@dxos/plugin-markdown 0.8.4-staging.60fe92afc8 → 0.9.1-main.c7dcc2e112

package/src/hooks/useExtensions.tsx

@@ -5,7 +5,7 @@
 import { type ViewUpdate } from '@codemirror/view';
 import { useMemo } from 'react';
 
-import { fromUrlPath } from '@dxos/app-toolkit';
+import { Paths } from '@dxos/app-toolkit';
 import { debounceAndThrottle } from '@dxos/async';
 import { Obj } from '@dxos/echo';
 import { createDocAccessor } from '@dxos/echo-client';
@@ -13,7 +13,7 @@ import { invariant } from '@dxos/invariant';
 import { getSpace, useObject } from '@dxos/react-client/echo';
 import { useIdentity } from '@dxos/react-client/halo';
 import { useThemeContext } from '@dxos/react-ui';
-import { type SelectionManager } from '@dxos/react-ui-attention';
+import { selectionAspect, type ViewStateManager } from '@dxos/react-ui-attention';
 import { Text } from '@dxos/schema';
 import { Domino } from '@dxos/ui';
 import {
@@ -51,7 +51,7 @@ export type ExtensionsOptions = {
   compact?: boolean;
   viewMode?: EditorViewMode;
   editable?: boolean;
-  selectionManager?: SelectionManager;
+  viewState?: ViewStateManager;
   editorStateStore?: EditorStateStore;
   previewOptions?: PreviewOptions;
   platform?: 'mobile' | 'desktop';
@@ -66,7 +66,7 @@ export const useExtensions = ({
   settings,
   compact,
   viewMode,
-  selectionManager,
+  viewState,
   editorStateStore,
   previewOptions,
   onSelectObject,
@@ -95,7 +95,7 @@ export const useExtensions = ({
         settings,
         compact,
         viewMode,
-        selectionManager,
+        viewState,
         previewOptions,
         platform,
         onSelectObject,
@@ -105,7 +105,7 @@ export const useExtensions = ({
       object,
       compact,
       viewMode,
-      selectionManager,
+      viewState,
       previewOptions,
       settings,
       settings?.debug,
@@ -155,12 +155,12 @@ const createBaseExtensions = ({
   settings,
   compact,
   viewMode,
-  selectionManager,
+  viewState,
   previewOptions,
   platform,
 }: ExtensionsOptions): Extension[] => {
   const extensions: Extension[] = [
-    selectionManager && selectionChange(selectionManager),
+    viewState && selectionChange(viewState),
     settings?.editorInputMode && InputModeExtensions[settings.editorInputMode],
     settings?.folding && !compact && platform !== 'mobile' && folding(),
   ].filter(isTruthy);
@@ -195,7 +195,7 @@ const createBaseExtensions = ({
   return extensions;
 };
 
-const selectionChange = (selectionManager: SelectionManager) => {
+const selectionChange = (viewState: ViewStateManager) => {
   const debouncedHandler = debounceAndThrottle((update: ViewUpdate) => {
     const id = update.state.facet(documentId);
     const cursorConverter = update.state.facet(Cursor.converter);
@@ -213,7 +213,7 @@ const selectionChange = (selectionManager: SelectionManager) => {
         to: cursorConverter.toCursor(range.to),
       }));
 
-    selectionManager.updateMultiRange(id, ranges);
+    viewState.set(selectionAspect, id, { mode: 'multi-range', ranges });
   }, 100);
 
   return EditorView.updateListener.of((update: ViewUpdate) => {
@@ -228,7 +228,7 @@ const createRenderLink =
   (el, { url }) => {
     // TODO(burdon): Formalize/document internal link format.
     const isInternal = url.startsWith('/') || url.startsWith(window.location.origin);
-    const qualifiedId = isInternal ? fromUrlPath(new URL(url, window.location.origin).pathname) : undefined;
+    const qualifiedId = isInternal ? Paths.fromUrlPath(new URL(url, window.location.origin).pathname) : undefined;
     const icon = Domino.of('span')
       .classNames('dx-link ms-1 inline-block align-[-0.125em]')
       .append(Domino.svg(isInternal ? 'ph--arrow-square-down--regular' : 'ph--arrow-square-out--regular'));

package/src/meta.ts

@@ -3,27 +3,7 @@
 //
 
 import { Plugin } from '@dxos/app-framework';
-import { DXN } from '@dxos/keys';
-import { trim } from '@dxos/util';
 
-export const meta = Plugin.makeMeta({
-  key: DXN.make('org.dxos.plugin.markdown'),
-  name: 'Markdown',
-  author: 'DXOS',
-  description: trim`
-    A full-featured markdown editor for authoring documents in your space. Edits flow through a collaborative CodeMirror surface backed by ECHO Text, so every keystroke replicates to other peers in real time without merge conflicts or lost work.
+import config from '../dx.config';
 
-    Documents can be opened in source, preview, or read-only mode and rendered as a full-surface article or as embeddable cards. An optional formatting toolbar exposes headings, lists, links, and other common markdown actions, and dispositional toolbar actions contributed by other plugins are surfaced inline alongside it.
-
-    The editor integrates with the rest of the workspace through @ references that link to any ECHO object, image and file uploads stored in the active space, and anchored comment threads on text ranges. Comments can optionally be routed to an AI agent on every message or only on @mention.
-
-    A built-in blueprint exposes create, open, and update operations as tools for AI agents. Updates are applied as compact find-and-replace diffs against the document, making it safe for agents to edit large documents incrementally while you continue collaborating.
-  `,
-  icon: 'ph--text-aa--regular',
-  iconHue: 'indigo',
-  source: 'https://github.com/dxos/dxos/tree/main/packages/plugins/plugin-markdown',
-  screenshots: [
-    'https://customer-5rxcjpyab08avpmn.cloudflarestream.com/cdf2656365bb1fd327c1fc2105d75e5a/iframe?poster=https%3A%2F%2Fcustomer-5rxcjpyab08avpmn.cloudflarestream.com%2Fcdf2656365bb1fd327c1fc2105d75e5a%2Fthumbnails%2Fthumbnail.jpg%3Ftime%3D%26height%3D600',
-    'https://dxos.network/plugin-details-markdown-dark.png',
-  ],
-});
+export const meta = Plugin.getMetaFromConfig(config);