@dxos/ui-editor 0.8.4-staging.60fe92afc8 → 0.9.1-main.c7dcc2e112

package/dist/lib/browser/index.mjs

@@ -6,7 +6,7 @@ import { TextKind } from "@dxos/protocols/proto/dxos/echo/model/text";
 
 // src/defaults.ts
 import { mx } from "@dxos/ui-theme";
-var editorClassNames = (role) => mx("dx-attention-surface data-[toolbar=disabled]:pt-2 dx-focus-ring-inset", role === "section" ? "[&_.cm-scroller]:overflow-hidden [&_.cm-scroller]:min-h-24" : "dx-container overflow-hidden");
+var editorClassNames = (role) => mx("dx-attention-surface data-[toolbar=disabled]:pt-2 dx-focus-ring-inset", role === "org.dxos.role.section" ? "[&_.cm-scroller]:overflow-hidden [&_.cm-scroller]:min-h-24" : "dx-container overflow-hidden");
 var documentSlots = {
   content: {
     /**
@@ -1603,11 +1603,18 @@ import { isNonNullable } from "@dxos/util";
 // src/extensions/selection.ts
 import { Transaction as Transaction3 } from "@codemirror/state";
 import { EditorView as EditorView8, keymap as keymap5 } from "@codemirror/view";
+import * as Schema from "effect/Schema";
 import { debounce } from "@dxos/async";
-import { invariant as invariant3 } from "@dxos/invariant";
 import { isTruthy } from "@dxos/util";
-var __dxlog_file8 = "/__w/dxos/dxos/packages/ui/ui-editor/src/extensions/selection.ts";
 var documentId = singleValueFacet();
+var EditorSelectionSchema = Schema.Struct({
+  anchor: Schema.Number,
+  head: Schema.optional(Schema.Number)
+}).pipe(Schema.mutable);
+var EditorSelectionStateSchema = Schema.Struct({
+  scrollTo: Schema.optional(Schema.Number),
+  selection: Schema.optional(EditorSelectionSchema)
+}).pipe(Schema.mutable);
 var stateRestoreAnnotation = "org.dxos.cm.state-restore";
 var createEditorStateTransaction = ({ scrollTo, selection }) => {
   return {
@@ -1619,17 +1626,6 @@ var createEditorStateTransaction = ({ scrollTo, selection }) => {
     annotations: Transaction3.userEvent.of(stateRestoreAnnotation)
   };
 };
-var createEditorStateStore = (keyPrefix) => ({
-  getState: (id) => {
-    invariant3(id, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file8, L: 26, S: void 0, A: ["id", ""] });
-    const state = localStorage.getItem(`${keyPrefix}/${id}`);
-    return state ? JSON.parse(state) : void 0;
-  },
-  setState: (id, state) => {
-    invariant3(id, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file8, L: 31, S: void 0, A: ["id", ""] });
-    localStorage.setItem(`${keyPrefix}/${id}`, JSON.stringify(state));
-  }
-});
 var selectionState = ({ getState, setState } = {}) => {
   const setStateDebounced = debounce(setState, 1e3);
   return [
@@ -1667,7 +1663,7 @@ var selectionState = ({ getState, setState } = {}) => {
         key: "Ctrl-r",
         run: (view) => {
           const state = getState(view.state.facet(documentId));
-          if (state) {
+          if (state && (state.scrollTo != null || state.selection)) {
             view.dispatch(createEditorStateTransaction(state));
           }
           return true;
@@ -1678,7 +1674,7 @@ var selectionState = ({ getState, setState } = {}) => {
 };
 
 // src/extensions/comments.ts
-var __dxlog_file9 = "/__w/dxos/dxos/packages/ui/ui-editor/src/extensions/comments.ts";
+var __dxlog_file8 = "/__w/dxos/dxos/packages/ui/ui-editor/src/extensions/comments.ts";
 var setComments = StateEffect3.define();
 var setSelection = StateEffect3.define();
 var setCommentState = StateEffect3.define();
@@ -1748,7 +1744,7 @@ var commentsDecorations = EditorView9.decorations.compute([
   const decorations2 = sortBy(comments2 ?? [], (range) => range.range.from)?.flatMap((comment) => {
     const range = comment.range;
     if (!range) {
-      log6.warn("Invalid range:", range, { "~LogMeta": "~LogMeta", F: __dxlog_file9, L: 93, S: void 0 });
+      log6.warn("Invalid range:", range, { "~LogMeta": "~LogMeta", F: __dxlog_file8, L: 93, S: void 0 });
       return void 0;
     } else if (range.from === range.to) {
       return void 0;
@@ -2514,7 +2510,7 @@ import { getSize } from "@dxos/ui-theme";
 import { StateEffect as StateEffect5 } from "@codemirror/state";
 import { EditorView as EditorView13, ViewPlugin as ViewPlugin9 } from "@codemirror/view";
 import { log as log7 } from "@dxos/log";
-var __dxlog_file10 = "/__w/dxos/dxos/packages/ui/ui-editor/src/extensions/scrolling/crawler.ts";
+var __dxlog_file9 = "/__w/dxos/dxos/packages/ui/ui-editor/src/extensions/scrolling/crawler.ts";
 var crawlerLineEffect = StateEffect5.define();
 var crawlerActiveEffect = StateEffect5.define();
 var scrollToLine = (view, options) => {
@@ -2589,7 +2585,7 @@ var crawler = ({ overScroll = 0 } = {}) => {
             }
           }
         } catch (err) {
-          log7.catch(err, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file10, L: 105, S: void 0 });
+          log7.catch(err, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file9, L: 105, S: void 0 });
         }
       });
     }),
@@ -2967,7 +2963,7 @@ var scroller = ({ overScroll, scrollOnResize, autoScroll: autoScroll2 = true } =
 };
 
 // src/extensions/factories.ts
-var __dxlog_file11 = "/__w/dxos/dxos/packages/ui/ui-editor/src/extensions/factories.ts";
+var __dxlog_file10 = "/__w/dxos/dxos/packages/ui/ui-editor/src/extensions/factories.ts";
 var tabbable = EditorView17.contentAttributes.of({
   tabindex: "0"
 });
@@ -3022,7 +3018,7 @@ var createBasicExtensions = (propsProp) => {
   return [
     // NOTE: Doesn't catch errors in keymap functions.
     EditorView17.exceptionSink.of((err) => {
-      log8.catch(err, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file11, L: 79, S: void 0 });
+      log8.catch(err, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file10, L: 79, S: void 0 });
     }),
     props.allowMultipleSelections && EditorState.allowMultipleSelections.of(true),
     props.bracketMatching && bracketMatching(),
@@ -4724,7 +4720,7 @@ var convertTreeToJson = (state) => {
 import { syntaxTree as syntaxTree7 } from "@codemirror/language";
 import { Prec as Prec4, RangeSetBuilder as RangeSetBuilder5, StateEffect as StateEffect8 } from "@codemirror/state";
 import { Decoration as Decoration11, EditorView as EditorView25, ViewPlugin as ViewPlugin17, WidgetType as WidgetType7 } from "@codemirror/view";
-import { invariant as invariant4 } from "@dxos/invariant";
+import { invariant as invariant3 } from "@dxos/invariant";
 
 // src/extensions/markdown/changes.ts
 import { syntaxTree as syntaxTree4 } from "@codemirror/language";
@@ -5070,7 +5066,8 @@ var formattingStyles = EditorView23.theme({
   },
   "& .cm-codeblock-line": {
     background: "var(--color-cm-codeblock)",
-    paddingInline: "1rem !important"
+    paddingLeft: "1rem !important",
+    paddingRight: "1.5rem !important"
   },
   "& .cm-codeblock-start": {
     borderTopLeftRadius: ".25rem",
@@ -5272,7 +5269,7 @@ var TableWidget = class extends WidgetType6 {
 };
 
 // src/extensions/markdown/decorate.ts
-var __dxlog_file12 = "/__w/dxos/dxos/packages/ui/ui-editor/src/extensions/markdown/decorate.ts";
+var __dxlog_file11 = "/__w/dxos/dxos/packages/ui/ui-editor/src/extensions/markdown/decorate.ts";
 var Unicode = {
   emDash: "\u2014",
   bullet: "\u2022",
@@ -5406,7 +5403,7 @@ var buildDecorations2 = (view, options, focus2) => {
   const { state } = view;
   const headerLevels = [];
   const getHeaderLevels = (node, level) => {
-    invariant4(level > 0, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file12, L: 160, S: void 0, A: ["level > 0", ""] });
+    invariant3(level > 0, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file11, L: 160, S: void 0, A: ["level > 0", ""] });
     if (level > headerLevels.length) {
       const len = headerLevels.length;
       headerLevels.length = level;
@@ -5437,7 +5434,7 @@ var buildDecorations2 = (view, options, focus2) => {
     listLevels.pop();
   };
   const getCurrentListLevel = () => {
-    invariant4(listLevels.length, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file12, L: 192, S: void 0, A: ["listLevels.length", ""] });
+    invariant3(listLevels.length, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file11, L: 192, S: void 0, A: ["listLevels.length", ""] });
     return listLevels[listLevels.length - 1];
   };
   const enterNode = (node) => {
@@ -5850,7 +5847,7 @@ var linkTooltip = (renderTooltip) => {
 // src/extensions/mention.ts
 import { autocompletion } from "@codemirror/autocomplete";
 import { log as log9 } from "@dxos/log";
-var __dxlog_file13 = "/__w/dxos/dxos/packages/ui/ui-editor/src/extensions/mention.ts";
+var __dxlog_file12 = "/__w/dxos/dxos/packages/ui/ui-editor/src/extensions/mention.ts";
 var mention = ({ debug, onSearch }) => {
   return autocompletion({
     // TODO(burdon): Not working.
@@ -5864,7 +5861,7 @@ var mention = ({ debug, onSearch }) => {
       (context) => {
         log9.info("completion context", {
           context
-        }, { "~LogMeta": "~LogMeta", F: __dxlog_file13, L: 18, S: void 0 });
+        }, { "~LogMeta": "~LogMeta", F: __dxlog_file12, L: 18, S: void 0 });
         const match = context.matchBefore(/@(\w+)?/);
         if (!match || match.from === match.to && !context.explicit) {
           return null;
@@ -5942,8 +5939,8 @@ import { Compartment, Facet as Facet3 } from "@codemirror/state";
 import { syntaxTree as syntaxTree9 } from "@codemirror/language";
 import { StateField as StateField10 } from "@codemirror/state";
 import { Facet as Facet2 } from "@codemirror/state";
-import { invariant as invariant5 } from "@dxos/invariant";
-var __dxlog_file14 = "/__w/dxos/dxos/packages/ui/ui-editor/src/extensions/outliner/tree.ts";
+import { invariant as invariant4 } from "@dxos/invariant";
+var __dxlog_file13 = "/__w/dxos/dxos/packages/ui/ui-editor/src/extensions/outliner/tree.ts";
 var itemToJSON = ({ type, index, level, lineRange, contentRange, children }) => {
   return {
     type,
@@ -6097,7 +6094,7 @@ var outlinerTree = (_options = {}) => {
             break;
           }
           case "BulletList": {
-            invariant5(current, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file14, L: 169, S: void 0, A: ["current", ""] });
+            invariant4(current, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file13, L: 169, S: void 0, A: ["current", ""] });
             parent = current;
             if (current) {
               current.lineRange.to = current.node.from;
@@ -6106,7 +6103,7 @@ var outlinerTree = (_options = {}) => {
             break;
           }
           case "ListItem": {
-            invariant5(parent, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file14, L: 179, S: void 0, A: ["parent", ""] });
+            invariant4(parent, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file13, L: 179, S: void 0, A: ["parent", ""] });
             const nextSibling = node.node.nextSibling ?? node.node.parent?.nextSibling;
             const docRange = {
               from: state.doc.lineAt(node.from).from,
@@ -6140,18 +6137,18 @@ var outlinerTree = (_options = {}) => {
             break;
           }
           case "ListMark": {
-            invariant5(current, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file14, L: 219, S: void 0, A: ["current", ""] });
+            invariant4(current, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file13, L: 219, S: void 0, A: ["current", ""] });
             current.type = "bullet";
             current.contentRange.from = node.from + "- ".length;
             break;
           }
           case "Task": {
-            invariant5(current, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file14, L: 226, S: void 0, A: ["current", ""] });
+            invariant4(current, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file13, L: 226, S: void 0, A: ["current", ""] });
             current.type = "task";
             break;
           }
           case "TaskMarker": {
-            invariant5(current, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file14, L: 232, S: void 0, A: ["current", ""] });
+            invariant4(current, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file13, L: 232, S: void 0, A: ["current", ""] });
             current.contentRange.from = node.from + "[ ] ".length;
             break;
           }
@@ -6159,13 +6156,13 @@ var outlinerTree = (_options = {}) => {
       },
       leave: (node) => {
         if (node.name === "BulletList") {
-          invariant5(parent, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file14, L: 240, S: void 0, A: ["parent", ""] });
+          invariant4(parent, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file13, L: 240, S: void 0, A: ["parent", ""] });
           prevSiblings[level--] = void 0;
           parent = parent.parent;
         }
       }
     });
-    invariant5(tree, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file14, L: 246, S: void 0, A: ["tree", ""] });
+    invariant4(tree, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file13, L: 246, S: void 0, A: ["tree", ""] });
     return tree;
   };
   return [
@@ -6457,7 +6454,7 @@ import { mx as mx7 } from "@dxos/ui-theme";
 import { EditorSelection as EditorSelection4, EditorState as EditorState2 } from "@codemirror/state";
 import { ViewPlugin as ViewPlugin18 } from "@codemirror/view";
 import { log as log10 } from "@dxos/log";
-var __dxlog_file15 = "/__w/dxos/dxos/packages/ui/ui-editor/src/extensions/outliner/editor.ts";
+var __dxlog_file14 = "/__w/dxos/dxos/packages/ui/ui-editor/src/extensions/outliner/editor.ts";
 var LIST_ITEM_REGEX = /^\s*- (\[ \]|\[x\])? /;
 var initialize = () => {
   return ViewPlugin18.fromClass(class {
@@ -6607,20 +6604,20 @@ var editor = () => [
             text: insert.toString(),
             length: insert.length
           }
-        }, { "~LogMeta": "~LogMeta", F: __dxlog_file15, L: 174, S: void 0 });
+        }, { "~LogMeta": "~LogMeta", F: __dxlog_file14, L: 174, S: void 0 });
       }
     });
     if (changes.length > 0) {
       log10("modified,", {
         changes
-      }, { "~LogMeta": "~LogMeta", F: __dxlog_file15, L: 196, S: void 0 });
+      }, { "~LogMeta": "~LogMeta", F: __dxlog_file14, L: 196, S: void 0 });
       return [
         {
           changes
         }
       ];
     } else if (cancel) {
-      log10("cancel", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file15, L: 205, S: void 0 });
+      log10("cancel", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file14, L: 205, S: void 0 });
       return [];
     }
     return tr;
@@ -8063,15 +8060,15 @@ var xmlFormatting = ({ skip } = {}) => {
 import { syntaxTree as syntaxTree11 } from "@codemirror/language";
 import { Prec as Prec7, RangeSetBuilder as RangeSetBuilder7, StateEffect as StateEffect13, StateField as StateField14 } from "@codemirror/state";
 import { Decoration as Decoration18, EditorView as EditorView34, ViewPlugin as ViewPlugin26, WidgetType as WidgetType10, keymap as keymap14 } from "@codemirror/view";
-import { invariant as invariant7 } from "@dxos/invariant";
+import { invariant as invariant6 } from "@dxos/invariant";
 import { log as log11 } from "@dxos/log";
 import { Domino as Domino4 } from "@dxos/ui";
 
 // src/extensions/tags/xml-util.ts
-import { invariant as invariant6 } from "@dxos/invariant";
-var __dxlog_file16 = "/__w/dxos/dxos/packages/ui/ui-editor/src/extensions/tags/xml-util.ts";
+import { invariant as invariant5 } from "@dxos/invariant";
+var __dxlog_file15 = "/__w/dxos/dxos/packages/ui/ui-editor/src/extensions/tags/xml-util.ts";
 var nodeToJson = (state, node) => {
-  invariant6(node.type.name === "Element", "Node is not an Element", { "~LogMeta": "~LogMeta", F: __dxlog_file16, L: 8, S: void 0, A: ["node.type.name === 'Element'", "'Node is not an Element'"] });
+  invariant5(node.type.name === "Element", "Node is not an Element", { "~LogMeta": "~LogMeta", F: __dxlog_file15, L: 8, S: void 0, A: ["node.type.name === 'Element'", "'Node is not an Element'"] });
   const openTag = node.node.getChild("OpenTag") || node.node.getChild("SelfClosingTag");
   if (openTag) {
     const tagName = openTag.getChild("TagName");
@@ -8173,7 +8170,7 @@ var decodeXmlEntity = (raw) => {
 };
 
 // src/extensions/tags/xml-tags.ts
-var __dxlog_file17 = "/__w/dxos/dxos/packages/ui/ui-editor/src/extensions/tags/xml-tags.ts";
+var __dxlog_file16 = "/__w/dxos/dxos/packages/ui/ui-editor/src/extensions/tags/xml-tags.ts";
 var navigatePreviousEffect = StateEffect13.define();
 var navigateNextEffect = StateEffect13.define();
 var getXmlTextChild = (children) => {
@@ -8208,7 +8205,7 @@ var widgetStateMapStateField = StateField14.define({
         log11("widget updated", {
           id,
           value
-        }, { "~LogMeta": "~LogMeta", F: __dxlog_file17, L: 59, S: void 0 });
+        }, { "~LogMeta": "~LogMeta", F: __dxlog_file16, L: 59, S: void 0 });
         const state = typeof value === "function" ? value(map[id]) : value;
         return {
           ...map,
@@ -8238,7 +8235,7 @@ var createWidgetMap = (setWidgets) => {
       log11("widget mounted", {
         id: state.id,
         tag: state.props._tag
-      }, { "~LogMeta": "~LogMeta", F: __dxlog_file17, L: 101, S: void 0 });
+      }, { "~LogMeta": "~LogMeta", F: __dxlog_file16, L: 101, S: void 0 });
       widgets.set(state.id, state);
       setWidgets?.([
         ...widgets.values()
@@ -8249,7 +8246,7 @@ var createWidgetMap = (setWidgets) => {
       log11("widget unmounted", {
         id,
         tag: state?.props._tag
-      }, { "~LogMeta": "~LogMeta", F: __dxlog_file17, L: 112, S: void 0 });
+      }, { "~LogMeta": "~LogMeta", F: __dxlog_file16, L: 112, S: void 0 });
       widgets.delete(id);
       setWidgets?.([
         ...widgets.values()
@@ -8420,7 +8417,7 @@ var createWidgetDecorationsField = (registry = {}, notifier) => StateField14.def
         log11("document reset", {
           from,
           to: state.doc.length
-        }, { "~LogMeta": "~LogMeta", F: __dxlog_file17, L: 298, S: void 0 });
+        }, { "~LogMeta": "~LogMeta", F: __dxlog_file16, L: 298, S: void 0 });
         return buildDecorations4(state, {
           from: 0,
           to: state.doc.length
@@ -8509,7 +8506,7 @@ var buildDecorations4 = (state, range, registry, notifier) => {
               }
             }
           } catch (err) {
-            log11.catch(err, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file17, L: 401, S: void 0 });
+            log11.catch(err, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file16, L: 401, S: void 0 });
           }
           return false;
         }
@@ -8588,7 +8585,7 @@ var PlaceholderWidget2 = class extends WidgetType10 {
   #view;
   constructor(id, Component, props, notifier, streaming) {
     super(), this.id = id, this.Component = Component, this.props = props, this.notifier = notifier, this.streaming = streaming;
-    invariant7(id, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file17, L: 488, S: this, A: ["id", ""] });
+    invariant6(id, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file16, L: 488, S: this, A: ["id", ""] });
   }
   get root() {
     return this.#root;
@@ -8637,6 +8634,8 @@ var PlaceholderWidget2 = class extends WidgetType10 {
 };
 export {
   Cursor,
+  EditorSelectionSchema,
+  EditorSelectionStateSchema,
   EditorState4 as EditorState,
   EditorView35 as EditorView,
   Inline,
@@ -8678,7 +8677,6 @@ export {
   createComment,
   createCrawler,
   createDataExtensions,
-  createEditorStateStore,
   createEditorStateTransaction,
   createExternalCommentSync,
   createJsonExtensions,