@squiz/formatted-text-editor 1.67.0 → 1.67.1

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Change Log
 
+## 1.67.1
+
+### Patch Changes
+
+- 928cc88: Made children optional for formatted text nodes/tags
+- Updated dependencies [928cc88]
+  - @squiz/dx-json-schema-lib@1.65.1
+
 ## 1.67.0
 
 ### Minor Changes

package/lib/utils/converters/remirrorNodeToSquizNode/remirrorNodeToSquizNode.js

@@ -121,7 +121,9 @@ const transformNode = (node) => {
  * @return {FormattedNode}
  */
 const wrapNodeIfNeeded = (node, wrappingNode, copyFont = true) => {
+    const wrappingNodeChildren = wrappingNode.children || [];
     if (node.type === 'tag' && wrappingNode.type === 'tag' && (node.tag === 'span' || node.tag === wrappingNode.tag)) {
+        const nodeChildren = node.children || [];
         // if the node we are wrapping with is a DOM node, and the node being wrapped is
         // a plain looking DOM node merge the 2 nodes.
         return {
@@ -141,13 +143,13 @@ const wrapNodeIfNeeded = (node, wrappingNode, copyFont = true) => {
                     ...wrappingNode.font,
                 }
                 : {}),
-            children: [...node.children, ...wrappingNode.children],
+            children: [...nodeChildren, ...wrappingNodeChildren],
         };
     }
     // if the node we are wrapping or the wrapping nodes are not compatible merge them.
     return {
         ...wrappingNode,
-        children: [node, ...wrappingNode.children],
+        children: [node, ...wrappingNodeChildren],
     };
 };
 const transformMark = (mark, node) => {

package/lib/utils/converters/squizNodeToRemirrorNode/squizNodeToRemirrorNode.js

@@ -133,7 +133,7 @@ const unwrapNodeIfNeeded = (node) => {
 const formatNode = (node) => {
     const children = [];
     if ('children' in node) {
-        node.children.forEach((child) => {
+        node.children?.forEach((child) => {
             children.push(...formatNode(child));
         });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@squiz/formatted-text-editor",
-  "version": "1.67.0",
+  "version": "1.67.1",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "private": false,
@@ -23,7 +23,7 @@
     "@headlessui/react": "1.7.11",
     "@mui/icons-material": "5.11.16",
     "@remirror/react": "2.0.25",
-    "@squiz/dx-json-schema-lib": "^1.65.0",
+    "@squiz/dx-json-schema-lib": "^1.65.1",
     "@squiz/resource-browser": "^1.66.3",
     "clsx": "1.2.1",
     "react-hook-form": "7.43.2",

package/src/utils/converters/remirrorNodeToSquizNode/remirrorNodeToSquizNode.ts

@@ -13,7 +13,7 @@ type FontOptions = FormattedTextModels.v1.FormattedNodeFontProperties;
 type FormattedText = FormattedTextModels.v1.FormattedText;
 type FormattedNode = FormattedTextModels.v1.FormattedNodes;
 type FormattedNodeFontProperties = FormattedTextModels.v1.FormattedNodeFontProperties;
-type FormattedNodeWithChildren = Extract<FormattedNode, { children: FormattedNode[] }>;
+type FormattedNodeWithChildren = Extract<FormattedNode, { children?: FormattedNode[] }>;
 type RemirrorTextAlignment = Exclude<Remirror.Attributes['nodeTextAlignment'], undefined>;
 type FormattedTextAlignment = FormattingOptions['alignment'];
 
@@ -164,7 +164,11 @@ const wrapNodeIfNeeded = (
   wrappingNode: FormattedNodeWithChildren,
   copyFont: boolean = true,
 ): FormattedNode => {
+  const wrappingNodeChildren = wrappingNode.children || [];
+
   if (node.type === 'tag' && wrappingNode.type === 'tag' && (node.tag === 'span' || node.tag === wrappingNode.tag)) {
+    const nodeChildren = node.children || [];
+
     // if the node we are wrapping with is a DOM node, and the node being wrapped is
     // a plain looking DOM node merge the 2 nodes.
     return {
@@ -186,14 +190,14 @@ const wrapNodeIfNeeded = (
             }
           : {},
       ),
-      children: [...node.children, ...wrappingNode.children],
+      children: [...nodeChildren, ...wrappingNodeChildren],
     };
   }
 
   // if the node we are wrapping or the wrapping nodes are not compatible merge them.
   return {
     ...wrappingNode,
-    children: [node, ...wrappingNode.children],
+    children: [node, ...wrappingNodeChildren],
   };
 };
 

package/src/utils/converters/squizNodeToRemirrorNode/squizNodeToRemirrorNode.ts

@@ -146,7 +146,7 @@ const formatNode = (node: FormattedNodes): RemirrorJSON[] => {
   const children: RemirrorJSON[] = [];
 
   if ('children' in node) {
-    node.children.forEach((child: FormattedNodes) => {
+    node.children?.forEach((child: FormattedNodes) => {
       children.push(...formatNode(child));
     });
   }