@baukit/navigation 0.7.3 → 0.7.4
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 +8 -0
- package/dist/index.d.ts +19 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +29 -4
- package/dist/index.js.map +1 -1
- package/dist/native.d.ts +1 -1
- package/dist/native.d.ts.map +1 -1
- package/dist/native.js +88 -26
- package/dist/native.js.map +1 -1
- package/dist/web.css +1 -1
- package/package.json +3 -3
- package/src/index.test.ts +36 -3
- package/src/index.ts +52 -5
- package/src/native.test.tsx +122 -7
- package/src/native.tsx +129 -23
- package/src/web.browser.test.tsx +17 -0
- package/src/web.css +1 -1
package/README.md
CHANGED
|
@@ -125,6 +125,14 @@ trigger and above the compact bottom bar. Long sections scroll inside that
|
|
|
125
125
|
space. It updates the limit when the viewport, content layout, or scroll
|
|
126
126
|
position changes.
|
|
127
127
|
|
|
128
|
+
For compact native content, `useNavigationBarHeight(bottomInset, theme)` reserves
|
|
129
|
+
space using the current font scale and the bar's typography and spacing. Pass the
|
|
130
|
+
same theme as `AppNavigation` when you customize it. The default height is 75 dp
|
|
131
|
+
before the bottom inset. `getNavigationBarHeight(fontScale, bottomInset, metrics)`
|
|
132
|
+
provides the same calculation without a hook. Its optional metrics are `spacing`,
|
|
133
|
+
`fontSize` and `lineHeight`. `NAVIGATION_DIMENSIONS.nativeBar` is the default native
|
|
134
|
+
height; `bar` remains the 64-pixel DOM height.
|
|
135
|
+
|
|
128
136
|
Keep route-heading focus in the product. Use
|
|
129
137
|
`createRouteFocusController` from `@baukit/a11y-core/web` for DOM route changes,
|
|
130
138
|
and the product's screen-transition adapter on native. Navigation does not know
|
package/dist/index.d.ts
CHANGED
|
@@ -44,15 +44,33 @@ export interface ActiveNavigation<Icon = unknown> {
|
|
|
44
44
|
readonly item: NavigationItem<Icon> | null;
|
|
45
45
|
readonly subItem: NavigationSubItem<Icon> | null;
|
|
46
46
|
}
|
|
47
|
+
export declare const NAVIGATION_BAR_DIMENSIONS: {
|
|
48
|
+
readonly avatar: 28;
|
|
49
|
+
readonly icon: 24;
|
|
50
|
+
readonly border: 1;
|
|
51
|
+
readonly targetBorder: 3;
|
|
52
|
+
readonly targetPadding: 8;
|
|
53
|
+
readonly labelFontSize: 11;
|
|
54
|
+
readonly labelLineHeight: 16;
|
|
55
|
+
readonly spacing: 8;
|
|
56
|
+
};
|
|
57
|
+
export interface NavigationBarMetrics {
|
|
58
|
+
readonly spacing?: number;
|
|
59
|
+
readonly fontSize?: number;
|
|
60
|
+
readonly lineHeight?: number;
|
|
61
|
+
}
|
|
62
|
+
export declare function getNavigationBarLineHeight(metrics?: NavigationBarMetrics): number;
|
|
63
|
+
export declare function getNavigationBarVisualHeight(fontScale?: number): number;
|
|
64
|
+
export declare function getNavigationBarHeight(fontScale?: number, bottomInset?: number, metrics?: NavigationBarMetrics): number;
|
|
47
65
|
export declare const NAVIGATION_DIMENSIONS: {
|
|
48
66
|
readonly avatar: 28;
|
|
49
67
|
readonly rail: 280;
|
|
50
68
|
readonly collapsedRail: 76;
|
|
51
69
|
readonly bar: 64;
|
|
70
|
+
readonly nativeBar: number;
|
|
52
71
|
readonly target: 44;
|
|
53
72
|
readonly androidTarget: 48;
|
|
54
73
|
};
|
|
55
|
-
export declare function getNavigationBarHeight(fontScale?: number, bottomInset?: number): number;
|
|
56
74
|
export declare function getNavigationLayout(width: number): 'bar' | 'rail';
|
|
57
75
|
export declare function navigationMatches(item: NavigationSubItem, pathname: string): boolean;
|
|
58
76
|
export declare function resolveActiveMenuEntry(entries: readonly NavigationProfileMenuEntry[], pathname: string): NavigationProfileMenuEntry | null;
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAEvC,MAAM,WAAW,iBAAiB,CAAC,IAAI,GAAG,OAAO;IAC/C,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC;IACrB,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC;CAClD;AAED,MAAM,WAAW,cAAc,CAAC,IAAI,GAAG,OAAO,CAAE,SAAQ,iBAAiB,CAAC,IAAI,CAAC;IAC7E,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC;IACpB,QAAQ,CAAC,QAAQ,CAAC,EAAE,SAAS,iBAAiB,CAAC,IAAI,CAAC,EAAE,CAAC;CACxD;AAED,MAAM,MAAM,0BAA0B,GAAG;IACvC,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;CAC7B,GAAG,CACA;IACE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC;IACjD,QAAQ,CAAC,QAAQ,CAAC,EAAE,KAAK,CAAC;CAC3B,GACD;IAAE,QAAQ,CAAC,QAAQ,EAAE,MAAM,IAAI,CAAC;IAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,KAAK,CAAA;CAAE,CAC3D,CAAC;AAEF,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IACzB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC9B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,qBAAqB,KAAK,SAAS,CAAC;CACrE,GAAG,CACA;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,KAAK,CAAA;CAAE,GAChD;IAAE,QAAQ,CAAC,IAAI,EAAE,SAAS,0BAA0B,EAAE,CAAC;IAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,KAAK,CAAA;CAAE,CAClF,CAAC;AAEF,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,iBAAiB,GAAG,MAAM,CAI5E;AAED,MAAM,WAAW,gBAAgB,CAAC,IAAI,GAAG,OAAO;IAC9C,QAAQ,CAAC,IAAI,EAAE,cAAc,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IAC3C,QAAQ,CAAC,OAAO,EAAE,iBAAiB,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;CAClD;AAED,eAAO,MAAM,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/dist/index.js
CHANGED
|
@@ -4,17 +4,42 @@ export function getNavigationProfileLabel(profile) {
|
|
|
4
4
|
? profile.label
|
|
5
5
|
: `${profile.label}, ${profile.subtitle}`;
|
|
6
6
|
}
|
|
7
|
-
export const
|
|
7
|
+
export const NAVIGATION_BAR_DIMENSIONS = {
|
|
8
8
|
avatar: 28,
|
|
9
|
+
icon: 24,
|
|
10
|
+
border: 1,
|
|
11
|
+
targetBorder: 3,
|
|
12
|
+
targetPadding: 8,
|
|
13
|
+
labelFontSize: 11,
|
|
14
|
+
labelLineHeight: 16,
|
|
15
|
+
spacing: 8,
|
|
16
|
+
};
|
|
17
|
+
export function getNavigationBarLineHeight(metrics = {}) {
|
|
18
|
+
return (metrics.lineHeight ??
|
|
19
|
+
Math.ceil((metrics.fontSize ?? NAVIGATION_BAR_DIMENSIONS.labelFontSize) *
|
|
20
|
+
(NAVIGATION_BAR_DIMENSIONS.labelLineHeight / NAVIGATION_BAR_DIMENSIONS.labelFontSize)));
|
|
21
|
+
}
|
|
22
|
+
export function getNavigationBarVisualHeight(fontScale = 1) {
|
|
23
|
+
return Math.max(NAVIGATION_BAR_DIMENSIONS.avatar, NAVIGATION_BAR_DIMENSIONS.icon * Math.max(1, fontScale));
|
|
24
|
+
}
|
|
25
|
+
export function getNavigationBarHeight(fontScale = 1, bottomInset = 0, metrics = {}) {
|
|
26
|
+
const scale = Math.max(1, fontScale);
|
|
27
|
+
return (NAVIGATION_BAR_DIMENSIONS.border +
|
|
28
|
+
2 * (NAVIGATION_BAR_DIMENSIONS.targetBorder + NAVIGATION_BAR_DIMENSIONS.targetPadding) +
|
|
29
|
+
getNavigationBarVisualHeight(scale) +
|
|
30
|
+
(metrics.spacing ?? NAVIGATION_BAR_DIMENSIONS.spacing) +
|
|
31
|
+
getNavigationBarLineHeight(metrics) * scale +
|
|
32
|
+
bottomInset);
|
|
33
|
+
}
|
|
34
|
+
export const NAVIGATION_DIMENSIONS = {
|
|
35
|
+
avatar: NAVIGATION_BAR_DIMENSIONS.avatar,
|
|
9
36
|
rail: 280,
|
|
10
37
|
collapsedRail: 76,
|
|
11
38
|
bar: 64,
|
|
39
|
+
nativeBar: getNavigationBarHeight(),
|
|
12
40
|
target: 44,
|
|
13
41
|
androidTarget: 48,
|
|
14
42
|
};
|
|
15
|
-
export function getNavigationBarHeight(fontScale = 1, bottomInset = 0) {
|
|
16
|
-
return NAVIGATION_DIMENSIONS.bar * Math.max(1, fontScale) + bottomInset;
|
|
17
|
-
}
|
|
18
43
|
export function getNavigationLayout(width) {
|
|
19
44
|
return getLayoutMode(width, { medium: 600, expanded: 1024 }) === 'expanded' ? 'rail' : 'bar';
|
|
20
45
|
}
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AA6ClD,MAAM,UAAU,yBAAyB,CAAC,OAA0B;IAClE,OAAO,OAAO,CAAC,QAAQ,KAAK,SAAS,IAAI,OAAO,CAAC,QAAQ,CAAC,IAAI,EAAE,KAAK,EAAE;QACrE,CAAC,CAAC,OAAO,CAAC,KAAK;QACf,CAAC,CAAC,GAAG,OAAO,CAAC,KAAK,KAAK,OAAO,CAAC,QAAQ,EAAE,CAAC;AAC9C,CAAC;AAOD,MAAM,CAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AA6ClD,MAAM,UAAU,yBAAyB,CAAC,OAA0B;IAClE,OAAO,OAAO,CAAC,QAAQ,KAAK,SAAS,IAAI,OAAO,CAAC,QAAQ,CAAC,IAAI,EAAE,KAAK,EAAE;QACrE,CAAC,CAAC,OAAO,CAAC,KAAK;QACf,CAAC,CAAC,GAAG,OAAO,CAAC,KAAK,KAAK,OAAO,CAAC,QAAQ,EAAE,CAAC;AAC9C,CAAC;AAOD,MAAM,CAAC,MAAM,yBAAyB,GAAG;IACvC,MAAM,EAAE,EAAE;IACV,IAAI,EAAE,EAAE;IACR,MAAM,EAAE,CAAC;IACT,YAAY,EAAE,CAAC;IACf,aAAa,EAAE,CAAC;IAChB,aAAa,EAAE,EAAE;IACjB,eAAe,EAAE,EAAE;IACnB,OAAO,EAAE,CAAC;CACF,CAAC;AAQX,MAAM,UAAU,0BAA0B,CAAC,UAAgC,EAAE;IAC3E,OAAO,CACL,OAAO,CAAC,UAAU;QAClB,IAAI,CAAC,IAAI,CACP,CAAC,OAAO,CAAC,QAAQ,IAAI,yBAAyB,CAAC,aAAa,CAAC;YAC3D,CAAC,yBAAyB,CAAC,eAAe,GAAG,yBAAyB,CAAC,aAAa,CAAC,CACxF,CACF,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,4BAA4B,CAAC,SAAS,GAAG,CAAC;IACxD,OAAO,IAAI,CAAC,GAAG,CACb,yBAAyB,CAAC,MAAM,EAChC,yBAAyB,CAAC,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,SAAS,CAAC,CACxD,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,sBAAsB,CACpC,SAAS,GAAG,CAAC,EACb,WAAW,GAAG,CAAC,EACf,UAAgC,EAAE;IAElC,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC;IACrC,OAAO,CACL,yBAAyB,CAAC,MAAM;QAChC,CAAC,GAAG,CAAC,yBAAyB,CAAC,YAAY,GAAG,yBAAyB,CAAC,aAAa,CAAC;QACtF,4BAA4B,CAAC,KAAK,CAAC;QACnC,CAAC,OAAO,CAAC,OAAO,IAAI,yBAAyB,CAAC,OAAO,CAAC;QACtD,0BAA0B,CAAC,OAAO,CAAC,GAAG,KAAK;QAC3C,WAAW,CACZ,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,qBAAqB,GAAG;IACnC,MAAM,EAAE,yBAAyB,CAAC,MAAM;IACxC,IAAI,EAAE,GAAG;IACT,aAAa,EAAE,EAAE;IACjB,GAAG,EAAE,EAAE;IACP,SAAS,EAAE,sBAAsB,EAAE;IACnC,MAAM,EAAE,EAAE;IACV,aAAa,EAAE,EAAE;CACT,CAAC;AAEX,MAAM,UAAU,mBAAmB,CAAC,KAAa;IAC/C,OAAO,aAAa,CAAC,KAAK,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,KAAK,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC;AAC/F,CAAC;AAED,SAAS,SAAS,CAAC,IAAY;IAC7B,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC;AAC1C,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,IAAuB,EAAE,QAAgB;IACzE,IAAI,IAAI,CAAC,OAAO,KAAK,SAAS;QAAE,OAAO,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC9D,MAAM,IAAI,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC;IACjC,MAAM,IAAI,GAAG,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAClC,OAAO,IAAI,KAAK,IAAI,IAAI,CAAC,IAAI,KAAK,GAAG,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC,CAAC;AACxE,CAAC;AAED,SAAS,SAAS,CAChB,KAAsB,EACtB,QAAgB;IAEhB,OAAO,KAAK,CAAC,MAAM,CAAc,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE;QAC9C,IAAI,CAAC,iBAAiB,CAAC,IAAI,EAAE,QAAQ,CAAC;YAAE,OAAO,IAAI,CAAC;QACpD,OAAO,IAAI,KAAK,IAAI,IAAI,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,GAAG,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;IAClG,CAAC,EAAE,IAAI,CAAC,CAAC;AACX,CAAC;AAED,MAAM,UAAU,sBAAsB,CACpC,OAA8C,EAC9C,QAAgB;IAEhB,OAAO,SAAS,CACd,OAAO,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,SAAS,CAAC,EACnD,QAAQ,CACT,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,uBAAuB,CACrC,KAAsC,EACtC,QAAgB;IAEhB,MAAM,OAAO,GAAG,SAAS,CACvB,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,IAAI,EAAE,CAAC,EAC5C,QAAQ,CACT,CAAC;IACF,MAAM,IAAI,GACR,OAAO,KAAK,IAAI;QACd,CAAC,CAAC,SAAS,CAAC,KAAK,EAAE,QAAQ,CAAC;QAC5B,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC;IAC3E,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;AAC3B,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,IAAoB,EAAE,QAAgB;IACpE,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,IAAI,EAAE,CAAC;IACnC,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC,IAAI,CAAC;IAC1C,MAAM,OAAO,GAAG,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IAC5C,MAAM,KAAK,GAAG,OAAO,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAC9D,OAAO,MAAM,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC;AAChE,CAAC;AAYD,MAAM,UAAU,iBAAiB,CAC/B,KAAsB,EACtB,MAAwB;IAExB,IAAI,MAAM,CAAC,IAAI,KAAK,eAAe;QAAE,OAAO,EAAE,GAAG,KAAK,EAAE,SAAS,EAAE,MAAM,CAAC,SAAS,EAAE,CAAC;IACtF,IAAI,MAAM,CAAC,IAAI,KAAK,eAAe,EAAE,CAAC;QACpC,OAAO,MAAM,CAAC,EAAE,KAAK,IAAI,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;YAC5D,CAAC,CAAC,KAAK;YACP,CAAC,CAAC,EAAE,GAAG,KAAK,EAAE,OAAO,EAAE,CAAC,GAAG,KAAK,CAAC,OAAO,EAAE,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC;IAC3D,CAAC;IACD,MAAM,IAAI,GAAG,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IAC/C,MAAM,SAAS,GAAG,MAAM,CAAC,SAAS,IAAI,KAAK,CAAC,SAAS,CAAC;IACtD,OAAO;QACL,SAAS,EAAE,KAAK;QAChB,OAAO,EACL,IAAI,IAAI,CAAC,SAAS;YAChB,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,KAAK,MAAM,CAAC,EAAE,CAAC;YAChD,CAAC,CAAC,IAAI;gBACJ,CAAC,CAAC,KAAK,CAAC,OAAO;gBACf,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,OAAO,EAAE,MAAM,CAAC,EAAE,CAAC;KACtC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,kBAAkB,CAChC,KAAgC,EAChC,OAA2B;IAE3B,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC;QAClB,MAAM,IAAI,UAAU,CAAC,2DAA2D,CAAC,CAAC;IACpF,MAAM,GAAG,GAAG,IAAI,GAAG,EAAU,CAAC;IAC9B,KAAK,MAAM,IAAI,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACnF,IAAI,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;YAC3C,MAAM,IAAI,KAAK,CAAC,qCAAqC,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;QAClE,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACjB,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE;YAAE,MAAM,IAAI,KAAK,CAAC,8BAA8B,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;QACvF,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE;YAAE,MAAM,IAAI,KAAK,CAAC,6BAA6B,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;IACvF,CAAC;IACD,IAAI,OAAO,KAAK,SAAS;QAAE,OAAO;IAClC,IAAI,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,OAAO,CAAC,QAAQ,CAAC,IAAI,EAAE,KAAK,EAAE;QAC/D,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC;IACzD,IAAI,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE;QAAE,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;IAC3E,IAAI,OAAO,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QAC/B,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC;YAAE,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;QACzE,KAAK,MAAM,KAAK,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;YACjC,IAAI,KAAK,CAAC,EAAE,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC7C,MAAM,IAAI,KAAK,CAAC,qCAAqC,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;YACnE,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;YAClB,IAAI,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE;gBACxD,MAAM,IAAI,KAAK,CAAC,2BAA2B,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;QAC3D,CAAC;IACH,CAAC;AACH,CAAC"}
|
package/dist/native.d.ts
CHANGED
|
@@ -37,7 +37,7 @@ export interface NavigationInsets {
|
|
|
37
37
|
readonly right?: number;
|
|
38
38
|
}
|
|
39
39
|
export type Navigate = (href: string) => void;
|
|
40
|
-
export declare function useNavigationBarHeight(bottomInset?: number): number;
|
|
40
|
+
export declare function useNavigationBarHeight(bottomInset?: number, theme?: NavigationTheme): number;
|
|
41
41
|
export interface AppNavigationProps extends CollapseProps {
|
|
42
42
|
readonly items: readonly NavigationItem<NavigationIcon>[];
|
|
43
43
|
readonly profile?: NavigationProfile;
|
package/dist/native.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"native.d.ts","sourceRoot":"","sources":["../src/native.tsx"],"names":[],"mappings":"AAAA,OAAO,EAQL,KAAK,SAAS,EACf,MAAM,OAAO,CAAC;AACf,OAAO,
|
|
1
|
+
{"version":3,"file":"native.d.ts","sourceRoot":"","sources":["../src/native.tsx"],"names":[],"mappings":"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"}
|
package/dist/native.js
CHANGED
|
@@ -3,17 +3,30 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
|
|
|
3
3
|
import { useEffect, useCallback, useLayoutEffect, useId, useRef, useState, } from 'react';
|
|
4
4
|
import { Image, Modal, Platform, Pressable, ScrollView, StyleSheet, Text, View, useWindowDimensions, } from 'react-native';
|
|
5
5
|
import { announce, asFocusTarget, hostElement, useAriaHiddenInert, useOverlayA11y, useReducedMotionPreference, useRovingMenu, } from '@baukit/a11y-core';
|
|
6
|
-
import { getNavigationLayout, getNavigationBarHeight, NAVIGATION_DIMENSIONS, navigationMatches, nextSectionHref, resolveActiveNavigation, resolveActiveMenuEntry, validateNavigation, } from './index.js';
|
|
6
|
+
import { getNavigationLayout, getNavigationBarHeight, getNavigationBarVisualHeight, getNavigationBarLineHeight, NAVIGATION_BAR_DIMENSIONS, NAVIGATION_DIMENSIONS, navigationMatches, nextSectionHref, resolveActiveNavigation, resolveActiveMenuEntry, validateNavigation, } from './index.js';
|
|
7
7
|
import { useNavigationState } from './use-navigation-state.js';
|
|
8
|
+
function barMetrics(theme) {
|
|
9
|
+
return {
|
|
10
|
+
...(theme === undefined ? {} : { spacing: theme.spacing }),
|
|
11
|
+
...(theme?.typography?.barFontSize === undefined
|
|
12
|
+
? {}
|
|
13
|
+
: { fontSize: theme.typography.barFontSize }),
|
|
14
|
+
...(theme?.typography?.lineHeight === undefined
|
|
15
|
+
? {}
|
|
16
|
+
: { lineHeight: theme.typography.lineHeight }),
|
|
17
|
+
};
|
|
18
|
+
}
|
|
8
19
|
function textStyle(theme, selected = false, bar = false) {
|
|
9
20
|
const typography = theme.typography;
|
|
10
21
|
return {
|
|
11
22
|
fontFamily: typography?.fontFamily,
|
|
12
|
-
fontSize: bar
|
|
23
|
+
fontSize: bar
|
|
24
|
+
? (typography?.barFontSize ?? NAVIGATION_BAR_DIMENSIONS.labelFontSize)
|
|
25
|
+
: (typography?.fontSize ?? 14),
|
|
13
26
|
fontWeight: selected
|
|
14
27
|
? (typography?.activeFontWeight ?? '700')
|
|
15
28
|
: (typography?.fontWeight ?? '400'),
|
|
16
|
-
lineHeight: typography?.lineHeight,
|
|
29
|
+
lineHeight: bar ? getNavigationBarLineHeight(barMetrics(theme)) : typography?.lineHeight,
|
|
17
30
|
letterSpacing: typography?.letterSpacing,
|
|
18
31
|
};
|
|
19
32
|
}
|
|
@@ -34,7 +47,7 @@ function FocusablePressable({ theme, selected = false, unfocusedBorderColor, sty
|
|
|
34
47
|
minWidth: Platform.OS === 'android'
|
|
35
48
|
? NAVIGATION_DIMENSIONS.androidTarget
|
|
36
49
|
: NAVIGATION_DIMENSIONS.target,
|
|
37
|
-
borderWidth:
|
|
50
|
+
borderWidth: NAVIGATION_BAR_DIMENSIONS.targetBorder,
|
|
38
51
|
borderColor: focused
|
|
39
52
|
? selected
|
|
40
53
|
? theme.activeText
|
|
@@ -93,8 +106,8 @@ function Target({ label, subtitle, selected = false, ancestor = false, expanded,
|
|
|
93
106
|
fontSize: theme.typography?.subtitleFontSize ?? 12,
|
|
94
107
|
}, children: subtitle })) : null] })) : null] }));
|
|
95
108
|
}
|
|
96
|
-
function Decorative({ children }) {
|
|
97
|
-
return (_jsx(View, { accessible: false, accessibilityElementsHidden: true, importantForAccessibility: "no-hide-descendants", "aria-hidden": true, children: children }));
|
|
109
|
+
function Decorative({ children, style, }) {
|
|
110
|
+
return (_jsx(View, { style: style, accessible: false, accessibilityElementsHidden: true, importantForAccessibility: "no-hide-descendants", "aria-hidden": true, children: children }));
|
|
98
111
|
}
|
|
99
112
|
const MENU_WIDTH = 280;
|
|
100
113
|
const MENU_EDGE = 8;
|
|
@@ -244,31 +257,76 @@ function Menu({ subtitle, renderBackground, entries, label, closeLabel, pathname
|
|
|
244
257
|
setWebPresented(true);
|
|
245
258
|
}, children: _jsx(View, { style: styles.modal, children: menu }) })] }));
|
|
246
259
|
}
|
|
247
|
-
function
|
|
260
|
+
function compactVisualStyle(fontScale) {
|
|
261
|
+
return { height: getNavigationBarVisualHeight(fontScale), justifyContent: 'center' };
|
|
262
|
+
}
|
|
263
|
+
function Avatar({ profile, active, theme, style, }) {
|
|
248
264
|
const [failedUrl, setFailedUrl] = useState();
|
|
249
265
|
if (profile.renderAvatar !== undefined) {
|
|
250
|
-
return (_jsx(Decorative, { children: profile.renderAvatar({ active, size: NAVIGATION_DIMENSIONS.avatar }) }));
|
|
266
|
+
return (_jsx(Decorative, { style: style, children: profile.renderAvatar({ active, size: NAVIGATION_DIMENSIONS.avatar }) }));
|
|
251
267
|
}
|
|
252
|
-
return (_jsx(Decorative, { children: profile.imageUrl !== undefined && failedUrl !== profile.imageUrl ? (_jsx(Image, { source: { uri: profile.imageUrl }, onError: () => {
|
|
268
|
+
return (_jsx(Decorative, { style: style, children: profile.imageUrl !== undefined && failedUrl !== profile.imageUrl ? (_jsx(Image, { source: { uri: profile.imageUrl }, onError: () => {
|
|
253
269
|
setFailedUrl(profile.imageUrl);
|
|
254
|
-
}, style: styles.avatar })) : (_jsx(View, { style: [styles.avatar, { backgroundColor: theme.activeBackground }], children: _jsx(Text, { style: { ...textStyle(theme), color: theme.activeText }, children: profile.initials }) })) }));
|
|
270
|
+
}, style: styles.avatar })) : (_jsx(View, { style: [styles.avatar, { backgroundColor: theme.activeBackground }], children: _jsx(Text, { allowFontScaling: false, style: { ...textStyle(theme), color: theme.activeText }, children: profile.initials }) })) }));
|
|
255
271
|
}
|
|
256
|
-
function
|
|
257
|
-
|
|
272
|
+
function profileIsActive(profile, pathname) {
|
|
273
|
+
return profile.href !== undefined
|
|
258
274
|
? navigationMatches({ id: 'profile', label: profile.label, href: profile.href }, pathname)
|
|
259
275
|
: resolveActiveMenuEntry(profile.menu, pathname) !== null;
|
|
260
|
-
|
|
276
|
+
}
|
|
277
|
+
function Profile({ profile, open, onOpen, triggerRef, id, theme, bar, collapsed, pathname, onNavigate, roving, onLayout, }) {
|
|
278
|
+
const { fontScale } = useWindowDimensions();
|
|
279
|
+
const active = profileIsActive(profile, pathname);
|
|
280
|
+
return (_jsx(View, { style: bar ? styles.barSection : styles.profile, testID: "navigation-profile", onLayout: onLayout, children: _jsx(Target, { label: profile.label, subtitle: profile.subtitle, selected: active, theme: theme, bar: bar, collapsed: collapsed, roving: roving, triggerRef: triggerRef, ...(profile.href === undefined
|
|
261
281
|
? { expanded: open, controls: id, menu: true }
|
|
262
282
|
: { href: profile.href }), onPress: (event) => {
|
|
263
283
|
if (profile.href !== undefined)
|
|
264
284
|
follow(profile.href, event, onNavigate);
|
|
265
285
|
else
|
|
266
286
|
onOpen();
|
|
267
|
-
}, children: _jsx(Avatar, { profile: profile, active: active, theme: theme }) }) }));
|
|
287
|
+
}, children: _jsx(Avatar, { profile: profile, active: active, theme: theme, style: bar ? compactVisualStyle(fontScale) : undefined }) }) }));
|
|
268
288
|
}
|
|
269
|
-
export function useNavigationBarHeight(bottomInset = 0) {
|
|
289
|
+
export function useNavigationBarHeight(bottomInset = 0, theme) {
|
|
270
290
|
const { fontScale } = useWindowDimensions();
|
|
271
|
-
return getNavigationBarHeight(fontScale, bottomInset);
|
|
291
|
+
return getNavigationBarHeight(fontScale, bottomInset, barMetrics(theme));
|
|
292
|
+
}
|
|
293
|
+
function useCompactBarScroll(selectedIndex) {
|
|
294
|
+
const ref = useRef(null);
|
|
295
|
+
const viewport = useRef(0);
|
|
296
|
+
const content = useRef(0);
|
|
297
|
+
const offset = useRef(0);
|
|
298
|
+
const frames = useRef(new Map());
|
|
299
|
+
const revealSelected = useCallback(() => {
|
|
300
|
+
const frame = frames.current.get(selectedIndex);
|
|
301
|
+
if (frame === undefined || viewport.current === 0 || content.current === 0)
|
|
302
|
+
return;
|
|
303
|
+
if (frame.x >= offset.current && frame.x + frame.width <= offset.current + viewport.current)
|
|
304
|
+
return;
|
|
305
|
+
const x = Math.max(0, Math.min(frame.x + (frame.width - viewport.current) / 2, content.current - viewport.current));
|
|
306
|
+
ref.current?.scrollTo({ x, animated: false });
|
|
307
|
+
offset.current = x;
|
|
308
|
+
}, [selectedIndex]);
|
|
309
|
+
useEffect(revealSelected, [revealSelected]);
|
|
310
|
+
return {
|
|
311
|
+
scrollProps: {
|
|
312
|
+
ref,
|
|
313
|
+
onLayout: (event) => {
|
|
314
|
+
viewport.current = event.nativeEvent.layout.width;
|
|
315
|
+
revealSelected();
|
|
316
|
+
},
|
|
317
|
+
onContentSizeChange: (width) => {
|
|
318
|
+
content.current = width;
|
|
319
|
+
revealSelected();
|
|
320
|
+
},
|
|
321
|
+
onScroll: (event) => {
|
|
322
|
+
offset.current = event.nativeEvent.contentOffset.x;
|
|
323
|
+
},
|
|
324
|
+
},
|
|
325
|
+
itemLayout: (index) => (event) => {
|
|
326
|
+
frames.current.set(index, event.nativeEvent.layout);
|
|
327
|
+
revealSelected();
|
|
328
|
+
},
|
|
329
|
+
};
|
|
272
330
|
}
|
|
273
331
|
export function AppNavigation(props) {
|
|
274
332
|
const { items, profile, pathname, onNavigate, theme, insets = {}, label, closeLabel, collapseLabel, expandLabel, } = props;
|
|
@@ -288,13 +346,15 @@ export function AppNavigation(props) {
|
|
|
288
346
|
const activeId = visible.some((item) => item.id === state.active.subItem?.id)
|
|
289
347
|
? state.active.subItem?.id
|
|
290
348
|
: state.active.item?.id;
|
|
349
|
+
const profileActive = profile !== undefined && profileIsActive(profile, pathname);
|
|
350
|
+
const compactScroll = useCompactBarScroll(bar ? (profileActive ? items.length : items.findIndex((item) => item.id === activeId)) : -1);
|
|
291
351
|
const roving = useRovingMenu({
|
|
292
352
|
active: true,
|
|
293
353
|
options: [
|
|
294
354
|
...visible.map((item) => ({
|
|
295
355
|
selected: item.id === activeId,
|
|
296
356
|
})),
|
|
297
|
-
...(profile === undefined ? [] : [{}]),
|
|
357
|
+
...(profile === undefined ? [] : [{ selected: profileActive }]),
|
|
298
358
|
],
|
|
299
359
|
});
|
|
300
360
|
const renderBackground = (backgroundProps = {}) => (_jsxs(View, { ...backgroundProps, role: "navigation", accessibilityLabel: label, testID: "primary-navigation", dataSet: { layout: bar ? 'bar' : 'rail', collapsed: String(collapsed) }, style: [
|
|
@@ -304,7 +364,9 @@ export function AppNavigation(props) {
|
|
|
304
364
|
borderColor: theme.border,
|
|
305
365
|
paddingBottom: insets.bottom ?? 0,
|
|
306
366
|
...(bar
|
|
307
|
-
? {
|
|
367
|
+
? {
|
|
368
|
+
minHeight: getNavigationBarHeight(dimensions.fontScale, insets.bottom, barMetrics(theme)),
|
|
369
|
+
}
|
|
308
370
|
: {}),
|
|
309
371
|
paddingLeft: insets.left ?? 0,
|
|
310
372
|
paddingRight: insets.right ?? 0,
|
|
@@ -316,19 +378,19 @@ export function AppNavigation(props) {
|
|
|
316
378
|
props.style,
|
|
317
379
|
], children: [!bar ? (_jsx(Target, { label: collapsed ? expandLabel : collapseLabel, expanded: !collapsed, collapsed: true, theme: theme, onPress: () => {
|
|
318
380
|
state.setCollapsed(!collapsed);
|
|
319
|
-
}, children: _jsx(Decorative, { children: _jsx(Text, { style: { ...textStyle(theme), color: theme.text }, children: collapsed ? '›' : '‹' }) }) })) : null, _jsxs(ScrollView, { horizontal: bar, scrollEnabled:
|
|
381
|
+
}, children: _jsx(Decorative, { children: _jsx(Text, { style: { ...textStyle(theme), color: theme.text }, children: collapsed ? '›' : '‹' }) }) })) : null, _jsxs(ScrollView, { ...(bar ? compactScroll.scrollProps : {}), testID: "navigation-items", horizontal: bar, scrollEnabled: true, showsHorizontalScrollIndicator: false, style: bar ? styles.barItems : styles.railItems, contentContainerStyle: bar ? styles.barContent : undefined, children: [items.map((item, index) => {
|
|
320
382
|
const active = state.active.item?.id === item.id;
|
|
321
383
|
const children = item.children ?? [];
|
|
322
384
|
const open = !collapsed && state.openIds.includes(item.id);
|
|
323
385
|
const href = bar && active ? nextSectionHref(item, pathname) : item.href;
|
|
324
|
-
return (_jsxs(View, { style: bar ? styles.barSection : undefined, testID: `navigation-section-${item.id}`, children: [_jsx(Target, { label: item.label, selected: active, ancestor: active && !bar && !collapsed && state.active.subItem !== null, theme: theme, bar: bar, collapsed: collapsed, roving: roving.itemProps(visible.indexOf(item)), ...(!bar && children.length > 0
|
|
386
|
+
return (_jsxs(View, { style: bar ? styles.barSection : undefined, testID: `navigation-section-${item.id}`, onLayout: bar ? compactScroll.itemLayout(index) : undefined, children: [_jsx(Target, { label: item.label, selected: active, ancestor: active && !bar && !collapsed && state.active.subItem !== null, theme: theme, bar: bar, collapsed: collapsed, roving: roving.itemProps(visible.indexOf(item)), ...(!bar && children.length > 0
|
|
325
387
|
? { expanded: open, controls: `${id}-${String(index)}` }
|
|
326
388
|
: { href }), onPress: (event) => {
|
|
327
389
|
if (!bar && children.length > 0)
|
|
328
390
|
state.toggleGroup(item.id);
|
|
329
391
|
else
|
|
330
392
|
follow(href, event, onNavigate);
|
|
331
|
-
}, children: _jsx(Decorative, { children: item.icon({ active, size:
|
|
393
|
+
}, children: _jsx(Decorative, { style: bar ? compactVisualStyle(dimensions.fontScale) : undefined, children: item.icon({ active, size: NAVIGATION_BAR_DIMENSIONS.icon }) }) }), !bar && open && children.length > 0 ? (_jsx(View, { nativeID: `${id}-${String(index)}`, role: "group", accessibilityLabel: item.label, style: [styles.children, { borderColor: theme.border }], children: children.map((child) => {
|
|
332
394
|
const selected = state.active.subItem?.id === child.id;
|
|
333
395
|
return (_jsx(Target, { label: child.label, selected: selected, href: child.href, theme: theme, roving: roving.itemProps(visible.indexOf(child)), onPress: (event) => {
|
|
334
396
|
follow(child.href, event, onNavigate);
|
|
@@ -336,7 +398,7 @@ export function AppNavigation(props) {
|
|
|
336
398
|
}) })) : null] }, item.id));
|
|
337
399
|
}), bar && profile !== undefined ? (_jsx(Profile, { profile: profile, open: profileOpen, onOpen: () => {
|
|
338
400
|
setProfileOpen(true);
|
|
339
|
-
}, triggerRef: profileTriggerRef, id: profileMenuId, theme: theme, bar: true, collapsed: false, pathname: pathname, onNavigate: onNavigate, roving: roving.itemProps(visible.length) })) : null] }), !bar && profile !== undefined ? (_jsx(Profile, { profile: profile, open: profileOpen, onOpen: () => {
|
|
401
|
+
}, triggerRef: profileTriggerRef, id: profileMenuId, theme: theme, bar: true, collapsed: false, pathname: pathname, onNavigate: onNavigate, roving: roving.itemProps(visible.length), onLayout: compactScroll.itemLayout(items.length) })) : null] }), !bar && profile !== undefined ? (_jsx(Profile, { profile: profile, open: profileOpen, onOpen: () => {
|
|
340
402
|
setProfileOpen(true);
|
|
341
403
|
}, triggerRef: profileTriggerRef, id: profileMenuId, theme: theme, bar: false, collapsed: collapsed, pathname: pathname, onNavigate: onNavigate, roving: roving.itemProps(visible.length) })) : null] }));
|
|
342
404
|
if (profile?.menu === undefined)
|
|
@@ -380,21 +442,21 @@ const styles = StyleSheet.create({
|
|
|
380
442
|
labelGroup: { minWidth: 0, flexShrink: 1 },
|
|
381
443
|
menuProfile: { padding: 8 },
|
|
382
444
|
target: {
|
|
383
|
-
padding:
|
|
445
|
+
padding: NAVIGATION_BAR_DIMENSIONS.targetPadding,
|
|
384
446
|
},
|
|
385
447
|
railTarget: { flexDirection: 'row', alignItems: 'center' },
|
|
386
448
|
collapsedTarget: { justifyContent: 'center' },
|
|
387
449
|
barTarget: { flexDirection: 'column', alignItems: 'center', justifyContent: 'center', flex: 1 },
|
|
388
450
|
bar: {
|
|
389
451
|
flexDirection: 'row',
|
|
390
|
-
minHeight: NAVIGATION_DIMENSIONS.
|
|
391
|
-
borderTopWidth:
|
|
452
|
+
minHeight: NAVIGATION_DIMENSIONS.nativeBar,
|
|
453
|
+
borderTopWidth: NAVIGATION_BAR_DIMENSIONS.border,
|
|
392
454
|
width: '100%',
|
|
393
455
|
},
|
|
394
456
|
rail: { borderRightWidth: 1, height: '100%' },
|
|
395
457
|
railItems: { flex: 1 },
|
|
396
458
|
barItems: { width: '100%' },
|
|
397
|
-
barContent: { flexDirection: 'row', flexGrow: 1 },
|
|
459
|
+
barContent: { flexDirection: 'row', flexGrow: 1, minWidth: '100%' },
|
|
398
460
|
barSection: { flex: 1, minWidth: NAVIGATION_DIMENSIONS.target },
|
|
399
461
|
children: { marginLeft: 20, paddingLeft: 8, borderLeftWidth: 1 },
|
|
400
462
|
profile: { position: 'relative', marginTop: 'auto', paddingTop: 8, borderTopWidth: 1 },
|
package/dist/native.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"native.js","sourceRoot":"","sources":["../src/native.tsx"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"native.js","sourceRoot":"","sources":["../src/native.tsx"],"names":[],"mappings":"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"}
|
package/dist/web.css
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
.bk-navigation,
|
|
2
2
|
.bk-navigation-picker {
|
|
3
|
+
font-family: var(--bk-typography-family-body);
|
|
3
4
|
--bk-navigation-active-background: color-mix(
|
|
4
5
|
in srgb,
|
|
5
6
|
var(--bk-color-background-accent) 14%,
|
|
@@ -18,7 +19,6 @@
|
|
|
18
19
|
box-sizing: border-box;
|
|
19
20
|
color: var(--bk-color-text-primary);
|
|
20
21
|
background: var(--bk-color-background-primary);
|
|
21
|
-
font-family: var(--bk-typography-family-body);
|
|
22
22
|
}
|
|
23
23
|
.bk-navigation *,
|
|
24
24
|
.bk-navigation-picker * {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@baukit/navigation",
|
|
3
|
-
"version": "0.7.
|
|
3
|
+
"version": "0.7.4",
|
|
4
4
|
"description": "Shared collapsible navigation for React web and React Native products.",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"homepage": "https://github.com/PatrickKoss/baukit#readme",
|
|
@@ -84,8 +84,8 @@
|
|
|
84
84
|
"react": "^19.2.0",
|
|
85
85
|
"react-native": "^0.86.3",
|
|
86
86
|
"react-dom": "^19.2.0",
|
|
87
|
-
"@baukit/a11y-core": "^0.7.
|
|
88
|
-
"@baukit/ui-tokens": "^0.7.
|
|
87
|
+
"@baukit/a11y-core": "^0.7.4",
|
|
88
|
+
"@baukit/ui-tokens": "^0.7.4"
|
|
89
89
|
},
|
|
90
90
|
"peerDependenciesMeta": {
|
|
91
91
|
"react-native": {
|
package/src/index.test.ts
CHANGED
|
@@ -3,6 +3,8 @@ import { blendColors, contrastRatio, exampleTokens } from '@baukit/ui-tokens';
|
|
|
3
3
|
import {
|
|
4
4
|
getNavigationLayout,
|
|
5
5
|
getNavigationBarHeight,
|
|
6
|
+
getNavigationBarVisualHeight,
|
|
7
|
+
NAVIGATION_BAR_DIMENSIONS,
|
|
6
8
|
navigationReducer,
|
|
7
9
|
navigationMatches,
|
|
8
10
|
resolveActiveMenuEntry,
|
|
@@ -220,7 +222,38 @@ it('selects one most-specific menu route using its path length', () => {
|
|
|
220
222
|
});
|
|
221
223
|
|
|
222
224
|
it('reserves compact height for enlarged text and safe areas', () => {
|
|
223
|
-
expect(getNavigationBarHeight(1, 24)).toBe(
|
|
224
|
-
expect(getNavigationBarHeight(
|
|
225
|
-
expect(getNavigationBarHeight(
|
|
225
|
+
expect(getNavigationBarHeight(1, 24)).toBe(99);
|
|
226
|
+
expect(getNavigationBarHeight(1.3, 24)).toBe(107);
|
|
227
|
+
expect(getNavigationBarHeight(2, 24)).toBe(135);
|
|
228
|
+
expect(getNavigationBarHeight(0.8)).toBe(75);
|
|
229
|
+
});
|
|
230
|
+
|
|
231
|
+
it.each([1, 1.3, 2])('fits the profile and a full label at font scale %s', (fontScale) => {
|
|
232
|
+
const dimensions = NAVIGATION_BAR_DIMENSIONS;
|
|
233
|
+
const available =
|
|
234
|
+
getNavigationBarHeight(fontScale) -
|
|
235
|
+
dimensions.border -
|
|
236
|
+
2 * (dimensions.targetPadding + dimensions.targetBorder) -
|
|
237
|
+
dimensions.spacing;
|
|
238
|
+
expect(available).toBeGreaterThanOrEqual(dimensions.avatar + 16 * fontScale);
|
|
239
|
+
expect(available).toBeGreaterThanOrEqual((dimensions.icon + 16) * fontScale);
|
|
240
|
+
});
|
|
241
|
+
it('reserves the configured label size, line height and spacing', () => {
|
|
242
|
+
expect(getNavigationBarHeight(1.3, 24, { spacing: 12, fontSize: 18 })).toBeCloseTo(125.3);
|
|
243
|
+
expect(getNavigationBarHeight(1.3, 24, { spacing: 12, lineHeight: 30 })).toBe(129.2);
|
|
244
|
+
});
|
|
245
|
+
|
|
246
|
+
it.each([
|
|
247
|
+
[0.8, 28],
|
|
248
|
+
[1, 28],
|
|
249
|
+
[1.3, 31.2],
|
|
250
|
+
[2, 48],
|
|
251
|
+
])('shares one icon and avatar box at font scale %s', (fontScale, expected) => {
|
|
252
|
+
expect(getNavigationBarVisualHeight(fontScale)).toBeCloseTo(expected);
|
|
253
|
+
expect(getNavigationBarVisualHeight(fontScale)).toBeGreaterThanOrEqual(
|
|
254
|
+
NAVIGATION_BAR_DIMENSIONS.avatar,
|
|
255
|
+
);
|
|
256
|
+
expect(getNavigationBarVisualHeight(fontScale)).toBeGreaterThanOrEqual(
|
|
257
|
+
NAVIGATION_BAR_DIMENSIONS.icon * fontScale,
|
|
258
|
+
);
|
|
226
259
|
});
|
package/src/index.ts
CHANGED
|
@@ -54,19 +54,66 @@ export interface ActiveNavigation<Icon = unknown> {
|
|
|
54
54
|
readonly subItem: NavigationSubItem<Icon> | null;
|
|
55
55
|
}
|
|
56
56
|
|
|
57
|
-
export const
|
|
57
|
+
export const NAVIGATION_BAR_DIMENSIONS = {
|
|
58
58
|
avatar: 28,
|
|
59
|
+
icon: 24,
|
|
60
|
+
border: 1,
|
|
61
|
+
targetBorder: 3,
|
|
62
|
+
targetPadding: 8,
|
|
63
|
+
labelFontSize: 11,
|
|
64
|
+
labelLineHeight: 16,
|
|
65
|
+
spacing: 8,
|
|
66
|
+
} as const;
|
|
67
|
+
|
|
68
|
+
export interface NavigationBarMetrics {
|
|
69
|
+
readonly spacing?: number;
|
|
70
|
+
readonly fontSize?: number;
|
|
71
|
+
readonly lineHeight?: number;
|
|
72
|
+
}
|
|
73
|
+
|
|
74
|
+
export function getNavigationBarLineHeight(metrics: NavigationBarMetrics = {}): number {
|
|
75
|
+
return (
|
|
76
|
+
metrics.lineHeight ??
|
|
77
|
+
Math.ceil(
|
|
78
|
+
(metrics.fontSize ?? NAVIGATION_BAR_DIMENSIONS.labelFontSize) *
|
|
79
|
+
(NAVIGATION_BAR_DIMENSIONS.labelLineHeight / NAVIGATION_BAR_DIMENSIONS.labelFontSize),
|
|
80
|
+
)
|
|
81
|
+
);
|
|
82
|
+
}
|
|
83
|
+
|
|
84
|
+
export function getNavigationBarVisualHeight(fontScale = 1): number {
|
|
85
|
+
return Math.max(
|
|
86
|
+
NAVIGATION_BAR_DIMENSIONS.avatar,
|
|
87
|
+
NAVIGATION_BAR_DIMENSIONS.icon * Math.max(1, fontScale),
|
|
88
|
+
);
|
|
89
|
+
}
|
|
90
|
+
|
|
91
|
+
export function getNavigationBarHeight(
|
|
92
|
+
fontScale = 1,
|
|
93
|
+
bottomInset = 0,
|
|
94
|
+
metrics: NavigationBarMetrics = {},
|
|
95
|
+
): number {
|
|
96
|
+
const scale = Math.max(1, fontScale);
|
|
97
|
+
return (
|
|
98
|
+
NAVIGATION_BAR_DIMENSIONS.border +
|
|
99
|
+
2 * (NAVIGATION_BAR_DIMENSIONS.targetBorder + NAVIGATION_BAR_DIMENSIONS.targetPadding) +
|
|
100
|
+
getNavigationBarVisualHeight(scale) +
|
|
101
|
+
(metrics.spacing ?? NAVIGATION_BAR_DIMENSIONS.spacing) +
|
|
102
|
+
getNavigationBarLineHeight(metrics) * scale +
|
|
103
|
+
bottomInset
|
|
104
|
+
);
|
|
105
|
+
}
|
|
106
|
+
|
|
107
|
+
export const NAVIGATION_DIMENSIONS = {
|
|
108
|
+
avatar: NAVIGATION_BAR_DIMENSIONS.avatar,
|
|
59
109
|
rail: 280,
|
|
60
110
|
collapsedRail: 76,
|
|
61
111
|
bar: 64,
|
|
112
|
+
nativeBar: getNavigationBarHeight(),
|
|
62
113
|
target: 44,
|
|
63
114
|
androidTarget: 48,
|
|
64
115
|
} as const;
|
|
65
116
|
|
|
66
|
-
export function getNavigationBarHeight(fontScale = 1, bottomInset = 0): number {
|
|
67
|
-
return NAVIGATION_DIMENSIONS.bar * Math.max(1, fontScale) + bottomInset;
|
|
68
|
-
}
|
|
69
|
-
|
|
70
117
|
export function getNavigationLayout(width: number): 'bar' | 'rail' {
|
|
71
118
|
return getLayoutMode(width, { medium: 600, expanded: 1024 }) === 'expanded' ? 'rail' : 'bar';
|
|
72
119
|
}
|
package/src/native.test.tsx
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { act, fireEvent, render, screen, within } from '@testing-library/react-native';
|
|
2
|
-
import { AccessibilityInfo, Platform, Text } from 'react-native';
|
|
2
|
+
import { AccessibilityInfo, Platform, ScrollView, Text } from 'react-native';
|
|
3
3
|
import {
|
|
4
4
|
AppNavigation,
|
|
5
5
|
useNavigationBarHeight,
|
|
@@ -7,7 +7,7 @@ import {
|
|
|
7
7
|
type NavigationIcon,
|
|
8
8
|
type NavigationTheme,
|
|
9
9
|
} from './native.js';
|
|
10
|
-
import type
|
|
10
|
+
import { getNavigationBarHeight, type NavigationItem } from './index.js';
|
|
11
11
|
|
|
12
12
|
// Resolve lazy native modules during setup, before Jest starts each test's timer.
|
|
13
13
|
const nativeModules = jest.requireActual<typeof import('react-native')>('react-native');
|
|
@@ -58,6 +58,70 @@ const theme: NavigationTheme = {
|
|
|
58
58
|
const profile = { label: 'Account', initials: 'AB', href: '/profile' };
|
|
59
59
|
const event = () => ({ nativeEvent: {}, preventDefault: jest.fn() });
|
|
60
60
|
|
|
61
|
+
it('fills the compact viewport, permits overflow and reveals selected German items at 200%', async () => {
|
|
62
|
+
jest.spyOn(nativeModules, 'useWindowDimensions').mockReturnValue({
|
|
63
|
+
width: 360,
|
|
64
|
+
height: 800,
|
|
65
|
+
scale: 1,
|
|
66
|
+
fontScale: 2,
|
|
67
|
+
});
|
|
68
|
+
const scrollTo = jest.spyOn(ScrollView.prototype, 'scrollTo');
|
|
69
|
+
const germanItems = [
|
|
70
|
+
{ id: 'today', label: 'Mein heutiger Tagesablauf', href: '/', icon },
|
|
71
|
+
{ id: 'journal', label: 'Persönliches Tagebuch', href: '/journal', icon },
|
|
72
|
+
{ id: 'exercises', label: 'Entspannungsübungen', href: '/exercises', icon },
|
|
73
|
+
{ id: 'community', label: 'Gemeinschaft und Austausch', href: '/community', icon },
|
|
74
|
+
];
|
|
75
|
+
const props = {
|
|
76
|
+
...labels,
|
|
77
|
+
items: germanItems,
|
|
78
|
+
theme,
|
|
79
|
+
onNavigate: jest.fn(),
|
|
80
|
+
profile: { ...profile, label: 'Profil und Einstellungen' },
|
|
81
|
+
};
|
|
82
|
+
await render(<AppNavigation {...props} pathname="/" />);
|
|
83
|
+
const scroll = screen.getByTestId('navigation-items');
|
|
84
|
+
expect(scroll).toHaveProp('scrollEnabled', true);
|
|
85
|
+
expect(scroll).toHaveProp(
|
|
86
|
+
'contentContainerStyle',
|
|
87
|
+
expect.objectContaining({
|
|
88
|
+
minWidth: '100%',
|
|
89
|
+
flexGrow: 1,
|
|
90
|
+
}),
|
|
91
|
+
);
|
|
92
|
+
expect(scroll.props['contentContainerStyle']).not.toHaveProperty('width');
|
|
93
|
+
const layout = (x: number, width: number) => ({
|
|
94
|
+
nativeEvent: { layout: { x, y: 0, width, height: 130 } },
|
|
95
|
+
});
|
|
96
|
+
await fireEvent(scroll, 'layout', layout(0, 360));
|
|
97
|
+
for (const [index, id] of [
|
|
98
|
+
...germanItems.map((item) => `navigation-section-${item.id}`),
|
|
99
|
+
'navigation-profile',
|
|
100
|
+
].entries()) {
|
|
101
|
+
await fireEvent(screen.getByTestId(id), 'layout', layout(index * 72, 72));
|
|
102
|
+
}
|
|
103
|
+
await fireEvent(scroll, 'contentSizeChange', 360, 130);
|
|
104
|
+
expect(scrollTo).not.toHaveBeenCalled();
|
|
105
|
+
for (const [index, id] of [
|
|
106
|
+
...germanItems.map((item) => `navigation-section-${item.id}`),
|
|
107
|
+
'navigation-profile',
|
|
108
|
+
].entries()) {
|
|
109
|
+
await fireEvent(screen.getByTestId(id), 'layout', layout(index * 180, 180));
|
|
110
|
+
}
|
|
111
|
+
await fireEvent(scroll, 'contentSizeChange', 900, 130);
|
|
112
|
+
await screen.rerender(<AppNavigation {...props} pathname="/community" />);
|
|
113
|
+
expect(scrollTo).toHaveBeenLastCalledWith({ x: 450, animated: false });
|
|
114
|
+
await screen.rerender(<AppNavigation {...props} pathname="/profile" />);
|
|
115
|
+
expect(scrollTo).toHaveBeenLastCalledWith({ x: 540, animated: false });
|
|
116
|
+
expect(screen.getByRole('link', { name: 'Profil und Einstellungen' })).toHaveProp('tabIndex', 0);
|
|
117
|
+
scrollTo.mockClear();
|
|
118
|
+
await fireEvent.scroll(scroll, { nativeEvent: { contentOffset: { x: 0, y: 0 } } });
|
|
119
|
+
expect(scrollTo).not.toHaveBeenCalled();
|
|
120
|
+
await screen.rerender(<AppNavigation {...props} pathname="/" />);
|
|
121
|
+
expect(scrollTo).not.toHaveBeenCalled();
|
|
122
|
+
jest.restoreAllMocks();
|
|
123
|
+
});
|
|
124
|
+
|
|
61
125
|
it('keeps keyboard focus visible on active navigation, picker and menu entries', async () => {
|
|
62
126
|
await render(
|
|
63
127
|
<>
|
|
@@ -784,11 +848,11 @@ it.each([
|
|
|
784
848
|
},
|
|
785
849
|
);
|
|
786
850
|
|
|
787
|
-
function ReservedHeight() {
|
|
788
|
-
return <Text testID="reserved-height">{useNavigationBarHeight(24)}</Text>;
|
|
851
|
+
function ReservedHeight({ theme }: { readonly theme?: NavigationTheme }) {
|
|
852
|
+
return <Text testID="reserved-height">{useNavigationBarHeight(24, theme)}</Text>;
|
|
789
853
|
}
|
|
790
854
|
|
|
791
|
-
it.each([1, 2])('reserves compact navigation space at font scale %s', async (fontScale) => {
|
|
855
|
+
it.each([1, 1.3, 2])('reserves compact navigation space at font scale %s', async (fontScale) => {
|
|
792
856
|
jest
|
|
793
857
|
.spyOn(nativeModules, 'useWindowDimensions')
|
|
794
858
|
.mockReturnValue({ width: 600, height: 800, scale: 1, fontScale });
|
|
@@ -802,11 +866,26 @@ it.each([1, 2])('reserves compact navigation space at font scale %s', async (fon
|
|
|
802
866
|
theme={theme}
|
|
803
867
|
onNavigate={jest.fn()}
|
|
804
868
|
insets={{ bottom: 24 }}
|
|
869
|
+
profile={{ label: 'Account', initials: 'AB', href: '/profile' }}
|
|
805
870
|
/>
|
|
806
871
|
</>,
|
|
807
872
|
);
|
|
808
|
-
|
|
809
|
-
expect(screen.getByTestId('
|
|
873
|
+
const height = getNavigationBarHeight(fontScale, 24);
|
|
874
|
+
expect(screen.getByTestId('primary-navigation')).toHaveStyle({ minHeight: height });
|
|
875
|
+
expect(screen.getByTestId('reserved-height').props['children']).toBe(height);
|
|
876
|
+
expect(screen.getByText('Home')).toHaveStyle({ lineHeight: 16 });
|
|
877
|
+
expect(screen.getByText('AB', { includeHiddenElements: true })).toHaveProp(
|
|
878
|
+
'allowFontScaling',
|
|
879
|
+
false,
|
|
880
|
+
);
|
|
881
|
+
expect(screen.getByText('filled', { includeHiddenElements: true }).parent).toHaveStyle({
|
|
882
|
+
height: Math.max(28, 24 * fontScale),
|
|
883
|
+
justifyContent: 'center',
|
|
884
|
+
});
|
|
885
|
+
expect(screen.getByText('AB', { includeHiddenElements: true }).parent?.parent).toHaveStyle({
|
|
886
|
+
height: Math.max(28, 24 * fontScale),
|
|
887
|
+
justifyContent: 'center',
|
|
888
|
+
});
|
|
810
889
|
jest.restoreAllMocks();
|
|
811
890
|
});
|
|
812
891
|
|
|
@@ -831,3 +910,39 @@ it.each([600, 1024])(
|
|
|
831
910
|
expect(screen.getByRole('link', { name: 'Home' })).toHaveProp('tabIndex', -1);
|
|
832
911
|
},
|
|
833
912
|
);
|
|
913
|
+
|
|
914
|
+
it('uses the same custom typography and spacing in the bar and height hook', async () => {
|
|
915
|
+
jest.spyOn(nativeModules, 'useWindowDimensions').mockReturnValue({
|
|
916
|
+
width: 600,
|
|
917
|
+
height: 800,
|
|
918
|
+
scale: 1,
|
|
919
|
+
fontScale: 1.3,
|
|
920
|
+
});
|
|
921
|
+
const customTheme = { ...theme, spacing: 12, typography: { barFontSize: 18, lineHeight: 30 } };
|
|
922
|
+
await render(
|
|
923
|
+
<>
|
|
924
|
+
<ReservedHeight theme={customTheme} />
|
|
925
|
+
<AppNavigation
|
|
926
|
+
{...labels}
|
|
927
|
+
items={items}
|
|
928
|
+
profile={profile}
|
|
929
|
+
pathname="/"
|
|
930
|
+
theme={customTheme}
|
|
931
|
+
onNavigate={jest.fn()}
|
|
932
|
+
insets={{ bottom: 24 }}
|
|
933
|
+
/>
|
|
934
|
+
</>,
|
|
935
|
+
);
|
|
936
|
+
expect(screen.getByTestId('primary-navigation')).toHaveStyle({
|
|
937
|
+
minHeight: 129.2,
|
|
938
|
+
borderTopWidth: 1,
|
|
939
|
+
});
|
|
940
|
+
expect(screen.getByTestId('reserved-height').props['children']).toBe(129.2);
|
|
941
|
+
expect(screen.getByRole('link', { name: 'Account' })).toHaveStyle({
|
|
942
|
+
padding: 8,
|
|
943
|
+
borderWidth: 3,
|
|
944
|
+
gap: 12,
|
|
945
|
+
});
|
|
946
|
+
expect(screen.getByText('Account')).toHaveStyle({ fontSize: 18, lineHeight: 30 });
|
|
947
|
+
jest.restoreAllMocks();
|
|
948
|
+
});
|
package/src/native.tsx
CHANGED
|
@@ -19,6 +19,9 @@ import {
|
|
|
19
19
|
View,
|
|
20
20
|
useWindowDimensions,
|
|
21
21
|
type GestureResponderEvent,
|
|
22
|
+
type LayoutChangeEvent,
|
|
23
|
+
type NativeScrollEvent,
|
|
24
|
+
type NativeSyntheticEvent,
|
|
22
25
|
type StyleProp,
|
|
23
26
|
type ViewStyle,
|
|
24
27
|
type TextStyle,
|
|
@@ -37,6 +40,10 @@ import {
|
|
|
37
40
|
import {
|
|
38
41
|
getNavigationLayout,
|
|
39
42
|
getNavigationBarHeight,
|
|
43
|
+
getNavigationBarVisualHeight,
|
|
44
|
+
getNavigationBarLineHeight,
|
|
45
|
+
NAVIGATION_BAR_DIMENSIONS,
|
|
46
|
+
type NavigationBarMetrics,
|
|
40
47
|
NAVIGATION_DIMENSIONS,
|
|
41
48
|
navigationMatches,
|
|
42
49
|
nextSectionHref,
|
|
@@ -78,15 +85,28 @@ export interface NavigationTheme {
|
|
|
78
85
|
readonly spacing: number;
|
|
79
86
|
readonly typography?: NavigationTypography;
|
|
80
87
|
}
|
|
88
|
+
function barMetrics(theme?: NavigationTheme): NavigationBarMetrics {
|
|
89
|
+
return {
|
|
90
|
+
...(theme === undefined ? {} : { spacing: theme.spacing }),
|
|
91
|
+
...(theme?.typography?.barFontSize === undefined
|
|
92
|
+
? {}
|
|
93
|
+
: { fontSize: theme.typography.barFontSize }),
|
|
94
|
+
...(theme?.typography?.lineHeight === undefined
|
|
95
|
+
? {}
|
|
96
|
+
: { lineHeight: theme.typography.lineHeight }),
|
|
97
|
+
};
|
|
98
|
+
}
|
|
81
99
|
function textStyle(theme: NavigationTheme, selected = false, bar = false): TextStyle {
|
|
82
100
|
const typography = theme.typography;
|
|
83
101
|
return {
|
|
84
102
|
fontFamily: typography?.fontFamily,
|
|
85
|
-
fontSize: bar
|
|
103
|
+
fontSize: bar
|
|
104
|
+
? (typography?.barFontSize ?? NAVIGATION_BAR_DIMENSIONS.labelFontSize)
|
|
105
|
+
: (typography?.fontSize ?? 14),
|
|
86
106
|
fontWeight: selected
|
|
87
107
|
? (typography?.activeFontWeight ?? '700')
|
|
88
108
|
: (typography?.fontWeight ?? '400'),
|
|
89
|
-
lineHeight: typography?.lineHeight,
|
|
109
|
+
lineHeight: bar ? getNavigationBarLineHeight(barMetrics(theme)) : typography?.lineHeight,
|
|
90
110
|
letterSpacing: typography?.letterSpacing,
|
|
91
111
|
};
|
|
92
112
|
}
|
|
@@ -137,7 +157,7 @@ function FocusablePressable({
|
|
|
137
157
|
Platform.OS === 'android'
|
|
138
158
|
? NAVIGATION_DIMENSIONS.androidTarget
|
|
139
159
|
: NAVIGATION_DIMENSIONS.target,
|
|
140
|
-
borderWidth:
|
|
160
|
+
borderWidth: NAVIGATION_BAR_DIMENSIONS.targetBorder,
|
|
141
161
|
borderColor: focused
|
|
142
162
|
? selected
|
|
143
163
|
? theme.activeText
|
|
@@ -270,9 +290,16 @@ function Target({
|
|
|
270
290
|
</FocusablePressable>
|
|
271
291
|
);
|
|
272
292
|
}
|
|
273
|
-
function Decorative({
|
|
293
|
+
function Decorative({
|
|
294
|
+
children,
|
|
295
|
+
style,
|
|
296
|
+
}: {
|
|
297
|
+
readonly children: ReactNode;
|
|
298
|
+
readonly style?: StyleProp<ViewStyle>;
|
|
299
|
+
}) {
|
|
274
300
|
return (
|
|
275
301
|
<View
|
|
302
|
+
style={style}
|
|
276
303
|
accessible={false}
|
|
277
304
|
accessibilityElementsHidden
|
|
278
305
|
importantForAccessibility="no-hide-descendants"
|
|
@@ -529,25 +556,31 @@ function Menu({
|
|
|
529
556
|
);
|
|
530
557
|
}
|
|
531
558
|
|
|
559
|
+
function compactVisualStyle(fontScale: number): ViewStyle {
|
|
560
|
+
return { height: getNavigationBarVisualHeight(fontScale), justifyContent: 'center' };
|
|
561
|
+
}
|
|
562
|
+
|
|
532
563
|
function Avatar({
|
|
533
564
|
profile,
|
|
534
565
|
active,
|
|
535
566
|
theme,
|
|
567
|
+
style,
|
|
536
568
|
}: {
|
|
537
569
|
readonly profile: NavigationProfile;
|
|
538
570
|
readonly active: boolean;
|
|
539
571
|
readonly theme: NavigationTheme;
|
|
572
|
+
readonly style?: StyleProp<ViewStyle>;
|
|
540
573
|
}) {
|
|
541
574
|
const [failedUrl, setFailedUrl] = useState<string>();
|
|
542
575
|
if (profile.renderAvatar !== undefined) {
|
|
543
576
|
return (
|
|
544
|
-
<Decorative>
|
|
577
|
+
<Decorative style={style}>
|
|
545
578
|
{profile.renderAvatar({ active, size: NAVIGATION_DIMENSIONS.avatar })}
|
|
546
579
|
</Decorative>
|
|
547
580
|
);
|
|
548
581
|
}
|
|
549
582
|
return (
|
|
550
|
-
<Decorative>
|
|
583
|
+
<Decorative style={style}>
|
|
551
584
|
{profile.imageUrl !== undefined && failedUrl !== profile.imageUrl ? (
|
|
552
585
|
<Image
|
|
553
586
|
source={{ uri: profile.imageUrl }}
|
|
@@ -558,7 +591,9 @@ function Avatar({
|
|
|
558
591
|
/>
|
|
559
592
|
) : (
|
|
560
593
|
<View style={[styles.avatar, { backgroundColor: theme.activeBackground }]}>
|
|
561
|
-
<Text style={{ ...textStyle(theme), color: theme.activeText }}>
|
|
594
|
+
<Text allowFontScaling={false} style={{ ...textStyle(theme), color: theme.activeText }}>
|
|
595
|
+
{profile.initials}
|
|
596
|
+
</Text>
|
|
562
597
|
</View>
|
|
563
598
|
)}
|
|
564
599
|
</Decorative>
|
|
@@ -577,6 +612,12 @@ interface ProfileProps {
|
|
|
577
612
|
readonly pathname: string;
|
|
578
613
|
readonly onNavigate: Navigate;
|
|
579
614
|
readonly roving: ReturnType<ReturnType<typeof useRovingMenu>['itemProps']>;
|
|
615
|
+
readonly onLayout?: (event: LayoutChangeEvent) => void;
|
|
616
|
+
}
|
|
617
|
+
function profileIsActive(profile: NavigationProfile, pathname: string): boolean {
|
|
618
|
+
return profile.href !== undefined
|
|
619
|
+
? navigationMatches({ id: 'profile', label: profile.label, href: profile.href }, pathname)
|
|
620
|
+
: resolveActiveMenuEntry(profile.menu, pathname) !== null;
|
|
580
621
|
}
|
|
581
622
|
function Profile({
|
|
582
623
|
profile,
|
|
@@ -590,13 +631,16 @@ function Profile({
|
|
|
590
631
|
pathname,
|
|
591
632
|
onNavigate,
|
|
592
633
|
roving,
|
|
634
|
+
onLayout,
|
|
593
635
|
}: ProfileProps) {
|
|
594
|
-
const
|
|
595
|
-
|
|
596
|
-
? navigationMatches({ id: 'profile', label: profile.label, href: profile.href }, pathname)
|
|
597
|
-
: resolveActiveMenuEntry(profile.menu, pathname) !== null;
|
|
636
|
+
const { fontScale } = useWindowDimensions();
|
|
637
|
+
const active = profileIsActive(profile, pathname);
|
|
598
638
|
return (
|
|
599
|
-
<View
|
|
639
|
+
<View
|
|
640
|
+
style={bar ? styles.barSection : styles.profile}
|
|
641
|
+
testID="navigation-profile"
|
|
642
|
+
onLayout={onLayout}
|
|
643
|
+
>
|
|
600
644
|
<Target
|
|
601
645
|
label={profile.label}
|
|
602
646
|
subtitle={profile.subtitle}
|
|
@@ -614,15 +658,61 @@ function Profile({
|
|
|
614
658
|
else onOpen();
|
|
615
659
|
}}
|
|
616
660
|
>
|
|
617
|
-
<Avatar
|
|
661
|
+
<Avatar
|
|
662
|
+
profile={profile}
|
|
663
|
+
active={active}
|
|
664
|
+
theme={theme}
|
|
665
|
+
style={bar ? compactVisualStyle(fontScale) : undefined}
|
|
666
|
+
/>
|
|
618
667
|
</Target>
|
|
619
668
|
</View>
|
|
620
669
|
);
|
|
621
670
|
}
|
|
622
671
|
|
|
623
|
-
export function useNavigationBarHeight(bottomInset = 0): number {
|
|
672
|
+
export function useNavigationBarHeight(bottomInset = 0, theme?: NavigationTheme): number {
|
|
624
673
|
const { fontScale } = useWindowDimensions();
|
|
625
|
-
return getNavigationBarHeight(fontScale, bottomInset);
|
|
674
|
+
return getNavigationBarHeight(fontScale, bottomInset, barMetrics(theme));
|
|
675
|
+
}
|
|
676
|
+
|
|
677
|
+
function useCompactBarScroll(selectedIndex: number) {
|
|
678
|
+
const ref = useRef<ScrollView>(null);
|
|
679
|
+
const viewport = useRef(0);
|
|
680
|
+
const content = useRef(0);
|
|
681
|
+
const offset = useRef(0);
|
|
682
|
+
const frames = useRef(new Map<number, { x: number; width: number }>());
|
|
683
|
+
const revealSelected = useCallback(() => {
|
|
684
|
+
const frame = frames.current.get(selectedIndex);
|
|
685
|
+
if (frame === undefined || viewport.current === 0 || content.current === 0) return;
|
|
686
|
+
if (frame.x >= offset.current && frame.x + frame.width <= offset.current + viewport.current)
|
|
687
|
+
return;
|
|
688
|
+
const x = Math.max(
|
|
689
|
+
0,
|
|
690
|
+
Math.min(frame.x + (frame.width - viewport.current) / 2, content.current - viewport.current),
|
|
691
|
+
);
|
|
692
|
+
ref.current?.scrollTo({ x, animated: false });
|
|
693
|
+
offset.current = x;
|
|
694
|
+
}, [selectedIndex]);
|
|
695
|
+
useEffect(revealSelected, [revealSelected]);
|
|
696
|
+
return {
|
|
697
|
+
scrollProps: {
|
|
698
|
+
ref,
|
|
699
|
+
onLayout: (event: LayoutChangeEvent) => {
|
|
700
|
+
viewport.current = event.nativeEvent.layout.width;
|
|
701
|
+
revealSelected();
|
|
702
|
+
},
|
|
703
|
+
onContentSizeChange: (width: number) => {
|
|
704
|
+
content.current = width;
|
|
705
|
+
revealSelected();
|
|
706
|
+
},
|
|
707
|
+
onScroll: (event: NativeSyntheticEvent<NativeScrollEvent>) => {
|
|
708
|
+
offset.current = event.nativeEvent.contentOffset.x;
|
|
709
|
+
},
|
|
710
|
+
},
|
|
711
|
+
itemLayout: (index: number) => (event: LayoutChangeEvent) => {
|
|
712
|
+
frames.current.set(index, event.nativeEvent.layout);
|
|
713
|
+
revealSelected();
|
|
714
|
+
},
|
|
715
|
+
};
|
|
626
716
|
}
|
|
627
717
|
|
|
628
718
|
export interface AppNavigationProps extends CollapseProps {
|
|
@@ -670,13 +760,17 @@ export function AppNavigation(props: AppNavigationProps) {
|
|
|
670
760
|
const activeId = visible.some((item) => item.id === state.active.subItem?.id)
|
|
671
761
|
? state.active.subItem?.id
|
|
672
762
|
: state.active.item?.id;
|
|
763
|
+
const profileActive = profile !== undefined && profileIsActive(profile, pathname);
|
|
764
|
+
const compactScroll = useCompactBarScroll(
|
|
765
|
+
bar ? (profileActive ? items.length : items.findIndex((item) => item.id === activeId)) : -1,
|
|
766
|
+
);
|
|
673
767
|
const roving = useRovingMenu({
|
|
674
768
|
active: true,
|
|
675
769
|
options: [
|
|
676
770
|
...visible.map((item) => ({
|
|
677
771
|
selected: item.id === activeId,
|
|
678
772
|
})),
|
|
679
|
-
...(profile === undefined ? [] : [{}]),
|
|
773
|
+
...(profile === undefined ? [] : [{ selected: profileActive }]),
|
|
680
774
|
],
|
|
681
775
|
});
|
|
682
776
|
const renderBackground = (backgroundProps: OverlayBackgroundProps = {}) => (
|
|
@@ -693,7 +787,13 @@ export function AppNavigation(props: AppNavigationProps) {
|
|
|
693
787
|
borderColor: theme.border,
|
|
694
788
|
paddingBottom: insets.bottom ?? 0,
|
|
695
789
|
...(bar
|
|
696
|
-
? {
|
|
790
|
+
? {
|
|
791
|
+
minHeight: getNavigationBarHeight(
|
|
792
|
+
dimensions.fontScale,
|
|
793
|
+
insets.bottom,
|
|
794
|
+
barMetrics(theme),
|
|
795
|
+
),
|
|
796
|
+
}
|
|
697
797
|
: {}),
|
|
698
798
|
paddingLeft: insets.left ?? 0,
|
|
699
799
|
paddingRight: insets.right ?? 0,
|
|
@@ -721,8 +821,10 @@ export function AppNavigation(props: AppNavigationProps) {
|
|
|
721
821
|
</Target>
|
|
722
822
|
) : null}
|
|
723
823
|
<ScrollView
|
|
824
|
+
{...(bar ? compactScroll.scrollProps : {})}
|
|
825
|
+
testID="navigation-items"
|
|
724
826
|
horizontal={bar}
|
|
725
|
-
scrollEnabled
|
|
827
|
+
scrollEnabled
|
|
726
828
|
showsHorizontalScrollIndicator={false}
|
|
727
829
|
style={bar ? styles.barItems : styles.railItems}
|
|
728
830
|
contentContainerStyle={bar ? styles.barContent : undefined}
|
|
@@ -737,6 +839,7 @@ export function AppNavigation(props: AppNavigationProps) {
|
|
|
737
839
|
key={item.id}
|
|
738
840
|
style={bar ? styles.barSection : undefined}
|
|
739
841
|
testID={`navigation-section-${item.id}`}
|
|
842
|
+
onLayout={bar ? compactScroll.itemLayout(index) : undefined}
|
|
740
843
|
>
|
|
741
844
|
<Target
|
|
742
845
|
label={item.label}
|
|
@@ -754,7 +857,9 @@ export function AppNavigation(props: AppNavigationProps) {
|
|
|
754
857
|
else follow(href, event, onNavigate);
|
|
755
858
|
}}
|
|
756
859
|
>
|
|
757
|
-
<Decorative
|
|
860
|
+
<Decorative style={bar ? compactVisualStyle(dimensions.fontScale) : undefined}>
|
|
861
|
+
{item.icon({ active, size: NAVIGATION_BAR_DIMENSIONS.icon })}
|
|
862
|
+
</Decorative>
|
|
758
863
|
</Target>
|
|
759
864
|
{!bar && open && children.length > 0 ? (
|
|
760
865
|
<View
|
|
@@ -803,6 +908,7 @@ export function AppNavigation(props: AppNavigationProps) {
|
|
|
803
908
|
pathname={pathname}
|
|
804
909
|
onNavigate={onNavigate}
|
|
805
910
|
roving={roving.itemProps(visible.length)}
|
|
911
|
+
onLayout={compactScroll.itemLayout(items.length)}
|
|
806
912
|
/>
|
|
807
913
|
) : null}
|
|
808
914
|
</ScrollView>
|
|
@@ -929,21 +1035,21 @@ const styles = StyleSheet.create({
|
|
|
929
1035
|
labelGroup: { minWidth: 0, flexShrink: 1 },
|
|
930
1036
|
menuProfile: { padding: 8 },
|
|
931
1037
|
target: {
|
|
932
|
-
padding:
|
|
1038
|
+
padding: NAVIGATION_BAR_DIMENSIONS.targetPadding,
|
|
933
1039
|
},
|
|
934
1040
|
railTarget: { flexDirection: 'row', alignItems: 'center' },
|
|
935
1041
|
collapsedTarget: { justifyContent: 'center' },
|
|
936
1042
|
barTarget: { flexDirection: 'column', alignItems: 'center', justifyContent: 'center', flex: 1 },
|
|
937
1043
|
bar: {
|
|
938
1044
|
flexDirection: 'row',
|
|
939
|
-
minHeight: NAVIGATION_DIMENSIONS.
|
|
940
|
-
borderTopWidth:
|
|
1045
|
+
minHeight: NAVIGATION_DIMENSIONS.nativeBar,
|
|
1046
|
+
borderTopWidth: NAVIGATION_BAR_DIMENSIONS.border,
|
|
941
1047
|
width: '100%',
|
|
942
1048
|
},
|
|
943
1049
|
rail: { borderRightWidth: 1, height: '100%' },
|
|
944
1050
|
railItems: { flex: 1 },
|
|
945
1051
|
barItems: { width: '100%' },
|
|
946
|
-
barContent: { flexDirection: 'row', flexGrow: 1 },
|
|
1052
|
+
barContent: { flexDirection: 'row', flexGrow: 1, minWidth: '100%' },
|
|
947
1053
|
barSection: { flex: 1, minWidth: NAVIGATION_DIMENSIONS.target },
|
|
948
1054
|
children: { marginLeft: 20, paddingLeft: 8, borderLeftWidth: 1 },
|
|
949
1055
|
profile: { position: 'relative', marginTop: 'auto', paddingTop: 8, borderTopWidth: 1 },
|
package/src/web.browser.test.tsx
CHANGED
|
@@ -458,3 +458,20 @@ it.each([600, 1024])('tabs into a visible Insights parent at width %s', async (w
|
|
|
458
458
|
.element(page.getByRole(width === 1024 ? 'button' : 'link', { name: 'Insights' }))
|
|
459
459
|
.toHaveFocus();
|
|
460
460
|
});
|
|
461
|
+
|
|
462
|
+
it('uses the body font in a standalone section picker', async () => {
|
|
463
|
+
styles = document.createElement('style');
|
|
464
|
+
styles.textContent = `${toCssVariables(exampleTokens)} ${stylesheet} body { font-family: serif; }`;
|
|
465
|
+
document.head.append(styles);
|
|
466
|
+
host = document.createElement('div');
|
|
467
|
+
document.body.append(host);
|
|
468
|
+
root = createRoot(host);
|
|
469
|
+
await act(() => {
|
|
470
|
+
root?.render(<SectionPicker item={section} pathname="/progress" />);
|
|
471
|
+
return Promise.resolve();
|
|
472
|
+
});
|
|
473
|
+
const picker = host.querySelector('.bk-navigation-picker');
|
|
474
|
+
expect(picker).not.toBeNull();
|
|
475
|
+
if (picker === null) throw new Error('Section picker is missing');
|
|
476
|
+
expect(getComputedStyle(picker).fontFamily).toBe(exampleTokens.typography.family.body);
|
|
477
|
+
});
|
package/src/web.css
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
.bk-navigation,
|
|
2
2
|
.bk-navigation-picker {
|
|
3
|
+
font-family: var(--bk-typography-family-body);
|
|
3
4
|
--bk-navigation-active-background: color-mix(
|
|
4
5
|
in srgb,
|
|
5
6
|
var(--bk-color-background-accent) 14%,
|
|
@@ -18,7 +19,6 @@
|
|
|
18
19
|
box-sizing: border-box;
|
|
19
20
|
color: var(--bk-color-text-primary);
|
|
20
21
|
background: var(--bk-color-background-primary);
|
|
21
|
-
font-family: var(--bk-typography-family-body);
|
|
22
22
|
}
|
|
23
23
|
.bk-navigation *,
|
|
24
24
|
.bk-navigation-picker * {
|