@gtkx/navigation 1.5.0 → 2.0.0-beta.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.
package/README.md CHANGED
@@ -13,7 +13,7 @@
13
13
  <p align="center">
14
14
  <a href="https://www.npmjs.com/package/create-gtkx"><img src="https://img.shields.io/npm/v/create-gtkx?color=cb3837&logo=npm&label=create-gtkx" alt="npm version" /></a>
15
15
  <a href="https://www.npmjs.com/package/create-gtkx"><img src="https://img.shields.io/npm/dm/create-gtkx?color=cb3837&logo=npm&label=downloads" alt="npm downloads" /></a>
16
- <img src="https://img.shields.io/badge/node-%E2%89%A524-339933?logo=node.js&logoColor=white" alt="Node >= 24" />
16
+ <img src="https://img.shields.io/badge/node-%E2%89%A526.7-339933?logo=node.js&logoColor=white" alt="Node >= 26.7" />
17
17
  <a href="https://github.com/gtkx-org/gtkx/blob/main/LICENSE"><img src="https://img.shields.io/badge/license-MPL--2.0-blue.svg" alt="License: MPL-2.0" /></a>
18
18
  <a href="https://github.com/gtkx-org/gtkx/actions/workflows/ci.yml"><img src="https://img.shields.io/github/actions/workflow/status/gtkx-org/gtkx/ci.yml?branch=main&logo=github&label=CI" alt="CI status" /></a>
19
19
  <img src="https://img.shields.io/badge/TypeScript-strict-3178c6?logo=typescript&logoColor=white" alt="TypeScript" />
@@ -116,7 +116,7 @@ At runtime, the native Rust core calls straight into the system GTK4, Adwaita, a
116
116
 
117
117
  ## Quick start
118
118
 
119
- GTKX is Linux-only and needs Node.js 24 or later. See [Requirements](#requirements).
119
+ GTKX is Linux-only and needs Node.js 26.7 or later. See [Requirements](#requirements).
120
120
 
121
121
  Scaffold a new app with the `create-gtkx` initializer:
122
122
 
@@ -145,8 +145,8 @@ The documentation at **[gtkx.dev](https://gtkx.dev)** includes a step-by-step tu
145
145
 
146
146
  GTKX is Linux-only. You need:
147
147
 
148
- - Linux with the GTK4 (4.20 or later) and GLib development libraries, plus Adwaita (1.8 or later) once your project binds `Adw-1`
149
- - Node.js 24 or later
148
+ - Linux with the GTK4 (4.20 or later), Adwaita (1.8 or later), and GLib development libraries
149
+ - Node.js 26.7 or later
150
150
 
151
151
  The `@gtkx/native` addon ships prebuilt for x64 and arm64 glibc Linux; other targets need to build it from the GTKX repository, which requires a Rust toolchain.
152
152
 
@@ -167,7 +167,7 @@ GTKX is stable and ready for production use.
167
167
 
168
168
  ## Contributing
169
169
 
170
- Contributions are welcome. See [CONTRIBUTING.md](https://github.com/gtkx-org/gtkx/blob/main/CONTRIBUTING.md), the [Code of Conduct](https://github.com/gtkx-org/gtkx/blob/main/CODE_OF_CONDUCT.md), and the [security policy](https://github.com/gtkx-org/gtkx/blob/main/SECURITY.md). Building the repo needs Node.js 24 or later, pnpm, and a Rust toolchain.
170
+ Contributions are welcome. See [CONTRIBUTING.md](https://github.com/gtkx-org/gtkx/blob/main/CONTRIBUTING.md), the [Code of Conduct](https://github.com/gtkx-org/gtkx/blob/main/CODE_OF_CONDUCT.md), and the [security policy](https://github.com/gtkx-org/gtkx/blob/main/SECURITY.md). Building the repo needs Node.js 26.7 or later, pnpm, and a Rust toolchain.
171
171
 
172
172
  ## License
173
173
 
@@ -1 +1 @@
1
- {"version":3,"file":"create-drawer-navigator.d.ts","sourceRoot":"","sources":["../../src/drawer/create-drawer-navigator.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAER,qBAAqB,EAErB,oBAAoB,EACpB,aAAa,EACb,YAAY,EACZ,mBAAmB,EACnB,cAAc,EACjB,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAIvC,OAAO,KAAK,EACR,wBAAwB,EACxB,uBAAuB,EACvB,oBAAoB,EACpB,oBAAoB,EACvB,MAAM,YAAY,CAAC;AAIpB,iFAAiF;AACjF,KAAK,aAAa,CACd,SAAS,SAAS,aAAa,GAAG,aAAa,EAC/C,WAAW,SAAS,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,IAC3D;IACA,oCAAoC;IACpC,SAAS,EAAE,SAAS,CAAC;IACrB,6BAA6B;IAC7B,WAAW,EAAE,WAAW,CAAC;IACzB,oCAAoC;IACpC,KAAK,EAAE,qBAAqB,CAAC,SAAS,CAAC,CAAC;IACxC,0BAA0B;IAC1B,aAAa,EAAE,uBAAuB,CAAC;IACvC,kCAAkC;IAClC,QAAQ,EAAE,wBAAwB,CAAC;IACnC,mCAAmC;IACnC,cAAc,EAAE;SACX,SAAS,IAAI,MAAM,SAAS,GAAG,oBAAoB,CAAC,SAAS,EAAE,SAAS,EAAE,WAAW,CAAC;KAC1F,CAAC;IACF,+BAA+B;IAC/B,SAAS,EAAE,OAAO,eAAe,CAAC;CACrC,CAAC;AAEF,sFAAsF;AACtF,QAAA,MAAM,kBAAkB,EAAE,mBAAmB,CAAC,aAAa,CAAwC,CAAC;AAapG,2GAA2G;AAC3G,iBAAS,eAAe,CAAC,EACrB,aAAa,EACb,SAAS,EACT,eAAe,EACf,UAAU,EACV,eAAe,EACf,eAAe,EACf,oBAAoB,EACpB,aAAa,EACb,GAAG,OAAO,EACb,EAAE,oBAAoB,GAAG,SAAS,CA2BlC;AAED,wHAAwH;AACxH,iBAAS,qBAAqB,CAC1B,KAAK,CAAC,SAAS,SAAS,aAAa,EACrC,KAAK,CAAC,WAAW,SAAS,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,EACjE,KAAK,CAAC,OAAO,SAAS,oBAAoB,GAAG,aAAa,CAAC,SAAS,EAAE,WAAW,CAAC,EAClF,KAAK,CAAC,MAAM,SAAS,YAAY,CAAC,OAAO,CAAC,GAAG,SAAS,GAAG,SAAS,EACpE,MAAM,CAAC,EAAE,MAAM,GAAG,cAAc,CAAC,OAAO,EAAE,MAAM,CAAC,CAElD;AAcD,OAAO,EAAE,qBAAqB,EAAE,kBAAkB,EAAE,eAAe,EAAE,KAAK,aAAa,EAAE,CAAC"}
1
+ {"version":3,"file":"create-drawer-navigator.d.ts","sourceRoot":"","sources":["../../src/drawer/create-drawer-navigator.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAER,qBAAqB,EAErB,oBAAoB,EACpB,aAAa,EACb,YAAY,EACZ,mBAAmB,EACnB,cAAc,EACjB,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAIvC,OAAO,KAAK,EACR,wBAAwB,EACxB,uBAAuB,EACvB,oBAAoB,EACpB,oBAAoB,EACvB,MAAM,YAAY,CAAC;AAIpB,iFAAiF;AACjF,KAAK,aAAa,CACd,SAAS,SAAS,aAAa,GAAG,aAAa,EAC/C,WAAW,SAAS,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,IAC3D;IACA,oCAAoC;IACpC,SAAS,EAAE,SAAS,CAAC;IACrB,6BAA6B;IAC7B,WAAW,EAAE,WAAW,CAAC;IACzB,oCAAoC;IACpC,KAAK,EAAE,qBAAqB,CAAC,SAAS,CAAC,CAAC;IACxC,0BAA0B;IAC1B,aAAa,EAAE,uBAAuB,CAAC;IACvC,kCAAkC;IAClC,QAAQ,EAAE,wBAAwB,CAAC;IACnC,mCAAmC;IACnC,cAAc,EAAE;SACX,SAAS,IAAI,MAAM,SAAS,GAAG,oBAAoB,CAAC,SAAS,EAAE,SAAS,EAAE,WAAW,CAAC;KAC1F,CAAC;IACF,+BAA+B;IAC/B,SAAS,EAAE,OAAO,eAAe,CAAC;CACrC,CAAC;AAEF,sFAAsF;AACtF,QAAA,MAAM,kBAAkB,EAAE,mBAAmB,CAAC,aAAa,CAAwC,CAAC;AAuBpG,2GAA2G;AAC3G,iBAAS,eAAe,CAAC,EACrB,aAAa,EACb,SAAS,EACT,eAAe,EACf,UAAU,EACV,eAAe,EACf,eAAe,EACf,oBAAoB,EACpB,aAAa,EACb,GAAG,OAAO,EACb,EAAE,oBAAoB,GAAG,SAAS,CA2BlC;AAED,wHAAwH;AACxH,iBAAS,qBAAqB,CAC1B,KAAK,CAAC,SAAS,SAAS,aAAa,EACrC,KAAK,CAAC,WAAW,SAAS,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,EACjE,KAAK,CAAC,OAAO,SAAS,oBAAoB,GAAG,aAAa,CAAC,SAAS,EAAE,WAAW,CAAC,EAClF,KAAK,CAAC,MAAM,SAAS,YAAY,CAAC,OAAO,CAAC,GAAG,SAAS,GAAG,SAAS,EACpE,MAAM,CAAC,EAAE,MAAM,GAAG,cAAc,CAAC,OAAO,EAAE,MAAM,CAAC,CAElD;AAED,OAAO,EAAE,qBAAqB,EAAE,kBAAkB,EAAE,eAAe,EAAE,KAAK,aAAa,EAAE,CAAC"}
@@ -6,8 +6,16 @@ import { DrawerView } from "./drawer-view.js";
6
6
  /** Declares a typed screen of a drawer navigator for the static configuration API. */
7
7
  const createDrawerScreen = createScreenFactory();
8
8
  const useDrawerRouter = (isCollapsed) => {
9
- const [flag] = useState(() => new CollapsedFlag(isCollapsed));
10
- const [createRouter] = useState(() => createDrawerRouter(() => flag.isCollapsed));
9
+ const [flag] = useState(() => {
10
+ let isCurrent = isCollapsed;
11
+ return {
12
+ read: () => isCurrent,
13
+ update: (isNext) => {
14
+ isCurrent = isNext;
15
+ },
16
+ };
17
+ });
18
+ const [createRouter] = useState(() => createDrawerRouter(flag.read));
11
19
  useEffect(() => {
12
20
  flag.update(isCollapsed);
13
21
  }, [flag, isCollapsed]);
@@ -23,14 +31,5 @@ function DrawerNavigator({ drawerContent, collapsed, sidebarPosition, pinSidebar
23
31
  function createDrawerNavigator(config) {
24
32
  return createNavigatorFactory(DrawerNavigator)(config);
25
33
  }
26
- class CollapsedFlag {
27
- isCollapsed;
28
- constructor(isCollapsed) {
29
- this.isCollapsed = isCollapsed;
30
- }
31
- update(isCollapsed) {
32
- this.isCollapsed = isCollapsed;
33
- }
34
- }
35
34
  export { createDrawerNavigator, createDrawerScreen, DrawerNavigator };
36
35
  //# sourceMappingURL=create-drawer-navigator.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"create-drawer-navigator.js","sourceRoot":"","sources":["../../src/drawer/create-drawer-navigator.tsx"],"names":[],"mappings":";AAWA,OAAO,EAAE,sBAAsB,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC3G,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAQ5C,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAyB9C,sFAAsF;AACtF,MAAM,kBAAkB,GAAuC,mBAAmB,EAAiB,CAAC;AAEpG,MAAM,eAAe,GAAG,CAAC,WAAoB,EAAuB,EAAE;IAClE,MAAM,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,GAAG,EAAE,CAAC,IAAI,aAAa,CAAC,WAAW,CAAC,CAAC,CAAC;IAC9D,MAAM,CAAC,YAAY,CAAC,GAAG,QAAQ,CAAC,GAAG,EAAE,CAAC,kBAAkB,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC;IAElF,SAAS,CAAC,GAAG,EAAE;QACX,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IAC7B,CAAC,EAAE,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC;IAExB,OAAO,YAAY,CAAC;AACxB,CAAC,CAAC;AAEF,2GAA2G;AAC3G,SAAS,eAAe,CAAC,EACrB,aAAa,EACb,SAAS,EACT,eAAe,EACf,UAAU,EACV,eAAe,EACf,eAAe,EACf,oBAAoB,EACpB,aAAa,EACb,GAAG,OAAO,EACS;IACnB,MAAM,YAAY,GAAG,eAAe,CAAC,SAAS,KAAK,IAAI,CAAC,CAAC;IAEzD,MAAM,EAAE,KAAK,EAAE,WAAW,EAAE,UAAU,EAAE,iBAAiB,EAAE,GAAG,oBAAoB,CAMhF,YAAY,EAAE,EAAE,GAAG,OAAO,EAAE,aAAa,EAAE,aAAa,IAAI,CAAC,SAAS,KAAK,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IAE1G,OAAO,CACH,KAAC,iBAAiB,cACd,KAAC,UAAU,IACP,KAAK,EAAE,KAAK,EACZ,UAAU,EAAE,UAAU,EACtB,WAAW,EAAE,WAAW,EACxB,aAAa,EAAE,aAAa,EAC5B,SAAS,EAAE,SAAS,EACpB,eAAe,EAAE,eAAe,EAChC,UAAU,EAAE,UAAU,EACtB,eAAe,EAAE,eAAe,EAChC,eAAe,EAAE,eAAe,EAChC,oBAAoB,EAAE,oBAAoB,GAC5C,GACc,CACvB,CAAC;AACN,CAAC;AAED,wHAAwH;AACxH,SAAS,qBAAqB,CAK5B,MAAe;IACb,OAAO,sBAAsB,CAAC,eAAe,CAAC,CAAC,MAAM,CAAoC,CAAC;AAC9F,CAAC;AAED,MAAM,aAAa;IACf,WAAW,CAAU;IAErB,YAAY,WAAoB;QAC5B,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;IACnC,CAAC;IAED,MAAM,CAAC,WAAoB;QACvB,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;IACnC,CAAC;CACJ;AAED,OAAO,EAAE,qBAAqB,EAAE,kBAAkB,EAAE,eAAe,EAAsB,CAAC","sourcesContent":["import type {\n DrawerActionHelpers,\n DrawerNavigationState,\n DrawerRouterOptions,\n NavigatorTypeBagBase,\n ParamListBase,\n StaticConfig,\n StaticScreenFactory,\n TypedNavigator,\n} from \"@react-navigation/core\";\nimport type { ReactNode } from \"react\";\nimport { createNavigatorFactory, createScreenFactory, useNavigationBuilder } from \"@react-navigation/core\";\nimport { useEffect, useState } from \"react\";\nimport type { DrawerRouterFactory } from \"./drawer-router.js\";\nimport type {\n DrawerNavigationEventMap,\n DrawerNavigationOptions,\n DrawerNavigationProp,\n DrawerNavigatorProps,\n} from \"./types.js\";\nimport { createDrawerRouter } from \"./drawer-router.js\";\nimport { DrawerView } from \"./drawer-view.js\";\n\n/** Type bag describing the drawer navigator to React Navigation's typed APIs. */\ntype DrawerTypeBag<\n ParamList extends ParamListBase = ParamListBase,\n NavigatorID extends string | undefined = string | undefined,\n> = {\n /** Route names and their params. */\n ParamList: ParamList;\n /** Optional navigator id. */\n NavigatorID: NavigatorID;\n /** Shape of the navigator state. */\n State: DrawerNavigationState<ParamList>;\n /** Per-screen options. */\n ScreenOptions: DrawerNavigationOptions;\n /** Events the navigator emits. */\n EventMap: DrawerNavigationEventMap;\n /** Navigation object per route. */\n NavigationList: {\n [RouteName in keyof ParamList]: DrawerNavigationProp<ParamList, RouteName, NavigatorID>;\n };\n /** The navigator component. */\n Navigator: typeof DrawerNavigator;\n};\n\n/** Declares a typed screen of a drawer navigator for the static configuration API. */\nconst createDrawerScreen: StaticScreenFactory<DrawerTypeBag> = createScreenFactory<DrawerTypeBag>();\n\nconst useDrawerRouter = (isCollapsed: boolean): DrawerRouterFactory => {\n const [flag] = useState(() => new CollapsedFlag(isCollapsed));\n const [createRouter] = useState(() => createDrawerRouter(() => flag.isCollapsed));\n\n useEffect(() => {\n flag.update(isCollapsed);\n }, [flag, isCollapsed]);\n\n return createRouter;\n};\n\n/** Renders the screens of a {@link createDrawerNavigator} beside a sidebar in an `AdwOverlaySplitView`. */\nfunction DrawerNavigator({\n drawerContent,\n collapsed,\n sidebarPosition,\n pinSidebar,\n minSidebarWidth,\n maxSidebarWidth,\n sidebarWidthFraction,\n defaultStatus,\n ...options\n}: DrawerNavigatorProps): ReactNode {\n const createRouter = useDrawerRouter(collapsed === true);\n\n const { state, descriptors, navigation, NavigationContent } = useNavigationBuilder<\n DrawerNavigationState<ParamListBase>,\n DrawerRouterOptions,\n DrawerActionHelpers<ParamListBase>,\n DrawerNavigationOptions,\n DrawerNavigationEventMap\n >(createRouter, { ...options, defaultStatus: defaultStatus ?? (collapsed === true ? \"closed\" : \"open\") });\n\n return (\n <NavigationContent>\n <DrawerView\n state={state}\n navigation={navigation}\n descriptors={descriptors}\n drawerContent={drawerContent}\n collapsed={collapsed}\n sidebarPosition={sidebarPosition}\n pinSidebar={pinSidebar}\n minSidebarWidth={minSidebarWidth}\n maxSidebarWidth={maxSidebarWidth}\n sidebarWidthFraction={sidebarWidthFraction}\n />\n </NavigationContent>\n );\n}\n\n/** Creates a drawer navigator rendered with `AdwOverlaySplitView`: a sidebar listing the screens beside the content. */\nfunction createDrawerNavigator<\n const ParamList extends ParamListBase,\n const NavigatorID extends string | undefined = string | undefined,\n const TypeBag extends NavigatorTypeBagBase = DrawerTypeBag<ParamList, NavigatorID>,\n const Config extends StaticConfig<TypeBag> | undefined = undefined,\n>(config?: Config): TypedNavigator<TypeBag, Config> {\n return createNavigatorFactory(DrawerNavigator)(config) as TypedNavigator<TypeBag, Config>;\n}\n\nclass CollapsedFlag {\n isCollapsed: boolean;\n\n constructor(isCollapsed: boolean) {\n this.isCollapsed = isCollapsed;\n }\n\n update(isCollapsed: boolean): void {\n this.isCollapsed = isCollapsed;\n }\n}\n\nexport { createDrawerNavigator, createDrawerScreen, DrawerNavigator, type DrawerTypeBag };\n"]}
1
+ {"version":3,"file":"create-drawer-navigator.js","sourceRoot":"","sources":["../../src/drawer/create-drawer-navigator.tsx"],"names":[],"mappings":";AAWA,OAAO,EAAE,sBAAsB,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC3G,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAQ5C,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAyB9C,sFAAsF;AACtF,MAAM,kBAAkB,GAAuC,mBAAmB,EAAiB,CAAC;AAEpG,MAAM,eAAe,GAAG,CAAC,WAAoB,EAAuB,EAAE;IAClE,MAAM,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,GAAG,EAAE;QACzB,IAAI,SAAS,GAAG,WAAW,CAAC;QAE5B,OAAO;YACH,IAAI,EAAE,GAAG,EAAE,CAAC,SAAS;YACrB,MAAM,EAAE,CAAC,MAAe,EAAE,EAAE;gBACxB,SAAS,GAAG,MAAM,CAAC;YACvB,CAAC;SACJ,CAAC;IACN,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,YAAY,CAAC,GAAG,QAAQ,CAAC,GAAG,EAAE,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IAErE,SAAS,CAAC,GAAG,EAAE;QACX,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IAC7B,CAAC,EAAE,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC;IAExB,OAAO,YAAY,CAAC;AACxB,CAAC,CAAC;AAEF,2GAA2G;AAC3G,SAAS,eAAe,CAAC,EACrB,aAAa,EACb,SAAS,EACT,eAAe,EACf,UAAU,EACV,eAAe,EACf,eAAe,EACf,oBAAoB,EACpB,aAAa,EACb,GAAG,OAAO,EACS;IACnB,MAAM,YAAY,GAAG,eAAe,CAAC,SAAS,KAAK,IAAI,CAAC,CAAC;IAEzD,MAAM,EAAE,KAAK,EAAE,WAAW,EAAE,UAAU,EAAE,iBAAiB,EAAE,GAAG,oBAAoB,CAMhF,YAAY,EAAE,EAAE,GAAG,OAAO,EAAE,aAAa,EAAE,aAAa,IAAI,CAAC,SAAS,KAAK,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IAE1G,OAAO,CACH,KAAC,iBAAiB,cACd,KAAC,UAAU,IACP,KAAK,EAAE,KAAK,EACZ,UAAU,EAAE,UAAU,EACtB,WAAW,EAAE,WAAW,EACxB,aAAa,EAAE,aAAa,EAC5B,SAAS,EAAE,SAAS,EACpB,eAAe,EAAE,eAAe,EAChC,UAAU,EAAE,UAAU,EACtB,eAAe,EAAE,eAAe,EAChC,eAAe,EAAE,eAAe,EAChC,oBAAoB,EAAE,oBAAoB,GAC5C,GACc,CACvB,CAAC;AACN,CAAC;AAED,wHAAwH;AACxH,SAAS,qBAAqB,CAK5B,MAAe;IACb,OAAO,sBAAsB,CAAC,eAAe,CAAC,CAAC,MAAM,CAAoC,CAAC;AAC9F,CAAC;AAED,OAAO,EAAE,qBAAqB,EAAE,kBAAkB,EAAE,eAAe,EAAsB,CAAC","sourcesContent":["import type {\n DrawerActionHelpers,\n DrawerNavigationState,\n DrawerRouterOptions,\n NavigatorTypeBagBase,\n ParamListBase,\n StaticConfig,\n StaticScreenFactory,\n TypedNavigator,\n} from \"@react-navigation/core\";\nimport type { ReactNode } from \"react\";\nimport { createNavigatorFactory, createScreenFactory, useNavigationBuilder } from \"@react-navigation/core\";\nimport { useEffect, useState } from \"react\";\nimport type { DrawerRouterFactory } from \"./drawer-router.js\";\nimport type {\n DrawerNavigationEventMap,\n DrawerNavigationOptions,\n DrawerNavigationProp,\n DrawerNavigatorProps,\n} from \"./types.js\";\nimport { createDrawerRouter } from \"./drawer-router.js\";\nimport { DrawerView } from \"./drawer-view.js\";\n\n/** Type bag describing the drawer navigator to React Navigation's typed APIs. */\ntype DrawerTypeBag<\n ParamList extends ParamListBase = ParamListBase,\n NavigatorID extends string | undefined = string | undefined,\n> = {\n /** Route names and their params. */\n ParamList: ParamList;\n /** Optional navigator id. */\n NavigatorID: NavigatorID;\n /** Shape of the navigator state. */\n State: DrawerNavigationState<ParamList>;\n /** Per-screen options. */\n ScreenOptions: DrawerNavigationOptions;\n /** Events the navigator emits. */\n EventMap: DrawerNavigationEventMap;\n /** Navigation object per route. */\n NavigationList: {\n [RouteName in keyof ParamList]: DrawerNavigationProp<ParamList, RouteName, NavigatorID>;\n };\n /** The navigator component. */\n Navigator: typeof DrawerNavigator;\n};\n\n/** Declares a typed screen of a drawer navigator for the static configuration API. */\nconst createDrawerScreen: StaticScreenFactory<DrawerTypeBag> = createScreenFactory<DrawerTypeBag>();\n\nconst useDrawerRouter = (isCollapsed: boolean): DrawerRouterFactory => {\n const [flag] = useState(() => {\n let isCurrent = isCollapsed;\n\n return {\n read: () => isCurrent,\n update: (isNext: boolean) => {\n isCurrent = isNext;\n },\n };\n });\n\n const [createRouter] = useState(() => createDrawerRouter(flag.read));\n\n useEffect(() => {\n flag.update(isCollapsed);\n }, [flag, isCollapsed]);\n\n return createRouter;\n};\n\n/** Renders the screens of a {@link createDrawerNavigator} beside a sidebar in an `AdwOverlaySplitView`. */\nfunction DrawerNavigator({\n drawerContent,\n collapsed,\n sidebarPosition,\n pinSidebar,\n minSidebarWidth,\n maxSidebarWidth,\n sidebarWidthFraction,\n defaultStatus,\n ...options\n}: DrawerNavigatorProps): ReactNode {\n const createRouter = useDrawerRouter(collapsed === true);\n\n const { state, descriptors, navigation, NavigationContent } = useNavigationBuilder<\n DrawerNavigationState<ParamListBase>,\n DrawerRouterOptions,\n DrawerActionHelpers<ParamListBase>,\n DrawerNavigationOptions,\n DrawerNavigationEventMap\n >(createRouter, { ...options, defaultStatus: defaultStatus ?? (collapsed === true ? \"closed\" : \"open\") });\n\n return (\n <NavigationContent>\n <DrawerView\n state={state}\n navigation={navigation}\n descriptors={descriptors}\n drawerContent={drawerContent}\n collapsed={collapsed}\n sidebarPosition={sidebarPosition}\n pinSidebar={pinSidebar}\n minSidebarWidth={minSidebarWidth}\n maxSidebarWidth={maxSidebarWidth}\n sidebarWidthFraction={sidebarWidthFraction}\n />\n </NavigationContent>\n );\n}\n\n/** Creates a drawer navigator rendered with `AdwOverlaySplitView`: a sidebar listing the screens beside the content. */\nfunction createDrawerNavigator<\n const ParamList extends ParamListBase,\n const NavigatorID extends string | undefined = string | undefined,\n const TypeBag extends NavigatorTypeBagBase = DrawerTypeBag<ParamList, NavigatorID>,\n const Config extends StaticConfig<TypeBag> | undefined = undefined,\n>(config?: Config): TypedNavigator<TypeBag, Config> {\n return createNavigatorFactory(DrawerNavigator)(config) as TypedNavigator<TypeBag, Config>;\n}\n\nexport { createDrawerNavigator, createDrawerScreen, DrawerNavigator, type DrawerTypeBag };\n"]}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@gtkx/navigation",
3
- "version": "1.5.0",
3
+ "version": "2.0.0-beta.1",
4
4
  "description": "React Navigation for GTKX: stack, tab, drawer and master/detail navigators rendered with libadwaita's navigation view, view stack and split views",
5
5
  "keywords": [
6
6
  "gtkx",
@@ -29,6 +29,8 @@
29
29
  "./package.json": "./package.json",
30
30
  ".": {
31
31
  "types": "./dist/index.d.ts",
32
+ "import": "./dist/index.js",
33
+ "require": null,
32
34
  "default": "./dist/index.js"
33
35
  }
34
36
  },
@@ -48,21 +50,21 @@
48
50
  }
49
51
  },
50
52
  "engines": {
51
- "node": ">=24"
53
+ "node": ">=26.7.0"
52
54
  },
53
55
  "dependencies": {
56
+ "@gtkx/react": "2.0.0-beta.1",
54
57
  "@react-navigation/core": "^7.21.13",
55
- "@react-navigation/routers": "^7.6.4",
56
- "@gtkx/react": "1.5.0"
58
+ "@react-navigation/routers": "^7.6.4"
57
59
  },
58
60
  "peerDependencies": {
59
61
  "react": "^19.2"
60
62
  },
61
63
  "devDependencies": {
62
- "vitest": "^4.1.11",
63
- "@gtkx/config": "1.5.0",
64
- "@gtkx/testing": "1.5.0",
65
- "@gtkx/vitest": "1.5.0"
64
+ "@gtkx/config": "2.0.0-beta.1",
65
+ "@gtkx/testing": "2.0.0-beta.1",
66
+ "@gtkx/vitest": "2.0.0-beta.1",
67
+ "vitest": "^4.1.11"
66
68
  },
67
69
  "scripts": {
68
70
  "release": "tsx ../../scripts/release-package.ts"
@@ -48,8 +48,18 @@ type DrawerTypeBag<
48
48
  const createDrawerScreen: StaticScreenFactory<DrawerTypeBag> = createScreenFactory<DrawerTypeBag>();
49
49
 
50
50
  const useDrawerRouter = (isCollapsed: boolean): DrawerRouterFactory => {
51
- const [flag] = useState(() => new CollapsedFlag(isCollapsed));
52
- const [createRouter] = useState(() => createDrawerRouter(() => flag.isCollapsed));
51
+ const [flag] = useState(() => {
52
+ let isCurrent = isCollapsed;
53
+
54
+ return {
55
+ read: () => isCurrent,
56
+ update: (isNext: boolean) => {
57
+ isCurrent = isNext;
58
+ },
59
+ };
60
+ });
61
+
62
+ const [createRouter] = useState(() => createDrawerRouter(flag.read));
53
63
 
54
64
  useEffect(() => {
55
65
  flag.update(isCollapsed);
@@ -108,16 +118,4 @@ function createDrawerNavigator<
108
118
  return createNavigatorFactory(DrawerNavigator)(config) as TypedNavigator<TypeBag, Config>;
109
119
  }
110
120
 
111
- class CollapsedFlag {
112
- isCollapsed: boolean;
113
-
114
- constructor(isCollapsed: boolean) {
115
- this.isCollapsed = isCollapsed;
116
- }
117
-
118
- update(isCollapsed: boolean): void {
119
- this.isCollapsed = isCollapsed;
120
- }
121
- }
122
-
123
121
  export { createDrawerNavigator, createDrawerScreen, DrawerNavigator, type DrawerTypeBag };