@dxos/shell 0.3.11-main.d56f337 → 0.3.11-main.d8b8a39

package/dist/lib/browser/react.mjs

@@ -220,7 +220,8 @@ var SpaceMemberListImpl = ({ members, onSelect }) => {
   const { t } = useTranslation3("os");
   const visibleMembers = members.filter((member) => member.identity);
   return visibleMembers.length > 0 ? /* @__PURE__ */ React6.createElement(List2, {
-    classNames: "flex flex-col gap-2"
+    classNames: "flex flex-col gap-2",
+    "data-testid": "space-members-list"
   }, visibleMembers.map((member) => {
     return /* @__PURE__ */ React6.createElement(IdentityListItem, {
       key: member.identity.identityKey.toHex(),
@@ -521,12 +522,6 @@ import { useControllableState } from "@radix-ui/react-use-controllable-state";
 import React11, { forwardRef as forwardRef2 } from "react";
 import { Button as Button3, DropdownMenu, useTranslation as useTranslation5 } from "@dxos/react-ui";
 import { descriptionText as descriptionText4, getSize as getSize3, mx as mx9 } from "@dxos/react-ui-theme";
-var buttonColorFragment = (props) => {
-  const resolvedVariant = props.variant ?? "default";
-  return [
-    !props.disabled ? resolvedVariant === "default" ? "bg-neutral-25 hover:bg-white hover:text-primary-500 active:bg-neutral-25 dark:active:bg-neutral-800" : resolvedVariant === "ghost" ? "active:bg-neutral-125 dark:active:bg-neutral-800" : resolvedVariant === "primary" ? "active:bg-primary-700 dark:active:bg-primary-500" : "" : ""
-  ];
-};
 var defaultActions = {
   noopAction: {
     label: "No-op",
@@ -552,8 +547,7 @@ var BifurcatedAction = /* @__PURE__ */ forwardRef2((props, forwardedRef) => {
     ...rest,
     classNames: [
       "bs-11 flex-1 min-is-0 flex gap-2 rounded-ie-none",
-      classNames,
-      ...buttonColorFragment(props)
+      classNames
     ],
     ref: forwardedRef,
     variant,
@@ -563,8 +557,7 @@ var BifurcatedAction = /* @__PURE__ */ forwardRef2((props, forwardedRef) => {
   }, /* @__PURE__ */ React11.createElement(Button3, {
     classNames: [
       "bs-11 flex-none rounded-is-none",
-      classNames,
-      ...buttonColorFragment(props)
+      classNames
     ]
   }, /* @__PURE__ */ React11.createElement("span", {
     className: "sr-only"
@@ -598,7 +591,6 @@ var Action = /* @__PURE__ */ forwardRef2((props, forwardedRef) => {
     classNames: [
       isFull && "is-full",
       "bs-11 flex gap-2 mbs-2",
-      ...buttonColorFragment(props),
       classNames
     ],
     ref: forwardedRef,
@@ -1107,7 +1099,7 @@ var IdentityActionChooserImpl = ({ onCreateInvitationClick, active, send, onDone
     weight: "bold",
     className: getSize6(4)
   })), /* @__PURE__ */ React23.createElement(Action, {
-    "data-testid": "sign-out",
+    "data-testid": "devices-panel.sign-out",
     onClick: () => send?.({
       type: "chooseSignOut"
     }),
@@ -1219,11 +1211,13 @@ var SignOutChooserImpl = ({ disabled, onResetDevice, onJoinNewIdentity, onBack }
     onClick: onBack
   }, t("back label")), /* @__PURE__ */ React25.createElement(Action, {
     variant: "primary",
+    "data-testid": "sign-out.join-new-identity",
     classNames: "!bg-error-500 hover:!bg-error-550",
     disabled,
     onClick: onJoinNewIdentity
   }, t("join new identity label")), /* @__PURE__ */ React25.createElement(Action, {
     variant: "primary",
+    "data-testid": "sign-out.reset-device",
     classNames: "!bg-error-500 hover:!bg-error-550",
     disabled,
     onClick: onResetDevice
@@ -1426,7 +1420,8 @@ var IdentityHeading = ({ titleId, title, identity, onDone }) => {
   }, /* @__PURE__ */ React27.createElement(Avatar4.Fallback, {
     href: fallbackHref
   })), /* @__PURE__ */ React27.createElement(Avatar4.Label, {
-    classNames: "block text-center font-light text-xl"
+    classNames: "block text-center font-light text-xl",
+    "data-testid": "identityHeading.displayName"
   }, identity.profile?.displayName ?? generateName2(identity.identityKey.toHex()))));
 };
 var IdentityPanelImpl = (props) => {
@@ -1636,6 +1631,7 @@ import { useMachine as useMachine2 } from "@xstate/react";
 import { useCallback as useCallback6 } from "react";
 import { assign as assign2, createMachine as createMachine2 } from "xstate";
 import { log as log4 } from "@dxos/log";
+import { AlreadyJoinedError } from "@dxos/react-client";
 import { Invitation as Invitation6, InvitationEncoder as InvitationEncoder3 } from "@dxos/react-client/invitations";
 var __dxlog_file5 = "/home/runner/work/dxos/dxos/packages/sdk/shell/src/panels/JoinPanel/joinMachine.ts";
 var getInvitationSubscribable = (Kind, invitation) => {
@@ -1754,12 +1750,28 @@ var getInvitationSubscribable = (Kind, invitation) => {
         }
       }
     }, (error) => {
+      if (error instanceof AlreadyJoinedError) {
+        log4("[already joined]", {
+          Kind,
+          error
+        }, {
+          F: __dxlog_file5,
+          L: 137,
+          S: void 0,
+          C: (f, a) => f(...a)
+        });
+        next({
+          type: `success${Kind}Invitation`,
+          invitation: invitation.get()
+        });
+        return complete?.();
+      }
       log4.error("[invitation errored]", {
         Kind,
         error
       }, {
         F: __dxlog_file5,
-        L: 136,
+        L: 142,
         S: void 0,
         C: (f, a) => f(...a)
       });
@@ -2084,7 +2096,7 @@ var joinMachine = createMachine2({
         spaceInvitation: context.space.invitation
       }, {
         F: __dxlog_file5,
-        L: 400,
+        L: 406,
         S: void 0,
         C: (f, a) => f(...a)
       });
@@ -2098,7 +2110,7 @@ var defaultCodeFromUrl = (invitationType, text) => {
   } catch (err) {
     log4.catch(err, void 0, {
       F: __dxlog_file5,
-      L: 427,
+      L: 433,
       S: void 0,
       C: (f, a) => f(...a)
     });
@@ -2109,7 +2121,8 @@ var useJoinMachine = (client, options) => {
   const redeemHaloInvitationCode = useCallback6(({ halo }) => {
     if (halo.unredeemedCode) {
       try {
-        const invitationObservable = client.halo.join(InvitationEncoder3.decode(defaultCodeFromUrl("halo", halo.unredeemedCode)));
+        const invitation = InvitationEncoder3.decode(defaultCodeFromUrl("halo", halo.unredeemedCode));
+        const invitationObservable = client.halo.join(invitation);
         return {
           ...halo,
           invitationObservable,
@@ -2118,7 +2131,7 @@ var useJoinMachine = (client, options) => {
       } catch (err) {
         log4.error("Could not redeem device invitation code", err, {
           F: __dxlog_file5,
-          L: 449,
+          L: 454,
           S: void 0,
           C: (f, a) => f(...a)
         });
@@ -2134,23 +2147,16 @@ var useJoinMachine = (client, options) => {
     if (space.unredeemedCode) {
       try {
         const invitation = InvitationEncoder3.decode(defaultCodeFromUrl("space", space.unredeemedCode));
-        if (space.succeededKeys?.has(invitation.spaceKey?.toHex() ?? "never")) {
-          return {
-            ...space,
-            invitation
-          };
-        } else {
-          const invitationObservable = client.spaces.join(invitation);
-          return {
-            ...space,
-            invitationObservable,
-            invitationSubscribable: getInvitationSubscribable("Space", invitationObservable)
-          };
-        }
+        const invitationObservable = client.spaces.join(invitation);
+        return {
+          ...space,
+          invitationObservable,
+          invitationSubscribable: getInvitationSubscribable("Space", invitationObservable)
+        };
       } catch (err) {
         log4.error("Could not redeem space invitation code", err, {
           F: __dxlog_file5,
-          L: 479,
+          L: 476,
           S: void 0,
           C: (f, a) => f(...a)
         });
@@ -2242,7 +2248,7 @@ var AdditionMethodChooser = (viewStateProps) => {
       type: "createIdentity"
     }),
     "data-autofocus": "choosingAuthMethod",
-    "data-testid": "create-identity"
+    "data-testid": "identity-chooser.create-identity"
   }, t("create identity label")), /* @__PURE__ */ React29.createElement(CompoundButton, {
     ...sharedButtonProps,
     description: t("join identity description"),
@@ -2252,7 +2258,7 @@ var AdditionMethodChooser = (viewStateProps) => {
     onClick: () => send({
       type: "acceptHaloInvitation"
     }),
-    "data-testid": "join-identity"
+    "data-testid": "identity-chooser.join-identity"
   }, t("join identity label")), /* @__PURE__ */ React29.createElement(CompoundButton, {
     ...sharedButtonProps,
     // TODO(mykola): Implement recover.
@@ -2264,7 +2270,7 @@ var AdditionMethodChooser = (viewStateProps) => {
     onClick: () => send({
       type: "recoverIdentity"
     }),
-    "data-testid": "recover-identity"
+    "data-testid": "identity-chooser.recover-identity"
   }, t("recover identity label"))));
 };
 
@@ -2429,13 +2435,18 @@ var InvitationInput = (props) => {
   }, [
     unredeemedCode
   ]);
-  const handleNext = () => send({
-    type: `set${Kind}InvitationCode`,
-    code: invitationCodeFromUrl(inputValue),
-    ...Kind === "Space" && {
-      succeededKeys
+  const handleNext = () => {
+    if (inputValue.trim().length === 0) {
+      return;
     }
-  });
+    send({
+      type: `set${Kind}InvitationCode`,
+      code: invitationCodeFromUrl(inputValue),
+      ...Kind === "Space" && {
+        succeededKeys
+      }
+    });
+  };
   const exitAction = /* @__PURE__ */ React33.createElement(Action, {
     variant: "ghost",
     disabled,
@@ -2451,6 +2462,7 @@ var InvitationInput = (props) => {
     className: "grow flex flex-col justify-center"
   }, /* @__PURE__ */ React33.createElement(Input, {
     label: /* @__PURE__ */ React33.createElement(StepHeading, null, t("invitation input label")),
+    // TODO(burdon): Translation.
     placeholder: "Type an invitation code",
     disabled,
     value: inputValue,
@@ -2628,7 +2640,7 @@ var ResetIdentityImpl = ({ disabled, validationMessage, onConfirm }) => {
       confirmationValue
     })),
     disabled,
-    "data-testid": "identity-input",
+    "data-testid": "reset-identity-input",
     placeholder: confirmationValue,
     onChange: ({ target: { value } }) => setInputValue(value)
   })), /* @__PURE__ */ React36.createElement(Actions, null, /* @__PURE__ */ React36.createElement(Action, {