@dxos/ui-editor 0.9.0 → 0.9.1-main.c7dcc2e112

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/ui-editor",
-  "version": "0.9.0",
+  "version": "0.9.1-main.c7dcc2e112",
   "description": "Text editor components.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -43,7 +43,7 @@
     "@codemirror/lang-yaml": "^6.1.3",
     "@codemirror/language": "^6.12.3",
     "@codemirror/language-data": "^6.5.2",
-    "@codemirror/lint": "6.9.6",
+    "@codemirror/lint": "6.9.7",
     "@codemirror/search": "^6.7.0",
     "@codemirror/state": "^6.6.0",
     "@codemirror/theme-one-dark": "^6.1.3",
@@ -62,23 +62,23 @@
     "lodash.merge": "^4.6.2",
     "lodash.sortby": "^4.7.0",
     "style-mod": "^4.1.0",
-    "@dxos/async": "0.9.0",
-    "@dxos/client": "0.9.0",
-    "@dxos/app-graph": "0.9.0",
-    "@dxos/display-name": "0.9.0",
-    "@dxos/context": "0.9.0",
-    "@dxos/echo": "0.9.0",
-    "@dxos/echo-client": "0.9.0",
-    "@dxos/debug": "0.9.0",
-    "@dxos/keys": "0.9.0",
-    "@dxos/invariant": "0.9.0",
-    "@dxos/lit-ui": "0.9.0",
-    "@dxos/log": "0.9.0",
-    "@dxos/ui": "0.9.0",
-    "@dxos/protocols": "0.9.0",
-    "@dxos/ui-theme": "0.9.0",
-    "@dxos/ui-types": "0.9.0",
-    "@dxos/util": "0.9.0"
+    "@dxos/app-graph": "0.9.1-main.c7dcc2e112",
+    "@dxos/client": "0.9.1-main.c7dcc2e112",
+    "@dxos/debug": "0.9.1-main.c7dcc2e112",
+    "@dxos/context": "0.9.1-main.c7dcc2e112",
+    "@dxos/display-name": "0.9.1-main.c7dcc2e112",
+    "@dxos/echo": "0.9.1-main.c7dcc2e112",
+    "@dxos/echo-client": "0.9.1-main.c7dcc2e112",
+    "@dxos/invariant": "0.9.1-main.c7dcc2e112",
+    "@dxos/keys": "0.9.1-main.c7dcc2e112",
+    "@dxos/lit-ui": "0.9.1-main.c7dcc2e112",
+    "@dxos/log": "0.9.1-main.c7dcc2e112",
+    "@dxos/ui": "0.9.1-main.c7dcc2e112",
+    "@dxos/protocols": "0.9.1-main.c7dcc2e112",
+    "@dxos/async": "0.9.1-main.c7dcc2e112",
+    "@dxos/ui-theme": "0.9.1-main.c7dcc2e112",
+    "@dxos/util": "0.9.1-main.c7dcc2e112",
+    "@dxos/ui-types": "0.9.1-main.c7dcc2e112"
   },
   "devDependencies": {
     "@automerge/automerge": "3.3.0-fragments.1",
@@ -99,18 +99,18 @@
     "vite": "^8.0.16",
     "vite-plugin-top-level-await": "^1.6.0",
     "vite-plugin-wasm": "^3.6.0",
-    "@dxos/config": "0.9.0",
-    "@dxos/echo": "0.9.0",
-    "@dxos/keyboard": "0.9.0",
-    "@dxos/random": "0.9.0",
-    "@dxos/schema": "0.9.0",
-    "@dxos/storybook-utils": "0.9.0",
-    "@dxos/ui-theme": "0.9.0"
+    "@dxos/config": "0.9.1-main.c7dcc2e112",
+    "@dxos/echo": "0.9.1-main.c7dcc2e112",
+    "@dxos/random": "0.9.1-main.c7dcc2e112",
+    "@dxos/schema": "0.9.1-main.c7dcc2e112",
+    "@dxos/ui-theme": "0.9.1-main.c7dcc2e112",
+    "@dxos/keyboard": "0.9.1-main.c7dcc2e112",
+    "@dxos/storybook-utils": "0.9.1-main.c7dcc2e112"
   },
   "peerDependencies": {
     "@effect/platform": "0.96.1",
     "effect": "3.21.3",
-    "@dxos/ui-theme": "0.9.0"
+    "@dxos/ui-theme": "0.9.1-main.c7dcc2e112"
   },
   "publishConfig": {
     "access": "public"

package/src/defaults.ts

@@ -9,7 +9,9 @@ import { type ThemeExtensionsOptions } from './extensions';
 export const editorClassNames = (role?: string) =>
   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',
+    role === 'org.dxos.role.section'
+      ? '[&_.cm-scroller]:overflow-hidden [&_.cm-scroller]:min-h-24'
+      : 'dx-container overflow-hidden',
   );
 
 export const documentSlots: ThemeExtensionsOptions['slots'] = {

package/src/extensions/markdown/styles.ts

@@ -82,7 +82,8 @@ export const formattingStyles = EditorView.theme({
   },
   '& .cm-codeblock-line': {
     background: 'var(--color-cm-codeblock)',
-    paddingInline: '1rem !important',
+    paddingLeft: '1rem !important',
+    paddingRight: '1.5rem !important',
   },
   '& .cm-codeblock-start': {
     borderTopLeftRadius: '.25rem',

package/src/extensions/selection.test.ts

@@ -0,0 +1,26 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+import * as Schema from 'effect/Schema';
+import { describe, test } from 'vitest';
+
+import { EditorSelectionStateSchema } from './selection';
+
+describe('EditorSelectionStateSchema', () => {
+  test('encode/decode preserves the legacy serialized shape', ({ expect }) => {
+    const value = { scrollTo: 42, selection: { anchor: 3, head: 9 } };
+    const encoded = Schema.encodeSync(EditorSelectionStateSchema)(value);
+    expect(encoded).toEqual(value);
+    expect(Schema.decodeUnknownSync(EditorSelectionStateSchema)(JSON.parse(JSON.stringify(encoded)))).toEqual(value);
+  });
+
+  test('accepts an empty state', ({ expect }) => {
+    expect(Schema.decodeUnknownSync(EditorSelectionStateSchema)({})).toEqual({});
+  });
+
+  test('accepts selection without head', ({ expect }) => {
+    const value = { selection: { anchor: 5 } };
+    expect(Schema.decodeUnknownSync(EditorSelectionStateSchema)(value)).toEqual(value);
+  });
+});

package/src/extensions/selection.ts

@@ -4,9 +4,9 @@
 
 import { type Extension, Transaction, type TransactionSpec } from '@codemirror/state';
 import { EditorView, keymap } from '@codemirror/view';
+import * as Schema from 'effect/Schema';
 
 import { debounce } from '@dxos/async';
-import { invariant } from '@dxos/invariant';
 import { isTruthy } from '@dxos/util';
 
 import { singleValueFacet } from '../util';
@@ -26,6 +26,16 @@ export type EditorSelectionState = {
   selection?: EditorSelection;
 };
 
+export const EditorSelectionSchema = Schema.Struct({
+  anchor: Schema.Number,
+  head: Schema.optional(Schema.Number),
+}).pipe(Schema.mutable);
+
+export const EditorSelectionStateSchema = Schema.Struct({
+  scrollTo: Schema.optional(Schema.Number),
+  selection: Schema.optional(EditorSelectionSchema),
+}).pipe(Schema.mutable);
+
 export type EditorStateStore = {
   setState: (id: string, state: EditorSelectionState) => void;
   getState: (id: string) => EditorSelectionState | undefined;
@@ -42,19 +52,6 @@ export const createEditorStateTransaction = ({ scrollTo, selection }: EditorSele
   };
 };
 
-export const createEditorStateStore = (keyPrefix: string): EditorStateStore => ({
-  getState: (id) => {
-    invariant(id);
-    const state = localStorage.getItem(`${keyPrefix}/${id}`);
-    return state ? JSON.parse(state) : undefined;
-  },
-
-  setState: (id, state) => {
-    invariant(id);
-    localStorage.setItem(`${keyPrefix}/${id}`, JSON.stringify(state));
-  },
-});
-
 /**
  * Track scrolling and selection state to be restored when switching to document.
  */
@@ -89,7 +86,9 @@ export const selectionState = ({ getState, setState }: Partial<EditorStateStore>
           key: 'Ctrl-r', // TODO(burdon): Setting to jump back to selection.
           run: (view) => {
             const state = getState(view.state.facet(documentId));
-            if (state) {
+            // Only restore when something was actually stored; a store may return an empty state
+            // (no scroll/selection) for an unseen document, which would otherwise dispatch a no-op.
+            if (state && (state.scrollTo != null || state.selection)) {
               view.dispatch(createEditorStateTransaction(state));
             }
             return true;