@dxos/shell 0.4.10-main.fd4f2a3 → 0.4.10-main.fe71b4c

package/src/components/DeviceList/DeviceList.tsx

@@ -0,0 +1,54 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import { CaretRight, Plus } from '@phosphor-icons/react';
+import React from 'react';
+
+import { type Device } from '@dxos/react-client/halo';
+import { Button, List, useTranslation } from '@dxos/react-ui';
+import { descriptionText, getSize, mx } from '@dxos/react-ui-theme';
+
+import { DeviceListItem } from './DeviceListItem';
+import { type DeviceListProps } from './DeviceListProps';
+
+export const DeviceList = ({
+  devices,
+  onClickAdd,
+  onClickEdit,
+  onClickReset,
+  onClickJoinExisting,
+}: DeviceListProps) => {
+  const { t } = useTranslation('os');
+  return (
+    <>
+      <h2 className={mx(descriptionText, 'text-center mbs-4')}>{t('devices heading')}</h2>
+      {devices.length > 0 && (
+        <List>
+          {devices.map((device: Device) => {
+            return (
+              <DeviceListItem
+                key={device.deviceKey.toHex()}
+                device={device}
+                onClickEdit={() => onClickEdit?.(device)}
+                {...{ onClickReset, onClickJoinExisting }}
+              />
+            );
+          })}
+        </List>
+      )}
+      <Button
+        variant='ghost'
+        classNames='justify-start gap-2 !pis-0 !pie-3'
+        data-testid='devices-panel.create-invitation'
+        onClick={onClickAdd}
+      >
+        <div role='img' className={mx(getSize(8), 'm-1 rounded-sm surface-input grid place-items-center')}>
+          <Plus weight='light' className={getSize(6)} />
+        </div>
+        <span className='grow font-medium text-start'>{t('choose add device label')}</span>
+        <CaretRight weight='bold' className={getSize(4)} />
+      </Button>
+    </>
+  );
+};

package/src/components/DeviceList/DeviceListItem.tsx

@@ -0,0 +1,120 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import {
+  Compass,
+  Desktop,
+  DeviceMobile,
+  Devices,
+  DotsThree,
+  type IconProps,
+  Intersect,
+  Power,
+  Robot,
+} from '@phosphor-icons/react';
+import React, { type ComponentPropsWithoutRef, forwardRef } from 'react';
+
+import { generateName } from '@dxos/display-name';
+import { Device, DeviceType, DeviceKind } from '@dxos/react-client/halo';
+import {
+  ListItem,
+  Avatar,
+  useId,
+  type ThemedClassName,
+  Tag,
+  useTranslation,
+  DropdownMenu,
+  Button,
+} from '@dxos/react-ui';
+import { getSize } from '@dxos/react-ui-theme';
+import { keyToFallback } from '@dxos/util';
+
+import { type DeviceListItemProps } from './DeviceListProps';
+
+const iconProps: IconProps = {
+  weight: 'duotone',
+  width: 24,
+  height: 24,
+  x: 8,
+  y: 8,
+};
+
+export const DeviceListItem = forwardRef<
+  HTMLLIElement,
+  ThemedClassName<ComponentPropsWithoutRef<'li'>> & DeviceListItemProps
+>(({ device, onClickAdd, onClickEdit, onClickReset, onClickJoinExisting, classNames, ...props }, forwardedRef) => {
+  const { t } = useTranslation('os');
+  const fallbackValue = keyToFallback(device.deviceKey);
+  const labelId = useId('identityListItem__label');
+  const displayName = device.profile
+    ? t('device name placeholder', { os: device.profile.os, platform: device.profile.platform })
+    : generateName(device.deviceKey.toHex());
+  const isCurrent = device.kind === DeviceKind.CURRENT;
+  return (
+    <ListItem.Root
+      {...props}
+      classNames={['flex gap-2 items-center mlb-2', classNames]}
+      data-testid={`device-list-item${isCurrent ? '-current' : ''}`}
+      labelId={labelId}
+      ref={forwardedRef}
+    >
+      <Avatar.Root
+        status={device.presence === Device.PresenceState.ONLINE ? 'active' : 'inactive'}
+        labelId={labelId}
+        hue={fallbackValue.hue}
+        variant='square'
+      >
+        <Avatar.Frame classNames='place-self-center'>
+          {device.profile?.type ? (
+            device.profile.type === DeviceType.BROWSER ? (
+              <Compass {...iconProps} />
+            ) : device.profile.type === DeviceType.NATIVE ? (
+              <Desktop {...iconProps} />
+            ) : [DeviceType.AGENT, DeviceType.AGENT_MANAGED].includes(device.profile.type) ? (
+              <Robot {...iconProps} />
+            ) : device.profile.type === DeviceType.MOBILE ? (
+              <DeviceMobile {...iconProps} />
+            ) : (
+              <Devices {...iconProps} />
+            )
+          ) : (
+            <Avatar.Fallback text={fallbackValue.emoji} />
+          )}
+        </Avatar.Frame>
+        {isCurrent && <Tag color='primary'>{t('current device tag label')}</Tag>}
+        <Avatar.Label classNames='flex-1 text-sm truncate'>{displayName}</Avatar.Label>
+        {device.kind === DeviceKind.CURRENT && (
+          <DropdownMenu.Root>
+            <DropdownMenu.Trigger asChild>
+              <Button
+                variant='ghost'
+                classNames='pli-0 is-[--rail-action] bs-[--rail-action]'
+                data-testid={`device-list-item${isCurrent ? '-current' : ''}.options`}
+              >
+                <span className='sr-only'>{t('more options label')}</span>
+                <DotsThree className={getSize(5)} />
+              </Button>
+            </DropdownMenu.Trigger>
+            <DropdownMenu.Content>
+              <DropdownMenu.Viewport>
+                {/* <DropdownMenu.Item disabled onClick={onClickEdit}> */}
+                {/*  <PencilSimpleLine className={getSize(5)} /> */}
+                {/*  {t('edit device label')} */}
+                {/* </DropdownMenu.Item> */}
+                <DropdownMenu.Item data-testid='device-list-item-current.join-existing' onClick={onClickJoinExisting}>
+                  <Intersect className={getSize(5)} />
+                  {t('choose join new identity label')}
+                </DropdownMenu.Item>
+                <DropdownMenu.Item data-testid='device-list-item-current.reset' onClick={onClickReset}>
+                  <Power className={getSize(5)} />
+                  {t('reset device label')}
+                </DropdownMenu.Item>
+              </DropdownMenu.Viewport>
+            </DropdownMenu.Content>
+          </DropdownMenu.Root>
+        )}
+      </Avatar.Root>
+    </ListItem.Root>
+  );
+});

package/src/components/DeviceList/DeviceListProps.ts

@@ -0,0 +1,33 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+import { type SpaceMember } from '@dxos/react-client/echo';
+import { type Device } from '@dxos/react-client/halo';
+
+export type DeviceListProps = {
+  devices: Device[];
+  onClickAdd?: () => void;
+  onClickEdit?: (device: Device) => void;
+  onClickReset?: () => void;
+  onClickJoinExisting?: () => void;
+};
+
+export type AgentFormProps = {
+  onAgentCreate?: () => Promise<void>;
+  onAgentDestroy?: () => Promise<void>;
+  agentStatus?: string;
+  agentActive?: boolean;
+  agentProviderDisabled?: boolean;
+  validationMessage?: string;
+  agentHostingEnabled?: boolean;
+};
+
+export type DeviceListItemProps = {
+  device: Device;
+  presence?: SpaceMember['presence'];
+  onClickAdd?: () => void;
+  onClickEdit?: () => void;
+  onClickReset?: () => void;
+  onClickJoinExisting?: () => void;
+};

package/src/components/DeviceList/index.ts

@@ -0,0 +1,6 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+export * from './DeviceList';
+export * from './DeviceListProps';

package/src/components/EmojiPicker.tsx

@@ -3,11 +3,20 @@
 //
 import emojiData from '@emoji-mart/data';
 import EmojiMart from '@emoji-mart/react';
-import { ArrowCounterClockwise, CaretDown } from '@phosphor-icons/react';
+import { ArrowCounterClockwise, CaretDown, ImageSquare } from '@phosphor-icons/react';
 import { useControllableState } from '@radix-ui/react-use-controllable-state';
-import React, { type Dispatch, type SetStateAction, useState } from 'react';
+import React, { type Dispatch, type SetStateAction, useRef, useState } from 'react';
 
-import { Button, Popover, useTranslation, Tooltip, type ButtonProps, useMediaQuery } from '@dxos/react-ui';
+import {
+  Button,
+  Popover,
+  useTranslation,
+  Tooltip,
+  type ButtonProps,
+  Toolbar,
+  useMediaQuery,
+  type ThemedClassName,
+} from '@dxos/react-ui';
 import { getSize } from '@dxos/react-ui-theme';
 
 export type EmojiPickerProps = {
@@ -18,7 +27,95 @@ export type EmojiPickerProps = {
   onClickClear?: ButtonProps['onClick'];
 };
 
-export const EmojiPicker = ({ disabled, defaultEmoji, emoji, onChangeEmoji, onClickClear }: EmojiPickerProps) => {
+/**
+ * A toolbar button for picking an emoji. Use only in `role=toolbar` elements. Unable to unset the value.
+ */
+export const EmojiPickerToolbarButton = ({
+  disabled,
+  defaultEmoji,
+  emoji,
+  onChangeEmoji,
+  classNames,
+}: ThemedClassName<Omit<EmojiPickerProps, 'onClickClear'>>) => {
+  const { t } = useTranslation('os');
+
+  const [_emojiValue, setEmojiValue] = useControllableState<string>({
+    prop: emoji,
+    onChange: onChangeEmoji,
+    defaultProp: defaultEmoji,
+  });
+
+  const [emojiPickerOpen, setEmojiPickerOpen] = useState<boolean>(false);
+
+  const suppressNextTooltip = useRef<boolean>(false);
+  const [triggerTooltipOpen, setTriggerTooltipOpen] = useState(false);
+
+  return (
+    <Tooltip.Root
+      open={triggerTooltipOpen}
+      onOpenChange={(nextOpen) => {
+        if (suppressNextTooltip.current) {
+          setTriggerTooltipOpen(false);
+          suppressNextTooltip.current = false;
+        } else {
+          setTriggerTooltipOpen(nextOpen);
+        }
+      }}
+    >
+      <Popover.Root
+        open={emojiPickerOpen}
+        onOpenChange={(nextOpen) => {
+          setEmojiPickerOpen(nextOpen);
+          suppressNextTooltip.current = true;
+        }}
+      >
+        <Tooltip.Trigger asChild>
+          <Popover.Trigger asChild>
+            <Toolbar.Button classNames={['gap-2 text-2xl plb-1', classNames]} disabled={disabled}>
+              <span className='sr-only'>{t('select emoji label')}</span>
+              <ImageSquare className={getSize(5)} />
+            </Toolbar.Button>
+          </Popover.Trigger>
+        </Tooltip.Trigger>
+        <Tooltip.Portal>
+          <Tooltip.Content side='bottom' classNames='z-50'>
+            {t('select emoji label')}
+            <Tooltip.Arrow />
+          </Tooltip.Content>
+        </Tooltip.Portal>
+        <Popover.Content
+          side='bottom'
+          onKeyDownCapture={(event) => {
+            if (event.key === 'Escape') {
+              event.stopPropagation();
+              setEmojiPickerOpen(false);
+              suppressNextTooltip.current = true;
+            }
+          }}
+        >
+          <EmojiMart
+            data={emojiData}
+            onEmojiSelect={({ native }: { native?: string }) => {
+              if (native) {
+                setEmojiValue(native);
+                setEmojiPickerOpen(false);
+              }
+            }}
+            autoFocus={true}
+            maxFrequentRows={0}
+            noCountryFlags={true}
+          />
+          <Popover.Arrow />
+        </Popover.Content>
+      </Popover.Root>
+    </Tooltip.Root>
+  );
+};
+
+/**
+ * A button for picking an emoji alongside a button for unsetting it.
+ */
+export const EmojiPickerBlock = ({ disabled, defaultEmoji, emoji, onChangeEmoji, onClickClear }: EmojiPickerProps) => {
   const { t } = useTranslation('os');
   const [isMd] = useMediaQuery('md', { ssr: false });
 

package/src/components/HuePicker.tsx

@@ -1,12 +1,21 @@
 //
 // Copyright 2024 DXOS.org
 //
-import { ArrowCounterClockwise, CaretDown, Check } from '@phosphor-icons/react';
+import { ArrowCounterClockwise, CaretDown, Check, Palette } from '@phosphor-icons/react';
 import { useControllableState } from '@radix-ui/react-use-controllable-state';
-import React, { type Dispatch, type SetStateAction } from 'react';
+import React, { type Dispatch, type SetStateAction, useRef, useState } from 'react';
 
-import { Button, useTranslation, Tooltip, DropdownMenu, useThemeContext, type ButtonProps } from '@dxos/react-ui';
-import { getSize, hueTokenThemes } from '@dxos/react-ui-theme';
+import {
+  Button,
+  useTranslation,
+  Tooltip,
+  DropdownMenu,
+  useThemeContext,
+  type ButtonProps,
+  Toolbar,
+  type ThemedClassName,
+} from '@dxos/react-ui';
+import { getSize, hueTokenThemes, mx } from '@dxos/react-ui-theme';
 
 const HuePreview = ({ hue }: { hue: string }) => {
   const { tx } = useThemeContext();
@@ -25,7 +34,92 @@ export type HuePickerProps = {
   onClickClear?: ButtonProps['onClick'];
 };
 
-export const HuePicker = ({ disabled, hue, onChangeHue, defaultHue, onClickClear }: HuePickerProps) => {
+/**
+ * A toolbar button for picking hue. Use only in `role=toolbar` elements. Unable to unset the value.
+ */
+export const HuePickerToolbarButton = ({
+  disabled,
+  hue,
+  onChangeHue,
+  classNames,
+  defaultHue,
+}: ThemedClassName<Omit<HuePickerProps, 'onClickClear'>>) => {
+  const { t } = useTranslation('os');
+
+  const [hueValue, setHueValue] = useControllableState<string>({
+    prop: hue,
+    onChange: onChangeHue,
+    defaultProp: defaultHue,
+  });
+
+  const [huePickerOpen, setHuePickerOpen] = useState<boolean>(false);
+
+  const suppressNextTooltip = useRef<boolean>(false);
+  const [triggerTooltipOpen, setTriggerTooltipOpen] = useState(false);
+
+  return (
+    <Tooltip.Root
+      open={triggerTooltipOpen}
+      onOpenChange={(nextOpen) => {
+        if (suppressNextTooltip.current) {
+          setTriggerTooltipOpen(false);
+          suppressNextTooltip.current = false;
+        } else {
+          setTriggerTooltipOpen(nextOpen);
+        }
+      }}
+    >
+      <DropdownMenu.Root
+        modal={false}
+        open={huePickerOpen}
+        onOpenChange={(nextOpen) => {
+          setHuePickerOpen(nextOpen);
+          suppressNextTooltip.current = true;
+        }}
+      >
+        <Tooltip.Trigger asChild>
+          <DropdownMenu.Trigger asChild>
+            <Toolbar.Button classNames={mx('gap-2 plb-1', classNames)} disabled={disabled}>
+              <span className='sr-only'>{t('select hue label')}</span>
+              <Palette className={getSize(5)} />
+            </Toolbar.Button>
+          </DropdownMenu.Trigger>
+        </Tooltip.Trigger>
+        <Tooltip.Portal>
+          <Tooltip.Content side='bottom' classNames='z-50'>
+            {t('select hue label')}
+            <Tooltip.Arrow />
+          </Tooltip.Content>
+        </Tooltip.Portal>
+        <DropdownMenu.Content side='bottom'>
+          <DropdownMenu.Viewport>
+            {Object.keys(hueTokenThemes).map((hue) => {
+              return (
+                <DropdownMenu.CheckboxItem
+                  key={hue}
+                  checked={hue === hueValue}
+                  onCheckedChange={() => setHueValue(hue)}
+                >
+                  <HuePreview hue={hue} />
+                  <span className='grow'>{t(`${hue} label`)}</span>
+                  <DropdownMenu.ItemIndicator>
+                    <Check />
+                  </DropdownMenu.ItemIndicator>
+                </DropdownMenu.CheckboxItem>
+              );
+            })}
+          </DropdownMenu.Viewport>
+          <DropdownMenu.Arrow />
+        </DropdownMenu.Content>
+      </DropdownMenu.Root>
+    </Tooltip.Root>
+  );
+};
+
+/**
+ * A button for picking hue alongside a button for unsetting it.
+ */
+export const HuePickerBlock = ({ disabled, hue, onChangeHue, defaultHue, onClickClear }: HuePickerProps) => {
   const { t } = useTranslation('os');
 
   const [hueValue, setHueValue] = useControllableState<string>({

package/src/components/IdentityList/index.ts

@@ -2,6 +2,5 @@
 // Copyright 2023 DXOS.org
 //
 
-export * from './DeviceList';
 export * from './IdentityListItem';
 export * from './SpaceMemberList';

package/src/components/InvitationList/InvitationListItem.tsx

@@ -96,14 +96,14 @@ export const InvitationListItemImpl = ({
   ...props
 }: InvitationListItemImplProps) => {
   const { t } = useTranslation('os');
-  const { cancel, status: invitationStatus, invitationCode, authCode, type } = propsInvitationStatus;
+  const { cancel, status: invitationStatus, invitationCode, authCode, multiUse } = propsInvitationStatus;
 
   const isCancellable = !(
     [Invitation.State.ERROR, Invitation.State.TIMEOUT, Invitation.State.CANCELLED].indexOf(invitationStatus) >= 0
   );
 
   const showShare =
-    type === Invitation.Type.MULTIUSE ||
+    multiUse ||
     [Invitation.State.INIT, Invitation.State.CONNECTING, Invitation.State.CONNECTED].indexOf(invitationStatus) >= 0;
 
   const showAuthCode = invitationStatus === Invitation.State.READY_FOR_AUTHENTICATION;
@@ -147,9 +147,9 @@ export const InvitationListItemImpl = ({
       classNames={['flex gap-2 pis-3 pie-1 items-center relative', props.classNames]}
     >
       <ListItem.Heading classNames='sr-only'>
-        {t(type === Invitation.Type.MULTIUSE ? 'invite many list item label' : 'invite one list item label')}
+        {t(multiUse ? 'invite many list item label' : 'invite one list item label')}
       </ListItem.Heading>
-      {type === Invitation.Type.MULTIUSE && (
+      {multiUse && (
         <AvatarStackEffect status={avatarStatus} animation={avatarAnimation} reverseEffects={reverseEffects} />
       )}
       <Tooltip.Root>
@@ -162,7 +162,7 @@ export const InvitationListItemImpl = ({
         </Avatar.Root>
         <Tooltip.Portal>
           <Tooltip.Content side='left' classNames='z-[70]'>
-            {t(type === Invitation.Type.MULTIUSE ? 'invite many qr label' : 'invite one qr label')}
+            {t(multiUse ? 'invite many qr label' : 'invite one qr label')}
             <Tooltip.Arrow />
           </Tooltip.Content>
         </Tooltip.Portal>

package/src/components/index.ts

@@ -2,11 +2,13 @@
 // Copyright 2023 DXOS.org
 //
 
+export * from './AgentConfig';
 export * from './Clipboard';
 export * from './CompoundButton';
 export * from './EmojiPicker';
 export * from './HuePicker';
 export * from './IdentityList';
+export * from './DeviceList';
 export * from './InvitationList';
 export * from './Panel';
 export * from './Viewport';

package/src/composites/Shell/Shell.tsx

@@ -81,13 +81,7 @@ export const Shell = ({ runtime, origin }: { runtime: ShellRuntime; origin: stri
             await runtime.setAppContext({ display: ShellDisplay.NONE });
             runtime.setLayout({ layout: ShellLayout.DEFAULT });
           }}
-          initialDisposition={
-            layout === ShellLayout.SHARE_IDENTITY
-              ? 'manage-device-invitation'
-              : layout === ShellLayout.EDIT_PROFILE
-                ? 'manage-profile'
-                : 'default'
-          }
+          initialDisposition={layout === ShellLayout.SHARE_IDENTITY ? 'manage-device-invitation' : 'default'}
         />
       );
 

package/src/panels/IdentityPanel/IdentityPanel.stories.tsx

@@ -8,7 +8,6 @@ import React from 'react';
 
 import { faker } from '@dxos/random';
 import { PublicKey } from '@dxos/react-client';
-import { Device, DeviceKind } from '@dxos/react-client/halo';
 import { Invitation } from '@dxos/react-client/invitations';
 import { withTheme } from '@dxos/storybook-utils';
 
@@ -53,58 +52,6 @@ export const IdentityActionChooser = () => {
   );
 };
 
-export const UpdateProfileForm = () => {
-  return (
-    <StorybookDialog inOverlayLayout>
-      <IdentityPanelImpl
-        {...noOpProps}
-        activeView='update profile form'
-        IdentityActionChooser={IdentityActionChooserImpl}
-      />
-    </StorybookDialog>
-  );
-};
-
-export const DeviceManager = () => {
-  return (
-    <StorybookDialog inOverlayLayout>
-      <IdentityPanelImpl
-        {...{
-          ...noOpProps,
-          // TODO(nf): update
-          devices: [
-            {
-              deviceKey: PublicKey.random(),
-              kind: DeviceKind.CURRENT,
-              presence: Device.PresenceState.ONLINE,
-            },
-            {
-              deviceKey: PublicKey.random(),
-              kind: DeviceKind.TRUSTED,
-              presence: Device.PresenceState.ONLINE,
-            },
-            {
-              deviceKey: PublicKey.random(),
-              kind: DeviceKind.TRUSTED,
-              presence: Device.PresenceState.OFFLINE,
-            },
-          ],
-        }}
-        activeView='device manager'
-        IdentityActionChooser={IdentityActionChooserImpl}
-      />
-    </StorybookDialog>
-  );
-};
-
-export const DeviceManagerEmpty = () => {
-  return (
-    <StorybookDialog inOverlayLayout>
-      <IdentityPanelImpl {...noOpProps} activeView='device manager' IdentityActionChooser={IdentityActionChooserImpl} />
-    </StorybookDialog>
-  );
-};
-
 const DeviceInvitationManagerWithState = (extraProps: InvitationManagerProps) => (
   <StorybookDialog inOverlayLayout>
     <IdentityPanelImpl
@@ -156,13 +103,3 @@ export const DeviceInvitationManagerCancelled = () =>
   DeviceInvitationManagerWithState({
     status: Invitation.State.CANCELLED,
   });
-
-// export const IdentityActionChooser = {
-//   decorators: [ClientDecorator()],
-//   args: { activeView: 'identity action chooser' },
-// };
-
-// export const DeviceManager = {
-//   decorators: [ClientDecorator()],
-//   args: { activeView: 'device manager' },
-// };