Initialize Event Emitter as part of UIManagerModule

Reviewed By: achen1 Differential Revision: D8216184 fbshipit-source-id: 3b188804e2dad2b112f566da49a939eb4338713d
facebook · May 31, 2018 · 6e359c4 · 6e359c4
1 parent 0f10e03
commit 6e359c4
Show file tree

Hide file tree

Showing 22 changed files with 43 additions and 50 deletions.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java
@@ -1078,8 +1078,6 @@ private ReactApplicationContext createReactContext(
     ReactMarker.logMarker(CREATE_REACT_CONTEXT_START, jsExecutor.getName());
     final ReactApplicationContext reactContext = new ReactApplicationContext(mApplicationContext);
 
-    reactContext.setEventDispatcher(new EventDispatcher(reactContext));
-
     NativeModuleCallExceptionHandler exceptionHandler = mNativeModuleCallExceptionHandler != null
         ? mNativeModuleCallExceptionHandler
         : mDevSupportManager;

diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java b/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java
@@ -194,7 +194,7 @@ public void onChildStartedNativeGesture(MotionEvent androidEvent) {
       return;
     }
     ReactContext reactContext = mReactInstanceManager.getCurrentReactContext();
-    EventDispatcher eventDispatcher = reactContext.<EventDispatcher>getEventDispatcher();
+    EventDispatcher eventDispatcher = reactContext.getNativeModule(UIManagerModule.class).getEventDispatcher();
     mJSTouchDispatcher.onChildStartedNativeGesture(androidEvent, eventDispatcher);
   }
 
@@ -280,7 +280,7 @@ private void dispatchJSTouchEvent(MotionEvent event) {
       return;
     }
     ReactContext reactContext = mReactInstanceManager.getCurrentReactContext();
-    EventDispatcher eventDispatcher = reactContext.<EventDispatcher>getEventDispatcher();
+    EventDispatcher eventDispatcher = reactContext.getNativeModule(UIManagerModule.class).getEventDispatcher();
     mJSTouchDispatcher.handleTouchEvent(event, eventDispatcher);
   }
 

diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContext.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContext.java
@@ -39,7 +39,6 @@ public class ReactContext extends ContextWrapper {
 
   private LifecycleState mLifecycleState = LifecycleState.BEFORE_CREATE;
 
-  private @Nullable EventDispatcher mEventDispatcher;
   private @Nullable CatalystInstance mCatalystInstance;
   private @Nullable LayoutInflater mInflater;
   private @Nullable MessageQueueThread mUiMessageQueueThread;
@@ -351,11 +350,4 @@ public JavaScriptContextHolder getJavaScriptContextHolder() {
     return mCatalystInstance.getJavaScriptContextHolder();
   }
 
-  public <T extends EventDispatcher> T getEventDispatcher() {
-    return (T) mEventDispatcher;
-  }
-
-  public void setEventDispatcher(EventDispatcher eventDispatcher) {
-    mEventDispatcher = eventDispatcher;
-  }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/FlatViewGroup.java b/ReactAndroid/src/main/java/com/facebook/react/flat/FlatViewGroup.java
@@ -31,6 +31,7 @@
 import com.facebook.react.uimanager.ReactClippingViewGroup;
 import com.facebook.react.uimanager.ReactCompoundViewGroup;
 import com.facebook.react.uimanager.ReactPointerEventsView;
+import com.facebook.react.uimanager.UIManagerModule;
 import com.facebook.react.uimanager.events.EventDispatcher;
 import com.facebook.react.views.image.ImageLoadEvent;
 import java.lang.ref.WeakReference;
@@ -126,7 +127,7 @@ public void dispatchImageLoadEvent(int reactTag, int imageLoadEvent) {
       }
 
       ReactContext reactContext = ((ReactContext) view.getContext());
-      reactContext.<EventDispatcher>getEventDispatcher().dispatchEvent(
+      reactContext.getNativeModule(UIManagerModule.class).getEventDispatcher().dispatchEvent(
           new ImageLoadEvent(reactTag, imageLoadEvent));
     }
   }

diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ThemedReactContext.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ThemedReactContext.java
@@ -7,7 +7,6 @@
 
 package com.facebook.react.uimanager;
 
-import com.facebook.react.bridge.EventDispatcher;
 import javax.annotation.Nullable;
 
 import android.app.Activity;
@@ -17,8 +16,6 @@
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.LifecycleEventListener;
 
-//
-
 /**
  * Wraps {@link ReactContext} with the base {@link Context} passed into the constructor.
  * It provides also a way to start activities using the viewContext to which RN native views belong.
@@ -56,9 +53,4 @@ public boolean hasCurrentActivity() {
   public @Nullable Activity getCurrentActivity() {
     return mReactApplicationContext.getCurrentActivity();
   }
-
-  @Override
-  public <T extends EventDispatcher> T getEventDispatcher() {
-    return mReactApplicationContext.getEventDispatcher();
-  }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModule.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModule.java
@@ -130,7 +130,7 @@ public UIManagerModule(
       int minTimeLeftInFrameForNonBatchedOperationMs) {
     super(reactContext);
     DisplayMetricsHolder.initDisplayMetricsIfNotInitialized(reactContext);
-    mEventDispatcher = reactContext.getEventDispatcher();
+    mEventDispatcher = new EventDispatcher(reactContext);
     mModuleConstants = createConstants(viewManagerResolver);
     mCustomDirectEvents = UIManagerModuleConstants.getDirectEventTypeConstants();
     mUIImplementation =
@@ -150,7 +150,7 @@ public UIManagerModule(
       int minTimeLeftInFrameForNonBatchedOperationMs) {
     super(reactContext);
     DisplayMetricsHolder.initDisplayMetricsIfNotInitialized(reactContext);
-    mEventDispatcher = reactContext.getEventDispatcher();
+    mEventDispatcher = new EventDispatcher(reactContext);
     mCustomDirectEvents = MapBuilder.newHashMap();
     mModuleConstants = createConstants(viewManagersList, null, mCustomDirectEvents);
     mUIImplementation =
@@ -704,10 +704,6 @@ public void setViewHierarchyUpdateDebugListener(
     mUIImplementation.setViewHierarchyUpdateDebugListener(listener);
   }
 
-  /**
-   * This method is deprecated, use {@link ReactContext#getEventDispatcher()}.
-   */
-  @Deprecated
   public EventDispatcher getEventDispatcher() {
     return mEventDispatcher;
   }

diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/EventDispatcher.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/EventDispatcher.java
@@ -56,8 +56,7 @@
  * EVENT_TYPE_ID_MASK =  0x0000ffff00000000
  * COALESCING_KEY_MASK = 0xffff000000000000
  */
-public class EventDispatcher implements LifecycleEventListener,
-  com.facebook.react.bridge.EventDispatcher {
+public class EventDispatcher implements LifecycleEventListener {
 
   private static final Comparator<Event> EVENT_COMPARATOR = new Comparator<Event>() {
     @Override

diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/checkbox/ReactCheckBoxManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/checkbox/ReactCheckBoxManager.java
@@ -10,6 +10,7 @@
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.uimanager.SimpleViewManager;
 import com.facebook.react.uimanager.ThemedReactContext;
+import com.facebook.react.uimanager.UIManagerModule;
 import com.facebook.react.uimanager.ViewProps;
 import com.facebook.react.uimanager.annotations.ReactProp;
 import com.facebook.react.uimanager.events.EventDispatcher;
@@ -25,7 +26,7 @@ public class ReactCheckBoxManager extends SimpleViewManager<ReactCheckBox> {
         public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
           ReactContext reactContext = (ReactContext) buttonView.getContext();
           reactContext
-              .<EventDispatcher>getEventDispatcher()
+              .getNativeModule(UIManagerModule.class).getEventDispatcher()
               .dispatchEvent(new ReactCheckBoxEvent(buttonView.getId(), isChecked));
         }
       };

diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/drawer/ReactDrawerLayoutManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/drawer/ReactDrawerLayoutManager.java
@@ -19,6 +19,7 @@
 import com.facebook.react.module.annotations.ReactModule;
 import com.facebook.react.uimanager.PixelUtil;
 import com.facebook.react.uimanager.ThemedReactContext;
+import com.facebook.react.uimanager.UIManagerModule;
 import com.facebook.react.uimanager.ViewGroupManager;
 import com.facebook.react.uimanager.annotations.ReactProp;
 import com.facebook.react.uimanager.events.EventDispatcher;
@@ -51,7 +52,7 @@ protected void addEventEmitters(ThemedReactContext reactContext, ReactDrawerLayo
     view.setDrawerListener(
         new DrawerEventEmitter(
             view,
-            reactContext.<EventDispatcher>getEventDispatcher()));
+            reactContext.getNativeModule(UIManagerModule.class).getEventDispatcher()));
   }
 
   @Override

diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageView.java b/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageView.java
@@ -50,6 +50,7 @@
 import com.facebook.react.modules.fresco.ReactNetworkImageRequest;
 import com.facebook.react.uimanager.FloatUtil;
 import com.facebook.react.uimanager.PixelUtil;
+import com.facebook.react.uimanager.UIManagerModule;
 import com.facebook.react.uimanager.events.EventDispatcher;
 import com.facebook.react.views.imagehelper.ImageSource;
 import com.facebook.react.views.imagehelper.MultiSourceHelper;
@@ -231,7 +232,7 @@ public void setShouldNotifyLoadEvents(boolean shouldNotify) {
     if (!shouldNotify) {
       mControllerListener = null;
     } else {
-      final EventDispatcher mEventDispatcher = ((ReactContext) getContext()).<EventDispatcher>getEventDispatcher();
+      final EventDispatcher mEventDispatcher = ((ReactContext) getContext()).getNativeModule(UIManagerModule.class).getEventDispatcher();
 
       mControllerListener = new BaseControllerListener<ImageInfo>() {
         @Override

diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostManager.java
@@ -12,6 +12,7 @@
 import com.facebook.react.module.annotations.ReactModule;
 import com.facebook.react.uimanager.LayoutShadowNode;
 import com.facebook.react.uimanager.ThemedReactContext;
+import com.facebook.react.uimanager.UIManagerModule;
 import com.facebook.react.uimanager.ViewGroupManager;
 import com.facebook.react.uimanager.annotations.ReactProp;
 import com.facebook.react.uimanager.events.EventDispatcher;
@@ -71,7 +72,7 @@ protected void addEventEmitters(
       ThemedReactContext reactContext,
       final ReactModalHostView view) {
     final EventDispatcher dispatcher =
-      reactContext.<EventDispatcher>getEventDispatcher();
+      reactContext.getNativeModule(UIManagerModule.class).getEventDispatcher();
     view.setOnRequestCloseListener(
       new ReactModalHostView.OnRequestCloseListener() {
         @Override

diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostView.java b/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostView.java
@@ -370,7 +370,7 @@ public void requestDisallowInterceptTouchEvent(boolean disallowIntercept) {
 
     private EventDispatcher getEventDispatcher() {
       ReactContext reactContext = getReactContext();
-      return reactContext.<EventDispatcher>getEventDispatcher();
+      return reactContext.getNativeModule(UIManagerModule.class).getEventDispatcher();
     }
   }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/picker/ReactPickerManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/picker/ReactPickerManager.java
@@ -19,6 +19,7 @@
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.uimanager.SimpleViewManager;
 import com.facebook.react.uimanager.ThemedReactContext;
+import com.facebook.react.uimanager.UIManagerModule;
 import com.facebook.react.uimanager.ViewProps;
 import com.facebook.react.uimanager.annotations.ReactProp;
 import com.facebook.react.uimanager.events.EventDispatcher;
@@ -86,7 +87,7 @@ protected void addEventEmitters(
     picker.setOnSelectListener(
             new PickerEventEmitter(
                     picker,
-                    reactContext.<EventDispatcher>getEventDispatcher()));
+                    reactContext.getNativeModule(UIManagerModule.class).getEventDispatcher()));
   }
 
   private static class ReactPickerAdapter extends ArrayAdapter<ReadableMap> {

diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewHelper.java b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewHelper.java
@@ -11,6 +11,7 @@
 import android.view.ViewGroup;
 import com.facebook.react.bridge.JSApplicationIllegalArgumentException;
 import com.facebook.react.bridge.ReactContext;
+import com.facebook.react.uimanager.UIManagerModule;
 import com.facebook.react.uimanager.events.EventDispatcher;
 
 /**
@@ -68,7 +69,7 @@ private static void emitScrollEvent(
     }
 
     ReactContext reactContext = (ReactContext) scrollView.getContext();
-    reactContext.<EventDispatcher>getEventDispatcher().dispatchEvent(
+    reactContext.getNativeModule(UIManagerModule.class).getEventDispatcher().dispatchEvent(
         ScrollEvent.obtain(
             scrollView.getId(),
             scrollEventType,

diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/slider/ReactSliderManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/slider/ReactSliderManager.java
@@ -19,6 +19,7 @@
 import com.facebook.react.uimanager.ReactShadowNodeImpl;
 import com.facebook.react.uimanager.SimpleViewManager;
 import com.facebook.react.uimanager.ThemedReactContext;
+import com.facebook.react.uimanager.UIManagerModule;
 import com.facebook.react.uimanager.ViewProps;
 import com.facebook.react.uimanager.annotations.ReactProp;
 import com.facebook.react.uimanager.events.EventDispatcher;
@@ -107,7 +108,7 @@ public long measure(
         @Override
         public void onProgressChanged(SeekBar seekbar, int progress, boolean fromUser) {
           ReactContext reactContext = (ReactContext) seekbar.getContext();
-          reactContext.<EventDispatcher>getEventDispatcher().dispatchEvent(
+          reactContext.getNativeModule(UIManagerModule.class).getEventDispatcher().dispatchEvent(
               new ReactSliderEvent(
                   seekbar.getId(),
                   ((ReactSlider) seekbar).toRealProgress(progress),
@@ -121,7 +122,7 @@ public void onStartTrackingTouch(SeekBar seekbar) {
         @Override
         public void onStopTrackingTouch(SeekBar seekbar) {
           ReactContext reactContext = (ReactContext) seekbar.getContext();
-          reactContext.<EventDispatcher>getEventDispatcher().dispatchEvent(
+          reactContext.getNativeModule(UIManagerModule.class).getEventDispatcher().dispatchEvent(
               new ReactSlidingCompleteEvent(
                   seekbar.getId(),
                   ((ReactSlider) seekbar).toRealProgress(seekbar.getProgress())));

diff --git a/...ndroid/src/main/java/com/facebook/react/views/swiperefresh/SwipeRefreshLayoutManager.java b/...ndroid/src/main/java/com/facebook/react/views/swiperefresh/SwipeRefreshLayoutManager.java
@@ -16,6 +16,7 @@
 import com.facebook.react.common.MapBuilder;
 import com.facebook.react.module.annotations.ReactModule;
 import com.facebook.react.uimanager.ThemedReactContext;
+import com.facebook.react.uimanager.UIManagerModule;
 import com.facebook.react.uimanager.ViewGroupManager;
 import com.facebook.react.uimanager.ViewProps;
 import com.facebook.react.uimanager.annotations.ReactProp;
@@ -88,7 +89,7 @@ protected void addEventEmitters(
         new OnRefreshListener() {
           @Override
           public void onRefresh() {
-            reactContext.<EventDispatcher>getEventDispatcher()
+            reactContext.getNativeModule(UIManagerModule.class).getEventDispatcher()
                 .dispatchEvent(new RefreshEvent(view.getId()));
           }
         });

diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitchManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitchManager.java
@@ -17,6 +17,7 @@
 import com.facebook.react.uimanager.ReactShadowNodeImpl;
 import com.facebook.react.uimanager.SimpleViewManager;
 import com.facebook.react.uimanager.ThemedReactContext;
+import com.facebook.react.uimanager.UIManagerModule;
 import com.facebook.react.uimanager.ViewProps;
 import com.facebook.react.uimanager.annotations.ReactProp;
 import com.facebook.react.uimanager.events.EventDispatcher;
@@ -104,7 +105,7 @@ public long measure(
         @Override
         public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
           ReactContext reactContext = (ReactContext) buttonView.getContext();
-          reactContext.<EventDispatcher>getEventDispatcher().dispatchEvent(
+          reactContext.getNativeModule(UIManagerModule.class).getEventDispatcher().dispatchEvent(
               new ReactSwitchEvent(
                   buttonView.getId(),
                   isChecked));

diff --git a/...src/main/java/com/facebook/react/views/textinput/ReactEditTextInputConnectionWrapper.java b/...src/main/java/com/facebook/react/views/textinput/ReactEditTextInputConnectionWrapper.java
@@ -12,6 +12,7 @@
 import android.view.inputmethod.InputConnection;
 import android.view.inputmethod.InputConnectionWrapper;
 import com.facebook.react.bridge.ReactContext;
+import com.facebook.react.uimanager.UIManagerModule;
 import com.facebook.react.uimanager.events.EventDispatcher;
 import javax.annotation.Nullable;
 
@@ -64,7 +65,7 @@ public ReactEditTextInputConnectionWrapper(
       final ReactEditText editText
   ) {
     super(target, false);
-    mEventDispatcher = reactContext.<EventDispatcher>getEventDispatcher();
+    mEventDispatcher = reactContext.getNativeModule(UIManagerModule.class).getEventDispatcher();
     mEditText = editText;
   }
 

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
@@ -27,13 +27,15 @@
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.bridge.UIManager;
 import com.facebook.react.common.MapBuilder;
 import com.facebook.react.module.annotations.ReactModule;
 import com.facebook.react.uimanager.BaseViewManager;
 import com.facebook.react.uimanager.LayoutShadowNode;
 import com.facebook.react.uimanager.PixelUtil;
 import com.facebook.react.uimanager.Spacing;
 import com.facebook.react.uimanager.ThemedReactContext;
+import com.facebook.react.uimanager.UIManagerModule;
 import com.facebook.react.uimanager.ViewDefaults;
 import com.facebook.react.uimanager.ViewProps;
 import com.facebook.react.uimanager.annotations.ReactProp;
@@ -693,7 +695,7 @@ private class ReactTextInputTextWatcher implements TextWatcher {
     public ReactTextInputTextWatcher(
         final ReactContext reactContext,
         final ReactEditText editText) {
-      mEventDispatcher = reactContext.<EventDispatcher>getEventDispatcher();
+      mEventDispatcher = reactContext.getNativeModule(UIManagerModule.class).getEventDispatcher();
       mEditText = editText;
       mPreviousText = null;
     }
@@ -751,7 +753,7 @@ protected void addEventEmitters(
         new View.OnFocusChangeListener() {
           public void onFocusChange(View v, boolean hasFocus) {
             EventDispatcher eventDispatcher =
-                reactContext.<EventDispatcher>getEventDispatcher();
+                reactContext.getNativeModule(UIManagerModule.class).getEventDispatcher();
             if (hasFocus) {
               eventDispatcher.dispatchEvent(
                   new ReactTextInputFocusEvent(
@@ -788,7 +790,7 @@ public boolean onEditorAction(TextView v, int actionId, KeyEvent keyEvent) {
               // Additionally we always generate a `submit` event.
 
               EventDispatcher eventDispatcher =
-                  reactContext.<EventDispatcher>getEventDispatcher();
+                  reactContext.getNativeModule(UIManagerModule.class).getEventDispatcher();
 
               eventDispatcher.dispatchEvent(
                   new ReactTextInputSubmitEditingEvent(
@@ -817,7 +819,7 @@ private class ReactContentSizeWatcher implements ContentSizeWatcher {
     public ReactContentSizeWatcher(ReactEditText editText) {
       mEditText = editText;
       ReactContext reactContext = (ReactContext) editText.getContext();
-      mEventDispatcher = reactContext.<EventDispatcher>getEventDispatcher();
+      mEventDispatcher = reactContext.getNativeModule(UIManagerModule.class).getEventDispatcher();
     }
 
     @Override
@@ -856,7 +858,7 @@ private class ReactSelectionWatcher implements SelectionWatcher {
     public ReactSelectionWatcher(ReactEditText editText) {
       mReactEditText = editText;
       ReactContext reactContext = (ReactContext) editText.getContext();
-      mEventDispatcher = reactContext.<EventDispatcher>getEventDispatcher();
+      mEventDispatcher = reactContext.getNativeModule(UIManagerModule.class).getEventDispatcher();
     }
 
     @Override
@@ -888,7 +890,7 @@ private class ReactScrollWatcher implements ScrollWatcher {
     public ReactScrollWatcher(ReactEditText editText) {
       mReactEditText = editText;
       ReactContext reactContext = (ReactContext) editText.getContext();
-      mEventDispatcher = reactContext.<EventDispatcher>getEventDispatcher();
+      mEventDispatcher = reactContext.getNativeModule(UIManagerModule.class).getEventDispatcher();
     }
 
     @Override