@react-navigation/core 6.2.0 → 6.2.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -82,10 +82,6 @@ function useNavigationHelpers(_ref) {
|
|
|
82
82
|
current = current.getParent();
|
|
83
83
|
}
|
|
84
84
|
|
|
85
|
-
if (current == null) {
|
|
86
|
-
throw new Error(`Couldn't find a parent navigator with the ID "${id}". Is this navigator nested under another navigator with this ID?`);
|
|
87
|
-
}
|
|
88
|
-
|
|
89
85
|
return current;
|
|
90
86
|
}
|
|
91
87
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["useNavigationHelpers.tsx"],"names":["PrivateValueStore","useNavigationHelpers","id","navigatorId","onAction","getState","emitter","router","onUnhandledAction","React","useContext","UnhandledActionContext","parentNavigationHelpers","NavigationContext","useMemo","dispatch","op","action","handled","actions","actionCreators","CommonActions","helpers","Object","keys","reduce","acc","name","navigationHelpers","emit","isFocused","canGoBack","state","getStateForAction","goBack","routeNames","routeParamList","routeGetIdList","getId","getParent","undefined","current"
|
|
1
|
+
{"version":3,"sources":["useNavigationHelpers.tsx"],"names":["PrivateValueStore","useNavigationHelpers","id","navigatorId","onAction","getState","emitter","router","onUnhandledAction","React","useContext","UnhandledActionContext","parentNavigationHelpers","NavigationContext","useMemo","dispatch","op","action","handled","actions","actionCreators","CommonActions","helpers","Object","keys","reduce","acc","name","navigationHelpers","emit","isFocused","canGoBack","state","getStateForAction","goBack","routeNames","routeParamList","routeGetIdList","getId","getParent","undefined","current"],"mappings":";;;;;;;AAAA;;AAOA;;AAEA;;AACA;;AACA;;;;;;;;AAGA;AACA;AACAA;;AAUA;AACA;AACA;AACA;AACe,SAASC,oBAAT,OAWY;AAAA,MANzB;AACAC,IAAAA,EAAE,EAAEC,WADJ;AAEAC,IAAAA,QAFA;AAGAC,IAAAA,QAHA;AAIAC,IAAAA,OAJA;AAKAC,IAAAA;AALA,GAMyB;AACzB,QAAMC,iBAAiB,GAAGC,KAAK,CAACC,UAAN,CAAiBC,+BAAjB,CAA1B;AACA,QAAMC,uBAAuB,GAAGH,KAAK,CAACC,UAAN,CAAiBG,0BAAjB,CAAhC;AAEA,SAAOJ,KAAK,CAACK,OAAN,CAAc,MAAM;AACzB,UAAMC,QAAQ,GAAIC,EAAD,IAA6C;AAC5D,YAAMC,MAAM,GAAG,OAAOD,EAAP,KAAc,UAAd,GAA2BA,EAAE,CAACX,QAAQ,EAAT,CAA7B,GAA4CW,EAA3D;AAEA,YAAME,OAAO,GAAGd,QAAQ,CAACa,MAAD,CAAxB;;AAEA,UAAI,CAACC,OAAL,EAAc;AACZV,QAAAA,iBAAiB,SAAjB,IAAAA,iBAAiB,WAAjB,YAAAA,iBAAiB,CAAGS,MAAH,CAAjB;AACD;AACF,KARD;;AAUA,UAAME,OAAO,GAAG,EACd,GAAGZ,MAAM,CAACa,cADI;AAEd,SAAGC;AAFW,KAAhB;AAKA,UAAMC,OAAO,GAAGC,MAAM,CAACC,IAAP,CAAYL,OAAZ,EAAqBM,MAArB,CAA4B,CAACC,GAAD,EAAMC,IAAN,KAAe;AACzD;AACAD,MAAAA,GAAG,CAACC,IAAD,CAAH,GAAY;AAAA,eAAkBZ,QAAQ,CAACI,OAAO,CAACQ,IAAD,CAAP,CAAc,YAAd,CAAD,CAA1B;AAAA,OAAZ;;AACA,aAAOD,GAAP;AACD,KAJe,EAIb,EAJa,CAAhB;AAMA,UAAME,iBAAiB,GAAG,EACxB,GAAGhB,uBADqB;AAExB,SAAGU,OAFqB;AAGxBP,MAAAA,QAHwB;AAIxBc,MAAAA,IAAI,EAAEvB,OAAO,CAACuB,IAJU;AAKxBC,MAAAA,SAAS,EAAElB,uBAAuB,GAC9BA,uBAAuB,CAACkB,SADM,GAE9B,MAAM,IAPc;AAQxBC,MAAAA,SAAS,EAAE,MAAM;AACf,cAAMC,KAAK,GAAG3B,QAAQ,EAAtB;AAEA,eACEE,MAAM,CAAC0B,iBAAP,CAAyBD,KAAzB,EAAgCX,uBAAca,MAAd,EAAhC,EAAkE;AAChEC,UAAAA,UAAU,EAAEH,KAAK,CAACG,UAD8C;AAEhEC,UAAAA,cAAc,EAAE,EAFgD;AAGhEC,UAAAA,cAAc,EAAE;AAHgD,SAAlE,MAIO,IAJP,KAKAzB,uBALA,aAKAA,uBALA,uBAKAA,uBAAuB,CAAEmB,SAAzB,EALA,KAMA,KAPF;AASD,OApBuB;AAqBxBO,MAAAA,KAAK,EAAE,MAAMnC,WArBW;AAsBxBoC,MAAAA,SAAS,EAAGrC,EAAD,IAAiB;AAC1B,YAAIA,EAAE,KAAKsC,SAAX,EAAsB;AACpB,cAAIC,OAAO,GAAGb,iBAAd;;AAEA,iBAAOa,OAAO,IAAIvC,EAAE,KAAKuC,OAAO,CAACH,KAAR,EAAzB,EAA0C;AACxCG,YAAAA,OAAO,GAAGA,OAAO,CAACF,SAAR,EAAV;AACD;;AAED,iBAAOE,OAAP;AACD;;AAED,eAAO7B,uBAAP;AACD,OAlCuB;AAmCxBP,MAAAA;AAnCwB,KAA1B;AAsCA,WAAOuB,iBAAP;AACD,GA7DM,EA6DJ,CACDzB,WADC,EAEDG,OAAO,CAACuB,IAFP,EAGDxB,QAHC,EAIDD,QAJC,EAKDI,iBALC,EAMDI,uBANC,EAODL,MAPC,CA7DI,CAAP;AAsED","sourcesContent":["import {\n CommonActions,\n NavigationAction,\n NavigationState,\n ParamListBase,\n Router,\n} from '@react-navigation/routers';\nimport * as React from 'react';\n\nimport NavigationContext from './NavigationContext';\nimport { NavigationHelpers, PrivateValueStore } from './types';\nimport UnhandledActionContext from './UnhandledActionContext';\nimport type { NavigationEventEmitter } from './useEventEmitter';\n\n// This is to make TypeScript compiler happy\n// eslint-disable-next-line babel/no-unused-expressions\nPrivateValueStore;\n\ntype Options<State extends NavigationState, Action extends NavigationAction> = {\n id: string | undefined;\n onAction: (action: NavigationAction) => boolean;\n getState: () => State;\n emitter: NavigationEventEmitter<any>;\n router: Router<State, Action>;\n};\n\n/**\n * Navigation object with helper methods to be used by a navigator.\n * This object includes methods for common actions as well as methods the parent screen's navigation object.\n */\nexport default function useNavigationHelpers<\n State extends NavigationState,\n ActionHelpers extends Record<string, () => void>,\n Action extends NavigationAction,\n EventMap extends Record<string, any>\n>({\n id: navigatorId,\n onAction,\n getState,\n emitter,\n router,\n}: Options<State, Action>) {\n const onUnhandledAction = React.useContext(UnhandledActionContext);\n const parentNavigationHelpers = React.useContext(NavigationContext);\n\n return React.useMemo(() => {\n const dispatch = (op: Action | ((state: State) => Action)) => {\n const action = typeof op === 'function' ? op(getState()) : op;\n\n const handled = onAction(action);\n\n if (!handled) {\n onUnhandledAction?.(action);\n }\n };\n\n const actions = {\n ...router.actionCreators,\n ...CommonActions,\n };\n\n const helpers = Object.keys(actions).reduce((acc, name) => {\n // @ts-expect-error: name is a valid key, but TypeScript is dumb\n acc[name] = (...args: any) => dispatch(actions[name](...args));\n return acc;\n }, {} as ActionHelpers);\n\n const navigationHelpers = {\n ...parentNavigationHelpers,\n ...helpers,\n dispatch,\n emit: emitter.emit,\n isFocused: parentNavigationHelpers\n ? parentNavigationHelpers.isFocused\n : () => true,\n canGoBack: () => {\n const state = getState();\n\n return (\n router.getStateForAction(state, CommonActions.goBack() as Action, {\n routeNames: state.routeNames,\n routeParamList: {},\n routeGetIdList: {},\n }) !== null ||\n parentNavigationHelpers?.canGoBack() ||\n false\n );\n },\n getId: () => navigatorId,\n getParent: (id?: string) => {\n if (id !== undefined) {\n let current = navigationHelpers;\n\n while (current && id !== current.getId()) {\n current = current.getParent();\n }\n\n return current;\n }\n\n return parentNavigationHelpers;\n },\n getState,\n } as NavigationHelpers<ParamListBase, EventMap> & ActionHelpers;\n\n return navigationHelpers;\n }, [\n navigatorId,\n emitter.emit,\n getState,\n onAction,\n onUnhandledAction,\n parentNavigationHelpers,\n router,\n ]);\n}\n"]}
|
|
@@ -64,10 +64,6 @@ export default function useNavigationHelpers(_ref) {
|
|
|
64
64
|
current = current.getParent();
|
|
65
65
|
}
|
|
66
66
|
|
|
67
|
-
if (current == null) {
|
|
68
|
-
throw new Error(`Couldn't find a parent navigator with the ID "${id}". Is this navigator nested under another navigator with this ID?`);
|
|
69
|
-
}
|
|
70
|
-
|
|
71
67
|
return current;
|
|
72
68
|
}
|
|
73
69
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["useNavigationHelpers.tsx"],"names":["CommonActions","React","NavigationContext","PrivateValueStore","UnhandledActionContext","useNavigationHelpers","id","navigatorId","onAction","getState","emitter","router","onUnhandledAction","useContext","parentNavigationHelpers","useMemo","dispatch","op","action","handled","actions","actionCreators","helpers","Object","keys","reduce","acc","name","navigationHelpers","emit","isFocused","canGoBack","state","getStateForAction","goBack","routeNames","routeParamList","routeGetIdList","getId","getParent","undefined","current"
|
|
1
|
+
{"version":3,"sources":["useNavigationHelpers.tsx"],"names":["CommonActions","React","NavigationContext","PrivateValueStore","UnhandledActionContext","useNavigationHelpers","id","navigatorId","onAction","getState","emitter","router","onUnhandledAction","useContext","parentNavigationHelpers","useMemo","dispatch","op","action","handled","actions","actionCreators","helpers","Object","keys","reduce","acc","name","navigationHelpers","emit","isFocused","canGoBack","state","getStateForAction","goBack","routeNames","routeParamList","routeGetIdList","getId","getParent","undefined","current"],"mappings":"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","sourcesContent":["import {\n CommonActions,\n NavigationAction,\n NavigationState,\n ParamListBase,\n Router,\n} from '@react-navigation/routers';\nimport * as React from 'react';\n\nimport NavigationContext from './NavigationContext';\nimport { NavigationHelpers, PrivateValueStore } from './types';\nimport UnhandledActionContext from './UnhandledActionContext';\nimport type { NavigationEventEmitter } from './useEventEmitter';\n\n// This is to make TypeScript compiler happy\n// eslint-disable-next-line babel/no-unused-expressions\nPrivateValueStore;\n\ntype Options<State extends NavigationState, Action extends NavigationAction> = {\n id: string | undefined;\n onAction: (action: NavigationAction) => boolean;\n getState: () => State;\n emitter: NavigationEventEmitter<any>;\n router: Router<State, Action>;\n};\n\n/**\n * Navigation object with helper methods to be used by a navigator.\n * This object includes methods for common actions as well as methods the parent screen's navigation object.\n */\nexport default function useNavigationHelpers<\n State extends NavigationState,\n ActionHelpers extends Record<string, () => void>,\n Action extends NavigationAction,\n EventMap extends Record<string, any>\n>({\n id: navigatorId,\n onAction,\n getState,\n emitter,\n router,\n}: Options<State, Action>) {\n const onUnhandledAction = React.useContext(UnhandledActionContext);\n const parentNavigationHelpers = React.useContext(NavigationContext);\n\n return React.useMemo(() => {\n const dispatch = (op: Action | ((state: State) => Action)) => {\n const action = typeof op === 'function' ? op(getState()) : op;\n\n const handled = onAction(action);\n\n if (!handled) {\n onUnhandledAction?.(action);\n }\n };\n\n const actions = {\n ...router.actionCreators,\n ...CommonActions,\n };\n\n const helpers = Object.keys(actions).reduce((acc, name) => {\n // @ts-expect-error: name is a valid key, but TypeScript is dumb\n acc[name] = (...args: any) => dispatch(actions[name](...args));\n return acc;\n }, {} as ActionHelpers);\n\n const navigationHelpers = {\n ...parentNavigationHelpers,\n ...helpers,\n dispatch,\n emit: emitter.emit,\n isFocused: parentNavigationHelpers\n ? parentNavigationHelpers.isFocused\n : () => true,\n canGoBack: () => {\n const state = getState();\n\n return (\n router.getStateForAction(state, CommonActions.goBack() as Action, {\n routeNames: state.routeNames,\n routeParamList: {},\n routeGetIdList: {},\n }) !== null ||\n parentNavigationHelpers?.canGoBack() ||\n false\n );\n },\n getId: () => navigatorId,\n getParent: (id?: string) => {\n if (id !== undefined) {\n let current = navigationHelpers;\n\n while (current && id !== current.getId()) {\n current = current.getParent();\n }\n\n return current;\n }\n\n return parentNavigationHelpers;\n },\n getState,\n } as NavigationHelpers<ParamListBase, EventMap> & ActionHelpers;\n\n return navigationHelpers;\n }, [\n navigatorId,\n emitter.emit,\n getState,\n onAction,\n onUnhandledAction,\n parentNavigationHelpers,\n router,\n ]);\n}\n"]}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@react-navigation/core",
|
|
3
3
|
"description": "Core utilities for building navigators",
|
|
4
|
-
"version": "6.2.
|
|
4
|
+
"version": "6.2.1",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"react",
|
|
7
7
|
"react-native",
|
|
@@ -69,5 +69,5 @@
|
|
|
69
69
|
]
|
|
70
70
|
]
|
|
71
71
|
},
|
|
72
|
-
"gitHead": "
|
|
72
|
+
"gitHead": "b1c421445ecb75d514ce27791433b12f9a7e75b7"
|
|
73
73
|
}
|
|
@@ -95,12 +95,6 @@ export default function useNavigationHelpers<
|
|
|
95
95
|
current = current.getParent();
|
|
96
96
|
}
|
|
97
97
|
|
|
98
|
-
if (current == null) {
|
|
99
|
-
throw new Error(
|
|
100
|
-
`Couldn't find a parent navigator with the ID "${id}". Is this navigator nested under another navigator with this ID?`
|
|
101
|
-
);
|
|
102
|
-
}
|
|
103
|
-
|
|
104
98
|
return current;
|
|
105
99
|
}
|
|
106
100
|
|