Skip to content

Commit 58b8219

Browse files
authored
Merge pull request #7095 from StoDevX/drew/fix-rnpicker-android
fix android menu daypart picker item label color crash
2 parents 9cf9fda + 1067813 commit 58b8219

File tree

4 files changed

+14
-9
lines changed

4 files changed

+14
-9
lines changed

ios/Podfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,7 @@ PODS:
374374
- React-Core
375375
- RNCClipboard (1.11.1):
376376
- React-Core
377-
- RNCPicker (2.4.10):
377+
- RNCPicker (2.5.1):
378378
- React-Core
379379
- RNDateTimePicker (6.7.5):
380380
- React-Core
@@ -652,7 +652,7 @@ SPEC CHECKSUMS:
652652
RNCalendarEvents: 7e65eb4a94f53c1744d1e275f7fafcfaa619f7a3
653653
RNCAsyncStorage: 8616bd5a58af409453ea4e1b246521bb76578d60
654654
RNCClipboard: 2834e1c4af68697089cdd455ee4a4cdd198fa7dd
655-
RNCPicker: 0bc2f0a29abcca7b7ed44a2d036aac9ab6d25700
655+
RNCPicker: 529d564911e93598cc399b56cc0769ce3675f8c8
656656
RNDateTimePicker: 65e1d202799460b286ff5e741d8baf54695e8abd
657657
RNDeviceInfo: 02ea8b23e2280fa18e00a06d7e62804d74028579
658658
RNGestureHandler: 071d7a9ad81e8b83fe7663b303d132406a7d8f39

modules/filter/section-picker.tsx

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as React from 'react'
2-
import {StyleSheet} from 'react-native'
2+
import {Platform, StyleSheet} from 'react-native'
33
import * as c from '@frogpond/colors'
44
import type {PickerType} from './types'
55
import {Section} from '@frogpond/tableview'
@@ -21,6 +21,7 @@ export function PickerSection<T extends object>({
2121
<Section footer={caption} header={title.toUpperCase()}>
2222
<Picker
2323
itemStyle={styles.pickerItem}
24+
mode="dropdown"
2425
onValueChange={(itemValue, itemIndex) => {
2526
let pickedItem = spec.options[itemIndex]
2627
onChange({...filter, spec: {...spec, selected: pickedItem}})
@@ -46,6 +47,10 @@ const styles = StyleSheet.create({
4647
backgroundColor: c.secondarySystemBackground,
4748
},
4849
pickerItem: {
49-
color: c.label,
50+
...Platform.select({
51+
ios: {
52+
color: c.label,
53+
},
54+
}),
5055
},
5156
})

package-lock.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
"@react-native-clipboard/clipboard": "1.11.1",
5353
"@react-native-community/datetimepicker": "6.7.5",
5454
"@react-native-community/netinfo": "9.3.10",
55-
"@react-native-picker/picker": "2.4.10",
55+
"@react-native-picker/picker": "2.5.1",
5656
"@react-navigation/bottom-tabs": "6.5.8",
5757
"@react-navigation/material-bottom-tabs": "6.2.16",
5858
"@react-navigation/material-top-tabs": "6.6.3",

0 commit comments

Comments
 (0)