diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactContentSizeChangedEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactContentSizeChangedEvent.java index 432347821a9..564b000769d 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactContentSizeChangedEvent.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactContentSizeChangedEvent.java @@ -11,6 +11,7 @@ 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; +import com.facebook.react.uimanager.events.RCTModernEventEmitter; /** Event emitted by EditText native view when content size changes. */ public class ReactContentSizeChangedEvent extends Event { @@ -20,8 +21,14 @@ public class ReactContentSizeChangedEvent extends Event { private float mContentWidth; private float mContentHeight; + @Deprecated public ReactContentSizeChangedEvent(int viewId, float contentSizeWidth, float contentSizeHeight) { - super(viewId); + this(-1, viewId, contentSizeWidth, contentSizeHeight); + } + + public ReactContentSizeChangedEvent( + int surfaceId, int viewId, float contentSizeWidth, float contentSizeHeight) { + super(surfaceId, viewId); mContentWidth = contentSizeWidth; mContentHeight = contentSizeHeight; } @@ -36,6 +43,12 @@ public class ReactContentSizeChangedEvent extends Event { rctEventEmitter.receiveEvent(getViewTag(), getEventName(), serializeEventData()); } + @Override + public void dispatchV2(RCTModernEventEmitter rctEventEmitter) { + rctEventEmitter.receiveEvent( + getSurfaceId(), getViewTag(), getEventName(), serializeEventData()); + } + private WritableMap serializeEventData() { WritableMap eventData = Arguments.createMap(); diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextChangedEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextChangedEvent.java index a3c7e1cac12..c12fd684b0c 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextChangedEvent.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextChangedEvent.java @@ -11,6 +11,7 @@ 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; +import com.facebook.react.uimanager.events.RCTModernEventEmitter; /** * Event emitted by EditText native view when text changes. VisibleForTesting from {@link @@ -23,8 +24,13 @@ public class ReactTextChangedEvent extends Event { private String mText; private int mEventCount; + @Deprecated public ReactTextChangedEvent(int viewId, String text, int eventCount) { - super(viewId); + this(-1, viewId, text, eventCount); + } + + public ReactTextChangedEvent(int surfaceId, int viewId, String text, int eventCount) { + super(surfaceId, viewId); mText = text; mEventCount = eventCount; } @@ -39,6 +45,12 @@ public class ReactTextChangedEvent extends Event { rctEventEmitter.receiveEvent(getViewTag(), getEventName(), serializeEventData()); } + @Override + public void dispatchV2(RCTModernEventEmitter rctEventEmitter) { + rctEventEmitter.receiveEvent( + getSurfaceId(), getViewTag(), getEventName(), serializeEventData()); + } + private WritableMap serializeEventData() { WritableMap eventData = Arguments.createMap(); eventData.putString("text", mText); diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputBlurEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputBlurEvent.java index 5a05bc44407..fa332f29158 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputBlurEvent.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputBlurEvent.java @@ -11,14 +11,20 @@ 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; +import com.facebook.react.uimanager.events.RCTModernEventEmitter; /** Event emitted by EditText native view when it loses focus. */ /* package */ class ReactTextInputBlurEvent extends Event { private static final String EVENT_NAME = "topBlur"; + @Deprecated public ReactTextInputBlurEvent(int viewId) { - super(viewId); + this(-1, viewId); + } + + public ReactTextInputBlurEvent(int surfaceId, int viewId) { + super(surfaceId, viewId); } @Override @@ -36,6 +42,12 @@ import com.facebook.react.uimanager.events.RCTEventEmitter; rctEventEmitter.receiveEvent(getViewTag(), getEventName(), serializeEventData()); } + @Override + public void dispatchV2(RCTModernEventEmitter rctEventEmitter) { + rctEventEmitter.receiveEvent( + getSurfaceId(), getViewTag(), getEventName(), serializeEventData()); + } + private WritableMap serializeEventData() { WritableMap eventData = Arguments.createMap(); eventData.putInt("target", getViewTag()); diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputEndEditingEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputEndEditingEvent.java index 597fa7d1335..50189f7d5d6 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputEndEditingEvent.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputEndEditingEvent.java @@ -11,6 +11,7 @@ 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; +import com.facebook.react.uimanager.events.RCTModernEventEmitter; /** * Event emitted by EditText native view when text editing ends, because of the user leaving the @@ -22,8 +23,13 @@ class ReactTextInputEndEditingEvent extends Event private String mText; + @Deprecated public ReactTextInputEndEditingEvent(int viewId, String text) { - super(viewId); + this(-1, viewId, text); + } + + public ReactTextInputEndEditingEvent(int surfaceId, int viewId, String text) { + super(surfaceId, viewId); mText = text; } @@ -42,6 +48,12 @@ class ReactTextInputEndEditingEvent extends Event rctEventEmitter.receiveEvent(getViewTag(), getEventName(), serializeEventData()); } + @Override + public void dispatchV2(RCTModernEventEmitter rctEventEmitter) { + rctEventEmitter.receiveEvent( + getSurfaceId(), getViewTag(), getEventName(), serializeEventData()); + } + private WritableMap serializeEventData() { WritableMap eventData = Arguments.createMap(); eventData.putInt("target", getViewTag()); diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputEvent.java index 09310782055..45034d425a7 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputEvent.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputEvent.java @@ -11,6 +11,7 @@ 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; +import com.facebook.react.uimanager.events.RCTModernEventEmitter; /** * Event emitted by EditText native view when text changes. VisibleForTesting from {@link @@ -25,9 +26,15 @@ public class ReactTextInputEvent extends Event { private int mRangeStart; private int mRangeEnd; + @Deprecated public ReactTextInputEvent( int viewId, String text, String previousText, int rangeStart, int rangeEnd) { - super(viewId); + this(-1, viewId, text, previousText, rangeStart, rangeEnd); + } + + public ReactTextInputEvent( + int surfaceId, int viewId, String text, String previousText, int rangeStart, int rangeEnd) { + super(surfaceId, viewId); mText = text; mPreviousText = previousText; mRangeStart = rangeStart; @@ -50,6 +57,12 @@ public class ReactTextInputEvent extends Event { rctEventEmitter.receiveEvent(getViewTag(), getEventName(), serializeEventData()); } + @Override + public void dispatchV2(RCTModernEventEmitter rctEventEmitter) { + rctEventEmitter.receiveEvent( + getSurfaceId(), getViewTag(), getEventName(), serializeEventData()); + } + private WritableMap serializeEventData() { WritableMap eventData = Arguments.createMap(); WritableMap range = Arguments.createMap(); diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputFocusEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputFocusEvent.java index 0bdaa6c1992..57f434a6822 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputFocusEvent.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputFocusEvent.java @@ -11,14 +11,20 @@ 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; +import com.facebook.react.uimanager.events.RCTModernEventEmitter; /** Event emitted by EditText native view when it receives focus. */ /* package */ class ReactTextInputFocusEvent extends Event { private static final String EVENT_NAME = "topFocus"; + @Deprecated public ReactTextInputFocusEvent(int viewId) { - super(viewId); + this(-1, viewId); + } + + public ReactTextInputFocusEvent(int surfaceId, int viewId) { + super(surfaceId, viewId); } @Override @@ -36,6 +42,12 @@ import com.facebook.react.uimanager.events.RCTEventEmitter; rctEventEmitter.receiveEvent(getViewTag(), getEventName(), serializeEventData()); } + @Override + public void dispatchV2(RCTModernEventEmitter rctEventEmitter) { + rctEventEmitter.receiveEvent( + getSurfaceId(), getViewTag(), getEventName(), serializeEventData()); + } + private WritableMap serializeEventData() { WritableMap eventData = Arguments.createMap(); eventData.putInt("target", getViewTag()); diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputKeyPressEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputKeyPressEvent.java index b4193e984eb..5894b417017 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputKeyPressEvent.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputKeyPressEvent.java @@ -11,6 +11,7 @@ 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; +import com.facebook.react.uimanager.events.RCTModernEventEmitter; /** Event emitted by EditText native view when key pressed */ public class ReactTextInputKeyPressEvent extends Event { @@ -19,8 +20,13 @@ public class ReactTextInputKeyPressEvent extends Event { private String mKey; + @Deprecated ReactTextInputKeyPressEvent(int viewId, final String key) { - super(viewId); + this(-1, viewId, key); + } + + ReactTextInputKeyPressEvent(int surfaceId, int viewId, final String key) { + super(surfaceId, viewId); mKey = key; } @@ -40,6 +46,12 @@ public class ReactTextInputKeyPressEvent extends Event { rctEventEmitter.receiveEvent(getViewTag(), getEventName(), serializeEventData()); } + @Override + public void dispatchV2(RCTModernEventEmitter rctEventEmitter) { + rctEventEmitter.receiveEvent( + getSurfaceId(), getViewTag(), getEventName(), serializeEventData()); + } + private WritableMap serializeEventData() { WritableMap eventData = Arguments.createMap(); eventData.putString("key", mKey); diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java index 3c32ac96017..3a21ef71c4b 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java @@ -897,12 +897,14 @@ public class ReactTextInputManager extends BaseViewManager { @@ -20,8 +21,14 @@ import com.facebook.react.uimanager.events.RCTEventEmitter; private int mSelectionStart; private int mSelectionEnd; + @Deprecated public ReactTextInputSelectionEvent(int viewId, int selectionStart, int selectionEnd) { - super(viewId); + this(-1, viewId, selectionStart, selectionEnd); + } + + public ReactTextInputSelectionEvent( + int surfaceId, int viewId, int selectionStart, int selectionEnd) { + super(surfaceId, viewId); mSelectionStart = selectionStart; mSelectionEnd = selectionEnd; } @@ -36,6 +43,12 @@ import com.facebook.react.uimanager.events.RCTEventEmitter; rctEventEmitter.receiveEvent(getViewTag(), getEventName(), serializeEventData()); } + @Override + public void dispatchV2(RCTModernEventEmitter rctEventEmitter) { + rctEventEmitter.receiveEvent( + getSurfaceId(), getViewTag(), getEventName(), serializeEventData()); + } + private WritableMap serializeEventData() { WritableMap eventData = Arguments.createMap(); diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputSubmitEditingEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputSubmitEditingEvent.java index fb717e70a23..eb72879cf61 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputSubmitEditingEvent.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputSubmitEditingEvent.java @@ -11,6 +11,7 @@ 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; +import com.facebook.react.uimanager.events.RCTModernEventEmitter; /** Event emitted by EditText native view when the user submits the text. */ /* package */ class ReactTextInputSubmitEditingEvent @@ -20,8 +21,13 @@ import com.facebook.react.uimanager.events.RCTEventEmitter; private String mText; + @Deprecated public ReactTextInputSubmitEditingEvent(int viewId, String text) { - super(viewId); + this(-1, viewId, text); + } + + public ReactTextInputSubmitEditingEvent(int surfaceId, int viewId, String text) { + super(surfaceId, viewId); mText = text; } @@ -40,6 +46,12 @@ import com.facebook.react.uimanager.events.RCTEventEmitter; rctEventEmitter.receiveEvent(getViewTag(), getEventName(), serializeEventData()); } + @Override + public void dispatchV2(RCTModernEventEmitter rctEventEmitter) { + rctEventEmitter.receiveEvent( + getSurfaceId(), getViewTag(), getEventName(), serializeEventData()); + } + private WritableMap serializeEventData() { WritableMap eventData = Arguments.createMap(); eventData.putInt("target", getViewTag());