-
-
Notifications
You must be signed in to change notification settings - Fork 1k
Make buttons activate immediately #4036
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.
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
Open
m-bert
wants to merge
13
commits into
main
Choose a base branch
from
@mbert/unify-native-handler-callbacks
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+78
−48
Open
Changes from all commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
eace4ec
Fix callbacks on iOS native side
m-bert 75666db
Simplify button
m-bert 3f12e06
Pressable
m-bert 83b52cc
One send
m-bert 71d5b2b
Old buttons
m-bert c73ec16
Fix active state handling for non-Android platforms in BaseButton
m-bert 26d763b
Merge branch 'main' into @mbert/unify-native-handler-callbacks
m-bert cb58495
Bring back pointerInside check
m-bert 9ceb673
Merge branch 'main' into @mbert/unify-native-handler-callbacks
m-bert ad05004
Unify buttons across platforms
m-bert cdd6619
Remove platform checks
m-bert 288c458
Unbind actions
m-bert 1f1d2df
Pressable last event
m-bert File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -83,6 +83,7 @@ const Pressable = (props: PressableProps) => { | |
| width: 0, | ||
| height: 0, | ||
| }); | ||
| const lastTouchEvent = useRef<PressableEvent | null>(null); | ||
|
|
||
| const normalizedHitSlop: Insets = useMemo( | ||
| () => | ||
|
|
@@ -257,6 +258,7 @@ const Pressable = (props: PressableProps) => { | |
| cancelsTouchesInView: false, | ||
| onTouchesDown: (event) => { | ||
| const pressableEvent = gestureTouchToPressableEvent(event); | ||
| lastTouchEvent.current = pressableEvent; | ||
| stateMachine.handleEvent( | ||
| StateMachineEvent.LONG_PRESS_TOUCHES_DOWN, | ||
| pressableEvent | ||
|
|
@@ -305,11 +307,15 @@ const Pressable = (props: PressableProps) => { | |
| } | ||
| }, | ||
| onBegin: () => { | ||
| stateMachine.handleEvent(StateMachineEvent.NATIVE_BEGIN); | ||
| stateMachine.handleEvent( | ||
| StateMachineEvent.NATIVE_BEGIN, | ||
| lastTouchEvent.current ?? undefined | ||
| ); | ||
| }, | ||
| onActivate: () => { | ||
| if (Platform.OS !== 'android') { | ||
| if (Platform.OS !== 'android' && Platform.OS !== 'ios') { | ||
| // Native.onActivate is broken with Android + hitSlop | ||
| // On iOS, onActivate fires on drag (not touch down), so we use onBegin + LONG_PRESS_TOUCHES_DOWN instead | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Is this still true? |
||
| stateMachine.handleEvent(StateMachineEvent.NATIVE_START); | ||
| } | ||
| }, | ||
|
|
@@ -323,9 +329,7 @@ const Pressable = (props: PressableProps) => { | |
| success ? StateMachineEvent.FINALIZE : StateMachineEvent.CANCEL | ||
| ); | ||
|
|
||
| if (Platform.OS !== 'ios') { | ||
| handleFinalize(); | ||
| } | ||
| handleFinalize(); | ||
| }, | ||
| enabled: disabled !== true, | ||
| disableReanimated: true, | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.