@dxos/shell 0.4.10-main.fa5a270 → 0.4.10-main.fd8ea31

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 } 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,9 +27,98 @@ 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 });
+
   const [emojiValue, setEmojiValue] = useControllableState<string>({
     prop: emoji,
     onChange: onChangeEmoji,
@@ -41,6 +139,7 @@ export const EmojiPicker = ({ disabled, defaultEmoji, emoji, onChangeEmoji, onCl
         </Popover.Trigger>
         <Popover.Content
           side='right'
+          sideOffset={isMd ? 0 : -310}
           onKeyDownCapture={(event) => {
             if (event.key === 'Escape') {
               event.stopPropagation();

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/IdentityDialog/IdentityDialog.tsx

@@ -16,7 +16,7 @@ export interface IdentityDialogProps
 }
 
 export const IdentityDialog = (props: IdentityDialogProps) => {
-  const titleId = useId('spaceDialog__title');
+  const titleId = useId('identityDialog__title', props.title);
   return (
     <Dialog.Root defaultOpen onOpenChange={(open) => open || props.onDone?.()}>
       <Dialog.Portal>

package/src/composites/Shell/Shell.tsx

@@ -11,6 +11,7 @@ import { useSpace } from '@dxos/react-client/echo';
 import { IdentityDialog } from '../IdentityDialog';
 import { JoinDialog } from '../JoinDialog';
 import { SpaceDialog } from '../SpaceDialog';
+import { StatusDialog } from '../StatusDialog';
 
 export const Shell = ({ runtime, origin }: { runtime: ShellRuntime; origin: string }) => {
   const [{ layout, invitationCode, spaceKey, target }, setLayout] = useState<LayoutRequest>({
@@ -41,11 +42,18 @@ export const Shell = ({ runtime, origin }: { runtime: ShellRuntime; origin: stri
   }, [runtime, layout, space]);
 
   switch (layout) {
+    case ShellLayout.STATUS:
+      return <StatusDialog />;
     case ShellLayout.INITIALIZE_IDENTITY:
+    case ShellLayout.INITIALIZE_IDENTITY_FROM_INVITATION:
       return (
         <JoinDialog
           mode='halo-only'
+          initialDisposition={
+            layout === ShellLayout.INITIALIZE_IDENTITY_FROM_INVITATION ? 'accept-halo-invitation' : 'default'
+          }
           initialInvitationCode={invitationCode}
+          onCancelResetStorage={() => runtime.setLayout({ layout: ShellLayout.IDENTITY })}
           onDone={() => {
             void runtime.setAppContext({ display: ShellDisplay.NONE });
             runtime.setLayout({ layout: ShellLayout.DEFAULT });
@@ -53,22 +61,27 @@ export const Shell = ({ runtime, origin }: { runtime: ShellRuntime; origin: stri
         />
       );
 
-    // TODO(wittjosiah): Jump straight to specific step if SHARE or EDIT are specified.
     case ShellLayout.IDENTITY:
     case ShellLayout.SHARE_IDENTITY:
     case ShellLayout.EDIT_PROFILE:
       return (
         <IdentityDialog
           createInvitationUrl={(invitationCode) => `${origin}?deviceInvitationCode=${invitationCode}`}
-          onResetDevice={async () => {
+          onResetStorage={async () => {
+            runtime.setLayout({ layout: ShellLayout.STATUS });
             await client.reset();
-            await runtime.setAppContext({ display: ShellDisplay.NONE, reload: true });
+            return runtime.setAppContext({ display: ShellDisplay.NONE, reload: true });
+          }}
+          onJoinNewIdentity={async () => {
+            runtime.setLayout({ layout: ShellLayout.STATUS });
+            await client.reset();
+            return runtime.setLayout({ layout: ShellLayout.INITIALIZE_IDENTITY_FROM_INVITATION });
           }}
-          onJoinNewIdentity={() => runtime.setLayout({ layout: ShellLayout.INITIALIZE_IDENTITY })}
           onDone={async () => {
             await runtime.setAppContext({ display: ShellDisplay.NONE });
             runtime.setLayout({ layout: ShellLayout.DEFAULT });
           }}
+          initialDisposition={layout === ShellLayout.SHARE_IDENTITY ? 'manage-device-invitation' : 'default'}
         />
       );
 

package/src/composites/StatusDialog/StatusDialog.tsx

@@ -0,0 +1,24 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import React from 'react';
+
+import { AlertDialog, useId } from '@dxos/react-ui';
+
+import { StatusPanel } from '../../panels';
+
+export const StatusDialog = () => {
+  const titleId = useId('statusDialog__title');
+  return (
+    <AlertDialog.Root open>
+      <AlertDialog.Portal>
+        <AlertDialog.Overlay>
+          <AlertDialog.Content aria-labelledby={titleId}>
+            <StatusPanel titleId={titleId} />
+          </AlertDialog.Content>
+        </AlertDialog.Overlay>
+      </AlertDialog.Portal>
+    </AlertDialog.Root>
+  );
+};

package/src/composites/StatusDialog/index.ts

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

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' },
-// };