@dxos/react-ui-editor 0.4.10-main.ec8b427 → 0.4.10-main.ef6fbc2

package/dist/lib/browser/index.mjs

@@ -2302,255 +2302,261 @@ var List;
   List2[List2["Bullet"] = 1] = "Bullet";
   List2[List2["Task"] = 2] = "Task";
 })(List || (List = {}));
-var setHeading = (level) => ({ state: state2, dispatch }) => {
-  const { selection: { ranges }, doc } = state2;
-  const changes = [];
-  let prevBlock = -1;
-  for (const range of ranges) {
-    let sawBlock = false;
-    syntaxTree(state2).iterate({
-      from: range.from,
-      to: range.to,
-      enter: (node) => {
-        if (!Object.hasOwn(Textblocks, node.name) || prevBlock === node.from) {
-          return;
-        }
-        sawBlock = true;
-        prevBlock = node.from;
-        const blockType = Textblocks[node.name];
-        const isHeading = /heading(\d)/.exec(blockType);
-        const curLevel = isHeading ? +isHeading[1] : node.name === "Paragraph" ? 0 : -1;
-        if (curLevel < 0 || curLevel === level) {
-          return;
-        }
-        if (curLevel === 0) {
-          changes.push({
-            from: node.from,
-            insert: "#".repeat(level) + " "
-          });
-        } else if (node.name === "SetextHeading1" || node.name === "SetextHeading2") {
-          const nextLine = doc.lineAt(node.to);
-          if (level) {
-            changes.push({
-              from: node.from,
-              insert: "#".repeat(level) + " "
-            });
+var setHeading = (level) => {
+  return ({ state: state2, dispatch }) => {
+    const { selection: { ranges }, doc } = state2;
+    const changes = [];
+    let prevBlock = -1;
+    for (const range of ranges) {
+      let sawBlock = false;
+      syntaxTree(state2).iterate({
+        from: range.from,
+        to: range.to,
+        enter: (node) => {
+          if (!Object.hasOwn(Textblocks, node.name) || prevBlock === node.from) {
+            return;
           }
-          changes.push({
-            from: nextLine.from - 1,
-            to: nextLine.to
-          });
-        } else {
-          if (level === 0) {
+          sawBlock = true;
+          prevBlock = node.from;
+          const blockType = Textblocks[node.name];
+          const isHeading = /heading(\d)/.exec(blockType);
+          const curLevel = isHeading ? +isHeading[1] : node.name === "Paragraph" ? 0 : -1;
+          if (curLevel < 0 || curLevel === level) {
+            return;
+          }
+          if (curLevel === 0) {
             changes.push({
               from: node.from,
-              to: Math.min(node.to, node.from + curLevel + 1)
+              insert: "#".repeat(level) + " "
             });
-          } else if (level < curLevel) {
+          } else if (node.name === "SetextHeading1" || node.name === "SetextHeading2") {
+            const nextLine = doc.lineAt(node.to);
+            if (level) {
+              changes.push({
+                from: node.from,
+                insert: "#".repeat(level) + " "
+              });
+            }
             changes.push({
-              from: node.from,
-              to: node.from + (curLevel - level)
+              from: nextLine.from - 1,
+              to: nextLine.to
             });
           } else {
-            changes.push({
-              from: node.from,
-              insert: "#".repeat(level - curLevel)
-            });
+            if (level === 0) {
+              changes.push({
+                from: node.from,
+                to: Math.min(node.to, node.from + curLevel + 1)
+              });
+            } else if (level < curLevel) {
+              changes.push({
+                from: node.from,
+                to: node.from + (curLevel - level)
+              });
+            } else {
+              changes.push({
+                from: node.from,
+                insert: "#".repeat(level - curLevel)
+              });
+            }
           }
         }
-      }
-    });
-    let line;
-    if (!sawBlock && range.empty && level > 0 && !/\S/.test((line = state2.doc.lineAt(range.from)).text)) {
-      changes.push({
-        from: line.from,
-        to: line.to,
-        insert: "#".repeat(level) + " "
       });
+      let line;
+      if (!sawBlock && range.empty && level > 0 && !/\S/.test((line = state2.doc.lineAt(range.from)).text)) {
+        changes.push({
+          from: line.from,
+          to: line.to,
+          insert: "#".repeat(level) + " "
+        });
+      }
     }
-  }
-  if (!changes.length) {
-    return false;
-  }
-  const changeSet = state2.changes(changes);
-  dispatch(state2.update({
-    changes: changeSet,
-    selection: state2.selection.map(changeSet, 1),
-    userEvent: "format.setHeading",
-    scrollIntoView: true
-  }));
-  return true;
+    if (!changes.length) {
+      return false;
+    }
+    const changeSet = state2.changes(changes);
+    dispatch(state2.update({
+      changes: changeSet,
+      selection: state2.selection.map(changeSet, 1),
+      userEvent: "format.setHeading",
+      scrollIntoView: true
+    }));
+    return true;
+  };
 };
-var setStyle = (type, enable) => ({ state: state2, dispatch }) => {
-  const marker = inlineMarkerText(type);
-  const changes = state2.changeByRange((range) => {
-    if (!enable && range.empty) {
-      const after = state2.doc.sliceString(range.head, range.head + 6);
-      const found = after.indexOf(marker);
-      if (found >= 0 && /^[*~`]*$/.test(after.slice(0, found))) {
-        const before = state2.doc.sliceString(range.head - 6, range.head);
-        if (before.slice(before.length - found - marker.length, before.length - found) === marker && [
-          ...before.slice(before.length - found)
-        ].reverse().join("") === after.slice(0, found)) {
-          return {
-            changes: [
-              {
-                from: range.head - marker.length - found,
-                to: range.head - found
-              },
-              {
-                from: range.head + found,
-                to: range.head + found + marker.length
-              }
-            ],
-            range: EditorSelection.cursor(range.from - marker.length)
-          };
+var setStyle = (type, enable) => {
+  return ({ state: state2, dispatch }) => {
+    const marker = inlineMarkerText(type);
+    const changes = state2.changeByRange((range) => {
+      if (!enable && range.empty) {
+        const after = state2.doc.sliceString(range.head, range.head + 6);
+        const found = after.indexOf(marker);
+        if (found >= 0 && /^[*~`]*$/.test(after.slice(0, found))) {
+          const before = state2.doc.sliceString(range.head - 6, range.head);
+          if (before.slice(before.length - found - marker.length, before.length - found) === marker && [
+            ...before.slice(before.length - found)
+          ].reverse().join("") === after.slice(0, found)) {
+            return {
+              changes: [
+                {
+                  from: range.head - marker.length - found,
+                  to: range.head - found
+                },
+                {
+                  from: range.head + found,
+                  to: range.head + found + marker.length
+                }
+              ],
+              range: EditorSelection.cursor(range.from - marker.length)
+            };
+          }
         }
       }
-    }
-    const changes2 = [];
-    const changesAtEnd = [];
-    let blockStart = -1;
-    let blockEnd = -1;
-    let startCovered = false;
-    let endCovered = false;
-    let { from, to } = range;
-    syntaxTree(state2).iterate({
-      from,
-      to,
-      enter: (node) => {
-        const { name } = node;
-        if (Object.hasOwn(Textblocks, name) && Textblocks[name] !== "codeblock") {
-          blockStart = blockContentStart(node);
-          blockEnd = blockContentEnd(node, state2.doc);
-          startCovered = endCovered = false;
-        } else if (name === "Link" || name === "Image" && enable) {
-          if (from < node.from && to > node.from && to <= node.to) {
-            to = node.to;
-          } else if (to > node.to && from >= node.from && from < node.to) {
-            from = node.from;
-          }
-        } else if (IgnoreInline.has(name) && enable) {
-          if (node.from < from && node.to > from) {
-            if (to === from) {
+      const changes2 = [];
+      const changesAtEnd = [];
+      let blockStart = -1;
+      let blockEnd = -1;
+      let startCovered = false;
+      let endCovered = false;
+      let { from, to } = range;
+      syntaxTree(state2).iterate({
+        from,
+        to,
+        enter: (node) => {
+          const { name } = node;
+          if (Object.hasOwn(Textblocks, name) && Textblocks[name] !== "codeblock") {
+            blockStart = blockContentStart(node);
+            blockEnd = blockContentEnd(node, state2.doc);
+            startCovered = endCovered = false;
+          } else if (name === "Link" || name === "Image" && enable) {
+            if (from < node.from && to > node.from && to <= node.to) {
               to = node.to;
+            } else if (to > node.to && from >= node.from && from < node.to) {
+              from = node.from;
             }
-            from = node.to;
-          }
-          if (node.from < to && node.to > to) {
-            to = node.from;
-          }
-        } else if (Object.hasOwn(InlineMarker, name)) {
-          const markType = InlineMarker[name];
-          const size = inlineMarkerText(markType).length;
-          const openEnd = node.from + size;
-          const closeStart = node.to - size;
-          if (markType === type) {
-            if (openEnd <= from && closeStart >= from) {
-              startCovered = !enable && openEnd === skipMarkers(from, node.node, -1, openEnd) ? {
-                from: node.from,
-                to: openEnd
-              } : true;
+          } else if (IgnoreInline.has(name) && enable) {
+            if (node.from < from && node.to > from) {
+              if (to === from) {
+                to = node.to;
+              }
+              from = node.to;
             }
-            if (openEnd <= to && closeStart >= to) {
-              endCovered = !enable && closeStart === skipMarkers(to, node.node, 1, closeStart) ? {
-                from: closeStart,
-                to: node.to
-              } : true;
+            if (node.from < to && node.to > to) {
+              to = node.from;
             }
-          }
-          if (markType === type || type === 3 && enable) {
-            if (node.from >= from && openEnd <= to) {
-              changes2.push({
-                from: node.from,
-                to: openEnd
-              });
-              if (markType !== type && closeStart >= to) {
-                changesAtEnd.push({
-                  from: skipSpaces(Math.min(to, blockEnd), state2.doc, 1, blockEnd),
-                  insert: inlineMarkerText(markType)
-                });
+          } else if (Object.hasOwn(InlineMarker, name)) {
+            const markType = InlineMarker[name];
+            const size = inlineMarkerText(markType).length;
+            const openEnd = node.from + size;
+            const closeStart = node.to - size;
+            if (markType === type) {
+              if (openEnd <= from && closeStart >= from) {
+                startCovered = !enable && openEnd === skipMarkers(from, node.node, -1, openEnd) ? {
+                  from: node.from,
+                  to: openEnd
+                } : true;
+              }
+              if (openEnd <= to && closeStart >= to) {
+                endCovered = !enable && closeStart === skipMarkers(to, node.node, 1, closeStart) ? {
+                  from: closeStart,
+                  to: node.to
+                } : true;
               }
             }
-            if (closeStart >= from && node.to <= to) {
-              changes2.push({
-                from: closeStart,
-                to: node.to
-              });
-              if (markType !== type && openEnd <= from) {
+            if (markType === type || type === 3 && enable) {
+              if (node.from >= from && openEnd <= to) {
                 changes2.push({
-                  from: skipSpaces(Math.max(from, blockStart), state2.doc, -1, blockStart),
-                  insert: inlineMarkerText(markType)
+                  from: node.from,
+                  to: openEnd
                 });
+                if (markType !== type && closeStart >= to) {
+                  changesAtEnd.push({
+                    from: skipSpaces(Math.min(to, blockEnd), state2.doc, 1, blockEnd),
+                    insert: inlineMarkerText(markType)
+                  });
+                }
+              }
+              if (closeStart >= from && node.to <= to) {
+                changes2.push({
+                  from: closeStart,
+                  to: node.to
+                });
+                if (markType !== type && openEnd <= from) {
+                  changes2.push({
+                    from: skipSpaces(Math.max(from, blockStart), state2.doc, -1, blockStart),
+                    insert: inlineMarkerText(markType)
+                  });
+                }
               }
             }
           }
-        }
-      },
-      leave: (node) => {
-        if (Object.hasOwn(Textblocks, node.name) && Textblocks[node.name] !== "codeblock") {
-          const rangeStart = Math.max(from, blockStart);
-          const rangeEnd = Math.min(to, blockEnd);
-          if (enable) {
-            if (!startCovered) {
-              changes2.push({
-                from: rangeStart,
-                insert: marker
-              });
-            }
-            if (!endCovered) {
-              changes2.push({
-                from: rangeEnd,
-                insert: marker
-              });
-            }
-          } else {
-            if (typeof startCovered === "object") {
-              changes2.push(startCovered);
-            } else if (startCovered) {
-              changes2.push({
-                from: skipSpaces(rangeStart, state2.doc, -1, blockStart),
-                insert: marker
-              });
-            }
-            if (typeof endCovered === "object") {
-              changes2.push(endCovered);
-            } else if (endCovered) {
-              changes2.push({
-                from: skipSpaces(rangeEnd, state2.doc, 1, blockEnd),
-                insert: marker
-              });
+        },
+        leave: (node) => {
+          if (Object.hasOwn(Textblocks, node.name) && Textblocks[node.name] !== "codeblock") {
+            const rangeStart = Math.max(from, blockStart);
+            const rangeEnd = Math.min(to, blockEnd);
+            if (enable) {
+              if (!startCovered) {
+                changes2.push({
+                  from: rangeStart,
+                  insert: marker
+                });
+              }
+              if (!endCovered) {
+                changes2.push({
+                  from: rangeEnd,
+                  insert: marker
+                });
+              }
+            } else {
+              if (typeof startCovered === "object") {
+                changes2.push(startCovered);
+              } else if (startCovered) {
+                changes2.push({
+                  from: skipSpaces(rangeStart, state2.doc, -1, blockStart),
+                  insert: marker
+                });
+              }
+              if (typeof endCovered === "object") {
+                changes2.push(endCovered);
+              } else if (endCovered) {
+                changes2.push({
+                  from: skipSpaces(rangeEnd, state2.doc, 1, blockEnd),
+                  insert: marker
+                });
+              }
             }
           }
         }
+      });
+      if (blockStart < 0 && range.empty && enable && !/\S/.test(state2.doc.lineAt(range.from).text)) {
+        return {
+          changes: {
+            from: range.head,
+            insert: marker + marker
+          },
+          range: EditorSelection.cursor(range.head + marker.length)
+        };
       }
-    });
-    if (blockStart < 0 && range.empty && enable && !/\S/.test(state2.doc.lineAt(range.from).text)) {
+      const changeSet = state2.changes(changes2.concat(changesAtEnd));
       return {
-        changes: {
-          from: range.head,
-          insert: marker + marker
-        },
-        range: EditorSelection.cursor(range.head + marker.length)
+        changes: changeSet,
+        range: range.empty && !changeSet.empty ? EditorSelection.cursor(range.head + marker.length) : EditorSelection.range(changeSet.mapPos(range.from, 1), changeSet.mapPos(range.to, -1))
       };
-    }
-    const changeSet = state2.changes(changes2.concat(changesAtEnd));
-    return {
-      changes: changeSet,
-      range: range.empty && !changeSet.empty ? EditorSelection.cursor(range.head + marker.length) : EditorSelection.range(changeSet.mapPos(range.from, 1), changeSet.mapPos(range.to, -1))
-    };
-  });
-  dispatch(state2.update(changes, {
-    userEvent: enable ? "format.style.add" : "format.style.remove",
-    scrollIntoView: true
-  }));
-  return true;
+    });
+    dispatch(state2.update(changes, {
+      userEvent: enable ? "format.style.add" : "format.style.remove",
+      scrollIntoView: true
+    }));
+    return true;
+  };
 };
 var addStyle = (style) => setStyle(style, true);
 var removeStyle = (style) => setStyle(style, false);
-var toggleStyle = (style) => (arg) => {
-  const form = getFormatting(arg.state);
-  return setStyle(style, style === 0 ? !form.strong : style === 1 ? !form.emphasis : style === 2 ? !form.strikethrough : !form.code)(arg);
+var toggleStyle = (style) => {
+  return (arg) => {
+    const form = getFormatting(arg.state);
+    return setStyle(style, style === 0 ? !form.strong : style === 1 ? !form.emphasis : style === 2 ? !form.strikethrough : !form.code)(arg);
+  };
 };
 var toggleStrong = toggleStyle(0);
 var toggleEmphasis = toggleStyle(1);
@@ -2654,296 +2660,305 @@ var removeLink = ({ state: state2, dispatch }) => {
   }));
   return true;
 };
-var addLink = ({ url, image: image2 } = {}) => ({ state: state2, dispatch }) => {
-  const changes = state2.changeByRange((range) => {
-    let { from, to } = range;
-    const cutStyles = [];
-    let okay = null;
-    syntaxTree(state2).iterate({
-      from,
-      to,
-      enter: (node) => {
-        if (Object.hasOwn(Textblocks, node.name)) {
-          okay = Textblocks[node.name] !== "codeblock" && from >= blockContentStart(node) && to <= blockContentEnd(node, state2.doc);
-        } else if (Object.hasOwn(InlineMarker, node.name)) {
-          const sNode = node.node;
-          if (node.from < from && node.to <= to) {
-            if (sNode.firstChild.to === from) {
-              from = node.from;
-            } else {
-              cutStyles.push(sNode);
-            }
-          } else if (node.from >= from && node.to > to) {
-            if (sNode.lastChild.from === to) {
-              to = node.to;
-            } else {
-              cutStyles.push(sNode);
+var addLink = ({ url, image: image2 } = {}) => {
+  return ({ state: state2, dispatch }) => {
+    const changes = state2.changeByRange((range) => {
+      let { from, to } = range;
+      const cutStyles = [];
+      let okay = null;
+      syntaxTree(state2).iterate({
+        from,
+        to,
+        enter: (node) => {
+          if (Object.hasOwn(Textblocks, node.name)) {
+            okay = Textblocks[node.name] !== "codeblock" && from >= blockContentStart(node) && to <= blockContentEnd(node, state2.doc);
+          } else if (Object.hasOwn(InlineMarker, node.name)) {
+            const sNode = node.node;
+            if (node.from < from && node.to <= to) {
+              if (sNode.firstChild.to === from) {
+                from = node.from;
+              } else {
+                cutStyles.push(sNode);
+              }
+            } else if (node.from >= from && node.to > to) {
+              if (sNode.lastChild.from === to) {
+                to = node.to;
+              } else {
+                cutStyles.push(sNode);
+              }
             }
           }
         }
+      });
+      if (okay === null) {
+        const line = state2.doc.lineAt(from);
+        okay = to <= line.to && !/\S/.test(line.text.slice(from - line.from));
       }
-    });
-    if (okay === null) {
-      const line = state2.doc.lineAt(from);
-      okay = to <= line.to && !/\S/.test(line.text.slice(from - line.from));
-    }
-    if (!okay) {
-      return {
-        range
-      };
-    }
-    const changes2 = [];
-    const changesAfter = [];
-    removeLinkInner(from, to, changesAfter, state2);
-    let cursorOffset = 1;
-    for (const style of cutStyles) {
-      const type = InlineMarker[style.name];
-      const mark2 = inlineMarkerText(type);
-      if (style.from < from) {
-        changes2.push({
-          from: skipSpaces(from, state2.doc, -1),
-          insert: mark2
-        });
-        changesAfter.push({
-          from: skipSpaces(from, state2.doc, 1, to),
-          insert: mark2
-        });
-      } else {
-        changes2.push({
-          from: skipSpaces(to, state2.doc, -1, from),
-          insert: mark2
-        });
-        const after = skipSpaces(to, state2.doc, 1);
-        if (after === to) {
-          cursorOffset += mark2.length;
+      if (!okay) {
+        return {
+          range
+        };
+      }
+      const changes2 = [];
+      const changesAfter = [];
+      removeLinkInner(from, to, changesAfter, state2);
+      let cursorOffset = 1;
+      for (const style of cutStyles) {
+        const type = InlineMarker[style.name];
+        const mark2 = inlineMarkerText(type);
+        if (style.from < from) {
+          changes2.push({
+            from: skipSpaces(from, state2.doc, -1),
+            insert: mark2
+          });
+          changesAfter.push({
+            from: skipSpaces(from, state2.doc, 1, to),
+            insert: mark2
+          });
+        } else {
+          changes2.push({
+            from: skipSpaces(to, state2.doc, -1, from),
+            insert: mark2
+          });
+          const after = skipSpaces(to, state2.doc, 1);
+          if (after === to) {
+            cursorOffset += mark2.length;
+          }
+          changesAfter.push({
+            from: after,
+            insert: mark2
+          });
         }
-        changesAfter.push({
-          from: after,
-          insert: mark2
-        });
       }
-    }
-    changes2.push({
-      from,
-      insert: image2 ? "![" : "["
-    }, {
-      from: to,
-      insert: `](${url ?? ""})`
+      changes2.push({
+        from,
+        insert: image2 ? "![" : "["
+      }, {
+        from: to,
+        insert: `](${url ?? ""})`
+      });
+      const changeSet = state2.changes(changes2.concat(changesAfter));
+      return {
+        changes: changeSet,
+        range: EditorSelection.cursor(changeSet.mapPos(to, 1) - cursorOffset - (url ? url.length + 2 : 0))
+      };
     });
-    const changeSet = state2.changes(changes2.concat(changesAfter));
-    return {
-      changes: changeSet,
-      range: EditorSelection.cursor(changeSet.mapPos(to, 1) - cursorOffset - (url ? url.length + 2 : 0))
-    };
-  });
-  if (changes.changes.empty) {
-    return false;
-  }
-  dispatch(state2.update(changes, {
-    userEvent: "format.link.add",
-    scrollIntoView: true
-  }));
-  return true;
+    if (changes.changes.empty) {
+      return false;
+    }
+    dispatch(state2.update(changes, {
+      userEvent: "format.link.add",
+      scrollIntoView: true
+    }));
+    return true;
+  };
 };
-var addList = (type) => ({ state: state2, dispatch }) => {
-  let lastBlock = -1;
-  let counter = 1;
-  let first = true;
-  let parentColumn = null;
-  const blocks = [];
-  for (const { from, to } of state2.selection.ranges) {
-    syntaxTree(state2).iterate({
-      from,
-      to,
-      enter: (node) => {
-        if (Object.hasOwn(Textblocks, node.name) && node.name !== "TableCell" || node.name === "Table") {
-          if (first) {
-            let before = node.node.prevSibling;
-            while (before && /Mark$/.test(before.name)) {
-              before = before.prevSibling;
-            }
-            if (before?.name === (type === 0 ? "OrderedList" : "BulletList")) {
-              const item = before.lastChild;
-              const itemLine = state2.doc.lineAt(item.from);
-              const itemText = itemLine.text.slice(item.from - itemLine.from);
-              parentColumn = item.from - itemLine.from + /^\s*/.exec(itemText)[0].length;
-              if (type === 0) {
-                const mark2 = /^\s*(\d+)[.)]/.exec(itemText);
-                if (mark2) {
-                  parentColumn += mark2[1].length;
-                  counter = +mark2[1] + 1;
+var addList = (type) => {
+  return ({ state: state2, dispatch }) => {
+    let lastBlock = -1;
+    let counter = 1;
+    let first = true;
+    let parentColumn = null;
+    const blocks = [];
+    for (const { from, to } of state2.selection.ranges) {
+      syntaxTree(state2).iterate({
+        from,
+        to,
+        enter: (node) => {
+          if (Object.hasOwn(Textblocks, node.name) && node.name !== "TableCell" || node.name === "Table") {
+            if (first) {
+              let before = node.node.prevSibling;
+              while (before && /Mark$/.test(before.name)) {
+                before = before.prevSibling;
+              }
+              if (before?.name === (type === 0 ? "OrderedList" : "BulletList")) {
+                const item = before.lastChild;
+                const itemLine = state2.doc.lineAt(item.from);
+                const itemText = itemLine.text.slice(item.from - itemLine.from);
+                parentColumn = item.from - itemLine.from + /^\s*/.exec(itemText)[0].length;
+                if (type === 0) {
+                  const mark2 = /^\s*(\d+)[.)]/.exec(itemText);
+                  if (mark2) {
+                    parentColumn += mark2[1].length;
+                    counter = +mark2[1] + 1;
+                  }
                 }
               }
+              first = false;
+            }
+            if (node.from === lastBlock) {
+              return;
             }
-            first = false;
+            lastBlock = node.from;
+            blocks.push({
+              node: node.node,
+              counter,
+              parentColumn
+            });
+            counter++;
+            return false;
           }
-          if (node.from === lastBlock) {
-            return;
+        },
+        leave: (node) => {
+          if (node.name === "BulletList" || node.name === "OrderedList" || node.name === "Blockquote") {
+            counter = 1;
+            parentColumn = null;
           }
-          lastBlock = node.from;
-          blocks.push({
-            node: node.node,
-            counter,
-            parentColumn
-          });
-          counter++;
-          return false;
-        }
-      },
-      leave: (node) => {
-        if (node.name === "BulletList" || node.name === "OrderedList" || node.name === "Blockquote") {
-          counter = 1;
-          parentColumn = null;
         }
-      }
-    });
-  }
-  if (!blocks.length) {
-    const { from, to } = state2.doc.lineAt(state2.selection.main.anchor);
-    if (from === to) {
-      const insert = type === 1 ? "- " : type === 0 ? "1. " : "- [ ] ";
-      dispatch(state2.update({
-        changes: [
-          {
-            from,
-            insert
-          }
-        ],
-        selection: {
-          anchor: from + insert.length
-        },
-        userEvent: "format.list.add",
-        scrollIntoView: true
-      }));
-      return true;
-    }
-    return false;
-  }
-  const changes = [];
-  for (let i = 0; i < blocks.length; i++) {
-    const { node, counter: counter2, parentColumn: parentColumn2 } = blocks[i];
-    const nodeFrom = node.name === "CodeBlock" ? node.from - 4 : node.from;
-    let padding = nodeFrom > 0 && !/\s/.test(state2.doc.sliceString(nodeFrom - 1, nodeFrom)) ? 1 : 0;
-    if (type === 0) {
-      padding += String(counter2).length;
+      });
     }
-    let line = state2.doc.lineAt(nodeFrom);
-    const column = nodeFrom - line.from;
-    if (parentColumn2 !== null && parentColumn2 > column) {
-      padding = Math.max(padding, parentColumn2 - column);
+    if (!blocks.length) {
+      const { from, to } = state2.doc.lineAt(state2.selection.main.anchor);
+      if (from === to) {
+        const insert = type === 1 ? "- " : type === 0 ? "1. " : "- [ ] ";
+        dispatch(state2.update({
+          changes: [
+            {
+              from,
+              insert
+            }
+          ],
+          selection: {
+            anchor: from + insert.length
+          },
+          userEvent: "format.list.add",
+          scrollIntoView: true
+        }));
+        return true;
+      }
+      return false;
     }
-    let mark2;
-    if (type === 0) {
-      let max = counter2;
-      for (let j = i + 1; j < blocks.length; j++) {
-        if (blocks[j].counter !== max + 1) {
-          break;
+    const changes = [];
+    for (let i = 0; i < blocks.length; i++) {
+      const { node, counter: counter2, parentColumn: parentColumn2 } = blocks[i];
+      const nodeFrom = node.name === "CodeBlock" ? node.from - 4 : node.from;
+      let padding = nodeFrom > 0 && !/\s/.test(state2.doc.sliceString(nodeFrom - 1, nodeFrom)) ? 1 : 0;
+      if (type === 0) {
+        padding += String(counter2).length;
+      }
+      let line = state2.doc.lineAt(nodeFrom);
+      const column = nodeFrom - line.from;
+      if (parentColumn2 !== null && parentColumn2 > column) {
+        padding = Math.max(padding, parentColumn2 - column);
+      }
+      let mark2;
+      if (type === 0) {
+        let max = counter2;
+        for (let j = i + 1; j < blocks.length; j++) {
+          if (blocks[j].counter !== max + 1) {
+            break;
+          }
+          max++;
         }
-        max++;
+        const num = String(counter2);
+        padding = Math.max(String(max).length, padding);
+        mark2 = " ".repeat(Math.max(0, padding - num.length)) + num + ". ";
+      } else {
+        mark2 = " ".repeat(padding) + "- " + (type === 2 ? "[ ] " : "");
       }
-      const num = String(counter2);
-      padding = Math.max(String(max).length, padding);
-      mark2 = " ".repeat(Math.max(0, padding - num.length)) + num + ". ";
-    } else {
-      mark2 = " ".repeat(padding) + "- " + (type === 2 ? "[ ] " : "");
-    }
-    changes.push({
-      from: nodeFrom,
-      insert: mark2
-    });
-    while (line.to < node.to) {
-      line = state2.doc.lineAt(line.to + 1);
-      const open = /^[\s>]*/.exec(line.text)[0].length;
       changes.push({
-        from: line.from + Math.min(open, column),
-        insert: " ".repeat(mark2.length)
+        from: nodeFrom,
+        insert: mark2
       });
+      while (line.to < node.to) {
+        line = state2.doc.lineAt(line.to + 1);
+        const open = /^[\s>]*/.exec(line.text)[0].length;
+        changes.push({
+          from: line.from + Math.min(open, column),
+          insert: " ".repeat(mark2.length)
+        });
+      }
     }
-  }
-  if (type === 0) {
-    const last = blocks[blocks.length - 1];
-    let next = last.node.nextSibling;
-    while (next && /Mark$/.test(next.name)) {
-      next = next.nextSibling;
-    }
-    if (next?.name === "OrderedList") {
-      renumberListItems(next.firstChild, last.counter + 1, changes, state2.doc);
+    if (type === 0) {
+      const last = blocks[blocks.length - 1];
+      let next = last.node.nextSibling;
+      while (next && /Mark$/.test(next.name)) {
+        next = next.nextSibling;
+      }
+      if (next?.name === "OrderedList") {
+        renumberListItems(next.firstChild, last.counter + 1, changes, state2.doc);
+      }
     }
-  }
-  const changeSet = state2.changes(changes);
-  dispatch(state2.update({
-    changes: changeSet,
-    selection: state2.selection.map(changeSet, 1),
-    userEvent: "format.list.add",
-    scrollIntoView: true
-  }));
-  return true;
+    "Oeswe";
+    const changeSet = state2.changes(changes);
+    dispatch(state2.update({
+      changes: changeSet,
+      selection: state2.selection.map(changeSet, 1),
+      userEvent: "format.list.add",
+      scrollIntoView: true
+    }));
+    return true;
+  };
 };
-var removeList = (type) => ({ state: state2, dispatch }) => {
-  let lastBlock = -1;
-  const changes = [];
-  const stack = [];
-  const targetNodeType = type === 0 ? "OrderedList" : type === 1 ? "BulletList" : "TaskList";
-  for (const { from, to } of state2.selection.ranges) {
-    syntaxTree(state2).iterate({
-      from,
-      to,
-      enter: (node) => {
-        const { name } = node;
-        if (name === "BulletList" || name === "OrderedList" || name === "Blockquote") {
-          stack.push(name);
-        } else if (name === "Task" && stack[stack.length - 1] === "BulletList") {
-          stack[stack.length - 1] = "TaskList";
-        }
-      },
-      leave: (node) => {
-        const { name } = node;
-        if (name === "BulletList" || name === "OrderedList" || name === "Blockquote") {
-          stack.pop();
-        } else if (name === "ListItem" && stack[stack.length - 1] === targetNodeType && node.from !== lastBlock) {
-          lastBlock = node.from;
-          let line = state2.doc.lineAt(node.from);
-          const mark2 = /^\s*(\d+[.)] |[-*+] (\[[ x]\] )?)/.exec(line.text.slice(node.from - line.from));
-          if (!mark2) {
-            return false;
+var removeList = (type) => {
+  return ({ state: state2, dispatch }) => {
+    let lastBlock = -1;
+    const changes = [];
+    const stack = [];
+    const targetNodeType = type === 0 ? "OrderedList" : type === 1 ? "BulletList" : "TaskList";
+    for (const { from, to } of state2.selection.ranges) {
+      syntaxTree(state2).iterate({
+        from,
+        to,
+        enter: (node) => {
+          const { name } = node;
+          if (name === "BulletList" || name === "OrderedList" || name === "Blockquote") {
+            stack.push(name);
+          } else if (name === "Task" && stack[stack.length - 1] === "BulletList") {
+            stack[stack.length - 1] = "TaskList";
           }
-          const column = node.from - line.from;
-          changes.push({
-            from: node.from,
-            to: node.from + mark2[0].length
-          });
-          while (line.to < node.to) {
-            line = state2.doc.lineAt(line.to + 1);
-            const open = /^[\s>]*/.exec(line.text)[0].length;
-            if (open > column) {
-              changes.push({
-                from: line.from + column,
-                to: line.from + Math.min(column + mark2[0].length, open)
-              });
+        },
+        leave: (node) => {
+          const { name } = node;
+          if (name === "BulletList" || name === "OrderedList" || name === "Blockquote") {
+            stack.pop();
+          } else if (name === "ListItem" && stack[stack.length - 1] === targetNodeType && node.from !== lastBlock) {
+            lastBlock = node.from;
+            let line = state2.doc.lineAt(node.from);
+            const mark2 = /^\s*(\d+[.)] |[-*+] (\[[ x]\] )?)/.exec(line.text.slice(node.from - line.from));
+            if (!mark2) {
+              return false;
             }
+            const column = node.from - line.from;
+            changes.push({
+              from: node.from,
+              to: node.from + mark2[0].length
+            });
+            while (line.to < node.to) {
+              line = state2.doc.lineAt(line.to + 1);
+              const open = /^[\s>]*/.exec(line.text)[0].length;
+              if (open > column) {
+                changes.push({
+                  from: line.from + column,
+                  to: line.from + Math.min(column + mark2[0].length, open)
+                });
+              }
+            }
+            if (node.to >= to) {
+              renumberListItems(node.node.nextSibling, 1, changes, state2.doc);
+            }
+            return false;
           }
-          if (node.to >= to) {
-            renumberListItems(node.node.nextSibling, 1, changes, state2.doc);
-          }
-          return false;
         }
-      }
-    });
-  }
-  if (!changes.length) {
-    return false;
-  }
-  dispatch(state2.update({
-    changes,
-    userEvent: "format.list.remove",
-    scrollIntoView: true
-  }));
-  return true;
+      });
+    }
+    if (!changes.length) {
+      return false;
+    }
+    dispatch(state2.update({
+      changes,
+      userEvent: "format.list.remove",
+      scrollIntoView: true
+    }));
+    return true;
+  };
 };
-var toggleList = (type) => (target) => {
-  const formatting = getFormatting(target.state);
-  const active = formatting.listStyle === (type === 1 ? "bullet" : type === 0 ? "ordered" : "task");
-  return (active ? removeList(type) : addList(type))(target);
+var toggleList = (type) => {
+  return (target) => {
+    const formatting = getFormatting(target.state);
+    const active = formatting.listStyle === (type === 1 ? "bullet" : type === 0 ? "ordered" : "task");
+    return (active ? removeList(type) : addList(type))(target);
+  };
 };
 var renumberListItems = (item, counter, changes, doc) => {
   for (; item; item = item.nextSibling) {
@@ -2963,79 +2978,81 @@ var renumberListItems = (item, counter, changes, doc) => {
     }
   }
 };
-var setBlockquote = (enable) => ({ state: state2, dispatch }) => {
-  const lines = [];
-  let lastBlock = -1;
-  for (const { from, to } of state2.selection.ranges) {
-    const sawBlock = false;
-    syntaxTree(state2).iterate({
-      from,
-      to,
-      enter: (node) => {
-        if (Object.hasOwn(Textblocks, node.name) || node.name === "Table") {
-          if (node.from === lastBlock) {
-            return false;
-          }
-          lastBlock = node.from;
-          let line2 = state2.doc.lineAt(node.from);
-          if (line2.number > 1) {
-            const prevLine = state2.doc.line(line2.number - 1);
-            if (/^[>\s]*$/.test(prevLine.text)) {
-              if (!enable || lines.length && lines[lines.length - 1].number === prevLine.number - 1) {
-                lines.push(prevLine);
+var setBlockquote = (enable) => {
+  return ({ state: state2, dispatch }) => {
+    const lines = [];
+    let lastBlock = -1;
+    for (const { from, to } of state2.selection.ranges) {
+      const sawBlock = false;
+      syntaxTree(state2).iterate({
+        from,
+        to,
+        enter: (node) => {
+          if (Object.hasOwn(Textblocks, node.name) || node.name === "Table") {
+            if (node.from === lastBlock) {
+              return false;
+            }
+            lastBlock = node.from;
+            let line2 = state2.doc.lineAt(node.from);
+            if (line2.number > 1) {
+              const prevLine = state2.doc.line(line2.number - 1);
+              if (/^[>\s]*$/.test(prevLine.text)) {
+                if (!enable || lines.length && lines[lines.length - 1].number === prevLine.number - 1) {
+                  lines.push(prevLine);
+                }
               }
             }
-          }
-          for (; ; ) {
-            lines.push(line2);
-            if (line2.to >= node.to) {
-              break;
+            for (; ; ) {
+              lines.push(line2);
+              if (line2.to >= node.to) {
+                break;
+              }
+              line2 = state2.doc.line(line2.number + 1);
             }
-            line2 = state2.doc.line(line2.number + 1);
-          }
-          if (!enable && line2.number < state2.doc.lines) {
-            const nextLine = state2.doc.line(line2.number + 1);
-            if (/^[>\s]*$/.test(nextLine.text)) {
-              lines.push(nextLine);
+            if (!enable && line2.number < state2.doc.lines) {
+              const nextLine = state2.doc.line(line2.number + 1);
+              if (/^[>\s]*$/.test(nextLine.text)) {
+                lines.push(nextLine);
+              }
             }
+            return false;
           }
-          return false;
         }
+      });
+      let line;
+      if (!sawBlock && enable && from === to && !/\S/.test((line = state2.doc.lineAt(from)).text)) {
+        lines.push(line);
       }
-    });
-    let line;
-    if (!sawBlock && enable && from === to && !/\S/.test((line = state2.doc.lineAt(from)).text)) {
-      lines.push(line);
     }
-  }
-  const changes = [];
-  for (const line of lines) {
-    if (enable) {
-      changes.push({
-        from: line.from,
-        insert: /\S/.test(line.text) ? "> " : ">"
-      });
-    } else {
-      const quote = /((?:[\s>\-+*]|\d+[.)])*?)> ?/.exec(line.text);
-      if (quote) {
+    const changes = [];
+    for (const line of lines) {
+      if (enable) {
         changes.push({
-          from: line.from + quote[1].length,
-          to: line.from + quote[0].length
+          from: line.from,
+          insert: /\S/.test(line.text) ? "> " : ">"
         });
+      } else {
+        const quote = /((?:[\s>\-+*]|\d+[.)])*?)> ?/.exec(line.text);
+        if (quote) {
+          changes.push({
+            from: line.from + quote[1].length,
+            to: line.from + quote[0].length
+          });
+        }
       }
     }
-  }
-  if (!changes.length) {
-    return false;
-  }
-  const changeSet = state2.changes(changes);
-  dispatch(state2.update({
-    changes: changeSet,
-    selection: state2.selection.map(changeSet, 1),
-    userEvent: enable ? "format.blockquote.add" : "format.blockquote.remove",
-    scrollIntoView: true
-  }));
-  return true;
+    if (!changes.length) {
+      return false;
+    }
+    const changeSet = state2.changes(changes);
+    dispatch(state2.update({
+      changes: changeSet,
+      selection: state2.selection.map(changeSet, 1),
+      userEvent: enable ? "format.blockquote.add" : "format.blockquote.remove",
+      scrollIntoView: true
+    }));
+    return true;
+  };
 };
 var addBlockquote = setBlockquote(true);
 var removeBlockquote = setBlockquote(false);
@@ -3105,8 +3122,8 @@ var addCodeblock = (target) => {
   return true;
 };
 var removeCodeblock = ({ state: state2, dispatch }) => {
-  const changes = [];
   let lastBlock = -1;
+  const changes = [];
   for (const { from, to } of state2.selection.ranges) {
     syntaxTree(state2).iterate({
       from,
@@ -3761,68 +3778,88 @@ var buildDecorations = (view, options, focus) => {
       from,
       to,
       enter: (node) => {
-        if (node.name === "FencedCode") {
-          const editing = editingRange(state2, node, focus);
-          for (const block of view.viewportLineBlocks) {
-            if (block.to < node.from) {
-              continue;
-            }
-            if (block.from > node.to) {
-              break;
-            }
-            const first = block.from <= node.from;
-            const last = block.to >= node.to && /^(\s>)*```$/.test(state2.doc.sliceString(block.from, block.to));
-            deco.add(block.from, block.from, first ? fencedCodeLineFirst : last ? fencedCodeLineLast : fencedCodeLine);
-            if (!editing && (first || last)) {
-              atomicDeco.add(block.from, block.to, hide);
+        switch (node.name) {
+          case "FencedCode": {
+            const editing = editingRange(state2, node, focus);
+            for (const block of view.viewportLineBlocks) {
+              if (block.to < node.from) {
+                continue;
+              }
+              if (block.from > node.to) {
+                break;
+              }
+              const first = block.from <= node.from;
+              const last = block.to >= node.to && /^(\s>)*```$/.test(state2.doc.sliceString(block.from, block.to));
+              deco.add(block.from, block.from, first ? fencedCodeLineFirst : last ? fencedCodeLineLast : fencedCodeLine);
+              if (!editing && (first || last)) {
+                atomicDeco.add(block.from, block.to, hide);
+              }
             }
+            return false;
           }
-          return false;
-        } else if (node.name === "Link") {
-          const marks = node.node.getChildren("LinkMark");
-          const urlNode = node.node.getChild("URL");
-          const editing = editingRange(state2, node, focus);
-          if (urlNode && marks.length >= 2) {
-            const url = state2.sliceDoc(urlNode.from, urlNode.to);
-            if (!editing) {
-              atomicDeco.add(node.from, marks[0].to, hide);
-            }
-            deco.add(marks[0].to, marks[1].from, Decoration5.mark({
-              tagName: "a",
-              attributes: {
-                class: "cm-link",
-                href: url,
-                rel: "noreferrer",
-                target: "_blank"
+          case "Link": {
+            const marks = node.node.getChildren("LinkMark");
+            const urlNode = node.node.getChild("URL");
+            const editing = editingRange(state2, node, focus);
+            if (urlNode && marks.length >= 2) {
+              const url = state2.sliceDoc(urlNode.from, urlNode.to);
+              if (!editing) {
+                atomicDeco.add(node.from, marks[0].to, hide);
+              }
+              deco.add(marks[0].to, marks[1].from, Decoration5.mark({
+                tagName: "a",
+                attributes: {
+                  class: "cm-link",
+                  href: url,
+                  rel: "noreferrer",
+                  target: "_blank"
+                }
+              }));
+              if (!editing) {
+                atomicDeco.add(marks[1].from, node.to, options.renderLinkButton ? Decoration5.replace({
+                  widget: new LinkButton(url, options.renderLinkButton)
+                }) : hide);
               }
-            }));
-            if (!editing) {
-              atomicDeco.add(marks[1].from, node.to, options.renderLinkButton ? Decoration5.replace({
-                widget: new LinkButton(url, options.renderLinkButton)
-              }) : hide);
             }
+            break;
           }
-        } else if (node.name === "HeaderMark") {
-          const parent = node.node.parent;
-          if (/^ATX/.test(parent.name) && !editingRange(state2, state2.doc.lineAt(node.from), focus)) {
-            const next = state2.doc.sliceString(node.to, node.to + 1);
-            atomicDeco.add(node.from, node.to + (next === " " ? 1 : 0), hide);
+          case "HeaderMark": {
+            const parent = node.node.parent;
+            if (/^ATX/.test(parent.name) && !editingRange(state2, state2.doc.lineAt(node.from), focus)) {
+              const next = state2.doc.sliceString(node.to, node.to + 1);
+              atomicDeco.add(node.from, node.to + (next === " " ? 1 : 0), hide);
+            }
+            break;
+          }
+          case "HorizontalRule": {
+            if (!editingRange(state2, node, focus)) {
+              deco.add(node.from, node.to, horizontalRule);
+            }
+            break;
           }
-        } else if (node.name === "HorizontalRule") {
-          if (!editingRange(state2, node, focus)) {
-            deco.add(node.from, node.to, horizontalRule);
+          case "TaskMarker": {
+            if (!editingRange(state2, node, focus)) {
+              const checked = state2.doc.sliceString(node.from + 1, node.to - 1) === "x";
+              atomicDeco.add(node.from - 2, node.from - 1, Decoration5.mark({
+                class: "cm-task"
+              }));
+              atomicDeco.add(node.from, node.to, checked ? checkedTask : uncheckedTask);
+            }
+            break;
           }
-        } else if (node.name === "TaskMarker") {
-          if (!editingRange(state2, node, focus)) {
-            const checked = state2.doc.sliceString(node.from + 1, node.to - 1) === "x";
-            atomicDeco.add(node.from - 2, node.from - 1, Decoration5.mark({
-              class: "cm-task"
+          case "ListItem": {
+            const start = state2.doc.lineAt(node.from);
+            deco.add(start.from, start.from, Decoration5.line({
+              class: "cm-list-item"
             }));
-            atomicDeco.add(node.from, node.to, checked ? checkedTask : uncheckedTask);
+            break;
           }
-        } else if (MarksByParent.has(node.name)) {
-          if (!editingRange(state2, node.node.parent, focus)) {
-            atomicDeco.add(node.from, node.to, hide);
+          default: {
+            if (MarksByParent.has(node.name)) {
+              if (!editingRange(state2, node.node.parent, focus)) {
+                atomicDeco.add(node.from, node.to, hide);
+              }
+            }
           }
         }
       }
@@ -3848,8 +3885,6 @@ var decorateMarkdown = (options = {}) => {
           this.scheduleUpdate(update2.view);
         }
       }
-      // TODO(burdon): BUG: If the cursor is at the end of a link at the end of a line,
-      //  the cursor will float in space or be in the wrong position after the decoration is applied.
       scheduleUpdate(view) {
         this.clearUpdate();
         this.pendingUpdate = setTimeout(() => {
@@ -4094,15 +4129,17 @@ var update = (state2, options) => {
     }
   });
   tables.forEach((table2) => {
-    const hide2 = state2.readOnly || cursor < table2.from || cursor > table2.to;
-    if (hide2) {
+    const replace = state2.readOnly || cursor < table2.from || cursor > table2.to;
+    if (replace) {
       builder.add(table2.from, table2.to, Decoration7.replace({
+        block: true,
         widget: new TableWidget(table2)
       }));
+    } else {
+      builder.add(table2.from, table2.to, Decoration7.mark({
+        class: "cm-table"
+      }));
     }
-    builder.add(table2.from, table2.to, Decoration7.mark({
-      class: "cm-table"
-    }));
   });
   return builder.finish();
 };
@@ -4800,28 +4837,15 @@ var useActionHandler = (view) => {
   return (action) => view && processAction(view, action);
 };
 
-// packages/ui/react-ui-editor/src/hooks/useDocAccessor.ts
-import { useMemo as useMemo2 } from "react";
-import { createDocAccessor, getTextContent } from "@dxos/echo-schema";
-var useDocAccessor = (text) => {
-  return useMemo2(() => ({
-    id: text.id,
-    doc: getTextContent(text),
-    accessor: createDocAccessor(text)
-  }), [
-    text
-  ]);
-};
-
 // packages/ui/react-ui-editor/src/hooks/useTextEditor.ts
 import { EditorSelection as EditorSelection2, EditorState as EditorState3 } from "@codemirror/state";
 import { EditorView as EditorView17 } from "@codemirror/view";
-import { useEffect as useEffect4, useMemo as useMemo3, useRef as useRef3, useState as useState4 } from "react";
+import { useEffect as useEffect4, useMemo as useMemo2, useRef as useRef3, useState as useState4 } from "react";
 import { log as log8 } from "@dxos/log";
 import { isNotFalsy as isNotFalsy5 } from "@dxos/util";
 var __dxlog_file11 = "/home/runner/work/dxos/dxos/packages/ui/react-ui-editor/src/hooks/useTextEditor.ts";
 var useTextEditor = (cb = () => ({}), deps = []) => {
-  let { id, doc, selection, extensions, autoFocus, scrollTo, debug } = useMemo3(cb, deps ?? []);
+  let { id, doc, selection, extensions, autoFocus, scrollTo, debug } = useMemo2(cb, deps ?? []);
   const onUpdate = useRef3();
   const [view, setView] = useState4();
   const parentRef = useRef3(null);
@@ -4915,6 +4939,19 @@ var useTextEditor = (cb = () => ({}), deps = []) => {
     view
   };
 };
+
+// packages/ui/react-ui-editor/src/hooks/useDocAccessor.ts
+import { useMemo as useMemo3 } from "react";
+import { createDocAccessor, getTextContent } from "@dxos/echo-schema";
+var useDocAccessor = (text) => {
+  return useMemo3(() => ({
+    id: text.id,
+    doc: getTextContent(text),
+    accessor: createDocAccessor(text)
+  }), [
+    text
+  ]);
+};
 export {
   Cursor,
   EditorModes,