@react-navigation/native 8.0.0-alpha.43 → 8.0.0-alpha.45
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.
- package/android/src/main/java/org/reactnavigation/MaterialSymbolModule.kt +1 -1
- package/lib/module/__stubs__/createStackNavigator.js +2 -5
- package/lib/module/__stubs__/createStackNavigator.js.map +1 -1
- package/lib/module/createMemoryHistory.js +4 -3
- package/lib/module/createMemoryHistory.js.map +1 -1
- package/lib/module/createStandardNavigationFactories.js +8 -10
- package/lib/module/createStandardNavigationFactories.js.map +1 -1
- package/lib/typescript/src/createMemoryHistory.d.ts.map +1 -1
- package/lib/typescript/src/createStandardNavigationFactories.d.ts.map +1 -1
- package/package.json +3 -3
- package/src/__stubs__/createStackNavigator.tsx +2 -2
- package/src/createMemoryHistory.tsx +4 -3
- package/src/createStandardNavigationFactories.tsx +9 -11
|
@@ -46,7 +46,7 @@ class MaterialSymbolModule(reactContext: ReactApplicationContext) :
|
|
|
46
46
|
}
|
|
47
47
|
|
|
48
48
|
val resolvedColor = ColorPropConverter.getColor(
|
|
49
|
-
colorValue, currentActivity ?: reactApplicationContext
|
|
49
|
+
colorValue, reactApplicationContext.currentActivity ?: reactApplicationContext
|
|
50
50
|
) ?: throw IllegalArgumentException("Could not resolve color")
|
|
51
51
|
|
|
52
52
|
val density = reactApplicationContext.resources.displayMetrics.density
|
|
@@ -1,12 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
3
|
import { createNavigatorFactory, StackRouter, useNavigationBuilder } from '@react-navigation/core';
|
|
4
|
-
import { jsx as _jsx } from "react/jsx-runtime";
|
|
5
4
|
const StackNavigator = props => {
|
|
6
5
|
const {
|
|
7
6
|
state,
|
|
8
7
|
descriptors,
|
|
9
|
-
|
|
8
|
+
render
|
|
10
9
|
} = useNavigationBuilder(StackRouter, props);
|
|
11
10
|
const route = state.routes[state.index];
|
|
12
11
|
if (route == null) {
|
|
@@ -16,9 +15,7 @@ const StackNavigator = props => {
|
|
|
16
15
|
if (descriptor == null) {
|
|
17
16
|
throw new Error(`Couldn't find a descriptor for route '${route.key}'.`);
|
|
18
17
|
}
|
|
19
|
-
return
|
|
20
|
-
children: descriptor.render()
|
|
21
|
-
});
|
|
18
|
+
return render(descriptor.render());
|
|
22
19
|
};
|
|
23
20
|
export const createStackNavigator = createNavigatorFactory(StackNavigator);
|
|
24
21
|
//# sourceMappingURL=createStackNavigator.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["createNavigatorFactory","StackRouter","useNavigationBuilder","
|
|
1
|
+
{"version":3,"names":["createNavigatorFactory","StackRouter","useNavigationBuilder","StackNavigator","props","state","descriptors","render","route","routes","index","Error","descriptor","key","createStackNavigator"],"sourceRoot":"../../../src","sources":["__stubs__/createStackNavigator.tsx"],"mappings":";;AAAA,SACEA,sBAAsB,EAKtBC,WAAW,EACXC,oBAAoB,QACf,wBAAwB;AAE/B,MAAMC,cAAc,GAClBC,KAMC,IACE;EACH,MAAM;IAAEC,KAAK;IAAEC,WAAW;IAAEC;EAAO,CAAC,GAAGL,oBAAoB,CACzDD,WAAW,EACXG,KACF,CAAC;EAED,MAAMI,KAAK,GAAGH,KAAK,CAACI,MAAM,CAACJ,KAAK,CAACK,KAAK,CAAC;EAEvC,IAAIF,KAAK,IAAI,IAAI,EAAE;IACjB,MAAM,IAAIG,KAAK,CAAC,kCAAkCN,KAAK,CAACK,KAAK,GAAG,CAAC;EACnE;EAEA,MAAME,UAAU,GAAGN,WAAW,CAACE,KAAK,CAACK,GAAG,CAAC;EAEzC,IAAID,UAAU,IAAI,IAAI,EAAE;IACtB,MAAM,IAAID,KAAK,CAAC,yCAAyCH,KAAK,CAACK,GAAG,IAAI,CAAC;EACzE;EAEA,OAAON,MAAM,CAACK,UAAU,CAACL,MAAM,CAAC,CAAC,CAAC;AACpC,CAAC;AAOD,OAAO,MAAMO,oBAAoB,GAC/Bd,sBAAsB,CAAmBG,cAAc,CAAC","ignoreList":[]}
|
|
@@ -183,10 +183,11 @@ export function createMemoryHistory() {
|
|
|
183
183
|
cb: done
|
|
184
184
|
});
|
|
185
185
|
|
|
186
|
-
// If navigation didn't happen within
|
|
186
|
+
// If navigation didn't happen within 1000ms, assume that it won't happen
|
|
187
187
|
// This may not be accurate, but hopefully it won't take so much time
|
|
188
188
|
// In Chrome, navigation seems to happen instantly in next microtask
|
|
189
|
-
// But on Firefox,
|
|
189
|
+
// But on Firefox, the traversal can take much longer when the main thread
|
|
190
|
+
// is busy, e.g. it was measured to take up to ~900ms while rendering a new screen
|
|
190
191
|
// We're using a hacky timeout since there doesn't seem to be way to know for sure
|
|
191
192
|
const timer = setTimeout(() => {
|
|
192
193
|
window.removeEventListener('popstate', onPopState);
|
|
@@ -196,7 +197,7 @@ export function createMemoryHistory() {
|
|
|
196
197
|
pending.splice(foundIndex, 1);
|
|
197
198
|
}
|
|
198
199
|
index = this.index;
|
|
199
|
-
},
|
|
200
|
+
}, 1000);
|
|
200
201
|
const onPopState = () => {
|
|
201
202
|
// Fix createMemoryHistory.index variable's value
|
|
202
203
|
// as it may go out of sync when navigating in the browser.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["nanoid","getPathWithoutHash","path","split","createMemoryHistory","index","items","pending","interrupt","forEach","it","cb","history","id","window","state","findIndex","item","get","backIndex","pathWithoutHash","i","push","slice","length","pushState","replace","pathWithHash","hash","includes","location","replaceState","go","n","nextIndex","lastItemIndex","targetId","Promise","resolve","reject","done","interrupted","clearTimeout","timer","Error","title","document","ref","setTimeout","removeEventListener","onPopState","foundIndex","splice","last","pop","addEventListener","listen","listener"],"sourceRoot":"../../src","sources":["createMemoryHistory.tsx"],"mappings":"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
|
|
1
|
+
{"version":3,"names":["nanoid","getPathWithoutHash","path","split","createMemoryHistory","index","items","pending","interrupt","forEach","it","cb","history","id","window","state","findIndex","item","get","backIndex","pathWithoutHash","i","push","slice","length","pushState","replace","pathWithHash","hash","includes","location","replaceState","go","n","nextIndex","lastItemIndex","targetId","Promise","resolve","reject","done","interrupted","clearTimeout","timer","Error","title","document","ref","setTimeout","removeEventListener","onPopState","foundIndex","splice","last","pop","addEventListener","listen","listener"],"sourceRoot":"../../src","sources":["createMemoryHistory.tsx"],"mappings":"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","ignoreList":[]}
|
|
@@ -78,16 +78,14 @@ export function createStandardNavigationFactories(navigator, router, mapper) {
|
|
|
78
78
|
/* eslint-enable @typescript-eslint/no-unused-vars */
|
|
79
79
|
...rest
|
|
80
80
|
} = props;
|
|
81
|
-
return /*#__PURE__*/_jsx(
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
})
|
|
90
|
-
});
|
|
81
|
+
return builder.render(/*#__PURE__*/_jsx(NavigatorContent, {
|
|
82
|
+
...rest,
|
|
83
|
+
...mapped,
|
|
84
|
+
state: state,
|
|
85
|
+
descriptors: descriptors,
|
|
86
|
+
actions: actions,
|
|
87
|
+
emitter: emitter
|
|
88
|
+
}));
|
|
91
89
|
}
|
|
92
90
|
const createNavigator = createNavigatorFactory(StandardNavigationNavigator);
|
|
93
91
|
const createScreen = createScreenFactory();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["CommonActions","createNavigatorFactory","createScreenFactory","useNavigationBuilder","React","useBuildHref","useMemoArray","jsx","_jsx","createStandardNavigationFactories","navigator","router","mapper","type","version","NavigatorContent","Error","StandardNavigationNavigator","props","builder","buildHref","routes","state","map","route","href","name","params","key","useMemo","index","descriptors","descriptor","options","render","actions","navigate","navigation","dispatch","target","back","goBack","emitter","emit","mapped","children","initialRouteName","layout","routeNamesChangeBehavior","routerOverride","screenLayout","screenListeners","screenOptions","rest","
|
|
1
|
+
{"version":3,"names":["CommonActions","createNavigatorFactory","createScreenFactory","useNavigationBuilder","React","useBuildHref","useMemoArray","jsx","_jsx","createStandardNavigationFactories","navigator","router","mapper","type","version","NavigatorContent","Error","StandardNavigationNavigator","props","builder","buildHref","routes","state","map","route","href","name","params","key","useMemo","index","descriptors","descriptor","options","render","actions","navigate","navigation","dispatch","target","back","goBack","emitter","emit","mapped","children","initialRouteName","layout","routeNamesChangeBehavior","routerOverride","screenLayout","screenListeners","screenOptions","rest","createNavigator","createScreen"],"sourceRoot":"../../src","sources":["createStandardNavigationFactories.tsx"],"mappings":"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","ignoreList":[]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createMemoryHistory.d.ts","sourceRoot":"","sources":["../../../src/createMemoryHistory.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAG9D,KAAK,aAAa,GAAG;IAEnB,EAAE,EAAE,MAAM,CAAC;IAEX,KAAK,EAAE,eAAe,CAAC;IAEvB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAIF,wBAAgB,mBAAmB;oBAmBlB,MAAM;eAcR,MAAM;wBAIG;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE;0BAmBd;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,eAAe,CAAA;KAAE;6BAoBrC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,eAAe,CAAA;KAAE;UAwC3D,MAAM;
|
|
1
|
+
{"version":3,"file":"createMemoryHistory.d.ts","sourceRoot":"","sources":["../../../src/createMemoryHistory.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAG9D,KAAK,aAAa,GAAG;IAEnB,EAAE,EAAE,MAAM,CAAC;IAEX,KAAK,EAAE,eAAe,CAAC;IAEvB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAIF,wBAAgB,mBAAmB;oBAmBlB,MAAM;eAcR,MAAM;wBAIG;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE;0BAmBd;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,eAAe,CAAA;KAAE;6BAoBrC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,eAAe,CAAA;KAAE;UAwC3D,MAAM;qBAmGK,MAAM,IAAI;EAqB9B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createStandardNavigationFactories.d.ts","sourceRoot":"","sources":["../../../src/createStandardNavigationFactories.tsx"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,oBAAoB,EACzB,KAAK,YAAY,EACjB,KAAK,gBAAgB,EACrB,KAAK,oBAAoB,EACzB,KAAK,aAAa,EAClB,KAAK,aAAa,EAEnB,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,KAAK,EACV,uBAAuB,EAExB,MAAM,qBAAqB,CAAC;AAK7B,KAAK,gBAAgB,CAAC,QAAQ,SAAS,YAAY,IAAI;KACpD,SAAS,IAAI,MAAM,QAAQ,GAAG;QAC7B,IAAI,EAAE,QAAQ,CAAC,SAAS,CAAC,SAAS;YAAE,IAAI,CAAC,EAAE,MAAM,IAAI,CAAA;SAAE,GACnD,IAAI,SAAS,MAAM,GAAG,SAAS,GAC7B,IAAI,GACJ,MAAM,GAAG,SAAS,GACpB,SAAS,CAAC;QACd,iBAAiB,EAAE,QAAQ,CAAC,SAAS,CAAC,SAAS;YAAE,iBAAiB,EAAE,IAAI,CAAA;SAAE,GACtE,IAAI,GACJ,KAAK,CAAC;KACX;CACF,CAAC;AAEF,MAAM,WAAW,6BAA8B,SAAQ,oBAAoB;IACzE,aAAa,EAAE,oBAAoB,CAAC;IACpC,SAAS,EAAE,KAAK,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;CACpC;AAED,KAAK,4BAA4B,CAC/B,OAAO,SAAS,6BAA6B,EAC7C,SAAS,SAAS,aAAa,IAC7B,OAAO,GAAG;IAAE,SAAS,EAAE,SAAS,CAAA;CAAE,CAAC;AAEvC,KAAK,yBAAyB,CAC5B,OAAO,SAAS,6BAA6B,EAC7C,SAAS,SAAS,aAAa,IAC7B,4BAA4B,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC,gBAAgB,CAAC,CAAC;AAEvE,KAAK,6BAA6B,CAChC,OAAO,SAAS,6BAA6B,IAC3C;IACF,KAAK,EAAE,4BAA4B,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC,OAAO,CAAC,CAAC;IACrE,UAAU,EAAE,yBAAyB,CACnC,OAAO,EACP,aAAa,CACd,CAAC,MAAM,yBAAyB,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC,CAAC;CAC5D,CAAC;AAEF,wBAAgB,iCAAiC,CAC/C,OAAO,SAAS,6BAA6B,EAC7C,cAAc,SAAS,MAAM,GAAG,EAAE,EAClC,WAAW,SAAS,MAAM,GAAG,EAAE,EAE/B,SAAS,EAAE,UAAU,CACnB,OAAO,uBAAuB,CAC5B,OAAO,CAAC,eAAe,CAAC,EACxB,gBAAgB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,EACrC,cAAc,GAAG,WAAW,CAC7B,CACF,EACD,MAAM,EAAE,aAAa,CACnB,4BAA4B,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC,OAAO,CAAC,EAC7D,gBAAgB,EAChB,OAAO,CAAC,eAAe,CAAC,CACzB,EACD,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,6BAA6B,CAAC,OAAO,CAAC,KAAK,WAAW;;
|
|
1
|
+
{"version":3,"file":"createStandardNavigationFactories.d.ts","sourceRoot":"","sources":["../../../src/createStandardNavigationFactories.tsx"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,oBAAoB,EACzB,KAAK,YAAY,EACjB,KAAK,gBAAgB,EACrB,KAAK,oBAAoB,EACzB,KAAK,aAAa,EAClB,KAAK,aAAa,EAEnB,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,KAAK,EACV,uBAAuB,EAExB,MAAM,qBAAqB,CAAC;AAK7B,KAAK,gBAAgB,CAAC,QAAQ,SAAS,YAAY,IAAI;KACpD,SAAS,IAAI,MAAM,QAAQ,GAAG;QAC7B,IAAI,EAAE,QAAQ,CAAC,SAAS,CAAC,SAAS;YAAE,IAAI,CAAC,EAAE,MAAM,IAAI,CAAA;SAAE,GACnD,IAAI,SAAS,MAAM,GAAG,SAAS,GAC7B,IAAI,GACJ,MAAM,GAAG,SAAS,GACpB,SAAS,CAAC;QACd,iBAAiB,EAAE,QAAQ,CAAC,SAAS,CAAC,SAAS;YAAE,iBAAiB,EAAE,IAAI,CAAA;SAAE,GACtE,IAAI,GACJ,KAAK,CAAC;KACX;CACF,CAAC;AAEF,MAAM,WAAW,6BAA8B,SAAQ,oBAAoB;IACzE,aAAa,EAAE,oBAAoB,CAAC;IACpC,SAAS,EAAE,KAAK,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;CACpC;AAED,KAAK,4BAA4B,CAC/B,OAAO,SAAS,6BAA6B,EAC7C,SAAS,SAAS,aAAa,IAC7B,OAAO,GAAG;IAAE,SAAS,EAAE,SAAS,CAAA;CAAE,CAAC;AAEvC,KAAK,yBAAyB,CAC5B,OAAO,SAAS,6BAA6B,EAC7C,SAAS,SAAS,aAAa,IAC7B,4BAA4B,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC,gBAAgB,CAAC,CAAC;AAEvE,KAAK,6BAA6B,CAChC,OAAO,SAAS,6BAA6B,IAC3C;IACF,KAAK,EAAE,4BAA4B,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC,OAAO,CAAC,CAAC;IACrE,UAAU,EAAE,yBAAyB,CACnC,OAAO,EACP,aAAa,CACd,CAAC,MAAM,yBAAyB,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC,CAAC;CAC5D,CAAC;AAEF,wBAAgB,iCAAiC,CAC/C,OAAO,SAAS,6BAA6B,EAC7C,cAAc,SAAS,MAAM,GAAG,EAAE,EAClC,WAAW,SAAS,MAAM,GAAG,EAAE,EAE/B,SAAS,EAAE,UAAU,CACnB,OAAO,uBAAuB,CAC5B,OAAO,CAAC,eAAe,CAAC,EACxB,gBAAgB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,EACrC,cAAc,GAAG,WAAW,CAC7B,CACF,EACD,MAAM,EAAE,aAAa,CACnB,4BAA4B,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC,OAAO,CAAC,EAC7D,gBAAgB,EAChB,OAAO,CAAC,eAAe,CAAC,CACzB,EACD,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,6BAA6B,CAAC,OAAO,CAAC,KAAK,WAAW;;mBAkIxD,KAAK,CAAC,aAAa,CAAC,cAAc,CAAC;;;EAUnD"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@react-navigation/native",
|
|
3
3
|
"description": "React Native integration for React Navigation",
|
|
4
|
-
"version": "8.0.0-alpha.
|
|
4
|
+
"version": "8.0.0-alpha.45",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"react-native",
|
|
7
7
|
"react-navigation",
|
|
@@ -62,7 +62,7 @@
|
|
|
62
62
|
"clean": "del lib"
|
|
63
63
|
},
|
|
64
64
|
"dependencies": {
|
|
65
|
-
"@react-navigation/core": "^8.0.0-alpha.
|
|
65
|
+
"@react-navigation/core": "^8.0.0-alpha.35",
|
|
66
66
|
"escape-string-regexp": "^5.0.0",
|
|
67
67
|
"fast-deep-equal": "^3.1.3",
|
|
68
68
|
"nanoid": "^5.1.11",
|
|
@@ -132,5 +132,5 @@
|
|
|
132
132
|
}
|
|
133
133
|
}
|
|
134
134
|
},
|
|
135
|
-
"gitHead": "
|
|
135
|
+
"gitHead": "400f7128965fc92c335a3f6c27e3fa26113915e4"
|
|
136
136
|
}
|
|
@@ -17,7 +17,7 @@ const StackNavigator = (
|
|
|
17
17
|
unknown
|
|
18
18
|
>
|
|
19
19
|
) => {
|
|
20
|
-
const { state, descriptors,
|
|
20
|
+
const { state, descriptors, render } = useNavigationBuilder(
|
|
21
21
|
StackRouter,
|
|
22
22
|
props
|
|
23
23
|
);
|
|
@@ -34,7 +34,7 @@ const StackNavigator = (
|
|
|
34
34
|
throw new Error(`Couldn't find a descriptor for route '${route.key}'.`);
|
|
35
35
|
}
|
|
36
36
|
|
|
37
|
-
return
|
|
37
|
+
return render(descriptor.render());
|
|
38
38
|
};
|
|
39
39
|
|
|
40
40
|
interface StubStackTypeBag extends NavigatorTypeBagBase {
|
|
@@ -189,10 +189,11 @@ export function createMemoryHistory() {
|
|
|
189
189
|
|
|
190
190
|
pending.push({ ref: done, cb: done });
|
|
191
191
|
|
|
192
|
-
// If navigation didn't happen within
|
|
192
|
+
// If navigation didn't happen within 1000ms, assume that it won't happen
|
|
193
193
|
// This may not be accurate, but hopefully it won't take so much time
|
|
194
194
|
// In Chrome, navigation seems to happen instantly in next microtask
|
|
195
|
-
// But on Firefox,
|
|
195
|
+
// But on Firefox, the traversal can take much longer when the main thread
|
|
196
|
+
// is busy, e.g. it was measured to take up to ~900ms while rendering a new screen
|
|
196
197
|
// We're using a hacky timeout since there doesn't seem to be way to know for sure
|
|
197
198
|
const timer = setTimeout(() => {
|
|
198
199
|
window.removeEventListener('popstate', onPopState);
|
|
@@ -205,7 +206,7 @@ export function createMemoryHistory() {
|
|
|
205
206
|
}
|
|
206
207
|
|
|
207
208
|
index = this.index;
|
|
208
|
-
},
|
|
209
|
+
}, 1000);
|
|
209
210
|
|
|
210
211
|
const onPopState = () => {
|
|
211
212
|
// Fix createMemoryHistory.index variable's value
|
|
@@ -190,17 +190,15 @@ export function createStandardNavigationFactories<
|
|
|
190
190
|
...rest
|
|
191
191
|
} = props;
|
|
192
192
|
|
|
193
|
-
return (
|
|
194
|
-
<
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
/>
|
|
203
|
-
</builder.NavigationContent>
|
|
193
|
+
return builder.render(
|
|
194
|
+
<NavigatorContent
|
|
195
|
+
{...(rest as NavigatorProps & MapperProps)}
|
|
196
|
+
{...mapped}
|
|
197
|
+
state={state}
|
|
198
|
+
descriptors={descriptors}
|
|
199
|
+
actions={actions}
|
|
200
|
+
emitter={emitter}
|
|
201
|
+
/>
|
|
204
202
|
);
|
|
205
203
|
}
|
|
206
204
|
|