@portabletext/editor 2.14.2 → 2.14.3

package/lib/index.js

@@ -58,53 +58,58 @@ function keepObjectEquality(object, keyMap) {
 function toSlateValue(value, {
   schemaTypes
 }, keyMap = {}) {
-  return value && Array.isArray(value) ? value.map((block) => {
-    const {
-      _type,
-      _key,
-      ...rest
-    } = 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 {
-          _type: cType,
-          _key: cKey,
-          ...cRest
-        } = child;
-        return cType !== "span" ? (hasInlines = !0, keepObjectEquality({
-          _type: cType,
-          _key: cKey,
-          children: [{
-            _key: VOID_CHILD_KEY,
-            _type: "span",
-            text: "",
-            marks: []
-          }],
-          value: cRest,
-          __inline: !0
-        }, keyMap)) : child;
-      });
-      return !hasMissingStyle && !hasMissingMarkDefs && !hasMissingChildren && !hasInlines && Element$1.isElement(block) ? block : (hasMissingStyle && (rest.style = schemaTypes.styles[0].name), keepObjectEquality({
-        _type,
-        _key,
-        ...rest,
-        children
-      }, keyMap));
-    }
-    return keepObjectEquality({
+  return value && Array.isArray(value) ? value.map((block) => toSlateBlock(block, {
+    schemaTypes
+  }, keyMap)) : [];
+}
+function toSlateBlock(block, {
+  schemaTypes
+}, keyMap = {}) {
+  const {
+    _type,
+    _key,
+    ...rest
+  } = 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 {
+        _type: cType,
+        _key: cKey,
+        ...cRest
+      } = child;
+      return cType !== "span" ? (hasInlines = !0, keepObjectEquality({
+        _type: cType,
+        _key: cKey,
+        children: [{
+          _key: VOID_CHILD_KEY,
+          _type: "span",
+          text: "",
+          marks: []
+        }],
+        value: cRest,
+        __inline: !0
+      }, keyMap)) : child;
+    });
+    return !hasMissingStyle && !hasMissingMarkDefs && !hasMissingChildren && !hasInlines && Element$1.isElement(block) ? block : (hasMissingStyle && (rest.style = schemaTypes.styles[0].name), keepObjectEquality({
       _type,
       _key,
-      children: [{
-        _key: VOID_CHILD_KEY,
-        _type: "span",
-        text: "",
-        marks: []
-      }],
-      value: rest
-    }, keyMap);
-  }) : [];
+      ...rest,
+      children
+    }, keyMap));
+  }
+  return keepObjectEquality({
+    _type,
+    _key,
+    children: [{
+      _key: VOID_CHILD_KEY,
+      _type: "span",
+      text: "",
+      marks: []
+    }],
+    value: rest
+  }, keyMap);
 }
 function fromSlateValue(value, textBlockType, keyMap = {}) {
   return value.map((block) => {
@@ -11308,7 +11313,9 @@ function validateValue(value, types, keyGenerator) {
           }
         }, !0;
       }
-      const allUsedMarks = uniq(flatten(textBlock.children.filter((cld) => cld._type === types.span.name).map((cld) => cld.marks || [])));
+      const allUsedMarks = uniq(flatten(textBlock.children.filter((child) => isSpan({
+        schema: types
+      }, child)).map((cld) => cld.marks || [])));
       if (Array.isArray(blk.markDefs) && blk.markDefs.length > 0) {
         const unusedMarkDefs = uniq(blk.markDefs.map((def) => def._key).filter((key) => !allUsedMarks.includes(key)));
         if (unusedMarkDefs.length > 0)
@@ -11733,75 +11740,69 @@ async function updateValue({
         });
       });
     });
-  }), isChanged = !0), value && value.length > 0) {
-    const slateValueFromProps = toSlateValue(value, {
-      schemaTypes: context.schema
-    });
-    streamBlocks ? await new Promise((resolve) => {
-      Editor.withoutNormalizing(slateEditor, () => {
-        withRemoteChanges(slateEditor, () => {
-          withoutPatching(slateEditor, () => {
-            if (doneSyncing) {
-              resolve();
-              return;
-            }
-            isChanged = removeExtraBlocks({
-              slateEditor,
-              slateValueFromProps
-            }), (async () => {
-              for await (const [currentBlock, currentBlockIndex] of getStreamedBlocks({
-                slateValue: slateValueFromProps
-              })) {
-                const {
-                  blockChanged,
-                  blockValid
-                } = syncBlock({
-                  context,
-                  sendBack,
-                  block: currentBlock,
-                  index: currentBlockIndex,
-                  slateEditor,
-                  value
-                });
-                if (isChanged = blockChanged || isChanged, isValid = isValid && blockValid, !isValid)
-                  break;
-              }
-              resolve();
-            })();
-          });
-        });
-      });
-    }) : Editor.withoutNormalizing(slateEditor, () => {
+  }), isChanged = !0), value && value.length > 0 && (streamBlocks ? await new Promise((resolve) => {
+    Editor.withoutNormalizing(slateEditor, () => {
       withRemoteChanges(slateEditor, () => {
         withoutPatching(slateEditor, () => {
-          if (doneSyncing)
+          if (doneSyncing) {
+            resolve();
             return;
+          }
           isChanged = removeExtraBlocks({
             slateEditor,
-            slateValueFromProps
-          });
-          let index = 0;
-          for (const currentBlock of slateValueFromProps) {
-            const {
-              blockChanged,
-              blockValid
-            } = syncBlock({
-              context,
-              sendBack,
-              block: currentBlock,
-              index,
-              slateEditor,
+            value
+          }), (async () => {
+            for await (const [currentBlock, currentBlockIndex] of getStreamedBlocks({
               value
-            });
-            if (isChanged = blockChanged || isChanged, isValid = isValid && blockValid, !blockValid)
-              break;
-            index++;
-          }
+            })) {
+              const {
+                blockChanged,
+                blockValid
+              } = syncBlock({
+                context,
+                sendBack,
+                block: currentBlock,
+                index: currentBlockIndex,
+                slateEditor,
+                value
+              });
+              if (isChanged = blockChanged || isChanged, isValid = isValid && blockValid, !isValid)
+                break;
+            }
+            resolve();
+          })();
         });
       });
     });
-  }
-  if (!isValid) {
+  }) : Editor.withoutNormalizing(slateEditor, () => {
+    withRemoteChanges(slateEditor, () => {
+      withoutPatching(slateEditor, () => {
+        if (doneSyncing)
+          return;
+        isChanged = removeExtraBlocks({
+          slateEditor,
+          value
+        });
+        let index = 0;
+        for (const currentBlock of value) {
+          const {
+            blockChanged,
+            blockValid
+          } = syncBlock({
+            context,
+            sendBack,
+            block: currentBlock,
+            index,
+            slateEditor,
+            value
+          });
+          if (isChanged = blockChanged || isChanged, isValid = isValid && blockValid, !blockValid)
+            break;
+          index++;
+        }
+      });
+    });
+  })), !isValid) {
     debug$2("Invalid value, returning"), doneSyncing = !0, sendBack({
       type: "done syncing",
       value
@@ -11845,12 +11846,12 @@ async function updateValue({
 }
 function removeExtraBlocks({
   slateEditor,
-  slateValueFromProps
+  value
 }) {
   let isChanged = !1;
   const childrenLength = slateEditor.children.length;
-  if (slateValueFromProps.length < childrenLength) {
-    for (let i = childrenLength - 1; i > slateValueFromProps.length - 1; i--)
+  if (value.length < childrenLength) {
+    for (let i = childrenLength - 1; i > value.length - 1; i--)
       Transforms.removeNodes(slateEditor, {
         at: [i]
       });
@@ -11859,10 +11860,10 @@ function removeExtraBlocks({
   return isChanged;
 }
 async function* getStreamedBlocks({
-  slateValue
+  value
 }) {
   let index = 0;
-  for await (const block of slateValue)
+  for await (const block of value)
     index % 10 === 0 && await new Promise((resolve) => setTimeout(resolve, 0)), yield [block, index], index++;
 }
 function syncBlock({
@@ -11880,26 +11881,38 @@ function syncBlock({
       withoutPatching(slateEditor, () => {
         if (hasChanges && blockValid) {
           const validationValue = [value[currentBlockIndex]], validation = validateValue(validationValue, context.schema, context.keyGenerator);
-          !validation.valid && validation.resolution?.autoResolve && validation.resolution?.patches.length > 0 && !context.readOnly && context.previousValue && context.previousValue !== value && (console.warn(`${validation.resolution.action} for block with _key '${validationValue[0]._key}'. ${validation.resolution?.description}`), validation.resolution.patches.forEach((patch) => {
+          if (!validation.valid && validation.resolution?.autoResolve && validation.resolution?.patches.length > 0 && !context.readOnly && context.previousValue && context.previousValue !== value && (console.warn(`${validation.resolution.action} for block with _key '${validationValue[0]._key}'. ${validation.resolution?.description}`), validation.resolution.patches.forEach((patch) => {
             sendBack({
               type: "patch",
               patch
             });
-          })), validation.valid || validation.resolution?.autoResolve ? (oldBlock._key === currentBlock._key ? (debug$2.enabled && debug$2("Updating block", oldBlock, currentBlock), _updateBlock(slateEditor, currentBlock, oldBlock, currentBlockIndex)) : (debug$2.enabled && debug$2("Replacing block", oldBlock, currentBlock), _replaceBlock(slateEditor, currentBlock, currentBlockIndex)), blockChanged = !0) : (sendBack({
-            type: "invalid value",
-            resolution: validation.resolution,
-            value
-          }), blockValid = !1);
+          })), validation.valid || validation.resolution?.autoResolve) {
+            const slateBlock = toSlateBlock(currentBlock, {
+              schemaTypes: context.schema
+            });
+            oldBlock._key === currentBlock._key ? (debug$2.enabled && debug$2("Updating block", oldBlock, currentBlock), _updateBlock(slateEditor, slateBlock, oldBlock, currentBlockIndex)) : (debug$2.enabled && debug$2("Replacing block", oldBlock, currentBlock), _replaceBlock(slateEditor, slateBlock, currentBlockIndex)), blockChanged = !0;
+          } else
+            sendBack({
+              type: "invalid value",
+              resolution: validation.resolution,
+              value
+            }), blockValid = !1;
         }
         if (!oldBlock && blockValid) {
-          const validationValue = [value[currentBlockIndex]], validation = validateValue(validationValue, context.schema, context.keyGenerator);
-          debug$2.enabled && debug$2("Validating and inserting new block in the end of the value", currentBlock), validation.valid || validation.resolution?.autoResolve ? Transforms.insertNodes(slateEditor, currentBlock, {
-            at: [currentBlockIndex]
-          }) : (debug$2("Invalid", validation), sendBack({
-            type: "invalid value",
-            resolution: validation.resolution,
-            value
-          }), blockValid = !1);
+          const validation = validateValue([currentBlock], context.schema, context.keyGenerator);
+          if (debug$2.enabled && debug$2("Validating and inserting new block in the end of the value", currentBlock), validation.valid || validation.resolution?.autoResolve) {
+            const slateBlock = toSlateBlock(currentBlock, {
+              schemaTypes: context.schema
+            });
+            Transforms.insertNodes(slateEditor, slateBlock, {
+              at: [currentBlockIndex]
+            });
+          } else
+            debug$2("Invalid", validation), sendBack({
+              type: "invalid value",
+              resolution: validation.resolution,
+              value
+            }), blockValid = !1;
         }
       });
     });