Merge branch 'main' into app-perf

seed-hypermedia · Feb 23, 2024 · 0319bd8 · 0319bd8
2 parents edf5b10 + b097860
commit 0319bd8
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/...ages/editor/src/blocknote/core/extensions/BlockManipulation/BlockManipulationExtension.ts b/...ages/editor/src/blocknote/core/extensions/BlockManipulation/BlockManipulationExtension.ts
@@ -68,6 +68,7 @@ export const BlockManipulationExtension = Extension.create({
               const selection = NodeSelection.create(view.state.doc, nodePos)
               tr = tr.setSelection(selection)
               view.dispatch(tr)
+              view.focus()
               return true
             }
             return false

diff --git a/frontend/packages/editor/src/blocknote/core/extensions/Blocks/helpers/getGroupInfoFromPos.ts b/frontend/packages/editor/src/blocknote/core/extensions/Blocks/helpers/getGroupInfoFromPos.ts
@@ -42,7 +42,7 @@ export function getGroupInfoFromPos(
     group,
     container,
     depth,
-    level: (maxDepth - 1) / 2,
+    level: Math.ceil((maxDepth - 1) / 2),
     $pos,
   }
 }
diff --git a/frontend/packages/editor/src/blocknote/core/extensions/Blocks/nodes/BlockContainer.ts b/frontend/packages/editor/src/blocknote/core/extensions/Blocks/nodes/BlockContainer.ts
@@ -702,16 +702,13 @@ export const BlockContainer = Node.create<{
                 const posAddition =
                   container.type.name === 'blockContainer' ? -1 : 0
 
-                if (newLevel !== child.attrs.listLevel)
-                  state.tr.setNodeMarkup(
+                if (newLevel !== child.attrs.listLevel) {
+                  state.tr.setNodeAttribute(
                     groupPos.start() + pos + posAddition,
-                    null,
-                    {
-                      ...child.attrs,
-                      listType: listType,
-                      listLevel: newLevel,
-                    },
+                    'listLevel',
+                    newLevel,
                   )
+                }
               }
             })
             return true
@@ -1329,6 +1326,8 @@ export const BlockContainer = Node.create<{
               state,
             )
 
+            if (group.attrs.listType === 'div') return false
+
             if (container) {
               setTimeout(() => {
                 this.editor.commands.UpdateGroupChildren(