From 4260611eefda20e8cee603f1886a1bf0a4607fed Mon Sep 17 00:00:00 2001
From: Meryem Kaftar <mery@clerk.dev>
Date: Thu, 9 Jan 2025 00:07:02 +0300
Subject: [PATCH] fix(clerk-js): Keyless toast's collapse behavior (#4855)

Co-authored-by: panteliselef <panteliselef@outlook.com>
---
 .changeset/shaggy-otters-hug.md                |  5 +++++
 .../src/ui/components/KeylessPrompt/index.tsx  | 18 ++++++++++--------
 2 files changed, 15 insertions(+), 8 deletions(-)
 create mode 100644 .changeset/shaggy-otters-hug.md

diff --git a/.changeset/shaggy-otters-hug.md b/.changeset/shaggy-otters-hug.md
new file mode 100644
index 0000000000..679f6a13a8
--- /dev/null
+++ b/.changeset/shaggy-otters-hug.md
@@ -0,0 +1,5 @@
+---
+'@clerk/clerk-js': patch
+---
+
+Updates Keyless UI to automatically expand when the application has been claimed.
diff --git a/packages/clerk-js/src/ui/components/KeylessPrompt/index.tsx b/packages/clerk-js/src/ui/components/KeylessPrompt/index.tsx
index bfc68e4149..b36262632b 100644
--- a/packages/clerk-js/src/ui/components/KeylessPrompt/index.tsx
+++ b/packages/clerk-js/src/ui/components/KeylessPrompt/index.tsx
@@ -24,10 +24,12 @@ const _KeylessPrompt = (_props: KeylessPromptProps) => {
   const [isExpanded, setIsExpanded] = useState(true);
   const claimed = Boolean(useRevalidateEnvironment().authConfig.claimedAt);
 
+  const isForcedExpanded = claimed || isExpanded;
+
   return (
     <Portal>
       <Flex
-        data-expanded={isExpanded}
+        data-expanded={isForcedExpanded}
         align='center'
         sx={t => ({
           position: 'fixed',
@@ -61,7 +63,7 @@ const _KeylessPrompt = (_props: KeylessPromptProps) => {
       >
         <button
           type='button'
-          aria-expanded={isExpanded}
+          aria-expanded={isForcedExpanded}
           aria-controls={contentIdentifier}
           id={buttonIdentifier}
           onClick={() => !claimed && setIsExpanded(prev => !prev)}
@@ -103,7 +105,7 @@ const _KeylessPrompt = (_props: KeylessPromptProps) => {
                   width: 1rem;
                   height: 1rem;
                   transform-style: preserve-3d;
-                  animation: ${isExpanded ? 'coinFlipAnimation 12s infinite linear' : ' none'};
+                  animation: ${isForcedExpanded ? 'coinFlipAnimation 12s infinite linear' : ' none'};
 
                   @keyframes coinFlipAnimation {
                     0%,
@@ -160,7 +162,7 @@ const _KeylessPrompt = (_props: KeylessPromptProps) => {
 
             <p
               data-text='Clerk is in keyless mode'
-              aria-label={claimed && isExpanded ? 'Missing environment keys' : 'Clerk is in keyless mode'}
+              aria-label={claimed ? 'Missing environment keys' : 'Clerk is in keyless mode'}
               css={css`
                 color: #d9d9d9;
                 font-size: 0.875rem;
@@ -191,7 +193,7 @@ const _KeylessPrompt = (_props: KeylessPromptProps) => {
                   background-clip: text;
                   filter: blur(1.2px);
                   animation: ${
-                    isExpanded
+                    isForcedExpanded
                       ? 'text-shimmer-expanded 3s infinite ease-out forwards'
                       : 'text-shimmer 3s infinite ease-out forwards'
                   };
@@ -220,7 +222,7 @@ const _KeylessPrompt = (_props: KeylessPromptProps) => {
                   background-size: 180% 100%;
                   background-clip: text;
                   animation: ${
-                    isExpanded
+                    isForcedExpanded
                       ? 'text-shimmer-expanded 3s infinite ease-out forwards'
                       : 'text-shimmer 3s infinite ease-out forwards'
                   };
@@ -316,7 +318,7 @@ const _KeylessPrompt = (_props: KeylessPromptProps) => {
           role='region'
           id={contentIdentifier}
           aria-labelledby={buttonIdentifier}
-          hidden={!isExpanded}
+          hidden={!isForcedExpanded}
         >
           <p
             css={css`
@@ -371,7 +373,7 @@ const _KeylessPrompt = (_props: KeylessPromptProps) => {
           href={claimed ? _props.copyKeysUrl : _props.claimUrl}
           target='_blank'
           rel='noopener noreferrer'
-          data-expanded={isExpanded}
+          data-expanded={isForcedExpanded}
           css={css`
             display: flex;
             align-items: center;