Skip to content

Add listeners bindings across navigators #82

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.

Sign up for GitHub

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
alelaru wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add listeners bindings across navigators #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 13 additions & 0 deletions src/BottomTabs.res
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,19 @@ and headerParams = {
layout: layout,
}

type listeners = {
...Core.eventListeners,
tabPress?: navigationEvent<unit> => unit,
tabLongPress?: navigationEvent<unit> => unit,
transitionStart?: navigationEvent<unit> => unit,
transitionEnd?: navigationEvent<unit> => unit,
}

type navigatorProps = {
id?: string,
initialRouteName?: string,
screenOptions?: screenOptionsParams => options,
screenListeners?: screenOptionsParams => listeners,
backBehavior?: backBehavior,
detachInactiveScreens?: bool,
tabBar?: unit => React.element,
Expand All @@ -111,6 +120,7 @@ type screenProps<'params> = {
name: string,
navigationKey?: string,
options?: screenOptionsParams => options,
listeners?: screenOptionsParams => listeners,
initialParams?: 'params,
getId?: getIdOptions => option<string>,
component?: React.component<screenProps>,
Expand Down Expand Up @@ -167,6 +177,9 @@ module Navigation = {
@string
[
| #tabPress(navigationEvent<unit> => unit)
| #tabLongPress(navigationEvent<unit> => unit)
| #transitionStart(navigationEvent<unit> => unit)
| #transitionEnd(navigationEvent<unit> => unit)
],
) => unsubscribe = "addListener"
}
10 changes: 10 additions & 0 deletions src/Core.res
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,15 @@ type stateEventData = {state: navigationState}

type action

type beforeRemoveEventData = {action: action}

type eventListeners = {
focus?: navigationEvent<unit> => unit,
blur?: navigationEvent<unit> => unit,
state?: navigationEvent<stateEventData> => unit,
beforeRemove?: navigationEvent<beforeRemoveEventData> => unit,
}

type layoutNavigatorParams = {
state: navigationState,
navigation: navigation,
Expand Down Expand Up @@ -100,6 +109,7 @@ module Navigation = {
| #focus(navigationEvent<unit> => unit)
| #blur(navigationEvent<unit> => unit)
| #state(navigationEvent<stateEventData> => unit)
| #beforeRemove(navigationEvent<beforeRemoveEventData> => unit)
],
) => unsubscribe = "addListener"
}
7 changes: 7 additions & 0 deletions src/Drawer.res
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,12 +90,18 @@ type contentComponentProps = {
descriptors: descriptors,
}

type listeners = {
...Core.eventListeners,
drawerItemPress?: navigationEvent<unit> => unit,
}

type drawerStatus = [#"open" | #closed]

type navigatorProps = {
id?: string,
initialRouteName?: string,
screenOptions?: screenOptionsParams => options,
screenListeners?: screenOptionsParams => listeners,
backBehavior?: backBehavior,
defaultStatus?: drawerStatus,
detachInactiveScreens?: bool,
Expand All @@ -109,6 +115,7 @@ type screenProps<'params> = {
name: string,
navigationKey?: string,
options?: screenOptionsParams => options,
listeners?: screenOptionsParams => listeners,
initialParams?: 'params,
getId?: getIdOptions => option<string>,
component?: React.component<screenProps>,
Expand Down
9 changes: 9 additions & 0 deletions src/MaterialBottomTabs.res
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,17 @@ type options = {
tabBarTestID?: string,
}

type listeners = {
...Core.eventListeners,
tabPress?: navigationEvent<unit> => unit,
tabLongPress?: navigationEvent<unit> => unit,
}

type navigatorProps = {
id?: string,
initialRouteName?: string,
screenOptions?: screenOptionsParams => options,
screenListeners?: screenOptionsParams => listeners,
backBehavior?: backBehavior,
shifting?: bool,
labeled?: bool,
Expand All @@ -53,6 +60,7 @@ type screenProps<'params> = {
name: string,
navigationKey?: string,
options?: screenOptionsParams => options,
listeners?: screenOptionsParams => listeners,
initialParams?: 'params,
getId?: getIdOptions => option<string>,
component?: React.component<screenProps>,
Expand Down Expand Up @@ -112,6 +120,7 @@ module Navigation = {
@string
[
| #tabPress(navigationEvent<unit> => unit)
| #tabLongPress(navigationEvent<unit> => unit)
],
) => unsubscribe = "addListener"
}
9 changes: 9 additions & 0 deletions src/MaterialTopTabs.res
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,17 @@ type tabBarProps = {
jumpTo: string => unit,
}

type listeners = {
...Core.eventListeners,
tabPress?: navigationEvent<unit> => unit,
tabLongPress?: navigationEvent<unit> => unit,
}

type navigatorProps = {
id?: string,
initialRouteName?: string,
screenOptions?: screenOptionsParams => options,
screenListeners?: screenOptionsParams => listeners,
backBehavior?: backBehavior,
tabBarPosition?: tabBarPosition,
keyboardDismissMode?: keyboardDismissMode,
Expand All @@ -95,6 +102,7 @@ type screenProps<'params> = {
name: string,
navigationKey?: string,
options?: screenOptionsParams => options,
listeners?: screenOptionsParams => listeners,
initialParams?: 'params,
getId?: getIdOptions => option<string>,
component?: React.component<screenProps>,
Expand Down Expand Up @@ -154,6 +162,7 @@ module Navigation = {
@string
[
| #tabPress(navigationEvent<unit> => unit)
| #tabLongPress(navigationEvent<unit> => unit)
],
) => unsubscribe = "addListener"
}
14 changes: 12 additions & 2 deletions src/NativeStack.res
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,10 +171,20 @@ and headerParams = {
back: backOptions,
}

type screenEventData = {closing: bool}

type listeners = {
...Core.eventListeners,
transitionStart?: navigationEvent<screenEventData> => unit,
transitionEnd?: navigationEvent<screenEventData> => unit,
gestureCancel?: navigationEvent<unit> => unit,
}

type navigatorProps = {
id?: string,
initialRouteName?: string,
screenOptions?: screenOptionsParams => options,
screenListeners?: screenOptionsParams => listeners,
layout?: layoutNavigatorParams => React.element,
children?: React.element,
}
Expand All @@ -183,6 +193,7 @@ type screenProps<'params> = {
name: string,
navigationKey?: string,
options?: screenOptionsParams => options,
listeners?: screenOptionsParams => listeners,
initialParams?: 'params,
getId?: getIdOptions => option<string>,
component?: React.component<screenProps>,
Expand Down Expand Up @@ -228,8 +239,6 @@ module Make = (): NavigatorModule => {
}
}

type screenEventData = {closing: int}

module Navigation = {
@send
external setOptions: (navigation, options) => unit = "setOptions"
Expand All @@ -255,6 +264,7 @@ module Navigation = {
[
| #transitionStart(navigationEvent<screenEventData> => unit)
| #transitionEnd(navigationEvent<screenEventData> => unit)
| #gestureCancel(navigationEvent<unit> => unit)
],
) => unsubscribe = "addListener"
}
15 changes: 13 additions & 2 deletions src/Stack.res
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,10 +154,22 @@ and headerParams = {
styleInterpolator: headerStyleInterpolator,
}

type screenEventData = {closing: bool}

type listeners = {
...Core.eventListeners,
transitionStart?: navigationEvent<screenEventData> => unit,
transitionEnd?: navigationEvent<screenEventData> => unit,
gestureStart?: navigationEvent<unit> => unit,
gestureEnd?: navigationEvent<unit> => unit,
gestureCancel?: navigationEvent<unit> => unit,
}

type navigatorProps = {
id?: string,
initialRouteName?: string,
screenOptions?: screenOptionsParams => options,
screenListeners?: screenOptionsParams => listeners,
detachInactiveScreens?: bool,
layout?: layoutNavigatorParams => React.element,
children?: React.element,
Expand All @@ -167,6 +179,7 @@ type screenProps<'params> = {
name: string,
navigationKey?: string,
options?: screenOptionsParams => options,
listeners?: screenOptionsParams => listeners,
initialParams?: 'params,
getId?: getIdOptions => option<string>,
component?: React.component<screenProps>,
Expand Down Expand Up @@ -212,8 +225,6 @@ module Make = (): NavigatorModule => {
}
}

type screenEventData = {closing: int}

module Navigation = {
@send
external setOptions: (navigation, options) => unit = "setOptions"
Expand Down