chore: fixup tests

Author: FRSgit

apps/preview/next/pages/showcases/MegaMenu/MegaMenuNavigation.tsx

@@ -402,8 +402,8 @@ export default function MegaMenuNavigation() {
   const { close, open, isOpen } = useDisclosure();
   const { refs, style } = useDropdown({
     isOpen,
-    onClose: (event: KeyboardEvent) => {
-      if (event.key === 'Escape') {
+    onClose: (event) => {
+      if ('key' in event && event.key === 'Escape') {
         refsByKey[activeNode[0]]?.current?.focus();
       }
       close();

packages/sfui/frameworks/react/hooks/useDropdown/types.ts

@@ -3,7 +3,7 @@ import type { UsePopoverOptions } from '../usePopover';
 
 export type UseDropdownOptions = Prettify<
   UsePopoverOptions & {
-    onClose: (event: KeyboardEvent) => void;
+    onClose: (event: KeyboardEvent | PointerEvent | MouseEvent | TouchEvent) => void;
     onCloseDeps?: unknown[];
   }
 >;

packages/sfui/frameworks/react/hooks/useDropdown/useDropdown.ts

@@ -9,12 +9,17 @@ export function useDropdown(options: UseDropdownOptions) {
     onCloseDeps,
     placement = 'bottom',
     middleware = [offset(8), shift(), flip()],
+    isOpen,
     ...popoverOptions
   } = options;
 
-  const { refs, style } = usePopover({ placement, middleware, ...popoverOptions });
+  const { refs, style } = usePopover({ placement, middleware, isOpen, ...popoverOptions });
 
-  useClickAway(refs.reference, onClose);
+  useClickAway<PointerEvent | MouseEvent | TouchEvent>(refs.reference, (e) => {
+    if (isOpen) {
+      onClose?.(e);
+    }
+  });
   useKey('Escape', onClose, { target: refs.reference.current }, onCloseDeps);
 
   return { refs, style };

packages/tests/components/SfDropdown/SfDropdown.cy.tsx

@@ -91,7 +91,7 @@ describe('SfDropdown', () => {
 
   describe('When click away', () => {
     it('Should call onClose', () => {
-      const props = { onClose: cy.spy() };
+      const props = { onClose: cy.spy(), modelValue: ref(true) };
       initializeComponent(props);
 
       page().clickAway(props.onClose);