@portabletext/editor 1.0.2 → 1.0.4

package/lib/index.js

@@ -2286,16 +2286,16 @@ function apply$1(value, patch) {
   return OPERATIONS$1[patch.type](value, patch.value);
 }
 const OPERATIONS = {
-  replace(currentValue, nextValue) {
+  replace(_currentValue, nextValue) {
     return nextValue;
   },
-  set(currentValue, nextValue) {
+  set(_currentValue, nextValue) {
     return nextValue;
   },
   setIfMissing(currentValue, nextValue) {
     return currentValue === void 0 ? nextValue : currentValue;
   },
-  unset(currentValue, nextValue) {
+  unset(_currentValue, _nextValue) {
   },
   diffMatchPatch(currentValue, nextValue) {
     const [result] = apply$4(parse(nextValue), currentValue, {
@@ -3752,7 +3752,8 @@ function createWithInsertData(change$, schemaTypes, keyGenerator) {
             editor,
             toSlateValue(parsed, { schemaTypes }),
             keyGenerator,
-            spanTypeName
+            spanTypeName,
+            schemaTypes
           ), validation = validateValue(parsed, schemaTypes, keyGenerator);
           if (!validation.valid && !((_a = validation.resolution) != null && _a.autoResolve)) {
             const errorDescription = `${(_b = validation.resolution) == null ? void 0 : _b.description}`;
@@ -3833,21 +3834,32 @@ const entityMap = {
 function escapeHtml(str) {
   return String(str).replace(/[&<>"'`=/]/g, (s) => entityMap[s]);
 }
-function _regenerateKeys(editor, fragment, keyGenerator, spanTypeName) {
+function _regenerateKeys(editor, fragment, keyGenerator, spanTypeName, editorTypes) {
   return fragment.map((node) => {
     const newNode = { ...node };
-    editor.isTextBlock(newNode) && (newNode.markDefs = (newNode.markDefs || []).map((def) => {
-      const oldKey = def._key, newKey = keyGenerator();
-      return newNode.children = newNode.children.map(
-        (child) => child._type === spanTypeName && editor.isTextSpan(child) ? {
-          ...child,
-          marks: child.marks && child.marks.includes(oldKey) ? (
-            // eslint-disable-next-line max-nested-callbacks
-            [...child.marks].filter((mark) => mark !== oldKey).concat(newKey)
-          ) : child.marks
-        } : child
-      ), { ...def, _key: newKey };
-    }));
+    if (editor.isTextBlock(newNode)) {
+      const annotations = editorTypes.annotations.map((t) => t.name);
+      if (annotations.length === 0) {
+        const { markDefs, ...NewNodeNoDefs } = newNode;
+        return { ...NewNodeNoDefs, _key: keyGenerator() };
+      }
+      if ((newNode.markDefs || []).some((def) => !annotations.includes(def._type))) {
+        const allowedAnnotations = (newNode.markDefs || []).filter((def) => annotations.includes(def._type));
+        return { ...newNode, markDefs: allowedAnnotations, _key: keyGenerator() };
+      }
+      newNode.markDefs = (newNode.markDefs || []).map((def) => {
+        const oldKey = def._key, newKey = keyGenerator();
+        return newNode.children = newNode.children.map(
+          (child) => child._type === spanTypeName && editor.isTextSpan(child) ? {
+            ...child,
+            marks: child.marks && child.marks.includes(oldKey) ? (
+              // eslint-disable-next-line max-nested-callbacks
+              [...child.marks].filter((mark) => mark !== oldKey).concat(newKey)
+            ) : child.marks
+          } : child
+        ), { ...def, _key: newKey };
+      });
+    }
     const nodeWithNewKeys = { ...newNode, _key: keyGenerator() };
     return editor.isTextBlock(nodeWithNewKeys) && (nodeWithNewKeys.children = nodeWithNewKeys.children.map((child) => ({
       ...child,
@@ -4700,35 +4712,20 @@ const debug$1 = debugWithName("components:Leaf"), EMPTY_MARKS = [], Leaf = (prop
     [onCopy]
   ), handlePaste = react.useCallback(
     (event) => {
-      if (event.preventDefault(), !!slateEditor.selection) {
-        if (!onPaste) {
-          debug("Pasting normally"), slateEditor.insertData(event.clipboardData);
-          return;
-        }
-        new Promise((resolve) => {
-          const value = PortableTextEditor.getValue(portableTextEditor), ptRange = toPortableTextRange(value, slateEditor.selection, schemaTypes), path = (ptRange == null ? void 0 : ptRange.focus.path) || [];
-          resolve(
-            onPaste({
-              event,
-              value,
-              path,
-              schemaTypes
-            })
-          );
-        }).then((result) => {
-          if (debug("Custom paste function from client resolved", result), change$.next({ type: "loading", isLoading: !0 }), !result || !result.insert) {
-            debug("No result from custom paste handler, pasting normally"), slateEditor.insertData(event.clipboardData);
-            return;
-          }
-          if (result && result.insert) {
-            slateEditor.insertFragment(
-              toSlateValue(result.insert, { schemaTypes })
-            ), change$.next({ type: "loading", isLoading: !1 });
-            return;
-          }
-          console.warn("Your onPaste function returned something unexpected:", result);
-        }).catch((error) => (change$.next({ type: "loading", isLoading: !1 }), console.error(error), error));
+      if (event.preventDefault(), !slateEditor.selection)
+        return;
+      if (!onPaste) {
+        debug("Pasting normally"), slateEditor.insertData(event.clipboardData);
+        return;
       }
+      const value = PortableTextEditor.getValue(portableTextEditor), ptRange = toPortableTextRange(value, slateEditor.selection, schemaTypes), path = (ptRange == null ? void 0 : ptRange.focus.path) || [], onPasteResult = onPaste({ event, value, path, schemaTypes });
+      onPasteResult === void 0 ? (debug("No result from custom paste handler, pasting normally"), slateEditor.insertData(event.clipboardData)) : (change$.next({ type: "loading", isLoading: !0 }), Promise.resolve(onPasteResult).then((result) => {
+        debug("Custom paste function from client resolved", result), result && result.insert ? slateEditor.insertFragment(
+          toSlateValue(result.insert, { schemaTypes })
+        ) : console.warn("Your onPaste function returned something unexpected:", result);
+      }).catch((error) => (console.error(error), error)).finally(() => {
+        change$.next({ type: "loading", isLoading: !1 });
+      }));
     },
     [change$, onPaste, portableTextEditor, schemaTypes, slateEditor]
   ), handleOnFocus = react.useCallback(
@@ -4853,21 +4850,8 @@ const debug$1 = debugWithName("components:Leaf"), EMPTY_MARKS = [], Leaf = (prop
     }
   ) : null;
 });
-function compactPatches(patches) {
-  const lastPatch = patches.slice(-1)[0];
-  if (lastPatch && lastPatch.type === "unset" && lastPatch.path.length === 0)
-    return [lastPatch];
-  let finalPatches = patches;
-  return finalPatches = finalPatches.filter((patch, index) => {
-    if (!patch)
-      return !1;
-    const nextPatch = finalPatches[index + 1];
-    return !(nextPatch && nextPatch.type === "set" && patch.type === "set" && isEqual__default.default(patch.path, nextPatch.path));
-  }), finalPatches.length !== patches.length ? finalPatches : patches;
-}
 exports.PortableTextEditable = PortableTextEditable;
 exports.PortableTextEditor = PortableTextEditor;
-exports.compactPatches = compactPatches;
 exports.keyGenerator = defaultKeyGenerator;
 exports.usePortableTextEditor = usePortableTextEditor;
 exports.usePortableTextEditorSelection = usePortableTextEditorSelection;