@@ -166,7 +166,7 @@ class Picker extends BaseComponent {
166
166
getAccessibilityInfo ( ) {
167
167
const { placeholder} = this . props ;
168
168
return {
169
- accessibilityLabel : this . getLabel ( ) ? `${ placeholder } . selected value = ${ this . getLabel ( ) } ` : `Select ${ placeholder } ` ,
169
+ accessibilityLabel : this . getLabel ( ) ? `${ placeholder } . selected. ${ this . getLabel ( ) } ` : `Select ${ placeholder } ` ,
170
170
accessibilityHint : this . getLabel ( )
171
171
? 'Double tap to edit'
172
172
: `Goes to ${ placeholder } . Suggestions will be provided` ,
@@ -196,7 +196,7 @@ class Picker extends BaseComponent {
196
196
}
197
197
198
198
if ( _ . isPlainObject ( value ) ) {
199
- return _ . get ( value , 'label' ) ;
199
+ return _ . get ( value , 'label' ) ;
200
200
}
201
201
202
202
// otherwise, extract from picker items
@@ -259,12 +259,14 @@ class Picker extends BaseComponent {
259
259
260
260
if ( ! showSearch || _ . isEmpty ( searchValue ) || _ . includes ( _ . lowerCase ( childLabel ) , _ . lowerCase ( searchValue ) ) ) {
261
261
const selectedValue = PickerPresenter . getItemValue ( { value, getItemValue} ) ;
262
+ const isSelected = PickerPresenter . isItemSelected ( childValue , selectedValue ) ;
262
263
return React . cloneElement ( child , {
263
- isSelected : PickerPresenter . isItemSelected ( childValue , selectedValue ) ,
264
+ isSelected,
264
265
onPress : mode === Picker . modes . MULTI ? this . toggleItemSelection : this . onDoneSelecting ,
265
266
getItemValue : child . props . getItemValue || getItemValue ,
266
267
onSelectedLayout : this . onSelectedItemLayout ,
267
268
renderItem : child . props . renderItem || renderItem ,
269
+ accessibilityState : isSelected ? { selected : true } : undefined ,
268
270
accessibilityHint : 'Double click to select this suggestion'
269
271
} ) ;
270
272
}
0 commit comments