@makeswift/runtime 0.8.6 → 0.8.7

package/dist/index.es5.js

@@ -25,11 +25,14 @@ import { findBreakpointOverride } from "./state/breakpoints.es.js";
 const LIST_ITEM_CHILD_POSITION = 0;
 const LIST_ITEM_LIST_POSITION = 1;
 const ElementUtils = {
+  isRootBlock(node) {
+    return Element.isElement(node) && (Element.isElementType(node, BlockType.Paragraph) || Element.isElementType(node, BlockType.Heading1) || Element.isElementType(node, BlockType.Heading2) || Element.isElementType(node, BlockType.Heading3) || Element.isElementType(node, BlockType.Heading3) || Element.isElementType(node, BlockType.Heading4) || Element.isElementType(node, BlockType.Heading5) || Element.isElementType(node, BlockType.Heading6) || Element.isElementType(node, BlockType.BlockQuote) || Element.isElementType(node, BlockType.UnorderedList) || Element.isElementType(node, BlockType.OrderedList));
+  },
   isBlock(node) {
-    return Element.isElement(node) && (Element.isElementType(node, BlockType.Paragraph) || Element.isElementType(node, BlockType.Heading1) || Element.isElementType(node, BlockType.Heading2) || Element.isElementType(node, BlockType.Heading3) || Element.isElementType(node, BlockType.Heading3) || Element.isElementType(node, BlockType.Heading4) || Element.isElementType(node, BlockType.Heading5) || Element.isElementType(node, BlockType.Heading6) || Element.isElementType(node, BlockType.BlockQuote) || Element.isElementType(node, BlockType.UnorderedList) || Element.isElementType(node, BlockType.OrderedList) || Element.isElementType(node, BlockType.ListItem) || Element.isElementType(node, BlockType.ListItemChild));
+    return Element.isElement(node) && (this.isRootBlock(node) || Element.isElementType(node, BlockType.ListItem) || Element.isElementType(node, BlockType.ListItemChild));
   },
   isInline(node) {
-    return Element.isElement(node) && (Element.isElementType(node, InlineType.Link) || Element.isElementType(node, InlineType.Link) || Element.isElementType(node, InlineType.SubScript) || Element.isElementType(node, InlineType.SuperScript));
+    return Element.isElementType(node, InlineType.Code) || Element.isElementType(node, InlineType.Link) || Element.isElementType(node, InlineType.SubScript) || Element.isElementType(node, InlineType.SuperScript);
   },
   isConvertibleToListTextNode(node) {
     return !this.isList(node) && !this.isListItem(node) && !this.isListItemChild(node);
@@ -60,7 +63,7 @@ const ElementUtils = {
   },
   createListItem() {
     return {
-      children: [this.createText()],
+      children: [this.createListItemChild()],
       type: BlockType.ListItem
     };
   },
@@ -73,18 +76,26 @@ const ElementUtils = {
 };
 const EditorUtils = {
   getFirstAncestorList(editor, path) {
-    const parentList = Editor.above(editor, {
-      at: path,
-      match: (node) => ElementUtils.isList(node)
-    });
-    return parentList != null ? parentList : null;
+    try {
+      const parentList = Editor.above(editor, {
+        at: path,
+        match: (node) => ElementUtils.isList(node)
+      });
+      return parentList != null ? parentList : null;
+    } catch (e) {
+      return null;
+    }
   },
   getFirstAncestorListItem(editor, path) {
-    const parentListItem = Editor.above(editor, {
-      at: path,
-      match: (node) => ElementUtils.isListItem(node)
-    });
-    return parentListItem != null ? parentListItem : null;
+    try {
+      const parentListItem = Editor.above(editor, {
+        at: path,
+        match: (node) => ElementUtils.isListItem(node)
+      });
+      return parentListItem != null ? parentListItem : null;
+    } catch (e) {
+      return null;
+    }
   }
 };
 function filterForSubtreeRoots(entries) {
@@ -208,10 +219,17 @@ function unwrapPath(editor, listItemPath) {
     }
   });
 }
-function unwrapList(editor) {
-  if (!editor.selection)
+function unwrapList(editor, options) {
+  var _a;
+  const at = (_a = options == null ? void 0 : options.at) != null ? _a : editor.selection;
+  if (!at)
     return;
-  const listItems = getSelectedListItems(editor);
+  const listItems = Array.from(Editor.nodes(editor, {
+    at,
+    match: (node) => {
+      return Element.isElement(node) && ElementUtils.isListItem(node);
+    }
+  }));
   const subRoots = filterForSubtreeRoots(listItems);
   const refs = subRoots.map(([_, path]) => Editor.pathRef(editor, path));
   refs.forEach((ref) => {
@@ -222,10 +240,12 @@ function unwrapList(editor) {
   });
 }
 function wrapList(editor, options = { type: BlockType.UnorderedList }) {
-  if (!editor.selection)
+  var _a;
+  const at = (_a = options.at) != null ? _a : editor.selection;
+  if (!at)
     return;
   const nonListEntries = Array.from(Editor.nodes(editor, {
-    at: editor.selection,
+    at,
     match: (node) => {
       return Element.isElement(node) && ElementUtils.isConvertibleToListTextNode(node);
     }
@@ -239,6 +259,7 @@ function wrapList(editor, options = { type: BlockType.UnorderedList }) {
           at: path
         });
         Transforms.wrapNodes(editor, ElementUtils.createListItem(), {
+          match: (node) => ElementUtils.isListItemChild(node),
           at: path
         });
         Transforms.wrapNodes(editor, ElementUtils.createList(options.type), {
@@ -250,18 +271,20 @@ function wrapList(editor, options = { type: BlockType.UnorderedList }) {
   });
 }
 function toggleList(editor, options = { type: BlockType.UnorderedList }) {
-  if (!editor.selection)
+  var _a;
+  const at = (_a = options.at) != null ? _a : editor.selection;
+  if (at == null)
     return;
-  const start = LocationUtils.getStartPath(editor.selection);
+  const start = LocationUtils.getStartPath(at);
   const ancestorPath = Path.ancestors(start).at(1);
   if (!ancestorPath || !Node.has(editor, ancestorPath))
     return;
   const ancestor = Node.get(editor, ancestorPath);
   if (!ElementUtils.isList(ancestor)) {
-    return wrapList(editor, { type: options.type });
+    return wrapList(editor, { type: options.type, at });
   }
   if (ancestor.type === options.type) {
-    unwrapList(editor);
+    unwrapList(editor, { at });
   } else {
     Transforms.setNodes(editor, { type: options.type }, { at: ancestorPath });
   }
@@ -372,10 +395,10 @@ function withList(editor) {
           const nodeChildren = Array.from(Node.children(editor, nodePath));
           const childrenToBeMerged = Array.from(Node.children(editor, nodeToBeMergedPath));
           Editor.withoutNormalizing(editor, () => {
-            childrenToBeMerged.forEach(([_, childPath], index) => {
+            childrenToBeMerged.reverse().forEach(([_, childPath]) => {
               Transforms.moveNodes(editor, {
                 at: childPath,
-                to: [...nodePath, nodeChildren.length + index]
+                to: [...nodePath, nodeChildren.length]
               });
             });
             Transforms.removeNodes(editor, { at: nodeToBeMergedPath });
@@ -390,94 +413,168 @@ function withList(editor) {
   };
   return editor;
 }
-function clearActiveTypographyStyle(editor) {
-  if (!editor.selection)
-    return;
-  const textNodes = Editor.nodes(editor, {
-    at: editor.selection,
-    match: (node) => Text.isText(node)
-  });
-  for (const [node, path] of textNodes) {
-    if (Text.isText(node)) {
-      const typography = __spreadProps(__spreadValues({}, node.typography), {
-        style: []
-      });
+function clearActiveTypographyStyle(editor, options) {
+  Editor.withoutNormalizing(editor, () => {
+    var _a;
+    const at = (_a = options == null ? void 0 : options.at) != null ? _a : editor.selection;
+    if (!at)
+      return;
+    const atRef = Editor.rangeRef(editor, at);
+    if (atRef.current) {
       Transforms.setNodes(editor, {
-        typography
-      }, { at: path });
+        slice: true
+      }, {
+        at: atRef.current,
+        match: (node) => Text.isText(node),
+        split: Range.isExpanded(atRef.current)
+      });
     }
-  }
-}
-function clearDeviceActiveTypography(editor, currentDeviceId) {
-  var _a, _b;
-  if (!editor.selection)
-    return;
-  const textNodes = Editor.nodes(editor, {
-    at: editor.selection,
-    match: (node) => Text.isText(node)
+    if (atRef.current) {
+      const textNodes = Array.from(Editor.nodes(editor, {
+        at: atRef.current,
+        match: (node) => Text.isText(node) && node.slice === true
+      }));
+      for (const [node, path] of textNodes) {
+        if (Text.isText(node)) {
+          const typography = __spreadProps(__spreadValues({}, node.typography), {
+            style: []
+          });
+          Transforms.setNodes(editor, {
+            typography
+          }, { at: path });
+        }
+      }
+    }
+    atRef.unref();
   });
-  for (const [node, path] of textNodes) {
-    if (Text.isText(node)) {
-      const typography = __spreadProps(__spreadValues({}, node.typography), {
-        style: (_b = (_a = node == null ? void 0 : node.typography) == null ? void 0 : _a.style.filter(({ deviceId }) => deviceId !== currentDeviceId)) != null ? _b : []
-      });
+}
+function clearDeviceActiveTypography(editor, currentDeviceId, options) {
+  Editor.withoutNormalizing(editor, () => {
+    var _a, _b, _c;
+    const at = (_a = options == null ? void 0 : options.at) != null ? _a : editor.selection;
+    if (!at)
+      return;
+    const atRef = Editor.rangeRef(editor, at);
+    if (atRef.current) {
       Transforms.setNodes(editor, {
-        typography
-      }, { at: path });
+        slice: true
+      }, {
+        at: atRef.current,
+        match: (node) => Text.isText(node),
+        split: Range.isExpanded(atRef.current)
+      });
     }
-  }
+    if (atRef.current) {
+      const textNodes = Array.from(Editor.nodes(editor, {
+        at: atRef.current,
+        match: (node) => Text.isText(node) && node.slice === true
+      }));
+      for (const [node, path] of textNodes) {
+        if (Text.isText(node)) {
+          const typography = __spreadProps(__spreadValues({}, node.typography), {
+            style: (_c = (_b = node == null ? void 0 : node.typography) == null ? void 0 : _b.style.filter(({ deviceId }) => deviceId !== currentDeviceId)) != null ? _c : []
+          });
+          Transforms.setNodes(editor, {
+            typography
+          }, { at: path });
+        }
+      }
+    }
+    atRef.unref();
+  });
 }
-function detachActiveTypography(editor, value) {
-  if (!editor.selection)
-    return;
-  const textNodes = Array.from(Editor.nodes(editor, {
-    at: editor.selection,
-    match: (node) => Text.isText(node)
-  }));
-  textNodes.forEach(([node, path]) => {
-    if (Text.isText(node)) {
+function detachActiveTypography(editor, value, options) {
+  Editor.withoutNormalizing(editor, () => {
+    var _a;
+    const at = (_a = options == null ? void 0 : options.at) != null ? _a : editor.selection;
+    if (!at)
+      return;
+    const atRef = Editor.rangeRef(editor, at);
+    if (atRef.current) {
       Transforms.setNodes(editor, {
-        typography: {
-          style: value
+        slice: true
+      }, {
+        at: atRef.current,
+        match: (node) => Text.isText(node),
+        split: Range.isExpanded(atRef.current)
+      });
+    }
+    if (atRef.current) {
+      const textNodes = Array.from(Editor.nodes(editor, {
+        at: atRef.current,
+        match: (node) => Text.isText(node) && node.slice === true
+      }));
+      for (const [node, path] of textNodes) {
+        if (Text.isText(node)) {
+          Transforms.setNodes(editor, {
+            typography: {
+              style: value
+            }
+          }, { at: path });
         }
-      }, { at: path });
+      }
     }
+    atRef.unref();
   });
 }
-function setActiveTypographyId(editor, id) {
+function setActiveTypographyId(editor, id, options) {
+  var _a;
+  const at = (_a = options == null ? void 0 : options.at) != null ? _a : editor.selection;
+  if (!at)
+    return;
   Transforms.setNodes(editor, {
     typography: {
       id,
       style: []
     }
   }, {
-    match: (node) => Text.isText(node)
+    at,
+    match: (node) => Text.isText(node),
+    split: Range.isExpanded(at)
   });
 }
-function setActiveTypographyStyle(editor, breakpoints, deviceId, prop, value) {
-  var _a, _b;
-  if (!editor.selection)
-    return;
-  const textNodes = Editor.nodes(editor, {
-    at: editor.selection,
-    match: (node) => Text.isText(node)
-  });
-  for (const [node, path] of textNodes) {
-    if (Text.isText(node)) {
-      const deviceOverrides = (_b = (_a = node == null ? void 0 : node.typography) == null ? void 0 : _a.style) != null ? _b : [];
-      const deviceStyle = findBreakpointOverride(breakpoints, deviceOverrides, deviceId, (v) => v) || { value: {} };
-      const nextDeviceStyle = {
-        deviceId,
-        value: __spreadProps(__spreadValues({}, deviceStyle.value), { [prop]: value })
-      };
-      const nextTypography = __spreadProps(__spreadValues({}, node.typography), {
-        style: [...deviceOverrides.filter((v) => v.deviceId !== deviceId), nextDeviceStyle]
-      });
+function setActiveTypographyStyle(editor, breakpoints, deviceId, prop, value, options) {
+  Editor.withoutNormalizing(editor, () => {
+    var _a, _b, _c;
+    const at = (_a = options == null ? void 0 : options.at) != null ? _a : editor.selection;
+    if (!at)
+      return;
+    const atRef = Editor.rangeRef(editor, at);
+    if (atRef.current) {
       Transforms.setNodes(editor, {
-        typography: nextTypography
-      }, { at: path });
+        slice: true
+      }, {
+        at: atRef.current,
+        match: (node) => Text.isText(node),
+        split: Range.isExpanded(atRef.current)
+      });
     }
-  }
+    if (atRef.current) {
+      const textNodes = Array.from(Editor.nodes(editor, {
+        at: atRef.current,
+        match: (node) => Text.isText(node) && node.slice === true
+      }));
+      for (const [node, path] of textNodes) {
+        if (Text.isText(node)) {
+          const deviceOverrides = (_c = (_b = node == null ? void 0 : node.typography) == null ? void 0 : _b.style) != null ? _c : [];
+          const deviceStyle = findBreakpointOverride(breakpoints, deviceOverrides, deviceId, (v) => v) || {
+            value: {}
+          };
+          const nextDeviceStyle = {
+            deviceId,
+            value: __spreadProps(__spreadValues({}, deviceStyle.value), { [prop]: value })
+          };
+          const nextTypography = __spreadProps(__spreadValues({}, node.typography), {
+            style: [...deviceOverrides.filter((v) => v.deviceId !== deviceId), nextDeviceStyle]
+          });
+          Transforms.setNodes(editor, {
+            typography: nextTypography
+          }, { at: path });
+        }
+      }
+    }
+    atRef.unref();
+  });
 }
 const Typography = {
   setActiveTypographyId,
@@ -495,21 +592,66 @@ function withTypography(editor) {
       Transforms.unsetNodes(editor, "typography", { at: normalizationPath });
       return;
     }
+    if (Text.isText(normalizationNode) && (normalizationNode == null ? void 0 : normalizationNode.slice) != null) {
+      Transforms.unsetNodes(editor, "slice", { at: normalizationPath });
+      return;
+    }
     normalizeNode(entry);
   };
   return editor;
 }
-function setBlockKeyForDevice(editor, breakpoints, deviceId, key, value) {
-  var _a;
-  if (!editor.selection)
-    return;
-  const rootElements = Editor.nodes(editor, {
-    match: (_, path) => path.length === 1,
-    at: Editor.unhangRange(editor, editor.selection)
+function unhangRange(editor, range) {
+  let [start, end] = Range.edges(range);
+  if (start.offset !== 0 || end.offset !== 0 || Range.isCollapsed(range)) {
+    return range;
+  }
+  const endBlock = Editor.above(editor, {
+    at: end,
+    match: (n) => Element.isElement(n) && Editor.isBlock(editor, n)
   });
+  const blockPath = endBlock ? endBlock[1] : [];
+  const first = Editor.start(editor, start);
+  const before = { anchor: first, focus: end };
+  let skip = true;
+  for (const [node, path] of Editor.nodes(editor, {
+    at: before,
+    match: Text.isText,
+    reverse: true
+  })) {
+    if (skip) {
+      skip = false;
+      continue;
+    }
+    if (node.text !== "" || Path.isBefore(path, blockPath)) {
+      end = { path, offset: node.text.length };
+      break;
+    }
+  }
+  return { anchor: start, focus: end };
+}
+function getSelection(editor) {
+  if (editor.selection)
+    return unhangRange(editor, editor.selection);
+  return {
+    anchor: Editor.start(editor, []),
+    focus: Editor.end(editor, [])
+  };
+}
+function getBlocksInSelection(editor) {
+  return Array.from(Editor.nodes(editor, {
+    at: getSelection(editor),
+    match: (node) => ElementUtils.isRootBlock(node)
+  })).filter((entry) => ElementUtils.isRootBlock(entry[0]));
+}
+function setBlockKeyForDevice(editor, breakpoints, deviceId, key, value, options) {
+  var _a, _b;
+  const at = (_a = options == null ? void 0 : options.at) != null ? _a : editor.selection;
+  if (!at)
+    return;
+  const rootElements = getBlocksInSelection(editor);
   for (const [node, path] of rootElements) {
     if (ElementUtils.isBlock(node)) {
-      const deviceValues = (_a = node[key]) != null ? _a : [];
+      const deviceValues = (_b = node[key]) != null ? _b : [];
       const currentDeviceValue = findBreakpointOverride(breakpoints, deviceValues, deviceId, (v) => v);
       const nextDeviceValue = __spreadProps(__spreadValues({}, currentDeviceValue), {
         deviceId,
@@ -523,12 +665,7 @@ function setBlockKeyForDevice(editor, breakpoints, deviceId, key, value) {
 }
 function clearBlockKeyForDevice(editor, deviceId, key) {
   var _a;
-  if (!editor.selection)
-    return;
-  const rootElements = Editor.nodes(editor, {
-    match: (_, path) => path.length === 1,
-    at: Editor.unhangRange(editor, editor.selection)
-  });
+  const rootElements = getBlocksInSelection(editor);
   for (const [node, path] of rootElements) {
     if (ElementUtils.isBlock(node)) {
       const deviceOverrides = (_a = node[key]) != null ? _a : [];
@@ -538,12 +675,29 @@ function clearBlockKeyForDevice(editor, deviceId, key) {
     }
   }
 }
+function wrapInline(editor, inline) {
+  Transforms.wrapNodes(editor, inline, {
+    at: getSelection(editor),
+    split: true
+  });
+}
+function unwrapInline(editor, type) {
+  Transforms.unwrapNodes(editor, {
+    match: (node) => ElementUtils.isInline(node) && node.type === type,
+    at: getSelection(editor)
+  });
+}
 const Block = {
   setBlockKeyForDevice,
-  clearBlockKeyForDevice
+  clearBlockKeyForDevice,
+  wrapInline,
+  unwrapInline
 };
 function withBlock(editor) {
   const { normalizeNode } = editor;
+  editor.isInline = (entry) => {
+    return ElementUtils.isInline(entry);
+  };
   editor.normalizeNode = (entry) => {
     var _a;
     const [normalizationNode, normalizationPath] = entry;