@portabletext/editor 1.40.2 → 1.40.4

package/lib/utils/index.js

@@ -1,12 +1,52 @@
-import { isEqualSelectionPoints } from "../_chunks-es/util.slice-blocks.js";
-import { blockOffsetToSpanSelectionPoint, getBlockEndPoint, getBlockStartPoint, getTextBlockText, isEmptyTextBlock, isKeyedSegment, isSpan, reverseSelection, sliceBlocks, spanSelectionPointToBlockOffset } from "../_chunks-es/util.slice-blocks.js";
+import { isEqualSelectionPoints, sliceBlocks, isSpan } from "../_chunks-es/util.slice-blocks.js";
+import { blockOffsetToSpanSelectionPoint, getBlockEndPoint, getBlockStartPoint, getTextBlockText, isEmptyTextBlock, isKeyedSegment, reverseSelection, spanSelectionPointToBlockOffset } from "../_chunks-es/util.slice-blocks.js";
 import { blockOffsetToBlockSelectionPoint, blockOffsetToSelectionPoint, blockOffsetsToSelection, childSelectionPointToBlockOffset, selectionPointToBlockOffset } from "../_chunks-es/util.selection-point-to-block-offset.js";
-import { isTextBlock, mergeTextBlocks, splitTextBlock } from "../_chunks-es/util.split-text-block.js";
+import { isSelectionCollapsed } from "../_chunks-es/util.is-selection-collapsed.js";
+import { isTextBlock } from "../_chunks-es/util.merge-text-blocks.js";
+import { mergeTextBlocks } from "../_chunks-es/util.merge-text-blocks.js";
 function isEqualSelections(a, b) {
   return !a && !b ? !0 : !a || !b ? !1 : isEqualSelectionPoints(a.anchor, b.anchor) && isEqualSelectionPoints(a.focus, b.focus);
 }
-function isSelectionCollapsed(selection) {
-  return selection ? selection.anchor.path.join() === selection.focus.path.join() && selection.anchor.offset === selection.focus.offset : !1;
+function splitTextBlock({
+  context,
+  block,
+  point
+}) {
+  const firstChild = block.children.at(0), lastChild = block.children.at(block.children.length - 1);
+  if (!firstChild || !lastChild)
+    return;
+  const before = sliceBlocks({
+    blocks: [block],
+    selection: {
+      anchor: {
+        path: [{
+          _key: block._key
+        }, "children", {
+          _key: firstChild._key
+        }],
+        offset: 0
+      },
+      focus: point
+    }
+  }).at(0), after = sliceBlocks({
+    blocks: [block],
+    selection: {
+      anchor: point,
+      focus: {
+        path: [{
+          _key: block._key
+        }, "children", {
+          _key: lastChild._key
+        }],
+        offset: isSpan(context, lastChild) ? lastChild.text.length : 0
+      }
+    }
+  }).at(0);
+  if (!(!before || !after) && !(!isTextBlock(context, before) || !isTextBlock(context, after)))
+    return {
+      before,
+      after
+    };
 }
 export {
   blockOffsetToBlockSelectionPoint,

package/lib/utils/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":["../../src/utils/util.is-equal-selections.ts","../../src/utils/util.is-selection-collapsed.ts"],"sourcesContent":["import type {EditorSelection} from '../types/editor'\nimport {isEqualSelectionPoints} from './util.is-equal-selection-points'\n\n/**\n * @public\n */\nexport function isEqualSelections(a: EditorSelection, b: EditorSelection) {\n  if (!a && !b) {\n    return true\n  }\n\n  if (!a || !b) {\n    return false\n  }\n\n  return (\n    isEqualSelectionPoints(a.anchor, b.anchor) &&\n    isEqualSelectionPoints(a.focus, b.focus)\n  )\n}\n","import type {EditorSelection} from '../types/editor'\n\n/**\n * @public\n */\nexport function isSelectionCollapsed(selection: EditorSelection) {\n  if (!selection) {\n    return false\n  }\n\n  return (\n    selection.anchor.path.join() === selection.focus.path.join() &&\n    selection.anchor.offset === selection.focus.offset\n  )\n}\n"],"names":["isEqualSelections","a","b","isEqualSelectionPoints","anchor","focus","isSelectionCollapsed","selection","path","join","offset"],"mappings":";;;;AAMgBA,SAAAA,kBAAkBC,GAAoBC,GAAoB;AACpE,SAAA,CAACD,KAAK,CAACC,IACF,KAGL,CAACD,KAAK,CAACC,IACF,KAIPC,uBAAuBF,EAAEG,QAAQF,EAAEE,MAAM,KACzCD,uBAAuBF,EAAEI,OAAOH,EAAEG,KAAK;AAE3C;ACdO,SAASC,qBAAqBC,WAA4B;AAC/D,SAAKA,YAKHA,UAAUH,OAAOI,KAAKC,KAAAA,MAAWF,UAAUF,MAAMG,KAAKC,KAAAA,KACtDF,UAAUH,OAAOM,WAAWH,UAAUF,MAAMK,SALrC;AAOX;"}
+{"version":3,"file":"index.js","sources":["../../src/utils/util.is-equal-selections.ts","../../src/utils/util.split-text-block.ts"],"sourcesContent":["import type {EditorSelection} from '../types/editor'\nimport {isEqualSelectionPoints} from './util.is-equal-selection-points'\n\n/**\n * @public\n */\nexport function isEqualSelections(a: EditorSelection, b: EditorSelection) {\n  if (!a && !b) {\n    return true\n  }\n\n  if (!a || !b) {\n    return false\n  }\n\n  return (\n    isEqualSelectionPoints(a.anchor, b.anchor) &&\n    isEqualSelectionPoints(a.focus, b.focus)\n  )\n}\n","import type {PortableTextTextBlock} from '@sanity/types'\nimport type {EditorSelectionPoint} from '..'\nimport type {EditorContext} from '../editor/editor-snapshot'\nimport {isSpan} from './util.is-span'\nimport {isTextBlock} from './util.is-text-block'\nimport {sliceBlocks} from './util.slice-blocks'\n\n/**\n * @beta\n */\nexport function splitTextBlock({\n  context,\n  block,\n  point,\n}: {\n  context: Pick<EditorContext, 'schema'>\n  block: PortableTextTextBlock\n  point: EditorSelectionPoint\n}): {before: PortableTextTextBlock; after: PortableTextTextBlock} | undefined {\n  const firstChild = block.children.at(0)\n  const lastChild = block.children.at(block.children.length - 1)\n\n  if (!firstChild || !lastChild) {\n    return undefined\n  }\n\n  const before = sliceBlocks({\n    blocks: [block],\n    selection: {\n      anchor: {\n        path: [{_key: block._key}, 'children', {_key: firstChild._key}],\n        offset: 0,\n      },\n      focus: point,\n    },\n  }).at(0)\n  const after = sliceBlocks({\n    blocks: [block],\n    selection: {\n      anchor: point,\n      focus: {\n        path: [{_key: block._key}, 'children', {_key: lastChild._key}],\n        offset: isSpan(context, lastChild) ? lastChild.text.length : 0,\n      },\n    },\n  }).at(0)\n\n  if (!before || !after) {\n    return undefined\n  }\n\n  if (!isTextBlock(context, before) || !isTextBlock(context, after)) {\n    return undefined\n  }\n\n  return {before, after}\n}\n"],"names":["isEqualSelections","a","b","isEqualSelectionPoints","anchor","focus","splitTextBlock","context","block","point","firstChild","children","at","lastChild","length","before","sliceBlocks","blocks","selection","path","_key","offset","after","isSpan","text","isTextBlock"],"mappings":";;;;;;AAMgBA,SAAAA,kBAAkBC,GAAoBC,GAAoB;AACpE,SAAA,CAACD,KAAK,CAACC,IACF,KAGL,CAACD,KAAK,CAACC,IACF,KAIPC,uBAAuBF,EAAEG,QAAQF,EAAEE,MAAM,KACzCD,uBAAuBF,EAAEI,OAAOH,EAAEG,KAAK;AAE3C;ACTO,SAASC,eAAe;AAAA,EAC7BC;AAAAA,EACAC;AAAAA,EACAC;AAKF,GAA8E;AAC5E,QAAMC,aAAaF,MAAMG,SAASC,GAAG,CAAC,GAChCC,YAAYL,MAAMG,SAASC,GAAGJ,MAAMG,SAASG,SAAS,CAAC;AAEzD,MAAA,CAACJ,cAAc,CAACG;AAClB;AAGF,QAAME,SAASC,YAAY;AAAA,IACzBC,QAAQ,CAACT,KAAK;AAAA,IACdU,WAAW;AAAA,MACTd,QAAQ;AAAA,QACNe,MAAM,CAAC;AAAA,UAACC,MAAMZ,MAAMY;AAAAA,WAAO,YAAY;AAAA,UAACA,MAAMV,WAAWU;AAAAA,QAAAA,CAAK;AAAA,QAC9DC,QAAQ;AAAA,MACV;AAAA,MACAhB,OAAOI;AAAAA,IAAAA;AAAAA,EAEV,CAAA,EAAEG,GAAG,CAAC,GACDU,QAAQN,YAAY;AAAA,IACxBC,QAAQ,CAACT,KAAK;AAAA,IACdU,WAAW;AAAA,MACTd,QAAQK;AAAAA,MACRJ,OAAO;AAAA,QACLc,MAAM,CAAC;AAAA,UAACC,MAAMZ,MAAMY;AAAAA,WAAO,YAAY;AAAA,UAACA,MAAMP,UAAUO;AAAAA,QAAAA,CAAK;AAAA,QAC7DC,QAAQE,OAAOhB,SAASM,SAAS,IAAIA,UAAUW,KAAKV,SAAS;AAAA,MAAA;AAAA,IAC/D;AAAA,EACF,CACD,EAAEF,GAAG,CAAC;AAEP,MAAI,EAACG,CAAAA,UAAU,CAACO,UAIZ,EAACG,CAAAA,YAAYlB,SAASQ,MAAM,KAAK,CAACU,YAAYlB,SAASe,KAAK;AAIzD,WAAA;AAAA,MAACP;AAAAA,MAAQO;AAAAA,IAAK;AACvB;"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@portabletext/editor",
-  "version": "1.40.2",
+  "version": "1.40.4",
   "description": "Portable Text Editor made in React",
   "keywords": [
     "sanity",
@@ -80,14 +80,14 @@
     "use-effect-event": "^1.0.2",
     "xstate": "^5.19.2",
     "@portabletext/patches": "1.1.3",
-    "@portabletext/block-tools": "1.1.13"
+    "@portabletext/block-tools": "1.1.14"
   },
   "devDependencies": {
     "@portabletext/toolkit": "^2.0.17",
     "@sanity/diff-match-patch": "^3.2.0",
     "@sanity/pkg-utils": "^7.1.1",
-    "@sanity/schema": "^3.79.0",
-    "@sanity/types": "^3.79.0",
+    "@sanity/schema": "^3.80.1",
+    "@sanity/types": "^3.80.1",
     "@testing-library/jest-dom": "^6.6.3",
     "@testing-library/react": "^16.2.0",
     "@types/debug": "^4.1.12",
@@ -115,8 +115,8 @@
     "racejar": "1.2.2"
   },
   "peerDependencies": {
-    "@sanity/schema": "^3.79.0",
-    "@sanity/types": "^3.79.0",
+    "@sanity/schema": "^3.80.1",
+    "@sanity/types": "^3.80.1",
     "react": "^16.9 || ^17 || ^18 || ^19",
     "rxjs": "^7.8.2"
   },

package/src/behavior-actions/behavior.action.delete.block.ts

@@ -7,8 +7,8 @@ export const deleteBlockActionImplementation: BehaviorActionImplementation<
 > = ({action}) => {
   const range = toSlateRange(
     {
-      anchor: {path: action.blockPath, offset: 0},
-      focus: {path: action.blockPath, offset: 0},
+      anchor: {path: action.at, offset: 0},
+      focus: {path: action.at, offset: 0},
     },
     action.editor,
   )

package/src/behavior-actions/behavior.action.insert-blocks.ts

@@ -122,14 +122,18 @@ export const insertBlocksActionImplementation: BehaviorActionImplementation<
         index++
       }
     } else {
+      let index = 0
+
       for (const block of fragment) {
         insertBlock({
           block,
-          placement: 'auto',
+          placement: index === 0 ? 'auto' : 'after',
           select: 'end',
           editor: action.editor,
           schema: context.schema,
         })
+
+        index++
       }
     }
   }

package/src/behavior-actions/behavior.actions.ts

@@ -36,9 +36,7 @@ import {
 import {insertInlineObjectActionImplementation} from './behavior.action.insert-inline-object'
 import {insertSpanActionImplementation} from './behavior.action.insert-span'
 import {insertBlockActionImplementation} from './behavior.action.insert.block'
-import {insertBlockObjectActionImplementation} from './behavior.action.insert.block-object'
 import {insertTextActionImplementation} from './behavior.action.insert.text'
-import {insertTextBlockActionImplementation} from './behavior.action.insert.text-block'
 import {
   addListItemActionImplementation,
   removeListItemActionImplementation,
@@ -102,13 +100,11 @@ const behaviorActionImplementations: BehaviorActionImplementations = {
   'history.undo': historyUndoActionImplementation,
   'insert.block': insertBlockActionImplementation,
   'insert.blocks': insertBlocksActionImplementation,
-  'insert.block object': insertBlockObjectActionImplementation,
   'insert.break': insertBreakActionImplementation,
   'insert.inline object': insertInlineObjectActionImplementation,
   'insert.soft break': insertSoftBreakActionImplementation,
   'insert.span': insertSpanActionImplementation,
   'insert.text': insertTextActionImplementation,
-  'insert.text block': insertTextBlockActionImplementation,
   'effect': effectActionImplementation,
   'list item.add': addListItemActionImplementation,
   'list item.remove': removeListItemActionImplementation,
@@ -296,13 +292,6 @@ export function performAction({
       })
       break
     }
-    case 'insert.block object': {
-      behaviorActionImplementations['insert.block object']({
-        context,
-        action,
-      })
-      break
-    }
     case 'insert.inline object': {
       behaviorActionImplementations['insert.inline object']({
         context,
@@ -338,13 +327,6 @@ export function performAction({
       })
       break
     }
-    case 'insert.text block': {
-      behaviorActionImplementations['insert.text block']({
-        context,
-        action,
-      })
-      break
-    }
     case 'list item.add': {
       behaviorActionImplementations['list item.add']({
         context,

package/src/behaviors/behavior.core.block-objects.ts

@@ -24,7 +24,17 @@ const arrowDownOnLonelyBlockObject = defineBehavior({
 
     return focusBlockObject && !nextBlock
   },
-  actions: [() => [raise({type: 'insert.text block', placement: 'after'})]],
+  actions: [
+    ({snapshot}) => [
+      raise({
+        type: 'insert.block',
+        block: {
+          _type: snapshot.context.schema.block.name,
+        },
+        placement: 'after',
+      }),
+    ],
+  ],
 })
 
 const arrowUpOnLonelyBlockObject = defineBehavior({
@@ -47,7 +57,17 @@ const arrowUpOnLonelyBlockObject = defineBehavior({
 
     return focusBlockObject && !previousBlock
   },
-  actions: [() => [raise({type: 'insert.text block', placement: 'before'})]],
+  actions: [
+    ({snapshot}) => [
+      raise({
+        type: 'insert.block',
+        block: {
+          _type: snapshot.context.schema.block.name,
+        },
+        placement: 'before',
+      }),
+    ],
+  ],
 })
 
 const breakingBlockObject = defineBehavior({
@@ -58,7 +78,17 @@ const breakingBlockObject = defineBehavior({
 
     return collapsedSelection && focusBlockObject !== undefined
   },
-  actions: [() => [raise({type: 'insert.text block', placement: 'after'})]],
+  actions: [
+    ({snapshot}) => [
+      raise({
+        type: 'insert.block',
+        block: {
+          _type: snapshot.context.schema.block.name,
+        },
+        placement: 'after',
+      }),
+    ],
+  ],
 })
 
 const clickingAboveLonelyBlockObject = defineBehavior({
@@ -78,7 +108,17 @@ const clickingAboveLonelyBlockObject = defineBehavior({
       !previousBlock
     )
   },
-  actions: [() => [raise({type: 'insert.text block', placement: 'before'})]],
+  actions: [
+    ({snapshot}) => [
+      raise({
+        type: 'insert.block',
+        block: {
+          _type: snapshot.context.schema.block.name,
+        },
+        placement: 'before',
+      }),
+    ],
+  ],
 })
 
 const clickingBelowLonelyBlockObject = defineBehavior({
@@ -98,7 +138,17 @@ const clickingBelowLonelyBlockObject = defineBehavior({
       !nextBlock
     )
   },
-  actions: [() => [raise({type: 'insert.text block', placement: 'after'})]],
+  actions: [
+    ({snapshot}) => [
+      raise({
+        type: 'insert.block',
+        block: {
+          _type: snapshot.context.schema.block.name,
+        },
+        placement: 'after',
+      }),
+    ],
+  ],
 })
 
 const deletingEmptyTextBlockAfterBlockObject = defineBehavior({
@@ -125,7 +175,7 @@ const deletingEmptyTextBlockAfterBlockObject = defineBehavior({
     (_, {focusTextBlock, previousBlock}) => [
       raise({
         type: 'delete.block',
-        blockPath: focusTextBlock.path,
+        at: focusTextBlock.path,
       }),
       raise({
         type: 'select',
@@ -162,7 +212,7 @@ const deletingEmptyTextBlockBeforeBlockObject = defineBehavior({
     (_, {focusTextBlock, nextBlock}) => [
       raise({
         type: 'delete.block',
-        blockPath: focusTextBlock.path,
+        at: focusTextBlock.path,
       }),
       raise({
         type: 'select',

package/src/behaviors/behavior.core.insert-break.ts

@@ -29,10 +29,8 @@ const breakingAtTheEndOfTextBlock = defineBehavior({
         type: 'insert.block',
         block: {
           _type: snapshot.context.schema.block.name,
-          _key: snapshot.context.keyGenerator(),
           children: [
             {
-              _key: snapshot.context.keyGenerator(),
               _type: snapshot.context.schema.span.name,
               text: '',
               marks: [],
@@ -94,11 +92,9 @@ const breakingAtTheStartOfTextBlock = defineBehavior({
       raise({
         type: 'insert.block',
         block: {
-          _key: snapshot.context.keyGenerator(),
           _type: snapshot.context.schema.block.name,
           children: [
             {
-              _key: snapshot.context.keyGenerator(),
               _type: snapshot.context.schema.span.name,
               marks: focusAnnotations.length === 0 ? focusDecorators : [],
               text: '',

package/src/behaviors/behavior.default.ts

@@ -359,7 +359,7 @@ export const defaultBehaviors = [
           ? draggedBlocks.map((block) =>
               raise({
                 type: 'delete.block',
-                blockPath: block.path,
+                at: block.path,
               }),
             )
           : [

package/src/behaviors/behavior.markdown.ts

@@ -204,9 +204,12 @@ export function createMarkdownBehaviors(config: MarkdownBehaviorsConfig) {
       ],
       (_, {hrObject, hrBlockOffsets}) => [
         {
-          type: 'insert.block object',
+          type: 'insert.block',
           placement: 'before',
-          blockObject: hrObject,
+          block: {
+            _type: hrObject.name,
+            ...(hrObject.value ?? {}),
+          },
         },
         {
           type: 'delete.text',
@@ -237,25 +240,34 @@ export function createMarkdownBehaviors(config: MarkdownBehaviorsConfig) {
           text: hrCharacters,
         },
       ],
-      (_, {hrObject, focusBlock}) =>
+      ({snapshot}, {hrObject, focusBlock}) =>
         isPortableTextTextBlock(focusBlock.node)
           ? [
               {
-                type: 'insert.text block',
-                textBlock: {children: focusBlock.node.children},
+                type: 'insert.block',
+                block: {
+                  _type: snapshot.context.schema.block.name,
+                  children: focusBlock.node.children,
+                },
                 placement: 'after',
               },
               {
-                type: 'insert.block object',
-                blockObject: hrObject,
+                type: 'insert.block',
+                block: {
+                  _type: hrObject.name,
+                  ...(hrObject.value ?? {}),
+                },
                 placement: 'after',
               },
-              {type: 'delete.block', blockPath: focusBlock.path},
+              {type: 'delete.block', at: focusBlock.path},
             ]
           : [
               {
-                type: 'insert.block object',
-                blockObject: hrObject,
+                type: 'insert.block',
+                block: {
+                  _type: hrObject.name,
+                  ...(hrObject.value ?? {}),
+                },
                 placement: 'after',
               },
             ],