Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[No QA] [TS migration] Migrate 'PopoverProvider' component to TypeScript #29857

Merged
merged 3 commits into from
Nov 3, 2023
Merged

[No QA] [TS migration] Migrate 'PopoverProvider' component to TypeScript #29857

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
991662b
ref: moved PopoverProvider to TS
kubabutkiewicz Oct 18, 2023
e9d0ab2
Merge branch 'main' of github.com:kubabutkiewicz/expensify-app into t…
kubabutkiewicz Oct 30, 2023
c15d77b
fix: lint
kubabutkiewicz Oct 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 3 additions & 11 deletions ...omponents/PopoverProvider/index.native.js → ...mponents/PopoverProvider/index.native.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,14 @@
import PropTypes from 'prop-types';
import React from 'react';
import {PopoverContextProps, PopoverContextValue} from './types';

const propTypes = {
children: PropTypes.node.isRequired,
};

const defaultProps = {};

const PopoverContext = React.createContext({
const PopoverContext = React.createContext<PopoverContextValue>({
onOpen: () => {},
popover: {},
close: () => {},
isOpen: false,
});

function PopoverContextProvider(props) {
function PopoverContextProvider(props: PopoverContextProps) {
const contextValue = React.useMemo(
() => ({
onOpen: () => {},
Expand All @@ -28,8 +22,6 @@ function PopoverContextProvider(props) {
return <PopoverContext.Provider value={contextValue}>{props.children}</PopoverContext.Provider>;
}

PopoverContextProvider.defaultProps = defaultProps;
PopoverContextProvider.propTypes = propTypes;
PopoverContextProvider.displayName = 'PopoverContextProvider';

export default PopoverContextProvider;
Expand Down
47 changes: 17 additions & 30 deletions src/components/PopoverProvider/index.js → src/components/PopoverProvider/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,18 @@
import PropTypes from 'prop-types';
import React from 'react';
import {AnchorRef, PopoverContextProps, PopoverContextValue} from './types';

const propTypes = {
children: PropTypes.node.isRequired,
};

const defaultProps = {};

const PopoverContext = React.createContext({
const PopoverContext = React.createContext<PopoverContextValue>({
onOpen: () => {},
popover: {},
close: () => {},
isOpen: false,
});

function PopoverContextProvider(props) {
function PopoverContextProvider(props: PopoverContextProps) {
const [isOpen, setIsOpen] = React.useState(false);
const activePopoverRef = React.useRef(null);
const activePopoverRef = React.useRef<AnchorRef | null>(null);

const closePopover = React.useCallback((anchorRef) => {
const closePopover = React.useCallback((anchorRef?: React.RefObject<HTMLElement>) => {
if (!activePopoverRef.current || (anchorRef && anchorRef !== activePopoverRef.current.anchorRef)) {
return;
}
Expand All @@ -32,17 +26,12 @@ function PopoverContextProvider(props) {
}, []);

React.useEffect(() => {
const listener = (e) => {
if (
!activePopoverRef.current ||
!activePopoverRef.current.ref ||
!activePopoverRef.current.ref.current ||
activePopoverRef.current.ref.current.contains(e.target) ||
(activePopoverRef.current.anchorRef && activePopoverRef.current.anchorRef.current && activePopoverRef.current.anchorRef.current.contains(e.target))
) {
const listener = (e: Event) => {
// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
if (activePopoverRef.current?.ref?.current?.contains(e.target as Node) || activePopoverRef.current?.anchorRef?.current?.contains(e.target as Node)) {
return;
}
const ref = activePopoverRef.current.anchorRef;
const ref = activePopoverRef.current?.anchorRef;
closePopover(ref);
};
document.addEventListener('click', listener, true);
Expand All @@ -52,8 +41,8 @@ function PopoverContextProvider(props) {
}, [closePopover]);

React.useEffect(() => {
const listener = (e) => {
if (!activePopoverRef.current || !activePopoverRef.current.ref || !activePopoverRef.current.ref.current || activePopoverRef.current.ref.current.contains(e.target)) {
const listener = (e: Event) => {
if (activePopoverRef.current?.ref?.current?.contains(e.target as Node)) {
return;
}
closePopover();
Expand All @@ -65,7 +54,7 @@ function PopoverContextProvider(props) {
}, [closePopover]);

React.useEffect(() => {
const listener = (e) => {
const listener = (e: KeyboardEvent) => {
if (e.key !== 'Escape') {
return;
}
Expand All @@ -91,8 +80,8 @@ function PopoverContextProvider(props) {
}, [closePopover]);

React.useEffect(() => {
const listener = (e) => {
if (activePopoverRef.current && activePopoverRef.current.ref && activePopoverRef.current.ref.current && activePopoverRef.current.ref.current.contains(e.target)) {
const listener = (e: Event) => {
if (activePopoverRef.current?.ref?.current?.contains(e.target as Node)) {
return;
}

Expand All @@ -105,12 +94,12 @@ function PopoverContextProvider(props) {
}, [closePopover]);

const onOpen = React.useCallback(
(popoverParams) => {
if (activePopoverRef.current && activePopoverRef.current.ref !== popoverParams.ref) {
(popoverParams: AnchorRef) => {
if (activePopoverRef.current && activePopoverRef.current.ref !== popoverParams?.ref) {
closePopover(activePopoverRef.current.anchorRef);
}
activePopoverRef.current = popoverParams;
if (popoverParams && popoverParams.onOpenCallback) {
if (popoverParams?.onOpenCallback) {
popoverParams.onOpenCallback();
}
setIsOpen(true);
Expand All @@ -131,8 +120,6 @@ function PopoverContextProvider(props) {
return <PopoverContext.Provider value={contextValue}>{props.children}</PopoverContext.Provider>;
}

PopoverContextProvider.defaultProps = defaultProps;
PopoverContextProvider.propTypes = propTypes;
PopoverContextProvider.displayName = 'PopoverContextProvider';

export default PopoverContextProvider;
Expand Down
20 changes: 20 additions & 0 deletions src/components/PopoverProvider/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
type PopoverContextProps = {
children: React.ReactNode;
};

type PopoverContextValue = {
onOpen?: (popoverParams: AnchorRef) => void;
popover?: AnchorRef | Record<string, never> | null;
close: (anchorRef?: React.RefObject<HTMLElement>) => void;
isOpen: boolean;
};

type AnchorRef = {
ref: React.RefObject<HTMLElement>;
close: (anchorRef?: React.RefObject<HTMLElement>) => void;
anchorRef: React.RefObject<HTMLElement>;
onOpenCallback?: () => void;
onCloseCallback?: () => void;
};

export type {PopoverContextProps, PopoverContextValue, AnchorRef};