expo-android-glass-view 0.1.10 → 1.0.0
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 +25 -0
- package/README.md +33 -7
- package/android/src/main/java/expo/modules/androidglassview/AndroidGlassMenuPanel.kt +24 -7
- package/android/src/main/java/expo/modules/androidglassview/ExpoAndroidGlassViewModule.kt +3 -0
- package/android/src/main/java/expo/modules/androidglassview/GlassHostView.kt +13 -0
- package/build/AndroidGlassMenu.d.ts.map +1 -1
- package/build/AndroidGlassMenu.js +8 -2
- package/build/AndroidGlassMenu.js.map +1 -1
- package/build/AndroidGlassMenu.types.d.ts +12 -3
- package/build/AndroidGlassMenu.types.d.ts.map +1 -1
- package/build/AndroidGlassMenu.types.js.map +1 -1
- package/build/GlassMenuPanel.android.d.ts.map +1 -1
- package/build/GlassMenuPanel.android.js +13 -3
- package/build/GlassMenuPanel.android.js.map +1 -1
- package/build/GlassMenuPanel.d.ts +1 -1
- package/build/GlassMenuPanel.d.ts.map +1 -1
- package/build/GlassMenuPanel.js +7 -5
- package/build/GlassMenuPanel.js.map +1 -1
- package/build/menuItemSerialization.d.ts +8 -0
- package/build/menuItemSerialization.d.ts.map +1 -0
- package/build/menuItemSerialization.js +15 -0
- package/build/menuItemSerialization.js.map +1 -0
- package/internal/jest-unit.config.cjs +1 -1
- package/package.json +1 -1
- package/src/AndroidGlassMenu.tsx +12 -0
- package/src/AndroidGlassMenu.types.ts +13 -3
- package/src/GlassMenuPanel.android.tsx +32 -4
- package/src/GlassMenuPanel.tsx +11 -4
- package/src/menuItemSerialization.ts +19 -0
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,30 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## 1.0.0 — 2026-09-21
|
|
4
|
+
|
|
5
|
+
### Changed
|
|
6
|
+
|
|
7
|
+
- **Breaking:** `AndroidGlassMenu` defaults to action rows without a leading checkmark slot.
|
|
8
|
+
Set `isSelectMenu` on selection menus to display `checked` items and reserve the slot,
|
|
9
|
+
including in nested rows. Rebuild the Android app or development client for this native prop.
|
|
10
|
+
|
|
11
|
+
## 0.1.11 — 2026-09-21
|
|
12
|
+
|
|
13
|
+
### Added
|
|
14
|
+
|
|
15
|
+
- `AndroidGlassMenu` standard rows now accept a decorative React element as `icon`, such as
|
|
16
|
+
`<Ionicons />`, alongside the existing native glyph names. Custom icons render inside the
|
|
17
|
+
glass surface and follow its opening, scrolling and submenu animations without replacing
|
|
18
|
+
native row selection.
|
|
19
|
+
- `AndroidGlassMenu` now accepts `shadow={false}` to remove its Android drop shadow and
|
|
20
|
+
`shadowOpacity` (0–1) to set its strength. Both affect the root and nested menu surfaces,
|
|
21
|
+
including menus with custom React content. The existing light/dark defaults are unchanged.
|
|
22
|
+
|
|
23
|
+
### Compatibility
|
|
24
|
+
|
|
25
|
+
- Rebuild the Android app or development client for these native menu capabilities; a JS-only
|
|
26
|
+
update is not enough. iOS and web continue to use plain menu fallbacks.
|
|
27
|
+
|
|
3
28
|
## 0.1.10 — 2026-09-15
|
|
4
29
|
|
|
5
30
|
### Added
|
package/README.md
CHANGED
|
@@ -39,8 +39,10 @@ Glass components sample what is drawn behind them in the same window, keeping up
|
|
|
39
39
|
scrolling lists, animations and layout changes. View, Button, Toggle, Slider and BottomTabs
|
|
40
40
|
need no provider. Menus require `AndroidGlassMenuProvider` above the navigator.
|
|
41
41
|
|
|
42
|
-
Version **0.
|
|
43
|
-
and configurable
|
|
42
|
+
Version **1.0.0** makes action menus the default: selection checkmarks require `isSelectMenu`.
|
|
43
|
+
Version 0.1.11 added React icons to standard menu rows and configurable Android menu shadows.
|
|
44
|
+
Version 0.1.10 introduced anchored menus, custom React menu content, light/dark materials and
|
|
45
|
+
configurable tab bar glass effects.
|
|
44
46
|
See [CHANGELOG.md](./CHANGELOG.md) for the release notes.
|
|
45
47
|
|
|
46
48
|
## Platforms
|
|
@@ -64,8 +66,8 @@ npx expo run:android
|
|
|
64
66
|
|
|
65
67
|
For bare React Native apps, [install Expo Modules](https://docs.expo.dev/bare/installing-expo-modules/) first.
|
|
66
68
|
|
|
67
|
-
When upgrading to 0.
|
|
68
|
-
|
|
69
|
+
When upgrading to 1.0.0, rebuild your native app or development client. The new menu
|
|
70
|
+
selection layout requires the matching native binary; updating JavaScript alone is insufficient.
|
|
69
71
|
|
|
70
72
|
## `AndroidGlassView`
|
|
71
73
|
|
|
@@ -375,6 +377,7 @@ function SortMenu() {
|
|
|
375
377
|
<AndroidGlassButton title="Sort" onPress={() => setVisible(true)} />
|
|
376
378
|
</View>
|
|
377
379
|
<AndroidGlassMenu
|
|
380
|
+
isSelectMenu
|
|
378
381
|
visible={visible}
|
|
379
382
|
anchorRef={anchorRef}
|
|
380
383
|
items={[
|
|
@@ -394,9 +397,18 @@ function SortMenu() {
|
|
|
394
397
|
outside press / Android Back closes the root menu. `onSelect` receives the chosen item's unique `id`. Each item supports
|
|
395
398
|
`title`, `checked`, `disabled`, `destructive`, and `separator` (before the row).
|
|
396
399
|
|
|
400
|
+
`isSelectMenu` defaults to `false`, so action rows do not reserve a checkmark slot before
|
|
401
|
+
their icon or title. Set `isSelectMenu` on selection menus to show checkmarks for `checked`
|
|
402
|
+
items and reserve the leading 22 dp slot on Android (24 dp on iOS and web). Section
|
|
403
|
+
headings follow the same alignment. Rebuild the Android app or development client after
|
|
404
|
+
upgrading to this native prop.
|
|
405
|
+
|
|
397
406
|
Optional `width` defaults to 250 dp. `theme` is `light` or `dark` and defaults to
|
|
398
|
-
`light`.
|
|
399
|
-
|
|
407
|
+
`light`. On Android, `shadow={false}` removes the drop shadow; `shadowOpacity`
|
|
408
|
+
sets its opacity from 0 to 1 (default 0.12 in light, 0.16 in dark). Both options
|
|
409
|
+
apply to nested surfaces and custom React content. Pass safe-area `insets`
|
|
410
|
+
(`top`, `right`, `bottom`, `left`) if the provider covers system bars; omitted edges
|
|
411
|
+
use 12 dp. Position is measured on opening and
|
|
400
412
|
window-size changes. The default `placement="overlap"` expands over the trigger,
|
|
401
413
|
aligned just beyond its right edge; `placement="below"` opens underneath. Both are
|
|
402
414
|
clamped to the provider bounds and flip above the trigger when needed. Keep the trigger stationary while open.
|
|
@@ -409,6 +421,20 @@ back row on Android. Selecting a leaf calls `onSelect` with its id. Set
|
|
|
409
421
|
updating their checked state. `compact` uses a smaller row and `sectionTitle` adds
|
|
410
422
|
a muted heading. `icon` supports grid, heart, adjustments, photo, video, screenshot,
|
|
411
423
|
album, zoom-in, zoom-out, aspect and people glyphs.
|
|
424
|
+
For a custom icon, pass a React element instead of a glyph name. It stays inside the
|
|
425
|
+
native row and follows the menu's content animation, including in submenus:
|
|
426
|
+
|
|
427
|
+
```tsx
|
|
428
|
+
import Ionicons from '@expo/vector-icons/Ionicons';
|
|
429
|
+
|
|
430
|
+
const items = [
|
|
431
|
+
{ id: 'share', title: 'Share', icon: <Ionicons name="share-outline" size={20} color="#202124" /> },
|
|
432
|
+
];
|
|
433
|
+
```
|
|
434
|
+
|
|
435
|
+
Custom icons are decorative and use the size and colour you give them; use a light
|
|
436
|
+
colour for dark menus. The icon slot is 20 × 20 dp. Native row selection, scrolling,
|
|
437
|
+
and submenu behaviour are unchanged. This feature requires a new Android build.
|
|
412
438
|
|
|
413
439
|
Use `\n` for a two-line title; those rows receive extra height. If hiding the
|
|
414
440
|
trigger during the morph, keep its layout and ref mounted and restore it in
|
|
@@ -554,7 +580,7 @@ screen don't count, because each glass view only captures what can reach it (see
|
|
|
554
580
|
React Native screen behind it_).
|
|
555
581
|
|
|
556
582
|
Earlier baseline measurements with `adb shell dumpsys gfxinfo` and `atrace` on a release build
|
|
557
|
-
(no new 0.1.
|
|
583
|
+
(no new 0.1.11 performance benchmark), on a mid-range phone:
|
|
558
584
|
Xiaomi 24117RN76E, MediaTek Helio G99, Android 16, 120 Hz.
|
|
559
585
|
|
|
560
586
|
| Screen | Glass views | Result |
|
|
@@ -47,6 +47,7 @@ import kotlin.math.roundToInt
|
|
|
47
47
|
internal data class GlassMenuItem(
|
|
48
48
|
val id: String, val title: String, val checked: Boolean = false, val disabled: Boolean = false,
|
|
49
49
|
val destructive: Boolean = false, val separator: Boolean = false, val icon: String = "",
|
|
50
|
+
val iconViewIndex: Int = -1,
|
|
50
51
|
val compact: Boolean = false, val sectionTitle: String = "", val keepsPresented: Boolean = false,
|
|
51
52
|
val children: List<GlassMenuItem> = emptyList()
|
|
52
53
|
)
|
|
@@ -54,9 +55,14 @@ internal data class GlassMenuItem(
|
|
|
54
55
|
/** All menu motion and navigation stay on the UI thread, within the content's window. */
|
|
55
56
|
@SuppressLint("ViewConstructor")
|
|
56
57
|
class AndroidGlassMenuPanel(context: Context, appContext: AppContext) : GlassHostView(context, appContext) {
|
|
58
|
+
override val drawsReactChildrenInCompose: Boolean get() = customHeight <= 0f
|
|
59
|
+
|
|
57
60
|
internal var items by mutableStateOf<List<GlassMenuItem>>(emptyList())
|
|
58
61
|
internal var expanded by mutableStateOf(false)
|
|
59
62
|
internal var dark by mutableStateOf(false)
|
|
63
|
+
internal var isSelectMenu by mutableStateOf(false)
|
|
64
|
+
internal var shadowEnabled by mutableStateOf(true)
|
|
65
|
+
internal var shadowOpacity by mutableStateOf<Float?>(null)
|
|
60
66
|
internal var originX by mutableFloatStateOf(1f)
|
|
61
67
|
internal var originY by mutableFloatStateOf(0f)
|
|
62
68
|
internal var rowHeight by mutableFloatStateOf(48f)
|
|
@@ -73,7 +79,7 @@ class AndroidGlassMenuPanel(context: Context, appContext: AppContext) : GlassHos
|
|
|
73
79
|
val item = array.getJSONObject(index)
|
|
74
80
|
GlassMenuItem(item.optString("id"), item.optString("title"), item.optBoolean("checked"),
|
|
75
81
|
item.optBoolean("disabled"), item.optBoolean("destructive"), item.optBoolean("separator"),
|
|
76
|
-
item.optString("icon"), item.optBoolean("compact"), item.optString("sectionTitle"),
|
|
82
|
+
item.optString("icon"), item.optInt("iconViewIndex", -1), item.optBoolean("compact"), item.optString("sectionTitle"),
|
|
77
83
|
item.optBoolean("keepsMenuPresented"), item.optJSONArray("children")?.let(::parse) ?: emptyList())
|
|
78
84
|
}
|
|
79
85
|
items = parse(JSONArray(json))
|
|
@@ -199,7 +205,7 @@ class AndroidGlassMenuPanel(context: Context, appContext: AppContext) : GlassHos
|
|
|
199
205
|
val index = parentRows.indexOfFirst { it.id == id }
|
|
200
206
|
if (index >= 0) {
|
|
201
207
|
val parent = parentRows[index]
|
|
202
|
-
val header = parent.copy(checked = false, separator = false, sectionTitle = "", icon = "", compact = false)
|
|
208
|
+
val header = parent.copy(checked = false, separator = false, sectionTitle = "", icon = "", iconViewIndex = -1, compact = false)
|
|
203
209
|
val children = parent.children.mapIndexed { childIndex, item ->
|
|
204
210
|
if (childIndex == 0) item.copy(separator = true) else item
|
|
205
211
|
}
|
|
@@ -341,7 +347,11 @@ class AndroidGlassMenuPanel(context: Context, appContext: AppContext) : GlassHos
|
|
|
341
347
|
}, effects = {
|
|
342
348
|
glassEffects(menuGlass, effectScale, material, press)
|
|
343
349
|
}, highlight = { menuGlass.rim.copy(alpha = menuGlass.rim.alpha + press * .25f) },
|
|
344
|
-
shadow = {
|
|
350
|
+
shadow = {
|
|
351
|
+
if (!shadowEnabled) null else menuGlass.dropShadow.let { base ->
|
|
352
|
+
shadowOpacity?.let { base.copy(color = base.color.copy(alpha = it)) } ?: base
|
|
353
|
+
}
|
|
354
|
+
},
|
|
345
355
|
onDrawSurface = { glassSurface(menuGlass, effectsSupported) }
|
|
346
356
|
)
|
|
347
357
|
.then(scrubbing)
|
|
@@ -374,7 +384,7 @@ class AndroidGlassMenuPanel(context: Context, appContext: AppContext) : GlassHos
|
|
|
374
384
|
if (item.separator) Canvas(Modifier.fillMaxWidth().height(12.dp).padding(horizontal=16.dp).graphicsLayer { this.alpha=childAlpha }) {
|
|
375
385
|
drawLine(foreground.copy(alpha=.09f),Offset(0f,size.height/2),Offset(size.width,size.height/2),.6f.dp.toPx())
|
|
376
386
|
}
|
|
377
|
-
if (item.sectionTitle.isNotEmpty()) Box(Modifier.fillMaxWidth().height((30*density.fontScale).dp).padding(start=34.dp),contentAlignment=Alignment.CenterStart) {
|
|
387
|
+
if (item.sectionTitle.isNotEmpty()) Box(Modifier.fillMaxWidth().height((30*density.fontScale).dp).padding(start=(if (isSelectMenu) 34 else 12).dp),contentAlignment=Alignment.CenterStart) {
|
|
378
388
|
BasicText(item.sectionTitle,style=TextStyle(color=foreground.copy(alpha=.48f),fontSize=13.sp))
|
|
379
389
|
}
|
|
380
390
|
Row(Modifier.fillMaxWidth().height(heightOf(item).dp).graphicsLayer { this.alpha=childAlpha }
|
|
@@ -387,11 +397,18 @@ class AndroidGlassMenuPanel(context: Context, appContext: AppContext) : GlassHos
|
|
|
387
397
|
val isHeader=item.id==headerId
|
|
388
398
|
val headerProgress = if (isHeader) reveal.coerceIn(0f,1f) else 0f
|
|
389
399
|
// Preserve the source row's leading slot, then collapse it into the header inset.
|
|
390
|
-
if (
|
|
391
|
-
|
|
392
|
-
|
|
400
|
+
if (isSelectMenu) {
|
|
401
|
+
if (isHeader) Spacer(Modifier.width((22f * (1f-headerProgress)).dp))
|
|
402
|
+
else Canvas(Modifier.width(22.dp).height(20.dp).clearAndSetSemantics {}) {
|
|
403
|
+
if(item.checked) drawMenuIcon("check",color)
|
|
404
|
+
}
|
|
393
405
|
}
|
|
394
406
|
if(item.icon.isNotEmpty()) Canvas(Modifier.padding(end=14.dp).size(20.dp).clearAndSetSemantics {}) { drawMenuIcon(item.icon,color) }
|
|
407
|
+
else if(item.iconViewIndex >= 0) Canvas(Modifier.padding(end=14.dp).size(20.dp).clearAndSetSemantics {}) {
|
|
408
|
+
if (reactChildrenGeneration >= 0) drawReactLayer(Offset.Zero, null) { canvas ->
|
|
409
|
+
drawReactChildInto(canvas, item.iconViewIndex)
|
|
410
|
+
}
|
|
411
|
+
}
|
|
395
412
|
BasicText(item.title,Modifier.weight(1f),style=TextStyle(color=color,fontSize=16.5f.sp,lineHeight=20.sp,
|
|
396
413
|
fontWeight=FontWeight((400f + 100f * headerProgress).roundToInt())),maxLines=2,overflow=TextOverflow.Ellipsis)
|
|
397
414
|
if(item.children.isNotEmpty()) Canvas(Modifier.padding(start=12.dp)
|
|
@@ -128,6 +128,9 @@ class ExpoAndroidGlassViewModule : Module() {
|
|
|
128
128
|
Prop("itemsJson") { view: AndroidGlassMenuPanel, value: String -> view.setItems(value) }
|
|
129
129
|
Prop("expanded") { view: AndroidGlassMenuPanel, value: Boolean -> view.expanded = value }
|
|
130
130
|
Prop("dark") { view: AndroidGlassMenuPanel, value: Boolean -> view.dark = value }
|
|
131
|
+
Prop("isSelectMenu") { view: AndroidGlassMenuPanel, value: Boolean -> view.isSelectMenu = value }
|
|
132
|
+
Prop("shadow") { view: AndroidGlassMenuPanel, value: Boolean? -> view.shadowEnabled = value ?: true }
|
|
133
|
+
Prop("shadowOpacity") { view: AndroidGlassMenuPanel, value: Float? -> view.shadowOpacity = value?.takeIf { it.isFinite() }?.coerceIn(0f, 1f) }
|
|
131
134
|
Prop("originX") { view: AndroidGlassMenuPanel, value: Float -> view.originX = value.coerceIn(0f, 1f) }
|
|
132
135
|
Prop("originY") { view: AndroidGlassMenuPanel, value: Float -> view.originY = value.coerceIn(0f, 1f) }
|
|
133
136
|
Prop("rowHeight") { view: AndroidGlassMenuPanel, value: Float -> view.rowHeight = value.coerceAtLeast(44f) }
|
|
@@ -186,6 +186,19 @@ abstract class GlassHostView(context: Context, appContext: AppContext) : ExpoVie
|
|
|
186
186
|
}
|
|
187
187
|
}
|
|
188
188
|
|
|
189
|
+
/** Draw one React child at the current canvas origin, for inline native content slots. */
|
|
190
|
+
internal fun drawReactChildInto(canvas: Canvas, index: Int) {
|
|
191
|
+
val child = getReactChildAt(index) ?: return
|
|
192
|
+
if (child.visibility != View.VISIBLE) return
|
|
193
|
+
val save = canvas.save()
|
|
194
|
+
val matrix = child.matrix
|
|
195
|
+
if (!matrix.isIdentity) canvas.concat(matrix)
|
|
196
|
+
val alpha = child.alpha
|
|
197
|
+
if (alpha < 1f) canvas.saveLayerAlpha(0f, 0f, child.width.toFloat(), child.height.toFloat(), (alpha * 255f).toInt())
|
|
198
|
+
child.draw(canvas)
|
|
199
|
+
canvas.restoreToCount(save)
|
|
200
|
+
}
|
|
201
|
+
|
|
189
202
|
override fun drawChild(canvas: Canvas, child: View, drawingTime: Long): Boolean {
|
|
190
203
|
if (drawsReactChildrenInCompose && child !== composeView) return false
|
|
191
204
|
return super.drawChild(canvas, child, drawingTime)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AndroidGlassMenu.d.ts","sourceRoot":"","sources":["../src/AndroidGlassMenu.tsx"],"names":[],"mappings":"AAAA,OAAO,EAQL,KAAK,SAAS,EACf,MAAM,OAAO,CAAC;AAUf,OAAO,KAAK,EAAE,qBAAqB,EAAwB,MAAM,0BAA0B,CAAC;AAU5F,mFAAmF;AACnF,wBAAgB,wBAAwB,CAAC,EAAE,QAAQ,EAAE,EAAE;IAAE,QAAQ,EAAE,SAAS,CAAA;CAAE,+
|
|
1
|
+
{"version":3,"file":"AndroidGlassMenu.d.ts","sourceRoot":"","sources":["../src/AndroidGlassMenu.tsx"],"names":[],"mappings":"AAAA,OAAO,EAQL,KAAK,SAAS,EACf,MAAM,OAAO,CAAC;AAUf,OAAO,KAAK,EAAE,qBAAqB,EAAwB,MAAM,0BAA0B,CAAC;AAU5F,mFAAmF;AACnF,wBAAgB,wBAAwB,CAAC,EAAE,QAAQ,EAAE,EAAE;IAAE,QAAQ,EAAE,SAAS,CAAA;CAAE,+BAkL7E;AAED,oFAAoF;AACpF,MAAM,CAAC,OAAO,UAAU,gBAAgB,CAAC,KAAK,EAAE,qBAAqB,QAiEpE"}
|
|
@@ -100,7 +100,7 @@ export function AndroidGlassMenuProvider({ children }) {
|
|
|
100
100
|
height: Platform.OS === 'android' ? frame.availableHeight : frame.height,
|
|
101
101
|
},
|
|
102
102
|
]}>
|
|
103
|
-
<GlassMenuPanel key={entry.id} items={entry.children != null ? EMPTY_ITEMS : (entry.items ?? EMPTY_ITEMS)} customHeight={entry.children != null ? frame.height : 0} children={entry.children} expanded={entry.visible} dark={entry.theme === 'dark'} originX={frame.originX} originY={frame.originY} rowHeight={rowHeight} sourceIcon={entry.sourceIcon} backRequest={backRequest} onNavigate={(value) => {
|
|
103
|
+
<GlassMenuPanel key={entry.id} items={entry.children != null ? EMPTY_ITEMS : (entry.items ?? EMPTY_ITEMS)} isSelectMenu={entry.isSelectMenu ?? false} customHeight={entry.children != null ? frame.height : 0} children={entry.children} expanded={entry.visible} dark={entry.theme === 'dark'} shadow={entry.shadow} shadowOpacity={entry.shadowOpacity} originX={frame.originX} originY={frame.originY} rowHeight={rowHeight} sourceIcon={entry.sourceIcon} backRequest={backRequest} onNavigate={(value) => {
|
|
104
104
|
depth.current = value;
|
|
105
105
|
}} onDismissRequest={dismissOrCollapse} onClosed={() => {
|
|
106
106
|
if (!entry.visible) {
|
|
@@ -139,7 +139,7 @@ export default function AndroidGlassMenu(props) {
|
|
|
139
139
|
const id = useId();
|
|
140
140
|
if (!portal)
|
|
141
141
|
throw new Error('AndroidGlassMenu requires AndroidGlassMenuProvider above the navigator.');
|
|
142
|
-
const { children, contentHeight, visible, anchorRef, items, onSelect, onDismiss, onDismissed, sourceIcon, width, theme, insets, placement, } = props;
|
|
142
|
+
const { children, contentHeight, visible, anchorRef, items, isSelectMenu, onSelect, onDismiss, onDismissed, sourceIcon, width, theme, shadow, shadowOpacity, insets, placement, } = props;
|
|
143
143
|
useEffect(() => {
|
|
144
144
|
portal.set({
|
|
145
145
|
id,
|
|
@@ -148,12 +148,15 @@ export default function AndroidGlassMenu(props) {
|
|
|
148
148
|
visible,
|
|
149
149
|
anchorRef,
|
|
150
150
|
items,
|
|
151
|
+
isSelectMenu,
|
|
151
152
|
onSelect,
|
|
152
153
|
onDismiss,
|
|
153
154
|
onDismissed,
|
|
154
155
|
sourceIcon,
|
|
155
156
|
width,
|
|
156
157
|
theme,
|
|
158
|
+
shadow,
|
|
159
|
+
shadowOpacity,
|
|
157
160
|
insets,
|
|
158
161
|
placement,
|
|
159
162
|
});
|
|
@@ -165,12 +168,15 @@ export default function AndroidGlassMenu(props) {
|
|
|
165
168
|
visible,
|
|
166
169
|
anchorRef,
|
|
167
170
|
items,
|
|
171
|
+
isSelectMenu,
|
|
168
172
|
onSelect,
|
|
169
173
|
onDismiss,
|
|
170
174
|
onDismissed,
|
|
171
175
|
sourceIcon,
|
|
172
176
|
width,
|
|
173
177
|
theme,
|
|
178
|
+
shadow,
|
|
179
|
+
shadowOpacity,
|
|
174
180
|
insets,
|
|
175
181
|
placement,
|
|
176
182
|
]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AndroidGlassMenu.js","sourceRoot":"","sources":["../src/AndroidGlassMenu.tsx"],"names":[],"mappings":"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","sourcesContent":["import {\n createContext,\n useContext,\n useEffect,\n useId,\n useMemo,\n useRef,\n useState,\n type ReactNode,\n} from 'react';\nimport {\n BackHandler,\n Pressable,\n Platform,\n StyleSheet,\n View,\n useWindowDimensions,\n} from 'react-native';\n\nimport type { AndroidGlassMenuProps, AndroidGlassMenuItem } from './AndroidGlassMenu.types';\nimport GlassMenuPanel from './GlassMenuPanel';\nimport { menuLayout } from './menuLayout';\n\nconst EMPTY_ITEMS: readonly AndroidGlassMenuItem[] = [];\n\ntype Entry = AndroidGlassMenuProps & { id: string };\ntype Portal = { set: (entry: Entry) => void; remove: (id: string) => void };\nconst Context = createContext<Portal | null>(null);\n\n/** Place above your navigator, in the same window as the content being sampled. */\nexport function AndroidGlassMenuProvider({ children }: { children: ReactNode }) {\n const [entry, setEntry] = useState<Entry | null>(null);\n const [frame, setFrame] = useState<{\n id: string;\n left: number;\n top: number;\n width: number;\n height: number;\n originX: number;\n originY: number;\n availableHeight: number;\n } | null>(null);\n const root = useRef<View>(null);\n const depth = useRef(0);\n const [backRequest, setBackRequest] = useState(0);\n const [closedId, setClosedId] = useState<string | null>(null);\n const hidden = !!entry && !entry.visible && closedId === entry.id;\n const panelId = useRef<string | null>(null);\n const { width: windowWidth, height: windowHeight, fontScale } = useWindowDimensions();\n const rowHeight = Math.max(48, 48 * fontScale);\n const portal = useMemo<Portal>(\n () => ({\n set: (next) => {\n if (next.visible) setClosedId(null);\n setEntry((current) => {\n if (next.visible) return next;\n if (current?.id !== next.id) return current;\n // Closing before measurement completed must not leave a back-button blocker.\n return panelId.current === next.id ? next : null;\n });\n },\n remove: (id) => {\n if (panelId.current === id) panelId.current = null;\n setEntry((current) => (current?.id === id ? null : current));\n setFrame((current) => (current?.id === id ? null : current));\n },\n }),\n []\n );\n\n useEffect(() => {\n depth.current = 0;\n }, [entry?.id]);\n\n const dismissOrCollapse = () => {\n if (depth.current > 0) setBackRequest((value) => value + 1);\n else entry?.onDismiss();\n };\n\n useEffect(() => {\n if (!entry?.visible) return;\n if (!entry.anchorRef.current) {\n entry.onDismiss();\n return;\n }\n let cancelled = false;\n root.current?.measureInWindow((rootX, rootY, rootWidth, rootHeight) => {\n entry.anchorRef.current?.measureInWindow((x, y, anchorWidth, anchorHeight) => {\n if (cancelled || rootWidth <= 0 || rootHeight <= 0) return;\n panelId.current = entry.id;\n const layout = menuLayout(\n { x: rootX, y: rootY, width: rootWidth, height: rootHeight },\n { x, y, width: anchorWidth, height: anchorHeight },\n entry.items ?? EMPTY_ITEMS,\n rowHeight,\n entry.width,\n entry.insets,\n entry.placement,\n fontScale,\n entry.children != null ? Math.max(48, entry.contentHeight ?? 240) : undefined\n );\n setFrame({\n id: entry.id,\n ...layout,\n availableHeight: Math.max(1, rootHeight - layout.top - (entry.insets?.bottom ?? 12)),\n });\n });\n });\n return () => {\n cancelled = true;\n };\n }, [entry, windowWidth, windowHeight, rowHeight, fontScale]);\n\n useEffect(() => {\n if (!entry || hidden) return;\n const subscription = BackHandler.addEventListener('hardwareBackPress', () => {\n if (depth.current > 0) setBackRequest((value) => value + 1);\n else entry.onDismiss();\n return true;\n });\n return () => subscription.remove();\n }, [entry, hidden]);\n\n return (\n <Context.Provider value={portal}>\n <View ref={root} collapsable={false} style={styles.root}>\n {/* Keep the native content tree stable when accessibility switches for the menu.\n Flattening this wrapper would invalidate the RenderNodes cached by glass backdrops. */}\n <View\n collapsable={false}\n style={styles.root}\n importantForAccessibility={entry?.visible ? 'no-hide-descendants' : 'auto'}\n accessibilityElementsHidden={!!entry?.visible}>\n {children}\n </View>\n {entry && frame?.id === entry.id && (\n <View\n style={[styles.overlay, hidden && styles.hidden]}\n pointerEvents={hidden ? 'none' : 'auto'}\n accessibilityViewIsModal={!hidden}\n importantForAccessibility={hidden ? 'no-hide-descendants' : 'auto'}\n accessibilityElementsHidden={hidden}>\n <Pressable\n style={StyleSheet.absoluteFill}\n onPress={dismissOrCollapse}\n accessibilityRole=\"button\"\n accessibilityLabel=\"Close menu\"\n />\n <View\n style={[\n styles.panel,\n {\n left: frame.left,\n top: frame.top,\n width: frame.width,\n height: Platform.OS === 'android' ? frame.availableHeight : frame.height,\n },\n ]}>\n <GlassMenuPanel\n key={entry.id}\n items={entry.children != null ? EMPTY_ITEMS : (entry.items ?? EMPTY_ITEMS)}\n customHeight={entry.children != null ? frame.height : 0}\n children={entry.children}\n expanded={entry.visible}\n dark={entry.theme === 'dark'}\n originX={frame.originX}\n originY={frame.originY}\n rowHeight={rowHeight}\n sourceIcon={entry.sourceIcon}\n backRequest={backRequest}\n onNavigate={(value) => {\n depth.current = value;\n }}\n onDismissRequest={dismissOrCollapse}\n onClosed={() => {\n if (!entry.visible) {\n entry.onDismissed?.();\n // Keep the Compose layer and its GPU programs warm for the next opening.\n setClosedId(entry.id);\n }\n }}\n onSelect={(id) => {\n if (!entry.visible) return;\n const findItem = (\n items: readonly AndroidGlassMenuItem[]\n ): AndroidGlassMenuItem | undefined => {\n for (const item of items) {\n if (item.id === id) return item;\n const child = item.children && findItem(item.children);\n if (child) return child;\n }\n return undefined;\n };\n const item = findItem(entry.items ?? EMPTY_ITEMS);\n if (!item || item.disabled) return;\n if (!item.keepsMenuPresented) entry.onDismiss();\n entry.onSelect?.(id);\n }}\n />\n </View>\n </View>\n )}\n </View>\n </Context.Provider>\n );\n}\n\n/** Controlled anchored menu. Its panel is rendered above the provider's content. */\nexport default function AndroidGlassMenu(props: AndroidGlassMenuProps) {\n const portal = useContext(Context);\n const id = useId();\n if (!portal)\n throw new Error('AndroidGlassMenu requires AndroidGlassMenuProvider above the navigator.');\n const {\n children,\n contentHeight,\n visible,\n anchorRef,\n items,\n onSelect,\n onDismiss,\n onDismissed,\n sourceIcon,\n width,\n theme,\n insets,\n placement,\n } = props;\n useEffect(() => {\n portal.set({\n id,\n children,\n contentHeight,\n visible,\n anchorRef,\n items,\n onSelect,\n onDismiss,\n onDismissed,\n sourceIcon,\n width,\n theme,\n insets,\n placement,\n });\n }, [\n portal,\n id,\n children,\n contentHeight,\n visible,\n anchorRef,\n items,\n onSelect,\n onDismiss,\n onDismissed,\n sourceIcon,\n width,\n theme,\n insets,\n placement,\n ]);\n useEffect(() => () => portal.remove(id), [portal, id]);\n return null;\n}\n\nconst styles = StyleSheet.create({\n root: { flex: 1 },\n overlay: { position: 'absolute', top: 0, left: 0, right: 0, bottom: 0, zIndex: 10000 },\n panel: { position: 'absolute' },\n hidden: { opacity: 0 },\n});\n"]}
|
|
1
|
+
{"version":3,"file":"AndroidGlassMenu.js","sourceRoot":"","sources":["../src/AndroidGlassMenu.tsx"],"names":[],"mappings":"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","sourcesContent":["import {\n createContext,\n useContext,\n useEffect,\n useId,\n useMemo,\n useRef,\n useState,\n type ReactNode,\n} from 'react';\nimport {\n BackHandler,\n Pressable,\n Platform,\n StyleSheet,\n View,\n useWindowDimensions,\n} from 'react-native';\n\nimport type { AndroidGlassMenuProps, AndroidGlassMenuItem } from './AndroidGlassMenu.types';\nimport GlassMenuPanel from './GlassMenuPanel';\nimport { menuLayout } from './menuLayout';\n\nconst EMPTY_ITEMS: readonly AndroidGlassMenuItem[] = [];\n\ntype Entry = AndroidGlassMenuProps & { id: string };\ntype Portal = { set: (entry: Entry) => void; remove: (id: string) => void };\nconst Context = createContext<Portal | null>(null);\n\n/** Place above your navigator, in the same window as the content being sampled. */\nexport function AndroidGlassMenuProvider({ children }: { children: ReactNode }) {\n const [entry, setEntry] = useState<Entry | null>(null);\n const [frame, setFrame] = useState<{\n id: string;\n left: number;\n top: number;\n width: number;\n height: number;\n originX: number;\n originY: number;\n availableHeight: number;\n } | null>(null);\n const root = useRef<View>(null);\n const depth = useRef(0);\n const [backRequest, setBackRequest] = useState(0);\n const [closedId, setClosedId] = useState<string | null>(null);\n const hidden = !!entry && !entry.visible && closedId === entry.id;\n const panelId = useRef<string | null>(null);\n const { width: windowWidth, height: windowHeight, fontScale } = useWindowDimensions();\n const rowHeight = Math.max(48, 48 * fontScale);\n const portal = useMemo<Portal>(\n () => ({\n set: (next) => {\n if (next.visible) setClosedId(null);\n setEntry((current) => {\n if (next.visible) return next;\n if (current?.id !== next.id) return current;\n // Closing before measurement completed must not leave a back-button blocker.\n return panelId.current === next.id ? next : null;\n });\n },\n remove: (id) => {\n if (panelId.current === id) panelId.current = null;\n setEntry((current) => (current?.id === id ? null : current));\n setFrame((current) => (current?.id === id ? null : current));\n },\n }),\n []\n );\n\n useEffect(() => {\n depth.current = 0;\n }, [entry?.id]);\n\n const dismissOrCollapse = () => {\n if (depth.current > 0) setBackRequest((value) => value + 1);\n else entry?.onDismiss();\n };\n\n useEffect(() => {\n if (!entry?.visible) return;\n if (!entry.anchorRef.current) {\n entry.onDismiss();\n return;\n }\n let cancelled = false;\n root.current?.measureInWindow((rootX, rootY, rootWidth, rootHeight) => {\n entry.anchorRef.current?.measureInWindow((x, y, anchorWidth, anchorHeight) => {\n if (cancelled || rootWidth <= 0 || rootHeight <= 0) return;\n panelId.current = entry.id;\n const layout = menuLayout(\n { x: rootX, y: rootY, width: rootWidth, height: rootHeight },\n { x, y, width: anchorWidth, height: anchorHeight },\n entry.items ?? EMPTY_ITEMS,\n rowHeight,\n entry.width,\n entry.insets,\n entry.placement,\n fontScale,\n entry.children != null ? Math.max(48, entry.contentHeight ?? 240) : undefined\n );\n setFrame({\n id: entry.id,\n ...layout,\n availableHeight: Math.max(1, rootHeight - layout.top - (entry.insets?.bottom ?? 12)),\n });\n });\n });\n return () => {\n cancelled = true;\n };\n }, [entry, windowWidth, windowHeight, rowHeight, fontScale]);\n\n useEffect(() => {\n if (!entry || hidden) return;\n const subscription = BackHandler.addEventListener('hardwareBackPress', () => {\n if (depth.current > 0) setBackRequest((value) => value + 1);\n else entry.onDismiss();\n return true;\n });\n return () => subscription.remove();\n }, [entry, hidden]);\n\n return (\n <Context.Provider value={portal}>\n <View ref={root} collapsable={false} style={styles.root}>\n {/* Keep the native content tree stable when accessibility switches for the menu.\n Flattening this wrapper would invalidate the RenderNodes cached by glass backdrops. */}\n <View\n collapsable={false}\n style={styles.root}\n importantForAccessibility={entry?.visible ? 'no-hide-descendants' : 'auto'}\n accessibilityElementsHidden={!!entry?.visible}>\n {children}\n </View>\n {entry && frame?.id === entry.id && (\n <View\n style={[styles.overlay, hidden && styles.hidden]}\n pointerEvents={hidden ? 'none' : 'auto'}\n accessibilityViewIsModal={!hidden}\n importantForAccessibility={hidden ? 'no-hide-descendants' : 'auto'}\n accessibilityElementsHidden={hidden}>\n <Pressable\n style={StyleSheet.absoluteFill}\n onPress={dismissOrCollapse}\n accessibilityRole=\"button\"\n accessibilityLabel=\"Close menu\"\n />\n <View\n style={[\n styles.panel,\n {\n left: frame.left,\n top: frame.top,\n width: frame.width,\n height: Platform.OS === 'android' ? frame.availableHeight : frame.height,\n },\n ]}>\n <GlassMenuPanel\n key={entry.id}\n items={entry.children != null ? EMPTY_ITEMS : (entry.items ?? EMPTY_ITEMS)}\n isSelectMenu={entry.isSelectMenu ?? false}\n customHeight={entry.children != null ? frame.height : 0}\n children={entry.children}\n expanded={entry.visible}\n dark={entry.theme === 'dark'}\n shadow={entry.shadow}\n shadowOpacity={entry.shadowOpacity}\n originX={frame.originX}\n originY={frame.originY}\n rowHeight={rowHeight}\n sourceIcon={entry.sourceIcon}\n backRequest={backRequest}\n onNavigate={(value) => {\n depth.current = value;\n }}\n onDismissRequest={dismissOrCollapse}\n onClosed={() => {\n if (!entry.visible) {\n entry.onDismissed?.();\n // Keep the Compose layer and its GPU programs warm for the next opening.\n setClosedId(entry.id);\n }\n }}\n onSelect={(id) => {\n if (!entry.visible) return;\n const findItem = (\n items: readonly AndroidGlassMenuItem[]\n ): AndroidGlassMenuItem | undefined => {\n for (const item of items) {\n if (item.id === id) return item;\n const child = item.children && findItem(item.children);\n if (child) return child;\n }\n return undefined;\n };\n const item = findItem(entry.items ?? EMPTY_ITEMS);\n if (!item || item.disabled) return;\n if (!item.keepsMenuPresented) entry.onDismiss();\n entry.onSelect?.(id);\n }}\n />\n </View>\n </View>\n )}\n </View>\n </Context.Provider>\n );\n}\n\n/** Controlled anchored menu. Its panel is rendered above the provider's content. */\nexport default function AndroidGlassMenu(props: AndroidGlassMenuProps) {\n const portal = useContext(Context);\n const id = useId();\n if (!portal)\n throw new Error('AndroidGlassMenu requires AndroidGlassMenuProvider above the navigator.');\n const {\n children,\n contentHeight,\n visible,\n anchorRef,\n items,\n isSelectMenu,\n onSelect,\n onDismiss,\n onDismissed,\n sourceIcon,\n width,\n theme,\n shadow,\n shadowOpacity,\n insets,\n placement,\n } = props;\n useEffect(() => {\n portal.set({\n id,\n children,\n contentHeight,\n visible,\n anchorRef,\n items,\n isSelectMenu,\n onSelect,\n onDismiss,\n onDismissed,\n sourceIcon,\n width,\n theme,\n shadow,\n shadowOpacity,\n insets,\n placement,\n });\n }, [\n portal,\n id,\n children,\n contentHeight,\n visible,\n anchorRef,\n items,\n isSelectMenu,\n onSelect,\n onDismiss,\n onDismissed,\n sourceIcon,\n width,\n theme,\n shadow,\n shadowOpacity,\n insets,\n placement,\n ]);\n useEffect(() => () => portal.remove(id), [portal, id]);\n return null;\n}\n\nconst styles = StyleSheet.create({\n root: { flex: 1 },\n overlay: { position: 'absolute', top: 0, left: 0, right: 0, bottom: 0, zIndex: 10000 },\n panel: { position: 'absolute' },\n hidden: { opacity: 0 },\n});\n"]}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { ReactNode, RefObject } from 'react';
|
|
1
|
+
import type { ReactElement, ReactNode, RefObject } from 'react';
|
|
2
2
|
import type { View } from 'react-native';
|
|
3
3
|
export type AndroidGlassMenuItem = {
|
|
4
4
|
/** Stable, unique identifier returned by onSelect. */
|
|
@@ -6,8 +6,8 @@ export type AndroidGlassMenuItem = {
|
|
|
6
6
|
title: string;
|
|
7
7
|
/** A nested action list, shown with a trailing chevron. */
|
|
8
8
|
children?: readonly AndroidGlassMenuItem[];
|
|
9
|
-
/** Native line icon displayed before the title. */
|
|
10
|
-
icon?: 'grid' | 'heart' | 'adjustments' | 'photo' | 'video' | 'screenshot' | 'album' | 'zoom-in' | 'zoom-out' | 'aspect' | 'people';
|
|
9
|
+
/** Native line icon or a decorative React icon displayed before the title. */
|
|
10
|
+
icon?: 'grid' | 'heart' | 'adjustments' | 'photo' | 'video' | 'screenshot' | 'album' | 'zoom-in' | 'zoom-out' | 'aspect' | 'people' | ReactElement;
|
|
11
11
|
/** A compact row inside a submenu. */
|
|
12
12
|
compact?: boolean;
|
|
13
13
|
/** Optional muted section heading above this item. */
|
|
@@ -27,6 +27,8 @@ export type AndroidGlassMenuProps = {
|
|
|
27
27
|
/** Standard native rows. Ignored when children are supplied. */
|
|
28
28
|
items?: readonly AndroidGlassMenuItem[];
|
|
29
29
|
onSelect?: (id: string) => void;
|
|
30
|
+
/** Reserve the leading checkmark slot for selectable rows. Defaults to false. */
|
|
31
|
+
isSelectMenu?: boolean;
|
|
30
32
|
/** Custom React content replacing the native rows. Interactive children stay live. */
|
|
31
33
|
children?: ReactNode;
|
|
32
34
|
/** Custom panel height in dp (including padding). Default 240; clamped to available space. */
|
|
@@ -43,6 +45,10 @@ export type AndroidGlassMenuProps = {
|
|
|
43
45
|
placement?: 'overlap' | 'below';
|
|
44
46
|
/** Shared glass material. Default light, independent of the system. */
|
|
45
47
|
theme?: 'light' | 'dark';
|
|
48
|
+
/** Android drop shadow. Default true. */
|
|
49
|
+
shadow?: boolean;
|
|
50
|
+
/** Android shadow opacity, 0–1. Defaults to 0.12 in light and 0.16 in dark. */
|
|
51
|
+
shadowOpacity?: number;
|
|
46
52
|
/** Padding inside the provider bounds, e.g. safe-area insets. Default 12 on all sides. */
|
|
47
53
|
insets?: {
|
|
48
54
|
top?: number;
|
|
@@ -55,8 +61,11 @@ export type GlassMenuPanelProps = {
|
|
|
55
61
|
children?: ReactNode;
|
|
56
62
|
customHeight?: number;
|
|
57
63
|
items: readonly AndroidGlassMenuItem[];
|
|
64
|
+
isSelectMenu: boolean;
|
|
58
65
|
expanded: boolean;
|
|
59
66
|
dark: boolean;
|
|
67
|
+
shadow?: boolean;
|
|
68
|
+
shadowOpacity?: number;
|
|
60
69
|
originX: number;
|
|
61
70
|
originY: number;
|
|
62
71
|
rowHeight: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AndroidGlassMenu.types.d.ts","sourceRoot":"","sources":["../src/AndroidGlassMenu.types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"AndroidGlassMenu.types.d.ts","sourceRoot":"","sources":["../src/AndroidGlassMenu.types.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AndroidGlassMenu.types.js","sourceRoot":"","sources":["../src/AndroidGlassMenu.types.ts"],"names":[],"mappings":"","sourcesContent":["import type { ReactNode, RefObject } from 'react';\nimport type { View } from 'react-native';\n\nexport type AndroidGlassMenuItem = {\n /** Stable, unique identifier returned by onSelect. */\n id: string;\n title: string;\n /** A nested action list, shown with a trailing chevron. */\n children?: readonly AndroidGlassMenuItem[];\n /** Native line icon displayed before the title. */\n icon?:\n | 'grid'\n | 'heart'\n | 'adjustments'\n | 'photo'\n | 'video'\n | 'screenshot'\n | 'album'\n | 'zoom-in'\n | 'zoom-out'\n | 'aspect'\n | 'people';\n /** A compact row inside a submenu. */\n compact?: boolean;\n /** Optional muted section heading above this item. */\n sectionTitle?: string;\n /** Update an option without dismissing the menu. */\n keepsMenuPresented?: boolean;\n checked?: boolean;\n disabled?: boolean;\n destructive?: boolean;\n /** Draw a separator before this item. */\n separator?: boolean;\n};\n\nexport type AndroidGlassMenuProps = {\n visible: boolean;\n /** A non-collapsible View wrapping the trigger, measured in window coordinates. */\n anchorRef: RefObject<Pick<View, 'measureInWindow'> | null>;\n /** Standard native rows. Ignored when children are supplied. */\n items?: readonly AndroidGlassMenuItem[];\n onSelect?: (id: string) => void;\n /** Custom React content replacing the native rows. Interactive children stay live. */\n children?: ReactNode;\n /** Custom panel height in dp (including padding). Default 240; clamped to available space. */\n contentHeight?: number;\n /** Set visible to false here. Called on selection, outside press, and Android back. */\n onDismiss: () => void;\n /** Called after the closing animation has returned to the trigger. */\n onDismissed?: () => void;\n /** Trigger glyph retained by the native surface during its morph. */\n sourceIcon?: 'sort';\n /** Default 250 dp, clamped to the provider's available width. */\n width?: number;\n /** Default overlap: expands over its trigger, like the reference menu. */\n placement?: 'overlap' | 'below';\n /** Shared glass material. Default light, independent of the system. */\n theme?: 'light' | 'dark';\n /** Padding inside the provider bounds, e.g. safe-area insets. Default 12 on all sides. */\n insets?: { top?: number; right?: number; bottom?: number; left?: number };\n};\n\nexport type GlassMenuPanelProps = {\n children?: ReactNode;\n customHeight?: number;\n items: readonly AndroidGlassMenuItem[];\n expanded: boolean;\n dark: boolean;\n originX: number;\n originY: number;\n rowHeight: number;\n sourceIcon?: 'sort';\n backRequest: number;\n onNavigate: (depth: number) => void;\n onDismissRequest: () => void;\n onSelect: (id: string) => void;\n onClosed: () => void;\n};\n"]}
|
|
1
|
+
{"version":3,"file":"AndroidGlassMenu.types.js","sourceRoot":"","sources":["../src/AndroidGlassMenu.types.ts"],"names":[],"mappings":"","sourcesContent":["import type { ReactElement, ReactNode, RefObject } from 'react';\nimport type { View } from 'react-native';\n\nexport type AndroidGlassMenuItem = {\n /** Stable, unique identifier returned by onSelect. */\n id: string;\n title: string;\n /** A nested action list, shown with a trailing chevron. */\n children?: readonly AndroidGlassMenuItem[];\n /** Native line icon or a decorative React icon displayed before the title. */\n icon?:\n | 'grid'\n | 'heart'\n | 'adjustments'\n | 'photo'\n | 'video'\n | 'screenshot'\n | 'album'\n | 'zoom-in'\n | 'zoom-out'\n | 'aspect'\n | 'people'\n | ReactElement;\n /** A compact row inside a submenu. */\n compact?: boolean;\n /** Optional muted section heading above this item. */\n sectionTitle?: string;\n /** Update an option without dismissing the menu. */\n keepsMenuPresented?: boolean;\n checked?: boolean;\n disabled?: boolean;\n destructive?: boolean;\n /** Draw a separator before this item. */\n separator?: boolean;\n};\n\nexport type AndroidGlassMenuProps = {\n visible: boolean;\n /** A non-collapsible View wrapping the trigger, measured in window coordinates. */\n anchorRef: RefObject<Pick<View, 'measureInWindow'> | null>;\n /** Standard native rows. Ignored when children are supplied. */\n items?: readonly AndroidGlassMenuItem[];\n onSelect?: (id: string) => void;\n /** Reserve the leading checkmark slot for selectable rows. Defaults to false. */\n isSelectMenu?: boolean;\n /** Custom React content replacing the native rows. Interactive children stay live. */\n children?: ReactNode;\n /** Custom panel height in dp (including padding). Default 240; clamped to available space. */\n contentHeight?: number;\n /** Set visible to false here. Called on selection, outside press, and Android back. */\n onDismiss: () => void;\n /** Called after the closing animation has returned to the trigger. */\n onDismissed?: () => void;\n /** Trigger glyph retained by the native surface during its morph. */\n sourceIcon?: 'sort';\n /** Default 250 dp, clamped to the provider's available width. */\n width?: number;\n /** Default overlap: expands over its trigger, like the reference menu. */\n placement?: 'overlap' | 'below';\n /** Shared glass material. Default light, independent of the system. */\n theme?: 'light' | 'dark';\n /** Android drop shadow. Default true. */\n shadow?: boolean;\n /** Android shadow opacity, 0–1. Defaults to 0.12 in light and 0.16 in dark. */\n shadowOpacity?: number;\n /** Padding inside the provider bounds, e.g. safe-area insets. Default 12 on all sides. */\n insets?: { top?: number; right?: number; bottom?: number; left?: number };\n};\n\nexport type GlassMenuPanelProps = {\n children?: ReactNode;\n customHeight?: number;\n items: readonly AndroidGlassMenuItem[];\n isSelectMenu: boolean;\n expanded: boolean;\n dark: boolean;\n shadow?: boolean;\n shadowOpacity?: number;\n originX: number;\n originY: number;\n rowHeight: number;\n sourceIcon?: 'sort';\n backRequest: number;\n onNavigate: (depth: number) => void;\n onDismissRequest: () => void;\n onSelect: (id: string) => void;\n onClosed: () => void;\n};\n"]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GlassMenuPanel.android.d.ts","sourceRoot":"","sources":["../src/GlassMenuPanel.android.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"GlassMenuPanel.android.d.ts","sourceRoot":"","sources":["../src/GlassMenuPanel.android.tsx"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAuBpE,MAAM,CAAC,OAAO,UAAU,cAAc,CAAC,EACrC,KAAK,EACL,QAAQ,EACR,YAAgB,EAChB,QAAQ,EACR,UAAU,EACV,GAAG,KAAK,EACT,EAAE,mBAAmB,+BA4CrB"}
|
|
@@ -1,8 +1,15 @@
|
|
|
1
1
|
import { requireNativeView } from 'expo';
|
|
2
|
-
import {
|
|
2
|
+
import { useMemo } from 'react';
|
|
3
|
+
import { ScrollView, StyleSheet, View, } from 'react-native';
|
|
4
|
+
import { serializeMenuItems } from './menuItemSerialization';
|
|
3
5
|
const NativePanel = requireNativeView('ExpoAndroidGlassView', 'AndroidGlassMenuPanel');
|
|
4
6
|
export default function GlassMenuPanel({ items, children, customHeight = 0, onSelect, onNavigate, ...props }) {
|
|
5
|
-
|
|
7
|
+
const { itemsJson, icons } = useMemo(() => serializeMenuItems(items), [items]);
|
|
8
|
+
return (<NativePanel {...props} style={styles.fill} shadow={props.shadow ?? true} shadowOpacity={props.shadowOpacity ?? null} customHeight={customHeight} itemsJson={itemsJson} onItemSelected={(event) => onSelect(event.nativeEvent.id)} onNavigate={(event) => onNavigate(event.nativeEvent.depth)}>
|
|
9
|
+
{children == null &&
|
|
10
|
+
icons.map((icon, index) => (<View key={index} collapsable={false} pointerEvents="none" accessible={false} style={styles.icon}>
|
|
11
|
+
{icon}
|
|
12
|
+
</View>))}
|
|
6
13
|
{children != null && (<ScrollView collapsable={false} pointerEvents={props.expanded ? 'auto' : 'none'} style={{
|
|
7
14
|
position: 'absolute',
|
|
8
15
|
top: 0,
|
|
@@ -16,5 +23,8 @@ export default function GlassMenuPanel({ items, children, customHeight = 0, onSe
|
|
|
16
23
|
</ScrollView>)}
|
|
17
24
|
</NativePanel>);
|
|
18
25
|
}
|
|
19
|
-
const styles = StyleSheet.create({
|
|
26
|
+
const styles = StyleSheet.create({
|
|
27
|
+
fill: { flex: 1 },
|
|
28
|
+
icon: { position: 'absolute', left: 0, top: 0, width: 20, height: 20 },
|
|
29
|
+
});
|
|
20
30
|
//# sourceMappingURL=GlassMenuPanel.android.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GlassMenuPanel.android.js","sourceRoot":"","sources":["../src/GlassMenuPanel.android.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"GlassMenuPanel.android.js","sourceRoot":"","sources":["../src/GlassMenuPanel.android.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,MAAM,CAAC;AACzC,OAAO,EAAE,OAAO,EAAsB,MAAM,OAAO,CAAC;AACpD,OAAO,EACL,UAAU,EACV,UAAU,EACV,IAAI,GAGL,MAAM,cAAc,CAAC;AAGtB,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAE7D,MAAM,WAAW,GAkBb,iBAAiB,CAAC,sBAAsB,EAAE,uBAAuB,CAAC,CAAC;AAEvE,MAAM,CAAC,OAAO,UAAU,cAAc,CAAC,EACrC,KAAK,EACL,QAAQ,EACR,YAAY,GAAG,CAAC,EAChB,QAAQ,EACR,UAAU,EACV,GAAG,KAAK,EACY;IACpB,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,kBAAkB,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;IAE/E,OAAO,CACL,CAAC,WAAW,CACV,IAAI,KAAK,CAAC,CACV,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CACnB,MAAM,CAAC,CAAC,KAAK,CAAC,MAAM,IAAI,IAAI,CAAC,CAC7B,aAAa,CAAC,CAAC,KAAK,CAAC,aAAa,IAAI,IAAI,CAAC,CAC3C,YAAY,CAAC,CAAC,YAAY,CAAC,CAC3B,SAAS,CAAC,CAAC,SAAS,CAAC,CACrB,cAAc,CAAC,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,CAC1D,UAAU,CAAC,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAC3D;MAAA,CAAC,QAAQ,IAAI,IAAI;YACf,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,CACzB,CAAC,IAAI,CACH,GAAG,CAAC,CAAC,KAAK,CAAC,CACX,WAAW,CAAC,CAAC,KAAK,CAAC,CACnB,aAAa,CAAC,MAAM,CACpB,UAAU,CAAC,CAAC,KAAK,CAAC,CAClB,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CACnB;YAAA,CAAC,IAAI,CACP;UAAA,EAAE,IAAI,CAAC,CACR,CAAC,CACJ;MAAA,CAAC,QAAQ,IAAI,IAAI,IAAI,CACnB,CAAC,UAAU,CACT,WAAW,CAAC,CAAC,KAAK,CAAC,CACnB,aAAa,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAChD,KAAK,CAAC,CAAC;gBACL,QAAQ,EAAE,UAAU;gBACpB,GAAG,EAAE,CAAC;gBACN,IAAI,EAAE,CAAC;gBACP,KAAK,EAAE,CAAC;gBACR,MAAM,EAAE,YAAY;gBACpB,YAAY,EAAE,EAAE;gBAChB,QAAQ,EAAE,QAAQ;aACnB,CAAC,CACF,qBAAqB,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CACvC,yBAAyB,CAAC,SAAS,CACnC;UAAA,CAAC,QAAQ,CACX;QAAA,EAAE,UAAU,CAAC,CACd,CACH;IAAA,EAAE,WAAW,CAAC,CACf,CAAC;AACJ,CAAC;AACD,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;IAC/B,IAAI,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE;IACjB,IAAI,EAAE,EAAE,QAAQ,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;CACvE,CAAC,CAAC","sourcesContent":["import { requireNativeView } from 'expo';\nimport { useMemo, type ComponentType } from 'react';\nimport {\n ScrollView,\n StyleSheet,\n View,\n type NativeSyntheticEvent,\n type ViewProps,\n} from 'react-native';\n\nimport type { GlassMenuPanelProps } from './AndroidGlassMenu.types';\nimport { serializeMenuItems } from './menuItemSerialization';\n\nconst NativePanel: ComponentType<\n ViewProps & {\n itemsJson: string;\n expanded: boolean;\n dark: boolean;\n isSelectMenu: boolean;\n shadow: boolean;\n shadowOpacity: number | null;\n originX: number;\n originY: number;\n rowHeight: number;\n backRequest: number;\n customHeight?: number;\n onItemSelected: (event: NativeSyntheticEvent<{ id: string }>) => void;\n onNavigate: (event: NativeSyntheticEvent<{ depth: number }>) => void;\n onDismissRequest: () => void;\n onClosed: () => void;\n }\n> = requireNativeView('ExpoAndroidGlassView', 'AndroidGlassMenuPanel');\n\nexport default function GlassMenuPanel({\n items,\n children,\n customHeight = 0,\n onSelect,\n onNavigate,\n ...props\n}: GlassMenuPanelProps) {\n const { itemsJson, icons } = useMemo(() => serializeMenuItems(items), [items]);\n\n return (\n <NativePanel\n {...props}\n style={styles.fill}\n shadow={props.shadow ?? true}\n shadowOpacity={props.shadowOpacity ?? null}\n customHeight={customHeight}\n itemsJson={itemsJson}\n onItemSelected={(event) => onSelect(event.nativeEvent.id)}\n onNavigate={(event) => onNavigate(event.nativeEvent.depth)}>\n {children == null &&\n icons.map((icon, index) => (\n <View\n key={index}\n collapsable={false}\n pointerEvents=\"none\"\n accessible={false}\n style={styles.icon}>\n {icon}\n </View>\n ))}\n {children != null && (\n <ScrollView\n collapsable={false}\n pointerEvents={props.expanded ? 'auto' : 'none'}\n style={{\n position: 'absolute',\n top: 0,\n left: 0,\n right: 0,\n height: customHeight,\n borderRadius: 30,\n overflow: 'hidden',\n }}\n contentContainerStyle={{ padding: 16 }}\n keyboardShouldPersistTaps=\"handled\">\n {children}\n </ScrollView>\n )}\n </NativePanel>\n );\n}\nconst styles = StyleSheet.create({\n fill: { flex: 1 },\n icon: { position: 'absolute', left: 0, top: 0, width: 20, height: 20 },\n});\n"]}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import type { GlassMenuPanelProps } from './AndroidGlassMenu.types';
|
|
2
|
-
export default function GlassMenuPanel({ items: rootItems, children, expanded, dark, rowHeight, onSelect, backRequest, onNavigate, onClosed, }: GlassMenuPanelProps): import("react").JSX.Element;
|
|
2
|
+
export default function GlassMenuPanel({ items: rootItems, isSelectMenu, children, expanded, dark, rowHeight, onSelect, backRequest, onNavigate, onClosed, }: GlassMenuPanelProps): import("react").JSX.Element;
|
|
3
3
|
//# sourceMappingURL=GlassMenuPanel.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GlassMenuPanel.d.ts","sourceRoot":"","sources":["../src/GlassMenuPanel.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAGpE,MAAM,CAAC,OAAO,UAAU,cAAc,CAAC,EACrC,KAAK,EAAE,SAAS,EAChB,QAAQ,EACR,QAAQ,EACR,IAAI,EACJ,SAAS,EACT,QAAQ,EACR,WAAW,EACX,UAAU,EACV,QAAQ,GACT,EAAE,mBAAmB,+
|
|
1
|
+
{"version":3,"file":"GlassMenuPanel.d.ts","sourceRoot":"","sources":["../src/GlassMenuPanel.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAGpE,MAAM,CAAC,OAAO,UAAU,cAAc,CAAC,EACrC,KAAK,EAAE,SAAS,EAChB,YAAY,EACZ,QAAQ,EACR,QAAQ,EACR,IAAI,EACJ,SAAS,EACT,QAAQ,EACR,WAAW,EACX,UAAU,EACV,QAAQ,GACT,EAAE,mBAAmB,+BAwFrB"}
|
package/build/GlassMenuPanel.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { useEffect, useState } from 'react';
|
|
2
2
|
import { Pressable, ScrollView, StyleSheet, Text, View, useWindowDimensions } from 'react-native';
|
|
3
3
|
import { menuItemHeight } from './menuLayout';
|
|
4
|
-
export default function GlassMenuPanel({ items: rootItems, children, expanded, dark, rowHeight, onSelect, backRequest, onNavigate, onClosed, }) {
|
|
4
|
+
export default function GlassMenuPanel({ items: rootItems, isSelectMenu, children, expanded, dark, rowHeight, onSelect, backRequest, onNavigate, onClosed, }) {
|
|
5
5
|
const { fontScale } = useWindowDimensions();
|
|
6
6
|
const [path, setPath] = useState([]);
|
|
7
7
|
let items = rootItems;
|
|
@@ -31,7 +31,7 @@ export default function GlassMenuPanel({ items: rootItems, children, expanded, d
|
|
|
31
31
|
{item.separator && <View style={styles.separator}/>}
|
|
32
32
|
{item.sectionTitle && (<Text style={{
|
|
33
33
|
color: dark ? '#ffffff88' : '#00000088',
|
|
34
|
-
paddingLeft: 36,
|
|
34
|
+
paddingLeft: isSelectMenu ? 36 : 12,
|
|
35
35
|
height: 30 * fontScale,
|
|
36
36
|
fontSize: 13,
|
|
37
37
|
textAlignVertical: 'center',
|
|
@@ -46,9 +46,10 @@ export default function GlassMenuPanel({ items: rootItems, children, expanded, d
|
|
|
46
46
|
backgroundColor: pressed ? (dark ? '#ffffff22' : '#00000011') : 'transparent',
|
|
47
47
|
},
|
|
48
48
|
]}>
|
|
49
|
-
<Text style={{ color: dark ? 'white' : '#17191d', width: 24 }}>
|
|
50
|
-
|
|
51
|
-
|
|
49
|
+
{isSelectMenu && (<Text style={{ color: dark ? 'white' : '#17191d', width: 24 }}>
|
|
50
|
+
{item.checked ? '✓' : ''}
|
|
51
|
+
</Text>)}
|
|
52
|
+
{item.icon != null && typeof item.icon !== 'string' && (<View style={styles.icon}>{item.icon}</View>)}
|
|
52
53
|
<Text style={{
|
|
53
54
|
flex: 1,
|
|
54
55
|
fontSize: 17,
|
|
@@ -66,6 +67,7 @@ export default function GlassMenuPanel({ items: rootItems, children, expanded, d
|
|
|
66
67
|
const styles = StyleSheet.create({
|
|
67
68
|
panel: { borderRadius: 32, padding: 8 },
|
|
68
69
|
row: { flexDirection: 'row', alignItems: 'center', paddingHorizontal: 12, borderRadius: 16 },
|
|
70
|
+
icon: { width: 20, height: 20, marginRight: 14 },
|
|
69
71
|
separator: { height: 1, marginVertical: 5.5, marginHorizontal: 16, backgroundColor: '#88888844' },
|
|
70
72
|
});
|
|
71
73
|
//# sourceMappingURL=GlassMenuPanel.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GlassMenuPanel.js","sourceRoot":"","sources":["../src/GlassMenuPanel.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"GlassMenuPanel.js","sourceRoot":"","sources":["../src/GlassMenuPanel.tsx"],"names":[],"mappings":"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","sourcesContent":["import { useEffect, useState } from 'react';\nimport { Pressable, ScrollView, StyleSheet, Text, View, useWindowDimensions } from 'react-native';\n\nimport type { GlassMenuPanelProps } from './AndroidGlassMenu.types';\nimport { menuItemHeight } from './menuLayout';\n\nexport default function GlassMenuPanel({\n items: rootItems,\n isSelectMenu,\n children,\n expanded,\n dark,\n rowHeight,\n onSelect,\n backRequest,\n onNavigate,\n onClosed,\n}: GlassMenuPanelProps) {\n const { fontScale } = useWindowDimensions();\n const [path, setPath] = useState<string[]>([]);\n let items = rootItems;\n for (const id of path) items = items.find((item) => item.id === id)?.children ?? items;\n useEffect(() => onNavigate(path.length), [path, onNavigate]);\n const [handledBackRequest, setHandledBackRequest] = useState(backRequest);\n if (handledBackRequest !== backRequest) {\n setHandledBackRequest(backRequest);\n setPath(path.slice(0, -1));\n }\n if (!expanded && path.length) setPath([]);\n useEffect(() => {\n if (!expanded) onClosed();\n }, [expanded, onClosed]);\n if (children != null)\n return (\n <ScrollView\n pointerEvents={expanded ? 'auto' : 'none'}\n style={[styles.panel, { backgroundColor: dark ? '#292d32' : '#f2f2f2' }]}\n contentContainerStyle={{ padding: 16 }}\n keyboardShouldPersistTaps=\"handled\">\n {children}\n </ScrollView>\n );\n return (\n <ScrollView style={[styles.panel, { backgroundColor: dark ? '#292d32' : '#f2f2f2' }]}>\n {path.length > 0 && (\n <Pressable onPress={() => setPath((value) => value.slice(0, -1))} style={styles.row}>\n <Text style={{ color: dark ? 'white' : '#17191d', paddingVertical: 16 }}>‹ Back</Text>\n </Pressable>\n )}\n {items.map((item) => (\n <View key={item.id}>\n {item.separator && <View style={styles.separator} />}\n {item.sectionTitle && (\n <Text\n style={{\n color: dark ? '#ffffff88' : '#00000088',\n paddingLeft: isSelectMenu ? 36 : 12,\n height: 30 * fontScale,\n fontSize: 13,\n textAlignVertical: 'center',\n }}>\n {item.sectionTitle}\n </Text>\n )}\n <Pressable\n disabled={item.disabled}\n accessibilityRole=\"menuitem\"\n accessibilityState={{ disabled: !!item.disabled, selected: !!item.checked }}\n onPress={() =>\n item.children?.length ? setPath([...path, item.id]) : onSelect(item.id)\n }\n style={({ pressed }) => [\n styles.row,\n {\n minHeight: menuItemHeight(item, rowHeight, fontScale),\n opacity: item.disabled ? 0.4 : 1,\n backgroundColor: pressed ? (dark ? '#ffffff22' : '#00000011') : 'transparent',\n },\n ]}>\n {isSelectMenu && (\n <Text style={{ color: dark ? 'white' : '#17191d', width: 24 }}>\n {item.checked ? '✓' : ''}\n </Text>\n )}\n {item.icon != null && typeof item.icon !== 'string' && (\n <View style={styles.icon}>{item.icon}</View>\n )}\n <Text\n style={{\n flex: 1,\n fontSize: 17,\n color: item.destructive ? '#e5484d' : dark ? 'white' : '#17191d',\n }}>\n {item.title}\n </Text>\n {!!item.children?.length && (\n <Text style={{ color: dark ? 'white' : '#17191d', fontSize: 20, paddingLeft: 12 }}>\n ›\n </Text>\n )}\n </Pressable>\n </View>\n ))}\n </ScrollView>\n );\n}\nconst styles = StyleSheet.create({\n panel: { borderRadius: 32, padding: 8 },\n row: { flexDirection: 'row', alignItems: 'center', paddingHorizontal: 12, borderRadius: 16 },\n icon: { width: 20, height: 20, marginRight: 14 },\n separator: { height: 1, marginVertical: 5.5, marginHorizontal: 16, backgroundColor: '#88888844' },\n});\n"]}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import type { ReactElement } from 'react';
|
|
2
|
+
import type { AndroidGlassMenuItem } from './AndroidGlassMenu.types';
|
|
3
|
+
/** Keep React elements in the native child tree, never in the JSON row payload. */
|
|
4
|
+
export declare function serializeMenuItems(items: readonly AndroidGlassMenuItem[]): {
|
|
5
|
+
itemsJson: string;
|
|
6
|
+
icons: ReactElement<unknown, string | import("react").JSXElementConstructor<any>>[];
|
|
7
|
+
};
|
|
8
|
+
//# sourceMappingURL=menuItemSerialization.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"menuItemSerialization.d.ts","sourceRoot":"","sources":["../src/menuItemSerialization.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,OAAO,CAAC;AAE1C,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAErE,mFAAmF;AACnF,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,SAAS,oBAAoB,EAAE;;;EAaxE"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
/** Keep React elements in the native child tree, never in the JSON row payload. */
|
|
2
|
+
export function serializeMenuItems(items) {
|
|
3
|
+
const icons = [];
|
|
4
|
+
const serialize = (rows) => rows.map(({ icon, children, ...item }) => {
|
|
5
|
+
const iconViewIndex = typeof icon === 'string' || icon == null ? -1 : icons.push(icon) - 1;
|
|
6
|
+
return {
|
|
7
|
+
...item,
|
|
8
|
+
icon: typeof icon === 'string' ? icon : '',
|
|
9
|
+
iconViewIndex,
|
|
10
|
+
children: children ? serialize(children) : [],
|
|
11
|
+
};
|
|
12
|
+
});
|
|
13
|
+
return { itemsJson: JSON.stringify(serialize(items)), icons };
|
|
14
|
+
}
|
|
15
|
+
//# sourceMappingURL=menuItemSerialization.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"menuItemSerialization.js","sourceRoot":"","sources":["../src/menuItemSerialization.ts"],"names":[],"mappings":"AAIA,mFAAmF;AACnF,MAAM,UAAU,kBAAkB,CAAC,KAAsC;IACvE,MAAM,KAAK,GAAmB,EAAE,CAAC;IACjC,MAAM,SAAS,GAAG,CAAC,IAAqC,EAAY,EAAE,CACpE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,IAAI,EAAE,EAAE,EAAE;QACvC,MAAM,aAAa,GAAG,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC3F,OAAO;YACL,GAAG,IAAI;YACP,IAAI,EAAE,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE;YAC1C,aAAa;YACb,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE;SAC9C,CAAC;IACJ,CAAC,CAAC,CAAC;IACL,OAAO,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC;AAChE,CAAC","sourcesContent":["import type { ReactElement } from 'react';\n\nimport type { AndroidGlassMenuItem } from './AndroidGlassMenu.types';\n\n/** Keep React elements in the native child tree, never in the JSON row payload. */\nexport function serializeMenuItems(items: readonly AndroidGlassMenuItem[]) {\n const icons: ReactElement[] = [];\n const serialize = (rows: readonly AndroidGlassMenuItem[]): object[] =>\n rows.map(({ icon, children, ...item }) => {\n const iconViewIndex = typeof icon === 'string' || icon == null ? -1 : icons.push(icon) - 1;\n return {\n ...item,\n icon: typeof icon === 'string' ? icon : '',\n iconViewIndex,\n children: children ? serialize(children) : [],\n };\n });\n return { itemsJson: JSON.stringify(serialize(items)), icons };\n}\n"]}
|
|
@@ -3,7 +3,7 @@ module.exports = {
|
|
|
3
3
|
rootDir: '..',
|
|
4
4
|
testEnvironment: 'node',
|
|
5
5
|
watchman: false,
|
|
6
|
-
testMatch: ['<rootDir>/src/__tests__
|
|
6
|
+
testMatch: ['<rootDir>/src/__tests__/*.test.ts'],
|
|
7
7
|
transform: {
|
|
8
8
|
'^.+\\.tsx?$': ['babel-jest', { presets: ['babel-preset-expo'] }],
|
|
9
9
|
},
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "expo-android-glass-view",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "1.0.0",
|
|
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",
|
package/src/AndroidGlassMenu.tsx
CHANGED
|
@@ -159,10 +159,13 @@ export function AndroidGlassMenuProvider({ children }: { children: ReactNode })
|
|
|
159
159
|
<GlassMenuPanel
|
|
160
160
|
key={entry.id}
|
|
161
161
|
items={entry.children != null ? EMPTY_ITEMS : (entry.items ?? EMPTY_ITEMS)}
|
|
162
|
+
isSelectMenu={entry.isSelectMenu ?? false}
|
|
162
163
|
customHeight={entry.children != null ? frame.height : 0}
|
|
163
164
|
children={entry.children}
|
|
164
165
|
expanded={entry.visible}
|
|
165
166
|
dark={entry.theme === 'dark'}
|
|
167
|
+
shadow={entry.shadow}
|
|
168
|
+
shadowOpacity={entry.shadowOpacity}
|
|
166
169
|
originX={frame.originX}
|
|
167
170
|
originY={frame.originY}
|
|
168
171
|
rowHeight={rowHeight}
|
|
@@ -217,12 +220,15 @@ export default function AndroidGlassMenu(props: AndroidGlassMenuProps) {
|
|
|
217
220
|
visible,
|
|
218
221
|
anchorRef,
|
|
219
222
|
items,
|
|
223
|
+
isSelectMenu,
|
|
220
224
|
onSelect,
|
|
221
225
|
onDismiss,
|
|
222
226
|
onDismissed,
|
|
223
227
|
sourceIcon,
|
|
224
228
|
width,
|
|
225
229
|
theme,
|
|
230
|
+
shadow,
|
|
231
|
+
shadowOpacity,
|
|
226
232
|
insets,
|
|
227
233
|
placement,
|
|
228
234
|
} = props;
|
|
@@ -234,12 +240,15 @@ export default function AndroidGlassMenu(props: AndroidGlassMenuProps) {
|
|
|
234
240
|
visible,
|
|
235
241
|
anchorRef,
|
|
236
242
|
items,
|
|
243
|
+
isSelectMenu,
|
|
237
244
|
onSelect,
|
|
238
245
|
onDismiss,
|
|
239
246
|
onDismissed,
|
|
240
247
|
sourceIcon,
|
|
241
248
|
width,
|
|
242
249
|
theme,
|
|
250
|
+
shadow,
|
|
251
|
+
shadowOpacity,
|
|
243
252
|
insets,
|
|
244
253
|
placement,
|
|
245
254
|
});
|
|
@@ -251,12 +260,15 @@ export default function AndroidGlassMenu(props: AndroidGlassMenuProps) {
|
|
|
251
260
|
visible,
|
|
252
261
|
anchorRef,
|
|
253
262
|
items,
|
|
263
|
+
isSelectMenu,
|
|
254
264
|
onSelect,
|
|
255
265
|
onDismiss,
|
|
256
266
|
onDismissed,
|
|
257
267
|
sourceIcon,
|
|
258
268
|
width,
|
|
259
269
|
theme,
|
|
270
|
+
shadow,
|
|
271
|
+
shadowOpacity,
|
|
260
272
|
insets,
|
|
261
273
|
placement,
|
|
262
274
|
]);
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { ReactNode, RefObject } from 'react';
|
|
1
|
+
import type { ReactElement, ReactNode, RefObject } from 'react';
|
|
2
2
|
import type { View } from 'react-native';
|
|
3
3
|
|
|
4
4
|
export type AndroidGlassMenuItem = {
|
|
@@ -7,7 +7,7 @@ export type AndroidGlassMenuItem = {
|
|
|
7
7
|
title: string;
|
|
8
8
|
/** A nested action list, shown with a trailing chevron. */
|
|
9
9
|
children?: readonly AndroidGlassMenuItem[];
|
|
10
|
-
/** Native line icon displayed before the title. */
|
|
10
|
+
/** Native line icon or a decorative React icon displayed before the title. */
|
|
11
11
|
icon?:
|
|
12
12
|
| 'grid'
|
|
13
13
|
| 'heart'
|
|
@@ -19,7 +19,8 @@ export type AndroidGlassMenuItem = {
|
|
|
19
19
|
| 'zoom-in'
|
|
20
20
|
| 'zoom-out'
|
|
21
21
|
| 'aspect'
|
|
22
|
-
| 'people'
|
|
22
|
+
| 'people'
|
|
23
|
+
| ReactElement;
|
|
23
24
|
/** A compact row inside a submenu. */
|
|
24
25
|
compact?: boolean;
|
|
25
26
|
/** Optional muted section heading above this item. */
|
|
@@ -40,6 +41,8 @@ export type AndroidGlassMenuProps = {
|
|
|
40
41
|
/** Standard native rows. Ignored when children are supplied. */
|
|
41
42
|
items?: readonly AndroidGlassMenuItem[];
|
|
42
43
|
onSelect?: (id: string) => void;
|
|
44
|
+
/** Reserve the leading checkmark slot for selectable rows. Defaults to false. */
|
|
45
|
+
isSelectMenu?: boolean;
|
|
43
46
|
/** Custom React content replacing the native rows. Interactive children stay live. */
|
|
44
47
|
children?: ReactNode;
|
|
45
48
|
/** Custom panel height in dp (including padding). Default 240; clamped to available space. */
|
|
@@ -56,6 +59,10 @@ export type AndroidGlassMenuProps = {
|
|
|
56
59
|
placement?: 'overlap' | 'below';
|
|
57
60
|
/** Shared glass material. Default light, independent of the system. */
|
|
58
61
|
theme?: 'light' | 'dark';
|
|
62
|
+
/** Android drop shadow. Default true. */
|
|
63
|
+
shadow?: boolean;
|
|
64
|
+
/** Android shadow opacity, 0–1. Defaults to 0.12 in light and 0.16 in dark. */
|
|
65
|
+
shadowOpacity?: number;
|
|
59
66
|
/** Padding inside the provider bounds, e.g. safe-area insets. Default 12 on all sides. */
|
|
60
67
|
insets?: { top?: number; right?: number; bottom?: number; left?: number };
|
|
61
68
|
};
|
|
@@ -64,8 +71,11 @@ export type GlassMenuPanelProps = {
|
|
|
64
71
|
children?: ReactNode;
|
|
65
72
|
customHeight?: number;
|
|
66
73
|
items: readonly AndroidGlassMenuItem[];
|
|
74
|
+
isSelectMenu: boolean;
|
|
67
75
|
expanded: boolean;
|
|
68
76
|
dark: boolean;
|
|
77
|
+
shadow?: boolean;
|
|
78
|
+
shadowOpacity?: number;
|
|
69
79
|
originX: number;
|
|
70
80
|
originY: number;
|
|
71
81
|
rowHeight: number;
|
|
@@ -1,14 +1,24 @@
|
|
|
1
1
|
import { requireNativeView } from 'expo';
|
|
2
|
-
import type
|
|
3
|
-
import {
|
|
2
|
+
import { useMemo, type ComponentType } from 'react';
|
|
3
|
+
import {
|
|
4
|
+
ScrollView,
|
|
5
|
+
StyleSheet,
|
|
6
|
+
View,
|
|
7
|
+
type NativeSyntheticEvent,
|
|
8
|
+
type ViewProps,
|
|
9
|
+
} from 'react-native';
|
|
4
10
|
|
|
5
11
|
import type { GlassMenuPanelProps } from './AndroidGlassMenu.types';
|
|
12
|
+
import { serializeMenuItems } from './menuItemSerialization';
|
|
6
13
|
|
|
7
14
|
const NativePanel: ComponentType<
|
|
8
15
|
ViewProps & {
|
|
9
16
|
itemsJson: string;
|
|
10
17
|
expanded: boolean;
|
|
11
18
|
dark: boolean;
|
|
19
|
+
isSelectMenu: boolean;
|
|
20
|
+
shadow: boolean;
|
|
21
|
+
shadowOpacity: number | null;
|
|
12
22
|
originX: number;
|
|
13
23
|
originY: number;
|
|
14
24
|
rowHeight: number;
|
|
@@ -29,14 +39,29 @@ export default function GlassMenuPanel({
|
|
|
29
39
|
onNavigate,
|
|
30
40
|
...props
|
|
31
41
|
}: GlassMenuPanelProps) {
|
|
42
|
+
const { itemsJson, icons } = useMemo(() => serializeMenuItems(items), [items]);
|
|
43
|
+
|
|
32
44
|
return (
|
|
33
45
|
<NativePanel
|
|
34
46
|
{...props}
|
|
35
47
|
style={styles.fill}
|
|
48
|
+
shadow={props.shadow ?? true}
|
|
49
|
+
shadowOpacity={props.shadowOpacity ?? null}
|
|
36
50
|
customHeight={customHeight}
|
|
37
|
-
itemsJson={
|
|
51
|
+
itemsJson={itemsJson}
|
|
38
52
|
onItemSelected={(event) => onSelect(event.nativeEvent.id)}
|
|
39
53
|
onNavigate={(event) => onNavigate(event.nativeEvent.depth)}>
|
|
54
|
+
{children == null &&
|
|
55
|
+
icons.map((icon, index) => (
|
|
56
|
+
<View
|
|
57
|
+
key={index}
|
|
58
|
+
collapsable={false}
|
|
59
|
+
pointerEvents="none"
|
|
60
|
+
accessible={false}
|
|
61
|
+
style={styles.icon}>
|
|
62
|
+
{icon}
|
|
63
|
+
</View>
|
|
64
|
+
))}
|
|
40
65
|
{children != null && (
|
|
41
66
|
<ScrollView
|
|
42
67
|
collapsable={false}
|
|
@@ -58,4 +83,7 @@ export default function GlassMenuPanel({
|
|
|
58
83
|
</NativePanel>
|
|
59
84
|
);
|
|
60
85
|
}
|
|
61
|
-
const styles = StyleSheet.create({
|
|
86
|
+
const styles = StyleSheet.create({
|
|
87
|
+
fill: { flex: 1 },
|
|
88
|
+
icon: { position: 'absolute', left: 0, top: 0, width: 20, height: 20 },
|
|
89
|
+
});
|
package/src/GlassMenuPanel.tsx
CHANGED
|
@@ -6,6 +6,7 @@ import { menuItemHeight } from './menuLayout';
|
|
|
6
6
|
|
|
7
7
|
export default function GlassMenuPanel({
|
|
8
8
|
items: rootItems,
|
|
9
|
+
isSelectMenu,
|
|
9
10
|
children,
|
|
10
11
|
expanded,
|
|
11
12
|
dark,
|
|
@@ -53,7 +54,7 @@ export default function GlassMenuPanel({
|
|
|
53
54
|
<Text
|
|
54
55
|
style={{
|
|
55
56
|
color: dark ? '#ffffff88' : '#00000088',
|
|
56
|
-
paddingLeft: 36,
|
|
57
|
+
paddingLeft: isSelectMenu ? 36 : 12,
|
|
57
58
|
height: 30 * fontScale,
|
|
58
59
|
fontSize: 13,
|
|
59
60
|
textAlignVertical: 'center',
|
|
@@ -76,9 +77,14 @@ export default function GlassMenuPanel({
|
|
|
76
77
|
backgroundColor: pressed ? (dark ? '#ffffff22' : '#00000011') : 'transparent',
|
|
77
78
|
},
|
|
78
79
|
]}>
|
|
79
|
-
|
|
80
|
-
{
|
|
81
|
-
|
|
80
|
+
{isSelectMenu && (
|
|
81
|
+
<Text style={{ color: dark ? 'white' : '#17191d', width: 24 }}>
|
|
82
|
+
{item.checked ? '✓' : ''}
|
|
83
|
+
</Text>
|
|
84
|
+
)}
|
|
85
|
+
{item.icon != null && typeof item.icon !== 'string' && (
|
|
86
|
+
<View style={styles.icon}>{item.icon}</View>
|
|
87
|
+
)}
|
|
82
88
|
<Text
|
|
83
89
|
style={{
|
|
84
90
|
flex: 1,
|
|
@@ -101,5 +107,6 @@ export default function GlassMenuPanel({
|
|
|
101
107
|
const styles = StyleSheet.create({
|
|
102
108
|
panel: { borderRadius: 32, padding: 8 },
|
|
103
109
|
row: { flexDirection: 'row', alignItems: 'center', paddingHorizontal: 12, borderRadius: 16 },
|
|
110
|
+
icon: { width: 20, height: 20, marginRight: 14 },
|
|
104
111
|
separator: { height: 1, marginVertical: 5.5, marginHorizontal: 16, backgroundColor: '#88888844' },
|
|
105
112
|
});
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import type { ReactElement } from 'react';
|
|
2
|
+
|
|
3
|
+
import type { AndroidGlassMenuItem } from './AndroidGlassMenu.types';
|
|
4
|
+
|
|
5
|
+
/** Keep React elements in the native child tree, never in the JSON row payload. */
|
|
6
|
+
export function serializeMenuItems(items: readonly AndroidGlassMenuItem[]) {
|
|
7
|
+
const icons: ReactElement[] = [];
|
|
8
|
+
const serialize = (rows: readonly AndroidGlassMenuItem[]): object[] =>
|
|
9
|
+
rows.map(({ icon, children, ...item }) => {
|
|
10
|
+
const iconViewIndex = typeof icon === 'string' || icon == null ? -1 : icons.push(icon) - 1;
|
|
11
|
+
return {
|
|
12
|
+
...item,
|
|
13
|
+
icon: typeof icon === 'string' ? icon : '',
|
|
14
|
+
iconViewIndex,
|
|
15
|
+
children: children ? serialize(children) : [],
|
|
16
|
+
};
|
|
17
|
+
});
|
|
18
|
+
return { itemsJson: JSON.stringify(serialize(items)), icons };
|
|
19
|
+
}
|