Merge branch 'main' into pfg-phase-1-new4

cloudscape-design · Sep 9, 2024 · d7a63c3 · d7a63c3
2 parents f3a4b50 + 824074c
commit d7a63c3
Show file tree

Hide file tree

Showing 16 changed files with 733 additions and 181 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -138,7 +138,7 @@
     "ts-loader": "^9.2.6",
     "typescript": "^4.6.4",
     "wait-on": "^7.2.0",
-    "webpack": "^5.76.0",
+    "webpack": "^5.94.0",
     "webpack-cli": "^4.9.1",
     "webpack-dev-server": "^4.7.4"
   },

diff --git a/src/popover/body.tsx b/src/popover/body.tsx
@@ -3,6 +3,8 @@
 import React, { useCallback, useEffect, useRef } from 'react';
 import clsx from 'clsx';
 
+import { getAnalyticsMetadataAttribute } from '@cloudscape-design/component-toolkit/internal/analytics-metadata';
+
 import { ButtonProps } from '../button/interfaces';
 import { InternalButton } from '../button/internal';
 import { useInternalI18n } from '../i18n/context';
@@ -24,6 +26,8 @@ export interface PopoverBodyProps {
 
   className?: string;
   ariaLabelledby?: string;
+
+  closeAnalyticsAction?: string;
 }
 
 export default function PopoverBody({
@@ -36,6 +40,7 @@ export default function PopoverBody({
   overflowVisible,
   className,
   ariaLabelledby,
+  closeAnalyticsAction,
 }: PopoverBodyProps) {
   const i18n = useInternalI18n('popover');
   const labelledById = useUniqueId('awsui-popover-');
@@ -63,7 +68,10 @@ export default function PopoverBody({
   }, [showDismissButton]);
 
   const dismissButton = (showDismissButton ?? null) && (
-    <div className={styles.dismiss}>
+    <div
+      className={styles.dismiss}
+      {...(closeAnalyticsAction ? getAnalyticsMetadataAttribute({ action: closeAnalyticsAction }) : {})}
+    >
       <InternalButton
         variant="icon"
         formAction="none"

diff --git a/src/popover/internal.tsx b/src/popover/internal.tsx
@@ -27,6 +27,7 @@ export interface InternalPopoverProps extends Omit<PopoverProps, 'triggerType' |
   __onOpen?: NonCancelableEventHandler<null>;
   triggerType?: PopoverProps.TriggerType | 'filtering-token';
   size: PopoverProps.Size | 'content';
+  __closeAnalyticsAction?: string;
 }
 
 export interface InternalPopoverRef {
@@ -54,6 +55,7 @@ function InternalPopover(
 
     __onOpen,
     __internalRootRef = null,
+    __closeAnalyticsAction,
     ...restProps
   }: InternalPopoverProps,
   ref: React.Ref<InternalPopoverRef>
@@ -166,6 +168,7 @@ function InternalPopover(
               header={header}
               onDismiss={onDismiss}
               overflowVisible="both"
+              closeAnalyticsAction={__closeAnalyticsAction}
             >
               {content}
             </PopoverBody>