@portabletext/editor 3.0.2 → 3.0.4

package/lib/_chunks-dts/index.d.ts

@@ -518,7 +518,7 @@ declare class PortableTextEditor extends Component<PortableTextEditorProps<Inter
    * ```
    * import * as selectors from '@portabletext/editor/selectors'
    * const editor = useEditor()
-   * const selectedSlice = useEditorSelector(editor, selectors.getSelectedSlice)
+   * const selectedValue = useEditorSelector(editor, selectors.getSelectedValue)
    * ```
    */
   static getFragment: (editor: PortableTextEditor) => PortableTextBlock[] | undefined;

package/lib/index.js

@@ -40,13 +40,6 @@ function keepObjectEquality(object, keyMap) {
   const value = keyMap[object._key];
   return value && isEqual(object, value) ? value : (keyMap[object._key] = object, object);
 }
-function toSlateValue(value, {
-  schemaTypes
-}, keyMap = {}) {
-  return value && Array.isArray(value) ? value.map((block) => toSlateBlock(block, {
-    schemaTypes
-  }, keyMap)) : [];
-}
 function toSlateBlock(block, {
   schemaTypes
 }, keyMap = {}) {
@@ -64,7 +57,11 @@ function toSlateBlock(block, {
         _key: childKey,
         ...childProps
       } = child, propKeys = Object.keys(childProps);
-      return childType !== schemaTypes.span.name ? propKeys.length === 1 && propKeys.at(0) === "text" ? child : (hasInlines = !0, keepObjectEquality({
+      return childType === void 0 && propKeys.length === 1 && propKeys.at(0) === "text" ? {
+        _key: childKey,
+        _type: schemaTypes.span.name,
+        text: childProps.text
+      } : childType !== schemaTypes.span.name ? (hasInlines = !0, keepObjectEquality({
         _type: childType,
         _key: childKey,
         children: [{
@@ -97,52 +94,53 @@ function toSlateBlock(block, {
   }, keyMap);
 }
 function fromSlateValue(value, textBlockType, keyMap = {}) {
-  return value.map((block) => {
-    const {
-      _key,
-      _type
-    } = block;
-    if (!_key || !_type)
-      throw new Error("Not a valid block");
-    if (_type === textBlockType && "children" in block && Array.isArray(block.children) && _key) {
-      let hasInlines = !1;
-      const children = block.children.map((child) => {
+  return value.map((block) => fromSlateBlock(block, textBlockType, keyMap));
+}
+function fromSlateBlock(block, textBlockType, keyMap = {}) {
+  const {
+    _key,
+    _type
+  } = block;
+  if (!_key || !_type)
+    throw new Error("Not a valid block");
+  if (_type === textBlockType && "children" in block && Array.isArray(block.children) && _key) {
+    let hasInlines = !1;
+    const children = block.children.map((child) => {
+      const {
+        _type: _cType
+      } = child;
+      if ("value" in child && _cType !== "span") {
+        hasInlines = !0;
         const {
-          _type: _cType
+          value: v,
+          _key: k,
+          _type: t,
+          __inline: _i,
+          children: _c,
+          ...rest
         } = child;
-        if ("value" in child && _cType !== "span") {
-          hasInlines = !0;
-          const {
-            value: v,
-            _key: k,
-            _type: t,
-            __inline: _i,
-            children: _c,
-            ...rest
-          } = child;
-          return keepObjectEquality({
-            ...rest,
-            ...v,
-            _key: k,
-            _type: t
-          }, keyMap);
-        }
-        return child;
-      });
-      return hasInlines ? keepObjectEquality({
-        ...block,
-        children,
-        _key,
-        _type
-      }, keyMap) : block;
-    }
-    const blockValue = "value" in block && block.value;
-    return keepObjectEquality({
+        return keepObjectEquality({
+          ...rest,
+          ...v,
+          _key: k,
+          _type: t
+        }, keyMap);
+      }
+      return child;
+    });
+    return hasInlines ? keepObjectEquality({
+      ...block,
+      children,
       _key,
-      _type,
-      ...typeof blockValue == "object" ? blockValue : {}
-    }, keyMap);
-  });
+      _type
+    }, keyMap) : block;
+  }
+  const blockValue = "value" in block && block.value;
+  return keepObjectEquality({
+    _key,
+    _type,
+    ...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 === "";
@@ -278,7 +276,7 @@ function elementToBlock({
   schema,
   element
 }) {
-  return fromSlateValue([element], schema.block.name)?.at(0);
+  return fromSlateBlock(element, schema.block.name);
 }
 function isBlockElement({
   editor,
@@ -4305,7 +4303,7 @@ const debug$c = debugWithName("behavior.operation.history.redo"), historyRedoOpe
   })?.[0];
   if (!block)
     throw new Error(`Unable to find block at ${JSON.stringify(operation.at)}`);
-  const parsedBlock = fromSlateValue([block], context.schema.block.name, KEY_TO_VALUE_ELEMENT.get(operation.editor)).at(0);
+  const parsedBlock = fromSlateBlock(block, context.schema.block.name, KEY_TO_VALUE_ELEMENT.get(operation.editor));
   if (!parsedBlock)
     throw new Error(`Unable to parse block at ${JSON.stringify(operation.at)}`);
   if (isTextBlock(context, parsedBlock)) {
@@ -5637,13 +5635,13 @@ function insertPatch(editor, patch, schema) {
     const {
       items: items2,
       position: position2
-    } = patch, blocksToInsert = toSlateValue(items2, {
+    } = patch, blocksToInsert = items2.map((item) => toSlateBlock(item, {
       schemaTypes: schema
-    }, KEY_TO_SLATE_ELEMENT.get(editor)), targetBlockIndex = block.index, normalizedIdx2 = position2 === "after" ? targetBlockIndex + 1 : targetBlockIndex, editorWasEmptyBefore = isEqualToEmptyEditor(editor.children, schema);
+    }, KEY_TO_SLATE_ELEMENT.get(editor))), targetBlockIndex = block.index, normalizedIdx2 = position2 === "after" ? targetBlockIndex + 1 : targetBlockIndex, editorWasEmptyBefore = isEqualToEmptyEditor(editor.children, schema);
     return Transforms.insertNodes(editor, blocksToInsert, {
       at: [normalizedIdx2]
     }), editorWasEmptyBefore && typeof patch.path[0] == "number" && patch.path[0] === 0 && Transforms.removeNodes(editor, {
-      at: [position2 === "before" ? targetBlockIndex + 1 : targetBlockIndex]
+      at: [position2 === "before" ? targetBlockIndex + blocksToInsert.length : targetBlockIndex]
     }), !0;
   }
   const {
@@ -5652,13 +5650,13 @@ function insertPatch(editor, patch, schema) {
   } = patch, targetChild = findBlockChild(block, patch.path);
   if (!targetChild)
     return !1;
-  const childrenToInsert = toSlateValue([{
+  const childrenToInsert = toSlateBlock({
     ...block.node,
     children: items
-  }], {
+  }, {
     schemaTypes: schema
   }, KEY_TO_SLATE_ELEMENT.get(editor)), normalizedIdx = position === "after" ? targetChild.index + 1 : targetChild.index, childInsertPath = [block.index, normalizedIdx];
-  return childrenToInsert && Element$1.isElement(childrenToInsert[0]) && Transforms.insertNodes(editor, childrenToInsert[0].children, {
+  return childrenToInsert && Element$1.isElement(childrenToInsert) && Transforms.insertNodes(editor, childrenToInsert.children, {
     at: childInsertPath
   }), !0;
 }
@@ -6072,9 +6070,9 @@ function insertNodePatch(schema, children, operation, beforeValue) {
   const block = beforeValue[operation.path[0]];
   if (operation.path.length === 1) {
     const position = operation.path[0] === 0 ? "before" : "after", beforeBlock = beforeValue[operation.path[0] - 1], targetKey = operation.path[0] === 0 ? block?._key : beforeBlock?._key;
-    return targetKey ? [insert([fromSlateValue([operation.node], schema.block.name)[0]], position, [{
+    return targetKey ? [insert([fromSlateBlock(operation.node, schema.block.name)], position, [{
       _key: targetKey
-    }])] : [setIfMissing(beforeValue, []), insert([fromSlateValue([operation.node], schema.block.name)[0]], "before", [operation.path[0]])];
+    }])] : [setIfMissing(beforeValue, []), insert([fromSlateBlock(operation.node, schema.block.name)], "before", [operation.path[0]])];
   } else if (isTextBlock({
     schema
   }, block) && operation.path.length === 2 && children[operation.path[0]]) {
@@ -6107,7 +6105,7 @@ function splitNodePatch(schema, children, operation, beforeValue) {
     if (isTextBlock({
       schema
     }, oldBlock)) {
-      const targetValue = fromSlateValue([children[operation.path[0] + 1]], schema.block.name)[0];
+      const targetValue = fromSlateBlock(children[operation.path[0] + 1], schema.block.name);
       targetValue && (patches.push(insert([targetValue], "after", [{
         _key: splitBlock._key
       }])), oldBlock.children.slice(operation.position).forEach((span) => {
@@ -6126,10 +6124,10 @@ function splitNodePatch(schema, children, operation, beforeValue) {
     if (isSpan({
       schema
     }, splitSpan)) {
-      const targetSpans = fromSlateValue([{
+      const targetSpans = fromSlateBlock({
         ...splitBlock,
         children: splitBlock.children.slice(operation.path[1] + 1, operation.path[1] + 2)
-      }], schema.block.name)[0].children;
+      }, schema.block.name).children;
       patches.push(insert(targetSpans, "after", [{
         _key: splitBlock._key
       }, "children", {
@@ -6168,7 +6166,7 @@ function mergeNodePatch(schema, children, operation, beforeValue) {
   const patches = [], block = beforeValue[operation.path[0]], updatedBlock = children[operation.path[0]];
   if (operation.path.length === 1)
     if (block?._key) {
-      const newBlock = fromSlateValue([children[operation.path[0] - 1]], schema.block.name)[0];
+      const newBlock = fromSlateBlock(children[operation.path[0] - 1], schema.block.name);
       patches.push(set(newBlock, [{
         _key: newBlock._key
       }])), patches.push(unset([{
@@ -6206,7 +6204,7 @@ function moveNodePatch(schema, beforeValue, operation) {
     const position = operation.path[0] > operation.newPath[0] ? "before" : "after";
     patches.push(unset([{
       _key: block._key
-    }])), patches.push(insert([fromSlateValue([block], schema.block.name)[0]], position, [{
+    }])), patches.push(insert([fromSlateBlock(block, schema.block.name)], position, [{
       _key: targetBlock._key
     }]));
   } else if (operation.path.length === 2 && isTextBlock({
@@ -6214,7 +6212,7 @@ function moveNodePatch(schema, beforeValue, operation) {
   }, block) && isTextBlock({
     schema
   }, targetBlock)) {
-    const child = block.children[operation.path[1]], targetChild = targetBlock.children[operation.newPath[1]], position = operation.newPath[1] === targetBlock.children.length ? "after" : "before", childToInsert = fromSlateValue([block], schema.block.name)[0].children[operation.path[1]];
+    const child = block.children[operation.path[1]], targetChild = targetBlock.children[operation.newPath[1]], position = operation.newPath[1] === targetBlock.children.length ? "after" : "before", childToInsert = fromSlateBlock(block, schema.block.name).children[operation.path[1]];
     patches.push(unset([{
       _key: block._key
     }, "children", {
@@ -6801,9 +6799,9 @@ function createSlateEditor(config) {
     blockIndexMap: instance.blockIndexMap,
     listIndexMap: instance.listIndexMap
   });
-  const initialValue = toSlateValue(instance.value, {
+  const initialValue = [toSlateBlock(placeholderBlock, {
     schemaTypes: config.editorActor.getSnapshot().context.schema
-  });
+  })];
   return {
     instance,
     initialValue
@@ -10931,14 +10929,14 @@ function createEditableAPI(editor, editorActor) {
       if (editor.selection) {
         const block = Node.descendant(editor, editor.selection.focus.path.slice(0, 1));
         if (block)
-          return fromSlateValue([block], types.block.name, KEY_TO_VALUE_ELEMENT.get(editor))[0];
+          return fromSlateBlock(block, types.block.name, KEY_TO_VALUE_ELEMENT.get(editor));
       }
     },
     focusChild: () => {
       if (editor.selection) {
         const block = Node.descendant(editor, editor.selection.focus.path.slice(0, 1));
         if (block && editor.isTextBlock(block))
-          return fromSlateValue([block], types.block.name, KEY_TO_VALUE_ELEMENT.get(editor))[0].children[editor.selection.focus.path[1]];
+          return fromSlateBlock(block, types.block.name, KEY_TO_VALUE_ELEMENT.get(editor)).children[editor.selection.focus.path[1]];
       }
     },
     insertChild: (type, value) => (editorActor.send({
@@ -11015,10 +11013,10 @@ function createEditableAPI(editor, editorActor) {
         const [block, blockPath] = Editor.node(editor, slatePath.focus.path.slice(0, 1));
         if (block && blockPath && typeof block._key == "string") {
           if (path.length === 1 && slatePath.focus.path.length === 1)
-            return [fromSlateValue([block], types.block.name)[0], [{
+            return [fromSlateBlock(block, types.block.name), [{
               _key: block._key
             }]];
-          const ptBlock = fromSlateValue([block], types.block.name, KEY_TO_VALUE_ELEMENT.get(editor))[0];
+          const ptBlock = fromSlateBlock(block, types.block.name, KEY_TO_VALUE_ELEMENT.get(editor));
           if (editor.isTextBlock(ptBlock)) {
             const ptChild = ptBlock.children[slatePath.focus.path[1]];
             if (ptChild)
@@ -11182,7 +11180,13 @@ function createEditableAPI(editor, editorActor) {
     insertBreak: () => {
       editor.insertBreak(), editor.onChange();
     },
-    getFragment: () => fromSlateValue(editor.getFragment(), types.block.name),
+    getFragment: () => {
+      const snapshot = getEditorSnapshot({
+        editorActorSnapshot: editorActor.getSnapshot(),
+        slateEditorInstance: editor
+      });
+      return getSelectedValue(snapshot);
+    },
     isSelectionsOverlapping: (selectionA, selectionB) => {
       const rangeA = toSlateRange({
         context: {
@@ -12805,7 +12809,7 @@ class PortableTextEditor extends Component {
    * ```
    * import * as selectors from '@portabletext/editor/selectors'
    * const editor = useEditor()
-   * const selectedSlice = useEditorSelector(editor, selectors.getSelectedSlice)
+   * const selectedValue = useEditorSelector(editor, selectors.getSelectedValue)
    * ```
    */
   static getFragment = (editor) => editor.editable?.getFragment();