@react-native-ohos/react-native-map-clustering 3.5.0 → 4.1.0-beta.1

package/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## 鸿蒙化Log
 
+### v4.1.0-beta.1
+
+- pre-release version 4.1.0-beta.1
+- feat:适配上游版本升级
+
+
 ### v3.5.0
 
 - release version 3.5.0

package/example/package.json

@@ -8,7 +8,7 @@
     "start": "hdc rport tcp:8081 tcp:8081 && react-native start",
     "codegen": "react-native codegen-harmony --rnoh-module-path ./harmony/entry/oh_modules/@rnoh/react-native-openharmony",
     "pack:pkg": "cd ../ && npm pack && cd ./example",
-    "install:pkg": "npm uninstall @react-native-ohos/react-native-map-clustering && npm run pack:pkg && npm i @react-native-ohos/react-native-map-clustering@file:../react-native-ohos-react-native-map-clustering-3.4.1-rc.1.tgz",
+    "install:pkg": "npm uninstall @react-native-ohos/react-native-map-clustering && npm run pack:pkg && npm i @react-native-ohos/react-native-map-clustering@file:../react-native-ohos-react-native-map-clustering-4.1.0-beta.1.tgz",
     "dev": "npm run codegen && react-native bundle-harmony --dev --minify=false",
     "prod": "npm run codegen && react-native bundle-harmony --dev=false --minify=true",
     "postinstall": "node ./scripts/create-build-profile",
@@ -16,7 +16,7 @@
   },
   "dependencies": {
     "@gorhom/portal": "^1.0.14",
-    "@react-native-ohos/react-native-map-clustering": "file:../react-native-ohos-react-native-map-clustering-3.4.1-rc.1.tgz",
+    "@react-native-ohos/react-native-map-clustering": "file:../react-native-ohos-react-native-map-clustering-4.1.0-beta.1.tgz",
     "@react-native-ohos/react-native-maps": "file:../packages/react-native-ohos-react-native-maps-1.24.3.tgz",
     "react": "18.3.1",
     "react-native": "0.77.1",

package/lib/ClusteredMapView.js

@@ -22,28 +22,30 @@ import ClusterHarmony from "./ClusterHarmony";
 const ClusteredMapView = forwardRef(
   (
     {
-      radius,
-      maxZoom,
-      minZoom,
-      minPoints,
-      extent,
-      nodeSize,
+      radius = Dimensions.get("window").width * 0.06,
+      maxZoom = 20,
+      minZoom = 1,
+      minPoints = 2,
+      extent = 512,
+      nodeSize = 64,
+      edgePadding = { top: 50, left: 50, right: 50, bottom: 50 },
       children,
-      onClusterPress,
-      onRegionChangeComplete,
-      onMarkersChange,
-      preserveClusterPressBehavior,
-      clusteringEnabled,
-      clusterColor,
-      clusterTextColor,
+      onClusterPress = () => {},
+      onRegionChangeComplete = () => {},
+      onMarkersChange = () => {},
+      preserveClusterPressBehavior = false,
+      clusteringEnabled = true,
+      clusterColor = "#00B386",
+      clusterTextColor = "#FFFFFF",
       clusterFontFamily,
-      spiderLineColor,
-      layoutAnimationConf,
-      animationEnabled,
+      spiderLineColor = "#FF0000",
+      layoutAnimationConf = LayoutAnimation.Presets.spring,
+      animationEnabled = true,
       renderCluster,
-      tracksViewChanges,
-      spiralEnabled,
-      superClusterRef,
+      tracksViewChanges = false,
+      spiralEnabled = true,
+      superClusterRef = {},
+      mapRef: mapRefProp = () => {},
       ...restProps
     },
     ref
@@ -130,11 +132,11 @@ const ClusteredMapView = forwardRef(
       }
     }, [isSpiderfier, markers]);
 
-    const _onRegionChangeComplete = (region, harmonyIn) => {
+    const _onRegionChangeComplete = (region, details, harmonyIn) => {
       if (Platform.OS === "harmony" && !harmonyIn) {
         region = region.nativeEvent.region;
         setTimeout(() => {
-          _onRegionChangeComplete(region, true);
+          _onRegionChangeComplete(region, details, true);
         }, 100);
         return;
       }
@@ -176,17 +178,19 @@ const ClusteredMapView = forwardRef(
           if (markers.length != 0) {
             updateMarkers(markers);
             onMarkersChange(markers);
-            onRegionChangeComplete(region, markers);
+            onRegionChangeComplete &&
+              onRegionChangeComplete(region, details, markers);
             updateRegion(region);
           }
         } else {
           updateMarkers(markers);
           onMarkersChange(markers);
-          onRegionChangeComplete(region, markers);
+          onRegionChangeComplete &&
+            onRegionChangeComplete(region, details, markers);
           updateRegion(region);
         }
       } else {
-        onRegionChangeComplete(region);
+        onRegionChangeComplete && onRegionChangeComplete(region, details);
       }
     };
 
@@ -205,9 +209,7 @@ const ClusteredMapView = forwardRef(
         longitude: geometry.coordinates[0],
       }));
 
-      mapRef.current.fitToCoordinates(coordinates, {
-        edgePadding: restProps.edgePadding,
-      });
+      mapRef.current.fitToCoordinates(coordinates, { edgePadding });
 
       onClusterPress(cluster, children);
     };
@@ -218,7 +220,7 @@ const ClusteredMapView = forwardRef(
         ref={(map) => {
           mapRef.current = map;
           if (ref) ref.current = map;
-          restProps.mapRef(map);
+          mapRefProp(map);
         }}
         onRegionChangeComplete={_onRegionChangeComplete}
       >
@@ -279,32 +281,4 @@ const ClusteredMapView = forwardRef(
   }
 );
 
-ClusteredMapView.defaultProps = {
-  clusteringEnabled: true,
-  spiralEnabled: true,
-  animationEnabled: true,
-  preserveClusterPressBehavior: false,
-  layoutAnimationConf: LayoutAnimation.Presets.spring,
-  tracksViewChanges: false,
-  // SuperCluster parameters
-  radius: Dimensions.get("window").width * 0.06,
-  maxZoom: 20,
-  minZoom: 1,
-  minPoints: 2,
-  extent: 512,
-  nodeSize: 64,
-  // Map parameters
-  edgePadding: { top: 50, left: 50, right: 50, bottom: 50 },
-  // Cluster styles
-  clusterColor: "#00B386",
-  clusterTextColor: "#FFFFFF",
-  spiderLineColor: "#FF0000",
-  // Callbacks
-  onRegionChangeComplete: () => {},
-  onClusterPress: () => {},
-  onMarkersChange: () => {},
-  superClusterRef: {},
-  mapRef: () => {},
-};
-
 export default memo(ClusteredMapView);

package/package.json

@@ -4,7 +4,7 @@
     "alias": "react-native-map-clustering",
     "redirectInternalImports": true
   },
-  "version": "3.5.0",
+  "version": "4.1.0-beta.1",
   "description": "React Native Map Clustering both for Android and iOS",
   "types": "index.d.ts",
   "main": "index.js",
@@ -29,9 +29,9 @@
   "bugs": {
     "url": "https://github.com/react-native-oh-library/react-native-map-clustering/issues"
   },
-  "homepage": "https://github.com/react-native-oh-library/react-native-map-clustering/tree/br_rnoh0.77#readme",
+  "homepage": "https://github.com/react-native-oh-library/react-native-map-clustering/tree/br_rnoh0.82#readme",
   "dependencies": {
-    "supercluster": "^7.1.0",
+    "supercluster": "^8.0.0",
     "@mapbox/geo-viewport": "^0.4.1"
   },
   "peerDependencies": {