Clean up useEditTextStockAndroidFocusBehavior feature flag (#51039)

Summary:
Pull Request resolved: #51039

We added a feature flag in case this broke things. Its been about 4 months now with now issues, I think we can clean this up.

Changelog: [Android][Fixed] - Can now focus TextInput with keyboard

Reviewed By: NickGerleman

Differential Revision: D73954790

fbshipit-source-id: 4682cf709aa2f34ba69e76a35d07a908edb28f23

Author: joevilches

packages/react-native/ReactAndroid/api/ReactAndroid.api

@@ -6600,7 +6600,6 @@ public class com/facebook/react/views/textinput/ReactEditText : androidx/appcomp
 	public fun onTextContextMenuItem (I)Z
 	public fun onTouchEvent (Landroid/view/MotionEvent;)Z
 	public fun removeTextChangedListener (Landroid/text/TextWatcher;)V
-	public fun requestFocus (ILandroid/graphics/Rect;)Z
 	public final fun requestFocusFromJS ()V
 	public final fun setAllowFontScaling (Z)V
 	public final fun setAutoFocus (Z)V

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlags.kt

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<991cfdadfc26e470da425a986d75c766>>
+ * @generated SignedSource<<b86b8bb1d53ca03240c25adb8b423040>>
  */
 
 /**
@@ -258,12 +258,6 @@ public object ReactNativeFeatureFlags {
   @JvmStatic
   public fun useAlwaysAvailableJSErrorHandling(): Boolean = accessor.useAlwaysAvailableJSErrorHandling()
 
-  /**
-   * If true, focusing in ReactEditText will mainly use stock Android requestFocus() behavior. If false it will use legacy custom focus behavior.
-   */
-  @JvmStatic
-  public fun useEditTextStockAndroidFocusBehavior(): Boolean = accessor.useEditTextStockAndroidFocusBehavior()
-
   /**
    * Should this application enable the Fabric Interop Layer for Android? If yes, the application will behave so that it can accept non-Fabric components and render them on Fabric. This toggle is controlling extra logic such as custom event dispatching that are needed for the Fabric Interop Layer to work correctly.
    */

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsCxxAccessor.kt

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<65268cf15face782370694a2a5bd8c3f>>
+ * @generated SignedSource<<9c1e0e7e87aead96e2554ef5ecf9e7af>>
  */
 
 /**
@@ -58,7 +58,6 @@ internal class ReactNativeFeatureFlagsCxxAccessor : ReactNativeFeatureFlagsAcces
   private var traceTurboModulePromiseRejectionsOnAndroidCache: Boolean? = null
   private var updateRuntimeShadowNodeReferencesOnCommitCache: Boolean? = null
   private var useAlwaysAvailableJSErrorHandlingCache: Boolean? = null
-  private var useEditTextStockAndroidFocusBehaviorCache: Boolean? = null
   private var useFabricInteropCache: Boolean? = null
   private var useNativeViewConfigsInBridgelessModeCache: Boolean? = null
   private var useOptimizedEventBatchingOnAndroidCache: Boolean? = null
@@ -409,15 +408,6 @@ internal class ReactNativeFeatureFlagsCxxAccessor : ReactNativeFeatureFlagsAcces
     return cached
   }
 
-  override fun useEditTextStockAndroidFocusBehavior(): Boolean {
-    var cached = useEditTextStockAndroidFocusBehaviorCache
-    if (cached == null) {
-      cached = ReactNativeFeatureFlagsCxxInterop.useEditTextStockAndroidFocusBehavior()
-      useEditTextStockAndroidFocusBehaviorCache = cached
-    }
-    return cached
-  }
-
   override fun useFabricInterop(): Boolean {
     var cached = useFabricInteropCache
     if (cached == null) {

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsCxxInterop.kt

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<6650ca57c9b43c16506ea8a95cf95b8a>>
+ * @generated SignedSource<<b95c0d1f576b67fcf9d9df498ea30994>>
  */
 
 /**
@@ -104,8 +104,6 @@ public object ReactNativeFeatureFlagsCxxInterop {
 
   @DoNotStrip @JvmStatic public external fun useAlwaysAvailableJSErrorHandling(): Boolean
 
-  @DoNotStrip @JvmStatic public external fun useEditTextStockAndroidFocusBehavior(): Boolean
-
   @DoNotStrip @JvmStatic public external fun useFabricInterop(): Boolean
 
   @DoNotStrip @JvmStatic public external fun useNativeViewConfigsInBridgelessMode(): Boolean

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsDefaults.kt

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<906ab78c1c4099bc4711c102885becd0>>
+ * @generated SignedSource<<c7425e6212e4e9d70e64452e550bf638>>
  */
 
 /**
@@ -99,8 +99,6 @@ public open class ReactNativeFeatureFlagsDefaults : ReactNativeFeatureFlagsProvi
 
   override fun useAlwaysAvailableJSErrorHandling(): Boolean = false
 
-  override fun useEditTextStockAndroidFocusBehavior(): Boolean = true
-
   override fun useFabricInterop(): Boolean = true
 
   override fun useNativeViewConfigsInBridgelessMode(): Boolean = false

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsLocalAccessor.kt

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<aa86a9c0807638f1f44ced69462b1d17>>
+ * @generated SignedSource<<5b145ee103cf6b40e13d33c88cd52777>>
  */
 
 /**
@@ -62,7 +62,6 @@ internal class ReactNativeFeatureFlagsLocalAccessor : ReactNativeFeatureFlagsAcc
   private var traceTurboModulePromiseRejectionsOnAndroidCache: Boolean? = null
   private var updateRuntimeShadowNodeReferencesOnCommitCache: Boolean? = null
   private var useAlwaysAvailableJSErrorHandlingCache: Boolean? = null
-  private var useEditTextStockAndroidFocusBehaviorCache: Boolean? = null
   private var useFabricInteropCache: Boolean? = null
   private var useNativeViewConfigsInBridgelessModeCache: Boolean? = null
   private var useOptimizedEventBatchingOnAndroidCache: Boolean? = null
@@ -451,16 +450,6 @@ internal class ReactNativeFeatureFlagsLocalAccessor : ReactNativeFeatureFlagsAcc
     return cached
   }
 
-  override fun useEditTextStockAndroidFocusBehavior(): Boolean {
-    var cached = useEditTextStockAndroidFocusBehaviorCache
-    if (cached == null) {
-      cached = currentProvider.useEditTextStockAndroidFocusBehavior()
-      accessedFeatureFlags.add("useEditTextStockAndroidFocusBehavior")
-      useEditTextStockAndroidFocusBehaviorCache = cached
-    }
-    return cached
-  }
-
   override fun useFabricInterop(): Boolean {
     var cached = useFabricInteropCache
     if (cached == null) {

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsProvider.kt

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<bad6f4d9b4c7ba419c2ad37a5089c3e7>>
+ * @generated SignedSource<<9cdb965a420d53cf36b6531684cb07ae>>
  */
 
 /**
@@ -99,8 +99,6 @@ public interface ReactNativeFeatureFlagsProvider {
 
   @DoNotStrip public fun useAlwaysAvailableJSErrorHandling(): Boolean
 
-  @DoNotStrip public fun useEditTextStockAndroidFocusBehavior(): Boolean
-
   @DoNotStrip public fun useFabricInterop(): Boolean
 
   @DoNotStrip public fun useNativeViewConfigsInBridgelessMode(): Boolean

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.kt

@@ -47,7 +47,6 @@ import com.facebook.react.bridge.ReactSoftExceptionLogger.logSoftException
 import com.facebook.react.common.ReactConstants
 import com.facebook.react.common.build.ReactBuildConfig
 import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags
-import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags.useEditTextStockAndroidFocusBehavior
 import com.facebook.react.internal.featureflags.ReactNativeNewArchitectureFeatureFlags
 import com.facebook.react.uimanager.BackgroundStyleApplicator.clipToPaddingBox
 import com.facebook.react.uimanager.BackgroundStyleApplicator.getBackgroundColor
@@ -198,10 +197,6 @@ public open class ReactEditText public constructor(context: Context) : AppCompat
     }
 
   init {
-    if (!useEditTextStockAndroidFocusBehavior()) {
-      isFocusableInTouchMode = false
-    }
-
     inputMethodManager =
         context.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
     defaultGravityHorizontal =
@@ -240,8 +235,7 @@ public open class ReactEditText public constructor(context: Context) : AppCompat
                 // selection on accessibility click to undo that.
                 setSelection(length)
               }
-              return if (useEditTextStockAndroidFocusBehavior()) requestFocusProgrammatically()
-              else requestFocusInternal()
+              return requestFocusProgrammatically()
             }
             return super.performAccessibilityAction(host, action, args)
           }
@@ -366,38 +360,10 @@ public open class ReactEditText public constructor(context: Context) : AppCompat
           if (id == android.R.id.paste) android.R.id.pasteAsPlainText else id)
 
   override fun clearFocus() {
-    val useStockFocusBehavior = useEditTextStockAndroidFocusBehavior()
-    if (!useStockFocusBehavior) {
-      isFocusableInTouchMode = false
-    }
     super.clearFocus()
     hideSoftKeyboard()
   }
 
-  override fun requestFocus(direction: Int, previouslyFocusedRect: Rect?): Boolean =
-      // This is a no-op so that when the OS calls requestFocus(), nothing will happen.
-      // ReactEditText
-      // is a controlled component, which means its focus is controlled by JS, with two exceptions:
-      // autofocus when it's attached to the window, and responding to accessibility events. In both
-      // of these cases, we call requestFocusInternal() directly.
-      if (useEditTextStockAndroidFocusBehavior()) {
-        super.requestFocus(direction, previouslyFocusedRect)
-      } else {
-        isFocused
-      }
-
-  private fun requestFocusInternal(): Boolean {
-    isFocusableInTouchMode = true
-    // We must explicitly call this method on the super class; if we call requestFocus() without
-    // any arguments, it will call into the overridden requestFocus(int, Rect) above, which no-ops.
-    val focused = super.requestFocus(FOCUS_DOWN, null)
-    if (showSoftInputOnFocus) {
-      showSoftKeyboard()
-    }
-
-    return focused
-  }
-
   // For cases like autoFocus, or ref.focus() where we request focus programmatically and not
   // through
   // interacting with the EditText directly (like clicking on it). We cannot use stock
@@ -629,11 +595,7 @@ public open class ReactEditText public constructor(context: Context) : AppCompat
   }
 
   public fun requestFocusFromJS() {
-    if (useEditTextStockAndroidFocusBehavior()) {
-      requestFocusProgrammatically()
-    } else {
-      requestFocusInternal()
-    }
+    requestFocusProgrammatically()
   }
 
   internal fun clearFocusFromJS() {
@@ -983,11 +945,7 @@ public open class ReactEditText public constructor(context: Context) : AppCompat
     }
 
     if (autoFocus && !didAttachToWindow) {
-      if (useEditTextStockAndroidFocusBehavior()) {
-        requestFocusProgrammatically()
-      } else {
-        requestFocusInternal()
-      }
+      requestFocusProgrammatically()
     }
 
     didAttachToWindow = true

packages/react-native/ReactAndroid/src/main/jni/react/featureflags/JReactNativeFeatureFlagsCxxInterop.cpp

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<65232e117b548982fd5c59502599b1bb>>
+ * @generated SignedSource<<c89831646046b10c7b2a40e14deb3d1a>>
  */
 
 /**
@@ -267,12 +267,6 @@ class ReactNativeFeatureFlagsJavaProvider
     return method(javaProvider_);
   }
 
-  bool useEditTextStockAndroidFocusBehavior() override {
-    static const auto method =
-        getReactNativeFeatureFlagsProviderJavaClass()->getMethod<jboolean()>("useEditTextStockAndroidFocusBehavior");
-    return method(javaProvider_);
-  }
-
   bool useFabricInterop() override {
     static const auto method =
         getReactNativeFeatureFlagsProviderJavaClass()->getMethod<jboolean()>("useFabricInterop");
@@ -509,11 +503,6 @@ bool JReactNativeFeatureFlagsCxxInterop::useAlwaysAvailableJSErrorHandling(
   return ReactNativeFeatureFlags::useAlwaysAvailableJSErrorHandling();
 }
 
-bool JReactNativeFeatureFlagsCxxInterop::useEditTextStockAndroidFocusBehavior(
-    facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop> /*unused*/) {
-  return ReactNativeFeatureFlags::useEditTextStockAndroidFocusBehavior();
-}
-
 bool JReactNativeFeatureFlagsCxxInterop::useFabricInterop(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop> /*unused*/) {
   return ReactNativeFeatureFlags::useFabricInterop();
@@ -694,9 +683,6 @@ void JReactNativeFeatureFlagsCxxInterop::registerNatives() {
       makeNativeMethod(
         "useAlwaysAvailableJSErrorHandling",
         JReactNativeFeatureFlagsCxxInterop::useAlwaysAvailableJSErrorHandling),
-      makeNativeMethod(
-        "useEditTextStockAndroidFocusBehavior",
-        JReactNativeFeatureFlagsCxxInterop::useEditTextStockAndroidFocusBehavior),
       makeNativeMethod(
         "useFabricInterop",
         JReactNativeFeatureFlagsCxxInterop::useFabricInterop),

packages/react-native/ReactAndroid/src/main/jni/react/featureflags/JReactNativeFeatureFlagsCxxInterop.h

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<980b6545944b8053fbe9901d3e4746ee>>
+ * @generated SignedSource<<2a5ad62d2cb4f1111391f1b566e10c1d>>
  */
 
 /**
@@ -144,9 +144,6 @@ class JReactNativeFeatureFlagsCxxInterop
   static bool useAlwaysAvailableJSErrorHandling(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
 
-  static bool useEditTextStockAndroidFocusBehavior(
-    facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
-
   static bool useFabricInterop(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);