Merge pull request #110 from cisagov/bugfix/close-show-hide-menu-with…

…-dialog Close the QuickMetaPopoverButtonMenu when ToggleHiddenDialog is closed
cisagov · Mar 28, 2023 · 2d82e36 · 2d82e36
2 parents 3babd29 + 8d1a4ce
commit 2d82e36
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/applications/client/src/views/Campaign/Explore/Panels/QuickMeta.tsx b/applications/client/src/views/Campaign/Explore/Panels/QuickMeta.tsx
@@ -40,7 +40,7 @@ export const QuickMetaPopoverButtonMenu = observer<PopoverButtonProps>(({ conten
 		stopPropagation
 		icon={<CarbonIcon icon={OverflowMenuVertical16} />}
 		css={buttonStyle}
-		content={<Menu onClick={(e) => e.stopPropagation()}>{content}</Menu>}
+		content={<Menu>{content}</Menu>}
 		{...props}
 	/>
 ));

diff --git a/packages/ui-styles/src/components/PopoverButton.tsx b/packages/ui-styles/src/components/PopoverButton.tsx
@@ -43,6 +43,10 @@ export const PopoverButton = ({
 			)}
 			content={content}
 			{...popoverProps}
+			onClose={(e) => {
+				if (stopPropagation) e.stopPropagation();
+				popoverProps?.onClose?.(e);
+			}}
 		/>
 	);
 };