fix(#281): incompatibility with RN 0.65+ (#283)

react-native-picker · Jun 25, 2021 · ec38608 · ec38608
1 parent 5a4ba06
commit ec38608
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/android/src/main/java/com/reactnativecommunity/picker/PickerBlurEvent.java b/android/src/main/java/com/reactnativecommunity/picker/PickerBlurEvent.java
@@ -21,7 +21,17 @@ public void dispatch(RCTEventEmitter rctEventEmitter) {
     rctEventEmitter.receiveEvent(getViewTag(), getEventName(), getEventData());
   }
 
-  private WritableMap getEventData() {
+  /**
+   * In RN version 0.65+ getEventData method is introduced
+   * https://github.com/facebook/react-native/commit/72d0ddc16f2f631003c3486e0a59e50c145ec613
+   *
+   * In order to keep compatibility with 0.65+ and not introduce breaking change for that lib,
+   * the only change is changing access modifier from `private` to `protected` without using @override annotation
+   * (idk if it will not bring any "method is hidden, but should overriden" warning, but for now it just works)
+   *
+   * In future versions, where `dispatch` method will be removed, there will be need to make a breaking change here
+   */
+  protected WritableMap getEventData() {
     WritableMap eventData = Arguments.createMap();
     eventData.putInt("target", getViewTag());
     return eventData;

diff --git a/android/src/main/java/com/reactnativecommunity/picker/PickerFocusEvent.java b/android/src/main/java/com/reactnativecommunity/picker/PickerFocusEvent.java
@@ -21,7 +21,17 @@ public void dispatch(RCTEventEmitter rctEventEmitter) {
     rctEventEmitter.receiveEvent(getViewTag(), getEventName(), getEventData());
   }
 
-  private WritableMap getEventData() {
+  /**
+   * In RN version 0.65+ getEventData method is introduced
+   * https://github.com/facebook/react-native/commit/72d0ddc16f2f631003c3486e0a59e50c145ec613
+   *
+   * In order to keep compatibility with 0.65+ and not introduce breaking change for that lib,
+   * the only change is changing access modifier from `private` to `protected` without using @override annotation
+   * (idk if it will not bring any "method is hidden, but should overriden" warning, but for now it just works)
+   *
+   * In future versions, where `dispatch` method will be removed, there will be need to make a breaking change here
+   */
+  protected WritableMap getEventData() {
     WritableMap eventData = Arguments.createMap();
     eventData.putInt("target", getViewTag());
     return eventData;