Merge branch 'main' into next

# Conflicts:
#	scripts/tools/bundle-test/yarn.lock

src/document/printer.js

@@ -200,10 +200,6 @@ function fits(next, restCommands, width, options, hasLineSuffix, mustBeFlat) {
               ? getLast(doc.expandedStates)
               : doc.contents,
           ]);
-
-          if (doc.id) {
-            groupModeMap[doc.id] = groupMode;
-          }
           break;
         }
         case "fill":
@@ -214,7 +210,9 @@ function fits(next, restCommands, width, options, hasLineSuffix, mustBeFlat) {
           break;
         case "if-break":
         case "indent-if-break": {
-          const groupMode = doc.groupId ? groupModeMap[doc.groupId] : mode;
+          const groupMode = doc.groupId
+            ? groupModeMap[doc.groupId] || MODE_FLAT
+            : mode;
           if (groupMode === MODE_BREAK) {
             const breakContents =
               doc.type === "if-break"