manually patching the prefab-headers avoid the app from triggering a runtime error

fabOnReact · fabOnReact · commit 24c182a4cfac · 2022-11-09T10:20:19.000+01:00
facebook#35130 (comment) facebook#35130 (comment) facebook#35130 (comment)
diff --git a/Libraries/Components/View/ReactNativeViewAttributes.js b/Libraries/Components/View/ReactNativeViewAttributes.js
@@ -19,6 +19,7 @@ const UIView = {
   accessibilityLiveRegion: true,
   accessibilityRole: true,
   accessibilityState: true,
+  accessibilityUnit: true,
   accessibilityValue: true,
   accessibilityHint: true,
   accessibilityLanguage: true,
diff --git a/Libraries/Components/View/View.js b/Libraries/Components/View/View.js
@@ -37,6 +37,7 @@ const View: React.AbstractComponent<
       accessibilityLiveRegion,
       accessibilityRole,
       accessibilityState,
+      accessibilityUnit,
       accessibilityValue,
       'aria-busy': ariaBusy,
       'aria-checked': ariaChecked,
diff --git a/Libraries/Components/View/ViewAccessibility.d.ts b/Libraries/Components/View/ViewAccessibility.d.ts
@@ -46,6 +46,7 @@ export interface AccessibilityProps
    * Accessibility State tells a person using either VoiceOver on iOS or TalkBack on Android the state of the element currently focused on.
    */
   accessibilityState?: AccessibilityState | undefined;
+  accessibilityUnit?: AccessibilityUnit | undefined;
 
   /**
    * alias for accessibilityState
diff --git a/Libraries/Components/View/ViewAccessibility.js b/Libraries/Components/View/ViewAccessibility.js
@@ -18,7 +18,6 @@ export type AccessibilityRole =
   | 'button'
   | 'togglebutton'
   | 'link'
-  | 'verbatim'
   | 'cardinal'
   | 'ordinal'
   | 'decimal'
@@ -150,6 +149,10 @@ export type AccessibilityState = {
   ...
 };
 
+export type AccessibilityUnit = {
+  hours?: number,
+};
+
 export type AccessibilityValue = $ReadOnly<{|
   /**
    * The minimum value of this component's range. (should be an integer)
diff --git a/Libraries/Components/View/ViewPropTypes.js b/Libraries/Components/View/ViewPropTypes.js
@@ -27,6 +27,7 @@ import type {
   AccessibilityRole,
   AccessibilityState,
   AccessibilityValue,
+  AccessibilityUnit,
   Role,
 } from './ViewAccessibility';
 import type {Node} from 'react';
@@ -501,6 +502,7 @@ export type ViewProps = $ReadOnly<{|
    * Indicates to accessibility services that UI Component is in a specific State.
    */
   accessibilityState?: ?AccessibilityState,
+  accessibilityUnit?: ?AccessibilityUnit,
   accessibilityValue?: ?AccessibilityValue,
 
   /**
diff --git a/Libraries/NativeComponent/BaseViewConfig.android.js b/Libraries/NativeComponent/BaseViewConfig.android.js
@@ -176,6 +176,7 @@ const validAttributesForNonEventProps = {
   accessibilityCollection: true,
   accessibilityCollectionItem: true,
   accessibilityState: true,
+  accessibilityUnit: true,
   accessibilityActions: true,
   accessibilityValue: true,
   importantForAccessibility: true,
diff --git a/Libraries/NativeComponent/BaseViewConfig.ios.js b/Libraries/NativeComponent/BaseViewConfig.ios.js
@@ -189,6 +189,7 @@ const validAttributesForNonEventProps = {
   transform: {diff: require('../Utilities/differ/matricesDiffer')},
   accessibilityRole: true,
   accessibilityState: true,
+  accessibilityUnit: false,
   nativeID: true,
   pointerEvents: true,
   removeClippedSubviews: true,
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManager.java
@@ -10,6 +10,7 @@
 import android.graphics.Color;
 import android.os.Build;
 import android.text.TextUtils;
+import android.util.Log;
 import android.view.View;
 import android.view.ViewParent;
 import android.view.accessibility.AccessibilityEvent;
@@ -264,6 +265,12 @@ public void setAccessibilityCollectionItem(
     view.setTag(R.id.accessibility_collection_item, accessibilityCollectionItem);
   }
 
+  @ReactProp(name = "accessibilityUnit")
+  public void setAccessibilityUnit(@NonNull T view, @Nullable ReadableMap accessibilityUnit) {
+    Log.w("TESTING::BaseViewManager", "setAccessibilityUnit");
+    Log.w("TESTING::BaseViewManager", "accessibilityUnit: " + (accessibilityUnit));
+  }
+
   @Override
   @ReactProp(name = ViewProps.ACCESSIBILITY_STATE)
   public void setViewState(@NonNull T view, @Nullable ReadableMap accessibilityState) {
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManagerInterface.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManagerInterface.java
@@ -34,6 +34,8 @@ public interface BaseViewManagerInterface<T extends View> {
 
   void setViewState(T view, @Nullable ReadableMap accessibilityState);
 
+  void setAccessibilityUnit(T view, @Nullable ReadableMap accessibilityUnit);
+
   void setBackgroundColor(T view, int backgroundColor);
 
   void setBorderRadius(T view, float borderRadius);
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactBaseTextShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactBaseTextShadowNode.java
@@ -15,6 +15,7 @@
 import android.text.Spannable;
 import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
+import android.util.Log;
 import android.view.Gravity;
 import androidx.annotation.Nullable;
 import com.facebook.infer.annotation.Assertions;
@@ -185,9 +186,11 @@ private static void buildSpannedFromShadowNode(
             new SetSpanOperation(start, end, new ReactClickableSpan(textShadowNode.getReactTag())));
       }
       if (textShadowNode.mAccessibilityUnit != null && Build.VERSION.SDK_INT >= 21) {
+        /*
         ops.add(
             new SetSpanOperation(
                 start, end, new ReactTtsSpan.Builder(textShadowNode.mAccessibilityUnit).build()));
+                */
       }
       float effectiveLetterSpacing = textAttributes.getEffectiveLetterSpacing();
       if (!Float.isNaN(effectiveLetterSpacing)
@@ -515,6 +518,14 @@ public void setIsAccessibilityLink(@Nullable String accessibilityRole) {
     }
   }
 
+  @ReactProp(name = "accessibilityUnit")
+  public void setAccessibilityUnit(@Nullable String accessibilityUnit) {
+    Log.w("TESTING::ReactBaseTextShadowNode", "accessibilityUnit: " + (accessibilityUnit));
+    if (isVirtual()) {
+      markUpdated();
+    }
+  }
+
   @ReactProp(name = ViewProps.FONT_FAMILY)
   public void setFontFamily(@Nullable String fontFamily) {
     mFontFamily = fontFamily;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTtsSpan.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTtsSpan.java
@@ -63,5 +63,18 @@ public Builder(String type) {
     public ReactTtsSpan build() {
       return new ReactTtsSpan(mType, mArgs);
     }
+
+    public C setIntArgument(String arg, int value) {
+      mArgs.putInt(arg, value);
+      return (C) this;
+    }
+  }
+  /*
+  public static class TimeBuilder extends SemioticClassBuilder<TimeBuilder> {
+
+    public TimeBuilder() {
+      super(TtsSpan.TYPE_TIME);
+    }
   }
+  */
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/TextAttributeProps.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/TextAttributeProps.java
@@ -11,6 +11,7 @@
 import android.text.Layout;
 import android.text.TextUtils;
 import android.util.LayoutDirection;
+import android.util.Log;
 import android.view.Gravity;
 import androidx.annotation.Nullable;
 import com.facebook.react.bridge.JSApplicationIllegalArgumentException;
@@ -604,15 +605,20 @@ private void setAccessibilityRole(@Nullable String accessibilityRole) {
     if (accessibilityRole != null) {
       mIsAccessibilityRoleSet = true;
       mAccessibilityRole = AccessibilityRole.fromValue(accessibilityRole);
-      mIsAccessibilityLink =
-          mAccessibilityRole.equals(AccessibilityRole.LINK);
+      mIsAccessibilityLink = mAccessibilityRole.equals(AccessibilityRole.LINK);
       String roleClassName =
           AccessibilityRole.getValue(AccessibilityRole.fromValue(accessibilityRole));
       mAccessibilityUnit =
           ReactTtsSpan.SUPPORTED_UNIT_TYPES.contains(roleClassName) ? roleClassName : null;
     }
   }
 
+  private void setAccessibilityUnit(@Nullable String accessibilityUnit) {
+    if (accessibilityUnit != null) {
+      Log.w("TESTING::TextAttributeProps", "accessibilityUnit: " + (accessibilityUnit));
+    }
+  }
+
   public static int getTextBreakStrategy(@Nullable String textBreakStrategy) {
     int androidTextBreakStrategy = DEFAULT_BREAK_STRATEGY;
     if (textBreakStrategy != null) {
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManagerMapBuffer.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManagerMapBuffer.java
@@ -144,9 +144,10 @@ private static void buildSpannableFromFragment(
           ops.add(new SetSpanOperation(start, end, new ReactClickableSpan(reactTag)));
         }
         if (textAttributes.mAccessibilityUnit != null && Build.VERSION.SDK_INT >= 21) {
-          ops.add(
-              new SetSpanOperation(
-                  start, end, new ReactTtsSpan.Builder(textAttributes.mAccessibilityUnit).build()));
+          ReactTtsSpan.Builder builder = new ReactTtsSpan.Builder(ReactTtsSpan.TYPE_TIME);
+          builder.setIntArgument(ReactTtsSpan.ARG_HOURS, 10);
+          builder.setIntArgument(ReactTtsSpan.ARG_MINUTES, 30);
+          ops.add(new SetSpanOperation(start, end, builder.build()));
         }
         if (textAttributes.mIsColorSet) {
           ops.add(
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactMapBufferPropSetter.kt b/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactMapBufferPropSetter.kt
@@ -6,7 +6,7 @@
  */
 
 package com.facebook.react.views.view
-
+import android.util.Log;
 import android.graphics.Color
 import android.graphics.Rect
 import androidx.core.view.ViewCompat
@@ -64,6 +64,7 @@ object ReactMapBufferPropSetter {
   private const val VP_POINTER_OVER_CAPTURE = 44
   private const val VP_BORDER_CURVES = 45 // iOS only
   private const val VP_FG_COLOR = 46 // iOS only?
+  private const val VP_ACCESSIBILITY_UNIT = 47
 
   // Yoga values
   private const val YG_BORDER_WIDTH = 100
@@ -107,6 +108,7 @@ object ReactMapBufferPropSetter {
   private const val UNDEF_COLOR = Int.MAX_VALUE
 
   fun setProps(view: ReactViewGroup, viewManager: ReactViewManager, props: MapBuffer) {
+    Log.w("TESTING::ReactMapBufferPropSetter", "props: " + ( props ));
     for (entry in props) {
       when (entry.key) {
         VP_ACCESSIBILITY_ACTIONS -> {
@@ -130,6 +132,9 @@ object ReactMapBufferPropSetter {
         VP_ACCESSIBILITY_STATE -> {
           viewManager.accessibilityState(view, entry.mapBufferValue)
         }
+        VP_ACCESSIBILITY_UNIT -> {
+          // viewManager.accessibilityUnit(view, entry.mapBufferValue)
+        }
         VP_ACCESSIBILITY_VALUE -> {
           viewManager.accessibilityValue(view, entry.stringValue)
         }
@@ -278,6 +283,14 @@ object ReactMapBufferPropSetter {
     ViewCompat.setAccessibilityLiveRegion(this, mode)
   }
 
+  private fun ReactViewManager.accessibilityUnit(view: ReactViewGroup, value: MapBuffer) {
+    Log.w("TESTING::ReactMapBufferPropSetter", "accessibilityUnit");
+    val accessibilityUnit = JavaOnlyMap()
+    accessibilityUnit.putString("hours", "10")
+
+    setAccessibilityUnit(view, accessibilityUnit)
+  }
+
   private fun ReactViewManager.accessibilityState(view: ReactViewGroup, value: MapBuffer) {
     val accessibilityState = JavaOnlyMap()
     accessibilityState.putBoolean("selected", value.getBoolean(ACCESSIBILITY_STATE_SELECTED))
diff --git a/ReactCommon/react/renderer/components/view/AccessibilityPrimitives.h b/ReactCommon/react/renderer/components/view/AccessibilityPrimitives.h
@@ -88,6 +88,22 @@ constexpr bool operator!=(
   return !(rhs == lhs);
 }
 
+struct AccessibilityUnit {
+  std::optional<std::string> hours;
+};
+
+constexpr bool operator==(
+    AccessibilityUnit const &lhs,
+    AccessibilityUnit const &rhs) {
+  return lhs.hours == rhs.hours;
+}
+
+constexpr bool operator!=(
+    AccessibilityUnit const &lhs,
+    AccessibilityUnit const &rhs) {
+  return !(rhs == lhs);
+}
+
 struct AccessibilityLabelledBy {
   std::vector<std::string> value{};
 };
diff --git a/ReactCommon/react/renderer/components/view/AccessibilityProps.cpp b/ReactCommon/react/renderer/components/view/AccessibilityProps.cpp
@@ -36,6 +36,15 @@ AccessibilityProps::AccessibilityProps(
                     "accessibilityState",
                     sourceProps.accessibilityState,
                     {})),
+      accessibilityUnit(
+          CoreFeatures::enablePropIteratorSetter
+              ? sourceProps.accessibilityUnit
+              : convertRawProp(
+                    context,
+                    rawProps,
+                    "accessibilityUnit",
+                    sourceProps.accessibilityUnit,
+                    {})),
       accessibilityLabel(
           CoreFeatures::enablePropIteratorSetter
               ? sourceProps.accessibilityLabel
@@ -211,6 +220,7 @@ void AccessibilityProps::setProp(
   switch (hash) {
     RAW_SET_PROP_SWITCH_CASE_BASIC(accessible, false);
     RAW_SET_PROP_SWITCH_CASE_BASIC(accessibilityState, {});
+    RAW_SET_PROP_SWITCH_CASE_BASIC(accessibilityUnit, {});
     RAW_SET_PROP_SWITCH_CASE_BASIC(accessibilityLabel, std::string{""});
     RAW_SET_PROP_SWITCH_CASE_BASIC(accessibilityLabelledBy, {});
     RAW_SET_PROP_SWITCH_CASE_BASIC(accessibilityHint, std::string{""});
diff --git a/ReactCommon/react/renderer/components/view/AccessibilityProps.h b/ReactCommon/react/renderer/components/view/AccessibilityProps.h
@@ -39,6 +39,7 @@ class AccessibilityProps {
 
   bool accessible{false};
   AccessibilityState accessibilityState;
+  AccessibilityUnit accessibilityUnit;
   std::string accessibilityLabel{""};
   AccessibilityLabelledBy accessibilityLabelledBy{};
   AccessibilityLiveRegion accessibilityLiveRegion{
diff --git a/ReactCommon/react/renderer/components/view/AccessibilityPropsMapBuffer.cpp b/ReactCommon/react/renderer/components/view/AccessibilityPropsMapBuffer.cpp
@@ -46,6 +46,7 @@ constexpr MapBuffer::Key ACCESSIBILITY_STATE_DISABLED = 1;
 constexpr MapBuffer::Key ACCESSIBILITY_STATE_EXPANDED = 2;
 constexpr MapBuffer::Key ACCESSIBILITY_STATE_SELECTED = 3;
 constexpr MapBuffer::Key ACCESSIBILITY_STATE_CHECKED = 4;
+constexpr MapBuffer::Key ACCESSIBILITY_UNIT_HOURS = 5;
 
 MapBuffer convertAccessibilityState(AccessibilityState const &state) {
   MapBufferBuilder builder(5);
@@ -72,6 +73,12 @@ MapBuffer convertAccessibilityState(AccessibilityState const &state) {
   return builder.build();
 }
 
+MapBuffer convertAccessibilityUnit(AccessibilityUnit const &state) {
+  MapBufferBuilder builder(1);
+  builder.putString(ACCESSIBILITY_UNIT_HOURS, "10");
+  return builder.build();
+}
+
 // TODO: Currently unsupported: nextFocusForward/Left/Up/Right/Down
 void AccessibilityProps::propsDiffMapBuffer(
     Props const *oldPropsPtr,
@@ -133,6 +140,12 @@ void AccessibilityProps::propsDiffMapBuffer(
         convertAccessibilityState(newProps.accessibilityState));
   }
 
+  if (oldProps.accessibilityUnit != newProps.accessibilityUnit) {
+    builder.putMapBuffer(
+        AP_ACCESSIBILITY_UNIT,
+        convertAccessibilityUnit(newProps.accessibilityUnit));
+  }
+
   if (oldProps.accessibilityValue != newProps.accessibilityValue) {
     builder.putString(
         AP_ACCESSIBILITY_VALUE, newProps.accessibilityValue.text.value_or(""));
diff --git a/ReactCommon/react/renderer/components/view/AccessibilityPropsMapBuffer.h b/ReactCommon/react/renderer/components/view/AccessibilityPropsMapBuffer.h
@@ -23,6 +23,7 @@ constexpr MapBuffer::Key AP_ACCESSIBILITY_STATE = 6;
 constexpr MapBuffer::Key AP_ACCESSIBILITY_VALUE = 7;
 constexpr MapBuffer::Key AP_ACCESSIBLE = 8;
 constexpr MapBuffer::Key AP_IMPORTANT_FOR_ACCESSIBILITY = 19;
+constexpr MapBuffer::Key AP_ACCESSIBILITY_UNIT = 47;
 
 // AccessibilityAction values
 constexpr MapBuffer::Key ACCESSIBILITY_ACTION_NAME = 0;
diff --git a/ReactCommon/react/renderer/components/view/accessibilityPropsConversions.h b/ReactCommon/react/renderer/components/view/accessibilityPropsConversions.h
@@ -170,6 +170,17 @@ inline void fromRawValue(
   }
 }
 
+inline void fromRawValue(
+    const PropsParserContext &context,
+    const RawValue &value,
+    AccessibilityUnit &result) {
+  auto map = (butter::map<std::string, RawValue>)value;
+  auto hours = map.find("hours");
+  if (hours != map.end()) {
+    fromRawValue(context, hours->second, result.hours);
+  }
+}
+
 inline std::string toString(
     const ImportantForAccessibility &importantForAccessibility) {
   switch (importantForAccessibility) {
