From deed0fdf85934d37e8bdb71e9618e53829c10f35 Mon Sep 17 00:00:00 2001 From: Kris Wong Date: Mon, 14 Jul 2025 10:39:10 -0500 Subject: [PATCH 1/3] fix: fixes an issue with font scaling on iOS https://github.com/vonovak/react-navigation-header-buttons/issues/260 Allow font scaling to be disabled for header button text. --- src/HeaderButton.tsx | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/src/HeaderButton.tsx b/src/HeaderButton.tsx index 053a22f..e55cc35 100644 --- a/src/HeaderButton.tsx +++ b/src/HeaderButton.tsx @@ -32,6 +32,7 @@ export type VisibleButtonProps = { iconSize?: number; color?: ColorValue; buttonStyle?: ViewStyle | TextStyle; + allowFontScaling?: boolean; }; type PlatformPressableProps = ComponentProps; @@ -81,8 +82,15 @@ export function HeaderButton(props: HeaderButtonProps) { export function defaultRenderVisibleButton( visibleButtonProps: VisibleButtonProps ): React.ReactElement { - const { IconComponent, iconSize, color, iconName, title, buttonStyle } = - visibleButtonProps; + const { + IconComponent, + iconSize, + color, + iconName, + title, + buttonStyle, + allowFontScaling, + } = visibleButtonProps; return IconComponent && iconName ? ( ) : ( - {title} + + {title} + ); } From a0c167780b0309ee8ddd7737596b863115a18e70 Mon Sep 17 00:00:00 2001 From: Kris Wong Date: Tue, 15 Jul 2025 12:34:41 -0500 Subject: [PATCH 2/3] fix: fix a typescript issue with newer versions of react native --- src/overflowMenu/vendor/MenuItem.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/overflowMenu/vendor/MenuItem.tsx b/src/overflowMenu/vendor/MenuItem.tsx index dd57a43..370b23b 100644 --- a/src/overflowMenu/vendor/MenuItem.tsx +++ b/src/overflowMenu/vendor/MenuItem.tsx @@ -27,7 +27,7 @@ export type Props = { /** * Function to execute on press. */ - onPress?: null | ((params?: GestureResponderEvent) => void) | undefined; + onPress?: (params?: GestureResponderEvent) => void; /** * @optional */ From 362b141daaa30a87aefc2cb808db4337836a3d6b Mon Sep 17 00:00:00 2001 From: Kris Wong Date: Tue, 15 Jul 2025 12:45:31 -0500 Subject: [PATCH 3/3] fix: take two --- src/overflowMenu/vendor/MenuItem.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/overflowMenu/vendor/MenuItem.tsx b/src/overflowMenu/vendor/MenuItem.tsx index 370b23b..d5dd1b1 100644 --- a/src/overflowMenu/vendor/MenuItem.tsx +++ b/src/overflowMenu/vendor/MenuItem.tsx @@ -27,7 +27,9 @@ export type Props = { /** * Function to execute on press. */ - onPress?: (params?: GestureResponderEvent) => void; + onPress?: ( + e?: React.MouseEvent | GestureResponderEvent + ) => void; /** * @optional */