feat: accept popupId: null in types

Author: jedwards1211

package.json

@@ -57,6 +57,7 @@
     "@types/glob": "^8.0.0",
     "@types/mocha": "^10.0.6",
     "@types/node": "^18.11.13",
+    "@types/sinon": "^17.0.3",
     "@typescript-eslint/eslint-plugin": "^7.6.0",
     "@typescript-eslint/parser": "^7.6.0",
     "@typescript-eslint/typescript-estree": "^5.46.0",
@@ -81,7 +82,7 @@
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "rimraf": "^3.0.2",
-    "sinon": "^6.1.4",
+    "sinon": "^6.3.5",
     "typescript": "^5.1.0",
     "webpack": "^5.75.0",
     "webpack-cli": "^5.0.1",

pnpm-lock.yaml

@@ -26,7 +26,7 @@ export type Variant = 'popover' | 'popper' | 'dialog'
 
 export type PopupState = {
   open: (eventOrAnchorEl?: SyntheticEvent | Element | null) => void
-  close: () => void
+  close: (eventOrAnchorEl?: SyntheticEvent | Element | null) => void
   toggle: (eventOrAnchorEl?: SyntheticEvent | Element | null) => void
   onBlur: (event: FocusEvent) => void
   onMouseLeave: (event: MouseEvent) => void
@@ -82,7 +82,7 @@ export function usePopupState({
   disableAutoFocus,
 }: {
   parentPopupState?: PopupState | null | undefined
-  popupId?: string
+  popupId?: string | null
   variant: Variant
   disableAutoFocus?: boolean | null | undefined
 }): PopupState {
@@ -281,7 +281,7 @@ export function usePopupState({
   const popupState: PopupState = {
     ...state,
     setAnchorEl,
-    popupId,
+    popupId: popupId ?? undefined,
     variant,
     open,
     close,

src/hooks.ts

@@ -1,6 +1,7 @@
 import * as React from 'react'
 
 export function useEvent<Fn extends (...args: any[]) => any>(handler: Fn): Fn {
+  // istanbul ignore next
   if (typeof window === 'undefined') {
     // useLayoutEffect doesn't work on the server side, don't bother
     // trying to make callback functions stable