@react-navigation/bottom-tabs 8.0.0-alpha.24 → 8.0.0-alpha.26

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 (10) hide show
  1. package/lib/module/index.js.map +1 -1
  2. package/lib/module/navigators/createBottomTabNavigator.js +3 -7
  3. package/lib/module/navigators/createBottomTabNavigator.js.map +1 -1
  4. package/lib/typescript/src/index.d.ts +1 -1
  5. package/lib/typescript/src/index.d.ts.map +1 -1
  6. package/lib/typescript/src/navigators/createBottomTabNavigator.d.ts +8 -14
  7. package/lib/typescript/src/navigators/createBottomTabNavigator.d.ts.map +1 -1
  8. package/package.json +5 -7
  9. package/src/index.tsx +1 -0
  10. package/src/navigators/createBottomTabNavigator.tsx +9 -46
package/lib/module/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"names":["SceneStyleInterpolators","TransitionPresets","TransitionSpecs","createBottomTabNavigator","createBottomTabScreen","BottomTabBar","BottomTabView","BottomTabBarHeightCallbackContext","BottomTabBarHeightContext","useBottomTabAnimation","useBottomTabBarHeight"],"sourceRoot":"../../src","sources":["index.tsx"],"mappings":";;AAAA,OAAO,KAAKA,uBAAuB,MAAM,gDAA6C;AACtF,OAAO,KAAKC,iBAAiB,MAAM,0CAAuC;AAC1E,OAAO,KAAKC,eAAe,MAAM,wCAAqC;;AAEtE;AACA;AACA;AACA,SAASF,uBAAuB,EAAEC,iBAAiB,EAAEC,eAAe;;AAEpE;AACA;AACA;AACA,SACEC,wBAAwB,EACxBC,qBAAqB,QAChB,0CAAuC;;AAE9C;AACA;AACA;AACA,SAASC,YAAY,QAAQ,yBAAsB;AACnD,SAASC,aAAa,QAAQ,gCAA6B;;AAE3D;AACA;AACA;AACA,SAASC,iCAAiC,QAAQ,8CAA2C;AAC7F,SAASC,yBAAyB,QAAQ,sCAAmC;AAC7E,SAASC,qBAAqB,QAAQ,kCAA+B;AACrE,SAASC,qBAAqB,QAAQ,kCAA+B;;AAErE;AACA;AACA","ignoreList":[]}
1
+ {"version":3,"names":["SceneStyleInterpolators","TransitionPresets","TransitionSpecs","createBottomTabNavigator","createBottomTabScreen","BottomTabBar","BottomTabView","BottomTabBarHeightCallbackContext","BottomTabBarHeightContext","useBottomTabAnimation","useBottomTabBarHeight"],"sourceRoot":"../../src","sources":["index.tsx"],"mappings":";;AAAA,OAAO,KAAKA,uBAAuB,MAAM,gDAA6C;AACtF,OAAO,KAAKC,iBAAiB,MAAM,0CAAuC;AAC1E,OAAO,KAAKC,eAAe,MAAM,wCAAqC;;AAEtE;AACA;AACA;AACA,SAASF,uBAAuB,EAAEC,iBAAiB,EAAEC,eAAe;;AAEpE;AACA;AACA;AACA,SAEEC,wBAAwB,EACxBC,qBAAqB,QAChB,0CAAuC;;AAE9C;AACA;AACA;AACA,SAASC,YAAY,QAAQ,yBAAsB;AACnD,SAASC,aAAa,QAAQ,gCAA6B;;AAE3D;AACA;AACA;AACA,SAASC,iCAAiC,QAAQ,8CAA2C;AAC7F,SAASC,yBAAyB,QAAQ,sCAAmC;AAC7E,SAASC,qBAAqB,QAAQ,kCAA+B;AACrE,SAASC,qBAAqB,QAAQ,kCAA+B;;AAErE;AACA;AACA","ignoreList":[]}
package/lib/module/navigators/createBottomTabNavigator.js CHANGED
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
 
3
- import { createNavigatorFactory, TabRouter, useNavigationBuilder } from '@react-navigation/native';
3
+ import { createNavigatorFactory, createScreenFactory, TabRouter, useNavigationBuilder } from '@react-navigation/native';
4
4
  import { BottomTabView } from "../views/BottomTabViewCommon.js";
5
5
  import { jsx as _jsx } from "react/jsx-runtime";
6
6
  function BottomTabNavigator({
@@ -40,10 +40,6 @@ function BottomTabNavigator({
40
40
  })
41
41
  });
42
42
  }
43
- export function createBottomTabNavigator(config) {
44
- return createNavigatorFactory(BottomTabNavigator)(config);
45
- }
46
- export function createBottomTabScreen(config) {
47
- return config;
48
- }
43
+ export const createBottomTabNavigator = createNavigatorFactory(BottomTabNavigator);
44
+ export const createBottomTabScreen = createScreenFactory();
49
45
  //# sourceMappingURL=createBottomTabNavigator.js.map
package/lib/module/navigators/createBottomTabNavigator.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"names":["createNavigatorFactory","TabRouter","useNavigationBuilder","BottomTabView","jsx","_jsx","BottomTabNavigator","initialRouteName","backBehavior","routeNamesChangeBehavior","children","layout","screenListeners","screenOptions","screenLayout","router","rest","state","navigation","descriptors","NavigationContent","createBottomTabNavigator","config","createBottomTabScreen"],"sourceRoot":"../../../src","sources":["navigators/createBottomTabNavigator.tsx"],"mappings":";;AAAA,SACEA,sBAAsB,EAStBC,SAAS,EAGTC,oBAAoB,QACf,0BAA0B;AAQjC,SAASC,aAAa,QAAQ,iCAA8B;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAE7D,SAASC,kBAAkBA,CAAC;EAC1BC,gBAAgB;EAChBC,YAAY;EACZC,wBAAwB;EACxBC,QAAQ;EACRC,MAAM;EACNC,eAAe;EACfC,aAAa;EACbC,YAAY;EACZC,MAAM;EACN,GAAGC;AACoB,CAAC,EAAE;EAC1B,MAAM;IAAEC,KAAK;IAAEC,UAAU;IAAEC,WAAW;IAAEC;EAAkB,CAAC,GACzDlB,oBAAoB,CAMlBD,SAAS,EAAE;IACXM,gBAAgB;IAChBC,YAAY;IACZC,wBAAwB;IACxBC,QAAQ;IACRC,MAAM;IACNC,eAAe;IACfC,aAAa;IACbC,YAAY;IACZC;EACF,CAAC,CAAC;EAEJ,oBACEV,IAAA,CAACe,iBAAiB;IAAAV,QAAA,eAChBL,IAAA,CAACF,aAAa;MAAA,GACRa,IAAI;MACRC,KAAK,EAAEA,KAAM;MACbC,UAAU,EAAEA,UAAW;MACvBC,WAAW,EAAEA;IAAY,CAC1B;EAAC,CACe,CAAC;AAExB;AA2BA,OAAO,SAASE,wBAAwBA,CAACC,MAAgB,EAAE;EACzD,OAAOtB,sBAAsB,CAACM,kBAAkB,CAAC,CAACgB,MAAM,CAAC;AAC3D;AAEA,OAAO,SAASC,qBAAqBA,CAInCD,MAOC,EACD;EACA,OAAOA,MAAM;AACf","ignoreList":[]}
1
+ {"version":3,"names":["createNavigatorFactory","createScreenFactory","TabRouter","useNavigationBuilder","BottomTabView","jsx","_jsx","BottomTabNavigator","initialRouteName","backBehavior","routeNamesChangeBehavior","children","layout","screenListeners","screenOptions","screenLayout","router","rest","state","navigation","descriptors","NavigationContent","createBottomTabNavigator","createBottomTabScreen"],"sourceRoot":"../../../src","sources":["navigators/createBottomTabNavigator.tsx"],"mappings":";;AAAA,SACEA,sBAAsB,EACtBC,mBAAmB,EAKnBC,SAAS,EAETC,oBAAoB,QACf,0BAA0B;AAOjC,SAASC,aAAa,QAAQ,iCAA8B;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAE7D,SAASC,kBAAkBA,CAAC;EAC1BC,gBAAgB;EAChBC,YAAY;EACZC,wBAAwB;EACxBC,QAAQ;EACRC,MAAM;EACNC,eAAe;EACfC,aAAa;EACbC,YAAY;EACZC,MAAM;EACN,GAAGC;AACoB,CAAC,EAAE;EAC1B,MAAM;IAAEC,KAAK;IAAEC,UAAU;IAAEC,WAAW;IAAEC;EAAkB,CAAC,GACzDlB,oBAAoB,CAMlBD,SAAS,EAAE;IACXM,gBAAgB;IAChBC,YAAY;IACZC,wBAAwB;IACxBC,QAAQ;IACRC,MAAM;IACNC,eAAe;IACfC,aAAa;IACbC,YAAY;IACZC;EACF,CAAC,CAAC;EAEJ,oBACEV,IAAA,CAACe,iBAAiB;IAAAV,QAAA,eAChBL,IAAA,CAACF,aAAa;MAAA,GACRa,IAAI;MACRC,KAAK,EAAEA,KAAM;MACbC,UAAU,EAAEA,UAAW;MACvBC,WAAW,EAAEA;IAAY,CAC1B;EAAC,CACe,CAAC;AAExB;AAUA,OAAO,MAAME,wBAAwB,GACnCtB,sBAAsB,CAAmBO,kBAAkB,CAAC;AAE9D,OAAO,MAAMgB,qBAAqB,GAAGtB,mBAAmB,CAAmB,CAAC","ignoreList":[]}
package/lib/typescript/src/index.d.ts CHANGED
@@ -8,7 +8,7 @@ export { SceneStyleInterpolators, TransitionPresets, TransitionSpecs };
8
8
  /**
9
9
  * Navigators
10
10
  */
11
- export { createBottomTabNavigator, createBottomTabScreen, } from './navigators/createBottomTabNavigator';
11
+ export { type BottomTabTypeBag, createBottomTabNavigator, createBottomTabScreen, } from './navigators/createBottomTabNavigator';
12
12
  /**
13
13
  * Views
14
14
  */
package/lib/typescript/src/index.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,uBAAuB,MAAM,6CAA6C,CAAC;AACvF,OAAO,KAAK,iBAAiB,MAAM,uCAAuC,CAAC;AAC3E,OAAO,KAAK,eAAe,MAAM,qCAAqC,CAAC;AAEvE;;GAEG;AACH,OAAO,EAAE,uBAAuB,EAAE,iBAAiB,EAAE,eAAe,EAAE,CAAC;AAEvE;;GAEG;AACH,OAAO,EACL,wBAAwB,EACxB,qBAAqB,GACtB,MAAM,uCAAuC,CAAC;AAE/C;;GAEG;AACH,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAE5D;;GAEG;AACH,OAAO,EAAE,iCAAiC,EAAE,MAAM,2CAA2C,CAAC;AAC9F,OAAO,EAAE,yBAAyB,EAAE,MAAM,mCAAmC,CAAC;AAC9E,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AACtE,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AAEtE;;GAEG;AACH,YAAY,EACV,uBAAuB,EACvB,iBAAiB,EACjB,oBAAoB,EACpB,2BAA2B,EAC3B,0BAA0B,EAC1B,uBAAuB,EACvB,uBAAuB,EACvB,oBAAoB,EACpB,oBAAoB,GACrB,MAAM,SAAS,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,uBAAuB,MAAM,6CAA6C,CAAC;AACvF,OAAO,KAAK,iBAAiB,MAAM,uCAAuC,CAAC;AAC3E,OAAO,KAAK,eAAe,MAAM,qCAAqC,CAAC;AAEvE;;GAEG;AACH,OAAO,EAAE,uBAAuB,EAAE,iBAAiB,EAAE,eAAe,EAAE,CAAC;AAEvE;;GAEG;AACH,OAAO,EACL,KAAK,gBAAgB,EACrB,wBAAwB,EACxB,qBAAqB,GACtB,MAAM,uCAAuC,CAAC;AAE/C;;GAEG;AACH,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAE5D;;GAEG;AACH,OAAO,EAAE,iCAAiC,EAAE,MAAM,2CAA2C,CAAC;AAC9F,OAAO,EAAE,yBAAyB,EAAE,MAAM,mCAAmC,CAAC;AAC9E,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AACtE,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AAEtE;;GAEG;AACH,YAAY,EACV,uBAAuB,EACvB,iBAAiB,EACjB,oBAAoB,EACpB,2BAA2B,EAC3B,0BAA0B,EAC1B,uBAAuB,EACvB,uBAAuB,EACvB,oBAAoB,EACpB,oBAAoB,GACrB,MAAM,SAAS,CAAC"}
package/lib/typescript/src/navigators/createBottomTabNavigator.d.ts CHANGED
@@ -1,20 +1,14 @@
1
- import { type ParamListBase, type StaticConfig, type StaticParamList, type StaticScreenConfig, type StaticScreenConfigLinking, type StaticScreenConfigScreen, type TabNavigationState, type TypedNavigator } from '@react-navigation/native';
2
- import type { BottomTabNavigationEventMap, BottomTabNavigationOptions, BottomTabNavigationProp, BottomTabNavigatorProps } from '../types';
1
+ import { type NavigatorTypeBagBase, type ParamListBase, type TabActionHelpers, type TabNavigationState } from '@react-navigation/native';
2
+ import type { BottomTabNavigationEventMap, BottomTabNavigationOptions, BottomTabNavigatorProps } from '../types';
3
3
  declare function BottomTabNavigator({ initialRouteName, backBehavior, routeNamesChangeBehavior, children, layout, screenListeners, screenOptions, screenLayout, router, ...rest }: BottomTabNavigatorProps): import("react/jsx-runtime").JSX.Element;
4
- type BottomTabTypeBag<ParamList extends {}> = {
5
- ParamList: ParamList;
6
- State: TabNavigationState<ParamList>;
4
+ export interface BottomTabTypeBag extends NavigatorTypeBagBase {
5
+ State: TabNavigationState<this['ParamList']>;
7
6
  ScreenOptions: BottomTabNavigationOptions;
8
7
  EventMap: BottomTabNavigationEventMap;
9
- NavigationList: {
10
- [RouteName in keyof ParamList]: BottomTabNavigationProp<ParamList, RouteName>;
11
- };
8
+ ActionHelpers: TabActionHelpers<this['ParamList']>;
12
9
  Navigator: typeof BottomTabNavigator;
13
- };
14
- export declare function createBottomTabNavigator<const ParamList extends ParamListBase>(): TypedNavigator<BottomTabTypeBag<ParamList>, undefined>;
15
- export declare function createBottomTabNavigator<const Config extends StaticConfig<BottomTabTypeBag<ParamListBase>>>(config: Config): TypedNavigator<BottomTabTypeBag<StaticParamList<{
16
- config: Config;
17
- }>>, Config>;
18
- export declare function createBottomTabScreen<const Linking extends StaticScreenConfigLinking, const Screen extends StaticScreenConfigScreen>(config: StaticScreenConfig<Linking, Screen, TabNavigationState<ParamListBase>, BottomTabNavigationOptions, BottomTabNavigationEventMap, BottomTabNavigationProp<ParamListBase>>): StaticScreenConfig<Linking, Screen, TabNavigationState<ParamListBase>, BottomTabNavigationOptions, BottomTabNavigationEventMap, BottomTabNavigationProp<ParamListBase>>;
10
+ }
11
+ export declare const createBottomTabNavigator: import("@react-navigation/core").TypedNavigatorFactory<BottomTabTypeBag>;
12
+ export declare const createBottomTabScreen: import("@react-navigation/core").StaticScreenFactory<import("@react-navigation/core").NavigatorTypeBagFor<BottomTabTypeBag, ParamListBase>>;
19
13
  export {};
20
14
  //# sourceMappingURL=createBottomTabNavigator.d.ts.map
package/lib/typescript/src/navigators/createBottomTabNavigator.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"createBottomTabNavigator.d.ts","sourceRoot":"","sources":["../../../../src/navigators/createBottomTabNavigator.tsx"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,aAAa,EAClB,KAAK,YAAY,EACjB,KAAK,eAAe,EACpB,KAAK,kBAAkB,EACvB,KAAK,yBAAyB,EAC9B,KAAK,wBAAwB,EAE7B,KAAK,kBAAkB,EAGvB,KAAK,cAAc,EAEpB,MAAM,0BAA0B,CAAC;AAElC,OAAO,KAAK,EACV,2BAA2B,EAC3B,0BAA0B,EAC1B,uBAAuB,EACvB,uBAAuB,EACxB,MAAM,UAAU,CAAC;AAGlB,iBAAS,kBAAkB,CAAC,EAC1B,gBAAgB,EAChB,YAAY,EACZ,wBAAwB,EACxB,QAAQ,EACR,MAAM,EACN,eAAe,EACf,aAAa,EACb,YAAY,EACZ,MAAM,EACN,GAAG,IAAI,EACR,EAAE,uBAAuB,2CA8BzB;AAED,KAAK,gBAAgB,CAAC,SAAS,SAAS,EAAE,IAAI;IAC5C,SAAS,EAAE,SAAS,CAAC;IACrB,KAAK,EAAE,kBAAkB,CAAC,SAAS,CAAC,CAAC;IACrC,aAAa,EAAE,0BAA0B,CAAC;IAC1C,QAAQ,EAAE,2BAA2B,CAAC;IACtC,cAAc,EAAE;SACb,SAAS,IAAI,MAAM,SAAS,GAAG,uBAAuB,CACrD,SAAS,EACT,SAAS,CACV;KACF,CAAC;IACF,SAAS,EAAE,OAAO,kBAAkB,CAAC;CACtC,CAAC;AAEF,wBAAgB,wBAAwB,CACtC,KAAK,CAAC,SAAS,SAAS,aAAa,KAClC,cAAc,CAAC,gBAAgB,CAAC,SAAS,CAAC,EAAE,SAAS,CAAC,CAAC;AAC5D,wBAAgB,wBAAwB,CACtC,KAAK,CAAC,MAAM,SAAS,YAAY,CAAC,gBAAgB,CAAC,aAAa,CAAC,CAAC,EAElE,MAAM,EAAE,MAAM,GACb,cAAc,CACf,gBAAgB,CAAC,eAAe,CAAC;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC,EACrD,MAAM,CACP,CAAC;AAKF,wBAAgB,qBAAqB,CACnC,KAAK,CAAC,OAAO,SAAS,yBAAyB,EAC/C,KAAK,CAAC,MAAM,SAAS,wBAAwB,EAE7C,MAAM,EAAE,kBAAkB,CACxB,OAAO,EACP,MAAM,EACN,kBAAkB,CAAC,aAAa,CAAC,EACjC,0BAA0B,EAC1B,2BAA2B,EAC3B,uBAAuB,CAAC,aAAa,CAAC,CACvC,2KAGF"}
1
+ {"version":3,"file":"createBottomTabNavigator.d.ts","sourceRoot":"","sources":["../../../../src/navigators/createBottomTabNavigator.tsx"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,oBAAoB,EACzB,KAAK,aAAa,EAClB,KAAK,gBAAgB,EACrB,KAAK,kBAAkB,EAIxB,MAAM,0BAA0B,CAAC;AAElC,OAAO,KAAK,EACV,2BAA2B,EAC3B,0BAA0B,EAC1B,uBAAuB,EACxB,MAAM,UAAU,CAAC;AAGlB,iBAAS,kBAAkB,CAAC,EAC1B,gBAAgB,EAChB,YAAY,EACZ,wBAAwB,EACxB,QAAQ,EACR,MAAM,EACN,eAAe,EACf,aAAa,EACb,YAAY,EACZ,MAAM,EACN,GAAG,IAAI,EACR,EAAE,uBAAuB,2CA8BzB;AAED,MAAM,WAAW,gBAAiB,SAAQ,oBAAoB;IAC5D,KAAK,EAAE,kBAAkB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC;IAC7C,aAAa,EAAE,0BAA0B,CAAC;IAC1C,QAAQ,EAAE,2BAA2B,CAAC;IACtC,aAAa,EAAE,gBAAgB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC;IACnD,SAAS,EAAE,OAAO,kBAAkB,CAAC;CACtC;AAED,eAAO,MAAM,wBAAwB,0EACyB,CAAC;AAE/D,eAAO,MAAM,qBAAqB,6IAA0C,CAAC"}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@react-navigation/bottom-tabs",
3
3
  "description": "Bottom tab navigator following iOS design guidelines",
4
- "version": "8.0.0-alpha.24",
4
+ "version": "8.0.0-alpha.26",
5
5
  "keywords": [
6
6
  "react-native-component",
7
7
  "react-component",
@@ -41,14 +41,12 @@
41
41
  "clean": "del lib"
42
42
  },
43
43
  "dependencies": {
44
- "@react-navigation/elements": "^3.0.0-alpha.22",
45
- "color": "^5.0.3"
44
+ "@react-navigation/elements": "^3.0.0-alpha.24"
46
45
  },
47
46
  "devDependencies": {
48
47
  "@jest/globals": "^30.3.0",
49
- "@react-navigation/native": "^8.0.0-alpha.19",
48
+ "@react-navigation/native": "^8.0.0-alpha.21",
50
49
  "@testing-library/react-native": "^13.3.3",
51
- "@types/color": "^4.2.0",
52
50
  "@types/react": "~19.2.2",
53
51
  "del-cli": "^7.0.0",
54
52
  "react": "19.2.0",
@@ -60,7 +58,7 @@
60
58
  "typescript": "^6.0.2"
61
59
  },
62
60
  "peerDependencies": {
63
- "@react-navigation/native": "^8.0.0-alpha.19",
61
+ "@react-navigation/native": "^8.0.0-alpha.21",
64
62
  "react": ">= 19.2.0",
65
63
  "react-native": "*",
66
64
  "react-native-safe-area-context": ">= 5.5.0",
@@ -84,5 +82,5 @@
84
82
  ]
85
83
  ]
86
84
  },
87
- "gitHead": "d7d3b8f648421eff0bf832ec9b2759651c12fc98"
85
+ "gitHead": "f8da528cd6e3920619bac910e24d5030a4ab7910"
88
86
  }
package/src/index.tsx CHANGED
@@ -11,6 +11,7 @@ export { SceneStyleInterpolators, TransitionPresets, TransitionSpecs };
11
11
  * Navigators
12
12
  */
13
13
  export {
14
+ type BottomTabTypeBag,
14
15
  createBottomTabNavigator,
15
16
  createBottomTabScreen,
16
17
  } from './navigators/createBottomTabNavigator';
package/src/navigators/createBottomTabNavigator.tsx CHANGED
@@ -1,23 +1,18 @@
1
1
  import {
2
2
  createNavigatorFactory,
3
+ createScreenFactory,
4
+ type NavigatorTypeBagBase,
3
5
  type ParamListBase,
4
- type StaticConfig,
5
- type StaticParamList,
6
- type StaticScreenConfig,
7
- type StaticScreenConfigLinking,
8
- type StaticScreenConfigScreen,
9
6
  type TabActionHelpers,
10
7
  type TabNavigationState,
11
8
  TabRouter,
12
9
  type TabRouterOptions,
13
- type TypedNavigator,
14
10
  useNavigationBuilder,
15
11
  } from '@react-navigation/native';
16
12
 
17
13
  import type {
18
14
  BottomTabNavigationEventMap,
19
15
  BottomTabNavigationOptions,
20
- BottomTabNavigationProp,
21
16
  BottomTabNavigatorProps,
22
17
  } from '../types';
23
18
  import { BottomTabView } from '../views/BottomTabViewCommon';
@@ -65,47 +60,15 @@ function BottomTabNavigator({
65
60
  );
66
61
  }
67
62
 
68
- type BottomTabTypeBag<ParamList extends {}> = {
69
- ParamList: ParamList;
70
- State: TabNavigationState<ParamList>;
63
+ export interface BottomTabTypeBag extends NavigatorTypeBagBase {
64
+ State: TabNavigationState<this['ParamList']>;
71
65
  ScreenOptions: BottomTabNavigationOptions;
72
66
  EventMap: BottomTabNavigationEventMap;
73
- NavigationList: {
74
- [RouteName in keyof ParamList]: BottomTabNavigationProp<
75
- ParamList,
76
- RouteName
77
- >;
78
- };
67
+ ActionHelpers: TabActionHelpers<this['ParamList']>;
79
68
  Navigator: typeof BottomTabNavigator;
80
- };
81
-
82
- export function createBottomTabNavigator<
83
- const ParamList extends ParamListBase,
84
- >(): TypedNavigator<BottomTabTypeBag<ParamList>, undefined>;
85
- export function createBottomTabNavigator<
86
- const Config extends StaticConfig<BottomTabTypeBag<ParamListBase>>,
87
- >(
88
- config: Config
89
- ): TypedNavigator<
90
- BottomTabTypeBag<StaticParamList<{ config: Config }>>,
91
- Config
92
- >;
93
- export function createBottomTabNavigator(config?: unknown) {
94
- return createNavigatorFactory(BottomTabNavigator)(config);
95
69
  }
96
70
 
97
- export function createBottomTabScreen<
98
- const Linking extends StaticScreenConfigLinking,
99
- const Screen extends StaticScreenConfigScreen,
100
- >(
101
- config: StaticScreenConfig<
102
- Linking,
103
- Screen,
104
- TabNavigationState<ParamListBase>,
105
- BottomTabNavigationOptions,
106
- BottomTabNavigationEventMap,
107
- BottomTabNavigationProp<ParamListBase>
108
- >
109
- ) {
110
- return config;
111
- }
71
+ export const createBottomTabNavigator =
72
+ createNavigatorFactory<BottomTabTypeBag>(BottomTabNavigator);
73
+
74
+ export const createBottomTabScreen = createScreenFactory<BottomTabTypeBag>();