refactor(CDropdown): update close button behavior

mrholek · mrholek · commit 0ba2acf5dc2b · 2022-03-30T18:49:24.000+02:00
diff --git a/packages/coreui-react/src/components/dropdown/CDropdownMenu.tsx b/packages/coreui-react/src/components/dropdown/CDropdownMenu.tsx
@@ -63,12 +63,12 @@ export const CDropdownMenu: FC<CDropdownMenuProps> = ({
     if (autoClose === false) {
       return
     }
-    if (!dropdownMenuRef.current?.contains(event.target as HTMLElement)) {
-      if (event.key === 'Escape') {
-        setVisible(false)
-      }
+
+    if (event.key === 'Escape') {
+      setVisible(false)
     }
   }
+
   const handleMouseUp = (event: Event) => {
     if (dropdownToggleRef && dropdownToggleRef.current.contains(event.target as HTMLElement)) {
       return

Original file line number	Diff line number	Diff line change
`@@ -63,12 +63,12 @@ export const CDropdownMenu: FC<CDropdownMenuProps> = ({`
`63`	`63`	`if (autoClose === false) {`
`64`	`64`	`return`
`65`	`65`	`}`
`66`		`- if (!dropdownMenuRef.current?.contains(event.target as HTMLElement)) {`
`67`		`- if (event.key === 'Escape') {`
`68`		`- setVisible(false)`
`69`		`- }`
	`66`	`+`
	`67`	`+ if (event.key === 'Escape') {`
	`68`	`+ setVisible(false)`
`70`	`69`	`}`
`71`	`70`	`}`
	`71`	`+`
`72`	`72`	`const handleMouseUp = (event: Event) => {`
`73`	`73`	`if (dropdownToggleRef && dropdownToggleRef.current.contains(event.target as HTMLElement)) {`
`74`	`74`	`return`