Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,15 @@ export type PopupMenuAndroidInstance = {
type Props = {
menuItems: $ReadOnlyArray<string>,
onSelectionChange: number => void,
onPopupDismiss?: () => void,
onDismiss?: () => void,
children: React.Node,
instanceRef: RefObject<?PopupMenuAndroidInstance>,
};

export default function PopupMenuAndroid({
menuItems,
onSelectionChange,
onPopupDismiss,
onDismiss,
children,
instanceRef,
}: Props): React.Node {
Expand All @@ -53,11 +53,11 @@ export default function PopupMenuAndroid({
},
[onSelectionChange],
);
const _onPopupDismiss = useCallback(
const _onDismiss = useCallback(
(event: PopupMenuDismissEvent) => {
onPopupDismiss?.();
onDismiss?.();
},
[onPopupDismiss],
[onDismiss],
);

useImperativeHandle(instanceRef, ItemViewabilityInstance => {
Expand All @@ -72,7 +72,7 @@ export default function PopupMenuAndroid({
<PopupMenuAndroidNativeComponent
ref={nativeRef}
onPopupMenuSelectionChange={_onSelectionChange}
onPopupMenuDismiss={_onPopupDismiss}
onPopupMenuDismiss={_onDismiss}
menuItems={menuItems}>
{children}
</PopupMenuAndroidNativeComponent>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ type PopupMenuAndroidInstance = {
type Props = {
menuItems: Array<string>;
onSelectionChange: (number) => void;
onDismiss: () => void;
children: React.ReactNode | undefined;
instanceRef: React.ElementRef<HostComponent<PopupMenuAndroidInstance>>;
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export type PopupMenuAndroidInstance = {
type Props = {
menuItems: $ReadOnlyArray<string>,
onSelectionChange: number => void,
onPopupDismiss?: () => void,
onDismiss?: () => void,
children: Node,
instanceRef: RefObject<?PopupMenuAndroidInstance>,
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ const PopupMenu = () => {
instanceRef={popupRef}
menuItems={items.map(({label}) => label)}
onSelectionChange={selection => items[selection].onPress()}
onPopupDismiss={() => console.warn('Popup was dismissed!')}>
onDismiss={() => console.warn('Popup was dismissed!')}>
<Button
title="Show PopupMenu!"
onPress={() => {
Expand Down