@makeswift/runtime 0.7.12 → 0.7.14

package/dist/index.cjs6.js

@@ -37,22 +37,22 @@ var slateReact = require("slate-react");
 var css = require("@emotion/css");
 var boxModels = require("./box-models.cjs.js");
 var richText = require("./rich-text.cjs.js");
-var typography = require("./typography.cjs.js");
+var leaf = require("./leaf.cjs.js");
+var next = require("./index.cjs.js");
 var jsxRuntime = require("react/jsx-runtime");
+var index = require("./index.cjs3.js");
+var isHotkey = require("is-hotkey");
 require("use-sync-external-store/shim");
-var next = require("./index.cjs.js");
 require("@emotion/serialize");
 require("@emotion/utils");
-var index = require("./index.cjs3.js");
-var compare = require("./compare.cjs.js");
-var isHotkey = require("is-hotkey");
 require("css-box-model");
 require("./actions.cjs.js");
+require("./introspection.cjs.js");
+require("use-sync-external-store/shim/with-selector");
+require("next/dynamic");
 require("./constants.cjs.js");
 require("redux");
 require("redux-thunk");
-require("use-sync-external-store/shim/with-selector");
-require("next/dynamic");
 require("./text-input.cjs.js");
 require("./combobox.cjs.js");
 require("./types.cjs.js");
@@ -74,23 +74,6 @@ function _interopDefaultLegacy(e) {
   return e && typeof e === "object" && "default" in e ? e : { "default": e };
 }
 var isHotkey__default = /* @__PURE__ */ _interopDefaultLegacy(isHotkey);
-function Leaf(_a) {
-  var _b = _a, {
-    leaf
-  } = _b, props = __objRest(_b, [
-    "leaf"
-  ]);
-  switch (leaf.type) {
-    case richText.TextType.Typography:
-      return /* @__PURE__ */ jsxRuntime.jsx(typography.TypographyLeaf, __spreadValues({
-        leaf
-      }, props));
-    default:
-      return /* @__PURE__ */ jsxRuntime.jsx("span", __spreadProps(__spreadValues({}, props.attributes), {
-        children: props.children
-      }));
-  }
-}
 function BlockElement({
   element,
   attributes,
@@ -175,10 +158,10 @@ function BlockElement({
       }));
   }
 }
-function StyledLink(_c) {
-  var _d = _c, {
+function StyledLink(_a) {
+  var _b = _a, {
     className
-  } = _d, restOfProps = __objRest(_d, [
+  } = _b, restOfProps = __objRest(_b, [
     "className"
   ]);
   return /* @__PURE__ */ jsxRuntime.jsx(index.Link, __spreadProps(__spreadValues({}, restOfProps), {
@@ -212,10 +195,10 @@ function InlineElement({
       }));
   }
 }
-function Element(_e) {
-  var _f = _e, {
+function Element(_c) {
+  var _d = _c, {
     element
-  } = _f, props = __objRest(_f, [
+  } = _d, props = __objRest(_d, [
     "element"
   ]);
   switch (element.type) {
@@ -251,7 +234,7 @@ function useSyncWithBuilder(editor, text) {
     if (shouldCommit && text) {
       const nextValue = richText.richTextDTOtoDAO(text);
       const nextSelection = richText.richTextDTOtoSelection(text);
-      if (!compare.compareRichTextDAO(editor.children, nextValue) || !compare.compareRichTextSelection(editor.selection, nextSelection)) {
+      if (!next.deepEqual(editor.children, nextValue) || !next.deepEqual(editor.selection, nextSelection)) {
         editor.children = nextValue;
         editor.selection = nextSelection;
         editor.onChange();
@@ -270,15 +253,17 @@ function useSyncWithBuilder(editor, text) {
   }, [shouldCommit]);
   return React.useCallback(() => setShouldCommit(false), []);
 }
+const LIST_ITEM_CHILD_POSITION = 0;
+const LIST_ITEM_LIST_POSITION = 1;
 const ElementUtils = {
-  isConvertibleToListTextNode(node) {
-    return !this.isList(node) && !this.isListItem(node) && !this.isListItemChild(node) && !this.isText(node) && !this.isTypography(node);
+  isBlock(node) {
+    return slate.Element.isElement(node) && (slate.Element.isElementType(node, richText.BlockType.Paragraph) || slate.Element.isElementType(node, richText.BlockType.Heading1) || slate.Element.isElementType(node, richText.BlockType.Heading2) || slate.Element.isElementType(node, richText.BlockType.Heading3) || slate.Element.isElementType(node, richText.BlockType.Heading3) || slate.Element.isElementType(node, richText.BlockType.Heading4) || slate.Element.isElementType(node, richText.BlockType.Heading5) || slate.Element.isElementType(node, richText.BlockType.Heading6) || slate.Element.isElementType(node, richText.BlockType.BlockQuote) || slate.Element.isElementType(node, richText.BlockType.UnorderedList) || slate.Element.isElementType(node, richText.BlockType.OrderedList) || slate.Element.isElementType(node, richText.BlockType.ListItem) || slate.Element.isElementType(node, richText.BlockType.ListItemChild));
   },
-  isText(node) {
-    return slate.Element.isElementType(node, richText.TextType.Text) || slate.Text.isText(node);
+  isInline(node) {
+    return slate.Element.isElement(node) && (slate.Element.isElementType(node, richText.InlineType.Link) || slate.Element.isElementType(node, richText.InlineType.Link) || slate.Element.isElementType(node, richText.InlineType.SubScript) || slate.Element.isElementType(node, richText.InlineType.SuperScript));
   },
-  isTypography(node) {
-    return slate.Element.isElementType(node, richText.TextType.Typography);
+  isConvertibleToListTextNode(node) {
+    return !this.isList(node) && !this.isListItem(node) && !this.isListItemChild(node);
   },
   isParagraph(node) {
     return slate.Element.isElementType(node, richText.BlockType.Paragraph);
@@ -293,7 +278,7 @@ const ElementUtils = {
     return slate.Element.isElementType(node, richText.BlockType.ListItemChild);
   },
   createText() {
-    return { text: "", type: richText.TextType.Text };
+    return { text: "" };
   },
   createParagraph() {
     return {
@@ -317,36 +302,6 @@ const ElementUtils = {
     };
   }
 };
-function wrapList(editor, options = { type: richText.BlockType.UnorderedList }) {
-  if (!editor.selection)
-    return;
-  const nonListEntries = Array.from(slate.Editor.nodes(editor, {
-    at: editor.selection,
-    match: (node) => {
-      return slate.Element.isElement(node) && ElementUtils.isConvertibleToListTextNode(node);
-    }
-  }));
-  const refs = nonListEntries.map(([_, path]) => slate.Editor.pathRef(editor, path));
-  refs.forEach((ref) => {
-    const path = ref.current;
-    if (path) {
-      slate.Editor.withoutNormalizing(editor, () => {
-        slate.Transforms.setNodes(editor, { type: richText.BlockType.ListItemChild }, {
-          at: path
-        });
-        slate.Transforms.wrapNodes(editor, ElementUtils.createListItem(), {
-          at: path
-        });
-        slate.Transforms.wrapNodes(editor, ElementUtils.createList(options.type), {
-          at: path
-        });
-      });
-    }
-    ref.unref();
-  });
-}
-const LIST_ITEM_CHILD_POSITION = 0;
-const LIST_ITEM_LIST_POSITION = 1;
 const EditorUtils = {
   getFirstAncestorList(editor, path) {
     const parentList = slate.Editor.above(editor, {
@@ -389,58 +344,6 @@ function getSelectedListItems(editor) {
   const firstAncestorPath = (_b = (_a = EditorUtils.getFirstAncestorListItem(editor, start)) == null ? void 0 : _a[1]) != null ? _b : [];
   return Array.from(listItems).filter((node) => slate.Path.isDescendant(start, node[1]) ? slate.Path.equals(node[1], firstAncestorPath) : !slate.Path.isAfter(start, node[1]));
 }
-function unwrapPath(editor, listItemPath) {
-  const parentList = EditorUtils.getFirstAncestorList(editor, listItemPath);
-  const listItemContainingParentList = EditorUtils.getFirstAncestorListItem(editor, listItemPath);
-  if (!parentList || listItemContainingParentList)
-    return;
-  slate.Editor.withoutNormalizing(editor, () => {
-    const listItemTextPath = [...listItemPath, LIST_ITEM_CHILD_POSITION];
-    const listItemNestedListPath = [...listItemPath, LIST_ITEM_LIST_POSITION];
-    if (slate.Node.has(editor, listItemNestedListPath)) {
-      slate.Transforms.setNodes(editor, { type: parentList[0].type }, { at: listItemNestedListPath });
-      slate.Transforms.liftNodes(editor, { at: listItemNestedListPath });
-      slate.Transforms.liftNodes(editor, { at: slate.Path.next(listItemPath) });
-    }
-    if (slate.Node.has(editor, listItemTextPath)) {
-      slate.Transforms.setNodes(editor, { type: richText.BlockType.Paragraph }, {
-        at: listItemTextPath
-      });
-      slate.Transforms.liftNodes(editor, { at: listItemTextPath });
-      slate.Transforms.liftNodes(editor, { at: listItemPath });
-    }
-  });
-}
-function unwrapList(editor) {
-  if (!editor.selection)
-    return;
-  const listItems = getSelectedListItems(editor);
-  const subRoots = filterForSubtreeRoots(listItems);
-  const refs = subRoots.map(([_, path]) => slate.Editor.pathRef(editor, path));
-  refs.forEach((ref) => {
-    if (ref.current) {
-      unwrapPath(editor, ref.current);
-    }
-    ref.unref();
-  });
-}
-function toggleList(editor, options = { type: richText.BlockType.UnorderedList }) {
-  if (!editor.selection)
-    return;
-  const start = LocationUtils.getStartPath(editor.selection);
-  const ancestorPath = slate.Path.ancestors(start).at(1);
-  if (!ancestorPath || !slate.Node.has(editor, ancestorPath))
-    return;
-  const ancestor = slate.Node.get(editor, ancestorPath);
-  if (!ElementUtils.isList(ancestor)) {
-    return wrapList(editor, { type: options.type });
-  }
-  if (ancestor.type === options.type) {
-    unwrapList(editor);
-  } else {
-    slate.Transforms.setNodes(editor, { type: options.type }, { at: ancestorPath });
-  }
-}
 function indentPath(editor, path) {
   const parent = slate.Node.parent(editor, path);
   if (!path || !slate.Path.hasPrevious(path) || !ElementUtils.isList(parent))
@@ -514,6 +417,86 @@ function dedent(editor) {
     ref.unref();
   });
 }
+function unwrapPath(editor, listItemPath) {
+  const parentList = EditorUtils.getFirstAncestorList(editor, listItemPath);
+  const listItemContainingParentList = EditorUtils.getFirstAncestorListItem(editor, listItemPath);
+  if (!parentList || listItemContainingParentList)
+    return;
+  slate.Editor.withoutNormalizing(editor, () => {
+    const listItemTextPath = [...listItemPath, LIST_ITEM_CHILD_POSITION];
+    const listItemNestedListPath = [...listItemPath, LIST_ITEM_LIST_POSITION];
+    if (slate.Node.has(editor, listItemNestedListPath)) {
+      slate.Transforms.setNodes(editor, { type: parentList[0].type }, { at: listItemNestedListPath });
+      slate.Transforms.liftNodes(editor, { at: listItemNestedListPath });
+      slate.Transforms.liftNodes(editor, { at: slate.Path.next(listItemPath) });
+    }
+    if (slate.Node.has(editor, listItemTextPath)) {
+      slate.Transforms.setNodes(editor, { type: richText.BlockType.Paragraph }, {
+        at: listItemTextPath
+      });
+      slate.Transforms.liftNodes(editor, { at: listItemTextPath });
+      slate.Transforms.liftNodes(editor, { at: listItemPath });
+    }
+  });
+}
+function unwrapList(editor) {
+  if (!editor.selection)
+    return;
+  const listItems = getSelectedListItems(editor);
+  const subRoots = filterForSubtreeRoots(listItems);
+  const refs = subRoots.map(([_, path]) => slate.Editor.pathRef(editor, path));
+  refs.forEach((ref) => {
+    if (ref.current) {
+      unwrapPath(editor, ref.current);
+    }
+    ref.unref();
+  });
+}
+function wrapList(editor, options = { type: richText.BlockType.UnorderedList }) {
+  if (!editor.selection)
+    return;
+  const nonListEntries = Array.from(slate.Editor.nodes(editor, {
+    at: editor.selection,
+    match: (node) => {
+      return slate.Element.isElement(node) && ElementUtils.isConvertibleToListTextNode(node);
+    }
+  }));
+  const refs = nonListEntries.map(([_, path]) => slate.Editor.pathRef(editor, path));
+  refs.forEach((ref) => {
+    const path = ref.current;
+    if (path) {
+      slate.Editor.withoutNormalizing(editor, () => {
+        slate.Transforms.setNodes(editor, { type: richText.BlockType.ListItemChild }, {
+          at: path
+        });
+        slate.Transforms.wrapNodes(editor, ElementUtils.createListItem(), {
+          at: path
+        });
+        slate.Transforms.wrapNodes(editor, ElementUtils.createList(options.type), {
+          at: path
+        });
+      });
+    }
+    ref.unref();
+  });
+}
+function toggleList(editor, options = { type: richText.BlockType.UnorderedList }) {
+  if (!editor.selection)
+    return;
+  const start = LocationUtils.getStartPath(editor.selection);
+  const ancestorPath = slate.Path.ancestors(start).at(1);
+  if (!ancestorPath || !slate.Node.has(editor, ancestorPath))
+    return;
+  const ancestor = slate.Node.get(editor, ancestorPath);
+  if (!ElementUtils.isList(ancestor)) {
+    return wrapList(editor, { type: options.type });
+  }
+  if (ancestor.type === options.type) {
+    unwrapList(editor);
+  } else {
+    slate.Transforms.setNodes(editor, { type: options.type }, { at: ancestorPath });
+  }
+}
 const List = {
   unwrapList,
   wrapList,
@@ -580,6 +563,7 @@ function onKeyDown(e, editor) {
   }
 }
 function withList(editor) {
+  const { normalizeNode } = editor;
   editor.normalizeNode = (entry) => {
     const [normalizationNode, normalizationPath] = entry;
     if (ElementUtils.isListItem(normalizationNode)) {
@@ -599,18 +583,10 @@ function withList(editor) {
         return;
       }
     }
-    if (ElementUtils.isList(normalizationNode)) {
-      Array.from(slate.Node.children(editor, normalizationPath)).forEach(([node, path]) => {
-        if (ElementUtils.isText(node)) {
-          slate.Transforms.removeNodes(editor, { at: path });
-          return;
-        }
-      });
-    }
-    if (!ElementUtils.isText(normalizationNode) && !ElementUtils.isTypography(normalizationNode)) {
+    if (!slate.Text.isText(normalizationNode)) {
       const mergeableChildren = Array.from(slate.Node.children(editor, normalizationPath)).map((child, index2, children) => {
         const potentialNodeToBeMerged = children.at(index2 + 1);
-        if (!potentialNodeToBeMerged || !ElementUtils.isList(potentialNodeToBeMerged[0]) || potentialNodeToBeMerged[0].type !== child[0].type) {
+        if (!potentialNodeToBeMerged || !ElementUtils.isList(potentialNodeToBeMerged[0]) || !ElementUtils.isList(child[0]) || potentialNodeToBeMerged[0].type !== child[0].type) {
           return null;
         }
         return [
@@ -641,13 +617,39 @@ function withList(editor) {
         return;
       }
     }
+    normalizeNode(entry);
+  };
+  return editor;
+}
+function withTypography(editor) {
+  const { normalizeNode } = editor;
+  editor.normalizeNode = (entry) => {
+    var _a, _b;
+    const [normalizationNode, normalizationPath] = entry;
+    if (slate.Text.isText(normalizationNode) && ((_a = normalizationNode == null ? void 0 : normalizationNode.typography) == null ? void 0 : _a.id) == null && ((_b = normalizationNode == null ? void 0 : normalizationNode.typography) == null ? void 0 : _b.style.length) === 0) {
+      slate.Transforms.unsetNodes(editor, "typography", { at: normalizationPath });
+      return;
+    }
+    normalizeNode(entry);
+  };
+  return editor;
+}
+function withBlock(editor) {
+  const { normalizeNode } = editor;
+  editor.normalizeNode = (entry) => {
+    var _a;
+    const [normalizationNode, normalizationPath] = entry;
+    if (ElementUtils.isBlock(normalizationNode) && ((_a = normalizationNode == null ? void 0 : normalizationNode.textAlign) == null ? void 0 : _a.length) == 0) {
+      slate.Transforms.unsetNodes(editor, "textAlign", { at: normalizationPath });
+      return;
+    }
+    normalizeNode(entry);
   };
   return editor;
 }
 const defaultText = [{
   type: richText.BlockType.Paragraph,
   children: [{
-    type: richText.TextType.Text,
     text: ""
   }]
 }];
@@ -657,11 +659,20 @@ const EditableText = React.forwardRef(function EditableText2({
   width,
   margin
 }, ref) {
-  const [editor] = React.useState(() => withList(slateReact.withReact(slate.createEditor())));
+  const [editor] = React.useState(() => withBlock(withTypography(withList(slateReact.withReact(slate.createEditor())))));
   const delaySync = useSyncWithBuilder(editor, text);
   const editMode = next.useBuilderEditMode();
   const [propControllers, setPropControllers] = React.useState(null);
   const controller = propControllers == null ? void 0 : propControllers.text;
+  React.useEffect(() => {
+    if (controller == null)
+      return;
+    const element = slateReact.ReactEditor.toDOMNode(editor, editor);
+    return next.pollBoxModel({
+      element,
+      onBoxModelChange: (boxModel) => controller.changeBoxModel(boxModel)
+    });
+  }, [editor, controller]);
   React.useImperativeHandle(ref, () => ({
     getDomNode() {
       return slateReact.ReactEditor.toDOMNode(editor, editor);
@@ -693,12 +704,13 @@ const EditableText = React.forwardRef(function EditableText2({
     onChange: delaySync,
     children: /* @__PURE__ */ jsxRuntime.jsx(slateReact.Editable, {
       id,
-      renderLeaf: Leaf,
+      renderLeaf: leaf.Leaf,
       renderElement: Element,
       onKeyDown: handleKeyDown,
       onFocus: handleFocus,
       className: css.cx(width, margin),
-      readOnly: editMode === richText.BuilderEditMode.INTERACT
+      readOnly: editMode === richText.BuilderEditMode.INTERACT,
+      placeholder: "Write some text..."
     })
   });
 });