@portabletext/editor 1.0.12 → 1.0.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@portabletext/editor",
-  "version": "1.0.12",
+  "version": "1.0.13",
   "description": "Portable Text Editor made in React",
   "keywords": [
     "sanity",

package/src/editor/plugins/createWithPortableTextMarkModel.ts

@@ -26,6 +26,7 @@ const debug = debugWithName('plugin:withPortableTextMarkModel')
 export function createWithPortableTextMarkModel(
   types: PortableTextMemberSchemaTypes,
   change$: Subject<EditorChange>,
+  keyGenerator: () => string,
 ): (editor: PortableTextSlateEditor) => PortableTextSlateEditor {
   return function withPortableTextMarkModel(editor: PortableTextSlateEditor) {
     const {apply, normalizeNode} = editor
@@ -255,21 +256,17 @@ export function createWithPortableTextMarkModel(
             Array.isArray(node.marks) &&
             node.marks.length > 0
           ) {
-            apply(op)
-            Transforms.splitNodes(editor, {
-              match: Text.isText,
-              at: {...selection.focus, offset: selection.focus.offset},
-            })
             const marksWithoutAnnotationMarks: string[] = (
               {
                 ...(Editor.marks(editor) || {}),
               }.marks || []
             ).filter((mark) => decorators.includes(mark))
-            Transforms.setNodes(
-              editor,
-              {marks: marksWithoutAnnotationMarks},
-              {at: Path.next(selection.focus.path)},
-            )
+            Transforms.insertNodes(editor, {
+              _type: 'span',
+              _key: keyGenerator(),
+              text: op.text,
+              marks: marksWithoutAnnotationMarks,
+            })
             debug('Inserting text at end of annotation')
             return
           }
@@ -469,17 +466,24 @@ export function createWithPortableTextMarkModel(
    */
   function mergeSpans(editor: PortableTextSlateEditor) {
     const {selection} = editor
+
     if (selection) {
-      for (const [node, path] of Array.from(
+      const textNodesInSelection = Array.from(
         Editor.nodes(editor, {
           at: Editor.range(editor, [selection.anchor.path[0]], [selection.focus.path[0]]),
+          match: Text.isText,
+          reverse: true,
         }),
-      ).reverse()) {
+      )
+
+      for (const [node, path] of textNodesInSelection) {
         const [parent] = path.length > 1 ? Editor.node(editor, Path.parent(path)) : [undefined]
         const nextPath = [path[0], path[1] + 1]
+
         if (editor.isTextBlock(parent)) {
           const nextNode = parent.children[nextPath[1]]
-          if (Text.isText(node) && Text.isText(nextNode) && isEqual(nextNode.marks, node.marks)) {
+
+          if (Text.isText(nextNode) && isEqual(nextNode.marks, node.marks)) {
             debug('Merging spans')
             Transforms.mergeNodes(editor, {at: nextPath, voids: true})
             editor.onChange()

package/src/editor/plugins/index.ts

@@ -78,7 +78,11 @@ export const withPlugins = <T extends Editor>(
     patches$,
     blockSchemaType: schemaTypes.block,
   })
-  const withPortableTextMarkModel = createWithPortableTextMarkModel(schemaTypes, change$)
+  const withPortableTextMarkModel = createWithPortableTextMarkModel(
+    schemaTypes,
+    change$,
+    keyGenerator,
+  )
   const withPortableTextBlockStyle = createWithPortableTextBlockStyle(schemaTypes)
 
   const withPlaceholderBlock = createWithPlaceholderBlock()

package/src/utils/operationToPatches.ts

@@ -28,7 +28,6 @@ import {debugWithName} from './debug'
 import {fromSlateValue} from './values'
 
 const debug = debugWithName('operationToPatches')
-debug.enabled = false
 
 export function createOperationToPatches(types: PortableTextMemberSchemaTypes): PatchFunctions {
   const textBlockName = types.block.name