@dxos/plugin-status-bar 0.8.4-main.72ec0f3 → 0.8.4-main.8360d9e660

package/package.json

@@ -1,9 +1,13 @@
 {
   "name": "@dxos/plugin-status-bar",
-  "version": "0.8.4-main.72ec0f3",
+  "version": "0.8.4-main.8360d9e660",
   "description": "Status bar plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/dxos/dxos"
+  },
   "license": "MIT",
   "author": "DXOS.org",
   "sideEffects": true,
@@ -25,38 +29,38 @@
     "src"
   ],
   "dependencies": {
-    "@fluentui/react-tabster": "^9.24.2",
-    "@preact-signals/safe-react": "^0.9.0",
-    "@preact/signals-core": "^1.12.1",
+    "@fluentui/react-tabster": "9.26.11",
     "@radix-ui/react-slot": "1.1.2",
     "date-fns": "^3.3.1",
-    "effect": "3.18.3",
+    "effect": "3.19.16",
     "react-resize-detector": "^11.0.1",
-    "@dxos/app-framework": "0.8.4-main.72ec0f3",
-    "@dxos/async": "0.8.4-main.72ec0f3",
-    "@dxos/plugin-observability": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-form": "0.8.4-main.72ec0f3",
-    "@dxos/schema": "0.8.4-main.72ec0f3",
-    "@dxos/react-client": "0.8.4-main.72ec0f3",
-    "@dxos/echo": "0.8.4-main.72ec0f3",
-    "@dxos/util": "0.8.4-main.72ec0f3"
+    "@dxos/app-toolkit": "0.8.4-main.8360d9e660",
+    "@dxos/app-framework": "0.8.4-main.8360d9e660",
+    "@dxos/operation": "0.8.4-main.8360d9e660",
+    "@dxos/async": "0.8.4-main.8360d9e660",
+    "@dxos/echo": "0.8.4-main.8360d9e660",
+    "@dxos/react-client": "0.8.4-main.8360d9e660",
+    "@dxos/plugin-observability": "0.8.4-main.8360d9e660",
+    "@dxos/react-ui-form": "0.8.4-main.8360d9e660",
+    "@dxos/util": "0.8.4-main.8360d9e660",
+    "@dxos/schema": "0.8.4-main.8360d9e660"
   },
   "devDependencies": {
-    "@types/react": "~19.2.2",
-    "@types/react-dom": "~19.2.2",
-    "react": "~19.2.0",
-    "react-dom": "~19.2.0",
-    "vite": "7.1.9",
-    "@dxos/react-ui-theme": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui": "0.8.4-main.72ec0f3",
-    "@dxos/storybook-utils": "0.8.4-main.72ec0f3"
+    "@types/react": "~19.2.7",
+    "@types/react-dom": "~19.2.3",
+    "react": "~19.2.3",
+    "react-dom": "~19.2.3",
+    "vite": "^7.1.11",
+    "@dxos/storybook-utils": "0.8.4-main.8360d9e660",
+    "@dxos/react-ui": "0.8.4-main.8360d9e660",
+    "@dxos/ui-theme": "0.8.4-main.8360d9e660"
   },
   "peerDependencies": {
-    "effect": "^3.13.3",
-    "react": "^19.0.0",
-    "react-dom": "^19.0.0",
-    "@dxos/react-ui": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-theme": "0.8.4-main.72ec0f3"
+    "effect": "3.19.16",
+    "react": "~19.2.3",
+    "react-dom": "~19.2.3",
+    "@dxos/react-ui": "0.8.4-main.8360d9e660",
+    "@dxos/ui-theme": "0.8.4-main.8360d9e660"
   },
   "publishConfig": {
     "access": "public"

package/src/StatusBarPlugin.ts

@@ -2,21 +2,15 @@
 // Copyright 2024 DXOS.org
 //
 
-import { Capabilities, Events, contributes, defineModule, definePlugin } from '@dxos/app-framework';
+import { Plugin } from '@dxos/app-framework';
+import { AppPlugin } from '@dxos/app-toolkit';
 
 import { ReactSurface } from './capabilities';
 import { meta } from './meta';
 import { translations } from './translations';
 
-export const StatusBarPlugin = definePlugin(meta, () => [
-  defineModule({
-    id: `${meta.id}/module/translations`,
-    activatesOn: Events.SetupTranslations,
-    activate: () => contributes(Capabilities.Translations, translations),
-  }),
-  defineModule({
-    id: `${meta.id}/module/react-surface`,
-    activatesOn: Events.SetupReactSurface,
-    activate: ReactSurface,
-  }),
-]);
+export const StatusBarPlugin = Plugin.define(meta).pipe(
+  AppPlugin.addSurfaceModule({ activate: ReactSurface }),
+  AppPlugin.addTranslationsModule({ translations }),
+  Plugin.make,
+);

package/src/capabilities/index.ts

@@ -2,6 +2,4 @@
 // Copyright 2025 DXOS.org
 //
 
-import { lazy } from '@dxos/app-framework';
-
-export const ReactSurface = lazy(() => import('./react-surface'));
+export * from './react-surface';

package/src/capabilities/react-surface/index.ts

@@ -0,0 +1,7 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { Capability } from '@dxos/app-framework';
+
+export const ReactSurface = Capability.lazy('ReactSurface', () => import('./react-surface'));

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

@@ -0,0 +1,39 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+import React from 'react';
+
+import { Capabilities, Capability } from '@dxos/app-framework';
+import { Surface } from '@dxos/app-framework/ui';
+
+import { StatusBarActions, StatusBarPanel, VersionNumber } from '../../containers';
+import { meta } from '../../meta';
+
+export default Capability.makeModule(() =>
+  Effect.succeed(
+    Capability.contributes(Capabilities.ReactSurface, [
+      Surface.create({
+        id: `${meta.id}.status-bar`,
+        role: 'status-bar',
+        component: () => <StatusBarPanel />,
+      }),
+      Surface.create({
+        id: `${meta.id}.status-bar--r0-footer`,
+        role: 'status-bar--r0-footer',
+        component: () => <Surface.Surface role='status' />,
+      }),
+      Surface.create({
+        id: `${meta.id}.status-bar--r1-footer`,
+        role: 'status-bar--r1-footer',
+        component: () => <StatusBarActions />,
+      }),
+      Surface.create({
+        id: `${meta.id}.header-end`,
+        role: 'header-end',
+        component: () => <VersionNumber />,
+      }),
+    ]),
+  ),
+);

package/src/components/{StatusBar.stories.tsx → StatusBar/StatusBar.stories.tsx}

@@ -8,7 +8,7 @@ import React from 'react';
 import { Icon } from '@dxos/react-ui';
 import { withTheme } from '@dxos/react-ui/testing';
 
-import { StatusBar } from './StatusBar';
+import { StatusBar } from './index';
 
 export const DefaultStory = () => (
   <div>
@@ -32,10 +32,10 @@ export const DefaultStory = () => (
 );
 
 const meta = {
-  title: 'plugins/plugin-status/StatusBar',
+  title: 'plugins/plugin-status-bar/components/StatusBar',
   component: StatusBar as any,
   render: DefaultStory,
-  decorators: [withTheme],
+  decorators: [withTheme()],
 } satisfies Meta<typeof StatusBar>;
 
 export default meta;

package/src/components/{StatusBar.tsx → StatusBar/StatusBar.tsx}

@@ -6,7 +6,7 @@ import { Slot } from '@radix-ui/react-slot';
 import React, { type ComponentPropsWithRef, type PropsWithChildren, type ReactNode, forwardRef } from 'react';
 
 import { type ThemedClassName } from '@dxos/react-ui';
-import { mx } from '@dxos/react-ui-theme';
+import { mx } from '@dxos/ui-theme';
 
 type StatusBarTextProps = ThemedClassName<{ children: ReactNode }>;
 
@@ -21,9 +21,9 @@ type StatusBarButtonProps = ThemedClassName<ComponentPropsWithRef<'button'> & {
 const StatusBarButton = forwardRef<HTMLButtonElement, StatusBarButtonProps>(
   ({ classNames, children, asChild, ...props }, forwardedRef) => {
     const classes = mx(
-      'flex items-center justify-center gap-2 p-1 pli-2 rounded-sm',
+      'flex items-center justify-center gap-2 p-1 px-2 rounded-xs',
       'select-none cursor-pointer dx-focus-ring text-description text-xs',
-      'hover:bg-neutral-75 active:bg-neutral-150 dark:hover:bg-neutral-750 dark:active:bg-neutral-700',
+      'hover:bg-neutral-100 active:bg-neutral-200 dark:hover:bg-neutral-700 dark:active:bg-neutral-600',
       classNames,
     );
 
@@ -47,7 +47,7 @@ const StatusBarItem = forwardRef<HTMLDivElement, StatusBarItemProps>(
   ({ classNames, children, ...props }, forwardedRef) => (
     <div
       role='menuitem'
-      className={mx('flex items-center justify-center gap-2 p-1 pli-2 rounded-sm select-none', classNames)}
+      className={mx('flex items-center justify-center gap-2 p-1 px-2 rounded-xs select-none', classNames)}
       ref={forwardedRef}
       {...props}
     >

package/src/components/StatusBar/index.ts

@@ -0,0 +1,5 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+export * from './StatusBar';

package/src/components/index.ts

@@ -3,5 +3,3 @@
 //
 
 export * from './StatusBar';
-export * from './StatusBarPanel';
-export * from './VersionNumber';

package/src/{components/StatusBarPanel.tsx → containers/StatusBarActions/StatusBarActions.tsx}

@@ -4,16 +4,16 @@
 
 import React, { useState } from 'react';
 
-import { Surface } from '@dxos/app-framework/react';
 import { useConfig } from '@dxos/react-client';
 import { Icon, Popover, useTranslation } from '@dxos/react-ui';
 
-import { meta } from '../meta';
+import { StatusBar } from '../../components';
+import { meta } from '../../meta';
+import VersionNumber from '../VersionNumber';
 
-import { StatusBar } from './StatusBar';
-import { VersionNumber } from './VersionNumber';
+export type StatusBarActionsProps = {};
 
-export const StatusBarActions = () => {
+export const StatusBarActions = (_props: StatusBarActionsProps) => {
   const { t } = useTranslation(meta.id);
   const [open, setOpen] = useState(false);
 
@@ -37,16 +37,6 @@ export const StatusBarActions = () => {
   );
 };
 
-export const StatusBarPanel = () => {
-  return (
-    <>
-      <StatusBarActions />
-      <span role='separator' className='grow' />
-      <Surface role='status' />
-    </>
-  );
-};
-
 const ENV_LABELS: Record<string, string> = {
   'edge-dev': 'Dev',
   'edge-main': 'Main',
@@ -68,7 +58,7 @@ const EnvironmentLabel = () => {
 
   return (
     <StatusBar.Item>
-      <StatusBar.Text classNames='text-xs text-subdued border border-separator rounded-full pli-1'>
+      <StatusBar.Text classNames='text-xs text-subdued border border-separator rounded-full px-1'>
         <span title={edgeEnv}>{edgeEnv[0]}</span>
       </StatusBar.Text>
     </StatusBar.Item>

package/src/containers/StatusBarActions/index.ts

@@ -0,0 +1,7 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+import { StatusBarActions } from './StatusBarActions';
+
+export default StatusBarActions;

package/src/containers/StatusBarPanel/StatusBarPanel.tsx

@@ -0,0 +1,21 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+import React from 'react';
+
+import { Surface } from '@dxos/app-framework/ui';
+
+import StatusBarActionsDefault from '../StatusBarActions';
+
+export type StatusBarPanelProps = {};
+
+export const StatusBarPanel = (_props: StatusBarPanelProps) => {
+  return (
+    <>
+      <StatusBarActionsDefault />
+      <span role='separator' className='grow' />
+      <Surface.Surface role='status' />
+    </>
+  );
+};

package/src/containers/StatusBarPanel/index.ts

@@ -0,0 +1,7 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+import { StatusBarPanel } from './StatusBarPanel';
+
+export default StatusBarPanel;

package/src/{components → containers/VersionNumber}/VersionNumber.tsx

@@ -8,15 +8,16 @@ import React from 'react';
 import { useConfig } from '@dxos/react-client';
 import { Icon, Link, Message, Popover, Trans, useTranslation } from '@dxos/react-ui';
 
-import { meta } from '../meta';
+import { StatusBar } from '../../components';
+import { meta } from '../../meta';
 
-import { StatusBar } from './StatusBar';
+export type VersionNumberProps = {};
 
 const repo = 'https://github.com/dxos/dxos';
 
 const VERSION_REGEX = /([\d.]+)/;
 
-export const VersionNumber = () => {
+export const VersionNumber = (_props: VersionNumberProps) => {
   const { t } = useTranslation(meta.id);
   const config = useConfig();
   const { version, timestamp, commitHash } = config.values.runtime?.app?.build ?? {};
@@ -39,20 +40,20 @@ export const VersionNumber = () => {
         <Popover.Content
           side='top'
           role='message'
-          classNames='z-[12] bg-warning-500 max-is-[min(calc(100vw-16px),40ch)]'
+          classNames='z-[12] bg-warning-500 max-w-[min(calc(100vw-16px),40ch)]'
         >
-          <Message.Root valence='warning' classNames='rounded-be-none p-5'>
+          <Message.Root valence='warning' classNames='rounded-b-none p-5'>
             <Message.Title>{t('warning title')}</Message.Title>
             <Message.Content>
               {t('technology preview message')}
               <br />
               <Link href={previewUrl} target='_blank' rel='noreferrer' variant='neutral'>
                 {t('learn more label')}
-                <Icon icon='ph--arrow-square-out--bold' classNames='inline mis-1' />
+                <Icon icon='ph--arrow-square-out--bold' classNames='dx-icon-inline ms-1' />
               </Link>
             </Message.Content>
           </Message.Root>
-          <div role='none' className='plb-4 pli-5 space-b-2 text-baseText'>
+          <div role='none' className='py-4 px-5 space-b-2 text-base-surface-text'>
             {timestamp && (
               <p>
                 {t('released message', {
@@ -61,7 +62,7 @@ export const VersionNumber = () => {
                 <br />
                 <Link href={releaseUrl} target='_blank' rel='noreferrer' variant='neutral'>
                   {t('see release label')}
-                  <Icon icon='ph--arrow-square-out--bold' classNames='inline mis-1' />
+                  <Icon icon='ph--arrow-square-out--bold' classNames='dx-icon-inline ms-1' />
                 </Link>
               </p>
             )}

package/src/containers/VersionNumber/index.ts

@@ -0,0 +1,7 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+import { VersionNumber } from './VersionNumber';
+
+export default VersionNumber;

package/src/containers/index.ts

@@ -0,0 +1,9 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+import { type ComponentType, lazy } from 'react';
+
+export const StatusBarActions: ComponentType<any> = lazy(() => import('./StatusBarActions'));
+export const StatusBarPanel: ComponentType<any> = lazy(() => import('./StatusBarPanel'));
+export const VersionNumber: ComponentType<any> = lazy(() => import('./VersionNumber'));

package/src/meta.ts

@@ -2,11 +2,11 @@
 // Copyright 2024 DXOS.org
 //
 
-import { type PluginMeta } from '@dxos/app-framework';
+import { type Plugin } from '@dxos/app-framework';
 import { trim } from '@dxos/util';
 
-export const meta: PluginMeta = {
-  id: 'dxos.org/plugin/status-bar',
+export const meta: Plugin.Meta = {
+  id: 'org.dxos.plugin.status-bar',
   name: 'Status Bar',
   description: trim`
     Persistent bottom bar displaying workspace status information and quick actions.

package/src/translations.ts

@@ -14,7 +14,7 @@ export const translations = [
         'warning title': 'WARNING',
         'technology preview message': 'Composer is currently in beta.',
         'learn more label': 'Learn more',
-        'released message': 'This version released {{released}}.',
+        'released message': 'This version was released {{released}}.',
         'see release label': 'See release on GitHub',
         'powered by dxos message': 'Powered by <dxos>DXOS</dxos>',
         'discord label': 'Discord',