@dxos/react-ui-editor 0.7.5-main.9d26e3a → 0.7.5-main.9d2a38b

package/dist/types/src/components/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/components/index.ts"],"names":[],"mappings":"AAIA,cAAc,WAAW,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/components/index.ts"],"names":[],"mappings":"AAIA,cAAc,iBAAiB,CAAC"}

package/dist/types/src/extensions/comments.d.ts

@@ -1,6 +1,8 @@
 import { type Extension, StateField, type EditorState } from '@codemirror/state';
 import { type Command, EditorView, type Rect } from '@codemirror/view';
 import { type UnsubscribeCallback } from '@dxos/async';
+import { type ReactiveObject } from '@dxos/live-object';
+import { type EditorToolbarState } from '../components';
 import { type Comment, type Range } from '../types';
 type CommentState = {
     comment: Comment;
@@ -87,10 +89,7 @@ export declare const scrollThreadIntoView: (view: EditorView, id: string, center
  */
 export declare const selectionOverlapsComment: (state: EditorState) => boolean;
 export declare const createExternalCommentSync: (id: string, subscribe: (sink: () => void) => UnsubscribeCallback, getComments: () => Comment[]) => Extension;
-export declare const useCommentState: () => [{
-    comment: boolean;
-    selection: boolean;
-}, Extension];
+export declare const useCommentState: (state: ReactiveObject<EditorToolbarState>) => Extension;
 /**
  * @deprecated This hook will be removed in future versions. Use the new comment sync extension instead.
  * Update comments state field.

package/dist/types/src/extensions/comments.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"comments.d.ts","sourceRoot":"","sources":["../../../../src/extensions/comments.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"comments.d.ts","sourceRoot":"","sources":["../../../../src/extensions/comments.ts"],"names":[],"mappings":"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"}

package/dist/types/src/extensions/markdown/editorAction.d.ts

@@ -0,0 +1,12 @@
+import { type EditorView } from '@codemirror/view';
+import { type Action } from '@dxos/app-graph';
+import { type MenuActionProperties } from '@dxos/react-ui-menu';
+export type PayloadType = 'view-mode' | 'blockquote' | 'strong' | 'codeblock' | 'comment' | 'heading' | 'image' | 'emphasis' | 'code' | 'link' | 'list-bullet' | 'list-ordered' | 'list-task' | 'mention' | 'prompt' | 'search' | 'strikethrough' | 'table';
+export type EditorActionPayload = {
+    type: PayloadType;
+    data?: any;
+};
+export type EditorAction = Action<MenuActionProperties & EditorActionPayload>;
+export type EditorPayloadHandler = (view: EditorView, payload: EditorActionPayload) => void;
+export declare const processEditorPayload: EditorPayloadHandler;
+//# sourceMappingURL=editorAction.d.ts.map

package/dist/types/src/extensions/markdown/editorAction.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"editorAction.d.ts","sourceRoot":"","sources":["../../../../../src/extensions/markdown/editorAction.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAEnD,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAsBhE,MAAM,MAAM,WAAW,GACnB,WAAW,GACX,YAAY,GACZ,QAAQ,GACR,WAAW,GACX,SAAS,GACT,SAAS,GACT,OAAO,GACP,UAAU,GACV,MAAM,GACN,MAAM,GACN,aAAa,GACb,cAAc,GACd,WAAW,GACX,SAAS,GACT,QAAQ,GACR,QAAQ,GACR,eAAe,GACf,OAAO,CAAC;AAEZ,MAAM,MAAM,mBAAmB,GAAG;IAChC,IAAI,EAAE,WAAW,CAAC;IAClB,IAAI,CAAC,EAAE,GAAG,CAAC;CACZ,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG,MAAM,CAAC,oBAAoB,GAAG,mBAAmB,CAAC,CAAC;AAE9E,MAAM,MAAM,oBAAoB,GAAG,CAAC,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,mBAAmB,KAAK,IAAI,CAAC;AAE5F,eAAO,MAAM,oBAAoB,EAAE,oBAyDlC,CAAC"}

package/dist/types/src/extensions/markdown/formatting.d.ts

@@ -1,16 +1,18 @@
 import { type Extension, type StateCommand, type EditorState } from '@codemirror/state';
 import { EditorView } from '@codemirror/view';
-export type Formatting = {
-    blankLine?: boolean;
-    blockType?: 'codeblock' | 'heading1' | 'heading2' | 'heading3' | 'heading4' | 'heading5' | 'heading6' | 'paragraph' | 'tablecell' | null;
-    blockQuote?: boolean;
-    strong?: boolean;
-    emphasis?: boolean;
-    strikethrough?: boolean;
-    code?: boolean;
-    link?: boolean;
-    listStyle?: null | 'ordered' | 'bullet' | 'task';
-};
+import { type ReactiveObject } from '@dxos/live-object';
+import { type EditorToolbarState } from '../../components';
+export type Formatting = Partial<{
+    blankLine: boolean;
+    blockType: 'codeblock' | 'heading1' | 'heading2' | 'heading3' | 'heading4' | 'heading5' | 'heading6' | 'paragraph' | 'tablecell' | null;
+    blockQuote: boolean;
+    strong: boolean;
+    emphasis: boolean;
+    strikethrough: boolean;
+    code: boolean;
+    link: boolean;
+    listStyle: null | 'ordered' | 'bullet' | 'task';
+}>;
 export declare const formattingEquals: (a: Formatting, b: Formatting) => boolean;
 export declare enum Inline {
     Strong = 0,
@@ -57,5 +59,5 @@ export declare const getFormatting: (state: EditorState) => Formatting;
 /**
  * Hook provides an extension to compute the current formatting state.
  */
-export declare const useFormattingState: () => [Formatting | undefined, Extension];
+export declare const useFormattingState: (state: ReactiveObject<EditorToolbarState>) => Extension;
 //# sourceMappingURL=formatting.d.ts.map

package/dist/types/src/extensions/markdown/formatting.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"formatting.d.ts","sourceRoot":"","sources":["../../../../../src/extensions/markdown/formatting.ts"],"names":[],"mappings":"AAMA,OAAO,EACL,KAAK,SAAS,EACd,KAAK,YAAY,EACjB,KAAK,WAAW,EAKjB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,UAAU,EAAU,MAAM,kBAAkB,CAAC;AAYtD,MAAM,MAAM,UAAU,GAAG;IACvB,SAAS,CAAC,EAAE,OAAO,CAAC;IAGpB,SAAS,CAAC,EACN,WAAW,GACX,UAAU,GACV,UAAU,GACV,UAAU,GACV,UAAU,GACV,UAAU,GACV,UAAU,GACV,WAAW,GACX,WAAW,GACX,IAAI,CAAC;IAET,UAAU,CAAC,EAAE,OAAO,CAAC;IAErB,MAAM,CAAC,EAAE,OAAO,CAAC;IAEjB,QAAQ,CAAC,EAAE,OAAO,CAAC;IAEnB,aAAa,CAAC,EAAE,OAAO,CAAC;IAExB,IAAI,CAAC,EAAE,OAAO,CAAC;IAEf,IAAI,CAAC,EAAE,OAAO,CAAC;IAEf,SAAS,CAAC,EAAE,IAAI,GAAG,SAAS,GAAG,QAAQ,GAAG,MAAM,CAAC;CAClD,CAAC;AAEF,eAAO,MAAM,gBAAgB,MAAO,UAAU,KAAK,UAAU,YAQ9B,CAAC;AAEhC,oBAAY,MAAM;IAChB,MAAM,IAAI;IACV,QAAQ,IAAI;IACZ,aAAa,IAAI;IACjB,IAAI,IAAI;CACT;AAED,oBAAY,IAAI;IACd,OAAO,IAAA;IACP,MAAM,IAAA;IACN,IAAI,IAAA;CACL;AAMD,eAAO,MAAM,UAAU,UAAW,MAAM,KAAG,YAmE1C,CAAC;AAMF,eAAO,MAAM,QAAQ,SAAU,MAAM,UAAU,OAAO,KAAG,YAqKxD,CAAC;AAEF,eAAO,MAAM,QAAQ,UAAW,MAAM,KAAG,YAAqC,CAAC;AAE/E,eAAO,MAAM,WAAW,UAAW,MAAM,KAAG,YAAsC,CAAC;AAEnF,eAAO,MAAM,WAAW,UAAW,MAAM,KAAG,YAc3C,CAAC;AAEF,eAAO,MAAM,YAAY,cAA6B,CAAC;AACvD,eAAO,MAAM,cAAc,cAA+B,CAAC;AAC3D,eAAO,MAAM,mBAAmB,cAAoC,CAAC;AACrE,eAAO,MAAM,gBAAgB,cAA2B,CAAC;AA0EzD,eAAO,MAAM,WAAW,SAAU,UAAU,SAS3C,CAAC;AA4BF,eAAO,MAAM,UAAU,EAAE,YAUxB,CAAC;AAGF,eAAO,MAAM,OAAO,oBAAoB;IAAE,GAAG,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,OAAO,CAAA;CAAE,KAAQ,YA6FhF,CAAC;AAMF,eAAO,MAAM,OAAO,SAAU,IAAI,KAAG,YAmJpC,CAAC;AAEF,eAAO,MAAM,UAAU,SAAU,IAAI,KAAG,YA+DvC,CAAC;AAEF,eAAO,MAAM,UAAU,SAAU,IAAI,KAAG,YAOvC,CAAC;AAqBF,eAAO,MAAM,aAAa,WAAY,OAAO,KAAG,YAyE/C,CAAC;AAEF,eAAO,MAAM,aAAa,cAAsB,CAAC;AAEjD,eAAO,MAAM,gBAAgB,cAAuB,CAAC;AAErD,eAAO,MAAM,gBAAgB,EAAE,YAE9B,CAAC;AAMF,eAAO,MAAM,YAAY,EAAE,YA8D1B,CAAC;AAEF,eAAO,MAAM,eAAe,EAAE,YA0C7B,CAAC;AAEF,eAAO,MAAM,eAAe,EAAE,YAE7B,CAAC;AAMF,MAAM,MAAM,iBAAiB,GAAG,EAAE,CAAC;AAEnC,eAAO,MAAM,gBAAgB,cAAc,iBAAiB,KAAQ,SAanE,CAAC;AA4CF;;GAEG;AACH,eAAO,MAAM,aAAa,UAAW,WAAW,KAAG,UAqKlD,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,kBAAkB,QAAO,CAAC,UAAU,GAAG,SAAS,EAAE,SAAS,CAoBvE,CAAC"}
+{"version":3,"file":"formatting.d.ts","sourceRoot":"","sources":["../../../../../src/extensions/markdown/formatting.ts"],"names":[],"mappings":"AAMA,OAAO,EACL,KAAK,SAAS,EACd,KAAK,YAAY,EACjB,KAAK,WAAW,EAKjB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,UAAU,EAAU,MAAM,kBAAkB,CAAC;AAItD,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAExD,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAU3D,MAAM,MAAM,UAAU,GAAG,OAAO,CAAC;IAC/B,SAAS,EAAE,OAAO,CAAC;IAGnB,SAAS,EACL,WAAW,GACX,UAAU,GACV,UAAU,GACV,UAAU,GACV,UAAU,GACV,UAAU,GACV,UAAU,GACV,WAAW,GACX,WAAW,GACX,IAAI,CAAC;IAET,UAAU,EAAE,OAAO,CAAC;IAEpB,MAAM,EAAE,OAAO,CAAC;IAEhB,QAAQ,EAAE,OAAO,CAAC;IAElB,aAAa,EAAE,OAAO,CAAC;IAEvB,IAAI,EAAE,OAAO,CAAC;IAEd,IAAI,EAAE,OAAO,CAAC;IAEd,SAAS,EAAE,IAAI,GAAG,SAAS,GAAG,QAAQ,GAAG,MAAM,CAAC;CACjD,CAAC,CAAC;AAEH,eAAO,MAAM,gBAAgB,MAAO,UAAU,KAAK,UAAU,YAQ9B,CAAC;AAEhC,oBAAY,MAAM;IAChB,MAAM,IAAI;IACV,QAAQ,IAAI;IACZ,aAAa,IAAI;IACjB,IAAI,IAAI;CACT;AAED,oBAAY,IAAI;IACd,OAAO,IAAA;IACP,MAAM,IAAA;IACN,IAAI,IAAA;CACL;AAMD,eAAO,MAAM,UAAU,UAAW,MAAM,KAAG,YAmE1C,CAAC;AAMF,eAAO,MAAM,QAAQ,SAAU,MAAM,UAAU,OAAO,KAAG,YAqKxD,CAAC;AAEF,eAAO,MAAM,QAAQ,UAAW,MAAM,KAAG,YAAqC,CAAC;AAE/E,eAAO,MAAM,WAAW,UAAW,MAAM,KAAG,YAAsC,CAAC;AAEnF,eAAO,MAAM,WAAW,UAAW,MAAM,KAAG,YAc3C,CAAC;AAEF,eAAO,MAAM,YAAY,cAA6B,CAAC;AACvD,eAAO,MAAM,cAAc,cAA+B,CAAC;AAC3D,eAAO,MAAM,mBAAmB,cAAoC,CAAC;AACrE,eAAO,MAAM,gBAAgB,cAA2B,CAAC;AA0EzD,eAAO,MAAM,WAAW,SAAU,UAAU,SAS3C,CAAC;AA4BF,eAAO,MAAM,UAAU,EAAE,YAUxB,CAAC;AAGF,eAAO,MAAM,OAAO,oBAAoB;IAAE,GAAG,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,OAAO,CAAA;CAAE,KAAQ,YA6FhF,CAAC;AAMF,eAAO,MAAM,OAAO,SAAU,IAAI,KAAG,YAmJpC,CAAC;AAEF,eAAO,MAAM,UAAU,SAAU,IAAI,KAAG,YA+DvC,CAAC;AAEF,eAAO,MAAM,UAAU,SAAU,IAAI,KAAG,YAOvC,CAAC;AAqBF,eAAO,MAAM,aAAa,WAAY,OAAO,KAAG,YAyE/C,CAAC;AAEF,eAAO,MAAM,aAAa,cAAsB,CAAC;AAEjD,eAAO,MAAM,gBAAgB,cAAuB,CAAC;AAErD,eAAO,MAAM,gBAAgB,EAAE,YAE9B,CAAC;AAMF,eAAO,MAAM,YAAY,EAAE,YA8D1B,CAAC;AAEF,eAAO,MAAM,eAAe,EAAE,YA0C7B,CAAC;AAEF,eAAO,MAAM,eAAe,EAAE,YAE7B,CAAC;AAMF,MAAM,MAAM,iBAAiB,GAAG,EAAE,CAAC;AAEnC,eAAO,MAAM,gBAAgB,cAAc,iBAAiB,KAAQ,SAanE,CAAC;AA4CF;;GAEG;AACH,eAAO,MAAM,aAAa,UAAW,WAAW,KAAG,UAqKlD,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,kBAAkB,UAAW,cAAc,CAAC,kBAAkB,CAAC,KAAG,SAY9E,CAAC"}

package/dist/types/src/extensions/markdown/index.d.ts

@@ -1,4 +1,4 @@
-export * from './action';
+export * from './editorAction';
 export * from './bundle';
 export * from './debug';
 export * from './decorate';

package/dist/types/src/extensions/markdown/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/extensions/markdown/index.ts"],"names":[],"mappings":"AAIA,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC;AACzB,cAAc,SAAS,CAAC;AACxB,cAAc,YAAY,CAAC;AAC3B,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,SAAS,CAAC;AACxB,cAAc,QAAQ,CAAC;AACvB,cAAc,SAAS,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/extensions/markdown/index.ts"],"names":[],"mappings":"AAIA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,UAAU,CAAC;AACzB,cAAc,SAAS,CAAC;AACxB,cAAc,YAAY,CAAC;AAC3B,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,SAAS,CAAC;AACxB,cAAc,QAAQ,CAAC;AACvB,cAAc,SAAS,CAAC"}

package/dist/types/src/extensions/markdown/styles.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"styles.d.ts","sourceRoot":"","sources":["../../../../../src/extensions/markdown/styles.ts"],"names":[],"mappings":"AAQA,eAAO,MAAM,0BAA0B,KAAK,CAAC;AAC7C,eAAO,MAAM,2BAA2B,KAAK,CAAC;AAE9C,eAAO,MAAM,gBAAgB,uCAqG3B,CAAC"}
+{"version":3,"file":"styles.d.ts","sourceRoot":"","sources":["../../../../../src/extensions/markdown/styles.ts"],"names":[],"mappings":"AAQA,eAAO,MAAM,0BAA0B,KAAK,CAAC;AAC7C,eAAO,MAAM,2BAA2B,KAAK,CAAC;AAE9C,eAAO,MAAM,gBAAgB,uCA0H3B,CAAC"}

package/dist/types/src/hooks/useActionHandler.d.ts

@@ -1,4 +1,4 @@
 import { type EditorView } from '@codemirror/view';
-import { type ToolbarProps } from '../components';
-export declare const useActionHandler: (view?: EditorView | null) => ToolbarProps["onAction"];
+import { type EditorAction } from '../extensions';
+export declare const useActionHandler: (view?: EditorView | null) => (action: EditorAction) => void | null | undefined;
 //# sourceMappingURL=useActionHandler.d.ts.map

package/dist/types/src/hooks/useActionHandler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useActionHandler.d.ts","sourceRoot":"","sources":["../../../../src/hooks/useActionHandler.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAEnD,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,eAAe,CAAC;AAGlD,eAAO,MAAM,gBAAgB,UAAW,UAAU,GAAG,IAAI,KAAG,YAAY,CAAC,UAAU,CAElF,CAAC"}
+{"version":3,"file":"useActionHandler.d.ts","sourceRoot":"","sources":["../../../../src/hooks/useActionHandler.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAGnD,OAAO,EAAE,KAAK,YAAY,EAAwB,MAAM,eAAe,CAAC;AAExE,eAAO,MAAM,gBAAgB,UAAW,UAAU,GAAG,IAAI,cAC3B,YAAY,4BACzC,CAAC"}

package/dist/types/src/index.d.ts

@@ -7,6 +7,7 @@ export * from './components';
 export * from './defaults';
 export * from './extensions';
 export * from './hooks';
+export { stackItemContentEditorClassNames, stackItemContentToolbarClassNames, } from './styles/stack-item-content-class-names';
 export * from './types';
 export * from './util';
 export { translations };

package/dist/types/src/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAIA,OAAO,YAAY,MAAM,gBAAgB,CAAC;AAE1C,OAAO,EAAE,KAAK,SAAS,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChE,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAExC,OAAO,EAAE,QAAQ,EAAE,MAAM,4CAA4C,CAAC;AAEtE,cAAc,cAAc,CAAC;AAC7B,cAAc,YAAY,CAAC;AAC3B,cAAc,cAAc,CAAC;AAC7B,cAAc,SAAS,CAAC;AACxB,cAAc,SAAS,CAAC;AACxB,cAAc,QAAQ,CAAC;AAEvB,OAAO,EAAE,YAAY,EAAE,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAIA,OAAO,YAAY,MAAM,gBAAgB,CAAC;AAE1C,OAAO,EAAE,KAAK,SAAS,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChE,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAExC,OAAO,EAAE,QAAQ,EAAE,MAAM,4CAA4C,CAAC;AAEtE,cAAc,cAAc,CAAC;AAC7B,cAAc,YAAY,CAAC;AAC3B,cAAc,cAAc,CAAC;AAC7B,cAAc,SAAS,CAAC;AACxB,OAAO,EACL,gCAAgC,EAChC,iCAAiC,GAClC,MAAM,yCAAyC,CAAC;AACjD,cAAc,SAAS,CAAC;AACxB,cAAc,QAAQ,CAAC;AAEvB,OAAO,EAAE,YAAY,EAAE,CAAC"}

package/dist/types/src/styles/stack-item-content-class-names.d.ts

@@ -0,0 +1,3 @@
+export declare const stackItemContentEditorClassNames: (role?: string) => string;
+export declare const stackItemContentToolbarClassNames: (role?: string) => string;
+//# sourceMappingURL=stack-item-content-class-names.d.ts.map

package/dist/types/src/styles/stack-item-content-class-names.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"stack-item-content-class-names.d.ts","sourceRoot":"","sources":["../../../../src/styles/stack-item-content-class-names.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,gCAAgC,UAAW,MAAM,WAI3D,CAAC;AAEJ,eAAO,MAAM,iCAAiC,UAAW,MAAM,WAI5D,CAAC"}

package/dist/types/tsconfig.tsbuildinfo

@@ -1 +1 @@
-{"version":"5.7.2"}
+{"version":"5.7.3"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/react-ui-editor",
-  "version": "0.7.5-main.9d26e3a",
+  "version": "0.7.5-main.9d2a38b",
   "description": "Document editing experience within a DXOS shell.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -39,6 +39,7 @@
     "@lezer/generator": "^1.7.1",
     "@lezer/highlight": "^1.2.1",
     "@lezer/markdown": "^1.3.1",
+    "@preact/signals-react": "^1.3.8",
     "@radix-ui/react-context": "^1.0.0",
     "@replit/codemirror-vim": "^6.2.1",
     "@replit/codemirror-vscode-keymap": "^6.0.2",
@@ -48,24 +49,24 @@
     "lodash.get": "^4.4.2",
     "lodash.merge": "^4.6.2",
     "lodash.sortby": "^4.7.0",
-    "react-dropzone": "^14.2.3",
     "style-mod": "^4.1.0",
-    "@dxos/async": "0.7.5-main.9d26e3a",
-    "@dxos/context": "0.7.5-main.9d26e3a",
-    "@dxos/automerge": "0.7.5-main.9d26e3a",
-    "@dxos/display-name": "0.7.5-main.9d26e3a",
-    "@dxos/echo-schema": "0.7.5-main.9d26e3a",
-    "@dxos/invariant": "0.7.5-main.9d26e3a",
-    "@dxos/live-object": "0.7.5-main.9d26e3a",
-    "@dxos/debug": "0.7.5-main.9d26e3a",
-    "@dxos/log": "0.7.5-main.9d26e3a",
-    "@dxos/protocols": "0.7.5-main.9d26e3a",
-    "@dxos/react-hooks": "0.7.5-main.9d26e3a",
-    "@dxos/util": "0.7.5-main.9d26e3a"
+    "@dxos/app-graph": "0.7.5-main.9d2a38b",
+    "@dxos/automerge": "0.7.5-main.9d2a38b",
+    "@dxos/context": "0.7.5-main.9d2a38b",
+    "@dxos/async": "0.7.5-main.9d2a38b",
+    "@dxos/debug": "0.7.5-main.9d2a38b",
+    "@dxos/display-name": "0.7.5-main.9d2a38b",
+    "@dxos/invariant": "0.7.5-main.9d2a38b",
+    "@dxos/live-object": "0.7.5-main.9d2a38b",
+    "@dxos/echo-schema": "0.7.5-main.9d2a38b",
+    "@dxos/log": "0.7.5-main.9d2a38b",
+    "@dxos/react-ui-menu": "0.7.5-main.9d2a38b",
+    "@dxos/util": "0.7.5-main.9d2a38b",
+    "@dxos/protocols": "0.7.5-main.9d2a38b",
+    "@dxos/react-hooks": "0.7.5-main.9d2a38b"
   },
   "devDependencies": {
     "@phosphor-icons/react": "^2.1.5",
-    "@preact/signals-react": "^1.3.8",
     "@types/chai": "^4.2.15",
     "@types/chai-dom": "^1.11.0",
     "@types/lodash.defaultsdeep": "^4.6.6",
@@ -86,23 +87,23 @@
     "vite": "5.4.7",
     "vite-plugin-top-level-await": "^1.4.1",
     "vite-plugin-wasm": "^3.3.0",
-    "@dxos/automerge": "0.7.5-main.9d26e3a",
-    "@dxos/config": "0.7.5-main.9d26e3a",
-    "@dxos/echo-signals": "0.7.5-main.9d26e3a",
-    "@dxos/keyboard": "0.7.5-main.9d26e3a",
-    "@dxos/random": "0.7.5-main.9d26e3a",
-    "@dxos/react-client": "0.7.5-main.9d26e3a",
-    "@dxos/react-ui": "0.7.5-main.9d26e3a",
-    "@dxos/storybook-utils": "0.7.5-main.9d26e3a",
-    "@dxos/react-ui-theme": "0.7.5-main.9d26e3a"
+    "@dxos/automerge": "0.7.5-main.9d2a38b",
+    "@dxos/config": "0.7.5-main.9d2a38b",
+    "@dxos/echo-signals": "0.7.5-main.9d2a38b",
+    "@dxos/keyboard": "0.7.5-main.9d2a38b",
+    "@dxos/random": "0.7.5-main.9d2a38b",
+    "@dxos/react-client": "0.7.5-main.9d2a38b",
+    "@dxos/react-ui": "0.7.5-main.9d2a38b",
+    "@dxos/storybook-utils": "0.7.5-main.9d2a38b",
+    "@dxos/react-ui-theme": "0.7.5-main.9d2a38b"
   },
   "peerDependencies": {
     "@phosphor-icons/react": "^2.1.5",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
-    "@dxos/react-client": "0.7.5-main.9d26e3a",
-    "@dxos/react-ui": "0.7.5-main.9d26e3a",
-    "@dxos/react-ui-theme": "0.7.5-main.9d26e3a"
+    "@dxos/react-client": "0.7.5-main.9d2a38b",
+    "@dxos/react-ui-theme": "0.7.5-main.9d2a38b",
+    "@dxos/react-ui": "0.7.5-main.9d2a38b"
   },
   "publishConfig": {
     "access": "public"

package/src/InputMode.stories.tsx

@@ -7,10 +7,10 @@ import '@dxos-theme';
 import React, { useState } from 'react';
 
 import { Toolbar as NaturalToolbar, Select, useThemeContext } from '@dxos/react-ui';
-import { attentionSurface, mx, textBlockWidth } from '@dxos/react-ui-theme';
+import { attentionSurface, mx } from '@dxos/react-ui-theme';
 import { withLayout, withTheme } from '@dxos/storybook-utils';
 
-import { Toolbar } from './components';
+import { EditorToolbar, useEditorToolbarState } from './components';
 import {
   type EditorInputMode,
   decorateMarkdown,
@@ -28,8 +28,9 @@ type StoryProps = { placeholder?: string; readonly?: boolean } & UseTextEditorPr
 
 const DefaultStory = ({ autoFocus, initialValue, placeholder, readonly }: StoryProps) => {
   const { themeMode } = useThemeContext();
-  const [formattingState, trackFormatting] = useFormattingState();
-  const [editorInputMode, setEditorInputMode] = useState<EditorInputMode>('default');
+  const toolbarState = useEditorToolbarState({ viewMode: 'source' });
+  const trackFormatting = useFormattingState(toolbarState);
+  const [editorInputMode, _setEditorInputMode] = useState<EditorInputMode>('default');
   const { parentRef, view } = useTextEditor(
     () => ({
       autoFocus,
@@ -54,11 +55,7 @@ const DefaultStory = ({ autoFocus, initialValue, placeholder, readonly }: StoryP
   //  Also not sure if view is even guaranteed to exist at this point.
   return (
     <div role='none' className={mx('fixed inset-0 flex flex-col')}>
-      <Toolbar.Root onAction={handleAction} state={formattingState} classNames={textBlockWidth}>
-        <Toolbar.Markdown />
-        <EditorInputModeToolbar editorInputMode={editorInputMode} setEditorInputMode={setEditorInputMode} />
-      </Toolbar.Root>
-
+      {toolbarState && <EditorToolbar onAction={handleAction} state={toolbarState} />}
       <div role='none' className='grow overflow-hidden'>
         <div className={attentionSurface} ref={parentRef} />
       </div>
@@ -66,7 +63,7 @@ const DefaultStory = ({ autoFocus, initialValue, placeholder, readonly }: StoryP
   );
 };
 
-const EditorInputModeToolbar = ({
+const _EditorInputModeToolbar = ({
   editorInputMode,
   setEditorInputMode,
 }: {

package/src/components/EditorToolbar/EditorToolbar.tsx

@@ -0,0 +1,106 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+import React, { useCallback } from 'react';
+
+import { type NodeArg } from '@dxos/app-graph';
+import { ElevationProvider } from '@dxos/react-ui';
+import {
+  ToolbarMenu,
+  MenuProvider,
+  type MenuActionHandler,
+  useMenuActions,
+  createGapSeparator,
+} from '@dxos/react-ui-menu';
+import { textBlockWidth } from '@dxos/react-ui-theme';
+
+import { createBlocks } from './blocks';
+import { createComment } from './comment';
+import { createFormatting } from './formatting';
+import { createHeadings } from './headings';
+import { createLists } from './lists';
+import {
+  type EditorToolbarActionGraphProps,
+  type EditorToolbarFeatureFlags,
+  type EditorToolbarProps,
+  editorToolbarSearch,
+} from './util';
+import { createViewMode } from './viewMode';
+import { stackItemContentToolbarClassNames } from '../../styles/stack-item-content-class-names';
+
+const createToolbar = ({
+  state,
+  customActions,
+  ...features
+}: EditorToolbarFeatureFlags & Pick<EditorToolbarActionGraphProps, 'state' | 'customActions'>): {
+  nodes: NodeArg<any>[];
+  edges: { source: string; target: string }[];
+} => {
+  const nodes = [];
+  const edges = [];
+  if (features.headings ?? true) {
+    const headings = createHeadings(state);
+    nodes.push(...headings.nodes);
+    edges.push(...headings.edges);
+  }
+  if (features.formatting ?? true) {
+    const formatting = createFormatting(state);
+    nodes.push(...formatting.nodes);
+    edges.push(...formatting.edges);
+  }
+  if (features.lists ?? true) {
+    const lists = createLists(state);
+    nodes.push(...lists.nodes);
+    edges.push(...lists.edges);
+  }
+  if (features.blocks ?? true) {
+    const blocks = createBlocks(state);
+    nodes.push(...blocks.nodes);
+    edges.push(...blocks.edges);
+  }
+  if (customActions) {
+    const custom = customActions();
+    nodes.push(...custom.nodes);
+    edges.push(...custom.edges);
+  }
+  const editorToolbarGap = createGapSeparator();
+  nodes.push(...editorToolbarGap.nodes);
+  edges.push(...editorToolbarGap.edges);
+  if (features.comment ?? true) {
+    const comment = createComment(state);
+    nodes.push(...comment.nodes);
+    edges.push(...comment.edges);
+  }
+  if (features.search ?? true) {
+    nodes.push(editorToolbarSearch);
+    edges.push({ source: 'root', target: editorToolbarSearch.id });
+  }
+  if (features.viewMode ?? true) {
+    const viewMode = createViewMode(state);
+    nodes.push(...viewMode.nodes);
+    edges.push(...viewMode.edges);
+  }
+  return { nodes, edges };
+};
+
+const useEditorToolbarActionGraph = ({ onAction, ...props }: EditorToolbarProps) => {
+  const menuCreator = useCallback(() => createToolbar(props), [props]);
+
+  const { resolveGroupItems } = useMenuActions(menuCreator);
+
+  return { resolveGroupItems, onAction: onAction as MenuActionHandler };
+};
+
+export const EditorToolbar = ({ classNames, attendableId, role, ...props }: EditorToolbarProps) => {
+  const menuProps = useEditorToolbarActionGraph(props);
+  return (
+    <div role='none' className={stackItemContentToolbarClassNames(role)}>
+      <ElevationProvider elevation={role === 'section' ? 'positioned' : 'base'}>
+        <MenuProvider {...menuProps} attendableId={attendableId}>
+          <ToolbarMenu classNames={[textBlockWidth, '!bg-transparent', classNames]} />
+        </MenuProvider>
+      </ElevationProvider>
+    </div>
+  );
+};

package/src/components/EditorToolbar/blocks.ts

@@ -0,0 +1,41 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { type NodeArg } from '@dxos/app-graph';
+import { type ToolbarMenuActionGroupProperties } from '@dxos/react-ui-menu';
+
+import { createEditorAction, createEditorActionGroup, type EditorToolbarState } from './util';
+import { type PayloadType } from '../../extensions';
+
+const createBlockGroupAction = (value: string) =>
+  createEditorActionGroup('block', {
+    variant: 'toggleGroup',
+    selectCardinality: 'single',
+    value,
+  } as ToolbarMenuActionGroupProperties);
+
+const createBlockActions = (value: string, blankLine?: boolean) =>
+  Object.entries({
+    blockquote: 'ph--quotes--regular',
+    codeblock: 'ph--code-block--regular',
+    table: 'ph--table--regular',
+  }).map(([type, icon]) => {
+    return createEditorAction(
+      { type: type as PayloadType, checked: type === value, ...(type === 'table' && { disabled: !!blankLine }) },
+      icon,
+    );
+  });
+
+export const createBlocks = (state: EditorToolbarState) => {
+  const value = state?.blockQuote ? 'blockquote' : state.blockType ?? '';
+  const blockGroupAction = createBlockGroupAction(value);
+  const blockActions = createBlockActions(value, state.blankLine);
+  return {
+    nodes: [blockGroupAction as NodeArg<any>, ...blockActions],
+    edges: [
+      { source: 'root', target: 'block' },
+      ...blockActions.map(({ id }) => ({ source: blockGroupAction.id, target: id })),
+    ],
+  };
+};

package/src/components/EditorToolbar/comment.ts

@@ -0,0 +1,20 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { createEditorAction, type EditorToolbarState } from './util';
+
+const commentLabel = (comment?: boolean, selection?: boolean) =>
+  comment
+    ? 'selection overlaps existing comment label'
+    : selection === false
+      ? 'select text to comment label'
+      : 'comment label';
+
+const createCommentAction = (label: string) =>
+  createEditorAction({ type: 'comment', testId: 'editor.toolbar.comment' }, 'ph--chat-text--regular', label);
+
+export const createComment = (state: EditorToolbarState) => ({
+  nodes: [createCommentAction(commentLabel(state.comment, state.selection))],
+  edges: [{ source: 'root', target: 'comment' }],
+});

package/src/components/EditorToolbar/formatting.ts

@@ -0,0 +1,41 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { type NodeArg } from '@dxos/app-graph';
+import { type ToolbarMenuActionGroupProperties } from '@dxos/react-ui-menu';
+
+import { createEditorAction, createEditorActionGroup, type EditorToolbarState } from './util';
+import { type Formatting, type PayloadType } from '../../extensions';
+
+const formats = {
+  strong: 'ph--text-b--regular',
+  emphasis: 'ph--text-italic--regular',
+  strikethrough: 'ph--text-strikethrough--regular',
+  code: 'ph--code--regular',
+  link: 'ph--link--regular',
+};
+
+const createFormattingGroup = (formatting: Formatting) =>
+  createEditorActionGroup('formatting', {
+    variant: 'toggleGroup',
+    selectCardinality: 'multiple',
+    value: Object.keys(formats).filter((key) => !!formatting[key as keyof Formatting]),
+  } as ToolbarMenuActionGroupProperties);
+
+const createFormattingActions = (formatting: Formatting) =>
+  Object.entries(formats).map(([type, icon]) =>
+    createEditorAction({ type: type as PayloadType, checked: !!formatting[type as keyof Formatting] }, icon),
+  );
+
+export const createFormatting = (state: EditorToolbarState) => {
+  const formattingGroupAction = createFormattingGroup(state);
+  const formattingActions = createFormattingActions(state);
+  return {
+    nodes: [formattingGroupAction as NodeArg<any>, ...formattingActions],
+    edges: [
+      { source: 'root', target: 'formatting' },
+      ...formattingActions.map(({ id }) => ({ source: formattingGroupAction.id, target: id })),
+    ],
+  };
+};

package/src/components/EditorToolbar/headings.ts

@@ -0,0 +1,59 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { type NodeArg } from '@dxos/app-graph';
+import { type ToolbarMenuActionGroupProperties } from '@dxos/react-ui-menu';
+
+import { createEditorAction, createEditorActionGroup, type EditorToolbarState } from './util';
+import { translationKey } from '../../translations';
+
+const createHeadingGroupAction = (value: string) =>
+  createEditorActionGroup(
+    'heading',
+    {
+      variant: 'dropdownMenu',
+      applyActive: true,
+      selectCardinality: 'single',
+      value,
+    } as ToolbarMenuActionGroupProperties,
+    'ph--text-h--regular',
+  );
+
+const createHeadingActions = (value: string) =>
+  Object.entries({
+    '0': 'ph--paragraph--regular',
+    '1': 'ph--text-h-one--regular',
+    '2': 'ph--text-h-two--regular',
+    '3': 'ph--text-h-three--regular',
+    '4': 'ph--text-h-four--regular',
+    '5': 'ph--text-h-five--regular',
+    '6': 'ph--text-h-six--regular',
+  }).map(([levelStr, icon]) => {
+    const level = parseInt(levelStr);
+    return createEditorAction(
+      { type: 'heading', data: level, checked: value === levelStr },
+      icon,
+      ['heading level label', { count: level, ns: translationKey }],
+      `heading--${levelStr}`,
+    );
+  });
+
+const computeHeadingValue = (state: EditorToolbarState) => {
+  const blockType = state ? state.blockType : 'paragraph';
+  const header = blockType && /heading(\d)/.exec(blockType);
+  return header ? header[1] : blockType === 'paragraph' || !blockType ? '0' : '';
+};
+
+export const createHeadings = (state: EditorToolbarState) => {
+  const headingValue = computeHeadingValue(state);
+  const headingGroupAction = createHeadingGroupAction(headingValue);
+  const headingActions = createHeadingActions(headingValue);
+  return {
+    nodes: [headingGroupAction as NodeArg<any>, ...headingActions],
+    edges: [
+      { source: 'root', target: 'heading' },
+      ...headingActions.map(({ id }) => ({ source: headingGroupAction.id, target: id })),
+    ],
+  };
+};

package/src/components/EditorToolbar/index.ts

@@ -0,0 +1,6 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+export * from './EditorToolbar';
+export { type EditorToolbarState, useEditorToolbarState, createEditorAction, createEditorActionGroup } from './util';

package/src/components/EditorToolbar/lists.ts

@@ -0,0 +1,40 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { type NodeArg } from '@dxos/app-graph';
+import { type ToolbarMenuActionGroupProperties } from '@dxos/react-ui-menu';
+
+import { createEditorAction, createEditorActionGroup, type EditorToolbarState } from './util';
+import { type PayloadType } from '../../extensions';
+
+const listStyles = {
+  bullet: 'ph--list-bullets--regular',
+  ordered: 'ph--list-numbers--regular',
+  task: 'ph--list-checks--regular',
+};
+
+const createListGroupAction = (value: string) =>
+  createEditorActionGroup('list', {
+    variant: 'toggleGroup',
+    selectCardinality: 'single',
+    value,
+  } as ToolbarMenuActionGroupProperties);
+
+const createListActions = (value: string) =>
+  Object.entries(listStyles).map(([listStyle, icon]) =>
+    createEditorAction({ type: `list-${listStyle}` as PayloadType, checked: value === listStyle }, icon),
+  );
+
+export const createLists = (state: EditorToolbarState) => {
+  const value = state.listStyle ?? '';
+  const listGroupAction = createListGroupAction(value);
+  const listActionsMap = createListActions(value);
+  return {
+    nodes: [listGroupAction as NodeArg<any>, ...listActionsMap],
+    edges: [
+      { source: 'root', target: 'list' },
+      ...listActionsMap.map(({ id }) => ({ source: listGroupAction.id, target: id })),
+    ],
+  };
+};