Merge branch 'main' into use-overflow-items

carbon-design-system · Dec 27, 2024 · 05a7abd · 05a7abd
2 parents c325bba + d341b15
commit 05a7abd
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 19 deletions.
diff --git a/packages/ibm-products/src/components/SidePanel/SidePanel.docs-page.js b/packages/ibm-products/src/components/SidePanel/SidePanel.docs-page.js
@@ -8,7 +8,7 @@
 import React from 'react';
 import { StoryDocsPage } from '../../global/js/utils/StoryDocsPage';
 
-import * as stories from './SidePanel';
+import * as stories from './SidePanel.stories';
 
 const DocsPage = () => (
   <StoryDocsPage

diff --git a/packages/ibm-products/src/components/SidePanel/SidePanel.tsx b/packages/ibm-products/src/components/SidePanel/SidePanel.tsx
@@ -553,7 +553,7 @@ export let SidePanel = React.forwardRef(
       if (!open) {
         onUnmount?.();
       }
-      setAnimationComplete(true);
+      setAnimationComplete(!animationComplete);
     };
 
     // Set the internal state `animationComplete` to true if
@@ -631,26 +631,24 @@ export let SidePanel = React.forwardRef(
     ]);
 
     useEffect(() => {
-      if (open) {
-        setTimeout(() => {
+      if (open && animationComplete) {
+        if (
+          selectorPrimaryFocus &&
+          getSpecificElement(sidePanelRef?.current, selectorPrimaryFocus)
+        ) {
+          const primeFocusEl = getSpecificElement(
+            sidePanelRef?.current,
+            selectorPrimaryFocus
+          );
           if (
-            selectorPrimaryFocus &&
-            getSpecificElement(sidePanelRef?.current, selectorPrimaryFocus)
+            primeFocusEl &&
+            window?.getComputedStyle(primeFocusEl)?.display !== 'none'
           ) {
-            const primeFocusEl = getSpecificElement(
-              sidePanelRef?.current,
-              selectorPrimaryFocus
-            );
-            if (
-              primeFocusEl &&
-              window?.getComputedStyle(primeFocusEl)?.display !== 'none'
-            ) {
-              (primeFocusEl as HTMLElement)?.focus();
-            }
-          } else if (!slideIn) {
-            firstElement?.focus();
+            setTimeout(() => primeFocusEl?.focus(), 0);
           }
-        }, 0);
+        } else if (!slideIn) {
+          setTimeout(() => firstElement?.focus(), 0);
+        }
       }
     }, [
       animationComplete,

diff --git a/packages/ibm-products/telemetry.yml b/packages/ibm-products/telemetry.yml
@@ -456,14 +456,17 @@ collect:
         - editButtonText
         - editing
         - editSuccess
+        - editSuccessMessage
         - editSuccessTitle
         - errorText
         - generateButtonText
         - generateSuccessBody
+        - generateSuccessMessage
         - generateSuccessTitle
         - generateTitle
         - hasAPIKeyVisibilityToggle
         - hasDownloadLink
+        - helperText
         - hideAPIKeyLabel
         - loadingText
         - modalLabel
@@ -532,6 +535,7 @@ collect:
         - fixedIsVisible
         # CoachmarkOverlayElements
         - isVisible
+        - onBack
         # CoachmarkStackHome
         - onClickNavItem
         # Columns