@portabletext/editor 2.9.1 → 2.9.2

package/src/operations/behavior.operations.ts

@@ -1,3 +1,4 @@
+import {Editor} from 'slate'
 import type {
   AbstractBehaviorEventType,
   SyntheticBehaviorEvent,
@@ -79,133 +80,135 @@ export function performOperation({
   context: BehaviorOperationImplementationContext
   operation: BehaviorOperation
 }) {
-  try {
-    switch (operation.type) {
-      case 'annotation.add': {
-        behaviorOperationImplementations['annotation.add']({
-          context,
-          operation: operation,
-        })
-        break
-      }
-      case 'annotation.remove': {
-        behaviorOperationImplementations['annotation.remove']({
-          context,
-          operation: operation,
-        })
-        break
-      }
-      case 'block.set': {
-        behaviorOperationImplementations['block.set']({
-          context,
-          operation: operation,
-        })
-        break
-      }
-      case 'block.unset': {
-        behaviorOperationImplementations['block.unset']({
-          context,
-          operation: operation,
-        })
-        break
-      }
-      case 'child.set': {
-        behaviorOperationImplementations['child.set']({
-          context,
-          operation: operation,
-        })
-        break
-      }
-      case 'child.unset': {
-        behaviorOperationImplementations['child.unset']({
-          context,
-          operation: operation,
-        })
-        break
-      }
-      case 'decorator.add': {
-        behaviorOperationImplementations['decorator.add']({
-          context,
-          operation: operation,
-        })
-        break
-      }
-      case 'decorator.remove': {
-        behaviorOperationImplementations['decorator.remove']({
-          context,
-          operation: operation,
-        })
-        break
-      }
-      case 'delete': {
-        behaviorOperationImplementations.delete({
-          context,
-          operation: operation,
-        })
-        break
-      }
-      case 'history.redo': {
-        behaviorOperationImplementations['history.redo']({
-          context,
-          operation: operation,
-        })
-        break
-      }
-      case 'history.undo': {
-        behaviorOperationImplementations['history.undo']({
-          context,
-          operation: operation,
-        })
-        break
-      }
-      case 'insert.block': {
-        behaviorOperationImplementations['insert.block']({
-          context,
-          operation: operation,
-        })
-        break
-      }
-      case 'insert.text': {
-        behaviorOperationImplementations['insert.text']({
-          context,
-          operation: operation,
-        })
-        break
-      }
-      case 'move.backward': {
-        behaviorOperationImplementations['move.backward']({
-          context,
-          operation: operation,
-        })
-        break
-      }
-      case 'move.block': {
-        behaviorOperationImplementations['move.block']({
-          context,
-          operation: operation,
-        })
-        break
-      }
-      case 'move.forward': {
-        behaviorOperationImplementations['move.forward']({
-          context,
-          operation: operation,
-        })
-        break
-      }
-      default: {
-        behaviorOperationImplementations.select({
-          context,
-          operation: operation,
-        })
-        break
-      }
+  Editor.withoutNormalizing(operation.editor, () => {
+    try {
+      switch (operation.type) {
+        case 'annotation.add': {
+          behaviorOperationImplementations['annotation.add']({
+            context,
+            operation: operation,
+          })
+          break
+        }
+        case 'annotation.remove': {
+          behaviorOperationImplementations['annotation.remove']({
+            context,
+            operation: operation,
+          })
+          break
+        }
+        case 'block.set': {
+          behaviorOperationImplementations['block.set']({
+            context,
+            operation: operation,
+          })
+          break
+        }
+        case 'block.unset': {
+          behaviorOperationImplementations['block.unset']({
+            context,
+            operation: operation,
+          })
+          break
+        }
+        case 'child.set': {
+          behaviorOperationImplementations['child.set']({
+            context,
+            operation: operation,
+          })
+          break
+        }
+        case 'child.unset': {
+          behaviorOperationImplementations['child.unset']({
+            context,
+            operation: operation,
+          })
+          break
+        }
+        case 'decorator.add': {
+          behaviorOperationImplementations['decorator.add']({
+            context,
+            operation: operation,
+          })
+          break
+        }
+        case 'decorator.remove': {
+          behaviorOperationImplementations['decorator.remove']({
+            context,
+            operation: operation,
+          })
+          break
+        }
+        case 'delete': {
+          behaviorOperationImplementations.delete({
+            context,
+            operation: operation,
+          })
+          break
+        }
+        case 'history.redo': {
+          behaviorOperationImplementations['history.redo']({
+            context,
+            operation: operation,
+          })
+          break
+        }
+        case 'history.undo': {
+          behaviorOperationImplementations['history.undo']({
+            context,
+            operation: operation,
+          })
+          break
+        }
+        case 'insert.block': {
+          behaviorOperationImplementations['insert.block']({
+            context,
+            operation: operation,
+          })
+          break
+        }
+        case 'insert.text': {
+          behaviorOperationImplementations['insert.text']({
+            context,
+            operation: operation,
+          })
+          break
+        }
+        case 'move.backward': {
+          behaviorOperationImplementations['move.backward']({
+            context,
+            operation: operation,
+          })
+          break
+        }
+        case 'move.block': {
+          behaviorOperationImplementations['move.block']({
+            context,
+            operation: operation,
+          })
+          break
+        }
+        case 'move.forward': {
+          behaviorOperationImplementations['move.forward']({
+            context,
+            operation: operation,
+          })
+          break
+        }
+        default: {
+          behaviorOperationImplementations.select({
+            context,
+            operation: operation,
+          })
+          break
+        }
+      }
+    } catch (error) {
+      console.error(
+        new Error(
+          `Executing "${operation.type}" failed due to: ${error.message}`,
+        ),
+      )
     }
-  } catch (error) {
-    console.error(
-      new Error(
-        `Executing "${operation.type}" failed due to: ${error.message}`,
-      ),
-    )
-  }
+  })
 }

package/src/selectors/selector.get-mark-state.ts

@@ -6,10 +6,16 @@ import {getNextSpan} from './selector.get-next-span'
 import {getPreviousSpan} from './selector.get-previous-span'
 import {getSelectedSpans} from './selector.get-selected-spans'
 
-export type MarkState = {
-  state: 'changed' | 'unchanged'
-  marks: Array<string>
-}
+export type MarkState =
+  | {
+      state: 'unchanged'
+      marks: Array<string>
+    }
+  | {
+      state: 'changed'
+      marks: Array<string>
+      previousMarks: Array<string>
+    }
 
 /**
  * Given that text is inserted at the current position, what marks should
@@ -106,21 +112,25 @@ export const getMarkState: EditorSelector<MarkState | undefined> = (
       if (previousSpanHasSameMarks) {
         return {
           state: 'changed',
+          previousMarks: marks,
           marks: previousSpan?.node.marks ?? [],
         }
       } else if (previousSpanHasSameAnnotations) {
         return {
           state: 'changed',
+          previousMarks: marks,
           marks: previousSpan?.node.marks ?? [],
         }
       } else if (previousSpanHasSameAnnotation) {
         return {
           state: 'unchanged',
+          previousMarks: marks,
           marks: focusSpan.node.marks ?? [],
         }
       } else if (!previousSpan) {
         return {
           state: 'changed',
+          previousMarks: marks,
           marks: [],
         }
       }
@@ -135,6 +145,7 @@ export const getMarkState: EditorSelector<MarkState | undefined> = (
       ) {
         return {
           state: 'changed',
+          previousMarks: marks,
           marks: nextSpan?.node.marks ?? [],
         }
       }
@@ -142,6 +153,7 @@ export const getMarkState: EditorSelector<MarkState | undefined> = (
       if (!nextSpan) {
         return {
           state: 'changed',
+          previousMarks: marks,
           marks: [],
         }
       }
@@ -152,11 +164,13 @@ export const getMarkState: EditorSelector<MarkState | undefined> = (
     if (previousSpanHasAnnotations) {
       return {
         state: 'changed',
+        previousMarks: marks,
         marks: [],
       }
     } else {
       return {
         state: 'changed',
+        previousMarks: marks,
         marks: (previousSpan?.node.marks ?? []).filter((mark) =>
           decorators.includes(mark),
         ),
@@ -166,6 +180,6 @@ export const getMarkState: EditorSelector<MarkState | undefined> = (
 
   return {
     state: 'unchanged',
-    marks: focusSpan.node.marks ?? [],
+    marks,
   }
 }

package/src/editor/with-applying-behavior-operations.ts

@@ -1,18 +0,0 @@
-import {Editor} from 'slate'
-import {defaultKeyGenerator} from './key-generator'
-
-const CURRENT_OPERATION_ID: WeakMap<Editor, string | undefined> = new WeakMap()
-
-export function withApplyingBehaviorOperations(editor: Editor, fn: () => void) {
-  CURRENT_OPERATION_ID.set(editor, defaultKeyGenerator())
-  Editor.withoutNormalizing(editor, fn)
-  CURRENT_OPERATION_ID.set(editor, undefined)
-}
-
-export function getCurrentOperationId(editor: Editor) {
-  return CURRENT_OPERATION_ID.get(editor)
-}
-
-export function isApplyingBehaviorOperations(editor: Editor) {
-  return getCurrentOperationId(editor) !== undefined
-}