@dxos/shell 0.4.7 → 0.4.8-main.ac78619

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/shell",
-  "version": "0.4.7",
+  "version": "0.4.8-main.ac78619",
   "description": "DXOS’s OS experiences",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -37,23 +37,24 @@
     "@radix-ui/react-use-controllable-state": "^1.0.0",
     "@react-hook/async": "^3.1.1",
     "@xstate/react": "^3.2.1",
+    "date-fns": "^3.3.1",
     "emoji-mart": "^5.5.2",
     "react-qr-rounded": "^1.0.0",
     "url-join": "^5.0.0",
     "xstate": "^4.37.0",
-    "@dxos/async": "0.4.7",
-    "@dxos/client-services": "0.4.7",
-    "@dxos/client-protocol": "0.4.7",
-    "@dxos/display-name": "0.4.7",
-    "@dxos/invariant": "0.4.7",
-    "@dxos/debug": "0.4.7",
-    "@dxos/log": "0.4.7",
-    "@dxos/react-client": "0.4.7",
-    "@dxos/react-ui-theme": "0.4.7",
-    "@dxos/react-ui": "0.4.7",
-    "@dxos/react-ui-types": "0.4.7",
-    "@dxos/util": "0.4.7",
-    "@dxos/rpc-tunnel": "0.4.7"
+    "@dxos/async": "0.4.8-main.ac78619",
+    "@dxos/client-services": "0.4.8-main.ac78619",
+    "@dxos/display-name": "0.4.8-main.ac78619",
+    "@dxos/client-protocol": "0.4.8-main.ac78619",
+    "@dxos/debug": "0.4.8-main.ac78619",
+    "@dxos/invariant": "0.4.8-main.ac78619",
+    "@dxos/log": "0.4.8-main.ac78619",
+    "@dxos/react-client": "0.4.8-main.ac78619",
+    "@dxos/react-ui": "0.4.8-main.ac78619",
+    "@dxos/react-ui-theme": "0.4.8-main.ac78619",
+    "@dxos/react-ui-types": "0.4.8-main.ac78619",
+    "@dxos/util": "0.4.8-main.ac78619",
+    "@dxos/rpc-tunnel": "0.4.8-main.ac78619"
   },
   "devDependencies": {
     "@phosphor-icons/react": "^2.0.5",
@@ -64,11 +65,11 @@
     "react-dom": "^18.2.0",
     "vite": "^5.1.5",
     "vite-plugin-turbosnap": "^1.0.2",
-    "@dxos/random": "0.4.7",
-    "@dxos/config": "0.4.7",
-    "@dxos/react-async": "0.4.7",
-    "@dxos/react-ui-theme": "0.4.7",
-    "@dxos/storybook-utils": "0.4.7"
+    "@dxos/config": "0.4.8-main.ac78619",
+    "@dxos/random": "0.4.8-main.ac78619",
+    "@dxos/react-ui-theme": "0.4.8-main.ac78619",
+    "@dxos/react-async": "0.4.8-main.ac78619",
+    "@dxos/storybook-utils": "0.4.8-main.ac78619"
   },
   "peerDependencies": {
     "@phosphor-icons/react": "^2.0.5",

package/src/components/InvitationList/InvitationListItem.tsx

@@ -2,6 +2,7 @@
 // Copyright 2023 DXOS.org
 //
 import { X } from '@phosphor-icons/react';
+import { formatDistanceToNow } from 'date-fns';
 import React, { type ComponentPropsWithoutRef, useCallback } from 'react';
 
 import {
@@ -111,6 +112,10 @@ export const InvitationListItemImpl = ({
 
   const invitationUrl = invitationCode && createInvitationUrl(invitationCode);
   const invitationId = invitation?.get().invitationId;
+  const invitationHasLifetime = invitation?.get().lifetime;
+  const invitationTimeLeft = invitation?.expiry
+    ? formatDistanceToNow(invitation?.expiry, { addSuffix: true })
+    : undefined;
 
   const avatarAnimation = [
     Invitation.State.INIT,
@@ -163,17 +168,26 @@ export const InvitationListItemImpl = ({
         </Tooltip.Portal>
       </Tooltip.Root>
       {showShare && invitationUrl ? (
-        <>
-          <Button
-            variant='ghost'
-            classNames='grow justify-start font-medium'
-            onClick={() => send({ type: 'selectInvitation', invitation })}
-            data-testid='show-qrcode'
-          >
-            <span>{t('open share panel label')}</span>
-          </Button>
-          <CopyButtonIconOnly variant='ghost' value={invitationUrl} />
-        </>
+        <Tooltip.Root>
+          <>
+            <Tooltip.Trigger asChild>
+              <Button
+                variant='ghost'
+                classNames='grow justify-start font-medium'
+                onClick={() => send({ type: 'selectInvitation', invitation })}
+                data-testid='show-qrcode'
+              >
+                <span>{t('open share panel label')}</span>
+              </Button>
+            </Tooltip.Trigger>
+            <CopyButtonIconOnly variant='ghost' value={invitationUrl} />
+          </>
+          <Tooltip.Portal>
+            <Tooltip.Content side='left' classNames='z-[70]'>
+              {invitationHasLifetime && <span>Expires {invitationTimeLeft}</span>}
+            </Tooltip.Content>
+          </Tooltip.Portal>
+        </Tooltip.Root>
       ) : showAuthCode ? (
         <AuthCode code={authCode} classNames='grow' />
       ) : invitationStatus === Invitation.State.CONNECTING ? (

package/src/panels/IdentityPanel/steps/IdentityActionChooser.tsx

@@ -31,6 +31,7 @@ export const IdentityActionChooser = (props: IdentityPanelStepProps) => {
   const createInvitation = (e: React.MouseEvent) => {
     const testing = e.altKey && e.shiftKey;
     invitations.forEach((invitation) => invitation.cancel());
+    // TODO(nf): allow user to make invitations non-persistent?
     const invitation = client.halo.share(
       testing ? { type: Invitation.Type.MULTIUSE, authMethod: Invitation.AuthMethod.NONE } : undefined,
     );

package/src/panels/SpacePanel/steps/SpaceManager.tsx

@@ -81,6 +81,22 @@ export const SpaceManager = (props: SpaceManagerProps) => {
         }
       }, [space]),
     },
+    // inviteNonPersistent: {
+    //   label: 'Invite one (nonpersistent)',
+    //   description: 'Only one user may join. Invitation does not resume if client is restarted.',
+    //   icon: UserPlus,
+    //   onClick: useCallback(() => {
+    //     const invitation = space.share?.({
+    //       type: Invitation.Type.INTERACTIVE,
+    //       authMethod: Invitation.AuthMethod.SHARED_SECRET,
+    //       persistent: false,
+    //       target,
+    //     });
+    //     if (invitation && config.values.runtime?.app?.env?.DX_ENVIRONMENT !== 'production') {
+    //       invitation.subscribe(onInvitationEvent);
+    //     }
+    //   }, [space]),
+    // },
   };
 
   return <SpaceManagerImpl {...props} invitations={invitations} inviteActions={inviteActions} />;