@dxos/plugin-status-bar 0.8.4-main.c85a9c8dae → 0.8.4-main.d9fc60f731

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-status-bar",
-  "version": "0.8.4-main.c85a9c8dae",
+  "version": "0.8.4-main.d9fc60f731",
   "description": "Status bar plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -8,59 +8,100 @@
     "type": "git",
     "url": "https://github.com/dxos/dxos"
   },
-  "license": "MIT",
+  "license": "FSL-1.1-Apache-2.0",
   "author": "DXOS.org",
   "sideEffects": true,
   "type": "module",
+  "imports": {
+    "#capabilities": {
+      "source": "./src/capabilities/index.ts",
+      "types": "./dist/types/src/capabilities/index.d.ts",
+      "default": "./dist/lib/neutral/capabilities/index.mjs"
+    },
+    "#components": {
+      "source": "./src/components/index.ts",
+      "types": "./dist/types/src/components/index.d.ts",
+      "default": "./dist/lib/neutral/components/index.mjs"
+    },
+    "#containers": {
+      "source": "./src/containers/index.ts",
+      "types": "./dist/types/src/containers/index.d.ts",
+      "default": "./dist/lib/neutral/containers/index.mjs"
+    },
+    "#meta": {
+      "source": "./src/meta.ts",
+      "types": "./dist/types/src/meta.d.ts",
+      "default": "./dist/lib/neutral/meta.mjs"
+    },
+    "#plugin": {
+      "source": "./src/StatusBarPlugin.ts",
+      "types": "./dist/types/src/StatusBarPlugin.d.ts",
+      "default": "./dist/lib/neutral/StatusBarPlugin.mjs"
+    },
+    "#translations": {
+      "source": "./src/translations.ts",
+      "types": "./dist/types/src/translations.d.ts",
+      "default": "./dist/lib/neutral/translations.mjs"
+    }
+  },
   "exports": {
     ".": {
       "source": "./src/index.ts",
       "types": "./dist/types/src/index.d.ts",
-      "browser": "./dist/lib/browser/index.mjs",
-      "node": "./dist/lib/node-esm/index.mjs"
+      "default": "./dist/lib/neutral/index.mjs"
+    },
+    "./components": {
+      "source": "./src/components/index.ts",
+      "types": "./dist/types/src/components/index.d.ts",
+      "default": "./dist/lib/neutral/components/index.mjs"
+    },
+    "./plugin": {
+      "source": "./src/plugin.ts",
+      "types": "./dist/types/src/plugin.d.ts",
+      "default": "./dist/lib/neutral/plugin.mjs"
+    },
+    "./translations": {
+      "source": "./src/translations.ts",
+      "types": "./dist/types/src/translations.d.ts",
+      "default": "./dist/lib/neutral/translations.mjs"
     }
   },
   "types": "dist/types/src/index.d.ts",
-  "typesVersions": {
-    "*": {}
-  },
   "files": [
     "dist",
     "src"
   ],
   "dependencies": {
-    "@fluentui/react-tabster": "9.26.11",
     "@radix-ui/react-slot": "1.1.2",
-    "date-fns": "^3.3.1",
-    "effect": "3.19.16",
-    "react-resize-detector": "^11.0.1",
-    "@dxos/app-framework": "0.8.4-main.c85a9c8dae",
-    "@dxos/app-toolkit": "0.8.4-main.c85a9c8dae",
-    "@dxos/async": "0.8.4-main.c85a9c8dae",
-    "@dxos/echo": "0.8.4-main.c85a9c8dae",
-    "@dxos/operation": "0.8.4-main.c85a9c8dae",
-    "@dxos/react-client": "0.8.4-main.c85a9c8dae",
-    "@dxos/plugin-observability": "0.8.4-main.c85a9c8dae",
-    "@dxos/util": "0.8.4-main.c85a9c8dae",
-    "@dxos/react-ui-form": "0.8.4-main.c85a9c8dae",
-    "@dxos/schema": "0.8.4-main.c85a9c8dae"
+    "date-fns": "^3.6.0",
+    "effect": "3.21.2",
+    "@dxos/app-framework": "0.8.4-main.d9fc60f731",
+    "@dxos/async": "0.8.4-main.d9fc60f731",
+    "@dxos/echo": "0.8.4-main.d9fc60f731",
+    "@dxos/app-toolkit": "0.8.4-main.d9fc60f731",
+    "@dxos/operation": "0.8.4-main.d9fc60f731",
+    "@dxos/keys": "0.8.4-main.d9fc60f731",
+    "@dxos/react-client": "0.8.4-main.d9fc60f731",
+    "@dxos/util": "0.8.4-main.d9fc60f731",
+    "@dxos/plugin-observability": "0.8.4-main.d9fc60f731"
   },
   "devDependencies": {
     "@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/react-ui": "0.8.4-main.c85a9c8dae",
-    "@dxos/storybook-utils": "0.8.4-main.c85a9c8dae",
-    "@dxos/ui-theme": "0.8.4-main.c85a9c8dae"
+    "vite": "^8.0.14",
+    "@dxos/react-ui": "0.8.4-main.d9fc60f731",
+    "@dxos/ui-theme": "0.8.4-main.d9fc60f731",
+    "@dxos/storybook-utils": "0.8.4-main.d9fc60f731",
+    "@dxos/plugin-testing": "0.8.4-main.d9fc60f731"
   },
   "peerDependencies": {
-    "effect": "3.19.16",
+    "effect": "3.21.2",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "@dxos/ui-theme": "0.8.4-main.c85a9c8dae",
-    "@dxos/react-ui": "0.8.4-main.c85a9c8dae"
+    "@dxos/react-ui": "0.8.4-main.d9fc60f731",
+    "@dxos/ui-theme": "0.8.4-main.d9fc60f731"
   },
   "publishConfig": {
     "access": "public"

package/src/StatusBarPlugin.test.ts

@@ -0,0 +1,23 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+import { describe, test } from 'vitest';
+
+import { createComposerTestApp } from '@dxos/plugin-testing/harness';
+
+import { StatusBarPlugin } from '#plugin';
+
+import { meta } from './meta';
+
+const moduleId = (name: string) => `${meta.id}.module.${name}`;
+
+describe('StatusBarPlugin', () => {
+  test('modules activate on the expected events', async ({ expect }) => {
+    await using harness = await createComposerTestApp({
+      plugins: [StatusBarPlugin()],
+    });
+
+    expect(harness.manager.getActive()).toContain(moduleId('ReactSurface'));
+  });
+});

package/src/StatusBarPlugin.ts

@@ -5,12 +5,14 @@
 import { Plugin } from '@dxos/app-framework';
 import { AppPlugin } from '@dxos/app-toolkit';
 
-import { ReactSurface } from './capabilities';
-import { meta } from './meta';
-import { translations } from './translations';
+import { ReactSurface } from '#capabilities';
+import { meta } from '#meta';
+import { translations } from '#translations';
 
 export const StatusBarPlugin = Plugin.define(meta).pipe(
   AppPlugin.addSurfaceModule({ activate: ReactSurface }),
   AppPlugin.addTranslationsModule({ translations }),
   Plugin.make,
 );
+
+export default StatusBarPlugin;

package/src/capabilities/index.ts

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

package/src/capabilities/{react-surface/react-surface.tsx → react-surface.tsx}

@@ -8,30 +8,24 @@ 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';
+import { StatusBarActions, StatusBarPanel, VersionNumber } from '#containers';
 
 export default Capability.makeModule(() =>
   Effect.succeed(
     Capability.contributes(Capabilities.ReactSurface, [
       Surface.create({
-        id: `${meta.id}/status-bar`,
+        id: 'statusBar',
         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`,
+        id: 'statusBarFooter',
         role: 'status-bar--r1-footer',
         component: () => <StatusBarActions />,
       }),
       Surface.create({
-        id: `${meta.id}/header-end`,
-        role: 'header-end',
+        id: 'versionInfo',
+        role: 'version-info',
         component: () => <VersionNumber />,
       }),
     ]),

package/src/components/StatusBar/StatusBar.stories.tsx

@@ -5,30 +5,27 @@
 import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React from 'react';
 
-import { Icon } from '@dxos/react-ui';
+import { Icon, IconButton } from '@dxos/react-ui';
 import { withTheme } from '@dxos/react-ui/testing';
 
 import { StatusBar } from './index';
 
-export const DefaultStory = () => (
-  <div>
-    <StatusBar.EndContent>
+const DefaultStory = () => (
+  <StatusBar.EndContent>
+    <StatusBar.Button>
+      <Icon icon='ph--mailbox--regular' />
+      <StatusBar.Text>Quick feedback</StatusBar.Text>
+    </StatusBar.Button>
+    <a href='https://dxos.org/discord' target='_blank' rel='noopener noreferrer'>
       <StatusBar.Button>
-        <Icon icon='ph--mailbox--regular' size={4} />
-        <StatusBar.Text>Quick feedback</StatusBar.Text>
+        <Icon icon='ph--discord-logo--regular' />
+        <StatusBar.Text>Join us on Discord</StatusBar.Text>
       </StatusBar.Button>
-      <a href='https://dxos.org/discord' target='_blank' rel='noopener noreferrer'>
-        <StatusBar.Button>
-          <Icon icon='ph--discord-logo--regular' size={4} />
-          <StatusBar.Text>Join us on Discord</StatusBar.Text>
-        </StatusBar.Button>
-      </a>
-      <StatusBar.Item>
-        <Icon icon='ph--lightning--regular' size={4} />
-        <StatusBar.Text>Online</StatusBar.Text>
-      </StatusBar.Item>
-    </StatusBar.EndContent>
-  </div>
+    </a>
+    <StatusBar.Item>
+      <IconButton variant='ghost' icon='ph--lightning--regular' iconOnly label='Online' />
+    </StatusBar.Item>
+  </StatusBar.EndContent>
 );
 
 const meta = {
@@ -36,6 +33,9 @@ const meta = {
   component: StatusBar as any,
   render: DefaultStory,
   decorators: [withTheme()],
+  parameters: {
+    layout: 'centered',
+  },
 } satisfies Meta<typeof StatusBar>;
 
 export default meta;

package/src/components/StatusBar/StatusBar.tsx

@@ -8,6 +8,26 @@ import React, { type ComponentPropsWithRef, type PropsWithChildren, type ReactNo
 import { type ThemedClassName } from '@dxos/react-ui';
 import { mx } from '@dxos/ui-theme';
 
+//
+// Item
+//
+
+type StatusBarItemProps = ThemedClassName<PropsWithChildren>;
+
+const StatusBarItem = forwardRef<HTMLDivElement, StatusBarItemProps>(
+  ({ classNames, children, ...props }, forwardedRef) => {
+    return (
+      <div {...props} role='status' className={mx('grid place-items-center', classNames)} ref={forwardedRef}>
+        {children}
+      </div>
+    );
+  },
+);
+
+//
+// Text
+//
+
 type StatusBarTextProps = ThemedClassName<{ children: ReactNode }>;
 
 const StatusBarText = forwardRef<HTMLSpanElement, StatusBarTextProps>(({ classNames, children }, forwardedRef) => (
@@ -16,8 +36,15 @@ const StatusBarText = forwardRef<HTMLSpanElement, StatusBarTextProps>(({ classNa
   </span>
 ));
 
+//
+// Button
+//
+
 type StatusBarButtonProps = ThemedClassName<ComponentPropsWithRef<'button'> & { asChild?: boolean }>;
 
+/**
+ * @deprecated
+ */
 const StatusBarButton = forwardRef<HTMLButtonElement, StatusBarButtonProps>(
   ({ classNames, children, asChild, ...props }, forwardedRef) => {
     const classes = mx(
@@ -39,42 +66,37 @@ const StatusBarButton = forwardRef<HTMLButtonElement, StatusBarButtonProps>(
   },
 );
 
-export default StatusBarButton;
-
-type StatusBarItemProps = ThemedClassName<ComponentPropsWithRef<'div'>>;
-
-const StatusBarItem = forwardRef<HTMLDivElement, StatusBarItemProps>(
-  ({ classNames, children, ...props }, forwardedRef) => (
-    <div
-      role='menuitem'
-      className={mx('flex items-center justify-center gap-2 p-1 px-2 rounded-xs select-none', classNames)}
-      ref={forwardedRef}
-      {...props}
-    >
-      {children}
-    </div>
-  ),
-);
+//
+// Content
+//
 
 type StartContentProps = ThemedClassName<PropsWithChildren<{}>>;
 
 const StartContent = forwardRef<HTMLDivElement, StartContentProps>(({ classNames, children }, forwardedRef) => (
-  <div role='none' className={mx('flex-grow flex items-center space-x-2', classNames)} ref={forwardedRef}>
+  <div className={mx('flex-grow flex items-center space-x-2', classNames)} ref={forwardedRef}>
     {children}
   </div>
 ));
 
+//
+// EndContent
+//
+
 type EndContentProps = ThemedClassName<PropsWithChildren<{}>>;
 
 const EndContent = forwardRef<HTMLDivElement, EndContentProps>(({ classNames, children }, forwardedRef) => (
-  <div role='none' className={mx('flex-grow flex items-center justify-end', classNames)} ref={forwardedRef}>
+  <div className={mx('flex-grow flex items-center justify-end', classNames)} ref={forwardedRef}>
     {children}
   </div>
 ));
 
+//
+// StatusBar
+//
+
 export const StatusBar = {
-  Text: StatusBarText,
   Item: StatusBarItem,
+  Text: StatusBarText,
   Button: StatusBarButton,
   StartContent,
   EndContent,

package/src/containers/StatusBarActions/StatusBarActions.stories.tsx

@@ -0,0 +1,62 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+import { type Meta, type StoryObj } from '@storybook/react-vite';
+
+import { Config } from '@dxos/react-client';
+import { withClientProvider } from '@dxos/react-client/testing';
+import { withLayout, withTheme } from '@dxos/react-ui/testing';
+
+import { translations } from '#translations';
+
+import { StatusBarActions } from './StatusBarActions';
+
+const meta: Meta<typeof StatusBarActions> = {
+  title: 'plugins/plugin-status-bar/containers/StatusBarActions',
+  component: StatusBarActions,
+  decorators: [
+    withTheme(),
+    withLayout({
+      layout: 'centered',
+      classNames: 'w-[calc(var(--dx-complementary-sidebar-size)_-_var(--dx-rail-content))]',
+    }),
+    withClientProvider({
+      config: new Config({
+        version: 1,
+        runtime: {
+          client: {
+            storage: {
+              persistent: false,
+            },
+          },
+          app: {
+            build: {
+              version: '0.8.3-beta.b78990fdd5',
+              timestamp: '2024-06-01T12:00:00.000Z',
+              commitHash: 'b78990fdd5',
+            },
+            env: {
+              DX_ENVIRONMENT: 'development',
+            },
+          },
+          services: {
+            edge: {
+              url: 'https://edge-dev.dxos.org',
+            },
+          },
+        },
+      }),
+    }),
+  ],
+  parameters: {
+    layout: 'centered',
+    translations,
+  },
+};
+
+export default meta;
+
+type Story = StoryObj<typeof meta>;
+
+export const Default: Story = {};

package/src/containers/StatusBarActions/StatusBarActions.tsx

@@ -2,65 +2,18 @@
 // Copyright 2024 DXOS.org
 //
 
-import React, { useState } from 'react';
+import React from 'react';
 
-import { useConfig } from '@dxos/react-client';
-import { Icon, Popover, useTranslation } from '@dxos/react-ui';
-
-import { StatusBar } from '../../components';
-import { meta } from '../../meta';
 import VersionNumber from '../VersionNumber';
 
 export type StatusBarActionsProps = {};
 
 export const StatusBarActions = (_props: StatusBarActionsProps) => {
-  const { t } = useTranslation(meta.id);
-  const [open, setOpen] = useState(false);
-
   return (
-    <Popover.Root open={open} onOpenChange={setOpen}>
-      <EnvironmentLabel />
+    <div className='h-full flex items-center px-2 gap-2'>
       <VersionNumber />
-      <StatusBar.Button asChild>
-        <a href='https://dxos.org/discord' target='_blank' rel='noopener noreferrer'>
-          <Icon icon='ph--discord-logo--regular' size={4} />
-          <StatusBar.Text classNames='hidden sm:block'>{t('discord label')}</StatusBar.Text>
-        </a>
-      </StatusBar.Button>
-      <StatusBar.Button asChild>
-        <a href='https://github.com/dxos/dxos' target='_blank' rel='noopener noreferrer'>
-          <Icon icon='ph--github-logo--regular' size={4} />
-          <StatusBar.Text classNames='hidden sm:block'>{t('github label')}</StatusBar.Text>
-        </a>
-      </StatusBar.Button>
-    </Popover.Root>
-  );
-};
-
-const ENV_LABELS: Record<string, string> = {
-  'edge-dev': 'Dev',
-  'edge-main': 'Main',
-  'edge-labs': 'Labs',
-  'edge-production': 'Production',
-};
-
-const EnvironmentLabel = () => {
-  const config = useConfig();
-  const edgeUrl = config.values.runtime?.services?.edge?.url;
-  if (!edgeUrl) {
-    return null;
-  }
-  const part = new URL(edgeUrl).host.split('.')[0];
-  const edgeEnv = ENV_LABELS[part];
-  if (!edgeEnv) {
-    return null;
-  }
-
-  return (
-    <StatusBar.Item>
-      <StatusBar.Text classNames='text-xs text-subdued border border-separator rounded-full px-1'>
-        <span title={edgeEnv}>{edgeEnv[0]}</span>
-      </StatusBar.Text>
-    </StatusBar.Item>
+      <div className='grow' />
+      {/* TODO(burdon): Show EDGE service status? */}
+    </div>
   );
 };

package/src/containers/StatusBarActions/index.ts

@@ -2,6 +2,4 @@
 // Copyright 2024 DXOS.org
 //
 
-import { StatusBarActions } from './StatusBarActions';
-
-export default StatusBarActions;
+export { StatusBarActions as default } from './StatusBarActions';

package/src/containers/StatusBarPanel/index.ts

@@ -2,6 +2,4 @@
 // Copyright 2024 DXOS.org
 //
 
-import { StatusBarPanel } from './StatusBarPanel';
-
-export default StatusBarPanel;
+export { StatusBarPanel as default } from './StatusBarPanel';

package/src/containers/VersionNumber/VersionNumber.tsx

@@ -2,85 +2,45 @@
 // Copyright 2024 DXOS.org
 //
 
-import { formatDistance } from 'date-fns/formatDistance';
+import { formatDistance, isValid } from 'date-fns';
 import React from 'react';
 
 import { useConfig } from '@dxos/react-client';
-import { Icon, Link, Message, Popover, Trans, useTranslation } from '@dxos/react-ui';
+import { Tooltip, useTranslation } from '@dxos/react-ui';
 
-import { StatusBar } from '../../components';
-import { meta } from '../../meta';
+import { StatusBar } from '#components';
+import { meta } from '#meta';
 
 export type VersionNumberProps = {};
 
-const repo = 'https://github.com/dxos/dxos';
-
 const VERSION_REGEX = /([\d.]+)/;
 
 export const VersionNumber = (_props: VersionNumberProps) => {
   const { t } = useTranslation(meta.id);
   const config = useConfig();
-  const { version, timestamp, commitHash } = config.values.runtime?.app?.build ?? {};
-  const [_, v] = version?.match(VERSION_REGEX) ?? [];
-  const isLabs = config.values.runtime?.app?.env?.DX_LABS;
-
-  const releaseUrl =
-    config.values.runtime?.app?.env?.DX_ENVIRONMENT === 'production'
-      ? `${repo}/releases/tag/v${version}`
-      : `${repo}/commit/${commitHash}`;
-
-  const previewUrl = 'https://docs.dxos.org/composer#technology-preview';
+  const { version, timestamp } = config.values.runtime?.app?.build ?? {};
+  const [_, short] = version?.match(VERSION_REGEX) ?? [];
+
+  if (!short) {
+    return null;
+  }
+
+  const releasedAt = timestamp ? new Date(timestamp) : undefined;
+  const released =
+    releasedAt && isValid(releasedAt)
+      ? t('released.message', { released: formatDistance(releasedAt, new Date(), { addSuffix: true }) })
+      : undefined;
+
+  const content = (
+    <div className='flex flex-col items-start gap-0.5'>
+      <span className='font-mono'>{version}</span>
+      {released && <span className='text-xs'>{released}</span>}
+    </div>
+  );
 
   return (
-    <Popover.Root>
-      <Popover.Trigger asChild>
-        <StatusBar.Button classNames='text-xs'>{isLabs ? version : v}</StatusBar.Button>
-      </Popover.Trigger>
-      <Popover.Portal>
-        <Popover.Content
-          side='top'
-          role='message'
-          classNames='z-[12] bg-warning-500 max-w-[min(calc(100vw-16px),40ch)]'
-        >
-          <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='dx-icon-inline ms-1' />
-              </Link>
-            </Message.Content>
-          </Message.Root>
-          <div role='none' className='py-4 px-5 space-b-2 text-base-surface-text'>
-            {timestamp && (
-              <p>
-                {t('released message', {
-                  released: formatDistance(new Date(timestamp), new Date(), { addSuffix: true }),
-                })}
-                <br />
-                <Link href={releaseUrl} target='_blank' rel='noreferrer' variant='neutral'>
-                  {t('see release label')}
-                  <Icon icon='ph--arrow-square-out--bold' classNames='dx-icon-inline ms-1' />
-                </Link>
-              </p>
-            )}
-            <p>
-              <Trans
-                {...{
-                  t,
-                  i18nKey: 'powered by dxos message',
-                  components: {
-                    dxos: <Link href='https://dxos.org' target='_blank' rel='noreferrer' variant='neutral' />,
-                  },
-                }}
-              />
-            </p>
-          </div>
-          <Popover.Arrow />
-        </Popover.Content>
-      </Popover.Portal>
-    </Popover.Root>
+    <Tooltip.Trigger asChild content={content} side='top'>
+      <StatusBar.Button classNames='h-full text-xs'>{short}</StatusBar.Button>
+    </Tooltip.Trigger>
   );
 };

package/src/containers/VersionNumber/index.ts

@@ -2,6 +2,4 @@
 // Copyright 2024 DXOS.org
 //
 
-import { VersionNumber } from './VersionNumber';
-
-export default VersionNumber;
+export { VersionNumber as default } from './VersionNumber';

package/src/index.ts

@@ -2,6 +2,5 @@
 // Copyright 2023 DXOS.org
 //
 
-export * from './components';
+// TODO(wittjosiah): StatusBar should be factored out of plugin-status-bar into a shared UI package.
 export * from './meta';
-export * from './StatusBarPlugin';