Merge pull request #6362 from BlueWallet/buttonprop

FIX: Button onPRess was not firing
This commit is contained in:
GLaDOS 2024-04-03 07:26:16 +00:00 committed by GitHub
commit f2ccc531c4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -45,49 +45,51 @@ const ToolTipMenu = (props, ref) => {
const buttonStyle = props.buttonStyle;
return isButton ? (
<ContextMenuButton
ref={ref}
disabled={disabled}
onPressMenuItem={({ nativeEvent }) => {
props.onPressMenuItem(nativeEvent.actionKey);
}}
isMenuPrimaryAction={isMenuPrimaryAction}
menuConfig={{
menuTitle,
menuItems,
}}
style={buttonStyle}
onPress={onPress}
accessibilityRole="button"
>
{props.children}
</ContextMenuButton>
) : props.onPress ? (
<TouchableOpacity accessibilityRole="button" onPress={props.onPress}>
<ContextMenuView
<TouchableOpacity onPress={onPress} disabled={disabled} accessibilityRole="button" style={buttonStyle}>
<ContextMenuButton
ref={ref}
internalCleanupMode="viewController"
useActionSheetFallback={false}
onPressMenuItem={({ nativeEvent }) => {
props.onPressMenuItem(nativeEvent.actionKey);
}}
useActionSheetFallback={false}
isMenuPrimaryAction={isMenuPrimaryAction}
menuConfig={{
menuTitle,
menuItems,
}}
{...(renderPreview
? {
previewConfig: {
previewType: 'CUSTOM',
backgroundColor: 'white',
},
renderPreview,
}
: {})}
>
{props.children}
</ContextMenuView>
</ContextMenuButton>
</TouchableOpacity>
) : props.onPress ? (
<ContextMenuView
ref={ref}
lazyPreview
shouldEnableAggressiveCleanup
shouldCleanupOnComponent
internalCleanupMode="viewController"
onPressMenuItem={({ nativeEvent }) => {
props.onPressMenuItem(nativeEvent.actionKey);
}}
useActionSheetFallback={false}
menuConfig={{
menuTitle,
menuItems,
}}
{...(renderPreview
? {
previewConfig: {
previewType: 'CUSTOM',
backgroundColor: 'white',
},
renderPreview,
}
: {})}
>
<TouchableOpacity accessibilityRole="button" onPress={props.onPress}>
{props.children}
</TouchableOpacity>
</ContextMenuView>
) : (
<ContextMenuView
ref={ref}