Skip to content

Commit

Permalink
Merge pull request #28973 from namhihi237/fix-28565-poiter-cursor-non…
Browse files Browse the repository at this point in the history
…-clickable

fix cursor default when menu can not clickable
  • Loading branch information
neil-marcellini authored Oct 10, 2023
2 parents 81565ec + e9c1625 commit 987569f
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 1 deletion.
1 change: 1 addition & 0 deletions src/components/BaseMiniContextMenuItem.js
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ function BaseMiniContextMenuItem(props) {
style={({hovered, pressed}) => [
styles.reportActionContextMenuMiniButton,
StyleUtils.getButtonBackgroundColorStyle(getButtonState(hovered, pressed, props.isDelayButtonStateComplete)),
props.isDelayButtonStateComplete && styles.cursorDefault,
]}
>
{(pressableState) => (
Expand Down
1 change: 1 addition & 0 deletions src/components/ContextMenuItem.js
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ function ContextMenuItem({onPress, successIcon, successText, icon, text, isMini,
style={getContextMenuItemStyles(windowWidth)}
isAnonymousAction={isAnonymousAction}
focused={isFocused}
interactive={isThrottledButtonActive}
/>
);
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/Pressable/PressableWithDelayToggle.js
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ function PressableWithDelayToggle(props) {
focusable={false}
accessible={false}
onPress={updatePressState}
style={[styles.flexRow, ...props.styles]}
style={[styles.flexRow, ...props.styles, !isActive && styles.cursorDefault]}
>
{({hovered, pressed}) => (
<>
Expand Down

0 comments on commit 987569f

Please sign in to comment.