@@ -395,39 +395,58 @@ inline static void updateNativeDrawableProp(
395395 result[propName] = nativeDrawableResult;
396396}
397397
398- static folly::dynamic toDynamic (const AccessibilityState& state) {
399- folly::dynamic result = folly::dynamic::object ();
400- result[" disabled" ] = state.disabled ;
398+ inline static void updateAccessibilityStateProp (
399+ folly::dynamic& result,
400+ const std::optional<AccessibilityState>& newState,
401+ const std::optional<AccessibilityState>& oldState) {
402+ folly::dynamic resultState = folly::dynamic::object ();
403+
404+ if (!newState.has_value () && oldState.has_value ()) {
405+ result[" accessibilityState" ] = resultState;
406+ return ;
407+ }
401408
402- // Omitting the key when `selected` is unset is what tells the platform the
403- // component is not selectable. BaseViewManager#setViewState falls back to
404- // `setSelected(false)` for an absent key, so the rendered result is
405- // unchanged from when this was a plain `bool`.
406- if (state.selected .has_value ()) {
407- result[" selected" ] = state.selected .value ();
409+ if (!oldState.has_value () || newState->disabled != oldState->disabled ) {
410+ resultState[" disabled" ] = newState->disabled ;
408411 }
409412
410- result[" busy" ] = state.busy ;
413+ if (!oldState.has_value () || newState->selected != oldState->selected ) {
414+ // Omitting the key when `selected` is unset is what tells the platform the
415+ // component is not selectable. BaseViewManager#setViewState falls back to
416+ // `setSelected(false)` for an absent key, so the rendered result is
417+ // unchanged from when this was a plain `bool`.
418+ if (newState->selected .has_value ()) {
419+ resultState[" selected" ] = newState->selected .value ();
420+ }
421+ }
411422
412- if (state. expanded . has_value ()) {
413- result[ " expanded " ] = state. expanded . value () ;
423+ if (!oldState. has_value () || newState-> busy != oldState-> busy ) {
424+ resultState[ " busy " ] = newState-> busy ;
414425 }
415426
416- switch (state.checked ) {
417- case AccessibilityState::Unchecked:
418- result[" checked" ] = false ;
419- break ;
420- case AccessibilityState::Checked:
421- result[" checked" ] = true ;
422- break ;
423- case AccessibilityState::Mixed:
424- result[" checked" ] = " mixed" ;
425- break ;
426- case AccessibilityState::None:
427- result[" checked" ] = " none" ;
428- break ;
427+ if (!oldState.has_value () || newState->expanded != oldState->expanded ) {
428+ if (newState->expanded .has_value ()) {
429+ resultState[" expanded" ] = newState->expanded .value ();
430+ }
429431 }
430- return result;
432+
433+ if (!oldState.has_value () || newState->checked != oldState->checked ) {
434+ switch (newState->checked ) {
435+ case AccessibilityState::Unchecked:
436+ resultState[" checked" ] = false ;
437+ break ;
438+ case AccessibilityState::Checked:
439+ resultState[" checked" ] = true ;
440+ break ;
441+ case AccessibilityState::Mixed:
442+ resultState[" checked" ] = " mixed" ;
443+ break ;
444+ case AccessibilityState::None:
445+ resultState[" checked" ] = " none" ;
446+ break ;
447+ }
448+ }
449+ result[" accessibilityState" ] = resultState;
431450}
432451
433452static folly::dynamic toDynamic (
@@ -521,8 +540,7 @@ folly::dynamic HostPlatformViewProps::getDiffProps(
521540 }
522541
523542 if (role != oldProps->role ) {
524- result[" role" ] =
525- role.has_value () ? toString (*role) : folly::dynamic (nullptr );
543+ result[" role" ] = toString (role);
526544 }
527545
528546 if (opacity != oldProps->opacity ) {
@@ -889,9 +907,8 @@ folly::dynamic HostPlatformViewProps::getDiffProps(
889907 // Accessibility
890908
891909 if (accessibilityState != oldProps->accessibilityState ) {
892- result[" accessibilityState" ] = accessibilityState.has_value ()
893- ? toDynamic (*accessibilityState)
894- : folly::dynamic::object ();
910+ updateAccessibilityStateProp (
911+ result, accessibilityState, oldProps->accessibilityState );
895912 }
896913
897914 if (accessibilityLabel != oldProps->accessibilityLabel ) {
@@ -924,9 +941,7 @@ folly::dynamic HostPlatformViewProps::getDiffProps(
924941 }
925942
926943 if (accessibilityRole != oldProps->accessibilityRole ) {
927- result[" accessibilityRole" ] = accessibilityRole.empty ()
928- ? folly::dynamic (nullptr )
929- : folly::dynamic (accessibilityRole);
944+ result[" accessibilityRole" ] = accessibilityRole;
930945 }
931946
932947 if (accessibilityLanguage != oldProps->accessibilityLanguage ) {
@@ -947,9 +962,7 @@ folly::dynamic HostPlatformViewProps::getDiffProps(
947962 if (accessibilityValue.text .has_value ()) {
948963 accessibilityValueObject[" text" ] = accessibilityValue.text .value ();
949964 }
950- result[" accessibilityValue" ] = accessibilityValueObject.empty ()
951- ? folly::dynamic (nullptr )
952- : accessibilityValueObject;
965+ result[" accessibilityValue" ] = accessibilityValueObject;
953966 }
954967
955968 if (accessibilityActions != oldProps->accessibilityActions ) {
0 commit comments