@dxos/plugin-help 0.8.4-main.21d9917 → 0.8.4-main.2244d791bb

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-help",
-  "version": "0.8.4-main.21d9917",
+  "version": "0.8.4-main.2244d791bb",
   "description": "Help plugin.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -45,47 +45,48 @@
     "src"
   ],
   "dependencies": {
-    "@effect-atom/atom": "^0.4.13",
+    "@effect-atom/atom": "^0.5.1",
     "@fluentui/react-tabster": "9.26.11",
     "react-joyride": "^2.7.2",
-    "@dxos/app-framework": "0.8.4-main.21d9917",
-    "@dxos/app-graph": "0.8.4-main.21d9917",
-    "@dxos/debug": "0.8.4-main.21d9917",
-    "@dxos/operation": "0.8.4-main.21d9917",
-    "@dxos/echo": "0.8.4-main.21d9917",
-    "@dxos/effect": "0.8.4-main.21d9917",
-    "@dxos/plugin-graph": "0.8.4-main.21d9917",
-    "@dxos/keyboard": "0.8.4-main.21d9917",
-    "@dxos/plugin-client": "0.8.4-main.21d9917",
-    "@dxos/plugin-space": "0.8.4-main.21d9917",
-    "@dxos/util": "0.8.4-main.21d9917",
-    "@dxos/react-client": "0.8.4-main.21d9917"
+    "@dxos/app-framework": "0.8.4-main.2244d791bb",
+    "@dxos/app-toolkit": "0.8.4-main.2244d791bb",
+    "@dxos/app-graph": "0.8.4-main.2244d791bb",
+    "@dxos/debug": "0.8.4-main.2244d791bb",
+    "@dxos/effect": "0.8.4-main.2244d791bb",
+    "@dxos/echo": "0.8.4-main.2244d791bb",
+    "@dxos/keyboard": "0.8.4-main.2244d791bb",
+    "@dxos/plugin-client": "0.8.4-main.2244d791bb",
+    "@dxos/operation": "0.8.4-main.2244d791bb",
+    "@dxos/plugin-space": "0.8.4-main.2244d791bb",
+    "@dxos/plugin-graph": "0.8.4-main.2244d791bb",
+    "@dxos/util": "0.8.4-main.2244d791bb",
+    "@dxos/react-client": "0.8.4-main.2244d791bb"
   },
   "devDependencies": {
-    "@effect-atom/atom-react": "^0.4.6",
-    "@effect/platform": "0.93.6",
+    "@effect-atom/atom-react": "^0.5.0",
+    "@effect/platform": "0.94.4",
     "@types/react": "~19.2.7",
     "@types/react-dom": "~19.2.3",
-    "effect": "3.19.11",
+    "effect": "3.19.16",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
     "react-floater": "0.7.9",
     "type-fest": "4.10.1",
     "vite": "7.1.9",
-    "@dxos/plugin-testing": "0.8.4-main.21d9917",
-    "@dxos/random": "0.8.4-main.21d9917",
-    "@dxos/react-ui": "0.8.4-main.21d9917",
-    "@dxos/storybook-utils": "0.8.4-main.21d9917",
-    "@dxos/ui-theme": "0.8.4-main.21d9917"
+    "@dxos/random": "0.8.4-main.2244d791bb",
+    "@dxos/plugin-testing": "0.8.4-main.2244d791bb",
+    "@dxos/storybook-utils": "0.8.4-main.2244d791bb",
+    "@dxos/react-ui": "0.8.4-main.2244d791bb",
+    "@dxos/ui-theme": "0.8.4-main.2244d791bb"
   },
   "peerDependencies": {
-    "@effect-atom/atom-react": "^0.4.6",
-    "@effect/platform": "0.93.6",
-    "effect": "3.19.11",
+    "@effect-atom/atom-react": "^0.5.0",
+    "@effect/platform": "0.94.4",
+    "effect": "3.19.16",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "@dxos/react-ui": "0.8.4-main.21d9917",
-    "@dxos/ui-theme": "0.8.4-main.21d9917"
+    "@dxos/react-ui": "0.8.4-main.2244d791bb",
+    "@dxos/ui-theme": "0.8.4-main.2244d791bb"
   },
   "publishConfig": {
     "access": "public"

package/src/HelpPlugin.tsx

@@ -2,7 +2,8 @@
 // Copyright 2023 DXOS.org
 //
 
-import { Common, Plugin } from '@dxos/app-framework';
+import { ActivationEvents, Plugin } from '@dxos/app-framework';
+import { AppPlugin } from '@dxos/app-toolkit';
 
 import { AppGraphBuilder, HelpState, OperationResolver, ReactRoot, ReactSurface } from './capabilities';
 import { meta } from './meta';
@@ -12,18 +13,18 @@ import { type Step } from './types';
 export type HelpPluginOptions = { steps?: Step[] };
 
 export const HelpPlugin = Plugin.define<HelpPluginOptions>(meta).pipe(
+  AppPlugin.addAppGraphModule({ activate: AppGraphBuilder }),
+  AppPlugin.addOperationResolverModule({ activate: OperationResolver }),
+  AppPlugin.addSurfaceModule({ activate: ReactSurface }),
+  AppPlugin.addTranslationsModule({ translations }),
   Plugin.addModule({
-    activatesOn: Common.ActivationEvent.Startup,
+    activatesOn: ActivationEvents.Startup,
     activate: HelpState,
   }),
-  Common.Plugin.addTranslationsModule({ translations }),
   Plugin.addModule(({ steps = [] }) => ({
     id: 'react-root',
-    activatesOn: Common.ActivationEvent.Startup,
+    activatesOn: ActivationEvents.Startup,
     activate: () => ReactRoot(steps),
   })),
-  Common.Plugin.addSurfaceModule({ activate: ReactSurface }),
-  Common.Plugin.addOperationResolverModule({ activate: OperationResolver }),
-  Common.Plugin.addAppGraphModule({ activate: AppGraphBuilder }),
   Plugin.make,
 );

package/src/capabilities/app-graph-builder/app-graph-builder.ts

@@ -4,8 +4,9 @@
 
 import * as Effect from 'effect/Effect';
 
-import { Capability, Common } from '@dxos/app-framework';
+import { Capabilities, Capability } from '@dxos/app-framework';
 import { GraphBuilder, NodeMatcher } from '@dxos/app-graph';
+import { AppCapabilities, LayoutOperation } from '@dxos/app-toolkit';
 import { Operation } from '@dxos/operation';
 
 import { SHORTCUTS_DIALOG } from '../../components';
@@ -22,7 +23,7 @@ export default Capability.makeModule(
           {
             id: HelpOperation.Start.meta.key,
             data: Effect.fnUntraced(function* () {
-              yield* Common.Capability.updateAtomValue(HelpCapabilities.State, (s) => ({ ...s, showHints: true }));
+              yield* Capabilities.updateAtomValue(HelpCapabilities.State, (s) => ({ ...s, showHints: true }));
               yield* Operation.invoke(HelpOperation.Start);
             }),
             properties: {
@@ -39,8 +40,8 @@ export default Capability.makeModule(
           {
             id: `${meta.id}/open-shortcuts`,
             data: Effect.fnUntraced(function* () {
-              yield* Common.Capability.updateAtomValue(HelpCapabilities.State, (s) => ({ ...s, showHints: true }));
-              yield* Operation.invoke(Common.LayoutOperation.UpdateDialog, {
+              yield* Capabilities.updateAtomValue(HelpCapabilities.State, (s) => ({ ...s, showHints: true }));
+              yield* Operation.invoke(LayoutOperation.UpdateDialog, {
                 subject: SHORTCUTS_DIALOG,
                 blockAlign: 'center',
               });
@@ -56,6 +57,6 @@ export default Capability.makeModule(
         ]),
     });
 
-    return Capability.contributes(Common.Capability.AppGraphBuilder, extensions);
+    return Capability.contributes(AppCapabilities.AppGraphBuilder, extensions);
   }),
 );

package/src/capabilities/operation-resolver/operation-resolver.ts

@@ -4,18 +4,18 @@
 
 import * as Effect from 'effect/Effect';
 
-import { Capability, Common } from '@dxos/app-framework';
+import { Capabilities, Capability } from '@dxos/app-framework';
 import { OperationResolver } from '@dxos/operation';
 
 import { HelpCapabilities, HelpOperation } from '../../types';
 
 export default Capability.makeModule(
   Effect.fnUntraced(function* () {
-    return Capability.contributes(Common.Capability.OperationResolver, [
+    return Capability.contributes(Capabilities.OperationResolver, [
       OperationResolver.make({
         operation: HelpOperation.Start,
         handler: Effect.fnUntraced(function* () {
-          yield* Common.Capability.updateAtomValue(HelpCapabilities.State, (state) => ({ ...state, running: true }));
+          yield* Capabilities.updateAtomValue(HelpCapabilities.State, (state) => ({ ...state, running: true }));
         }),
       }),
     ]);

package/src/capabilities/react-root/react-root.tsx

@@ -5,8 +5,8 @@
 import * as Effect from 'effect/Effect';
 import React from 'react';
 
-import { Capability, Common } from '@dxos/app-framework';
-import { useAtomCapabilityState } from '@dxos/app-framework/react';
+import { Capabilities, Capability } from '@dxos/app-framework';
+import { useAtomCapabilityState } from '@dxos/app-framework/ui';
 
 import { WelcomeTour } from '../../components';
 import { meta } from '../../meta';
@@ -14,7 +14,7 @@ import { HelpCapabilities, type Step } from '../../types';
 
 export default Capability.makeModule(
   Effect.fnUntraced(function* (steps?: Step[]) {
-    return Capability.contributes(Common.Capability.ReactRoot, {
+    return Capability.contributes(Capabilities.ReactRoot, {
       id: meta.id,
       root: () => {
         const [state, updateState] = useAtomCapabilityState(HelpCapabilities.State);

package/src/capabilities/react-surface/react-surface.tsx

@@ -5,25 +5,26 @@
 import * as Effect from 'effect/Effect';
 import React from 'react';
 
-import { Capability, Common } from '@dxos/app-framework';
+import { Capabilities, Capability } from '@dxos/app-framework';
+import { Surface } from '@dxos/app-framework/ui';
 
 import { SHORTCUTS_DIALOG, ShortcutsDialogContent, ShortcutsHints, ShortcutsList } from '../../components';
 import { meta } from '../../meta';
 
 export default Capability.makeModule(() =>
   Effect.succeed(
-    Capability.contributes(Common.Capability.ReactSurface, [
-      Common.createSurface({
+    Capability.contributes(Capabilities.ReactSurface, [
+      Surface.create({
         id: `${meta.id}/hints`,
         role: 'hints',
         component: () => <ShortcutsHints />,
       }),
-      Common.createSurface({
+      Surface.create({
         id: `${meta.id}/keyshortcuts`,
         role: 'keyshortcuts',
         component: () => <ShortcutsList />,
       }),
-      Common.createSurface({
+      Surface.create({
         id: SHORTCUTS_DIALOG,
         role: 'dialog',
         filter: (data): data is { component: string } => data.component === SHORTCUTS_DIALOG,

package/src/components/WelcomeTour/WelcomeTour.stories.tsx

@@ -109,7 +109,7 @@ const meta = {
   component: WelcomeTour,
   render: DefaultStory,
   decorators: [
-    withTheme,
+    withTheme(),
     withPluginManager({
       plugins: [StorybookPlugin({})],
     }),

package/src/components/WelcomeTour/WelcomeTour.tsx

@@ -5,7 +5,8 @@
 import React, { useState } from 'react';
 import Joyride, { ACTIONS, EVENTS } from 'react-joyride';
 
-import { useLayout, usePluginManager } from '@dxos/app-framework/react';
+import { usePluginManager } from '@dxos/app-framework/ui';
+import { useLayout } from '@dxos/app-toolkit/ui';
 import { useAsyncEffect } from '@dxos/react-ui';
 
 import { HelpContext, type Step } from '../../types';

package/dist/lib/browser/app-graph-builder-DX3VXARQ.mjs.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../src/capabilities/app-graph-builder/app-graph-builder.ts"],
-  "sourcesContent": ["//\n// Copyright 2025 DXOS.org\n//\n\nimport * as Effect from 'effect/Effect';\n\nimport { Capability, Common } from '@dxos/app-framework';\nimport { GraphBuilder, NodeMatcher } from '@dxos/app-graph';\nimport { Operation } from '@dxos/operation';\n\nimport { SHORTCUTS_DIALOG } from '../../components';\nimport { meta } from '../../meta';\nimport { HelpCapabilities, HelpOperation } from '../../types';\n\nexport default Capability.makeModule(\n  Effect.fnUntraced(function* () {\n    const extensions = yield* GraphBuilder.createExtension({\n      id: meta.id,\n      match: NodeMatcher.whenRoot,\n      actions: () =>\n        Effect.succeed([\n          {\n            id: HelpOperation.Start.meta.key,\n            data: Effect.fnUntraced(function* () {\n              yield* Common.Capability.updateAtomValue(HelpCapabilities.State, (s) => ({ ...s, showHints: true }));\n              yield* Operation.invoke(HelpOperation.Start);\n            }),\n            properties: {\n              label: ['open help tour', { ns: meta.id }],\n              icon: 'ph--info--regular',\n              keyBinding: {\n                macos: 'shift+meta+/',\n                windows: 'shift+ctrl+/',\n                linux: 'shift+ctrl+?',\n              },\n              testId: 'helpPlugin.openHelp',\n            },\n          },\n          {\n            id: `${meta.id}/open-shortcuts`,\n            data: Effect.fnUntraced(function* () {\n              yield* Common.Capability.updateAtomValue(HelpCapabilities.State, (s) => ({ ...s, showHints: true }));\n              yield* Operation.invoke(Common.LayoutOperation.UpdateDialog, {\n                subject: SHORTCUTS_DIALOG,\n                blockAlign: 'center',\n              });\n            }),\n            properties: {\n              label: ['open shortcuts label', { ns: meta.id }],\n              icon: 'ph--keyboard--regular',\n              keyBinding: {\n                macos: 'meta+ctrl+/',\n              },\n            },\n          },\n        ]),\n    });\n\n    return Capability.contributes(Common.Capability.AppGraphBuilder, extensions);\n  }),\n);\n"],
-  "mappings": ";;;;;;;;;;;;AAIA,YAAYA,YAAY;AAExB,SAASC,YAAYC,cAAc;AACnC,SAASC,cAAcC,mBAAmB;AAC1C,SAASC,iBAAiB;AAM1B,IAAA,4BAAeC,WAAWC,WACjBC,kBAAW,aAAA;AAChB,QAAMC,aAAa,OAAOC,aAAaC,gBAAgB;IACrDC,IAAIC,KAAKD;IACTE,OAAOC,YAAYC;IACnBC,SAAS,MACAC,eAAQ;MACb;QACEN,IAAIO,cAAcC,MAAMP,KAAKQ;QAC7BC,MAAad,kBAAW,aAAA;AACtB,iBAAOe,OAAOjB,WAAWkB,gBAAgBC,iBAAiBC,OAAO,CAACC,OAAO;YAAE,GAAGA;YAAGC,WAAW;UAAK,EAAA;AACjG,iBAAOC,UAAUC,OAAOX,cAAcC,KAAK;QAC7C,CAAA;QACAW,YAAY;UACVC,OAAO;YAAC;YAAkB;cAAEC,IAAIpB,KAAKD;YAAG;;UACxCsB,MAAM;UACNC,YAAY;YACVC,OAAO;YACPC,SAAS;YACTC,OAAO;UACT;UACAC,QAAQ;QACV;MACF;MACA;QACE3B,IAAI,GAAGC,KAAKD,EAAE;QACdU,MAAad,kBAAW,aAAA;AACtB,iBAAOe,OAAOjB,WAAWkB,gBAAgBC,iBAAiBC,OAAO,CAACC,OAAO;YAAE,GAAGA;YAAGC,WAAW;UAAK,EAAA;AACjG,iBAAOC,UAAUC,OAAOP,OAAOiB,gBAAgBC,cAAc;YAC3DC,SAASC;YACTC,YAAY;UACd,CAAA;QACF,CAAA;QACAb,YAAY;UACVC,OAAO;YAAC;YAAwB;cAAEC,IAAIpB,KAAKD;YAAG;;UAC9CsB,MAAM;UACNC,YAAY;YACVC,OAAO;UACT;QACF;MACF;KACD;EACL,CAAA;AAEA,SAAO9B,WAAWuC,YAAYtB,OAAOjB,WAAWwC,iBAAiBrC,UAAAA;AACnE,CAAA,CAAA;",
-  "names": ["Effect", "Capability", "Common", "GraphBuilder", "NodeMatcher", "Operation", "Capability", "makeModule", "fnUntraced", "extensions", "GraphBuilder", "createExtension", "id", "meta", "match", "NodeMatcher", "whenRoot", "actions", "succeed", "HelpOperation", "Start", "key", "data", "Common", "updateAtomValue", "HelpCapabilities", "State", "s", "showHints", "Operation", "invoke", "properties", "label", "ns", "icon", "keyBinding", "macos", "windows", "linux", "testId", "LayoutOperation", "UpdateDialog", "subject", "SHORTCUTS_DIALOG", "blockAlign", "contributes", "AppGraphBuilder"]
-}

package/dist/lib/browser/react-root-SZRF6EXG.mjs.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../src/capabilities/react-root/react-root.tsx"],
-  "sourcesContent": ["//\n// Copyright 2025 DXOS.org\n//\n\nimport * as Effect from 'effect/Effect';\nimport React from 'react';\n\nimport { Capability, Common } from '@dxos/app-framework';\nimport { useAtomCapabilityState } from '@dxos/app-framework/react';\n\nimport { WelcomeTour } from '../../components';\nimport { meta } from '../../meta';\nimport { HelpCapabilities, type Step } from '../../types';\n\nexport default Capability.makeModule(\n  Effect.fnUntraced(function* (steps?: Step[]) {\n    return Capability.contributes(Common.Capability.ReactRoot, {\n      id: meta.id,\n      root: () => {\n        const [state, updateState] = useAtomCapabilityState(HelpCapabilities.State);\n        return (\n          <WelcomeTour\n            steps={steps ?? []}\n            running={state.running}\n            onRunningChanged={(newState) => {\n              updateState((s) => ({ ...s, running: newState }));\n              if (!newState) {\n                updateState((s) => ({ ...s, showHints: false }));\n              }\n            }}\n          />\n        );\n      },\n    });\n  }),\n);\n"],
-  "mappings": ";;;;;;;;;;;AAIA,YAAYA,YAAY;AACxB,OAAOC,WAAW;AAElB,SAASC,YAAYC,cAAc;AACnC,SAASC,8BAA8B;AAMvC,IAAA,qBAAeC,WAAWC,WACjBC,kBAAW,WAAWC,OAAc;AACzC,SAAOH,WAAWI,YAAYC,OAAOL,WAAWM,WAAW;IACzDC,IAAIC,KAAKD;IACTE,MAAM,MAAA;AACJ,YAAM,CAACC,OAAOC,WAAAA,IAAeC,uBAAuBC,iBAAiBC,KAAK;AAC1E,aACE,sBAAA,cAACC,aAAAA;QACCZ,OAAOA,SAAS,CAAA;QAChBa,SAASN,MAAMM;QACfC,kBAAkB,CAACC,aAAAA;AACjBP,sBAAY,CAACQ,OAAO;YAAE,GAAGA;YAAGH,SAASE;UAAS,EAAA;AAC9C,cAAI,CAACA,UAAU;AACbP,wBAAY,CAACQ,OAAO;cAAE,GAAGA;cAAGC,WAAW;YAAM,EAAA;UAC/C;QACF;;IAGN;EACF,CAAA;AACF,CAAA,CAAA;",
-  "names": ["Effect", "React", "Capability", "Common", "useAtomCapabilityState", "Capability", "makeModule", "fnUntraced", "steps", "contributes", "Common", "ReactRoot", "id", "meta", "root", "state", "updateState", "useAtomCapabilityState", "HelpCapabilities", "State", "WelcomeTour", "running", "onRunningChanged", "newState", "s", "showHints"]
-}

package/dist/lib/browser/react-surface-DWNTJBVM.mjs.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../src/capabilities/react-surface/react-surface.tsx"],
-  "sourcesContent": ["//\n// Copyright 2025 DXOS.org\n//\n\nimport * as Effect from 'effect/Effect';\nimport React from 'react';\n\nimport { Capability, Common } from '@dxos/app-framework';\n\nimport { SHORTCUTS_DIALOG, ShortcutsDialogContent, ShortcutsHints, ShortcutsList } from '../../components';\nimport { meta } from '../../meta';\n\nexport default Capability.makeModule(() =>\n  Effect.succeed(\n    Capability.contributes(Common.Capability.ReactSurface, [\n      Common.createSurface({\n        id: `${meta.id}/hints`,\n        role: 'hints',\n        component: () => <ShortcutsHints />,\n      }),\n      Common.createSurface({\n        id: `${meta.id}/keyshortcuts`,\n        role: 'keyshortcuts',\n        component: () => <ShortcutsList />,\n      }),\n      Common.createSurface({\n        id: SHORTCUTS_DIALOG,\n        role: 'dialog',\n        filter: (data): data is { component: string } => data.component === SHORTCUTS_DIALOG,\n        component: () => <ShortcutsDialogContent />,\n      }),\n    ]),\n  ),\n);\n"],
-  "mappings": ";;;;;;;;;;;;AAIA,YAAYA,YAAY;AACxB,OAAOC,WAAW;AAElB,SAASC,YAAYC,cAAc;AAKnC,IAAA,wBAAeC,WAAWC,WAAW,MAC5BC,eACLF,WAAWG,YAAYC,OAAOJ,WAAWK,cAAc;EACrDD,OAAOE,cAAc;IACnBC,IAAI,GAAGC,KAAKD,EAAE;IACdE,MAAM;IACNC,WAAW,MAAM,sBAAA,cAACC,gBAAAA,IAAAA;EACpB,CAAA;EACAP,OAAOE,cAAc;IACnBC,IAAI,GAAGC,KAAKD,EAAE;IACdE,MAAM;IACNC,WAAW,MAAM,sBAAA,cAACE,eAAAA,IAAAA;EACpB,CAAA;EACAR,OAAOE,cAAc;IACnBC,IAAIM;IACJJ,MAAM;IACNK,QAAQ,CAACC,SAAwCA,KAAKL,cAAcG;IACpEH,WAAW,MAAM,sBAAA,cAACM,wBAAAA,IAAAA;EACpB,CAAA;CACD,CAAA,CAAA;",
-  "names": ["Effect", "React", "Capability", "Common", "Capability", "makeModule", "succeed", "contributes", "Common", "ReactSurface", "createSurface", "id", "meta", "role", "component", "ShortcutsHints", "ShortcutsList", "SHORTCUTS_DIALOG", "filter", "data", "ShortcutsDialogContent"]
-}