expo-android-glass-view 0.1.0 → 0.1.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/CHANGELOG.md +4 -2
- package/README.md +83 -13
- package/build/AndroidGlassBottomTabs.android.d.ts.map +1 -1
- package/build/AndroidGlassBottomTabs.android.js +11 -2
- package/build/AndroidGlassBottomTabs.android.js.map +1 -1
- package/build/AndroidGlassComponents.types.d.ts +5 -4
- package/build/AndroidGlassComponents.types.d.ts.map +1 -1
- package/build/AndroidGlassComponents.types.js.map +1 -1
- package/build/MinimizeOnScroll.d.ts +41 -0
- package/build/MinimizeOnScroll.d.ts.map +1 -0
- package/build/MinimizeOnScroll.js +76 -0
- package/build/MinimizeOnScroll.js.map +1 -0
- package/build/index.d.ts +1 -1
- package/build/index.d.ts.map +1 -1
- package/build/index.js +1 -1
- package/build/index.js.map +1 -1
- package/package.json +1 -1
- package/src/AndroidGlassBottomTabs.android.tsx +10 -2
- package/src/AndroidGlassComponents.types.ts +5 -4
- package/src/MinimizeOnScroll.tsx +98 -0
- package/src/index.ts +6 -1
- package/build/useMinimizeOnScroll.d.ts +0 -17
- package/build/useMinimizeOnScroll.d.ts.map +0 -1
- package/build/useMinimizeOnScroll.js +0 -39
- package/build/useMinimizeOnScroll.js.map +0 -1
- package/src/useMinimizeOnScroll.ts +0 -53
package/CHANGELOG.md
CHANGED
|
@@ -8,6 +8,8 @@ First release.
|
|
|
8
8
|
whose backdrop is the live React Native screen behind it.
|
|
9
9
|
- `AndroidGlassButton`, `AndroidGlassToggle`, `AndroidGlassSlider`, `AndroidGlassBottomTabs` and
|
|
10
10
|
`AndroidGlassTab`: Kyant's Backdrop Catalog components, driven from React Native.
|
|
11
|
-
-
|
|
12
|
-
|
|
11
|
+
- Minimize on scroll: the tab bar shrinks while a list scrolls down and comes back on scroll up or
|
|
12
|
+
touch, like iOS 26. Animated natively. `MinimizeOnScrollProvider` + `useMinimizeOnScrollHandler`
|
|
13
|
+
share it across a navigator's screens; `useMinimizeOnScroll` and the `minimized` prop cover a
|
|
14
|
+
single component.
|
|
13
15
|
- iOS and web: plain fallbacks with the same API.
|
package/README.md
CHANGED
|
@@ -19,6 +19,8 @@ import {
|
|
|
19
19
|
AndroidGlassSlider,
|
|
20
20
|
AndroidGlassBottomTabs,
|
|
21
21
|
AndroidGlassTab,
|
|
22
|
+
MinimizeOnScrollProvider,
|
|
23
|
+
useMinimizeOnScrollHandler,
|
|
22
24
|
useMinimizeOnScroll,
|
|
23
25
|
} from 'expo-android-glass-view';
|
|
24
26
|
```
|
|
@@ -184,27 +186,95 @@ droplet returns to `selectedIndex`.
|
|
|
184
186
|
|
|
185
187
|
Like iOS 26 tab bars, the bar can shrink while the user scrolls down a list, and come back when
|
|
186
188
|
they scroll up, get back to the top or touch it. It gets shorter and narrower; every tab keeps its
|
|
187
|
-
first child (the icon) while the rest (the label) fades out.
|
|
188
|
-
|
|
189
|
+
first child (the icon) while the rest (the label) fades out.
|
|
190
|
+
|
|
191
|
+
Wrap the bar and the screens in `MinimizeOnScrollProvider`, and give each list the handler from
|
|
192
|
+
`useMinimizeOnScrollHandler`:
|
|
193
|
+
|
|
194
|
+
```tsx
|
|
195
|
+
<MinimizeOnScrollProvider>
|
|
196
|
+
{/* your navigator, or screens + AndroidGlassBottomTabs */}
|
|
197
|
+
</MinimizeOnScrollProvider>
|
|
198
|
+
|
|
199
|
+
// In any screen:
|
|
200
|
+
const onScroll = useMinimizeOnScrollHandler();
|
|
201
|
+
<FlatList onScroll={onScroll} scrollEventThrottle={16} … />
|
|
202
|
+
```
|
|
203
|
+
|
|
204
|
+
Inside the provider, `AndroidGlassBottomTabs` follows the shared state by itself (unless you pass
|
|
205
|
+
`minimized`). Each list tracks its own scroll position, and a screen isn't re-rendered when the
|
|
206
|
+
bar minimizes. The scroll position is read in JS, where the list lives; only the resulting flag
|
|
207
|
+
goes to the native side, where the animation runs. Any list that reports `onScroll` works
|
|
208
|
+
(ScrollView, FlatList, SectionList, FlashList…); if you already have an `onScroll`, call the
|
|
209
|
+
handler from it.
|
|
210
|
+
|
|
211
|
+
When the list and the bar are in the same component, `useMinimizeOnScroll` alone is enough:
|
|
189
212
|
|
|
190
213
|
```tsx
|
|
191
214
|
const { minimized, setMinimized, onScroll } = useMinimizeOnScroll();
|
|
192
215
|
|
|
193
216
|
<ScrollView onScroll={onScroll} scrollEventThrottle={16}>…</ScrollView>
|
|
217
|
+
<AndroidGlassBottomTabs minimized={minimized} onMinimizedChange={setMinimized} …>…</AndroidGlassBottomTabs>
|
|
218
|
+
```
|
|
194
219
|
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
220
|
+
The iOS and web fallbacks don't minimize; there, `useMinimizeOnScrollHandler` returns `undefined`.
|
|
221
|
+
|
|
222
|
+
### With Expo Router or React Navigation
|
|
223
|
+
|
|
224
|
+
The bar doesn't navigate by itself: use it as the navigator's `tabBar`, driven by the navigation
|
|
225
|
+
state. Tap vetoes (`tabPress` with `preventDefault`) send the droplet back.
|
|
226
|
+
|
|
227
|
+
```tsx
|
|
228
|
+
import { Tabs } from 'expo-router';
|
|
229
|
+
import type { BottomTabBarProps } from 'expo-router/js-tabs';
|
|
230
|
+
import { StyleSheet } from 'react-native';
|
|
231
|
+
import {
|
|
232
|
+
AndroidGlassBottomTabs,
|
|
233
|
+
AndroidGlassTab,
|
|
234
|
+
MinimizeOnScrollProvider,
|
|
235
|
+
} from 'expo-android-glass-view';
|
|
236
|
+
|
|
237
|
+
function GlassTabBar({ state, descriptors, navigation }: BottomTabBarProps) {
|
|
238
|
+
// Routes hidden with `href: null` reach a custom bar as `display: 'none'`.
|
|
239
|
+
const routes = state.routes.filter(
|
|
240
|
+
(route) => StyleSheet.flatten(descriptors[route.key].options.tabBarItemStyle)?.display !== 'none'
|
|
241
|
+
);
|
|
242
|
+
const focusedKey = state.routes[state.index].key;
|
|
243
|
+
return (
|
|
244
|
+
<AndroidGlassBottomTabs
|
|
245
|
+
selectedIndex={routes.findIndex((route) => route.key === focusedKey)}
|
|
246
|
+
onTabSelected={(index) => {
|
|
247
|
+
const route = routes[index];
|
|
248
|
+
const event = navigation.emit({ type: 'tabPress', target: route.key, canPreventDefault: true });
|
|
249
|
+
if (!event.defaultPrevented) navigation.navigate(route.name, route.params);
|
|
250
|
+
}}
|
|
251
|
+
style={{ position: 'absolute', left: 24, right: 24, bottom: 32 }}>
|
|
252
|
+
{routes.map((route) => {
|
|
253
|
+
const { options } = descriptors[route.key];
|
|
254
|
+
return (
|
|
255
|
+
<AndroidGlassTab
|
|
256
|
+
key={route.key}
|
|
257
|
+
label={options.title ?? route.name}
|
|
258
|
+
// The droplet tints the selected tab, so draw icons in one neutral colour.
|
|
259
|
+
icon={options.tabBarIcon?.({ focused: false, color: '#000000', size: 24 })}
|
|
260
|
+
/>
|
|
261
|
+
);
|
|
262
|
+
})}
|
|
263
|
+
</AndroidGlassBottomTabs>
|
|
264
|
+
);
|
|
265
|
+
}
|
|
266
|
+
|
|
267
|
+
export default function TabLayout() {
|
|
268
|
+
return (
|
|
269
|
+
<MinimizeOnScrollProvider>
|
|
270
|
+
<Tabs tabBar={(props) => <GlassTabBar {...props} />} />
|
|
271
|
+
</MinimizeOnScrollProvider>
|
|
272
|
+
);
|
|
273
|
+
}
|
|
202
274
|
```
|
|
203
275
|
|
|
204
|
-
The
|
|
205
|
-
|
|
206
|
-
SectionList, FlashList…); if you already have an `onScroll`, call the hook's from it. The iOS and
|
|
207
|
-
web fallbacks don't minimize.
|
|
276
|
+
The bar floats over the screens, so give their content some bottom padding. With React
|
|
277
|
+
Navigation, the same component works as `createBottomTabNavigator`'s `tabBar`.
|
|
208
278
|
|
|
209
279
|
## Colours and dark mode
|
|
210
280
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AndroidGlassBottomTabs.android.d.ts","sourceRoot":"","sources":["../src/AndroidGlassBottomTabs.android.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAG/B,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,gCAAgC,CAAC;
|
|
1
|
+
{"version":3,"file":"AndroidGlassBottomTabs.android.d.ts","sourceRoot":"","sources":["../src/AndroidGlassBottomTabs.android.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAG/B,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,gCAAgC,CAAC;AAuBlF,MAAM,CAAC,OAAO,UAAU,sBAAsB,CAAC,EAC7C,aAAa,EACb,aAAa,EACb,SAAS,EACT,iBAAiB,EACjB,WAAW,EACX,cAAc,EACd,QAAQ,EACR,KAAK,EACL,GAAG,IAAI,EACR,EAAE,2BAA2B,qBAgD7B"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { requireNativeView } from 'expo';
|
|
2
2
|
import * as React from 'react';
|
|
3
3
|
import { StyleSheet, View } from 'react-native';
|
|
4
|
+
import { MinimizedStateContext } from './MinimizeOnScroll';
|
|
4
5
|
import { toNativeColor } from './utils';
|
|
5
6
|
const NativeAndroidGlassBottomTabs = requireNativeView('ExpoAndroidGlassView', 'AndroidGlassBottomTabs');
|
|
6
7
|
export default function AndroidGlassBottomTabs({ selectedIndex, onTabSelected, minimized, onMinimizedChange, accentColor, containerColor, children, style, ...rest }) {
|
|
@@ -11,12 +12,20 @@ export default function AndroidGlassBottomTabs({ selectedIndex, onTabSelected, m
|
|
|
11
12
|
// up with earlier selections) from a current one.
|
|
12
13
|
const [eventCount, setEventCount] = React.useState(0);
|
|
13
14
|
const selected = selectedIndex ?? ownIndex;
|
|
14
|
-
|
|
15
|
+
// Inside a MinimizeOnScrollProvider, the bar follows the shared state unless `minimized` is given.
|
|
16
|
+
const shared = React.useContext(MinimizedStateContext);
|
|
17
|
+
const followsProvider = minimized === undefined;
|
|
18
|
+
return (<NativeAndroidGlassBottomTabs accessibilityRole="tablist" {...rest} style={[styles.bar, style]} selectedIndex={selected} tabsCount={tabs.length} mostRecentEventCount={eventCount} minimized={minimized ?? shared?.minimized ?? false} accentColor={toNativeColor(accentColor)} containerColor={toNativeColor(containerColor)} onTabSelected={(event) => {
|
|
15
19
|
const { index, eventCount: count } = event.nativeEvent;
|
|
16
20
|
setEventCount((current) => Math.max(current, count));
|
|
17
21
|
setOwnIndex(index);
|
|
18
22
|
onTabSelected?.(index);
|
|
19
|
-
}} onMinimizedChange={(event) =>
|
|
23
|
+
}} onMinimizedChange={(event) => {
|
|
24
|
+
const value = event.nativeEvent.minimized;
|
|
25
|
+
if (followsProvider)
|
|
26
|
+
shared?.setMinimized(value);
|
|
27
|
+
onMinimizedChange?.(value);
|
|
28
|
+
}}>
|
|
20
29
|
{tabs.map((tab, index) => (
|
|
21
30
|
// The native bar handles taps and drags, and draws these views itself (inside the glass
|
|
22
31
|
// and, tinted, under the droplet), so they must stay real views and not take touches.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AndroidGlassBottomTabs.android.js","sourceRoot":"","sources":["../src/AndroidGlassBottomTabs.android.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,MAAM,CAAC;AACzC,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AAGhD,OAAO,EAAoB,aAAa,EAAE,MAAM,SAAS,CAAC;AAkB1D,MAAM,4BAA4B,GAChC,iBAAiB,CAAC,sBAAsB,EAAE,wBAAwB,CAAC,CAAC;AAEtE,MAAM,CAAC,OAAO,UAAU,sBAAsB,CAAC,EAC7C,aAAa,EACb,aAAa,EACb,SAAS,EACT,iBAAiB,EACjB,WAAW,EACX,cAAc,EACd,QAAQ,EACR,KAAK,EACL,GAAG,IAAI,EACqB;IAC5B,MAAM,IAAI,GAAG,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;IAC3E,sEAAsE;IACtE,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IAClD,+FAA+F;IAC/F,kDAAkD;IAClD,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IACtD,MAAM,QAAQ,GAAG,aAAa,IAAI,QAAQ,CAAC;IAC3C,OAAO,CACL,CAAC,4BAA4B,CAC3B,iBAAiB,CAAC,SAAS,CAC3B,IAAI,IAAI,CAAC,CACT,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAC3B,aAAa,CAAC,CAAC,QAAQ,CAAC,CACxB,SAAS,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CACvB,oBAAoB,CAAC,CAAC,UAAU,CAAC,CACjC,SAAS,CAAC,CAAC,SAAS,IAAI,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"AndroidGlassBottomTabs.android.js","sourceRoot":"","sources":["../src/AndroidGlassBottomTabs.android.tsx"],"names":[],"mappings":"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","sourcesContent":["import { requireNativeView } from 'expo';\nimport * as React from 'react';\nimport { StyleSheet, View } from 'react-native';\n\nimport type { AndroidGlassBottomTabsProps } from './AndroidGlassComponents.types';\nimport { MinimizedStateContext } from './MinimizeOnScroll';\nimport { type NativeColor, toNativeColor } from './utils';\n\ntype IndexEvent = { nativeEvent: { index: number; eventCount: number } };\ntype MinimizedEvent = { nativeEvent: { minimized: boolean } };\n\ntype NativeAndroidGlassBottomTabsProps = Omit<\n AndroidGlassBottomTabsProps,\n 'onTabSelected' | 'onMinimizedChange' | 'accentColor' | 'containerColor'\n> & {\n tabsCount: number;\n /** Count of the last selection event handled here (see ControlledProp on the native side). */\n mostRecentEventCount: number;\n onTabSelected: (event: IndexEvent) => void;\n onMinimizedChange: (event: MinimizedEvent) => void;\n accentColor?: NativeColor;\n containerColor?: NativeColor;\n};\n\nconst NativeAndroidGlassBottomTabs: React.ComponentType<NativeAndroidGlassBottomTabsProps> =\n requireNativeView('ExpoAndroidGlassView', 'AndroidGlassBottomTabs');\n\nexport default function AndroidGlassBottomTabs({\n selectedIndex,\n onTabSelected,\n minimized,\n onMinimizedChange,\n accentColor,\n containerColor,\n children,\n style,\n ...rest\n}: AndroidGlassBottomTabsProps) {\n const tabs = React.Children.toArray(children).filter(React.isValidElement);\n // Without a `selectedIndex` prop, the bar keeps the user's selection.\n const [ownIndex, setOwnIndex] = React.useState(0);\n // Sent back with `selectedIndex`, so the native side can tell a stale index (JS still catching\n // up with earlier selections) from a current one.\n const [eventCount, setEventCount] = React.useState(0);\n const selected = selectedIndex ?? ownIndex;\n // Inside a MinimizeOnScrollProvider, the bar follows the shared state unless `minimized` is given.\n const shared = React.useContext(MinimizedStateContext);\n const followsProvider = minimized === undefined;\n return (\n <NativeAndroidGlassBottomTabs\n accessibilityRole=\"tablist\"\n {...rest}\n style={[styles.bar, style]}\n selectedIndex={selected}\n tabsCount={tabs.length}\n mostRecentEventCount={eventCount}\n minimized={minimized ?? shared?.minimized ?? false}\n accentColor={toNativeColor(accentColor)}\n containerColor={toNativeColor(containerColor)}\n onTabSelected={(event) => {\n const { index, eventCount: count } = event.nativeEvent;\n setEventCount((current) => Math.max(current, count));\n setOwnIndex(index);\n onTabSelected?.(index);\n }}\n onMinimizedChange={(event) => {\n const value = event.nativeEvent.minimized;\n if (followsProvider) shared?.setMinimized(value);\n onMinimizedChange?.(value);\n }}>\n {tabs.map((tab, index) => (\n // The native bar handles taps and drags, and draws these views itself (inside the glass\n // and, tinted, under the droplet), so they must stay real views and not take touches.\n <View\n key={tab.key ?? index}\n collapsable={false}\n pointerEvents=\"none\"\n accessibilityRole=\"tab\"\n accessibilityState={{ selected: index === selected }}\n style={styles.tab}>\n {tab}\n </View>\n ))}\n </NativeAndroidGlassBottomTabs>\n );\n}\n\nconst styles = StyleSheet.create({\n // 4 dp side padding keeps the tabs aligned with the droplet: (width - 8 dp) / count each.\n bar: {\n height: 64,\n flexDirection: 'row',\n paddingHorizontal: 4,\n },\n tab: {\n flex: 1,\n alignItems: 'center',\n justifyContent: 'center',\n gap: 2,\n },\n});\n"]}
|
|
@@ -47,13 +47,14 @@ export type AndroidGlassBottomTabsProps = ViewProps & {
|
|
|
47
47
|
onTabSelected?: (index: number) => void;
|
|
48
48
|
/**
|
|
49
49
|
* Minimizes the bar, like iOS 26 tab bars on scroll: it gets shorter and narrower, each tab keeps
|
|
50
|
-
* only its first child (the icon) and the rest (the label) fades out. Animated natively
|
|
51
|
-
*
|
|
50
|
+
* only its first child (the icon) and the rest (the label) fades out. Animated natively. Inside a
|
|
51
|
+
* `MinimizeOnScrollProvider`, leave it out: the bar follows the provider. Android only.
|
|
52
52
|
*/
|
|
53
53
|
minimized?: boolean;
|
|
54
54
|
/**
|
|
55
|
-
* Called with `false` when the user expands the minimized bar by touching it.
|
|
56
|
-
* `
|
|
55
|
+
* Called with `false` when the user expands the minimized bar by touching it. With
|
|
56
|
+
* `useMinimizeOnScroll`, pass its `setMinimized`; inside a `MinimizeOnScrollProvider` it isn't
|
|
57
|
+
* needed.
|
|
57
58
|
*/
|
|
58
59
|
onMinimizedChange?: (minimized: boolean) => void;
|
|
59
60
|
/** Colour the selected tab's content takes under the droplet. Default system blue. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AndroidGlassComponents.types.d.ts","sourceRoot":"","sources":["../src/AndroidGlassComponents.types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AACvC,OAAO,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEhF,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AAEtE;;;;GAIG;AACH,MAAM,MAAM,uBAAuB,GAAG,qBAAqB,GAAG;IAC5D,wCAAwC;IACxC,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;IACrB,uDAAuD;IACvD,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;IAClC;;;OAGG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG,SAAS,GAAG;IAChD,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,CAAC;IACzC,+CAA+C;IAC/C,WAAW,CAAC,EAAE,UAAU,CAAC;IACzB,6BAA6B;IAC7B,UAAU,CAAC,EAAE,UAAU,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG,SAAS,GAAG;IAChD,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,iBAAiB;IACjB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,iBAAiB;IACjB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,sDAAsD;IACtD,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACxC,0EAA0E;IAC1E,iBAAiB,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAC5C,mEAAmE;IACnE,WAAW,CAAC,EAAE,UAAU,CAAC;IACzB,UAAU,CAAC,EAAE,UAAU,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,2BAA2B,GAAG,SAAS,GAAG;IACpD,iCAAiC;IACjC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,mEAAmE;IACnE,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACxC;;;;OAIG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB
|
|
1
|
+
{"version":3,"file":"AndroidGlassComponents.types.d.ts","sourceRoot":"","sources":["../src/AndroidGlassComponents.types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AACvC,OAAO,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEhF,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AAEtE;;;;GAIG;AACH,MAAM,MAAM,uBAAuB,GAAG,qBAAqB,GAAG;IAC5D,wCAAwC;IACxC,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;IACrB,uDAAuD;IACvD,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;IAClC;;;OAGG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG,SAAS,GAAG;IAChD,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,CAAC;IACzC,+CAA+C;IAC/C,WAAW,CAAC,EAAE,UAAU,CAAC;IACzB,6BAA6B;IAC7B,UAAU,CAAC,EAAE,UAAU,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG,SAAS,GAAG;IAChD,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,iBAAiB;IACjB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,iBAAiB;IACjB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,sDAAsD;IACtD,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACxC,0EAA0E;IAC1E,iBAAiB,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAC5C,mEAAmE;IACnE,WAAW,CAAC,EAAE,UAAU,CAAC;IACzB,UAAU,CAAC,EAAE,UAAU,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,2BAA2B,GAAG,SAAS,GAAG;IACpD,iCAAiC;IACjC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,mEAAmE;IACnE,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACxC;;;;OAIG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB;;;;OAIG;IACH,iBAAiB,CAAC,EAAE,CAAC,SAAS,EAAE,OAAO,KAAK,IAAI,CAAC;IACjD,sFAAsF;IACtF,WAAW,CAAC,EAAE,UAAU,CAAC;IACzB,+BAA+B;IAC/B,cAAc,CAAC,EAAE,UAAU,CAAC;IAC5B,wEAAwE;IACxE,QAAQ,CAAC,EAAE,SAAS,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IACjC,IAAI,CAAC,EAAE,SAAS,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;CACnC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AndroidGlassComponents.types.js","sourceRoot":"","sources":["../src/AndroidGlassComponents.types.ts"],"names":[],"mappings":"","sourcesContent":["import type { ReactNode } from 'react';\nimport type { ColorValue, StyleProp, TextStyle, ViewProps } from 'react-native';\n\nimport type { AndroidGlassViewProps } from './AndroidGlassView.types';\n\n/**\n * Accepts every `AndroidGlassView` glass prop. `cornerRadius` defaults to a capsule.\n * Children (label, icon, …) are drawn inside the glass and follow its press deformation; they\n * are decorative, so don't put interactive elements in a button.\n */\nexport type AndroidGlassButtonProps = AndroidGlassViewProps & {\n /** Called when the button is tapped. */\n onPress?: () => void;\n /** Convenience label, rendered before the children. */\n title?: string;\n titleStyle?: StyleProp<TextStyle>;\n /**\n * Press and drag feedback: the glass stretches towards the finger and a highlight follows it.\n * Default true.\n */\n interactive?: boolean;\n};\n\nexport type AndroidGlassToggleProps = ViewProps & {\n value?: boolean;\n onValueChange?: (value: boolean) => void;\n /** Track colour when on. Default iOS green. */\n accentColor?: ColorValue;\n /** Track colour when off. */\n trackColor?: ColorValue;\n};\n\nexport type AndroidGlassSliderProps = ViewProps & {\n value?: number;\n /** Default 0. */\n minimumValue?: number;\n /** Default 1. */\n maximumValue?: number;\n /** Called continuously while the thumb is dragged. */\n onValueChange?: (value: number) => void;\n /** Called once when the finger is lifted, or after a tap on the track. */\n onSlidingComplete?: (value: number) => void;\n /** Colour of the filled part of the track. Default system blue. */\n accentColor?: ColorValue;\n trackColor?: ColorValue;\n};\n\nexport type AndroidGlassBottomTabsProps = ViewProps & {\n /** Index of the selected tab. */\n selectedIndex?: number;\n /** Called when the user taps a tab or drops the droplet on one. */\n onTabSelected?: (index: number) => void;\n /**\n * Minimizes the bar, like iOS 26 tab bars on scroll: it gets shorter and narrower, each tab keeps\n * only its first child (the icon) and the rest (the label) fades out. Animated natively
|
|
1
|
+
{"version":3,"file":"AndroidGlassComponents.types.js","sourceRoot":"","sources":["../src/AndroidGlassComponents.types.ts"],"names":[],"mappings":"","sourcesContent":["import type { ReactNode } from 'react';\nimport type { ColorValue, StyleProp, TextStyle, ViewProps } from 'react-native';\n\nimport type { AndroidGlassViewProps } from './AndroidGlassView.types';\n\n/**\n * Accepts every `AndroidGlassView` glass prop. `cornerRadius` defaults to a capsule.\n * Children (label, icon, …) are drawn inside the glass and follow its press deformation; they\n * are decorative, so don't put interactive elements in a button.\n */\nexport type AndroidGlassButtonProps = AndroidGlassViewProps & {\n /** Called when the button is tapped. */\n onPress?: () => void;\n /** Convenience label, rendered before the children. */\n title?: string;\n titleStyle?: StyleProp<TextStyle>;\n /**\n * Press and drag feedback: the glass stretches towards the finger and a highlight follows it.\n * Default true.\n */\n interactive?: boolean;\n};\n\nexport type AndroidGlassToggleProps = ViewProps & {\n value?: boolean;\n onValueChange?: (value: boolean) => void;\n /** Track colour when on. Default iOS green. */\n accentColor?: ColorValue;\n /** Track colour when off. */\n trackColor?: ColorValue;\n};\n\nexport type AndroidGlassSliderProps = ViewProps & {\n value?: number;\n /** Default 0. */\n minimumValue?: number;\n /** Default 1. */\n maximumValue?: number;\n /** Called continuously while the thumb is dragged. */\n onValueChange?: (value: number) => void;\n /** Called once when the finger is lifted, or after a tap on the track. */\n onSlidingComplete?: (value: number) => void;\n /** Colour of the filled part of the track. Default system blue. */\n accentColor?: ColorValue;\n trackColor?: ColorValue;\n};\n\nexport type AndroidGlassBottomTabsProps = ViewProps & {\n /** Index of the selected tab. */\n selectedIndex?: number;\n /** Called when the user taps a tab or drops the droplet on one. */\n onTabSelected?: (index: number) => void;\n /**\n * Minimizes the bar, like iOS 26 tab bars on scroll: it gets shorter and narrower, each tab keeps\n * only its first child (the icon) and the rest (the label) fades out. Animated natively. Inside a\n * `MinimizeOnScrollProvider`, leave it out: the bar follows the provider. Android only.\n */\n minimized?: boolean;\n /**\n * Called with `false` when the user expands the minimized bar by touching it. With\n * `useMinimizeOnScroll`, pass its `setMinimized`; inside a `MinimizeOnScrollProvider` it isn't\n * needed.\n */\n onMinimizedChange?: (minimized: boolean) => void;\n /** Colour the selected tab's content takes under the droplet. Default system blue. */\n accentColor?: ColorValue;\n /** Colour of the glass bar. */\n containerColor?: ColorValue;\n /** One child per tab, e.g. `AndroidGlassTab`. Tabs get equal widths. */\n children?: ReactNode;\n};\n\nexport type AndroidGlassTabProps = {\n icon?: ReactNode;\n label?: string;\n labelStyle?: StyleProp<TextStyle>;\n};\n"]}
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
import * as React from 'react';
|
|
2
|
+
import { type NativeScrollEvent, type NativeSyntheticEvent } from 'react-native';
|
|
3
|
+
type ScrollHandler = (event: NativeSyntheticEvent<NativeScrollEvent>) => void;
|
|
4
|
+
type SetMinimized = (minimized: boolean) => void;
|
|
5
|
+
type MinimizedState = {
|
|
6
|
+
minimized: boolean;
|
|
7
|
+
setMinimized: SetMinimized;
|
|
8
|
+
};
|
|
9
|
+
export type MinimizeOnScroll = {
|
|
10
|
+
/** Pass to `AndroidGlassBottomTabs`' `minimized`. */
|
|
11
|
+
minimized: boolean;
|
|
12
|
+
/** Pass to `AndroidGlassBottomTabs`' `onMinimizedChange`. Can also force a state. */
|
|
13
|
+
setMinimized: SetMinimized;
|
|
14
|
+
/** Pass to the list's `onScroll`, together with `scrollEventThrottle={16}`. */
|
|
15
|
+
onScroll: ScrollHandler;
|
|
16
|
+
};
|
|
17
|
+
/** Read by AndroidGlassBottomTabs; not part of the public API. */
|
|
18
|
+
export declare const MinimizedStateContext: React.Context<MinimizedState | null>;
|
|
19
|
+
/**
|
|
20
|
+
* Shares one minimize state between the tab bar and any number of lists, e.g. around a
|
|
21
|
+
* navigator's tabs, where the bar and the screens are different components. Inside it,
|
|
22
|
+
* `AndroidGlassBottomTabs` follows the shared state unless it gets a `minimized` prop.
|
|
23
|
+
*/
|
|
24
|
+
export declare function MinimizeOnScrollProvider({ children }: {
|
|
25
|
+
children?: React.ReactNode;
|
|
26
|
+
}): React.JSX.Element;
|
|
27
|
+
/**
|
|
28
|
+
* `onScroll` for a list inside `MinimizeOnScrollProvider`: scrolling down minimizes the tab bar,
|
|
29
|
+
* scrolling up (or reaching the top) expands it. Each list tracks its own position, and the
|
|
30
|
+
* component isn't re-rendered when the bar minimizes. Returns `undefined` outside a provider and
|
|
31
|
+
* on iOS and web, where the bar doesn't minimize, so the list sends no scroll events for nothing.
|
|
32
|
+
*/
|
|
33
|
+
export declare function useMinimizeOnScrollHandler(): ScrollHandler | undefined;
|
|
34
|
+
/**
|
|
35
|
+
* Minimize state plus an `onScroll` for one list. Inside `MinimizeOnScrollProvider` it uses the
|
|
36
|
+
* shared state; outside, its own, which is enough when the list and the tab bar are in the same
|
|
37
|
+
* component.
|
|
38
|
+
*/
|
|
39
|
+
export declare function useMinimizeOnScroll(): MinimizeOnScroll;
|
|
40
|
+
export {};
|
|
41
|
+
//# sourceMappingURL=MinimizeOnScroll.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"MinimizeOnScroll.d.ts","sourceRoot":"","sources":["../src/MinimizeOnScroll.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,KAAK,iBAAiB,EAAE,KAAK,oBAAoB,EAAY,MAAM,cAAc,CAAC;AAO3F,KAAK,aAAa,GAAG,CAAC,KAAK,EAAE,oBAAoB,CAAC,iBAAiB,CAAC,KAAK,IAAI,CAAC;AAC9E,KAAK,YAAY,GAAG,CAAC,SAAS,EAAE,OAAO,KAAK,IAAI,CAAC;AACjD,KAAK,cAAc,GAAG;IAAE,SAAS,EAAE,OAAO,CAAC;IAAC,YAAY,EAAE,YAAY,CAAA;CAAE,CAAC;AAEzE,MAAM,MAAM,gBAAgB,GAAG;IAC7B,qDAAqD;IACrD,SAAS,EAAE,OAAO,CAAC;IACnB,qFAAqF;IACrF,YAAY,EAAE,YAAY,CAAC;IAC3B,+EAA+E;IAC/E,QAAQ,EAAE,aAAa,CAAC;CACzB,CAAC;AAIF,kEAAkE;AAClE,eAAO,MAAM,qBAAqB,sCAAmD,CAAC;AAkCtF;;;;GAIG;AACH,wBAAgB,wBAAwB,CAAC,EAAE,QAAQ,EAAE,EAAE;IAAE,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;CAAE,qBAOpF;AAED;;;;;GAKG;AACH,wBAAgB,0BAA0B,IAAI,aAAa,GAAG,SAAS,CAItE;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,IAAI,gBAAgB,CAMtD"}
|
|
@@ -0,0 +1,76 @@
|
|
|
1
|
+
import * as React from 'react';
|
|
2
|
+
import { Platform } from 'react-native';
|
|
3
|
+
/** Within this distance from the top of the list, the bar is always expanded. */
|
|
4
|
+
const TOP_ZONE = 24;
|
|
5
|
+
/** Smallest scroll step between two events that counts as a direction. */
|
|
6
|
+
const MIN_STEP = 3;
|
|
7
|
+
// Two contexts: lists only need the (stable) setter, so a minimize doesn't re-render screens.
|
|
8
|
+
const SetMinimizedContext = React.createContext(null);
|
|
9
|
+
/** Read by AndroidGlassBottomTabs; not part of the public API. */
|
|
10
|
+
export const MinimizedStateContext = React.createContext(null);
|
|
11
|
+
/** Minimize state whose setter only re-renders on a change (scroll events arrive every frame). */
|
|
12
|
+
function useMinimizedState() {
|
|
13
|
+
const [minimized, setState] = React.useState(false);
|
|
14
|
+
const current = React.useRef(false);
|
|
15
|
+
const setMinimized = React.useCallback((next) => {
|
|
16
|
+
if (current.current !== next) {
|
|
17
|
+
current.current = next;
|
|
18
|
+
setState(next);
|
|
19
|
+
}
|
|
20
|
+
}, []);
|
|
21
|
+
return React.useMemo(() => ({ minimized, setMinimized }), [minimized, setMinimized]);
|
|
22
|
+
}
|
|
23
|
+
/** Minimizes on scroll down; expands on scroll up and near the top. */
|
|
24
|
+
function useScrollHandler(setMinimized) {
|
|
25
|
+
const previousY = React.useRef(0);
|
|
26
|
+
return React.useCallback((event) => {
|
|
27
|
+
// Clamped to the scrollable range, so overscroll can't flip the direction for a frame.
|
|
28
|
+
const { contentOffset, contentSize, layoutMeasurement } = event.nativeEvent;
|
|
29
|
+
const maxY = Math.max(contentSize.height - layoutMeasurement.height, 0);
|
|
30
|
+
const y = Math.min(Math.max(contentOffset.y, 0), maxY);
|
|
31
|
+
const step = y - previousY.current;
|
|
32
|
+
previousY.current = y;
|
|
33
|
+
if (y < TOP_ZONE)
|
|
34
|
+
setMinimized(false);
|
|
35
|
+
else if (step > MIN_STEP)
|
|
36
|
+
setMinimized(true);
|
|
37
|
+
else if (step < -MIN_STEP)
|
|
38
|
+
setMinimized(false);
|
|
39
|
+
}, [setMinimized]);
|
|
40
|
+
}
|
|
41
|
+
/**
|
|
42
|
+
* Shares one minimize state between the tab bar and any number of lists, e.g. around a
|
|
43
|
+
* navigator's tabs, where the bar and the screens are different components. Inside it,
|
|
44
|
+
* `AndroidGlassBottomTabs` follows the shared state unless it gets a `minimized` prop.
|
|
45
|
+
*/
|
|
46
|
+
export function MinimizeOnScrollProvider({ children }) {
|
|
47
|
+
const state = useMinimizedState();
|
|
48
|
+
return (<SetMinimizedContext.Provider value={state.setMinimized}>
|
|
49
|
+
<MinimizedStateContext.Provider value={state}>{children}</MinimizedStateContext.Provider>
|
|
50
|
+
</SetMinimizedContext.Provider>);
|
|
51
|
+
}
|
|
52
|
+
/**
|
|
53
|
+
* `onScroll` for a list inside `MinimizeOnScrollProvider`: scrolling down minimizes the tab bar,
|
|
54
|
+
* scrolling up (or reaching the top) expands it. Each list tracks its own position, and the
|
|
55
|
+
* component isn't re-rendered when the bar minimizes. Returns `undefined` outside a provider and
|
|
56
|
+
* on iOS and web, where the bar doesn't minimize, so the list sends no scroll events for nothing.
|
|
57
|
+
*/
|
|
58
|
+
export function useMinimizeOnScrollHandler() {
|
|
59
|
+
const setMinimized = React.useContext(SetMinimizedContext);
|
|
60
|
+
const onScroll = useScrollHandler(setMinimized ?? noop);
|
|
61
|
+
return setMinimized != null && Platform.OS === 'android' ? onScroll : undefined;
|
|
62
|
+
}
|
|
63
|
+
/**
|
|
64
|
+
* Minimize state plus an `onScroll` for one list. Inside `MinimizeOnScrollProvider` it uses the
|
|
65
|
+
* shared state; outside, its own, which is enough when the list and the tab bar are in the same
|
|
66
|
+
* component.
|
|
67
|
+
*/
|
|
68
|
+
export function useMinimizeOnScroll() {
|
|
69
|
+
const shared = React.useContext(MinimizedStateContext);
|
|
70
|
+
const own = useMinimizedState();
|
|
71
|
+
const { minimized, setMinimized } = shared ?? own;
|
|
72
|
+
const onScroll = useScrollHandler(setMinimized);
|
|
73
|
+
return { minimized, setMinimized, onScroll };
|
|
74
|
+
}
|
|
75
|
+
function noop() { }
|
|
76
|
+
//# sourceMappingURL=MinimizeOnScroll.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"MinimizeOnScroll.js","sourceRoot":"","sources":["../src/MinimizeOnScroll.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAqD,QAAQ,EAAE,MAAM,cAAc,CAAC;AAE3F,iFAAiF;AACjF,MAAM,QAAQ,GAAG,EAAE,CAAC;AACpB,0EAA0E;AAC1E,MAAM,QAAQ,GAAG,CAAC,CAAC;AAenB,8FAA8F;AAC9F,MAAM,mBAAmB,GAAG,KAAK,CAAC,aAAa,CAAsB,IAAI,CAAC,CAAC;AAC3E,kEAAkE;AAClE,MAAM,CAAC,MAAM,qBAAqB,GAAG,KAAK,CAAC,aAAa,CAAwB,IAAI,CAAC,CAAC;AAEtF,kGAAkG;AAClG,SAAS,iBAAiB;IACxB,MAAM,CAAC,SAAS,EAAE,QAAQ,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACpD,MAAM,OAAO,GAAG,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACpC,MAAM,YAAY,GAAG,KAAK,CAAC,WAAW,CAAC,CAAC,IAAa,EAAE,EAAE;QACvD,IAAI,OAAO,CAAC,OAAO,KAAK,IAAI,EAAE,CAAC;YAC7B,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC;YACvB,QAAQ,CAAC,IAAI,CAAC,CAAC;QACjB,CAAC;IACH,CAAC,EAAE,EAAE,CAAC,CAAC;IACP,OAAO,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,SAAS,EAAE,YAAY,EAAE,CAAC,EAAE,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC,CAAC;AACvF,CAAC;AAED,uEAAuE;AACvE,SAAS,gBAAgB,CAAC,YAA0B;IAClD,MAAM,SAAS,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IAClC,OAAO,KAAK,CAAC,WAAW,CACtB,CAAC,KAA8C,EAAE,EAAE;QACjD,uFAAuF;QACvF,MAAM,EAAE,aAAa,EAAE,WAAW,EAAE,iBAAiB,EAAE,GAAG,KAAK,CAAC,WAAW,CAAC;QAC5E,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,MAAM,GAAG,iBAAiB,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QACxE,MAAM,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;QACvD,MAAM,IAAI,GAAG,CAAC,GAAG,SAAS,CAAC,OAAO,CAAC;QACnC,SAAS,CAAC,OAAO,GAAG,CAAC,CAAC;QACtB,IAAI,CAAC,GAAG,QAAQ;YAAE,YAAY,CAAC,KAAK,CAAC,CAAC;aACjC,IAAI,IAAI,GAAG,QAAQ;YAAE,YAAY,CAAC,IAAI,CAAC,CAAC;aACxC,IAAI,IAAI,GAAG,CAAC,QAAQ;YAAE,YAAY,CAAC,KAAK,CAAC,CAAC;IACjD,CAAC,EACD,CAAC,YAAY,CAAC,CACf,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,wBAAwB,CAAC,EAAE,QAAQ,EAAkC;IACnF,MAAM,KAAK,GAAG,iBAAiB,EAAE,CAAC;IAClC,OAAO,CACL,CAAC,mBAAmB,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,YAAY,CAAC,CACtD;MAAA,CAAC,qBAAqB,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,qBAAqB,CAAC,QAAQ,CAC1F;IAAA,EAAE,mBAAmB,CAAC,QAAQ,CAAC,CAChC,CAAC;AACJ,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,0BAA0B;IACxC,MAAM,YAAY,GAAG,KAAK,CAAC,UAAU,CAAC,mBAAmB,CAAC,CAAC;IAC3D,MAAM,QAAQ,GAAG,gBAAgB,CAAC,YAAY,IAAI,IAAI,CAAC,CAAC;IACxD,OAAO,YAAY,IAAI,IAAI,IAAI,QAAQ,CAAC,EAAE,KAAK,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC;AAClF,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,mBAAmB;IACjC,MAAM,MAAM,GAAG,KAAK,CAAC,UAAU,CAAC,qBAAqB,CAAC,CAAC;IACvD,MAAM,GAAG,GAAG,iBAAiB,EAAE,CAAC;IAChC,MAAM,EAAE,SAAS,EAAE,YAAY,EAAE,GAAG,MAAM,IAAI,GAAG,CAAC;IAClD,MAAM,QAAQ,GAAG,gBAAgB,CAAC,YAAY,CAAC,CAAC;IAChD,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,QAAQ,EAAE,CAAC;AAC/C,CAAC;AAED,SAAS,IAAI,KAAI,CAAC","sourcesContent":["import * as React from 'react';\nimport { type NativeScrollEvent, type NativeSyntheticEvent, Platform } from 'react-native';\n\n/** Within this distance from the top of the list, the bar is always expanded. */\nconst TOP_ZONE = 24;\n/** Smallest scroll step between two events that counts as a direction. */\nconst MIN_STEP = 3;\n\ntype ScrollHandler = (event: NativeSyntheticEvent<NativeScrollEvent>) => void;\ntype SetMinimized = (minimized: boolean) => void;\ntype MinimizedState = { minimized: boolean; setMinimized: SetMinimized };\n\nexport type MinimizeOnScroll = {\n /** Pass to `AndroidGlassBottomTabs`' `minimized`. */\n minimized: boolean;\n /** Pass to `AndroidGlassBottomTabs`' `onMinimizedChange`. Can also force a state. */\n setMinimized: SetMinimized;\n /** Pass to the list's `onScroll`, together with `scrollEventThrottle={16}`. */\n onScroll: ScrollHandler;\n};\n\n// Two contexts: lists only need the (stable) setter, so a minimize doesn't re-render screens.\nconst SetMinimizedContext = React.createContext<SetMinimized | null>(null);\n/** Read by AndroidGlassBottomTabs; not part of the public API. */\nexport const MinimizedStateContext = React.createContext<MinimizedState | null>(null);\n\n/** Minimize state whose setter only re-renders on a change (scroll events arrive every frame). */\nfunction useMinimizedState(): MinimizedState {\n const [minimized, setState] = React.useState(false);\n const current = React.useRef(false);\n const setMinimized = React.useCallback((next: boolean) => {\n if (current.current !== next) {\n current.current = next;\n setState(next);\n }\n }, []);\n return React.useMemo(() => ({ minimized, setMinimized }), [minimized, setMinimized]);\n}\n\n/** Minimizes on scroll down; expands on scroll up and near the top. */\nfunction useScrollHandler(setMinimized: SetMinimized): ScrollHandler {\n const previousY = React.useRef(0);\n return React.useCallback(\n (event: NativeSyntheticEvent<NativeScrollEvent>) => {\n // Clamped to the scrollable range, so overscroll can't flip the direction for a frame.\n const { contentOffset, contentSize, layoutMeasurement } = event.nativeEvent;\n const maxY = Math.max(contentSize.height - layoutMeasurement.height, 0);\n const y = Math.min(Math.max(contentOffset.y, 0), maxY);\n const step = y - previousY.current;\n previousY.current = y;\n if (y < TOP_ZONE) setMinimized(false);\n else if (step > MIN_STEP) setMinimized(true);\n else if (step < -MIN_STEP) setMinimized(false);\n },\n [setMinimized]\n );\n}\n\n/**\n * Shares one minimize state between the tab bar and any number of lists, e.g. around a\n * navigator's tabs, where the bar and the screens are different components. Inside it,\n * `AndroidGlassBottomTabs` follows the shared state unless it gets a `minimized` prop.\n */\nexport function MinimizeOnScrollProvider({ children }: { children?: React.ReactNode }) {\n const state = useMinimizedState();\n return (\n <SetMinimizedContext.Provider value={state.setMinimized}>\n <MinimizedStateContext.Provider value={state}>{children}</MinimizedStateContext.Provider>\n </SetMinimizedContext.Provider>\n );\n}\n\n/**\n * `onScroll` for a list inside `MinimizeOnScrollProvider`: scrolling down minimizes the tab bar,\n * scrolling up (or reaching the top) expands it. Each list tracks its own position, and the\n * component isn't re-rendered when the bar minimizes. Returns `undefined` outside a provider and\n * on iOS and web, where the bar doesn't minimize, so the list sends no scroll events for nothing.\n */\nexport function useMinimizeOnScrollHandler(): ScrollHandler | undefined {\n const setMinimized = React.useContext(SetMinimizedContext);\n const onScroll = useScrollHandler(setMinimized ?? noop);\n return setMinimized != null && Platform.OS === 'android' ? onScroll : undefined;\n}\n\n/**\n * Minimize state plus an `onScroll` for one list. Inside `MinimizeOnScrollProvider` it uses the\n * shared state; outside, its own, which is enough when the list and the tab bar are in the same\n * component.\n */\nexport function useMinimizeOnScroll(): MinimizeOnScroll {\n const shared = React.useContext(MinimizedStateContext);\n const own = useMinimizedState();\n const { minimized, setMinimized } = shared ?? own;\n const onScroll = useScrollHandler(setMinimized);\n return { minimized, setMinimized, onScroll };\n}\n\nfunction noop() {}\n"]}
|
package/build/index.d.ts
CHANGED
|
@@ -4,7 +4,7 @@ export { default as AndroidGlassToggle } from './AndroidGlassToggle';
|
|
|
4
4
|
export { default as AndroidGlassSlider } from './AndroidGlassSlider';
|
|
5
5
|
export { default as AndroidGlassBottomTabs } from './AndroidGlassBottomTabs';
|
|
6
6
|
export { default as AndroidGlassTab } from './AndroidGlassTab';
|
|
7
|
-
export { useMinimizeOnScroll, type MinimizeOnScroll } from './
|
|
7
|
+
export { MinimizeOnScrollProvider, useMinimizeOnScroll, useMinimizeOnScrollHandler, type MinimizeOnScroll, } from './MinimizeOnScroll';
|
|
8
8
|
export * from './AndroidGlassView.types';
|
|
9
9
|
export * from './AndroidGlassComponents.types';
|
|
10
10
|
//# sourceMappingURL=index.d.ts.map
|
package/build/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,IAAI,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACjE,OAAO,EAAE,OAAO,IAAI,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AACrE,OAAO,EAAE,OAAO,IAAI,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AACrE,OAAO,EAAE,OAAO,IAAI,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AACrE,OAAO,EAAE,OAAO,IAAI,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAC7E,OAAO,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAC/D,OAAO,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,IAAI,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACjE,OAAO,EAAE,OAAO,IAAI,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AACrE,OAAO,EAAE,OAAO,IAAI,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AACrE,OAAO,EAAE,OAAO,IAAI,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AACrE,OAAO,EAAE,OAAO,IAAI,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAC7E,OAAO,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAC/D,OAAO,EACL,wBAAwB,EACxB,mBAAmB,EACnB,0BAA0B,EAC1B,KAAK,gBAAgB,GACtB,MAAM,oBAAoB,CAAC;AAC5B,cAAc,0BAA0B,CAAC;AACzC,cAAc,gCAAgC,CAAC"}
|
package/build/index.js
CHANGED
|
@@ -6,7 +6,7 @@ export { default as AndroidGlassToggle } from './AndroidGlassToggle';
|
|
|
6
6
|
export { default as AndroidGlassSlider } from './AndroidGlassSlider';
|
|
7
7
|
export { default as AndroidGlassBottomTabs } from './AndroidGlassBottomTabs';
|
|
8
8
|
export { default as AndroidGlassTab } from './AndroidGlassTab';
|
|
9
|
-
export { useMinimizeOnScroll } from './
|
|
9
|
+
export { MinimizeOnScrollProvider, useMinimizeOnScroll, useMinimizeOnScrollHandler, } from './MinimizeOnScroll';
|
|
10
10
|
export * from './AndroidGlassView.types';
|
|
11
11
|
export * from './AndroidGlassComponents.types';
|
|
12
12
|
//# sourceMappingURL=index.js.map
|
package/build/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,+FAA+F;AAC/F,wDAAwD;AACxD,OAAO,EAAE,OAAO,IAAI,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACjE,OAAO,EAAE,OAAO,IAAI,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AACrE,OAAO,EAAE,OAAO,IAAI,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AACrE,OAAO,EAAE,OAAO,IAAI,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AACrE,OAAO,EAAE,OAAO,IAAI,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAC7E,OAAO,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAC/D,OAAO,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,+FAA+F;AAC/F,wDAAwD;AACxD,OAAO,EAAE,OAAO,IAAI,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACjE,OAAO,EAAE,OAAO,IAAI,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AACrE,OAAO,EAAE,OAAO,IAAI,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AACrE,OAAO,EAAE,OAAO,IAAI,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AACrE,OAAO,EAAE,OAAO,IAAI,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAC7E,OAAO,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAC/D,OAAO,EACL,wBAAwB,EACxB,mBAAmB,EACnB,0BAA0B,GAE3B,MAAM,oBAAoB,CAAC;AAC5B,cAAc,0BAA0B,CAAC;AACzC,cAAc,gCAAgC,CAAC","sourcesContent":["// Each component resolves to its native Android implementation (*.android.tsx) on Android, and\n// to a plain fallback with the same API on iOS and web.\nexport { default as AndroidGlassView } from './AndroidGlassView';\nexport { default as AndroidGlassButton } from './AndroidGlassButton';\nexport { default as AndroidGlassToggle } from './AndroidGlassToggle';\nexport { default as AndroidGlassSlider } from './AndroidGlassSlider';\nexport { default as AndroidGlassBottomTabs } from './AndroidGlassBottomTabs';\nexport { default as AndroidGlassTab } from './AndroidGlassTab';\nexport {\n MinimizeOnScrollProvider,\n useMinimizeOnScroll,\n useMinimizeOnScrollHandler,\n type MinimizeOnScroll,\n} from './MinimizeOnScroll';\nexport * from './AndroidGlassView.types';\nexport * from './AndroidGlassComponents.types';\n"]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "expo-android-glass-view",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.1",
|
|
4
4
|
"description": "Liquid Glass views, buttons, sliders and toggles for React Native on Android (Jetpack Compose, powered by Kyant0/AndroidLiquidGlass)",
|
|
5
5
|
"main": "build/index.js",
|
|
6
6
|
"types": "build/index.d.ts",
|
|
@@ -3,6 +3,7 @@ import * as React from 'react';
|
|
|
3
3
|
import { StyleSheet, View } from 'react-native';
|
|
4
4
|
|
|
5
5
|
import type { AndroidGlassBottomTabsProps } from './AndroidGlassComponents.types';
|
|
6
|
+
import { MinimizedStateContext } from './MinimizeOnScroll';
|
|
6
7
|
import { type NativeColor, toNativeColor } from './utils';
|
|
7
8
|
|
|
8
9
|
type IndexEvent = { nativeEvent: { index: number; eventCount: number } };
|
|
@@ -42,6 +43,9 @@ export default function AndroidGlassBottomTabs({
|
|
|
42
43
|
// up with earlier selections) from a current one.
|
|
43
44
|
const [eventCount, setEventCount] = React.useState(0);
|
|
44
45
|
const selected = selectedIndex ?? ownIndex;
|
|
46
|
+
// Inside a MinimizeOnScrollProvider, the bar follows the shared state unless `minimized` is given.
|
|
47
|
+
const shared = React.useContext(MinimizedStateContext);
|
|
48
|
+
const followsProvider = minimized === undefined;
|
|
45
49
|
return (
|
|
46
50
|
<NativeAndroidGlassBottomTabs
|
|
47
51
|
accessibilityRole="tablist"
|
|
@@ -50,7 +54,7 @@ export default function AndroidGlassBottomTabs({
|
|
|
50
54
|
selectedIndex={selected}
|
|
51
55
|
tabsCount={tabs.length}
|
|
52
56
|
mostRecentEventCount={eventCount}
|
|
53
|
-
minimized={minimized ?? false}
|
|
57
|
+
minimized={minimized ?? shared?.minimized ?? false}
|
|
54
58
|
accentColor={toNativeColor(accentColor)}
|
|
55
59
|
containerColor={toNativeColor(containerColor)}
|
|
56
60
|
onTabSelected={(event) => {
|
|
@@ -59,7 +63,11 @@ export default function AndroidGlassBottomTabs({
|
|
|
59
63
|
setOwnIndex(index);
|
|
60
64
|
onTabSelected?.(index);
|
|
61
65
|
}}
|
|
62
|
-
onMinimizedChange={(event) =>
|
|
66
|
+
onMinimizedChange={(event) => {
|
|
67
|
+
const value = event.nativeEvent.minimized;
|
|
68
|
+
if (followsProvider) shared?.setMinimized(value);
|
|
69
|
+
onMinimizedChange?.(value);
|
|
70
|
+
}}>
|
|
63
71
|
{tabs.map((tab, index) => (
|
|
64
72
|
// The native bar handles taps and drags, and draws these views itself (inside the glass
|
|
65
73
|
// and, tinted, under the droplet), so they must stay real views and not take touches.
|
|
@@ -52,13 +52,14 @@ export type AndroidGlassBottomTabsProps = ViewProps & {
|
|
|
52
52
|
onTabSelected?: (index: number) => void;
|
|
53
53
|
/**
|
|
54
54
|
* Minimizes the bar, like iOS 26 tab bars on scroll: it gets shorter and narrower, each tab keeps
|
|
55
|
-
* only its first child (the icon) and the rest (the label) fades out. Animated natively
|
|
56
|
-
*
|
|
55
|
+
* only its first child (the icon) and the rest (the label) fades out. Animated natively. Inside a
|
|
56
|
+
* `MinimizeOnScrollProvider`, leave it out: the bar follows the provider. Android only.
|
|
57
57
|
*/
|
|
58
58
|
minimized?: boolean;
|
|
59
59
|
/**
|
|
60
|
-
* Called with `false` when the user expands the minimized bar by touching it.
|
|
61
|
-
* `
|
|
60
|
+
* Called with `false` when the user expands the minimized bar by touching it. With
|
|
61
|
+
* `useMinimizeOnScroll`, pass its `setMinimized`; inside a `MinimizeOnScrollProvider` it isn't
|
|
62
|
+
* needed.
|
|
62
63
|
*/
|
|
63
64
|
onMinimizedChange?: (minimized: boolean) => void;
|
|
64
65
|
/** Colour the selected tab's content takes under the droplet. Default system blue. */
|
|
@@ -0,0 +1,98 @@
|
|
|
1
|
+
import * as React from 'react';
|
|
2
|
+
import { type NativeScrollEvent, type NativeSyntheticEvent, Platform } from 'react-native';
|
|
3
|
+
|
|
4
|
+
/** Within this distance from the top of the list, the bar is always expanded. */
|
|
5
|
+
const TOP_ZONE = 24;
|
|
6
|
+
/** Smallest scroll step between two events that counts as a direction. */
|
|
7
|
+
const MIN_STEP = 3;
|
|
8
|
+
|
|
9
|
+
type ScrollHandler = (event: NativeSyntheticEvent<NativeScrollEvent>) => void;
|
|
10
|
+
type SetMinimized = (minimized: boolean) => void;
|
|
11
|
+
type MinimizedState = { minimized: boolean; setMinimized: SetMinimized };
|
|
12
|
+
|
|
13
|
+
export type MinimizeOnScroll = {
|
|
14
|
+
/** Pass to `AndroidGlassBottomTabs`' `minimized`. */
|
|
15
|
+
minimized: boolean;
|
|
16
|
+
/** Pass to `AndroidGlassBottomTabs`' `onMinimizedChange`. Can also force a state. */
|
|
17
|
+
setMinimized: SetMinimized;
|
|
18
|
+
/** Pass to the list's `onScroll`, together with `scrollEventThrottle={16}`. */
|
|
19
|
+
onScroll: ScrollHandler;
|
|
20
|
+
};
|
|
21
|
+
|
|
22
|
+
// Two contexts: lists only need the (stable) setter, so a minimize doesn't re-render screens.
|
|
23
|
+
const SetMinimizedContext = React.createContext<SetMinimized | null>(null);
|
|
24
|
+
/** Read by AndroidGlassBottomTabs; not part of the public API. */
|
|
25
|
+
export const MinimizedStateContext = React.createContext<MinimizedState | null>(null);
|
|
26
|
+
|
|
27
|
+
/** Minimize state whose setter only re-renders on a change (scroll events arrive every frame). */
|
|
28
|
+
function useMinimizedState(): MinimizedState {
|
|
29
|
+
const [minimized, setState] = React.useState(false);
|
|
30
|
+
const current = React.useRef(false);
|
|
31
|
+
const setMinimized = React.useCallback((next: boolean) => {
|
|
32
|
+
if (current.current !== next) {
|
|
33
|
+
current.current = next;
|
|
34
|
+
setState(next);
|
|
35
|
+
}
|
|
36
|
+
}, []);
|
|
37
|
+
return React.useMemo(() => ({ minimized, setMinimized }), [minimized, setMinimized]);
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
/** Minimizes on scroll down; expands on scroll up and near the top. */
|
|
41
|
+
function useScrollHandler(setMinimized: SetMinimized): ScrollHandler {
|
|
42
|
+
const previousY = React.useRef(0);
|
|
43
|
+
return React.useCallback(
|
|
44
|
+
(event: NativeSyntheticEvent<NativeScrollEvent>) => {
|
|
45
|
+
// Clamped to the scrollable range, so overscroll can't flip the direction for a frame.
|
|
46
|
+
const { contentOffset, contentSize, layoutMeasurement } = event.nativeEvent;
|
|
47
|
+
const maxY = Math.max(contentSize.height - layoutMeasurement.height, 0);
|
|
48
|
+
const y = Math.min(Math.max(contentOffset.y, 0), maxY);
|
|
49
|
+
const step = y - previousY.current;
|
|
50
|
+
previousY.current = y;
|
|
51
|
+
if (y < TOP_ZONE) setMinimized(false);
|
|
52
|
+
else if (step > MIN_STEP) setMinimized(true);
|
|
53
|
+
else if (step < -MIN_STEP) setMinimized(false);
|
|
54
|
+
},
|
|
55
|
+
[setMinimized]
|
|
56
|
+
);
|
|
57
|
+
}
|
|
58
|
+
|
|
59
|
+
/**
|
|
60
|
+
* Shares one minimize state between the tab bar and any number of lists, e.g. around a
|
|
61
|
+
* navigator's tabs, where the bar and the screens are different components. Inside it,
|
|
62
|
+
* `AndroidGlassBottomTabs` follows the shared state unless it gets a `minimized` prop.
|
|
63
|
+
*/
|
|
64
|
+
export function MinimizeOnScrollProvider({ children }: { children?: React.ReactNode }) {
|
|
65
|
+
const state = useMinimizedState();
|
|
66
|
+
return (
|
|
67
|
+
<SetMinimizedContext.Provider value={state.setMinimized}>
|
|
68
|
+
<MinimizedStateContext.Provider value={state}>{children}</MinimizedStateContext.Provider>
|
|
69
|
+
</SetMinimizedContext.Provider>
|
|
70
|
+
);
|
|
71
|
+
}
|
|
72
|
+
|
|
73
|
+
/**
|
|
74
|
+
* `onScroll` for a list inside `MinimizeOnScrollProvider`: scrolling down minimizes the tab bar,
|
|
75
|
+
* scrolling up (or reaching the top) expands it. Each list tracks its own position, and the
|
|
76
|
+
* component isn't re-rendered when the bar minimizes. Returns `undefined` outside a provider and
|
|
77
|
+
* on iOS and web, where the bar doesn't minimize, so the list sends no scroll events for nothing.
|
|
78
|
+
*/
|
|
79
|
+
export function useMinimizeOnScrollHandler(): ScrollHandler | undefined {
|
|
80
|
+
const setMinimized = React.useContext(SetMinimizedContext);
|
|
81
|
+
const onScroll = useScrollHandler(setMinimized ?? noop);
|
|
82
|
+
return setMinimized != null && Platform.OS === 'android' ? onScroll : undefined;
|
|
83
|
+
}
|
|
84
|
+
|
|
85
|
+
/**
|
|
86
|
+
* Minimize state plus an `onScroll` for one list. Inside `MinimizeOnScrollProvider` it uses the
|
|
87
|
+
* shared state; outside, its own, which is enough when the list and the tab bar are in the same
|
|
88
|
+
* component.
|
|
89
|
+
*/
|
|
90
|
+
export function useMinimizeOnScroll(): MinimizeOnScroll {
|
|
91
|
+
const shared = React.useContext(MinimizedStateContext);
|
|
92
|
+
const own = useMinimizedState();
|
|
93
|
+
const { minimized, setMinimized } = shared ?? own;
|
|
94
|
+
const onScroll = useScrollHandler(setMinimized);
|
|
95
|
+
return { minimized, setMinimized, onScroll };
|
|
96
|
+
}
|
|
97
|
+
|
|
98
|
+
function noop() {}
|
package/src/index.ts
CHANGED
|
@@ -6,6 +6,11 @@ export { default as AndroidGlassToggle } from './AndroidGlassToggle';
|
|
|
6
6
|
export { default as AndroidGlassSlider } from './AndroidGlassSlider';
|
|
7
7
|
export { default as AndroidGlassBottomTabs } from './AndroidGlassBottomTabs';
|
|
8
8
|
export { default as AndroidGlassTab } from './AndroidGlassTab';
|
|
9
|
-
export {
|
|
9
|
+
export {
|
|
10
|
+
MinimizeOnScrollProvider,
|
|
11
|
+
useMinimizeOnScroll,
|
|
12
|
+
useMinimizeOnScrollHandler,
|
|
13
|
+
type MinimizeOnScroll,
|
|
14
|
+
} from './MinimizeOnScroll';
|
|
10
15
|
export * from './AndroidGlassView.types';
|
|
11
16
|
export * from './AndroidGlassComponents.types';
|
|
@@ -1,17 +0,0 @@
|
|
|
1
|
-
import type { NativeScrollEvent, NativeSyntheticEvent } from 'react-native';
|
|
2
|
-
export type MinimizeOnScroll = {
|
|
3
|
-
/** Pass to `AndroidGlassBottomTabs`' `minimized`. */
|
|
4
|
-
minimized: boolean;
|
|
5
|
-
/** Pass to `AndroidGlassBottomTabs`' `onMinimizedChange`. Can also force a state. */
|
|
6
|
-
setMinimized: (minimized: boolean) => void;
|
|
7
|
-
/** Pass to the main list's `onScroll`, together with `scrollEventThrottle={16}`. */
|
|
8
|
-
onScroll: (event: NativeSyntheticEvent<NativeScrollEvent>) => void;
|
|
9
|
-
};
|
|
10
|
-
/**
|
|
11
|
-
* Minimizes `AndroidGlassBottomTabs` while the user scrolls down a list, and expands it when they
|
|
12
|
-
* scroll up or get back to the top, like iOS 26 tab bars. Works with ScrollView, FlatList,
|
|
13
|
-
* SectionList and any list that reports `onScroll`. JS only decides the state; the animation
|
|
14
|
-
* runs natively.
|
|
15
|
-
*/
|
|
16
|
-
export declare function useMinimizeOnScroll(): MinimizeOnScroll;
|
|
17
|
-
//# sourceMappingURL=useMinimizeOnScroll.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"useMinimizeOnScroll.d.ts","sourceRoot":"","sources":["../src/useMinimizeOnScroll.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AAO5E,MAAM,MAAM,gBAAgB,GAAG;IAC7B,qDAAqD;IACrD,SAAS,EAAE,OAAO,CAAC;IACnB,qFAAqF;IACrF,YAAY,EAAE,CAAC,SAAS,EAAE,OAAO,KAAK,IAAI,CAAC;IAC3C,oFAAoF;IACpF,QAAQ,EAAE,CAAC,KAAK,EAAE,oBAAoB,CAAC,iBAAiB,CAAC,KAAK,IAAI,CAAC;CACpE,CAAC;AAEF;;;;;GAKG;AACH,wBAAgB,mBAAmB,IAAI,gBAAgB,CA6BtD"}
|
|
@@ -1,39 +0,0 @@
|
|
|
1
|
-
import { useCallback, useRef, useState } from 'react';
|
|
2
|
-
/** Within this distance from the top of the list, the bar is always expanded. */
|
|
3
|
-
const TOP_ZONE = 24;
|
|
4
|
-
/** Smallest scroll step between two events that counts as a direction. */
|
|
5
|
-
const MIN_STEP = 3;
|
|
6
|
-
/**
|
|
7
|
-
* Minimizes `AndroidGlassBottomTabs` while the user scrolls down a list, and expands it when they
|
|
8
|
-
* scroll up or get back to the top, like iOS 26 tab bars. Works with ScrollView, FlatList,
|
|
9
|
-
* SectionList and any list that reports `onScroll`. JS only decides the state; the animation
|
|
10
|
-
* runs natively.
|
|
11
|
-
*/
|
|
12
|
-
export function useMinimizeOnScroll() {
|
|
13
|
-
const [minimized, setMinimizedState] = useState(false);
|
|
14
|
-
const current = useRef(false);
|
|
15
|
-
const previousY = useRef(0);
|
|
16
|
-
const setMinimized = useCallback((next) => {
|
|
17
|
-
// Scroll events arrive every frame; only a change re-renders.
|
|
18
|
-
if (current.current !== next) {
|
|
19
|
-
current.current = next;
|
|
20
|
-
setMinimizedState(next);
|
|
21
|
-
}
|
|
22
|
-
}, []);
|
|
23
|
-
const onScroll = useCallback((event) => {
|
|
24
|
-
// Clamped to the scrollable range, so overscroll can't flip the direction for a frame.
|
|
25
|
-
const { contentOffset, contentSize, layoutMeasurement } = event.nativeEvent;
|
|
26
|
-
const maxY = Math.max(contentSize.height - layoutMeasurement.height, 0);
|
|
27
|
-
const y = Math.min(Math.max(contentOffset.y, 0), maxY);
|
|
28
|
-
const step = y - previousY.current;
|
|
29
|
-
previousY.current = y;
|
|
30
|
-
if (y < TOP_ZONE)
|
|
31
|
-
setMinimized(false);
|
|
32
|
-
else if (step > MIN_STEP)
|
|
33
|
-
setMinimized(true);
|
|
34
|
-
else if (step < -MIN_STEP)
|
|
35
|
-
setMinimized(false);
|
|
36
|
-
}, [setMinimized]);
|
|
37
|
-
return { minimized, setMinimized, onScroll };
|
|
38
|
-
}
|
|
39
|
-
//# sourceMappingURL=useMinimizeOnScroll.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"useMinimizeOnScroll.js","sourceRoot":"","sources":["../src/useMinimizeOnScroll.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAGtD,iFAAiF;AACjF,MAAM,QAAQ,GAAG,EAAE,CAAC;AACpB,0EAA0E;AAC1E,MAAM,QAAQ,GAAG,CAAC,CAAC;AAWnB;;;;;GAKG;AACH,MAAM,UAAU,mBAAmB;IACjC,MAAM,CAAC,SAAS,EAAE,iBAAiB,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IACvD,MAAM,OAAO,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;IAC9B,MAAM,SAAS,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;IAE5B,MAAM,YAAY,GAAG,WAAW,CAAC,CAAC,IAAa,EAAE,EAAE;QACjD,8DAA8D;QAC9D,IAAI,OAAO,CAAC,OAAO,KAAK,IAAI,EAAE,CAAC;YAC7B,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC;YACvB,iBAAiB,CAAC,IAAI,CAAC,CAAC;QAC1B,CAAC;IACH,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,QAAQ,GAAG,WAAW,CAC1B,CAAC,KAA8C,EAAE,EAAE;QACjD,uFAAuF;QACvF,MAAM,EAAE,aAAa,EAAE,WAAW,EAAE,iBAAiB,EAAE,GAAG,KAAK,CAAC,WAAW,CAAC;QAC5E,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,MAAM,GAAG,iBAAiB,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QACxE,MAAM,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;QACvD,MAAM,IAAI,GAAG,CAAC,GAAG,SAAS,CAAC,OAAO,CAAC;QACnC,SAAS,CAAC,OAAO,GAAG,CAAC,CAAC;QACtB,IAAI,CAAC,GAAG,QAAQ;YAAE,YAAY,CAAC,KAAK,CAAC,CAAC;aACjC,IAAI,IAAI,GAAG,QAAQ;YAAE,YAAY,CAAC,IAAI,CAAC,CAAC;aACxC,IAAI,IAAI,GAAG,CAAC,QAAQ;YAAE,YAAY,CAAC,KAAK,CAAC,CAAC;IACjD,CAAC,EACD,CAAC,YAAY,CAAC,CACf,CAAC;IAEF,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,QAAQ,EAAE,CAAC;AAC/C,CAAC","sourcesContent":["import { useCallback, useRef, useState } from 'react';\nimport type { NativeScrollEvent, NativeSyntheticEvent } from 'react-native';\n\n/** Within this distance from the top of the list, the bar is always expanded. */\nconst TOP_ZONE = 24;\n/** Smallest scroll step between two events that counts as a direction. */\nconst MIN_STEP = 3;\n\nexport type MinimizeOnScroll = {\n /** Pass to `AndroidGlassBottomTabs`' `minimized`. */\n minimized: boolean;\n /** Pass to `AndroidGlassBottomTabs`' `onMinimizedChange`. Can also force a state. */\n setMinimized: (minimized: boolean) => void;\n /** Pass to the main list's `onScroll`, together with `scrollEventThrottle={16}`. */\n onScroll: (event: NativeSyntheticEvent<NativeScrollEvent>) => void;\n};\n\n/**\n * Minimizes `AndroidGlassBottomTabs` while the user scrolls down a list, and expands it when they\n * scroll up or get back to the top, like iOS 26 tab bars. Works with ScrollView, FlatList,\n * SectionList and any list that reports `onScroll`. JS only decides the state; the animation\n * runs natively.\n */\nexport function useMinimizeOnScroll(): MinimizeOnScroll {\n const [minimized, setMinimizedState] = useState(false);\n const current = useRef(false);\n const previousY = useRef(0);\n\n const setMinimized = useCallback((next: boolean) => {\n // Scroll events arrive every frame; only a change re-renders.\n if (current.current !== next) {\n current.current = next;\n setMinimizedState(next);\n }\n }, []);\n\n const onScroll = useCallback(\n (event: NativeSyntheticEvent<NativeScrollEvent>) => {\n // Clamped to the scrollable range, so overscroll can't flip the direction for a frame.\n const { contentOffset, contentSize, layoutMeasurement } = event.nativeEvent;\n const maxY = Math.max(contentSize.height - layoutMeasurement.height, 0);\n const y = Math.min(Math.max(contentOffset.y, 0), maxY);\n const step = y - previousY.current;\n previousY.current = y;\n if (y < TOP_ZONE) setMinimized(false);\n else if (step > MIN_STEP) setMinimized(true);\n else if (step < -MIN_STEP) setMinimized(false);\n },\n [setMinimized]\n );\n\n return { minimized, setMinimized, onScroll };\n}\n"]}
|
|
@@ -1,53 +0,0 @@
|
|
|
1
|
-
import { useCallback, useRef, useState } from 'react';
|
|
2
|
-
import type { NativeScrollEvent, NativeSyntheticEvent } from 'react-native';
|
|
3
|
-
|
|
4
|
-
/** Within this distance from the top of the list, the bar is always expanded. */
|
|
5
|
-
const TOP_ZONE = 24;
|
|
6
|
-
/** Smallest scroll step between two events that counts as a direction. */
|
|
7
|
-
const MIN_STEP = 3;
|
|
8
|
-
|
|
9
|
-
export type MinimizeOnScroll = {
|
|
10
|
-
/** Pass to `AndroidGlassBottomTabs`' `minimized`. */
|
|
11
|
-
minimized: boolean;
|
|
12
|
-
/** Pass to `AndroidGlassBottomTabs`' `onMinimizedChange`. Can also force a state. */
|
|
13
|
-
setMinimized: (minimized: boolean) => void;
|
|
14
|
-
/** Pass to the main list's `onScroll`, together with `scrollEventThrottle={16}`. */
|
|
15
|
-
onScroll: (event: NativeSyntheticEvent<NativeScrollEvent>) => void;
|
|
16
|
-
};
|
|
17
|
-
|
|
18
|
-
/**
|
|
19
|
-
* Minimizes `AndroidGlassBottomTabs` while the user scrolls down a list, and expands it when they
|
|
20
|
-
* scroll up or get back to the top, like iOS 26 tab bars. Works with ScrollView, FlatList,
|
|
21
|
-
* SectionList and any list that reports `onScroll`. JS only decides the state; the animation
|
|
22
|
-
* runs natively.
|
|
23
|
-
*/
|
|
24
|
-
export function useMinimizeOnScroll(): MinimizeOnScroll {
|
|
25
|
-
const [minimized, setMinimizedState] = useState(false);
|
|
26
|
-
const current = useRef(false);
|
|
27
|
-
const previousY = useRef(0);
|
|
28
|
-
|
|
29
|
-
const setMinimized = useCallback((next: boolean) => {
|
|
30
|
-
// Scroll events arrive every frame; only a change re-renders.
|
|
31
|
-
if (current.current !== next) {
|
|
32
|
-
current.current = next;
|
|
33
|
-
setMinimizedState(next);
|
|
34
|
-
}
|
|
35
|
-
}, []);
|
|
36
|
-
|
|
37
|
-
const onScroll = useCallback(
|
|
38
|
-
(event: NativeSyntheticEvent<NativeScrollEvent>) => {
|
|
39
|
-
// Clamped to the scrollable range, so overscroll can't flip the direction for a frame.
|
|
40
|
-
const { contentOffset, contentSize, layoutMeasurement } = event.nativeEvent;
|
|
41
|
-
const maxY = Math.max(contentSize.height - layoutMeasurement.height, 0);
|
|
42
|
-
const y = Math.min(Math.max(contentOffset.y, 0), maxY);
|
|
43
|
-
const step = y - previousY.current;
|
|
44
|
-
previousY.current = y;
|
|
45
|
-
if (y < TOP_ZONE) setMinimized(false);
|
|
46
|
-
else if (step > MIN_STEP) setMinimized(true);
|
|
47
|
-
else if (step < -MIN_STEP) setMinimized(false);
|
|
48
|
-
},
|
|
49
|
-
[setMinimized]
|
|
50
|
-
);
|
|
51
|
-
|
|
52
|
-
return { minimized, setMinimized, onScroll };
|
|
53
|
-
}
|