@portabletext/editor 7.10.2 → 7.10.4

package/lib/index.js

@@ -5934,7 +5934,7 @@ function RenderSpan(props) {
       if (decoratorSchemaTypes.includes(mark_0))
         return [];
       const markDef_0 = block?.markDefs?.find((markDef) => markDef._key === mark_0);
-      return markDef_0 ? [markDef_0] : [];
+      return markDef_0 ? [markDef_0] : (console.warn(`Mark ${mark_0} is neither a decorator in the schema nor a markDef key in the block. The mark is kept in the value but does not render. If it is a decorator, add it to the schema.`), []);
     }), children = props.children;
     for (const mark_1 of decorators) {
       const decoratorSchemaType = subSchema.decorators.find((dec) => dec.name === mark_1);
@@ -5942,7 +5942,7 @@ function RenderSpan(props) {
     }
     for (const annotationMarkDef of annotationMarkDefs) {
       const annotationSchemaType = subSchema.annotations.find((t) => t.name === annotationMarkDef._type);
-      annotationSchemaType && (block && props.renderAnnotation ? children = /* @__PURE__ */ jsx("span", { ref: spanRef, children: /* @__PURE__ */ jsx(RenderAnnotation, { renderAnnotation: props.renderAnnotation, block, editorElementRef: spanRef, focused, path: props.path, selected, schemaType: annotationSchemaType, value: annotationMarkDef, children }) }) : children = /* @__PURE__ */ jsx("span", { ref: spanRef, children }));
+      annotationSchemaType || console.warn(`The schema has no annotation type ${annotationMarkDef._type}. The annotation is kept in the value but does not render. Add ${annotationMarkDef._type} to the schema to render it.`), annotationSchemaType && (block && props.renderAnnotation ? children = /* @__PURE__ */ jsx("span", { ref: spanRef, children: /* @__PURE__ */ jsx(RenderAnnotation, { renderAnnotation: props.renderAnnotation, block, editorElementRef: spanRef, focused, path: props.path, selected, schemaType: annotationSchemaType, value: annotationMarkDef, children }) }) : children = /* @__PURE__ */ jsx("span", { ref: spanRef, children }));
     }
     $[8] = block, $[9] = focused, $[10] = props.children, $[11] = props.leaf.marks, $[12] = props.path, $[13] = props.renderAnnotation, $[14] = props.renderDecorator, $[15] = selected, $[16] = subSchema.annotations, $[17] = subSchema.decorators, $[18] = annotationMarkDefs, $[19] = children;
   } else
@@ -9051,51 +9051,17 @@ const normalizeNode = (editor, entry) => {
   if (isSpan({
     schema: editor.snapshot.context.schema
   }, node)) {
-    const blockPath = parentPath(path2);
-    if (!getTextBlock(editor.snapshot, blockPath))
+    const blockPath = parentPath(path2), blockEntry = getTextBlock(editor.snapshot, blockPath);
+    if (!blockEntry)
       return;
-    const decorators = getPathSubSchema(editor.snapshot, path2).decorators.map((decorator) => decorator.name), annotations = node.marks?.filter((mark) => !decorators.includes(mark));
+    const annotations = node.marks?.filter((mark) => blockEntry.node.markDefs?.some((markDef) => markDef._key === mark));
     if (node.text === "" && annotations && annotations.length > 0) {
       debug.normalization("removing annotations from empty span node"), setNodeProperties(editor, {
-        marks: node.marks?.filter((mark) => decorators.includes(mark))
+        marks: node.marks?.filter((mark) => !annotations.includes(mark))
       }, path2);
       return;
     }
   }
-  if (isTextBlock({
-    schema: editor.snapshot.context.schema
-  }, node)) {
-    const decorators = getPathSubSchema(editor.snapshot, path2).decorators.map((decorator) => decorator.name);
-    for (const {
-      node: child,
-      path: childPath
-    } of getChildren(editor.snapshot, path2))
-      if (isSpan({
-        schema: editor.snapshot.context.schema
-      }, child)) {
-        const marks = child.marks ?? [], orphanedAnnotations = marks.filter((mark) => !decorators.includes(mark) && !node.markDefs?.find((def) => def._key === mark));
-        if (orphanedAnnotations.length > 0) {
-          debug.normalization("removing orphaned annotations from span node"), setNodeProperties(editor, {
-            marks: marks.filter((mark) => !orphanedAnnotations.includes(mark))
-          }, childPath);
-          return;
-        }
-      }
-  }
-  if (isSpan({
-    schema: editor.snapshot.context.schema
-  }, node)) {
-    const blockPath = parentPath(path2), blockEntry2 = getTextBlock(editor.snapshot, blockPath);
-    if (blockEntry2) {
-      const block = blockEntry2.node, decorators = getPathSubSchema(editor.snapshot, path2).decorators.map((decorator) => decorator.name), marks = node.marks ?? [], orphanedAnnotations = marks.filter((mark) => !decorators.includes(mark) && !block.markDefs?.find((def) => def._key === mark));
-      if (orphanedAnnotations.length > 0) {
-        debug.normalization("removing orphaned annotations from span node"), setNodeProperties(editor, {
-          marks: marks.filter((mark) => !orphanedAnnotations.includes(mark))
-        }, path2);
-        return;
-      }
-    }
-  }
   if (isTextBlock({
     schema: editor.snapshot.context.schema
   }, node)) {
@@ -18094,32 +18060,6 @@ function validateValue(value, types, keyGenerator) {
             }
           }, !0;
       }
-      const orphanedMarks = allUsedMarks.filter((mark) => !types.decorators.map((dec) => dec.name).includes(mark)).filter((mark) => textBlock.markDefs === void 0 || !textBlock.markDefs.find((def) => def._key === mark));
-      if (orphanedMarks.length > 0) {
-        const spanChildren = textBlock.children.filter((cld) => cld._type === types.span.name && Array.isArray(cld.marks) && cld.marks.some((mark) => orphanedMarks.includes(mark)));
-        if (spanChildren) {
-          const orphaned = orphanedMarks.join(", ");
-          return resolution = {
-            autoResolve: !0,
-            patches: spanChildren.map((child) => set((child.marks || []).filter((cMrk) => !orphanedMarks.includes(cMrk)), [{
-              _key: blk._key
-            }, "children", {
-              _key: child._key
-            }, "marks"])),
-            description: `Block with _key '${blk._key}' contains marks (${orphaned}) not supported by the current content model.`,
-            action: "Remove invalid marks",
-            item: blk,
-            i18n: {
-              description: "inputs.portable-text.invalid-value.orphaned-marks.description",
-              action: "inputs.portable-text.invalid-value.orphaned-marks.action",
-              values: {
-                key: blk._key,
-                orphanedMarks: orphanedMarks.map((m) => m.toString())
-              }
-            }
-          }, !0;
-        }
-      }
       textBlock.children.some((child, cIndex) => {
         if (typeof child != "object" || child === null)
           return resolution = {