@expo/ui 57.0.22 → 57.0.24
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/android/build.gradle +2 -2
- package/android/src/main/java/expo/modules/ui/DatePickerView.kt +35 -2
- package/android/src/main/java/expo/modules/ui/DateRangePickerView.kt +35 -2
- package/android/src/main/java/expo/modules/ui/HostView.kt +21 -0
- package/android/src/main/java/expo/modules/ui/ModifierRegistry.kt +2 -2
- package/android/src/main/java/expo/modules/ui/RNHostView.kt +124 -17
- package/android/src/main/java/expo/modules/ui/menu/DropdownMenu.kt +8 -1
- package/android/src/main/java/expo/modules/ui/menu/DropdownMenuRecords.kt +13 -1
- package/build/community/bottom-sheet/BottomSheet.ios.d.ts.map +1 -1
- package/build/community/datetime-picker/DateTimePicker.android.d.ts.map +1 -1
- package/build/community/menu/MenuView.android.d.ts.map +1 -1
- package/build/jetpack-compose/DatePicker/index.d.ts +38 -0
- package/build/jetpack-compose/DatePicker/index.d.ts.map +1 -1
- package/build/jetpack-compose/DropdownMenu/index.d.ts +8 -1
- package/build/jetpack-compose/DropdownMenu/index.d.ts.map +1 -1
- package/build/jetpack-compose/RNHostView/index.d.ts +6 -1
- package/build/jetpack-compose/RNHostView/index.d.ts.map +1 -1
- package/build/swift-ui/Chart/index.d.ts +10 -0
- package/build/swift-ui/Chart/index.d.ts.map +1 -1
- package/build/swift-ui/RNHostView.d.ts +7 -2
- package/build/swift-ui/RNHostView.d.ts.map +1 -1
- package/build/swift-ui/modifiers/index.d.ts +1 -0
- package/build/swift-ui/modifiers/index.d.ts.map +1 -1
- package/build/swift-ui/modifiers/presentationModifiers.d.ts +17 -1
- package/build/swift-ui/modifiers/presentationModifiers.d.ts.map +1 -1
- package/build/swift-ui/modifiers/searchable.d.ts +84 -0
- package/build/swift-ui/modifiers/searchable.d.ts.map +1 -0
- package/build/types.d.ts +27 -0
- package/build/types.d.ts.map +1 -1
- package/build/universal/ListItem/ListItem.android.d.ts.map +1 -1
- package/build/universal/RNHostView/index.d.ts.map +1 -1
- package/build/universal/RNHostView/types.d.ts +9 -4
- package/build/universal/RNHostView/types.d.ts.map +1 -1
- package/build/utils/matchContents.d.ts +11 -0
- package/build/utils/matchContents.d.ts.map +1 -0
- package/expo-module.config.json +1 -1
- package/ios/ChartView.swift +15 -10
- package/ios/Modifiers/PresentationModifiers.swift +20 -4
- package/ios/Modifiers/SearchToolbarBehaviorModifier.swift +35 -0
- package/ios/Modifiers/SearchableModifier.swift +94 -0
- package/ios/Modifiers/ViewModifierRegistry.swift +8 -0
- package/ios/Picker/PickerView.swift +9 -7
- package/ios/RNHostView.swift +55 -9
- package/local-maven-repo/expo/modules/ui/expo.modules.ui/{57.0.22/expo.modules.ui-57.0.22-sources.jar → 57.0.24/expo.modules.ui-57.0.24-sources.jar} +0 -0
- package/local-maven-repo/expo/modules/ui/expo.modules.ui/57.0.24/expo.modules.ui-57.0.24-sources.jar.md5 +1 -0
- package/local-maven-repo/expo/modules/ui/expo.modules.ui/57.0.24/expo.modules.ui-57.0.24-sources.jar.sha1 +1 -0
- package/local-maven-repo/expo/modules/ui/expo.modules.ui/57.0.24/expo.modules.ui-57.0.24-sources.jar.sha256 +1 -0
- package/local-maven-repo/expo/modules/ui/expo.modules.ui/57.0.24/expo.modules.ui-57.0.24-sources.jar.sha512 +1 -0
- package/local-maven-repo/expo/modules/ui/expo.modules.ui/57.0.24/expo.modules.ui-57.0.24.aar +0 -0
- package/local-maven-repo/expo/modules/ui/expo.modules.ui/57.0.24/expo.modules.ui-57.0.24.aar.md5 +1 -0
- package/local-maven-repo/expo/modules/ui/expo.modules.ui/57.0.24/expo.modules.ui-57.0.24.aar.sha1 +1 -0
- package/local-maven-repo/expo/modules/ui/expo.modules.ui/57.0.24/expo.modules.ui-57.0.24.aar.sha256 +1 -0
- package/local-maven-repo/expo/modules/ui/expo.modules.ui/57.0.24/expo.modules.ui-57.0.24.aar.sha512 +1 -0
- package/local-maven-repo/expo/modules/ui/expo.modules.ui/{57.0.22/expo.modules.ui-57.0.22.module → 57.0.24/expo.modules.ui-57.0.24.module} +22 -22
- package/local-maven-repo/expo/modules/ui/expo.modules.ui/57.0.24/expo.modules.ui-57.0.24.module.md5 +1 -0
- package/local-maven-repo/expo/modules/ui/expo.modules.ui/57.0.24/expo.modules.ui-57.0.24.module.sha1 +1 -0
- package/local-maven-repo/expo/modules/ui/expo.modules.ui/57.0.24/expo.modules.ui-57.0.24.module.sha256 +1 -0
- package/local-maven-repo/expo/modules/ui/expo.modules.ui/57.0.24/expo.modules.ui-57.0.24.module.sha512 +1 -0
- package/local-maven-repo/expo/modules/ui/expo.modules.ui/{57.0.22/expo.modules.ui-57.0.22.pom → 57.0.24/expo.modules.ui-57.0.24.pom} +1 -1
- package/local-maven-repo/expo/modules/ui/expo.modules.ui/57.0.24/expo.modules.ui-57.0.24.pom.md5 +1 -0
- package/local-maven-repo/expo/modules/ui/expo.modules.ui/57.0.24/expo.modules.ui-57.0.24.pom.sha1 +1 -0
- package/local-maven-repo/expo/modules/ui/expo.modules.ui/57.0.24/expo.modules.ui-57.0.24.pom.sha256 +1 -0
- package/local-maven-repo/expo/modules/ui/expo.modules.ui/57.0.24/expo.modules.ui-57.0.24.pom.sha512 +1 -0
- package/local-maven-repo/expo/modules/ui/expo.modules.ui/maven-metadata.xml +4 -4
- package/local-maven-repo/expo/modules/ui/expo.modules.ui/maven-metadata.xml.md5 +1 -1
- package/local-maven-repo/expo/modules/ui/expo.modules.ui/maven-metadata.xml.sha1 +1 -1
- package/local-maven-repo/expo/modules/ui/expo.modules.ui/maven-metadata.xml.sha256 +1 -1
- package/local-maven-repo/expo/modules/ui/expo.modules.ui/maven-metadata.xml.sha512 +1 -1
- package/package.json +4 -4
- package/src/community/bottom-sheet/BottomSheet.ios.tsx +7 -6
- package/src/community/datetime-picker/DateTimePicker.android.tsx +4 -0
- package/src/community/menu/MenuView.android.tsx +12 -2
- package/src/jetpack-compose/DatePicker/index.tsx +38 -0
- package/src/jetpack-compose/DropdownMenu/index.tsx +12 -1
- package/src/jetpack-compose/RNHostView/index.tsx +17 -6
- package/src/swift-ui/Chart/index.tsx +10 -0
- package/src/swift-ui/RNHostView.tsx +11 -4
- package/src/swift-ui/modifiers/index.ts +1 -0
- package/src/swift-ui/modifiers/presentationModifiers.ts +18 -2
- package/src/swift-ui/modifiers/searchable.ts +107 -0
- package/src/types.ts +28 -0
- package/src/universal/ListItem/ListItem.android.tsx +7 -2
- package/src/universal/RNHostView/index.tsx +9 -4
- package/src/universal/RNHostView/types.ts +6 -4
- package/src/utils/matchContents.ts +14 -0
- package/local-maven-repo/expo/modules/ui/expo.modules.ui/57.0.22/expo.modules.ui-57.0.22-sources.jar.md5 +0 -1
- package/local-maven-repo/expo/modules/ui/expo.modules.ui/57.0.22/expo.modules.ui-57.0.22-sources.jar.sha1 +0 -1
- package/local-maven-repo/expo/modules/ui/expo.modules.ui/57.0.22/expo.modules.ui-57.0.22-sources.jar.sha256 +0 -1
- package/local-maven-repo/expo/modules/ui/expo.modules.ui/57.0.22/expo.modules.ui-57.0.22-sources.jar.sha512 +0 -1
- package/local-maven-repo/expo/modules/ui/expo.modules.ui/57.0.22/expo.modules.ui-57.0.22.aar +0 -0
- package/local-maven-repo/expo/modules/ui/expo.modules.ui/57.0.22/expo.modules.ui-57.0.22.aar.md5 +0 -1
- package/local-maven-repo/expo/modules/ui/expo.modules.ui/57.0.22/expo.modules.ui-57.0.22.aar.sha1 +0 -1
- package/local-maven-repo/expo/modules/ui/expo.modules.ui/57.0.22/expo.modules.ui-57.0.22.aar.sha256 +0 -1
- package/local-maven-repo/expo/modules/ui/expo.modules.ui/57.0.22/expo.modules.ui-57.0.22.aar.sha512 +0 -1
- package/local-maven-repo/expo/modules/ui/expo.modules.ui/57.0.22/expo.modules.ui-57.0.22.module.md5 +0 -1
- package/local-maven-repo/expo/modules/ui/expo.modules.ui/57.0.22/expo.modules.ui-57.0.22.module.sha1 +0 -1
- package/local-maven-repo/expo/modules/ui/expo.modules.ui/57.0.22/expo.modules.ui-57.0.22.module.sha256 +0 -1
- package/local-maven-repo/expo/modules/ui/expo.modules.ui/57.0.22/expo.modules.ui-57.0.22.module.sha512 +0 -1
- package/local-maven-repo/expo/modules/ui/expo.modules.ui/57.0.22/expo.modules.ui-57.0.22.pom.md5 +0 -1
- package/local-maven-repo/expo/modules/ui/expo.modules.ui/57.0.22/expo.modules.ui-57.0.22.pom.sha1 +0 -1
- package/local-maven-repo/expo/modules/ui/expo.modules.ui/57.0.22/expo.modules.ui-57.0.22.pom.sha256 +0 -1
- package/local-maven-repo/expo/modules/ui/expo.modules.ui/57.0.22/expo.modules.ui-57.0.22.pom.sha512 +0 -1
|
@@ -0,0 +1,94 @@
|
|
|
1
|
+
// Copyright 2026-present 650 Industries. All rights reserved.
|
|
2
|
+
|
|
3
|
+
import ExpoModulesCore
|
|
4
|
+
import SwiftUI
|
|
5
|
+
|
|
6
|
+
internal enum SearchFieldPlacementType: String, Enumerable {
|
|
7
|
+
case automatic
|
|
8
|
+
case toolbar
|
|
9
|
+
case sidebar
|
|
10
|
+
case navigationBarDrawer
|
|
11
|
+
|
|
12
|
+
var toSearchFieldPlacement: SearchFieldPlacement {
|
|
13
|
+
switch self {
|
|
14
|
+
case .automatic:
|
|
15
|
+
return .automatic
|
|
16
|
+
case .toolbar:
|
|
17
|
+
#if os(tvOS)
|
|
18
|
+
return .automatic
|
|
19
|
+
#else
|
|
20
|
+
return .toolbar
|
|
21
|
+
#endif
|
|
22
|
+
case .sidebar:
|
|
23
|
+
#if os(tvOS)
|
|
24
|
+
return .automatic
|
|
25
|
+
#else
|
|
26
|
+
return .sidebar
|
|
27
|
+
#endif
|
|
28
|
+
case .navigationBarDrawer:
|
|
29
|
+
#if os(iOS)
|
|
30
|
+
return .navigationBarDrawer
|
|
31
|
+
#else
|
|
32
|
+
return .automatic
|
|
33
|
+
#endif
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
internal struct SearchableModifier: ViewModifier, Record {
|
|
39
|
+
@Field var text: ObservableState?
|
|
40
|
+
@Field var placement: SearchFieldPlacementType = .automatic
|
|
41
|
+
@Field var prompt: String?
|
|
42
|
+
var eventDispatcher: EventDispatcher?
|
|
43
|
+
|
|
44
|
+
init() {}
|
|
45
|
+
|
|
46
|
+
init(from params: Dict, appContext: AppContext, eventDispatcher: EventDispatcher) throws {
|
|
47
|
+
try self = .init(from: params, appContext: appContext)
|
|
48
|
+
self.eventDispatcher = eventDispatcher
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
@ViewBuilder
|
|
52
|
+
func body(content: Content) -> some View {
|
|
53
|
+
if let text {
|
|
54
|
+
SearchableWrapper(
|
|
55
|
+
state: text,
|
|
56
|
+
placement: placement,
|
|
57
|
+
prompt: prompt,
|
|
58
|
+
eventDispatcher: eventDispatcher
|
|
59
|
+
) {
|
|
60
|
+
content
|
|
61
|
+
}
|
|
62
|
+
} else {
|
|
63
|
+
content
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
|
|
68
|
+
private struct SearchableWrapper<C: View>: View {
|
|
69
|
+
@ObservedObject var state: ObservableState
|
|
70
|
+
let placement: SearchFieldPlacementType
|
|
71
|
+
let prompt: String?
|
|
72
|
+
let eventDispatcher: EventDispatcher?
|
|
73
|
+
@ViewBuilder let content: () -> C
|
|
74
|
+
|
|
75
|
+
var body: some View {
|
|
76
|
+
// The search field writes through the binding. Only report edits that come from the field,
|
|
77
|
+
// so a value written from JavaScript does not bounce back as an event.
|
|
78
|
+
let query = Binding<String>(
|
|
79
|
+
get: { state.value as? String ?? "" },
|
|
80
|
+
set: { newValue in
|
|
81
|
+
guard newValue != state.value as? String else {
|
|
82
|
+
return
|
|
83
|
+
}
|
|
84
|
+
state.value = newValue
|
|
85
|
+
eventDispatcher?(["searchable": ["text": newValue]])
|
|
86
|
+
}
|
|
87
|
+
)
|
|
88
|
+
if let prompt {
|
|
89
|
+
content().searchable(text: query, placement: placement.toSearchFieldPlacement, prompt: prompt)
|
|
90
|
+
} else {
|
|
91
|
+
content().searchable(text: query, placement: placement.toSearchFieldPlacement)
|
|
92
|
+
}
|
|
93
|
+
}
|
|
94
|
+
}
|
|
@@ -2376,6 +2376,14 @@ extension ViewModifierRegistry {
|
|
|
2376
2376
|
return try ScrollPositionModifier(from: params, appContext: appContext, eventDispatcher: eventDispatcher)
|
|
2377
2377
|
}
|
|
2378
2378
|
|
|
2379
|
+
register("searchable") { params, appContext, eventDispatcher in
|
|
2380
|
+
return try SearchableModifier(from: params, appContext: appContext, eventDispatcher: eventDispatcher)
|
|
2381
|
+
}
|
|
2382
|
+
|
|
2383
|
+
register("searchToolbarBehavior") { params, appContext, _ in
|
|
2384
|
+
return try SearchToolbarBehaviorModifier(from: params, appContext: appContext)
|
|
2385
|
+
}
|
|
2386
|
+
|
|
2379
2387
|
register("pickerStyle") { params, appContext, _ in
|
|
2380
2388
|
return try PickerStyleModifier(from: params, appContext: appContext)
|
|
2381
2389
|
}
|
|
@@ -12,6 +12,7 @@ internal final class PickerProps: UIBaseViewProps {
|
|
|
12
12
|
|
|
13
13
|
internal struct PickerView: ExpoSwiftUI.View {
|
|
14
14
|
@State var selection: AnyHashable?
|
|
15
|
+
@State private var previousSelection: AnyHashable?
|
|
15
16
|
@ObservedObject var props: PickerProps
|
|
16
17
|
|
|
17
18
|
init(props: PickerProps) {
|
|
@@ -38,11 +39,8 @@ internal struct PickerView: ExpoSwiftUI.View {
|
|
|
38
39
|
|
|
39
40
|
picker
|
|
40
41
|
.onChange(of: selection) { newValue in
|
|
41
|
-
guard let newValue else { return }
|
|
42
|
-
|
|
43
|
-
if currentSelection == newValue {
|
|
44
|
-
return
|
|
45
|
-
}
|
|
42
|
+
guard let newValue, newValue != previousSelection else { return }
|
|
43
|
+
previousSelection = newValue
|
|
46
44
|
let payload: [String: Any]
|
|
47
45
|
if let stringValue = newValue as? String {
|
|
48
46
|
payload = ["selection": stringValue]
|
|
@@ -54,10 +52,14 @@ internal struct PickerView: ExpoSwiftUI.View {
|
|
|
54
52
|
props.onSelectionChange(payload)
|
|
55
53
|
}
|
|
56
54
|
.onChange(of: props.selection) { newValue in
|
|
57
|
-
|
|
55
|
+
let newSelection = Self.getHashableFromEither(newValue)
|
|
56
|
+
previousSelection = newSelection
|
|
57
|
+
selection = newSelection
|
|
58
58
|
}
|
|
59
59
|
.onAppear {
|
|
60
|
-
|
|
60
|
+
let initialSelection = Self.getHashableFromEither(props.selection)
|
|
61
|
+
previousSelection = initialSelection
|
|
62
|
+
selection = initialSelection
|
|
61
63
|
}
|
|
62
64
|
}
|
|
63
65
|
|
package/ios/RNHostView.swift
CHANGED
|
@@ -4,7 +4,8 @@ import SwiftUI
|
|
|
4
4
|
import ExpoModulesCore
|
|
5
5
|
|
|
6
6
|
internal final class RNHostViewProps: ExpoSwiftUI.ViewProps {
|
|
7
|
-
@Field var
|
|
7
|
+
@Field var matchContentsHorizontal: Bool = false
|
|
8
|
+
@Field var matchContentsVertical: Bool = false
|
|
8
9
|
/**
|
|
9
10
|
Adds LeafNode and MeasurableYogaNode trait in Shadow node
|
|
10
11
|
*/
|
|
@@ -50,8 +51,13 @@ struct RNHostView: ExpoSwiftUI.View {
|
|
|
50
51
|
|
|
51
52
|
@ViewBuilder
|
|
52
53
|
private var hostedContent: some View {
|
|
53
|
-
if
|
|
54
|
-
ApplySizeFromYogaNode(
|
|
54
|
+
if matchesContents, let childUIView = firstChildUIView {
|
|
55
|
+
ApplySizeFromYogaNode(
|
|
56
|
+
childUIView: childUIView,
|
|
57
|
+
horizontal: props.matchContentsHorizontal,
|
|
58
|
+
vertical: props.matchContentsVertical,
|
|
59
|
+
shadowNodeProxy: props.shadowNodeProxy
|
|
60
|
+
) {
|
|
55
61
|
Children()
|
|
56
62
|
}
|
|
57
63
|
.onAppear {
|
|
@@ -62,7 +68,7 @@ struct RNHostView: ExpoSwiftUI.View {
|
|
|
62
68
|
.onDisappear {
|
|
63
69
|
touchHandler.detach()
|
|
64
70
|
}
|
|
65
|
-
} else if
|
|
71
|
+
} else if matchesContents {
|
|
66
72
|
// No hosted UIView (a pure SwiftUI child, e.g. Text/Image). Render it at its
|
|
67
73
|
// natural size instead of falling into the fill branch below, which would
|
|
68
74
|
// stretch a self-sizing SwiftUI view to fill its container.
|
|
@@ -87,6 +93,10 @@ struct RNHostView: ExpoSwiftUI.View {
|
|
|
87
93
|
}
|
|
88
94
|
}
|
|
89
95
|
|
|
96
|
+
private var matchesContents: Bool {
|
|
97
|
+
props.matchContentsHorizontal || props.matchContentsVertical
|
|
98
|
+
}
|
|
99
|
+
|
|
90
100
|
private var firstChildUIView: UIView? {
|
|
91
101
|
props.children?.first?.uiView
|
|
92
102
|
}
|
|
@@ -143,20 +153,52 @@ private final class RNHostTouchHandler: ObservableObject {
|
|
|
143
153
|
}
|
|
144
154
|
}
|
|
145
155
|
|
|
146
|
-
// Sets SwiftUI view size from Yoga node size
|
|
156
|
+
// Sets SwiftUI view size from Yoga node size on the matched axes
|
|
147
157
|
// Listens to Yoga node size changes and updates the SwiftUI view size
|
|
158
|
+
// An axis that is not matched fills the parent and reports its size to the Yoga node instead
|
|
148
159
|
private struct ApplySizeFromYogaNode<Content: SwiftUI.View>: SwiftUI.View {
|
|
149
160
|
@StateObject private var observer: Observer
|
|
161
|
+
let horizontal: Bool
|
|
162
|
+
let vertical: Bool
|
|
163
|
+
let shadowNodeProxy: ExpoSwiftUI.ShadowNodeProxy
|
|
150
164
|
let content: Content
|
|
151
165
|
|
|
152
|
-
init(
|
|
166
|
+
init(
|
|
167
|
+
childUIView: UIView,
|
|
168
|
+
horizontal: Bool,
|
|
169
|
+
vertical: Bool,
|
|
170
|
+
shadowNodeProxy: ExpoSwiftUI.ShadowNodeProxy,
|
|
171
|
+
@ViewBuilder content: () -> Content
|
|
172
|
+
) {
|
|
153
173
|
_observer = StateObject(wrappedValue: Observer(view: childUIView))
|
|
174
|
+
self.horizontal = horizontal
|
|
175
|
+
self.vertical = vertical
|
|
176
|
+
self.shadowNodeProxy = shadowNodeProxy
|
|
154
177
|
self.content = content()
|
|
155
178
|
}
|
|
156
179
|
|
|
157
180
|
var body: some SwiftUI.View {
|
|
158
|
-
|
|
159
|
-
|
|
181
|
+
if horizontal && vertical {
|
|
182
|
+
content
|
|
183
|
+
.frame(width: observer.size.width, height: observer.size.height)
|
|
184
|
+
} else {
|
|
185
|
+
content
|
|
186
|
+
.frame(
|
|
187
|
+
width: horizontal ? observer.size.width : nil,
|
|
188
|
+
height: vertical ? observer.size.height : nil
|
|
189
|
+
)
|
|
190
|
+
.frame(
|
|
191
|
+
maxWidth: horizontal ? nil : .infinity,
|
|
192
|
+
maxHeight: vertical ? nil : .infinity
|
|
193
|
+
)
|
|
194
|
+
.modifier(
|
|
195
|
+
ReportSizeToYogaNodeModifier(
|
|
196
|
+
shadowNodeProxy: shadowNodeProxy,
|
|
197
|
+
reportWidth: !horizontal,
|
|
198
|
+
reportHeight: !vertical
|
|
199
|
+
)
|
|
200
|
+
)
|
|
201
|
+
}
|
|
160
202
|
}
|
|
161
203
|
|
|
162
204
|
@MainActor
|
|
@@ -183,9 +225,13 @@ private struct ApplySizeFromYogaNode<Content: SwiftUI.View>: SwiftUI.View {
|
|
|
183
225
|
// Listens to SwiftUI view size changes and updates the Yoga node size
|
|
184
226
|
private struct ReportSizeToYogaNodeModifier: ViewModifier {
|
|
185
227
|
let shadowNodeProxy: ExpoSwiftUI.ShadowNodeProxy
|
|
228
|
+
var reportWidth = true
|
|
229
|
+
var reportHeight = true
|
|
186
230
|
|
|
187
231
|
private func handleSizeChange(_ size: CGSize) {
|
|
188
|
-
shadowNodeProxy.setViewSize?(
|
|
232
|
+
shadowNodeProxy.setViewSize?(
|
|
233
|
+
CGSize(width: reportWidth ? size.width : .nan, height: reportHeight ? size.height : .nan)
|
|
234
|
+
)
|
|
189
235
|
}
|
|
190
236
|
|
|
191
237
|
func body(content: Content) -> some View {
|
|
Binary file
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
1a02710d453ddf4e16b757d49d762e15
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
7fea4274b4bfb186f2f09029712af9cf4e63851f
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
db12810acc1f81f264310c6360569c2438bf64bfa7beb247645f72386693c03d
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
e747d4348f8c62981b1aa9c7d431862cec15608b7ca3435f0231f8c77048ab285cb174263cb72a0b3f76afcccfcc2a36c010cf9b38ba8ccbd448b497d545f0a7
|
|
Binary file
|
package/local-maven-repo/expo/modules/ui/expo.modules.ui/57.0.24/expo.modules.ui-57.0.24.aar.md5
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
f1d1772350ffa1b84af3b4dd39097087
|
package/local-maven-repo/expo/modules/ui/expo.modules.ui/57.0.24/expo.modules.ui-57.0.24.aar.sha1
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
9597589716216065063aff62f26aaec746cda67f
|
package/local-maven-repo/expo/modules/ui/expo.modules.ui/57.0.24/expo.modules.ui-57.0.24.aar.sha256
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
34ed3aa87360c91f4ba32a84d89e18c1def2585018c5baf7f9f462f5dbfe76c7
|
package/local-maven-repo/expo/modules/ui/expo.modules.ui/57.0.24/expo.modules.ui-57.0.24.aar.sha512
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
0e7a330208213a1c86e6e50e441d378e8e31f68b739b43ece0f190839e4223906da6886250b925e0a3a4a9da66f9361fb25c10c7925bb4b2d911b7bc9d371385
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
"component": {
|
|
4
4
|
"group": "expo.modules.ui",
|
|
5
5
|
"module": "expo.modules.ui",
|
|
6
|
-
"version": "57.0.
|
|
6
|
+
"version": "57.0.24",
|
|
7
7
|
"attributes": {
|
|
8
8
|
"org.gradle.status": "release"
|
|
9
9
|
}
|
|
@@ -24,13 +24,13 @@
|
|
|
24
24
|
},
|
|
25
25
|
"files": [
|
|
26
26
|
{
|
|
27
|
-
"name": "expo.modules.ui-57.0.
|
|
28
|
-
"url": "expo.modules.ui-57.0.
|
|
29
|
-
"size":
|
|
30
|
-
"sha512": "
|
|
31
|
-
"sha256": "
|
|
32
|
-
"sha1": "
|
|
33
|
-
"md5": "
|
|
27
|
+
"name": "expo.modules.ui-57.0.24.aar",
|
|
28
|
+
"url": "expo.modules.ui-57.0.24.aar",
|
|
29
|
+
"size": 2092728,
|
|
30
|
+
"sha512": "0e7a330208213a1c86e6e50e441d378e8e31f68b739b43ece0f190839e4223906da6886250b925e0a3a4a9da66f9361fb25c10c7925bb4b2d911b7bc9d371385",
|
|
31
|
+
"sha256": "34ed3aa87360c91f4ba32a84d89e18c1def2585018c5baf7f9f462f5dbfe76c7",
|
|
32
|
+
"sha1": "9597589716216065063aff62f26aaec746cda67f",
|
|
33
|
+
"md5": "f1d1772350ffa1b84af3b4dd39097087"
|
|
34
34
|
}
|
|
35
35
|
]
|
|
36
36
|
},
|
|
@@ -141,13 +141,13 @@
|
|
|
141
141
|
],
|
|
142
142
|
"files": [
|
|
143
143
|
{
|
|
144
|
-
"name": "expo.modules.ui-57.0.
|
|
145
|
-
"url": "expo.modules.ui-57.0.
|
|
146
|
-
"size":
|
|
147
|
-
"sha512": "
|
|
148
|
-
"sha256": "
|
|
149
|
-
"sha1": "
|
|
150
|
-
"md5": "
|
|
144
|
+
"name": "expo.modules.ui-57.0.24.aar",
|
|
145
|
+
"url": "expo.modules.ui-57.0.24.aar",
|
|
146
|
+
"size": 2092728,
|
|
147
|
+
"sha512": "0e7a330208213a1c86e6e50e441d378e8e31f68b739b43ece0f190839e4223906da6886250b925e0a3a4a9da66f9361fb25c10c7925bb4b2d911b7bc9d371385",
|
|
148
|
+
"sha256": "34ed3aa87360c91f4ba32a84d89e18c1def2585018c5baf7f9f462f5dbfe76c7",
|
|
149
|
+
"sha1": "9597589716216065063aff62f26aaec746cda67f",
|
|
150
|
+
"md5": "f1d1772350ffa1b84af3b4dd39097087"
|
|
151
151
|
}
|
|
152
152
|
]
|
|
153
153
|
},
|
|
@@ -161,13 +161,13 @@
|
|
|
161
161
|
},
|
|
162
162
|
"files": [
|
|
163
163
|
{
|
|
164
|
-
"name": "expo.modules.ui-57.0.
|
|
165
|
-
"url": "expo.modules.ui-57.0.
|
|
166
|
-
"size":
|
|
167
|
-
"sha512": "
|
|
168
|
-
"sha256": "
|
|
169
|
-
"sha1": "
|
|
170
|
-
"md5": "
|
|
164
|
+
"name": "expo.modules.ui-57.0.24-sources.jar",
|
|
165
|
+
"url": "expo.modules.ui-57.0.24-sources.jar",
|
|
166
|
+
"size": 107661,
|
|
167
|
+
"sha512": "e747d4348f8c62981b1aa9c7d431862cec15608b7ca3435f0231f8c77048ab285cb174263cb72a0b3f76afcccfcc2a36c010cf9b38ba8ccbd448b497d545f0a7",
|
|
168
|
+
"sha256": "db12810acc1f81f264310c6360569c2438bf64bfa7beb247645f72386693c03d",
|
|
169
|
+
"sha1": "7fea4274b4bfb186f2f09029712af9cf4e63851f",
|
|
170
|
+
"md5": "1a02710d453ddf4e16b757d49d762e15"
|
|
171
171
|
}
|
|
172
172
|
]
|
|
173
173
|
}
|
package/local-maven-repo/expo/modules/ui/expo.modules.ui/57.0.24/expo.modules.ui-57.0.24.module.md5
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
ff25db577ae4585fc4747f429930a7f8
|
package/local-maven-repo/expo/modules/ui/expo.modules.ui/57.0.24/expo.modules.ui-57.0.24.module.sha1
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
2259f0139a5bc618b70a196407a0b69dda2739fa
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
84c1267cc40bfde0f6aaa90c16439d3b89f56ed0942e842d9ecbd4612fe14c1f
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
d327d00fb8921a83e9258632e926b30c25ca0c4126ecd8b828d71f5b0aec14c5bf0e74fba977ed2f7f60b5b08b3b673ac10fbf424982d783274b4a03906c6f53
|
|
@@ -9,7 +9,7 @@
|
|
|
9
9
|
<modelVersion>4.0.0</modelVersion>
|
|
10
10
|
<groupId>expo.modules.ui</groupId>
|
|
11
11
|
<artifactId>expo.modules.ui</artifactId>
|
|
12
|
-
<version>57.0.
|
|
12
|
+
<version>57.0.24</version>
|
|
13
13
|
<packaging>aar</packaging>
|
|
14
14
|
<name>expo.modules.ui</name>
|
|
15
15
|
<url>https://github.com/expo/expo</url>
|
package/local-maven-repo/expo/modules/ui/expo.modules.ui/57.0.24/expo.modules.ui-57.0.24.pom.md5
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
39072352bc73e9acf897ecdf4a08e82c
|
package/local-maven-repo/expo/modules/ui/expo.modules.ui/57.0.24/expo.modules.ui-57.0.24.pom.sha1
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
0cc3af5794746db75db029beff0f3f54c45bc91d
|
package/local-maven-repo/expo/modules/ui/expo.modules.ui/57.0.24/expo.modules.ui-57.0.24.pom.sha256
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
701253bb9938969cba7be92fdc216b8e5a5c75e8775746df1a97aa6d8b188cb4
|
package/local-maven-repo/expo/modules/ui/expo.modules.ui/57.0.24/expo.modules.ui-57.0.24.pom.sha512
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
b755143f8a4cf08d6a2a8c47fc35438158401425f2a6f64c1e95cb0f3951bc200e344da72c552fe625e7d7eb13979caf82079d07aeaf647b7e782bb3943f365c
|
|
@@ -3,11 +3,11 @@
|
|
|
3
3
|
<groupId>expo.modules.ui</groupId>
|
|
4
4
|
<artifactId>expo.modules.ui</artifactId>
|
|
5
5
|
<versioning>
|
|
6
|
-
<latest>57.0.
|
|
7
|
-
<release>57.0.
|
|
6
|
+
<latest>57.0.24</latest>
|
|
7
|
+
<release>57.0.24</release>
|
|
8
8
|
<versions>
|
|
9
|
-
<version>57.0.
|
|
9
|
+
<version>57.0.24</version>
|
|
10
10
|
</versions>
|
|
11
|
-
<lastUpdated>
|
|
11
|
+
<lastUpdated>20261014162610</lastUpdated>
|
|
12
12
|
</versioning>
|
|
13
13
|
</metadata>
|
|
@@ -1 +1 @@
|
|
|
1
|
-
|
|
1
|
+
15de773378cb007559dd0f8b83c7a885
|
|
@@ -1 +1 @@
|
|
|
1
|
-
|
|
1
|
+
0114d80ccc3501c8ec62578135450c645fd9522a
|
|
@@ -1 +1 @@
|
|
|
1
|
-
|
|
1
|
+
f73add6b6b9262b17b7a12cf0110610d53e58f4a8a351d6e6b6f186faf206a8a
|
|
@@ -1 +1 @@
|
|
|
1
|
-
|
|
1
|
+
7f8af4f5064b0b04334dd70817b122c3efdbe2f647f4f47b99d4a3c7931e5288fcf125f5972c51f7617fe9f429fba3328b37cfeab86ac45cf3ba697858ab1287
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@expo/ui",
|
|
3
|
-
"version": "57.0.
|
|
3
|
+
"version": "57.0.24",
|
|
4
4
|
"description": "A collection of UI components",
|
|
5
5
|
"sideEffects": [
|
|
6
6
|
"*.fx.js",
|
|
@@ -96,8 +96,8 @@
|
|
|
96
96
|
"@types/react": "~19.2.0",
|
|
97
97
|
"react-native-reanimated": "4.5.1",
|
|
98
98
|
"react-native-worklets": "0.10.1",
|
|
99
|
-
"expo": "
|
|
100
|
-
"expo
|
|
99
|
+
"expo-module-scripts": "56.0.3",
|
|
100
|
+
"expo": "57.0.29"
|
|
101
101
|
},
|
|
102
102
|
"jest": {
|
|
103
103
|
"preset": "expo-module-scripts"
|
|
@@ -121,7 +121,7 @@
|
|
|
121
121
|
"optional": true
|
|
122
122
|
}
|
|
123
123
|
},
|
|
124
|
-
"gitHead": "
|
|
124
|
+
"gitHead": "0607af7a70d0ea3e58a6d55824aac5cfd3e78613",
|
|
125
125
|
"scripts": {
|
|
126
126
|
"build": "expo-module build",
|
|
127
127
|
"clean": "expo-module clean",
|
|
@@ -199,8 +199,9 @@ export function BottomSheet(props: BottomSheetProps) {
|
|
|
199
199
|
const bg = extractBackgroundColor(backgroundStyle);
|
|
200
200
|
return [
|
|
201
201
|
...(fitToContents
|
|
202
|
-
? //
|
|
203
|
-
|
|
202
|
+
? // Fits the sheet height to the content (iPad opens near full height otherwise) and lets
|
|
203
|
+
// the system choose the width.
|
|
204
|
+
[presentationSizing('automatic', { fitted: { horizontal: false, vertical: true } })]
|
|
204
205
|
: [
|
|
205
206
|
presentationDetents(detents, {
|
|
206
207
|
selection: selectedDetent,
|
|
@@ -231,16 +232,16 @@ export function BottomSheet(props: BottomSheetProps) {
|
|
|
231
232
|
onDismiss={fireCloseCallbacks}
|
|
232
233
|
fitToContents={fitToContents}>
|
|
233
234
|
<Group modifiers={modifiers}>
|
|
234
|
-
<RNHostView matchContents={fitToContents}>
|
|
235
|
+
<RNHostView matchContents={fitToContents ? { vertical: true } : false}>
|
|
235
236
|
{/* paddingTop compensates for tighter spacing between native drag indicator and content
|
|
236
237
|
compared to gorhom's handle. flexGrow:1 + height:0 (flex-basis 0) fills the snap-point
|
|
237
238
|
height without inheriting the scrollable child's intrinsic content height. With matchContents,
|
|
238
|
-
RNHostView
|
|
239
|
-
|
|
239
|
+
RNHostView takes the width from the sheet, which can be narrower than the window, and
|
|
240
|
+
the height from the content. */}
|
|
240
241
|
<View
|
|
241
242
|
style={
|
|
242
243
|
fitToContents
|
|
243
|
-
? {
|
|
244
|
+
? { paddingTop: handleComponent !== null ? 16 : 0 }
|
|
244
245
|
: { flexGrow: 1, height: 0, paddingTop: handleComponent !== null ? 16 : 0 }
|
|
245
246
|
}>
|
|
246
247
|
<SheetScrollContextReset>{children}</SheetScrollContextReset>
|
|
@@ -129,6 +129,10 @@ export function DateTimePicker(props: DateTimePickerProps) {
|
|
|
129
129
|
color={accentColor}
|
|
130
130
|
onDateSelected={onDateSelected}
|
|
131
131
|
showVariantToggle={false}
|
|
132
|
+
// Match iOS, where the inline picker has no label: hide Material 3's "Select date" title
|
|
133
|
+
// and its selected-date headline.
|
|
134
|
+
showTitle={false}
|
|
135
|
+
showHeadline={false}
|
|
132
136
|
{...(testID ? { testID } : undefined)}
|
|
133
137
|
/>
|
|
134
138
|
</Host>
|
|
@@ -13,6 +13,10 @@ import { Icon } from '../../jetpack-compose/Icon';
|
|
|
13
13
|
import { RNHostView } from '../../jetpack-compose/RNHostView';
|
|
14
14
|
import { Text as ComposeText } from '../../jetpack-compose/Text';
|
|
15
15
|
import { useMaterialColors } from '../../jetpack-compose/colors';
|
|
16
|
+
import type { PopupProperties } from '../../types';
|
|
17
|
+
|
|
18
|
+
// Clipped popups drop the status bar offset, so edge-to-edge menus near the bottom detach from the anchor.
|
|
19
|
+
const POPUP_PROPERTIES: PopupProperties = { clippingEnabled: false };
|
|
16
20
|
|
|
17
21
|
function actionId(action: MenuAction): string {
|
|
18
22
|
return action.id ?? action.title;
|
|
@@ -82,7 +86,10 @@ function MenuActionItem({ action, onPressAction, dismissAll, destructiveColor }:
|
|
|
82
86
|
);
|
|
83
87
|
}
|
|
84
88
|
return (
|
|
85
|
-
<DropdownMenu
|
|
89
|
+
<DropdownMenu
|
|
90
|
+
expanded={submenuExpanded}
|
|
91
|
+
onDismissRequest={() => setSubmenuExpanded(false)}
|
|
92
|
+
properties={POPUP_PROPERTIES}>
|
|
86
93
|
<DropdownMenu.Trigger>
|
|
87
94
|
<DropdownMenuItem
|
|
88
95
|
enabled={!attributes?.disabled}
|
|
@@ -191,7 +198,10 @@ export function MenuView(props: MenuComponentProps & { ref?: React.Ref<MenuCompo
|
|
|
191
198
|
return (
|
|
192
199
|
<View style={style} testID={testID}>
|
|
193
200
|
<Host colorScheme={colorScheme} matchContents>
|
|
194
|
-
<DropdownMenu
|
|
201
|
+
<DropdownMenu
|
|
202
|
+
expanded={expanded}
|
|
203
|
+
onDismissRequest={dismissAll}
|
|
204
|
+
properties={POPUP_PROPERTIES}>
|
|
195
205
|
<DropdownMenu.Trigger>
|
|
196
206
|
<RNHostView matchContents>
|
|
197
207
|
<Pressable
|
|
@@ -131,6 +131,20 @@ export interface DateTimePickerProps {
|
|
|
131
131
|
* @default true
|
|
132
132
|
*/
|
|
133
133
|
showVariantToggle?: boolean;
|
|
134
|
+
/**
|
|
135
|
+
* Whether the picker shows its title, such as "Select date". When `false`, the picker passes
|
|
136
|
+
* `null` to Material 3's `title` slot. This prop has no effect when `displayedComponents` is
|
|
137
|
+
* `'hourAndMinute'`.
|
|
138
|
+
* @default true
|
|
139
|
+
*/
|
|
140
|
+
showTitle?: boolean;
|
|
141
|
+
/**
|
|
142
|
+
* Whether the picker shows its headline, which displays the current selection. When `false`,
|
|
143
|
+
* the picker passes `null` to Material 3's `headline` slot. This prop has no effect when
|
|
144
|
+
* `displayedComponents` is `'hourAndMinute'`.
|
|
145
|
+
* @default true
|
|
146
|
+
*/
|
|
147
|
+
showHeadline?: boolean;
|
|
134
148
|
/**
|
|
135
149
|
* The components that the picker should display.
|
|
136
150
|
* On Android, you can have a picker that selects just the date or just the time.
|
|
@@ -252,6 +266,18 @@ export interface DateRangePickerProps {
|
|
|
252
266
|
* @default true
|
|
253
267
|
*/
|
|
254
268
|
showVariantToggle?: boolean;
|
|
269
|
+
/**
|
|
270
|
+
* Whether the picker shows its title, such as "Select date". When `false`, the picker passes
|
|
271
|
+
* `null` to Material 3's `title` slot.
|
|
272
|
+
* @default true
|
|
273
|
+
*/
|
|
274
|
+
showTitle?: boolean;
|
|
275
|
+
/**
|
|
276
|
+
* Whether the picker shows its headline, which displays the current selection. When `false`,
|
|
277
|
+
* the picker passes `null` to Material 3's `headline` slot.
|
|
278
|
+
* @default true
|
|
279
|
+
*/
|
|
280
|
+
showHeadline?: boolean;
|
|
255
281
|
/**
|
|
256
282
|
* The tint color to use on the picker elements.
|
|
257
283
|
*/
|
|
@@ -332,6 +358,18 @@ export interface DatePickerDialogProps {
|
|
|
332
358
|
initialDate?: string | null;
|
|
333
359
|
variant?: AndroidVariant;
|
|
334
360
|
showVariantToggle?: boolean;
|
|
361
|
+
/**
|
|
362
|
+
* Whether the picker shows its title, such as "Select date". When `false`, the picker passes
|
|
363
|
+
* `null` to Material 3's `title` slot.
|
|
364
|
+
* @default true
|
|
365
|
+
*/
|
|
366
|
+
showTitle?: boolean;
|
|
367
|
+
/**
|
|
368
|
+
* Whether the picker shows its headline, which displays the current selection. When `false`,
|
|
369
|
+
* the picker passes `null` to Material 3's `headline` slot.
|
|
370
|
+
* @default true
|
|
371
|
+
*/
|
|
372
|
+
showHeadline?: boolean;
|
|
335
373
|
confirmButtonLabel?: string;
|
|
336
374
|
dismissButtonLabel?: string;
|
|
337
375
|
color?: ColorValue;
|
|
@@ -3,7 +3,7 @@ import type { ReactNode } from 'react';
|
|
|
3
3
|
import type { StyleProp, ViewStyle, ColorValue } from 'react-native';
|
|
4
4
|
|
|
5
5
|
import { PresentedContent } from '../../PresentedContentContext';
|
|
6
|
-
import type { ModifierConfig } from '../../types';
|
|
6
|
+
import type { ModifierConfig, PopupProperties } from '../../types';
|
|
7
7
|
import { createViewModifierEventListener } from '../modifiers/utils';
|
|
8
8
|
|
|
9
9
|
const MenuNativeView: React.ComponentType<NativeMenuProps> = requireNativeView(
|
|
@@ -51,6 +51,13 @@ export interface DropdownMenuProps {
|
|
|
51
51
|
*/
|
|
52
52
|
shadowElevation?: number;
|
|
53
53
|
|
|
54
|
+
/**
|
|
55
|
+
* Properties for the popup window of the dropdown menu.
|
|
56
|
+
*
|
|
57
|
+
* @platform android
|
|
58
|
+
*/
|
|
59
|
+
properties?: PopupProperties;
|
|
60
|
+
|
|
54
61
|
/**
|
|
55
62
|
* Optional styles to apply to the `DropdownMenu`.
|
|
56
63
|
*/
|
|
@@ -67,6 +74,7 @@ type NativeMenuProps = {
|
|
|
67
74
|
onDismissRequest?: () => void;
|
|
68
75
|
color?: ColorValue;
|
|
69
76
|
shadowElevation?: number;
|
|
77
|
+
properties?: PopupProperties;
|
|
70
78
|
style?: StyleProp<ViewStyle>;
|
|
71
79
|
modifiers?: ModifierConfig[];
|
|
72
80
|
children?: ReactNode;
|
|
@@ -120,3 +128,6 @@ DropdownMenu.Items = Items;
|
|
|
120
128
|
|
|
121
129
|
export { DropdownMenu };
|
|
122
130
|
export { DropdownMenuItem } from './DropdownMenuItem';
|
|
131
|
+
|
|
132
|
+
// Re-exported so the docs generator includes PopupProperties on the DropdownMenu API page.
|
|
133
|
+
export type { PopupProperties };
|