Back out "Add onFocus and onBlur to Pressable."

Summary:
I suspect it's causing T82781515.

Changelog:
[Category][Type] - Backout of "[react-native][PR] Add onFocus and onBlur to Pressable."

Reviewed By: p-sun

Differential Revision: D25864414

fbshipit-source-id: efba9136edba97d5bd2a0de15f9ddae7dfd24e51
This commit is contained in:
Valentin Shergin
2021-01-10 13:54:36 -08:00
committed by Facebook GitHub Bot
parent dfd8d9ae91
commit e37e56b042
9 changed files with 16 additions and 131 deletions
@@ -1,4 +1,4 @@
load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_target", "rn_android_library")
load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "rn_android_library")
rn_android_library(
name = "common",
@@ -18,8 +18,5 @@ rn_android_library(
"PUBLIC",
],
deps = [
react_native_target("java/com/facebook/react/uimanager:uimanager"),
react_native_target("java/com/facebook/react/uimanager/annotations:annotations"),
react_native_target("java/com/facebook/react/bridge:bridge"),
],
)
@@ -21,7 +21,6 @@ rn_android_library(
react_native_target("java/com/facebook/react/modules/core:core"),
react_native_target("java/com/facebook/react/uimanager:uimanager"),
react_native_target("java/com/facebook/react/uimanager/annotations:annotations"),
react_native_target("java/com/facebook/react/views/common:common"),
react_native_target("java/com/facebook/react/views/imagehelper:imagehelper"),
react_native_target("java/com/facebook/react/views/scroll:scroll"),
react_native_target("java/com/facebook/react/views/text:text"),
@@ -5,19 +5,19 @@
* LICENSE file in the root directory of this source tree.
*/
package com.facebook.react.views.common;
package com.facebook.react.views.textinput;
import com.facebook.react.bridge.Arguments;
import com.facebook.react.bridge.WritableMap;
import com.facebook.react.uimanager.events.Event;
import com.facebook.react.uimanager.events.RCTEventEmitter;
/** Event emitted by a native view when it loses focus. */
public class ReactViewBlurEvent extends Event<ReactViewBlurEvent> {
/** Event emitted by EditText native view when it loses focus. */
/* package */ class ReactTextInputBlurEvent extends Event<ReactTextInputBlurEvent> {
private static final String EVENT_NAME = "topBlur";
public ReactViewBlurEvent(int viewId) {
public ReactTextInputBlurEvent(int viewId) {
super(viewId);
}
@@ -5,19 +5,19 @@
* LICENSE file in the root directory of this source tree.
*/
package com.facebook.react.views.common;
package com.facebook.react.views.textinput;
import com.facebook.react.bridge.Arguments;
import com.facebook.react.bridge.WritableMap;
import com.facebook.react.uimanager.events.Event;
import com.facebook.react.uimanager.events.RCTEventEmitter;
/** Event emitted by a native view when it receives focus. */
public class ReactViewFocusEvent extends Event<ReactViewFocusEvent> {
/** Event emitted by EditText native view when it receives focus. */
/* package */ class ReactTextInputFocusEvent extends Event<ReactTextInputFocusEvent> {
private static final String EVENT_NAME = "topFocus";
public ReactViewFocusEvent(int viewId) {
public ReactTextInputFocusEvent(int viewId) {
super(viewId);
}
@@ -59,8 +59,6 @@ import com.facebook.react.uimanager.ViewProps;
import com.facebook.react.uimanager.annotations.ReactProp;
import com.facebook.react.uimanager.annotations.ReactPropGroup;
import com.facebook.react.uimanager.events.EventDispatcher;
import com.facebook.react.views.common.ReactViewBlurEvent;
import com.facebook.react.views.common.ReactViewFocusEvent;
import com.facebook.react.views.imagehelper.ResourceDrawableIdHelper;
import com.facebook.react.views.scroll.ScrollEvent;
import com.facebook.react.views.scroll.ScrollEventType;
@@ -976,9 +974,9 @@ public class ReactTextInputManager extends BaseViewManager<ReactEditText, Layout
public void onFocusChange(View v, boolean hasFocus) {
EventDispatcher eventDispatcher = getEventDispatcher(reactContext, editText);
if (hasFocus) {
eventDispatcher.dispatchEvent(new ReactViewFocusEvent(editText.getId()));
eventDispatcher.dispatchEvent(new ReactTextInputFocusEvent(editText.getId()));
} else {
eventDispatcher.dispatchEvent(new ReactViewBlurEvent(editText.getId()));
eventDispatcher.dispatchEvent(new ReactTextInputBlurEvent(editText.getId()));
eventDispatcher.dispatchEvent(
new ReactTextInputEndEditingEvent(
@@ -29,8 +29,6 @@ import com.facebook.react.uimanager.ViewProps;
import com.facebook.react.uimanager.annotations.ReactProp;
import com.facebook.react.uimanager.annotations.ReactPropGroup;
import com.facebook.react.uimanager.events.EventDispatcher;
import com.facebook.react.views.common.ReactViewBlurEvent;
import com.facebook.react.views.common.ReactViewFocusEvent;
import com.facebook.yoga.YogaConstants;
import java.util.Locale;
import java.util.Map;
@@ -236,7 +234,8 @@ public class ReactViewManager extends ReactClippingViewManager<ReactViewGroup> {
@Override
public void onClick(View v) {
final EventDispatcher mEventDispatcher =
getEventDispatcher((ReactContext) view.getContext(), view);
UIManagerHelper.getEventDispatcherForReactTag(
(ReactContext) view.getContext(), view.getId());
if (mEventDispatcher == null) {
return;
}
@@ -255,27 +254,6 @@ public class ReactViewManager extends ReactClippingViewManager<ReactViewGroup> {
}
}
private static EventDispatcher getEventDispatcher(
ReactContext reactContext, ReactViewGroup view) {
return UIManagerHelper.getEventDispatcherForReactTag(reactContext, view.getId());
}
@Override
protected void addEventEmitters(
final ThemedReactContext reactContext, final ReactViewGroup view) {
view.setOnFocusChangeListener(
new View.OnFocusChangeListener() {
public void onFocusChange(View v, boolean hasFocus) {
EventDispatcher eventDispatcher = getEventDispatcher(reactContext, view);
if (hasFocus) {
eventDispatcher.dispatchEvent(new ReactViewFocusEvent(view.getId()));
} else {
eventDispatcher.dispatchEvent(new ReactViewBlurEvent(view.getId()));
}
}
});
}
@ReactProp(name = ViewProps.OVERFLOW)
public void setOverflow(ReactViewGroup view, String overflow) {
view.setOverflow(overflow);