From ba0fe2f80eaa8792136c1520f1962b54d7604d29 Mon Sep 17 00:00:00 2001 From: mym0404 Date: Fri, 17 May 2024 02:13:38 +0900 Subject: [PATCH 1/3] fix(android): force make mutable map of exported direct event type map type --- .../reactnativenavermap/mapview/RNCNaverMapViewManager.kt | 2 +- .../overlay/arrowheadpath/RNCNaverMapArrowheadPathManager.kt | 2 +- .../overlay/circle/RNCNaverMapCircleManager.kt | 2 +- .../overlay/ground/RNCNaverMapGroundManager.kt | 2 +- .../overlay/marker/RNCNaverMapMarkerManager.kt | 2 +- .../reactnativenavermap/overlay/path/RNCNaverMapPathManager.kt | 2 +- .../overlay/polygon/RNCNaverMapPolygonManager.kt | 2 +- .../overlay/polyline/RNCNaverMapPolylineManager.kt | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/android/src/main/java/com/mjstudio/reactnativenavermap/mapview/RNCNaverMapViewManager.kt b/android/src/main/java/com/mjstudio/reactnativenavermap/mapview/RNCNaverMapViewManager.kt index 12f35334..03a6f9dd 100644 --- a/android/src/main/java/com/mjstudio/reactnativenavermap/mapview/RNCNaverMapViewManager.kt +++ b/android/src/main/java/com/mjstudio/reactnativenavermap/mapview/RNCNaverMapViewManager.kt @@ -110,7 +110,7 @@ class RNCNaverMapViewManager : RNCNaverMapViewManagerSpec = - (super.getExportedCustomDirectEventTypeConstants() ?: mutableMapOf()).apply { + (super.getExportedCustomDirectEventTypeConstants()?.toMutableMap() ?: mutableMapOf()).apply { registerDirectEvent(this, NaverMapInitializeEvent.EVENT_NAME) registerDirectEvent(this, NaverMapOptionChangeEvent.EVENT_NAME) registerDirectEvent(this, NaverMapCameraChangeEvent.EVENT_NAME) diff --git a/android/src/main/java/com/mjstudio/reactnativenavermap/overlay/arrowheadpath/RNCNaverMapArrowheadPathManager.kt b/android/src/main/java/com/mjstudio/reactnativenavermap/overlay/arrowheadpath/RNCNaverMapArrowheadPathManager.kt index 79e490af..20282966 100644 --- a/android/src/main/java/com/mjstudio/reactnativenavermap/overlay/arrowheadpath/RNCNaverMapArrowheadPathManager.kt +++ b/android/src/main/java/com/mjstudio/reactnativenavermap/overlay/arrowheadpath/RNCNaverMapArrowheadPathManager.kt @@ -26,7 +26,7 @@ class RNCNaverMapArrowheadPathManager : RNCNaverMapArrowheadPathManagerSpec = - (super.getExportedCustomDirectEventTypeConstants() ?: mutableMapOf()).apply { + (super.getExportedCustomDirectEventTypeConstants()?.toMutableMap() ?: mutableMapOf()).apply { registerDirectEvent(this, NaverMapOverlayTapEvent.EVENT_NAME) } diff --git a/android/src/main/java/com/mjstudio/reactnativenavermap/overlay/circle/RNCNaverMapCircleManager.kt b/android/src/main/java/com/mjstudio/reactnativenavermap/overlay/circle/RNCNaverMapCircleManager.kt index a53b7aa8..7e21e3d7 100644 --- a/android/src/main/java/com/mjstudio/reactnativenavermap/overlay/circle/RNCNaverMapCircleManager.kt +++ b/android/src/main/java/com/mjstudio/reactnativenavermap/overlay/circle/RNCNaverMapCircleManager.kt @@ -26,7 +26,7 @@ class RNCNaverMapCircleManager : RNCNaverMapCircleManagerSpec } override fun getExportedCustomDirectEventTypeConstants(): MutableMap = - (super.getExportedCustomDirectEventTypeConstants() ?: mutableMapOf()).apply { + (super.getExportedCustomDirectEventTypeConstants()?.toMutableMap() ?: mutableMapOf()).apply { registerDirectEvent(this, NaverMapOverlayTapEvent.EVENT_NAME) } diff --git a/android/src/main/java/com/mjstudio/reactnativenavermap/overlay/ground/RNCNaverMapGroundManager.kt b/android/src/main/java/com/mjstudio/reactnativenavermap/overlay/ground/RNCNaverMapGroundManager.kt index 15b099d9..656bf486 100644 --- a/android/src/main/java/com/mjstudio/reactnativenavermap/overlay/ground/RNCNaverMapGroundManager.kt +++ b/android/src/main/java/com/mjstudio/reactnativenavermap/overlay/ground/RNCNaverMapGroundManager.kt @@ -25,7 +25,7 @@ class RNCNaverMapGroundManager : RNCNaverMapGroundManagerSpec } override fun getExportedCustomDirectEventTypeConstants(): MutableMap = - (super.getExportedCustomDirectEventTypeConstants() ?: mutableMapOf()).apply { + (super.getExportedCustomDirectEventTypeConstants()?.toMutableMap() ?: mutableMapOf()).apply { registerDirectEvent(this, NaverMapOverlayTapEvent.EVENT_NAME) } diff --git a/android/src/main/java/com/mjstudio/reactnativenavermap/overlay/marker/RNCNaverMapMarkerManager.kt b/android/src/main/java/com/mjstudio/reactnativenavermap/overlay/marker/RNCNaverMapMarkerManager.kt index 301105e2..770ab6e2 100644 --- a/android/src/main/java/com/mjstudio/reactnativenavermap/overlay/marker/RNCNaverMapMarkerManager.kt +++ b/android/src/main/java/com/mjstudio/reactnativenavermap/overlay/marker/RNCNaverMapMarkerManager.kt @@ -36,7 +36,7 @@ class RNCNaverMapMarkerManager : RNCNaverMapMarkerManagerSpec } override fun getExportedCustomDirectEventTypeConstants(): MutableMap = - (super.getExportedCustomDirectEventTypeConstants() ?: mutableMapOf()).apply { + (super.getExportedCustomDirectEventTypeConstants()?.toMutableMap() ?: mutableMapOf()).apply { registerDirectEvent(this, NaverMapOverlayTapEvent.EVENT_NAME) } diff --git a/android/src/main/java/com/mjstudio/reactnativenavermap/overlay/path/RNCNaverMapPathManager.kt b/android/src/main/java/com/mjstudio/reactnativenavermap/overlay/path/RNCNaverMapPathManager.kt index 066ef305..cbe1826c 100644 --- a/android/src/main/java/com/mjstudio/reactnativenavermap/overlay/path/RNCNaverMapPathManager.kt +++ b/android/src/main/java/com/mjstudio/reactnativenavermap/overlay/path/RNCNaverMapPathManager.kt @@ -27,7 +27,7 @@ class RNCNaverMapPathManager : RNCNaverMapPathManagerSpec() { } override fun getExportedCustomDirectEventTypeConstants(): MutableMap = - (super.getExportedCustomDirectEventTypeConstants() ?: mutableMapOf()).apply { + (super.getExportedCustomDirectEventTypeConstants()?.toMutableMap() ?: mutableMapOf()).apply { registerDirectEvent(this, NaverMapOverlayTapEvent.EVENT_NAME) } diff --git a/android/src/main/java/com/mjstudio/reactnativenavermap/overlay/polygon/RNCNaverMapPolygonManager.kt b/android/src/main/java/com/mjstudio/reactnativenavermap/overlay/polygon/RNCNaverMapPolygonManager.kt index 99db30a6..9075ff14 100644 --- a/android/src/main/java/com/mjstudio/reactnativenavermap/overlay/polygon/RNCNaverMapPolygonManager.kt +++ b/android/src/main/java/com/mjstudio/reactnativenavermap/overlay/polygon/RNCNaverMapPolygonManager.kt @@ -26,7 +26,7 @@ class RNCNaverMapPolygonManager : RNCNaverMapPolygonManagerSpec = - (super.getExportedCustomDirectEventTypeConstants() ?: mutableMapOf()).apply { + (super.getExportedCustomDirectEventTypeConstants()?.toMutableMap() ?: mutableMapOf()).apply { registerDirectEvent(this, NaverMapOverlayTapEvent.EVENT_NAME) } diff --git a/android/src/main/java/com/mjstudio/reactnativenavermap/overlay/polyline/RNCNaverMapPolylineManager.kt b/android/src/main/java/com/mjstudio/reactnativenavermap/overlay/polyline/RNCNaverMapPolylineManager.kt index 9b0cbb23..6ba9a2a0 100644 --- a/android/src/main/java/com/mjstudio/reactnativenavermap/overlay/polyline/RNCNaverMapPolylineManager.kt +++ b/android/src/main/java/com/mjstudio/reactnativenavermap/overlay/polyline/RNCNaverMapPolylineManager.kt @@ -26,7 +26,7 @@ class RNCNaverMapPolylineManager : RNCNaverMapPolylineManagerSpec = - (super.getExportedCustomDirectEventTypeConstants() ?: mutableMapOf()).apply { + (super.getExportedCustomDirectEventTypeConstants()?.toMutableMap() ?: mutableMapOf()).apply { registerDirectEvent(this, NaverMapOverlayTapEvent.EVENT_NAME) } From 0842ca90c6b4d5d1127adbc1c26d74c22b009de0 Mon Sep 17 00:00:00 2001 From: mym0404 Date: Fri, 17 May 2024 02:17:59 +0900 Subject: [PATCH 2/3] Revert "fix(android): force make mutable map of exported direct event type map type" This reverts commit ba0fe2f80eaa8792136c1520f1962b54d7604d29. --- .../reactnativenavermap/mapview/RNCNaverMapViewManager.kt | 2 +- .../overlay/arrowheadpath/RNCNaverMapArrowheadPathManager.kt | 2 +- .../overlay/circle/RNCNaverMapCircleManager.kt | 2 +- .../overlay/ground/RNCNaverMapGroundManager.kt | 2 +- .../overlay/marker/RNCNaverMapMarkerManager.kt | 2 +- .../reactnativenavermap/overlay/path/RNCNaverMapPathManager.kt | 2 +- .../overlay/polygon/RNCNaverMapPolygonManager.kt | 2 +- .../overlay/polyline/RNCNaverMapPolylineManager.kt | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/android/src/main/java/com/mjstudio/reactnativenavermap/mapview/RNCNaverMapViewManager.kt b/android/src/main/java/com/mjstudio/reactnativenavermap/mapview/RNCNaverMapViewManager.kt index 03a6f9dd..12f35334 100644 --- a/android/src/main/java/com/mjstudio/reactnativenavermap/mapview/RNCNaverMapViewManager.kt +++ b/android/src/main/java/com/mjstudio/reactnativenavermap/mapview/RNCNaverMapViewManager.kt @@ -110,7 +110,7 @@ class RNCNaverMapViewManager : RNCNaverMapViewManagerSpec = - (super.getExportedCustomDirectEventTypeConstants()?.toMutableMap() ?: mutableMapOf()).apply { + (super.getExportedCustomDirectEventTypeConstants() ?: mutableMapOf()).apply { registerDirectEvent(this, NaverMapInitializeEvent.EVENT_NAME) registerDirectEvent(this, NaverMapOptionChangeEvent.EVENT_NAME) registerDirectEvent(this, NaverMapCameraChangeEvent.EVENT_NAME) diff --git a/android/src/main/java/com/mjstudio/reactnativenavermap/overlay/arrowheadpath/RNCNaverMapArrowheadPathManager.kt b/android/src/main/java/com/mjstudio/reactnativenavermap/overlay/arrowheadpath/RNCNaverMapArrowheadPathManager.kt index 20282966..79e490af 100644 --- a/android/src/main/java/com/mjstudio/reactnativenavermap/overlay/arrowheadpath/RNCNaverMapArrowheadPathManager.kt +++ b/android/src/main/java/com/mjstudio/reactnativenavermap/overlay/arrowheadpath/RNCNaverMapArrowheadPathManager.kt @@ -26,7 +26,7 @@ class RNCNaverMapArrowheadPathManager : RNCNaverMapArrowheadPathManagerSpec = - (super.getExportedCustomDirectEventTypeConstants()?.toMutableMap() ?: mutableMapOf()).apply { + (super.getExportedCustomDirectEventTypeConstants() ?: mutableMapOf()).apply { registerDirectEvent(this, NaverMapOverlayTapEvent.EVENT_NAME) } diff --git a/android/src/main/java/com/mjstudio/reactnativenavermap/overlay/circle/RNCNaverMapCircleManager.kt b/android/src/main/java/com/mjstudio/reactnativenavermap/overlay/circle/RNCNaverMapCircleManager.kt index 7e21e3d7..a53b7aa8 100644 --- a/android/src/main/java/com/mjstudio/reactnativenavermap/overlay/circle/RNCNaverMapCircleManager.kt +++ b/android/src/main/java/com/mjstudio/reactnativenavermap/overlay/circle/RNCNaverMapCircleManager.kt @@ -26,7 +26,7 @@ class RNCNaverMapCircleManager : RNCNaverMapCircleManagerSpec } override fun getExportedCustomDirectEventTypeConstants(): MutableMap = - (super.getExportedCustomDirectEventTypeConstants()?.toMutableMap() ?: mutableMapOf()).apply { + (super.getExportedCustomDirectEventTypeConstants() ?: mutableMapOf()).apply { registerDirectEvent(this, NaverMapOverlayTapEvent.EVENT_NAME) } diff --git a/android/src/main/java/com/mjstudio/reactnativenavermap/overlay/ground/RNCNaverMapGroundManager.kt b/android/src/main/java/com/mjstudio/reactnativenavermap/overlay/ground/RNCNaverMapGroundManager.kt index 656bf486..15b099d9 100644 --- a/android/src/main/java/com/mjstudio/reactnativenavermap/overlay/ground/RNCNaverMapGroundManager.kt +++ b/android/src/main/java/com/mjstudio/reactnativenavermap/overlay/ground/RNCNaverMapGroundManager.kt @@ -25,7 +25,7 @@ class RNCNaverMapGroundManager : RNCNaverMapGroundManagerSpec } override fun getExportedCustomDirectEventTypeConstants(): MutableMap = - (super.getExportedCustomDirectEventTypeConstants()?.toMutableMap() ?: mutableMapOf()).apply { + (super.getExportedCustomDirectEventTypeConstants() ?: mutableMapOf()).apply { registerDirectEvent(this, NaverMapOverlayTapEvent.EVENT_NAME) } diff --git a/android/src/main/java/com/mjstudio/reactnativenavermap/overlay/marker/RNCNaverMapMarkerManager.kt b/android/src/main/java/com/mjstudio/reactnativenavermap/overlay/marker/RNCNaverMapMarkerManager.kt index 770ab6e2..301105e2 100644 --- a/android/src/main/java/com/mjstudio/reactnativenavermap/overlay/marker/RNCNaverMapMarkerManager.kt +++ b/android/src/main/java/com/mjstudio/reactnativenavermap/overlay/marker/RNCNaverMapMarkerManager.kt @@ -36,7 +36,7 @@ class RNCNaverMapMarkerManager : RNCNaverMapMarkerManagerSpec } override fun getExportedCustomDirectEventTypeConstants(): MutableMap = - (super.getExportedCustomDirectEventTypeConstants()?.toMutableMap() ?: mutableMapOf()).apply { + (super.getExportedCustomDirectEventTypeConstants() ?: mutableMapOf()).apply { registerDirectEvent(this, NaverMapOverlayTapEvent.EVENT_NAME) } diff --git a/android/src/main/java/com/mjstudio/reactnativenavermap/overlay/path/RNCNaverMapPathManager.kt b/android/src/main/java/com/mjstudio/reactnativenavermap/overlay/path/RNCNaverMapPathManager.kt index cbe1826c..066ef305 100644 --- a/android/src/main/java/com/mjstudio/reactnativenavermap/overlay/path/RNCNaverMapPathManager.kt +++ b/android/src/main/java/com/mjstudio/reactnativenavermap/overlay/path/RNCNaverMapPathManager.kt @@ -27,7 +27,7 @@ class RNCNaverMapPathManager : RNCNaverMapPathManagerSpec() { } override fun getExportedCustomDirectEventTypeConstants(): MutableMap = - (super.getExportedCustomDirectEventTypeConstants()?.toMutableMap() ?: mutableMapOf()).apply { + (super.getExportedCustomDirectEventTypeConstants() ?: mutableMapOf()).apply { registerDirectEvent(this, NaverMapOverlayTapEvent.EVENT_NAME) } diff --git a/android/src/main/java/com/mjstudio/reactnativenavermap/overlay/polygon/RNCNaverMapPolygonManager.kt b/android/src/main/java/com/mjstudio/reactnativenavermap/overlay/polygon/RNCNaverMapPolygonManager.kt index 9075ff14..99db30a6 100644 --- a/android/src/main/java/com/mjstudio/reactnativenavermap/overlay/polygon/RNCNaverMapPolygonManager.kt +++ b/android/src/main/java/com/mjstudio/reactnativenavermap/overlay/polygon/RNCNaverMapPolygonManager.kt @@ -26,7 +26,7 @@ class RNCNaverMapPolygonManager : RNCNaverMapPolygonManagerSpec = - (super.getExportedCustomDirectEventTypeConstants()?.toMutableMap() ?: mutableMapOf()).apply { + (super.getExportedCustomDirectEventTypeConstants() ?: mutableMapOf()).apply { registerDirectEvent(this, NaverMapOverlayTapEvent.EVENT_NAME) } diff --git a/android/src/main/java/com/mjstudio/reactnativenavermap/overlay/polyline/RNCNaverMapPolylineManager.kt b/android/src/main/java/com/mjstudio/reactnativenavermap/overlay/polyline/RNCNaverMapPolylineManager.kt index 6ba9a2a0..9b0cbb23 100644 --- a/android/src/main/java/com/mjstudio/reactnativenavermap/overlay/polyline/RNCNaverMapPolylineManager.kt +++ b/android/src/main/java/com/mjstudio/reactnativenavermap/overlay/polyline/RNCNaverMapPolylineManager.kt @@ -26,7 +26,7 @@ class RNCNaverMapPolylineManager : RNCNaverMapPolylineManagerSpec = - (super.getExportedCustomDirectEventTypeConstants()?.toMutableMap() ?: mutableMapOf()).apply { + (super.getExportedCustomDirectEventTypeConstants() ?: mutableMapOf()).apply { registerDirectEvent(this, NaverMapOverlayTapEvent.EVENT_NAME) } From 2edb7ecb4aad78d9ff2d950c29ceab708305a22d Mon Sep 17 00:00:00 2001 From: mym0404 Date: Fri, 17 May 2024 02:18:27 +0900 Subject: [PATCH 3/3] fix(android): make direct event inner map type to mutable --- .../com/mjstudio/reactnativenavermap/util/DirectEventUtils.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/src/main/java/com/mjstudio/reactnativenavermap/util/DirectEventUtils.kt b/android/src/main/java/com/mjstudio/reactnativenavermap/util/DirectEventUtils.kt index d82a1426..93bb7e8e 100644 --- a/android/src/main/java/com/mjstudio/reactnativenavermap/util/DirectEventUtils.kt +++ b/android/src/main/java/com/mjstudio/reactnativenavermap/util/DirectEventUtils.kt @@ -4,5 +4,5 @@ internal fun registerDirectEvent( map: MutableMap, name: String, ) { - map[name] = mapOf("registrationName" to name.replace(Regex("""^top"""), "on")) + map[name] = mutableMapOf("registrationName" to name.replace(Regex("""^top"""), "on")) }