expo-router 58.0.10 → 58.0.12

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.
Files changed (57) hide show
  1. package/android/build.gradle +2 -2
  2. package/build/fork/native-stack/createNativeStackNavigator.js +29 -1
  3. package/build/fork/native-stack/createNativeStackNavigator.js.map +1 -1
  4. package/build/global-state/getRouteInfoFromState.js +74 -38
  5. package/build/global-state/getRouteInfoFromState.js.map +1 -1
  6. package/build/layouts/stack-router.js +1 -2
  7. package/build/layouts/stack-router.js.map +1 -1
  8. package/build/link/linking.js +8 -1
  9. package/build/link/linking.js.map +1 -1
  10. package/build/native-tabs/NativeTabsView.js +1 -1
  11. package/build/native-tabs/common/elements.d.ts +5 -4
  12. package/build/native-tabs/common/elements.js.map +1 -1
  13. package/build/native-tabs/utils/optionsIconConverter.ios.js +16 -6
  14. package/build/native-tabs/utils/optionsIconConverter.ios.js.map +1 -1
  15. package/build/react-navigation/elements/useFrameSize.js +3 -0
  16. package/build/react-navigation/elements/useFrameSize.js.map +1 -1
  17. package/build/react-navigation/native-stack/types.d.ts +9 -0
  18. package/build/react-navigation/native-stack/views/useHeaderConfigProps.d.ts +1 -1
  19. package/build/react-navigation/native-stack/views/useHeaderConfigProps.js +2 -2
  20. package/build/react-navigation/native-stack/views/useHeaderConfigProps.js.map +1 -1
  21. package/build/testing-library/index.d.ts +11 -15
  22. package/build/testing-library/index.js +15 -39
  23. package/build/testing-library/index.js.map +1 -1
  24. package/build/useScreens.js +2 -8
  25. package/build/useScreens.js.map +1 -1
  26. package/local-maven-repo/expo/modules/router/expo.modules.router/{58.0.10/expo.modules.router-58.0.10.module → 58.0.12/expo.modules.router-58.0.12.module} +7 -7
  27. package/local-maven-repo/expo/modules/router/expo.modules.router/58.0.12/expo.modules.router-58.0.12.module.md5 +1 -0
  28. package/local-maven-repo/expo/modules/router/expo.modules.router/58.0.12/expo.modules.router-58.0.12.module.sha1 +1 -0
  29. package/local-maven-repo/expo/modules/router/expo.modules.router/58.0.12/expo.modules.router-58.0.12.module.sha256 +1 -0
  30. package/local-maven-repo/expo/modules/router/expo.modules.router/58.0.12/expo.modules.router-58.0.12.module.sha512 +1 -0
  31. package/local-maven-repo/expo/modules/router/expo.modules.router/{58.0.10/expo.modules.router-58.0.10.pom → 58.0.12/expo.modules.router-58.0.12.pom} +1 -1
  32. package/local-maven-repo/expo/modules/router/expo.modules.router/58.0.12/expo.modules.router-58.0.12.pom.md5 +1 -0
  33. package/local-maven-repo/expo/modules/router/expo.modules.router/58.0.12/expo.modules.router-58.0.12.pom.sha1 +1 -0
  34. package/local-maven-repo/expo/modules/router/expo.modules.router/58.0.12/expo.modules.router-58.0.12.pom.sha256 +1 -0
  35. package/local-maven-repo/expo/modules/router/expo.modules.router/58.0.12/expo.modules.router-58.0.12.pom.sha512 +1 -0
  36. package/package.json +10 -11
  37. package/build/import-mode/index.d.ts +0 -2
  38. package/build/import-mode/index.js +0 -13
  39. package/build/import-mode/index.js.map +0 -1
  40. package/local-maven-repo/expo/modules/router/expo.modules.router/58.0.10/expo.modules.router-58.0.10.module.md5 +0 -1
  41. package/local-maven-repo/expo/modules/router/expo.modules.router/58.0.10/expo.modules.router-58.0.10.module.sha1 +0 -1
  42. package/local-maven-repo/expo/modules/router/expo.modules.router/58.0.10/expo.modules.router-58.0.10.module.sha256 +0 -1
  43. package/local-maven-repo/expo/modules/router/expo.modules.router/58.0.10/expo.modules.router-58.0.10.module.sha512 +0 -1
  44. package/local-maven-repo/expo/modules/router/expo.modules.router/58.0.10/expo.modules.router-58.0.10.pom.md5 +0 -1
  45. package/local-maven-repo/expo/modules/router/expo.modules.router/58.0.10/expo.modules.router-58.0.10.pom.sha1 +0 -1
  46. package/local-maven-repo/expo/modules/router/expo.modules.router/58.0.10/expo.modules.router-58.0.10.pom.sha256 +0 -1
  47. package/local-maven-repo/expo/modules/router/expo.modules.router/58.0.10/expo.modules.router-58.0.10.pom.sha512 +0 -1
  48. /package/local-maven-repo/expo/modules/router/expo.modules.router/{58.0.10/expo.modules.router-58.0.10-sources.jar → 58.0.12/expo.modules.router-58.0.12-sources.jar} +0 -0
  49. /package/local-maven-repo/expo/modules/router/expo.modules.router/{58.0.10/expo.modules.router-58.0.10-sources.jar.md5 → 58.0.12/expo.modules.router-58.0.12-sources.jar.md5} +0 -0
  50. /package/local-maven-repo/expo/modules/router/expo.modules.router/{58.0.10/expo.modules.router-58.0.10-sources.jar.sha1 → 58.0.12/expo.modules.router-58.0.12-sources.jar.sha1} +0 -0
  51. /package/local-maven-repo/expo/modules/router/expo.modules.router/{58.0.10/expo.modules.router-58.0.10-sources.jar.sha256 → 58.0.12/expo.modules.router-58.0.12-sources.jar.sha256} +0 -0
  52. /package/local-maven-repo/expo/modules/router/expo.modules.router/{58.0.10/expo.modules.router-58.0.10-sources.jar.sha512 → 58.0.12/expo.modules.router-58.0.12-sources.jar.sha512} +0 -0
  53. /package/local-maven-repo/expo/modules/router/expo.modules.router/{58.0.10/expo.modules.router-58.0.10.aar → 58.0.12/expo.modules.router-58.0.12.aar} +0 -0
  54. /package/local-maven-repo/expo/modules/router/expo.modules.router/{58.0.10/expo.modules.router-58.0.10.aar.md5 → 58.0.12/expo.modules.router-58.0.12.aar.md5} +0 -0
  55. /package/local-maven-repo/expo/modules/router/expo.modules.router/{58.0.10/expo.modules.router-58.0.10.aar.sha1 → 58.0.12/expo.modules.router-58.0.12.aar.sha1} +0 -0
  56. /package/local-maven-repo/expo/modules/router/expo.modules.router/{58.0.10/expo.modules.router-58.0.10.aar.sha256 → 58.0.12/expo.modules.router-58.0.12.aar.sha256} +0 -0
  57. /package/local-maven-repo/expo/modules/router/expo.modules.router/{58.0.10/expo.modules.router-58.0.10.aar.sha512 → 58.0.12/expo.modules.router-58.0.12.aar.sha512} +0 -0
@@ -4,13 +4,13 @@ plugins {
4
4
  }
5
5
 
6
6
  group = 'expo.modules.router'
7
- version = '58.0.10'
7
+ version = '58.0.12'
8
8
 
9
9
  android {
10
10
  namespace "expo.modules.router"
11
11
  defaultConfig {
12
12
  versionCode 1
13
- versionName "58.0.10"
13
+ versionName "58.0.12"
14
14
  }
15
15
  lintOptions {
16
16
  abortOnError false
@@ -136,13 +136,41 @@ function NativeStackNavigatorContent({ state, descriptors, emitter, isPreloaded,
136
136
  computedState,
137
137
  registry
138
138
  ]);
139
+ // Native can push a preloaded screen on its own (link preview commit), so it must not animate.
140
+ // The screen gets its animation back when JS pushes it, which also keeps the pop animated.
141
+ const stackDescriptors = _react().useMemo(()=>{
142
+ const preloadedKeys = computedState.routes.map((route)=>route.key).filter(isComputedRoutePreloaded);
143
+ if (preloadedKeys.length === 0) {
144
+ return mergedDescriptors;
145
+ }
146
+ const result = {
147
+ ...mergedDescriptors
148
+ };
149
+ for (const key of preloadedKeys){
150
+ const descriptor = result[key];
151
+ if (descriptor) {
152
+ result[key] = {
153
+ ...descriptor,
154
+ options: {
155
+ ...descriptor.options,
156
+ animation: 'none'
157
+ }
158
+ };
159
+ }
160
+ }
161
+ return result;
162
+ }, [
163
+ mergedDescriptors,
164
+ computedState,
165
+ isComputedRoutePreloaded
166
+ ]);
139
167
  return /*#__PURE__*/ (0, _jsxruntime().jsx)(_descriptorscontext.DescriptorsContext, {
140
168
  value: fullDescriptors,
141
169
  children: /*#__PURE__*/ (0, _jsxruntime().jsx)(_compositionoptions.CompositionContext, {
142
170
  value: contextValue,
143
171
  children: /*#__PURE__*/ (0, _jsxruntime().jsx)(_nativestack.NativeStackView, {
144
172
  state: computedState,
145
- descriptors: mergedDescriptors,
173
+ descriptors: stackDescriptors,
146
174
  emit: emit,
147
175
  isPreloaded: isComputedRoutePreloaded,
148
176
  isRemovalPrevented: isRemovalPrevented,
@@ -1 +1 @@
1
- {"version":3,"sources":["fork/native-stack/createNativeStackNavigator.tsx"],"sourcesContent":[null],"names":["createStandardNativeStackNavigator","GLASS","isLiquidGlassAvailable","NativeStackNavigatorContent","state","descriptors","emitter","isPreloaded","isRemovalPrevented","pop","removeRoutes","subscribePopToTopOnParentTabPress","unstable_nativeProps","fullDescriptors","computedState","emit","isComputedRoutePreloaded","usePreviewTransition","useClearGuardedRoutes","React","useEffect","finalDescriptors","useMemo","needsNewMap","result","key","Object","keys","descriptor","options","internalGestureEnabled","INTERNAL_EXPO_ROUTER_GESTURE_ENABLED_OPTION_NAME","needsGestureFix","undefined","needsGlassFix","presentation","newOptions","gestureEnabled","headerTransparent","contentStyle","backgroundColor","headerShadowVisible","headerLargeTitleShadowVisible","registry","contextValue","useCompositionRegistry","mergedDescriptors","mergeOptions","DescriptorsContext","value","CompositionContext","NativeStackView","createStandardNavigator"],"mappings":";;;;+BA6HaA;;;eAAAA;;;;;;;;;;;yBA7H0B;;;;;;;iEAChB;;;;;;;yBACiB;;;;;;uCAEF;kCAI/B;6BAMA;oCAGkE;oCACtC;sCACE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAErC,MAAMC,QAAQC,IAAAA,yCAAsB;AA2BpC,SAASC,4BAA4B,EACnCC,KAAK,EACLC,WAAW,EACXC,OAAO,EACPC,WAAW,EACXC,kBAAkB,EAClBC,GAAG,EACHC,YAAY,EACZC,iCAAiC,EACjCC,oBAAoB,EACR;IACZ,MAAMC,kBAAkBR;IAExB,MAAM,EACJS,aAAa,EACbC,IAAI,EACJR,aAAaS,wBAAwB,EACtC,GAAGC,IAAAA,0CAAoB,EAACb,OAAOE,QAAQS,IAAI,EAAER;IAE9CW,IAAAA,4CAAqB,EAACR;IACtBS,SAAMC,SAAS,CAAC,IAAMT,qCAAqC;QAACA;KAAkC;IAE9F,0EAA0E;IAC1E,uFAAuF;IACvF,MAAMU,mBAAmBF,SAAMG,OAAO,CAAC;QACrC,IAAIC,cAAc;QAClB,MAAMC,SAAmC,CAAC;QAC1C,KAAK,MAAMC,OAAOC,OAAOC,IAAI,CAACd,iBAAkB;YAC9C,MAAMe,aAAaf,eAAe,CAACY,IAAI;YACvC,MAAMI,UAAUD,WAAWC,OAAO;YAClC,MAAMC,yBAAyBD,SAAS,CAACE,kEAAgD,CAAC;YAC1F,MAAMC,kBAAkBF,2BAA2BG;YACnD,MAAMC,gBAAgBjC,SAAS4B,SAASM,iBAAiB;YAEzD,IAAIH,mBAAmBE,eAAe;gBACpCX,cAAc;gBACd,MAAMa,aAAa;oBAAE,GAAGP,OAAO;gBAAC;gBAChC,IAAIG,iBAAiB;oBACnBI,WAAWC,cAAc,GAAGP;gBAC9B;gBACA,IAAII,eAAe;oBACjBE,WAAWE,iBAAiB,KAAK;oBACjCF,WAAWG,YAAY,KAAK;wBAAEC,iBAAiB;oBAAc;oBAC7DJ,WAAWK,mBAAmB,KAAK;oBACnCL,WAAWM,6BAA6B,KAAK;gBAC/C;gBACAlB,MAAM,CAACC,IAAI,GAAG;oBAAE,GAAGG,UAAU;oBAAEC,SAASO;gBAAW;YACrD,OAAO;gBACLZ,MAAM,CAACC,IAAI,GAAGG;YAChB;QACF;QACA,OAAOL,cAAcC,SAASX;IAChC,GAAG;QAACA;KAAgB;IACpB,MAAM,EAAE8B,QAAQ,EAAEC,YAAY,EAAE,GAAGC,IAAAA,0CAAsB;IAEzD,MAAMC,oBAAoB3B,SAAMG,OAAO,CACrC,IAAMyB,IAAAA,gCAAY,EAAC1B,kBAAkBsB,UAAU7B,gBAC/C;QAACO;QAAkBP;QAAe6B;KAAS;IAG7C,qBACE,uBAACK,sCAAkB;QAACC,OAAOpC;kBACzB,cAAA,uBAACqC,sCAAkB;YAACD,OAAOL;sBACzB,cAAA,uBAACO,4BAAe;gBACd/C,OAAOU;gBACPT,aAAayC;gBACb/B,MAAMA;gBACNR,aAAaS;gBACbR,oBAAoBA;gBACpBC,KAAKA;gBACLG,sBAAsBA;;;;AAKhC;AAEO,MAAMZ,qCAAqCoD,IAAAA,6CAAuB,EAIvEjD"}
1
+ {"version":3,"sources":["fork/native-stack/createNativeStackNavigator.tsx"],"sourcesContent":[null],"names":["createStandardNativeStackNavigator","GLASS","isLiquidGlassAvailable","NativeStackNavigatorContent","state","descriptors","emitter","isPreloaded","isRemovalPrevented","pop","removeRoutes","subscribePopToTopOnParentTabPress","unstable_nativeProps","fullDescriptors","computedState","emit","isComputedRoutePreloaded","usePreviewTransition","useClearGuardedRoutes","React","useEffect","finalDescriptors","useMemo","needsNewMap","result","key","Object","keys","descriptor","options","internalGestureEnabled","INTERNAL_EXPO_ROUTER_GESTURE_ENABLED_OPTION_NAME","needsGestureFix","undefined","needsGlassFix","presentation","newOptions","gestureEnabled","headerTransparent","contentStyle","backgroundColor","headerShadowVisible","headerLargeTitleShadowVisible","registry","contextValue","useCompositionRegistry","mergedDescriptors","mergeOptions","stackDescriptors","preloadedKeys","routes","map","route","filter","length","animation","DescriptorsContext","value","CompositionContext","NativeStackView","createStandardNavigator"],"mappings":"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"}
@@ -56,9 +56,8 @@ function areUrlObjectsEqual(a, b) {
56
56
  }
57
57
  function getRouteInfoFromState(state) {
58
58
  if (!state) return defaultRouteInfo;
59
- // TODO(@kitten): Review edge-case type safety
60
59
  const index = 'index' in state ? state.index ?? 0 : 0;
61
- let route = state.routes[index];
60
+ const route = state.routes[index];
62
61
  (0, _navigationParams.warnIfNestedParams)(route.params);
63
62
  if (route.name === _constants.NOT_FOUND_ROUTE_NAME || route.name === _constants.SITEMAP_ROUTE_NAME) {
64
63
  const path = route.path || (route.name === _constants.NOT_FOUND_ROUTE_NAME ? '/' : `/${route.name}`);
@@ -75,11 +74,28 @@ function getRouteInfoFromState(state) {
75
74
  if (route.name !== _constants.INTERNAL_SLOT_NAME) {
76
75
  throw new Error(`Expected the first route to be ${_constants.INTERNAL_SLOT_NAME}, but got ${route.name}`);
77
76
  }
78
- state = route.state;
77
+ const { segments, params: mergedParams } = collectRouteState(route.state);
78
+ const params = decodeParams(mergedParams);
79
+ const { pathname, pathParams } = resolvePathname(segments, params);
80
+ const { searchParams, pathnameWithParams } = serializeQueryAndHash(pathname, params, pathParams);
81
+ return {
82
+ segments,
83
+ pathname,
84
+ // Navigation params can contain ordinary object values at runtime despite the public search-param type.
85
+ // TODO: address this together with other params serialization issues
86
+ params: params,
87
+ unstable_globalHref: (0, _getPathFromStateforks.appendBaseUrl)(pathnameWithParams),
88
+ searchParams,
89
+ pathnameWithParams,
90
+ // TODO: Remove this, it is not used anywhere
91
+ isIndex: false
92
+ };
93
+ }
94
+ function collectRouteState(state) {
79
95
  const segments = [];
80
- let params = Object.create(null);
96
+ const params = Object.create(null);
81
97
  while(state){
82
- route = state.routes['index' in state && state.index ? state.index : 0];
98
+ const route = state.routes['index' in state && state.index ? state.index : 0];
83
99
  (0, _navigationParams.warnIfNestedParams)(route.params);
84
100
  Object.assign(params, route.params);
85
101
  let routeName = route.name;
@@ -89,7 +105,16 @@ function getRouteInfoFromState(state) {
89
105
  segments.push(...routeName.split('/'));
90
106
  state = route.state;
91
107
  }
92
- params = Object.fromEntries(Object.entries(params).map(([key, value])=>{
108
+ if (segments[segments.length - 1] === 'index') {
109
+ segments.pop();
110
+ }
111
+ return {
112
+ segments,
113
+ params
114
+ };
115
+ }
116
+ function decodeParams(params) {
117
+ return Object.fromEntries(Object.entries(params).map(([key, value])=>{
93
118
  if (typeof value === 'string') {
94
119
  return [
95
120
  key,
@@ -107,25 +132,29 @@ function getRouteInfoFromState(state) {
107
132
  ];
108
133
  }
109
134
  }));
110
- if (segments[segments.length - 1] === 'index') {
111
- segments.pop();
112
- }
113
- const pathParams = new Set();
114
- const pathname = '/' + segments.filter((segment)=>{
115
- return !(segment.startsWith('(') && segment.endsWith(')'));
116
- }).flatMap((segment)=>{
135
+ }
136
+ function resolvePathname(segments, params) {
137
+ const resolvedSegments = segments.filter((segment)=>!(segment.startsWith('(') && segment.endsWith(')'))).map((segment)=>{
117
138
  if (segment === '+not-found') {
118
139
  const notFoundPath = params['not-found'];
119
- pathParams.add('not-found');
120
140
  if (typeof notFoundPath === 'undefined') {
121
141
  // Not founds are optional, do nothing if its not present
122
- return [];
142
+ return {
143
+ parts: [],
144
+ paramName: 'not-found'
145
+ };
123
146
  } else if (Array.isArray(notFoundPath)) {
124
- return notFoundPath.map(String);
147
+ return {
148
+ parts: notFoundPath.map(String),
149
+ paramName: 'not-found'
150
+ };
125
151
  } else {
126
- return [
127
- String(notFoundPath)
128
- ];
152
+ return {
153
+ parts: [
154
+ String(notFoundPath)
155
+ ],
156
+ paramName: 'not-found'
157
+ };
129
158
  }
130
159
  } else if (segment.startsWith('[...') && segment.endsWith(']')) {
131
160
  let paramName = segment.slice(4, -1);
@@ -134,25 +163,40 @@ function getRouteInfoFromState(state) {
134
163
  paramName = paramName.slice(0, -1);
135
164
  }
136
165
  const values = params[paramName];
137
- pathParams.add(paramName);
138
166
  // Catchall params are optional
139
- return Array.isArray(values) ? values.filter(isSerializableParam).map(String) : isSerializableParam(values) && values ? [
167
+ const parts = Array.isArray(values) ? values.filter(isSerializableParam).map(String) : isSerializableParam(values) && values ? [
140
168
  String(values)
141
169
  ] : [];
170
+ return {
171
+ parts,
172
+ paramName
173
+ };
142
174
  } else if (segment.startsWith('[') && segment.endsWith(']')) {
143
175
  const paramName = segment.slice(1, -1);
144
176
  const value = params[paramName];
145
- pathParams.add(paramName);
146
177
  // Optional params are optional
147
- return isSerializableParam(value) && value ? [
148
- String(value)
149
- ] : [];
178
+ return {
179
+ parts: isSerializableParam(value) && value ? [
180
+ String(value)
181
+ ] : [],
182
+ paramName
183
+ };
150
184
  } else {
151
- return [
152
- segment
153
- ];
185
+ return {
186
+ parts: [
187
+ segment
188
+ ]
189
+ };
154
190
  }
155
- }).join('/');
191
+ });
192
+ const pathname = '/' + resolvedSegments.flatMap(({ parts })=>parts).join('/');
193
+ const pathParams = new Set(resolvedSegments.map(({ paramName })=>paramName).filter((paramName)=>paramName !== undefined));
194
+ return {
195
+ pathname,
196
+ pathParams
197
+ };
198
+ }
199
+ function serializeQueryAndHash(pathname, params, pathParams) {
156
200
  const searchParams = new URLSearchParams(Object.entries(params).flatMap(([key, value])=>{
157
201
  // Search params should not include path params
158
202
  if (pathParams.has(key)) {
@@ -182,16 +226,8 @@ function getRouteInfoFromState(state) {
182
226
  let pathnameWithParams = searchParamString ? pathname + '?' + searchParamString : pathname;
183
227
  pathnameWithParams = hash ? pathnameWithParams + '#' + hash : pathnameWithParams;
184
228
  return {
185
- segments,
186
- pathname,
187
- // Navigation params can contain ordinary object values at runtime despite the public search-param type.
188
- // TODO: address this together with other params serialization issues
189
- params: params,
190
- unstable_globalHref: (0, _getPathFromStateforks.appendBaseUrl)(pathnameWithParams),
191
229
  searchParams,
192
- pathnameWithParams,
193
- // TODO: Remove this, it is not used anywhere
194
- isIndex: false
230
+ pathnameWithParams
195
231
  };
196
232
  }
197
233
  function isSerializableParam(value) {
@@ -1 +1 @@
1
- {"version":3,"sources":["global-state/getRouteInfoFromState.ts"],"sourcesContent":[null],"names":["areUrlObjectsEqual","defaultRouteInfo","getRouteInfoFromState","unstable_globalHref","searchParams","URLSearchParams","pathname","params","segments","pathnameWithParams","isIndex","a","b","isArrayEqual","isEqual","state","index","route","routes","warnIfNestedParams","name","NOT_FOUND_ROUTE_NAME","SITEMAP_ROUTE_NAME","path","appendBaseUrl","INTERNAL_SLOT_NAME","Error","Object","create","assign","routeName","startsWith","slice","push","split","fromEntries","entries","map","key","value","safeDecodeURIComponent","Array","isArray","v","length","pop","pathParams","Set","filter","segment","endsWith","flatMap","notFoundPath","add","String","paramName","values","isSerializableParam","join","has","hash","get","undefined","delete","searchParamString","toString"],"mappings":"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"}
1
+ {"version":3,"sources":["global-state/getRouteInfoFromState.ts"],"sourcesContent":[null],"names":["areUrlObjectsEqual","defaultRouteInfo","getRouteInfoFromState","unstable_globalHref","searchParams","URLSearchParams","pathname","params","segments","pathnameWithParams","isIndex","a","b","isArrayEqual","isEqual","state","index","route","routes","warnIfNestedParams","name","NOT_FOUND_ROUTE_NAME","SITEMAP_ROUTE_NAME","path","appendBaseUrl","INTERNAL_SLOT_NAME","Error","mergedParams","collectRouteState","decodeParams","pathParams","resolvePathname","serializeQueryAndHash","Object","create","assign","routeName","startsWith","slice","push","split","length","pop","fromEntries","entries","map","key","value","safeDecodeURIComponent","Array","isArray","v","resolvedSegments","filter","segment","endsWith","notFoundPath","parts","paramName","String","values","isSerializableParam","flatMap","join","Set","undefined","has","hash","get","delete","searchParamString","toString"],"mappings":"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"}
@@ -103,8 +103,7 @@ const stackRouterOverride = (original)=>{
103
103
  params: {
104
104
  ...action.type === 'NAVIGATE' && action.payload.merge ? previewRoute.params : {},
105
105
  ...action.payload.params,
106
- [_navigationParams.INTERNAL_EXPO_ROUTER_IS_PREVIEW_NAVIGATION_PARAM_NAME]: true,
107
- [_navigationParams.INTERNAL_EXPO_ROUTER_NO_ANIMATION_PARAM_NAME]: true
106
+ [_navigationParams.INTERNAL_EXPO_ROUTER_IS_PREVIEW_NAVIGATION_PARAM_NAME]: true
108
107
  }
109
108
  }, action);
110
109
  actionResult = {
@@ -1 +1 @@
1
- {"version":3,"sources":["layouts/stack-router.ts"],"sourcesContent":[null],"names":["StackRouter","stackRouterOverride","isStackAction","action","type","getPreviewKey","payload","__internal__PreviewKey","undefined","getZoomTransitionIdFromAction","allParams","params","internalParams","getInternalExpoRouterParams","val","INTERNAL_EXPO_ROUTER_ZOOM_TRANSITION_SOURCE_ID_PARAM_NAME","original","getStateForAction","state","options","ensureStateType","target","key","actionSingularOptions","singular","getIdFunction","name","actionName","getActionSingularIdFn","routeGetIdList","routeNames","includes","getId","id","activeRoutes","routes","slice","index","preloadedRoutes","previewKey","previewRoute","find","route","currentRoute","shouldCreateSingularRoute","getSingularId","actionResult","attachRouteState","path","merge","INTERNAL_EXPO_ROUTER_IS_PREVIEW_NAVIGATION_PARAM_NAME","INTERNAL_EXPO_ROUTER_NO_ANIMATION_PARAM_NAME","length","concat","filter","r","affectedRouteKey","minter","createRouteKeyMinter","mint","routeKeySeq","browserHistory","result","filteredState","filterSingular","getStackBrowserHistoryAction","zoomTransitionId","lastRoute","modifiedLastRoute","INTERNAL_EXPO_ROUTER_ZOOM_TRANSITION_SCREEN_ID_PARAM_NAME","map","affectedIndex","findIndex","preloadZoomTransitionId","affectedRoute","toSpliced","actionGetId","currentIndex","current","extendRouter","RNStackRouter","baseRouter"],"mappings":"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"}
1
+ {"version":3,"sources":["layouts/stack-router.ts"],"sourcesContent":[null],"names":["StackRouter","stackRouterOverride","isStackAction","action","type","getPreviewKey","payload","__internal__PreviewKey","undefined","getZoomTransitionIdFromAction","allParams","params","internalParams","getInternalExpoRouterParams","val","INTERNAL_EXPO_ROUTER_ZOOM_TRANSITION_SOURCE_ID_PARAM_NAME","original","getStateForAction","state","options","ensureStateType","target","key","actionSingularOptions","singular","getIdFunction","name","actionName","getActionSingularIdFn","routeGetIdList","routeNames","includes","getId","id","activeRoutes","routes","slice","index","preloadedRoutes","previewKey","previewRoute","find","route","currentRoute","shouldCreateSingularRoute","getSingularId","actionResult","attachRouteState","path","merge","INTERNAL_EXPO_ROUTER_IS_PREVIEW_NAVIGATION_PARAM_NAME","length","concat","filter","r","affectedRouteKey","minter","createRouteKeyMinter","mint","routeKeySeq","browserHistory","result","filteredState","filterSingular","getStackBrowserHistoryAction","zoomTransitionId","lastRoute","modifiedLastRoute","INTERNAL_EXPO_ROUTER_ZOOM_TRANSITION_SCREEN_ID_PARAM_NAME","map","affectedIndex","findIndex","preloadZoomTransitionId","affectedRoute","toSpliced","actionGetId","currentIndex","current","extendRouter","RNStackRouter","baseRouter"],"mappings":"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"}
@@ -115,7 +115,14 @@ function getInitialURL() {
115
115
  let _rootURL;
116
116
  function getRootURL() {
117
117
  if (_rootURL === undefined) {
118
- _rootURL = _expolinking().createURL('/');
118
+ try {
119
+ _rootURL = _expolinking().createURL('/');
120
+ } catch {
121
+ // `createURL` throws in production when the app has no `scheme`.
122
+ // The root URL only seeds the initial route, so the root path is enough.
123
+ _rootURL = '/';
124
+ return _rootURL;
125
+ }
119
126
  if (isExpoGo) {
120
127
  _rootURL = (0, _extractPathFromURL.parsePathFromExpoGoLink)(_rootURL);
121
128
  }
@@ -1 +1 @@
1
- {"version":3,"sources":["link/linking.ts"],"sourcesContent":[null],"names":["getInitialURL","getPathFromState","getRootURL","getStateFromPath","subscribe","isExpoGo","expo","globalThis","modules","ExpoGo","window","Platform","OS","location","href","url","Linking","getLinkingURL","parseExpoGoUrlFromListener","Promise","resolve","getInitialURLWithTimeout","then","_rootURL","undefined","createURL","parsePathFromExpoGoLink","pathname","queryString","parsePathAndParamsFromExpoGoLink","nativeLinking","redirects","listener","callback","legacySubscription","legacy_subscribe","applyRedirects","redirectSystemPath","path","initial","subscription","addEventListener","remove"],"mappings":";;;;;;;;;;;;;;;;;;QAsBgBA;eAAAA;;QAqGWC;eAAAA,kCAAgB;;QArE3BC;eAAAA;;QAqEPC;eAAAA,kCAAgB;;QA7CTC;eAAAA;;;;iEA9ES;;;;;;;yBACA;;;;;;oCAKlB;0CACkC;kCACR;kCACA;oCACF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAK/B,MAAMC,WAAW,OAAOC,SAAS,eAAeC,WAAWD,IAAI,EAAEE,SAASC;AAOnE,SAAST;IAGd,IAAI,OAAOU,WAAW,aAAa;QACjC,OAAO;IACT;IACA,IAAIC,uBAAQ,CAACC,EAAE,KAAK,SAASF,OAAOG,QAAQ,EAAEC,MAAM;QAClD,OAAOJ,OAAOG,QAAQ,CAACC,IAAI;IAC7B;IACA,IAAIH,uBAAQ,CAACC,EAAE,KAAK,OAAO;QACzB,mFAAmF;QACnF,MAAMG,MAAMC,eAAQC,aAAa;QACjC,OACEC,2BAA2BH,QAC3B,uFAAuF;QACvF,4DAA4D;QAC5Db;IAEJ;IAEA,qGAAqG;IACrG,OAAOiB,QAAQC,OAAO,CAACC,IAAAA,kDAAwB,KAAIC,IAAI,CACrD,CAACP,MACCG,2BAA2BH,QAC3B,uFAAuF;QACvF,4DAA4D;QAC5Db;AAEN;AAEA,IAAIqB;AAEG,SAASrB;IACd,IAAIqB,aAAaC,WAAW;QAC1BD,WAAWP,eAAQS,SAAS,CAAC;QAC7B,IAAIpB,UAAU;YACZkB,WAAWG,IAAAA,2CAAuB,EAACH;QACrC;IACF;IACA,OAAOA;AACT;AAEA,2DAA2D;AAC3D,SAASL,2BAAoDH,GAAM;IACjE,IAAI,CAACA,OAAO,CAACV,UAAU;QACrB,OAAOU;IACT;IACA,MAAM,EAAEY,QAAQ,EAAEC,WAAW,EAAE,GAAGC,IAAAA,oDAAgC,EAACd;IACnE,+EAA+E;IAC/E,oFAAoF;IACpF,IAAI,CAACY,YAAYA,aAAa,KAAK;QACjC,OAAQzB,eAAe0B;IACzB;IACA,OAAOb;AACT;AAEO,SAASX,UACd0B,aAAuC,EACvCC,SAAuC;IAEvC,OAAO,CAACC;QACN,IAAIC;QAEJ,MAAMC,qBAAqBJ,eAAeK,mBAAmBH;QAE7D,IAAI3B,UAAU;YACZ,mDAAmD;YACnD4B,WAAW,OAAO,EAAElB,GAAG,EAAE;gBACvB,IAAID,OAAkCI,2BAA2BH;gBACjED,OAAOsB,IAAAA,kCAAc,EAACtB,MAAMiB;gBAC5B,IAAIjB,QAAQgB,eAAeO,oBAAoB;oBAC7CvB,OAAO,MAAMgB,cAAcO,kBAAkB,CAAC;wBAAEC,MAAMxB;wBAAMyB,SAAS;oBAAM;gBAC7E;gBAEA,IAAIzB,MAAM;oBACRkB,SAASlB;gBACX;YACF;QACF,OAAO;YACLmB,WAAW,OAAO,EAAElB,GAAG,EAAE;gBACvB,IAAID,OAAOsB,IAAAA,kCAAc,EAACrB,KAAKgB;gBAC/B,IAAIjB,QAAQgB,eAAeO,oBAAoB;oBAC7CvB,OAAO,MAAMgB,cAAcO,kBAAkB,CAAC;wBAAEC,MAAMxB;wBAAMyB,SAAS;oBAAM;gBAC7E;gBAEA,IAAIzB,MAAM;oBACRkB,SAASlB;gBACX;YACF;QACF;QAEA,MAAM0B,eAAexB,eAAQyB,gBAAgB,CAAC,OAAOR;QAErD,OAAO;YACL,2FAA2F;YAC3FO,cAAcE;YACdR;QACF;IACF;AACF"}
1
+ {"version":3,"sources":["link/linking.ts"],"sourcesContent":[null],"names":["getInitialURL","getPathFromState","getRootURL","getStateFromPath","subscribe","isExpoGo","expo","globalThis","modules","ExpoGo","window","Platform","OS","location","href","url","Linking","getLinkingURL","parseExpoGoUrlFromListener","Promise","resolve","getInitialURLWithTimeout","then","_rootURL","undefined","createURL","parsePathFromExpoGoLink","pathname","queryString","parsePathAndParamsFromExpoGoLink","nativeLinking","redirects","listener","callback","legacySubscription","legacy_subscribe","applyRedirects","redirectSystemPath","path","initial","subscription","addEventListener","remove"],"mappings":";;;;;;;;;;;;;;;;;;QAsBgBA;eAAAA;;QA4GWC;eAAAA,kCAAgB;;QA5E3BC;eAAAA;;QA4EPC;eAAAA,kCAAgB;;QA7CTC;eAAAA;;;;iEArFS;;;;;;;yBACA;;;;;;oCAKlB;0CACkC;kCACR;kCACA;oCACF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAK/B,MAAMC,WAAW,OAAOC,SAAS,eAAeC,WAAWD,IAAI,EAAEE,SAASC;AAOnE,SAAST;IAGd,IAAI,OAAOU,WAAW,aAAa;QACjC,OAAO;IACT;IACA,IAAIC,uBAAQ,CAACC,EAAE,KAAK,SAASF,OAAOG,QAAQ,EAAEC,MAAM;QAClD,OAAOJ,OAAOG,QAAQ,CAACC,IAAI;IAC7B;IACA,IAAIH,uBAAQ,CAACC,EAAE,KAAK,OAAO;QACzB,mFAAmF;QACnF,MAAMG,MAAMC,eAAQC,aAAa;QACjC,OACEC,2BAA2BH,QAC3B,uFAAuF;QACvF,4DAA4D;QAC5Db;IAEJ;IAEA,qGAAqG;IACrG,OAAOiB,QAAQC,OAAO,CAACC,IAAAA,kDAAwB,KAAIC,IAAI,CACrD,CAACP,MACCG,2BAA2BH,QAC3B,uFAAuF;QACvF,4DAA4D;QAC5Db;AAEN;AAEA,IAAIqB;AAEG,SAASrB;IACd,IAAIqB,aAAaC,WAAW;QAC1B,IAAI;YACFD,WAAWP,eAAQS,SAAS,CAAC;QAC/B,EAAE,OAAM;YACN,iEAAiE;YACjE,yEAAyE;YACzEF,WAAW;YACX,OAAOA;QACT;QACA,IAAIlB,UAAU;YACZkB,WAAWG,IAAAA,2CAAuB,EAACH;QACrC;IACF;IACA,OAAOA;AACT;AAEA,2DAA2D;AAC3D,SAASL,2BAAoDH,GAAM;IACjE,IAAI,CAACA,OAAO,CAACV,UAAU;QACrB,OAAOU;IACT;IACA,MAAM,EAAEY,QAAQ,EAAEC,WAAW,EAAE,GAAGC,IAAAA,oDAAgC,EAACd;IACnE,+EAA+E;IAC/E,oFAAoF;IACpF,IAAI,CAACY,YAAYA,aAAa,KAAK;QACjC,OAAQzB,eAAe0B;IACzB;IACA,OAAOb;AACT;AAEO,SAASX,UACd0B,aAAuC,EACvCC,SAAuC;IAEvC,OAAO,CAACC;QACN,IAAIC;QAEJ,MAAMC,qBAAqBJ,eAAeK,mBAAmBH;QAE7D,IAAI3B,UAAU;YACZ,mDAAmD;YACnD4B,WAAW,OAAO,EAAElB,GAAG,EAAE;gBACvB,IAAID,OAAkCI,2BAA2BH;gBACjED,OAAOsB,IAAAA,kCAAc,EAACtB,MAAMiB;gBAC5B,IAAIjB,QAAQgB,eAAeO,oBAAoB;oBAC7CvB,OAAO,MAAMgB,cAAcO,kBAAkB,CAAC;wBAAEC,MAAMxB;wBAAMyB,SAAS;oBAAM;gBAC7E;gBAEA,IAAIzB,MAAM;oBACRkB,SAASlB;gBACX;YACF;QACF,OAAO;YACLmB,WAAW,OAAO,EAAElB,GAAG,EAAE;gBACvB,IAAID,OAAOsB,IAAAA,kCAAc,EAACrB,KAAKgB;gBAC/B,IAAIjB,QAAQgB,eAAeO,oBAAoB;oBAC7CvB,OAAO,MAAMgB,cAAcO,kBAAkB,CAAC;wBAAEC,MAAMxB;wBAAMyB,SAAS;oBAAM;gBAC7E;gBAEA,IAAIzB,MAAM;oBACRkB,SAASlB;gBACX;YACF;QACF;QAEA,MAAM0B,eAAexB,eAAQyB,gBAAgB,CAAC,OAAOR;QAErD,OAAO;YACL,2FAA2F;YAC3FO,cAAcE;YACdR;QACF;IACF;AACF"}
@@ -13,7 +13,7 @@ Object.defineProperty(exports, "NativeTabsView", {
13
13
  }
14
14
  });
15
15
  function NativeTabsView(_props) {
16
- throw new Error('You are using NativeTabs on unsupported platform. This is likely an internal Expo Router bug.');
16
+ throw new Error('You are using NativeTabs on an unsupported platform. This is likely an internal Expo Router bug.');
17
17
  }
18
18
 
19
19
  //# sourceMappingURL=NativeTabsView.js.map
@@ -91,11 +91,12 @@ export interface XcassetIcon {
91
91
  * The name of the iOS asset catalog image to use as an icon.
92
92
  *
93
93
  * Xcassets provide automatic multi-resolution (@1x/@2x/@3x), dark mode variants,
94
- * and device-specific images via `[UIImage imageNamed:]`.
94
+ * and device-specific images via `[UIImage imageNamed:]`. Both image sets and
95
+ * symbol sets are supported.
95
96
  *
96
- * The rendering mode (template vs original) can be controlled via the `renderingMode` prop
97
- * on the `Icon` component. By default, icons are tinted when `iconColor` is set, and
98
- * rendered as original otherwise.
97
+ * > **Note:** The rendering mode comes from the asset's **Render As** setting in the
98
+ * > asset catalog, not from the `renderingMode` prop. Set it to **Template Image** for
99
+ * > the icon to be tinted with `iconColor` and `selectedIconColor`.
99
100
  *
100
101
  * The value can be provided in two ways:
101
102
  * - As a string with the asset catalog image name
@@ -1 +1 @@
1
- {"version":3,"sources":["native-tabs/common/elements.tsx"],"sourcesContent":[null],"names":["NativeTabsBottomAccessory","NativeTabsTriggerBadge","NativeTabsTriggerIcon","NativeTabsTriggerLabel","NativeTabsTriggerPromiseIcon","NativeTabsTriggerVectorIcon","Label","Icon","VectorIcon","props","Badge"],"mappings":";;;;;;;;;;;;;;;;;;;QA0RaA;eAAAA;;QA3BAC;eAAAA;;QAhDAC;eAAAA;;QA3LAC;eAAAA;;QAsNAC;eAAAA;;QANAC;eAAAA;;;4BAhOkC;AAgBxC,MAAMF,yBAAgEG,iBAAK;AA2L3E,MAAMJ,wBAA8DK,gBAAI;AAqBxE,MAAMF,8BAA8BG,sBAAU;AAM9C,MAAMJ,+BAA+B,SAASA,6BACnDK,KAAwC;IAExC,OAAO;AACT;AAiBO,MAAMR,yBAAgES,iBAAK;AA2B3E,MAAMV,4BAAsE;IACjF,OAAO;AACT"}
1
+ {"version":3,"sources":["native-tabs/common/elements.tsx"],"sourcesContent":[null],"names":["NativeTabsBottomAccessory","NativeTabsTriggerBadge","NativeTabsTriggerIcon","NativeTabsTriggerLabel","NativeTabsTriggerPromiseIcon","NativeTabsTriggerVectorIcon","Label","Icon","VectorIcon","props","Badge"],"mappings":";;;;;;;;;;;;;;;;;;;QA2RaA;eAAAA;;QA3BAC;eAAAA;;QAhDAC;eAAAA;;QA5LAC;eAAAA;;QAuNAC;eAAAA;;QANAC;eAAAA;;;4BAjOkC;AAgBxC,MAAMF,yBAAgEG,iBAAK;AA4L3E,MAAMJ,wBAA8DK,gBAAI;AAqBxE,MAAMF,8BAA8BG,sBAAU;AAM9C,MAAMJ,+BAA+B,SAASA,6BACnDK,KAAwC;IAExC,OAAO;AACT;AAiBO,MAAMR,yBAAgES,iBAAK;AA2B3E,MAAMV,4BAAsE;IACjF,OAAO;AACT"}
@@ -41,6 +41,9 @@ function appendIconOptions(options, props) {
41
41
  } : undefined;
42
42
  }
43
43
  } else if ('xcasset' in props && props.xcasset) {
44
+ if (process.env.NODE_ENV !== 'production' && 'renderingMode' in props && props.renderingMode !== undefined) {
45
+ console.warn('`renderingMode` has no effect on `xcasset` icons — tinting is controlled by the ' + 'asset\'s "Render As" setting in the asset catalog instead. Remove `renderingMode`, ' + 'or use `src` if you need to control tinting from JavaScript.');
46
+ }
44
47
  if (typeof props.xcasset === 'string') {
45
48
  options.icon = {
46
49
  xcasset: props.xcasset
@@ -73,6 +76,16 @@ function convertOptionsIconToScreensPropsIcon(icon, renderingMode) {
73
76
  name: icon.sf
74
77
  };
75
78
  }
79
+ // Asset catalog icons have to be resolved natively with `[UIImage imageNamed:]`.
80
+ // Passing the name to the image loader as a `{ uri }` source happens to work for
81
+ // image sets, but symbol sets can never be produced that way. Tinting is then
82
+ // controlled by the asset's "Render As" setting in the asset catalog, not `renderingMode`.
83
+ if (icon && 'xcasset' in icon && icon.xcasset) {
84
+ return {
85
+ type: 'xcasset',
86
+ name: icon.xcasset
87
+ };
88
+ }
76
89
  const imageSource = getIconImageSource(icon);
77
90
  if (!imageSource) {
78
91
  return undefined;
@@ -89,15 +102,12 @@ function convertOptionsIconToScreensPropsIcon(icon, renderingMode) {
89
102
  templateSource: imageSource
90
103
  };
91
104
  }
105
+ // Mirrors the precedence in `convertOptionsIconToScreensPropsIcon` — SF Symbols and asset
106
+ // catalog icons aren't resolved through `renderingMode`, so both resolve to `undefined` here.
92
107
  function getIconImageSource(icon) {
93
- if (!icon || 'sf' in icon && icon.sf) {
108
+ if (!icon || 'sf' in icon && icon.sf || 'xcasset' in icon && icon.xcasset) {
94
109
  return undefined;
95
110
  }
96
- if ('xcasset' in icon && icon.xcasset) {
97
- return {
98
- uri: icon.xcasset
99
- };
100
- }
101
111
  if ('src' in icon && icon.src) {
102
112
  return icon.src;
103
113
  }
@@ -1 +1 @@
1
- {"version":3,"sources":["native-tabs/utils/optionsIconConverter.ios.ts"],"sourcesContent":[null],"names":["appendIconOptions","convertOptionsIconToScreensPropsIcon","resolveIconRenderingMode","options","props","sf","icon","undefined","selectedIcon","default","selected","xcasset","src","applyIconSrcOptions","applySelectedColor","selectedColor","iconColor","getIconImageSource","renderingMode","type","name","imageSource","effectiveRenderingMode","templateSource","uri"],"mappings":";;;;;;;;;;;;;;;;QAQgBA;eAAAA;;QAgDAC;eAAAA;;QAXAC;eAAAA;;;4CAvCwC;AAEjD,SAASF,kBAAkBG,OAAyB,EAAEC,KAAiC;IAC5F,IAAI,QAAQA,SAASA,MAAMC,EAAE,EAAE;QAC7B,IAAI,OAAOD,MAAMC,EAAE,KAAK,UAAU;YAChCF,QAAQG,IAAI,GAAGF,MAAMC,EAAE,GACnB;gBACEA,IAAID,MAAMC,EAAE;YACd,IACAE;YACJJ,QAAQK,YAAY,GAAGD;QACzB,OAAO,IAAIH,MAAMC,EAAE,EAAE;YACnBF,QAAQG,IAAI,GAAGF,MAAMC,EAAE,CAACI,OAAO,GAC3B;gBACEJ,IAAID,MAAMC,EAAE,CAACI,OAAO;YACtB,IACAF;YACJJ,QAAQK,YAAY,GAAGJ,MAAMC,EAAE,CAACK,QAAQ,GACpC;gBACEL,IAAID,MAAMC,EAAE,CAACK,QAAQ;YACvB,IACAH;QACN;IACF,OAAO,IAAI,aAAaH,SAASA,MAAMO,OAAO,EAAE;QAC9C,IAAI,OAAOP,MAAMO,OAAO,KAAK,UAAU;YACrCR,QAAQG,IAAI,GAAG;gBAAEK,SAASP,MAAMO,OAAO;YAAC;YACxCR,QAAQK,YAAY,GAAGD;QACzB,OAAO;YACLJ,QAAQG,IAAI,GAAGF,MAAMO,OAAO,CAACF,OAAO,GAAG;gBAAEE,SAASP,MAAMO,OAAO,CAACF,OAAO;YAAC,IAAIF;YAC5EJ,QAAQK,YAAY,GAAGJ,MAAMO,OAAO,CAACD,QAAQ,GACzC;gBAAEC,SAASP,MAAMO,OAAO,CAACD,QAAQ;YAAC,IAClCH;QACN;IACF,OAAO,IAAI,SAASH,SAASA,MAAMQ,GAAG,EAAE;QACtCC,IAAAA,+CAAmB,EAACV,SAASC;IAC/B;IACAU,IAAAA,8CAAkB,EAACX,SAASC,MAAMW,aAAa;AACjD;AAEO,SAASb,yBACdI,IAA6B,EAC7BU,SAAsB;IAEtB,IAAI,CAACC,mBAAmBX,OAAO;QAC7B,OAAOC;IACT;IACA,MAAMW,gBAAgBZ,QAAQ,mBAAmBA,OAAOA,KAAKY,aAAa,GAAGX;IAC7E,OAAOW,iBAAkBF,CAAAA,cAAcT,YAAY,aAAa,UAAS;AAC3E;AAEO,SAASN,qCACdK,IAA6B,EAC7BY,aAAiC;IAEjC,IAAIZ,QAAQ,QAAQA,QAAQA,KAAKD,EAAE,EAAE;QACnC,OAAO;YACLc,MAAM;YACNC,MAAMd,KAAKD,EAAE;QACf;IACF;IACA,MAAMgB,cAAcJ,mBAAmBX;IACvC,IAAI,CAACe,aAAa;QAChB,OAAOd;IACT;IACA,MAAMe,yBAAyBJ,iBAAiBhB,yBAAyBI;IACzE,IAAIgB,2BAA2B,YAAY;QACzC,OAAO;YAAEH,MAAM;YAAeE;QAAY;IAC5C;IACA,OAAO;QAAEF,MAAM;QAAkBI,gBAAgBF;IAAY;AAC/D;AAEA,SAASJ,mBAAmBX,IAA6B;IACvD,IAAI,CAACA,QAAS,QAAQA,QAAQA,KAAKD,EAAE,EAAG;QACtC,OAAOE;IACT;IACA,IAAI,aAAaD,QAAQA,KAAKK,OAAO,EAAE;QACrC,OAAO;YAAEa,KAAKlB,KAAKK,OAAO;QAAC;IAC7B;IACA,IAAI,SAASL,QAAQA,KAAKM,GAAG,EAAE;QAC7B,OAAON,KAAKM,GAAG;IACjB;IACA,OAAOL;AACT"}
1
+ {"version":3,"sources":["native-tabs/utils/optionsIconConverter.ios.ts"],"sourcesContent":[null],"names":["appendIconOptions","convertOptionsIconToScreensPropsIcon","resolveIconRenderingMode","options","props","sf","icon","undefined","selectedIcon","default","selected","xcasset","process","env","NODE_ENV","renderingMode","console","warn","src","applyIconSrcOptions","applySelectedColor","selectedColor","iconColor","getIconImageSource","type","name","imageSource","effectiveRenderingMode","templateSource"],"mappings":"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"}
@@ -206,6 +206,9 @@ function FrameSizeListenerWeb({ onChange }) {
206
206
  if (elementRef.current == null) {
207
207
  return;
208
208
  }
209
+ if (typeof elementRef.current.getBoundingClientRect !== 'function') {
210
+ return;
211
+ }
209
212
  const rect = elementRef.current.getBoundingClientRect();
210
213
  onChange({
211
214
  width: rect.width,
@@ -1 +1 @@
1
- {"version":3,"sources":["react-navigation/elements/useFrameSize.tsx"],"sourcesContent":[null],"names":["FrameSizeProvider","useFrameSize","FrameContext","React","createContext","undefined","selector","throttle","context","use","Error","value","useSyncExternalStoreWithSelector","subscribeThrottled","subscribe","getCurrent","initialFrame","render","frameRef","useRef","width","height","listeners","Set","useLatestCallback","current","listener","add","delete","delay","timer","updated","waiting","throttledListener","clearTimeout","setTimeout","unsubscribe","useMemo","onChange","frame","forEach","viewRef","useEffect","Platform","OS","measure","_x","_y","onLayout","event","nativeEvent","layout","Provider","FrameSizeListenerWeb","ref","elementRef","rect","getBoundingClientRect","observer","ResizeObserver","entries","entry","contentRect","observe","disconnect","div","style","position","left","right","top","bottom","pointerEvents","visibility"],"mappings":"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"}
1
+ {"version":3,"sources":["react-navigation/elements/useFrameSize.tsx"],"sourcesContent":[null],"names":["FrameSizeProvider","useFrameSize","FrameContext","React","createContext","undefined","selector","throttle","context","use","Error","value","useSyncExternalStoreWithSelector","subscribeThrottled","subscribe","getCurrent","initialFrame","render","frameRef","useRef","width","height","listeners","Set","useLatestCallback","current","listener","add","delete","delay","timer","updated","waiting","throttledListener","clearTimeout","setTimeout","unsubscribe","useMemo","onChange","frame","forEach","viewRef","useEffect","Platform","OS","measure","_x","_y","onLayout","event","nativeEvent","layout","Provider","FrameSizeListenerWeb","ref","elementRef","getBoundingClientRect","rect","observer","ResizeObserver","entries","entry","contentRect","observe","disconnect","div","style","position","left","right","top","bottom","pointerEvents","visibility"],"mappings":"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"}
@@ -285,6 +285,15 @@ export type NativeStackNavigationOptions = {
285
285
  * @platform ios
286
286
  */
287
287
  headerBlurEffect?: ScreenStackHeaderConfigProps['blurEffect'];
288
+ /**
289
+ * Interface style of the native header. Defaults to the navigation theme's style. The native
290
+ * header does not support changes to this option while the screen is visible.
291
+ *
292
+ * Only supported on iOS.
293
+ *
294
+ * @platform ios
295
+ */
296
+ headerUserInterfaceStyle?: 'light' | 'dark';
288
297
  /**
289
298
  * Tint color for the header. Changes the color of back button and title.
290
299
  */
@@ -10,5 +10,5 @@ type Props = NativeStackNavigationOptions & {
10
10
  } | undefined;
11
11
  route: Route<string>;
12
12
  };
13
- export declare function useHeaderConfigProps({ headerBackIcon, headerBackImageSource, headerBackButtonDisplayMode, headerBackButtonMenuEnabled, headerBackTitle, headerBackTitleStyle, headerBackVisible, headerShadowVisible, headerLargeStyle, headerLargeTitle: headerLargeTitleDeprecated, headerLargeTitleEnabled, headerLargeTitleShadowVisible, headerLargeTitleStyle, headerBackground, headerLeft, headerRight, headerShown, headerStyle, headerBlurEffect, headerTintColor, headerTitle, headerTitleAlign, headerTitleStyle, headerTransparent, headerSearchBarOptions, headerTopInsetEnabled, headerBack, route, title, unstable_headerLeftItems: headerLeftItems, unstable_headerRightItems: headerRightItems, unstable_nativeProps, }: Props): ScreenStackHeaderConfigProps;
13
+ export declare function useHeaderConfigProps({ headerBackIcon, headerBackImageSource, headerBackButtonDisplayMode, headerBackButtonMenuEnabled, headerBackTitle, headerBackTitleStyle, headerBackVisible, headerShadowVisible, headerLargeStyle, headerLargeTitle: headerLargeTitleDeprecated, headerLargeTitleEnabled, headerLargeTitleShadowVisible, headerLargeTitleStyle, headerBackground, headerLeft, headerRight, headerShown, headerStyle, headerBlurEffect, headerUserInterfaceStyle, headerTintColor, headerTitle, headerTitleAlign, headerTitleStyle, headerTransparent, headerSearchBarOptions, headerTopInsetEnabled, headerBack, route, title, unstable_headerLeftItems: headerLeftItems, unstable_headerRightItems: headerRightItems, unstable_nativeProps, }: Props): ScreenStackHeaderConfigProps;
14
14
  export {};
@@ -133,7 +133,7 @@ const getMenuItem = (item)=>{
133
133
  subtitle: description
134
134
  };
135
135
  };
136
- function useHeaderConfigProps({ headerBackIcon, headerBackImageSource, headerBackButtonDisplayMode, headerBackButtonMenuEnabled, headerBackTitle, headerBackTitleStyle, headerBackVisible, headerShadowVisible, headerLargeStyle, headerLargeTitle: headerLargeTitleDeprecated, headerLargeTitleEnabled = headerLargeTitleDeprecated, headerLargeTitleShadowVisible, headerLargeTitleStyle, headerBackground, headerLeft, headerRight, headerShown, headerStyle, headerBlurEffect, headerTintColor, headerTitle, headerTitleAlign, headerTitleStyle, headerTransparent, headerSearchBarOptions, headerTopInsetEnabled, headerBack, route, title, unstable_headerLeftItems: headerLeftItems, unstable_headerRightItems: headerRightItems, unstable_nativeProps }) {
136
+ function useHeaderConfigProps({ headerBackIcon, headerBackImageSource, headerBackButtonDisplayMode, headerBackButtonMenuEnabled, headerBackTitle, headerBackTitleStyle, headerBackVisible, headerShadowVisible, headerLargeStyle, headerLargeTitle: headerLargeTitleDeprecated, headerLargeTitleEnabled = headerLargeTitleDeprecated, headerLargeTitleShadowVisible, headerLargeTitleStyle, headerBackground, headerLeft, headerRight, headerShown, headerStyle, headerBlurEffect, headerUserInterfaceStyle, headerTintColor, headerTitle, headerTitleAlign, headerTitleStyle, headerTransparent, headerSearchBarOptions, headerTopInsetEnabled, headerBack, route, title, unstable_headerLeftItems: headerLeftItems, unstable_headerRightItems: headerRightItems, unstable_nativeProps }) {
137
137
  const { direction } = (0, _native.useLocale)();
138
138
  const { colors, fonts, dark } = (0, _native.useTheme)();
139
139
  const tintColor = headerTintColor ?? (_reactnative().Platform.OS === 'ios' ? colors.primary : colors.text);
@@ -345,7 +345,7 @@ function useHeaderConfigProps({ headerBackIcon, headerBackImageSource, headerBac
345
345
  children,
346
346
  headerLeftBarButtonItems: processBarButtonItems(leftItems, colors, fonts),
347
347
  headerRightBarButtonItems: processBarButtonItems(rightItems, colors, fonts),
348
- experimental_userInterfaceStyle: dark ? 'dark' : 'light',
348
+ experimental_userInterfaceStyle: headerUserInterfaceStyle ?? (dark ? 'dark' : 'light'),
349
349
  ...headerNativeProps
350
350
  };
351
351
  }