fix: typescript types

fix #106
jcoreio · Jul 3, 2022 · 2128977 · 2128977
1 parent 3c1230f
commit 2128977
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/src/core.d.ts b/src/core.d.ts
@@ -1,8 +1,10 @@
 import { SyntheticEvent, MouseEvent, TouchEvent, FocusEvent } from 'react'
 
 export type Variant = 'popover' | 'popper' | 'dialog'
-
-export type AnchorPosition = { left: number; top: number }
+export interface AnchorPosition {
+  top: number
+  left: number
+}
 
 export type PopupState = {
   open: (eventOrAnchorEl?: SyntheticEvent<any> | HTMLElement | null) => void
@@ -129,7 +131,7 @@ export function bindFocus(popupState: PopupState): ControlAriaProps & {
 export function bindPopover(popupState: PopupState): {
   id: string | undefined
   anchorEl: HTMLElement | undefined
-  anchorPosition: AnchorPosition | null | undefined
+  anchorPosition: AnchorPosition | undefined
   anchorReference: 'anchorEl' | 'anchorPosition'
   open: boolean
   onClose: () => void
@@ -148,7 +150,7 @@ export function bindPopover(popupState: PopupState): {
 export function bindMenu(popupState: PopupState): {
   id: string | undefined
   anchorEl: HTMLElement | undefined
-  anchorPosition: AnchorPosition | null | undefined
+  anchorPosition: AnchorPosition | undefined
   anchorReference: 'anchorEl' | 'anchorPosition'
   open: boolean
   onClose: () => void

diff --git a/src/core.js b/src/core.js
@@ -27,7 +27,7 @@ export type PopupState = {|
   ) => void,
   isOpen: boolean,
   anchorEl: ?HTMLElement,
-  anchorPosition: ?AnchorPosition,
+  anchorPosition: AnchorPosition | void,
   setAnchorEl: (?HTMLElement) => any,
   setAnchorElUsed: boolean,
   popupId: ?string,
@@ -42,7 +42,7 @@ export type CoreState = {|
   isOpen: boolean,
   setAnchorElUsed: boolean,
   anchorEl: ?HTMLElement,
-  anchorPosition: ?AnchorPosition,
+  anchorPosition: AnchorPosition | void,
   hovered: boolean,
   focused: boolean,
   _openEventType: ?string,
@@ -55,7 +55,7 @@ export const initCoreState: CoreState = {
   isOpen: false,
   setAnchorElUsed: false,
   anchorEl: null,
-  anchorPosition: null,
+  anchorPosition: undefined,
   hovered: false,
   focused: false,
   _openEventType: null,
@@ -119,7 +119,7 @@ export function createPopupState({
     const anchorPosition =
       typeof clientX === 'number' && typeof clientY === 'number'
         ? { left: clientX, top: clientY }
-        : null
+        : undefined
 
     if (eventType === 'touchstart') {
       setState({ _deferNextOpen: true })
@@ -391,7 +391,7 @@ export function bindPopover({
 }: PopupState): {|
   id: ?string,
   anchorEl: ?HTMLElement,
-  anchorPosition: ?AnchorPosition,
+  anchorPosition: AnchorPosition | void,
   anchorReference: 'anchorEl' | 'anchorPosition',
   open: boolean,
   onClose: () => void,
@@ -442,7 +442,7 @@ export function bindMenu({
 }: PopupState): {|
   id: ?string,
   anchorEl?: ?HTMLElement,
-  anchorPosition?: ?AnchorPosition,
+  anchorPosition: AnchorPosition | void,
   anchorReference: 'anchorEl' | 'anchorPosition',
   open: boolean,
   onClose: () => void,