File tree Expand file tree Collapse file tree 2 files changed +3
-2
lines changed Expand file tree Collapse file tree 2 files changed +3
-2
lines changed Original file line number Diff line number Diff line change @@ -30,7 +30,7 @@ const PickerItem = props => {
30
30
} = props ;
31
31
const context = useContext ( PickerContext ) ;
32
32
const { migrate, renderItem} = context ;
33
- const isSelected = isItemSelected ( value , ! migrate && _ . isObject ( context . value ) ? context . value . value : context . value ) ;
33
+ const isSelected = isItemSelected ( value , ! migrate && _ . isPlainObject ( context . value ) ? context . value . value : context . value ) ;
34
34
const itemLabel = getItemLabel ( label , value , props . getItemLabel || context . getItemLabel ) ;
35
35
const accessibilityProps = {
36
36
accessibilityState : isSelected ? { selected : true } : undefined ,
@@ -54,7 +54,7 @@ const PickerItem = props => {
54
54
if ( migrate ) {
55
55
context . onPress ( value ) ;
56
56
} else {
57
- context . onPress ( _ . isObject ( value ) ? value : { value, label : itemLabel } ) ;
57
+ context . onPress ( ( _ . isPlainObject ( value ) || context . isMultiMode ) ? value : { value, label : itemLabel } ) ;
58
58
}
59
59
} , [ migrate , value , context . onPress ] ) ;
60
60
Original file line number Diff line number Diff line change @@ -213,6 +213,7 @@ class Picker extends PureComponent {
213
213
migrate,
214
214
value,
215
215
onPress : mode === Picker . modes . MULTI ? this . toggleItemSelection : this . onDoneSelecting ,
216
+ isMultiMode : mode === Picker . modes . MULTI ,
216
217
getItemValue,
217
218
getItemLabel,
218
219
onSelectedLayout : this . onSelectedItemLayout ,
You can’t perform that action at this time.
0 commit comments