@portabletext/editor 3.0.7 → 3.0.9

package/lib/index.js

@@ -7,10 +7,11 @@ import { Element as Element$1, Text, Range, Editor, Node, Point, Path, Transform
 import { useSelected, useSlateSelector, useSlateStatic, ReactEditor, useSlate, Editable, withReact, Slate } from "slate-react";
 import debug$j from "debug";
 import { DOMEditor, isDOMNode, EDITOR_TO_PENDING_SELECTION, IS_FOCUSED, IS_READ_ONLY } from "slate-dom";
-import { getBlockEndPoint, getBlockStartPoint, getBlockKeyFromSelectionPoint, isSelectionCollapsed, isEqualSelectionPoints, getChildKeyFromSelectionPoint, blockOffsetToSpanSelectionPoint, defaultKeyGenerator, parseBlocks, parseBlock, parseAnnotation, parseSpan, parseInlineObject, isKeyedSegment, isListBlock, isTypedObject, getSelectionStartPoint, getSelectionEndPoint } from "./_chunks-es/util.slice-blocks.js";
+import { getBlockEndPoint, getBlockStartPoint, getBlockKeyFromSelectionPoint, isSelectionCollapsed, isEqualSelectionPoints, getChildKeyFromSelectionPoint, blockOffsetToSpanSelectionPoint, defaultKeyGenerator, parseBlocks, parseBlock, parseAnnotation, parseMarkDefs, parseSpan, parseInlineObject, isKeyedSegment, isListBlock, isTypedObject, getSelectionStartPoint, getSelectionEndPoint } from "./_chunks-es/util.slice-blocks.js";
 import isEqual from "lodash/isEqual.js";
 import { isTextBlock, isSpan, compileSchema } from "@portabletext/schema";
 import { defineSchema } from "@portabletext/schema";
+import { isEmptyTextBlock, sliceTextBlock, getTextBlockText } from "./_chunks-es/util.slice-text-block.js";
 import { getFocusInlineObject, isSelectionCollapsed as isSelectionCollapsed$1, getFocusTextBlock, getFocusSpan as getFocusSpan$1, getSelectedBlocks, isSelectionExpanded, getSelectionStartBlock, getSelectionEndBlock, isOverlappingSelection, getFocusBlock as getFocusBlock$1, isSelectingEntireBlocks, getSelectedValue, getActiveDecorators, isActiveAnnotation, getCaretWordSelection, getFocusBlockObject, getPreviousBlock, getNextBlock, getMarkState, getActiveAnnotationsMarks, isAtTheEndOfBlock, isAtTheStartOfBlock, getFirstBlock as getFirstBlock$1, getLastBlock as getLastBlock$1, getFocusListBlock, getSelectionStartPoint as getSelectionStartPoint$1, getSelectionEndPoint as getSelectionEndPoint$1, isActiveDecorator, getFocusChild as getFocusChild$1, getActiveAnnotations, getSelectedTextBlocks, isActiveListItem, isActiveStyle } from "./_chunks-es/selector.is-at-the-start-of-block.js";
 import { defineBehavior, forward, raise, effect } from "./behaviors/index.js";
 import uniq from "lodash/uniq.js";
@@ -20,9 +21,7 @@ import { htmlToBlocks } from "@portabletext/block-tools";
 import { toHTML } from "@portabletext/to-html";
 import { Schema } from "@sanity/schema";
 import flatten from "lodash/flatten.js";
-import omit from "lodash/omit.js";
-import { applyAll, unset, insert, set, setIfMissing, diffMatchPatch as diffMatchPatch$1 } from "@portabletext/patches";
-import { isEmptyTextBlock, sliceTextBlock, getTextBlockText } from "./_chunks-es/util.slice-text-block.js";
+import { set, applyAll, unset, insert, setIfMissing, diffMatchPatch as diffMatchPatch$1 } from "@portabletext/patches";
 import { createDraft, finishDraft } from "immer";
 import { createKeyboardShortcut, code, underline, italic, bold, undo, redo } from "@portabletext/keyboard-shortcuts";
 import isPlainObject from "lodash/isPlainObject.js";
@@ -51,7 +50,7 @@ function toSlateBlock(block, {
   if (block && block._type === schemaTypes.block.name) {
     const textBlock = block;
     let hasInlines = !1;
-    const hasMissingStyle = typeof textBlock.style > "u", hasMissingMarkDefs = typeof textBlock.markDefs > "u", hasMissingChildren = typeof textBlock.children > "u", children = (textBlock.children || []).map((child) => {
+    const hasMissingMarkDefs = typeof textBlock.markDefs > "u", hasMissingChildren = typeof textBlock.children > "u", children = (textBlock.children || []).map((child) => {
       const {
         _type: childType,
         _key: childKey,
@@ -74,12 +73,12 @@ function toSlateBlock(block, {
         __inline: !0
       }, keyMap)) : child;
     });
-    return !hasMissingStyle && !hasMissingMarkDefs && !hasMissingChildren && !hasInlines && Element$1.isElement(block) ? block : (hasMissingStyle && (rest.style = schemaTypes.styles[0].name), keepObjectEquality({
+    return !hasMissingMarkDefs && !hasMissingChildren && !hasInlines && Element$1.isElement(block) ? block : keepObjectEquality({
       _type,
       _key,
       ...rest,
       children
-    }, keyMap));
+    }, keyMap);
   }
   return keepObjectEquality({
     _type,
@@ -139,8 +138,16 @@ function fromSlateBlock(block, textBlockType, keyMap = {}) {
     ...typeof blockValue == "object" ? blockValue : {}
   }, keyMap);
 }
-function isEqualToEmptyEditor(children, schemaTypes) {
-  return children === void 0 || children && Array.isArray(children) && children.length === 0 || children && Array.isArray(children) && children.length === 1 && Element$1.isElement(children[0]) && children[0]._type === schemaTypes.block.name && "style" in children[0] && children[0].style === schemaTypes.styles[0].name && !("listItem" in children[0]) && Array.isArray(children[0].children) && children[0].children.length === 1 && Text.isText(children[0].children[0]) && children[0].children[0]._type === "span" && !children[0].children[0].marks?.join("") && children[0].children[0].text === "";
+function isEqualToEmptyEditor(blocks, schemaTypes) {
+  if (blocks.length !== 1)
+    return !1;
+  const firstBlock = blocks.at(0);
+  if (!firstBlock)
+    return !0;
+  if (!Element$1.isElement(firstBlock) || firstBlock._type !== schemaTypes.block.name || "listItem" in firstBlock || !("style" in firstBlock) || firstBlock.style !== schemaTypes.styles.at(0)?.name || !Array.isArray(firstBlock.children) || firstBlock.children.length !== 1)
+    return !1;
+  const firstChild = firstBlock.children.at(0);
+  return !(!firstChild || !Text.isText(firstChild) || !("_type" in firstChild) || firstChild._type !== schemaTypes.span.name || firstChild.text !== "" || firstChild.marks?.join(""));
 }
 function getFocusBlock({
   editor
@@ -2233,7 +2240,7 @@ const debug$g = debugWithName("component:Editable"), PortableTextEditable = forw
     onFocus && onFocus(event_2), event_2.isDefaultPrevented() || (relayActor.send({
       type: "focused",
       event: event_2
-    }), !slateEditor.selection && isEqualToEmptyEditor(slateEditor.children, editorActor.getSnapshot().context.schema) && (Transforms.select(slateEditor, Editor.start(slateEditor, [])), slateEditor.onChange()));
+    }), !slateEditor.selection && slateEditor.children.length === 1 && isEmptyTextBlock(editorActor.getSnapshot().context, slateEditor.value.at(0)) && (Transforms.select(slateEditor, Editor.start(slateEditor, [])), slateEditor.onChange()));
   }, $[91] = editorActor, $[92] = onFocus, $[93] = relayActor, $[94] = slateEditor, $[95] = t22) : t22 = $[95];
   const handleOnFocus = t22;
   let t23;
@@ -3073,7 +3080,7 @@ function createWithPortableTextMarkModel(editorActor) {
     const {
       apply: apply2,
       normalizeNode
-    } = editor, decorators = editorActor.getSnapshot().context.schema.decorators.map((t) => t.name);
+    } = editor, decorators = editorActor.getSnapshot().context.schema.decorators.map((t) => t.name), defaultStyle = editorActor.getSnapshot().context.schema.styles.at(0)?.name;
     return editor.normalizeNode = (nodeEntry) => {
       const [node, path] = nodeEntry;
       if (editor.isTextBlock(node)) {
@@ -3101,6 +3108,16 @@ function createWithPortableTextMarkModel(editorActor) {
         });
         return;
       }
+      if (defaultStyle && editor.isTextBlock(node) && typeof node.style > "u") {
+        debug$e("Adding .style to block node"), withNormalizeNode(editor, () => {
+          Transforms.setNodes(editor, {
+            style: defaultStyle
+          }, {
+            at: path
+          });
+        });
+        return;
+      }
       if (editor.isTextSpan(node) && !Array.isArray(node.marks)) {
         debug$e("Adding .marks to span node"), withNormalizeNode(editor, () => {
           Transforms.setNodes(editor, {
@@ -4247,32 +4264,58 @@ const debug$c = debugWithName("behavior.operation.history.redo"), historyRedoOpe
   const blockIndex = operation.editor.blockIndexMap.get(operation.at[0]._key);
   if (blockIndex === void 0)
     throw new Error(`Unable to find block index for block at ${JSON.stringify(operation.at)}`);
-  const block = operation.editor.value.at(blockIndex);
-  if (!block)
+  const slateBlock = operation.editor.children.at(blockIndex);
+  if (!slateBlock)
     throw new Error(`Unable to find block at ${JSON.stringify(operation.at)}`);
-  const {
-    _type,
-    ...filteredProps
-  } = operation.props, updatedBlock = {
-    ...block,
-    ...filteredProps
-  }, parsedBlock = parseBlock({
-    context,
-    block: updatedBlock,
-    options: {
-      normalize: !1,
-      removeUnusedMarkDefs: !1,
-      validateFields: !0
-    }
-  });
-  if (!parsedBlock)
-    throw new Error(`Unable to update block at ${JSON.stringify(operation.at)}`);
-  const slateBlock = toSlateBlock(parsedBlock, {
-    schemaTypes: context.schema
-  });
-  Transforms.setNodes(operation.editor, slateBlock, {
-    at: [blockIndex]
-  });
+  if (isTextBlock(context, slateBlock)) {
+    const filteredProps = {};
+    for (const key of Object.keys(operation.props))
+      if (!(key === "_type" || key === "children")) {
+        if (key === "style") {
+          context.schema.styles.some((style) => style.name === operation.props[key]) && (filteredProps[key] = operation.props[key]);
+          continue;
+        }
+        if (key === "listItem") {
+          context.schema.lists.some((list) => list.name === operation.props[key]) && (filteredProps[key] = operation.props[key]);
+          continue;
+        }
+        if (key === "level") {
+          filteredProps[key] = operation.props[key];
+          continue;
+        }
+        if (key === "markDefs") {
+          const {
+            markDefs
+          } = parseMarkDefs({
+            context,
+            markDefs: operation.props[key],
+            options: {
+              validateFields: !0
+            }
+          });
+          filteredProps[key] = markDefs;
+          continue;
+        }
+        context.schema.block.fields?.some((field) => field.name === key) && (filteredProps[key] = operation.props[key]);
+      }
+    Transforms.setNodes(operation.editor, filteredProps, {
+      at: [blockIndex]
+    });
+  } else {
+    const schemaDefinition = context.schema.blockObjects.find((definition) => definition.name === slateBlock._type), filteredProps = {};
+    for (const key of Object.keys(operation.props))
+      if (key !== "_type") {
+        if (key === "_key") {
+          filteredProps[key] = operation.props[key];
+          continue;
+        }
+        schemaDefinition?.fields.some((field) => field.name === key) && (filteredProps[key] = operation.props[key]);
+      }
+    const patches = Object.entries(filteredProps).map(([key, value]) => key === "_key" ? set(value, ["_key"]) : set(value, ["value", key])), updatedSlateBlock = applyAll(slateBlock, patches);
+    Transforms.setNodes(operation.editor, updatedSlateBlock, {
+      at: [blockIndex]
+    });
+  }
 }, blockUnsetOperationImplementation = ({
   context,
   operation
@@ -4280,50 +4323,22 @@ const debug$c = debugWithName("behavior.operation.history.redo"), historyRedoOpe
   const blockKey = operation.at[0]._key, blockIndex = operation.editor.blockIndexMap.get(blockKey);
   if (blockIndex === void 0)
     throw new Error(`Unable to find block index for block key ${blockKey}`);
-  const block = blockIndex !== void 0 ? operation.editor.value.at(blockIndex) : void 0;
-  if (!block)
+  const slateBlock = blockIndex !== void 0 ? operation.editor.children.at(blockIndex) : void 0;
+  if (!slateBlock)
     throw new Error(`Unable to find block at ${JSON.stringify(operation.at)}`);
-  if (isTextBlock(context, block)) {
-    const propsToRemove = operation.props.filter((prop) => prop !== "_type"), updatedTextBlock = parseBlock({
-      context,
-      block: omit(block, propsToRemove),
-      options: {
-        normalize: !1,
-        removeUnusedMarkDefs: !0,
-        validateFields: !0
-      }
-    });
-    if (!updatedTextBlock)
-      throw new Error(`Unable to update block at ${JSON.stringify(operation.at)}`);
-    const propsToSet = {};
-    for (const prop of propsToRemove)
-      prop in updatedTextBlock ? propsToSet[prop] = updatedTextBlock[prop] : propsToSet[prop] = void 0;
-    Transforms.setNodes(operation.editor, propsToSet, {
+  if (isTextBlock(context, slateBlock)) {
+    const propsToRemove = operation.props.filter((prop) => prop !== "_type" && prop !== "_key" && prop !== "children");
+    Transforms.unsetNodes(operation.editor, propsToRemove, {
+      at: [blockIndex]
+    }), operation.props.includes("_key") && Transforms.setNodes(operation.editor, {
+      _key: context.keyGenerator()
+    }, {
       at: [blockIndex]
     });
     return;
   }
-  const updatedBlockObject = parseBlock({
-    context,
-    block: omit(block, operation.props.filter((prop) => prop !== "_type")),
-    options: {
-      normalize: !1,
-      removeUnusedMarkDefs: !0,
-      validateFields: !0
-    }
-  });
-  if (!updatedBlockObject)
-    throw new Error(`Unable to update block at ${JSON.stringify(operation.at)}`);
-  const {
-    _type,
-    _key,
-    ...props
-  } = updatedBlockObject;
-  Transforms.setNodes(operation.editor, {
-    _type,
-    _key,
-    value: props
-  }, {
+  const patches = operation.props.flatMap((key) => key === "_type" ? [] : key === "_key" ? set(context.keyGenerator(), ["_key"]) : unset(["value", key])), updatedSlateBlock = applyAll(slateBlock, patches);
+  Transforms.setNodes(operation.editor, updatedSlateBlock, {
     at: [blockIndex]
   });
 }, childSetOperationImplementation = ({
@@ -4696,7 +4711,7 @@ function insertBlock(options) {
         at: nextPath
       }), select === "start" ? Transforms.select(editor, Editor.start(editor, nextPath)) : select === "end" && Transforms.select(editor, Editor.end(editor, nextPath));
     } else {
-      if (endBlock && isEqualToEmptyEditor([endBlock], context.schema)) {
+      if (isEmptyTextBlock(context, endBlock)) {
         Transforms.insertNodes(editor, [block], {
           at: endBlockPath,
           select: !1
@@ -4753,14 +4768,14 @@ function insertBlock(options) {
         select: select !== "none"
       });
       const atAfterInsert = atBeforeInsert?.unref() ?? editor.selection;
-      select === "none" && atAfterInsert && Transforms.select(editor, atAfterInsert), focusBlock && isEqualToEmptyEditor([focusBlock], context.schema) && Transforms.removeNodes(editor, {
+      select === "none" && atAfterInsert && Transforms.select(editor, atAfterInsert), isEmptyTextBlock(context, focusBlock) && Transforms.removeNodes(editor, {
         at: focusBlockPath
       });
       return;
     }
     if (editor.isTextBlock(endBlock) && editor.isTextBlock(block)) {
       const selectionStartPoint = Range.start(at);
-      if (isEqualToEmptyEditor([endBlock], context.schema)) {
+      if (isEmptyTextBlock(context, endBlock)) {
         Transforms.insertNodes(editor, [block], {
           at: endBlockPath,
           select: !1