@dxos/plugin-status-bar 0.8.4-main.f9ba587 → 0.8.4-main.fcc0d83b33

package/package.json

@@ -1,61 +1,76 @@
 {
   "name": "@dxos/plugin-status-bar",
-  "version": "0.8.4-main.f9ba587",
+  "version": "0.8.4-main.fcc0d83b33",
   "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,
   "type": "module",
+  "imports": {
+    "#capabilities": "./src/capabilities/index.ts",
+    "#components": "./src/components/index.ts",
+    "#containers": "./src/containers/index.ts",
+    "#meta": "./src/meta.ts",
+    "#translations": "./src/translations.ts"
+  },
   "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"
+    },
+    "./translations": {
+      "source": "./src/translations.ts",
+      "types": "./dist/types/src/translations.d.ts",
+      "browser": "./dist/lib/browser/translations.mjs",
+      "node": "./dist/lib/node-esm/translations.mjs"
     }
   },
   "types": "dist/types/src/index.d.ts",
-  "typesVersions": {
-    "*": {}
-  },
   "files": [
     "dist",
     "src"
   ],
   "dependencies": {
-    "@fluentui/react-tabster": "^9.24.2",
-    "@preact-signals/safe-react": "^0.9.0",
-    "@preact/signals-core": "^1.9.0",
+    "@fluentui/react-tabster": "9.26.11",
     "@radix-ui/react-slot": "1.1.2",
-    "date-fns": "^3.3.1",
-    "effect": "3.16.13",
+    "date-fns": "^3.6.0",
+    "effect": "3.20.0",
     "react-resize-detector": "^11.0.1",
-    "@dxos/app-framework": "0.8.4-main.f9ba587",
-    "@dxos/echo-schema": "0.8.4-main.f9ba587",
-    "@dxos/async": "0.8.4-main.f9ba587",
-    "@dxos/echo": "0.8.4-main.f9ba587",
-    "@dxos/plugin-observability": "0.8.4-main.f9ba587",
-    "@dxos/react-client": "0.8.4-main.f9ba587",
-    "@dxos/react-ui-form": "0.8.4-main.f9ba587",
-    "@dxos/schema": "0.8.4-main.f9ba587"
+    "@dxos/app-framework": "0.8.4-main.fcc0d83b33",
+    "@dxos/app-toolkit": "0.8.4-main.fcc0d83b33",
+    "@dxos/echo": "0.8.4-main.fcc0d83b33",
+    "@dxos/operation": "0.8.4-main.fcc0d83b33",
+    "@dxos/react-client": "0.8.4-main.fcc0d83b33",
+    "@dxos/react-ui-form": "0.8.4-main.fcc0d83b33",
+    "@dxos/plugin-observability": "0.8.4-main.fcc0d83b33",
+    "@dxos/schema": "0.8.4-main.fcc0d83b33",
+    "@dxos/async": "0.8.4-main.fcc0d83b33",
+    "@dxos/util": "0.8.4-main.fcc0d83b33"
   },
   "devDependencies": {
-    "@types/react": "~18.2.0",
-    "@types/react-dom": "~18.2.0",
-    "react": "~18.2.0",
-    "react-dom": "~18.2.0",
-    "vite": "5.4.7",
-    "@dxos/react-ui": "0.8.4-main.f9ba587",
-    "@dxos/react-ui-theme": "0.8.4-main.f9ba587",
-    "@dxos/storybook-utils": "0.8.4-main.f9ba587"
+    "@types/react": "~19.2.7",
+    "@types/react-dom": "~19.2.3",
+    "react": "~19.2.3",
+    "react-dom": "~19.2.3",
+    "vite": "^8.0.10",
+    "@dxos/react-ui": "0.8.4-main.fcc0d83b33",
+    "@dxos/storybook-utils": "0.8.4-main.fcc0d83b33",
+    "@dxos/ui-theme": "0.8.4-main.fcc0d83b33"
   },
   "peerDependencies": {
-    "effect": "^3.13.3",
-    "react": "~18.2.0",
-    "react-dom": "~18.2.0",
-    "@dxos/react-ui": "0.8.4-main.f9ba587",
-    "@dxos/react-ui-theme": "0.8.4-main.f9ba587"
+    "effect": "3.20.0",
+    "react": "~19.2.3",
+    "react-dom": "~19.2.3",
+    "@dxos/react-ui": "0.8.4-main.fcc0d83b33",
+    "@dxos/ui-theme": "0.8.4-main.fcc0d83b33"
   },
   "publishConfig": {
     "access": "public"

package/src/StatusBarPlugin.ts

@@ -2,22 +2,15 @@
 // Copyright 2024 DXOS.org
 //
 
-import { Capabilities, contributes, defineModule, definePlugin, Events } 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';
+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,6 @@
 // Copyright 2025 DXOS.org
 //
 
-import { lazy } from '@dxos/app-framework';
+import { Capability } from '@dxos/app-framework';
 
-export const ReactSurface = lazy(() => import('./react-surface'));
+export const ReactSurface = Capability.lazy('ReactSurface', () => import('./react-surface'));

package/src/capabilities/react-surface.tsx

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

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

@@ -0,0 +1,45 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+import { type Meta, type StoryObj } from '@storybook/react-vite';
+import React from 'react';
+
+import { Icon, IconButton } from '@dxos/react-ui';
+import { withTheme } from '@dxos/react-ui/testing';
+
+import { StatusBar } from './index';
+
+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--discord-logo--regular' />
+        <StatusBar.Text>Join us on Discord</StatusBar.Text>
+      </StatusBar.Button>
+    </a>
+    <StatusBar.Item>
+      <IconButton variant='ghost' icon='ph--lightning--regular' iconOnly label='Online' />
+    </StatusBar.Item>
+  </StatusBar.EndContent>
+);
+
+const meta = {
+  title: 'plugins/plugin-status-bar/components/StatusBar',
+  component: StatusBar as any,
+  render: DefaultStory,
+  decorators: [withTheme()],
+  parameters: {
+    layout: 'centered',
+  },
+} satisfies Meta<typeof StatusBar>;
+
+export default meta;
+
+type Story = StoryObj<typeof meta>;
+
+export const Default: Story = {};

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

@@ -3,10 +3,30 @@
 //
 
 import { Slot } from '@radix-ui/react-slot';
-import React, { type ComponentPropsWithRef, forwardRef, type PropsWithChildren, type ReactNode } from 'react';
+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';
+
+//
+// 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 }>;
 
@@ -16,14 +36,21 @@ 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(
-      'flex items-center justify-center gap-2 p-1 px-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,
     );
 
@@ -39,22 +66,9 @@ 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-sm select-none', classNames)}
-      ref={forwardedRef}
-      {...props}
-    >
-      {children}
-    </div>
-  ),
-);
+//
+// Content
+//
 
 type StartContentProps = ThemedClassName<PropsWithChildren<{}>>;
 
@@ -64,6 +78,10 @@ const StartContent = forwardRef<HTMLDivElement, StartContentProps>(({ classNames
   </div>
 ));
 
+//
+// EndContent
+//
+
 type EndContentProps = ThemedClassName<PropsWithChildren<{}>>;
 
 const EndContent = forwardRef<HTMLDivElement, EndContentProps>(({ classNames, children }, forwardedRef) => (
@@ -72,9 +90,13 @@ const EndContent = forwardRef<HTMLDivElement, EndContentProps>(({ classNames, ch
   </div>
 ));
 
+//
+// StatusBar
+//
+
 export const StatusBar = {
-  Text: StatusBarText,
   Item: StatusBarItem,
+  Text: StatusBarText,
   Button: StatusBarButton,
   StartContent,
   EndContent,

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/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

@@ -0,0 +1,70 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+import React, { useState } 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}>
+      <div role='none' className='h-full flex items-center px-2 gap-2'>
+        <EnvironmentLabel />
+        <VersionNumber />
+        <div role='none' className='grow' />
+        <StatusBar.Button asChild>
+          <a href='https://dxos.org/discord' target='_blank' rel='noopener noreferrer'>
+            <Icon icon='ph--discord-logo--regular' />
+            <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' />
+            <StatusBar.Text classNames='hidden sm:block'>{t('github.label')}</StatusBar.Text>
+          </a>
+        </StatusBar.Button>
+      </div>
+    </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>
+  );
+};

package/src/containers/StatusBarActions/index.ts

@@ -0,0 +1,5 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+export { StatusBarActions as default } from './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,5 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+export { StatusBarPanel as default } from './StatusBarPanel';

package/src/containers/VersionNumber/VersionNumber.tsx

@@ -0,0 +1,97 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+import { formatDistance } from 'date-fns/formatDistance';
+import React from 'react';
+
+import { useConfig } from '@dxos/react-client';
+import { Icon, Link, Message, Popover, Trans, useTranslation } from '@dxos/react-ui';
+
+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 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';
+
+  return (
+    <Popover.Root>
+      <Popover.Trigger asChild>
+        <StatusBar.Button classNames='h-full text-xs'>{v}</StatusBar.Button>
+      </Popover.Trigger>
+      <Popover.Portal>
+        <Popover.Content side='top' role='message' classNames='z-[12] max-w-[min(calc(100vw-16px),40ch)]'>
+          <Message.Root valence='info' classNames='rounded-b-none p-4'>
+            <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='flex flex-col ps-9 pe-4 py-2 gap-1 space-b-2 text-base-surface-text'>
+            {timestamp && (
+              <div>
+                <p>
+                  {t('released.message', {
+                    released: formatDistance(new Date(timestamp), new Date(), { addSuffix: true }),
+                  })}
+                </p>
+                <div>
+                  <span className='dx-tag dx-tag--neutral -ml-1'>{version}</span>
+                </div>
+              </div>
+            )}
+            <div>
+              <p>
+                <Link href={releaseUrl} target='_blank' rel='noreferrer' variant='neutral'>
+                  {t('see-release.label')}
+                  <Icon icon='ph--arrow-square-out--bold' size={4} classNames='dx-icon-inline ms-1' />
+                </Link>
+              </p>
+              <p>
+                <Trans
+                  {...{
+                    t,
+                    i18nKey: 'powered-by-dxos.message',
+                    components: {
+                      dxos: (
+                        <Link
+                          classNames='text-green-500'
+                          href='https://dxos.org'
+                          target='_blank'
+                          rel='noreferrer'
+                          variant='neutral'
+                        />
+                      ),
+                    },
+                  }}
+                />
+              </p>
+            </div>
+          </div>
+          <Popover.Arrow />
+        </Popover.Content>
+      </Popover.Portal>
+    </Popover.Root>
+  );
+};

package/src/containers/VersionNumber/index.ts

@@ -0,0 +1,5 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+export { VersionNumber as default } from './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'));