@maydon_tech/react-native-nitro-maps 0.1.0 → 0.1.2

package/nitrogen/generated/shared/c++/ClusterConfig.hpp

@@ -31,6 +31,7 @@ namespace margelo::nitro::nitromap { struct MarkerColor; }
 namespace margelo::nitro::nitromap { enum class ClusterAnimationStyle; }
 
 #include "ClusterStrategy.hpp"
+#include <optional>
 #include <string>
 #include "MarkerColor.hpp"
 #include <variant>
@@ -44,24 +45,24 @@ namespace margelo::nitro::nitromap {
   struct ClusterConfig {
   public:
     bool enabled     SWIFT_PRIVATE;
-    ClusterStrategy strategy     SWIFT_PRIVATE;
-    double radius     SWIFT_PRIVATE;
-    double minimumClusterSize     SWIFT_PRIVATE;
-    double maxZoom     SWIFT_PRIVATE;
-    std::variant<std::string, MarkerColor> backgroundColor     SWIFT_PRIVATE;
-    std::variant<std::string, MarkerColor> textColor     SWIFT_PRIVATE;
-    double borderWidth     SWIFT_PRIVATE;
-    std::variant<std::string, MarkerColor> borderColor     SWIFT_PRIVATE;
-    bool animatesClusters     SWIFT_PRIVATE;
-    double animationDuration     SWIFT_PRIVATE;
-    ClusterAnimationStyle animationStyle     SWIFT_PRIVATE;
-    bool realtimeClustering     SWIFT_PRIVATE;
-    double renderBuffer     SWIFT_PRIVATE;
-    double throttleInterval     SWIFT_PRIVATE;
+    std::optional<ClusterStrategy> strategy     SWIFT_PRIVATE;
+    std::optional<double> radius     SWIFT_PRIVATE;
+    std::optional<double> minimumClusterSize     SWIFT_PRIVATE;
+    std::optional<double> maxZoom     SWIFT_PRIVATE;
+    std::optional<std::variant<std::string, MarkerColor>> backgroundColor     SWIFT_PRIVATE;
+    std::optional<std::variant<std::string, MarkerColor>> textColor     SWIFT_PRIVATE;
+    std::optional<double> borderWidth     SWIFT_PRIVATE;
+    std::optional<std::variant<std::string, MarkerColor>> borderColor     SWIFT_PRIVATE;
+    std::optional<bool> animatesClusters     SWIFT_PRIVATE;
+    std::optional<double> animationDuration     SWIFT_PRIVATE;
+    std::optional<ClusterAnimationStyle> animationStyle     SWIFT_PRIVATE;
+    std::optional<bool> realtimeClustering     SWIFT_PRIVATE;
+    std::optional<double> renderBuffer     SWIFT_PRIVATE;
+    std::optional<double> throttleInterval     SWIFT_PRIVATE;
 
   public:
     ClusterConfig() = default;
-    explicit ClusterConfig(bool enabled, ClusterStrategy strategy, double radius, double minimumClusterSize, double maxZoom, std::variant<std::string, MarkerColor> backgroundColor, std::variant<std::string, MarkerColor> textColor, double borderWidth, std::variant<std::string, MarkerColor> borderColor, bool animatesClusters, double animationDuration, ClusterAnimationStyle animationStyle, bool realtimeClustering, double renderBuffer, double throttleInterval): enabled(enabled), strategy(strategy), radius(radius), minimumClusterSize(minimumClusterSize), maxZoom(maxZoom), backgroundColor(backgroundColor), textColor(textColor), borderWidth(borderWidth), borderColor(borderColor), animatesClusters(animatesClusters), animationDuration(animationDuration), animationStyle(animationStyle), realtimeClustering(realtimeClustering), renderBuffer(renderBuffer), throttleInterval(throttleInterval) {}
+    explicit ClusterConfig(bool enabled, std::optional<ClusterStrategy> strategy, std::optional<double> radius, std::optional<double> minimumClusterSize, std::optional<double> maxZoom, std::optional<std::variant<std::string, MarkerColor>> backgroundColor, std::optional<std::variant<std::string, MarkerColor>> textColor, std::optional<double> borderWidth, std::optional<std::variant<std::string, MarkerColor>> borderColor, std::optional<bool> animatesClusters, std::optional<double> animationDuration, std::optional<ClusterAnimationStyle> animationStyle, std::optional<bool> realtimeClustering, std::optional<double> renderBuffer, std::optional<double> throttleInterval): enabled(enabled), strategy(strategy), radius(radius), minimumClusterSize(minimumClusterSize), maxZoom(maxZoom), backgroundColor(backgroundColor), textColor(textColor), borderWidth(borderWidth), borderColor(borderColor), animatesClusters(animatesClusters), animationDuration(animationDuration), animationStyle(animationStyle), realtimeClustering(realtimeClustering), renderBuffer(renderBuffer), throttleInterval(throttleInterval) {}
   };
 
 } // namespace margelo::nitro::nitromap
@@ -75,39 +76,39 @@ namespace margelo::nitro {
       jsi::Object obj = arg.asObject(runtime);
       return margelo::nitro::nitromap::ClusterConfig(
         JSIConverter<bool>::fromJSI(runtime, obj.getProperty(runtime, "enabled")),
-        JSIConverter<margelo::nitro::nitromap::ClusterStrategy>::fromJSI(runtime, obj.getProperty(runtime, "strategy")),
-        JSIConverter<double>::fromJSI(runtime, obj.getProperty(runtime, "radius")),
-        JSIConverter<double>::fromJSI(runtime, obj.getProperty(runtime, "minimumClusterSize")),
-        JSIConverter<double>::fromJSI(runtime, obj.getProperty(runtime, "maxZoom")),
-        JSIConverter<std::variant<std::string, margelo::nitro::nitromap::MarkerColor>>::fromJSI(runtime, obj.getProperty(runtime, "backgroundColor")),
-        JSIConverter<std::variant<std::string, margelo::nitro::nitromap::MarkerColor>>::fromJSI(runtime, obj.getProperty(runtime, "textColor")),
-        JSIConverter<double>::fromJSI(runtime, obj.getProperty(runtime, "borderWidth")),
-        JSIConverter<std::variant<std::string, margelo::nitro::nitromap::MarkerColor>>::fromJSI(runtime, obj.getProperty(runtime, "borderColor")),
-        JSIConverter<bool>::fromJSI(runtime, obj.getProperty(runtime, "animatesClusters")),
-        JSIConverter<double>::fromJSI(runtime, obj.getProperty(runtime, "animationDuration")),
-        JSIConverter<margelo::nitro::nitromap::ClusterAnimationStyle>::fromJSI(runtime, obj.getProperty(runtime, "animationStyle")),
-        JSIConverter<bool>::fromJSI(runtime, obj.getProperty(runtime, "realtimeClustering")),
-        JSIConverter<double>::fromJSI(runtime, obj.getProperty(runtime, "renderBuffer")),
-        JSIConverter<double>::fromJSI(runtime, obj.getProperty(runtime, "throttleInterval"))
+        JSIConverter<std::optional<margelo::nitro::nitromap::ClusterStrategy>>::fromJSI(runtime, obj.getProperty(runtime, "strategy")),
+        JSIConverter<std::optional<double>>::fromJSI(runtime, obj.getProperty(runtime, "radius")),
+        JSIConverter<std::optional<double>>::fromJSI(runtime, obj.getProperty(runtime, "minimumClusterSize")),
+        JSIConverter<std::optional<double>>::fromJSI(runtime, obj.getProperty(runtime, "maxZoom")),
+        JSIConverter<std::optional<std::variant<std::string, margelo::nitro::nitromap::MarkerColor>>>::fromJSI(runtime, obj.getProperty(runtime, "backgroundColor")),
+        JSIConverter<std::optional<std::variant<std::string, margelo::nitro::nitromap::MarkerColor>>>::fromJSI(runtime, obj.getProperty(runtime, "textColor")),
+        JSIConverter<std::optional<double>>::fromJSI(runtime, obj.getProperty(runtime, "borderWidth")),
+        JSIConverter<std::optional<std::variant<std::string, margelo::nitro::nitromap::MarkerColor>>>::fromJSI(runtime, obj.getProperty(runtime, "borderColor")),
+        JSIConverter<std::optional<bool>>::fromJSI(runtime, obj.getProperty(runtime, "animatesClusters")),
+        JSIConverter<std::optional<double>>::fromJSI(runtime, obj.getProperty(runtime, "animationDuration")),
+        JSIConverter<std::optional<margelo::nitro::nitromap::ClusterAnimationStyle>>::fromJSI(runtime, obj.getProperty(runtime, "animationStyle")),
+        JSIConverter<std::optional<bool>>::fromJSI(runtime, obj.getProperty(runtime, "realtimeClustering")),
+        JSIConverter<std::optional<double>>::fromJSI(runtime, obj.getProperty(runtime, "renderBuffer")),
+        JSIConverter<std::optional<double>>::fromJSI(runtime, obj.getProperty(runtime, "throttleInterval"))
       );
     }
     static inline jsi::Value toJSI(jsi::Runtime& runtime, const margelo::nitro::nitromap::ClusterConfig& arg) {
       jsi::Object obj(runtime);
       obj.setProperty(runtime, "enabled", JSIConverter<bool>::toJSI(runtime, arg.enabled));
-      obj.setProperty(runtime, "strategy", JSIConverter<margelo::nitro::nitromap::ClusterStrategy>::toJSI(runtime, arg.strategy));
-      obj.setProperty(runtime, "radius", JSIConverter<double>::toJSI(runtime, arg.radius));
-      obj.setProperty(runtime, "minimumClusterSize", JSIConverter<double>::toJSI(runtime, arg.minimumClusterSize));
-      obj.setProperty(runtime, "maxZoom", JSIConverter<double>::toJSI(runtime, arg.maxZoom));
-      obj.setProperty(runtime, "backgroundColor", JSIConverter<std::variant<std::string, margelo::nitro::nitromap::MarkerColor>>::toJSI(runtime, arg.backgroundColor));
-      obj.setProperty(runtime, "textColor", JSIConverter<std::variant<std::string, margelo::nitro::nitromap::MarkerColor>>::toJSI(runtime, arg.textColor));
-      obj.setProperty(runtime, "borderWidth", JSIConverter<double>::toJSI(runtime, arg.borderWidth));
-      obj.setProperty(runtime, "borderColor", JSIConverter<std::variant<std::string, margelo::nitro::nitromap::MarkerColor>>::toJSI(runtime, arg.borderColor));
-      obj.setProperty(runtime, "animatesClusters", JSIConverter<bool>::toJSI(runtime, arg.animatesClusters));
-      obj.setProperty(runtime, "animationDuration", JSIConverter<double>::toJSI(runtime, arg.animationDuration));
-      obj.setProperty(runtime, "animationStyle", JSIConverter<margelo::nitro::nitromap::ClusterAnimationStyle>::toJSI(runtime, arg.animationStyle));
-      obj.setProperty(runtime, "realtimeClustering", JSIConverter<bool>::toJSI(runtime, arg.realtimeClustering));
-      obj.setProperty(runtime, "renderBuffer", JSIConverter<double>::toJSI(runtime, arg.renderBuffer));
-      obj.setProperty(runtime, "throttleInterval", JSIConverter<double>::toJSI(runtime, arg.throttleInterval));
+      obj.setProperty(runtime, "strategy", JSIConverter<std::optional<margelo::nitro::nitromap::ClusterStrategy>>::toJSI(runtime, arg.strategy));
+      obj.setProperty(runtime, "radius", JSIConverter<std::optional<double>>::toJSI(runtime, arg.radius));
+      obj.setProperty(runtime, "minimumClusterSize", JSIConverter<std::optional<double>>::toJSI(runtime, arg.minimumClusterSize));
+      obj.setProperty(runtime, "maxZoom", JSIConverter<std::optional<double>>::toJSI(runtime, arg.maxZoom));
+      obj.setProperty(runtime, "backgroundColor", JSIConverter<std::optional<std::variant<std::string, margelo::nitro::nitromap::MarkerColor>>>::toJSI(runtime, arg.backgroundColor));
+      obj.setProperty(runtime, "textColor", JSIConverter<std::optional<std::variant<std::string, margelo::nitro::nitromap::MarkerColor>>>::toJSI(runtime, arg.textColor));
+      obj.setProperty(runtime, "borderWidth", JSIConverter<std::optional<double>>::toJSI(runtime, arg.borderWidth));
+      obj.setProperty(runtime, "borderColor", JSIConverter<std::optional<std::variant<std::string, margelo::nitro::nitromap::MarkerColor>>>::toJSI(runtime, arg.borderColor));
+      obj.setProperty(runtime, "animatesClusters", JSIConverter<std::optional<bool>>::toJSI(runtime, arg.animatesClusters));
+      obj.setProperty(runtime, "animationDuration", JSIConverter<std::optional<double>>::toJSI(runtime, arg.animationDuration));
+      obj.setProperty(runtime, "animationStyle", JSIConverter<std::optional<margelo::nitro::nitromap::ClusterAnimationStyle>>::toJSI(runtime, arg.animationStyle));
+      obj.setProperty(runtime, "realtimeClustering", JSIConverter<std::optional<bool>>::toJSI(runtime, arg.realtimeClustering));
+      obj.setProperty(runtime, "renderBuffer", JSIConverter<std::optional<double>>::toJSI(runtime, arg.renderBuffer));
+      obj.setProperty(runtime, "throttleInterval", JSIConverter<std::optional<double>>::toJSI(runtime, arg.throttleInterval));
       return obj;
     }
     static inline bool canConvert(jsi::Runtime& runtime, const jsi::Value& value) {
@@ -119,20 +120,20 @@ namespace margelo::nitro {
         return false;
       }
       if (!JSIConverter<bool>::canConvert(runtime, obj.getProperty(runtime, "enabled"))) return false;
-      if (!JSIConverter<margelo::nitro::nitromap::ClusterStrategy>::canConvert(runtime, obj.getProperty(runtime, "strategy"))) return false;
-      if (!JSIConverter<double>::canConvert(runtime, obj.getProperty(runtime, "radius"))) return false;
-      if (!JSIConverter<double>::canConvert(runtime, obj.getProperty(runtime, "minimumClusterSize"))) return false;
-      if (!JSIConverter<double>::canConvert(runtime, obj.getProperty(runtime, "maxZoom"))) return false;
-      if (!JSIConverter<std::variant<std::string, margelo::nitro::nitromap::MarkerColor>>::canConvert(runtime, obj.getProperty(runtime, "backgroundColor"))) return false;
-      if (!JSIConverter<std::variant<std::string, margelo::nitro::nitromap::MarkerColor>>::canConvert(runtime, obj.getProperty(runtime, "textColor"))) return false;
-      if (!JSIConverter<double>::canConvert(runtime, obj.getProperty(runtime, "borderWidth"))) return false;
-      if (!JSIConverter<std::variant<std::string, margelo::nitro::nitromap::MarkerColor>>::canConvert(runtime, obj.getProperty(runtime, "borderColor"))) return false;
-      if (!JSIConverter<bool>::canConvert(runtime, obj.getProperty(runtime, "animatesClusters"))) return false;
-      if (!JSIConverter<double>::canConvert(runtime, obj.getProperty(runtime, "animationDuration"))) return false;
-      if (!JSIConverter<margelo::nitro::nitromap::ClusterAnimationStyle>::canConvert(runtime, obj.getProperty(runtime, "animationStyle"))) return false;
-      if (!JSIConverter<bool>::canConvert(runtime, obj.getProperty(runtime, "realtimeClustering"))) return false;
-      if (!JSIConverter<double>::canConvert(runtime, obj.getProperty(runtime, "renderBuffer"))) return false;
-      if (!JSIConverter<double>::canConvert(runtime, obj.getProperty(runtime, "throttleInterval"))) return false;
+      if (!JSIConverter<std::optional<margelo::nitro::nitromap::ClusterStrategy>>::canConvert(runtime, obj.getProperty(runtime, "strategy"))) return false;
+      if (!JSIConverter<std::optional<double>>::canConvert(runtime, obj.getProperty(runtime, "radius"))) return false;
+      if (!JSIConverter<std::optional<double>>::canConvert(runtime, obj.getProperty(runtime, "minimumClusterSize"))) return false;
+      if (!JSIConverter<std::optional<double>>::canConvert(runtime, obj.getProperty(runtime, "maxZoom"))) return false;
+      if (!JSIConverter<std::optional<std::variant<std::string, margelo::nitro::nitromap::MarkerColor>>>::canConvert(runtime, obj.getProperty(runtime, "backgroundColor"))) return false;
+      if (!JSIConverter<std::optional<std::variant<std::string, margelo::nitro::nitromap::MarkerColor>>>::canConvert(runtime, obj.getProperty(runtime, "textColor"))) return false;
+      if (!JSIConverter<std::optional<double>>::canConvert(runtime, obj.getProperty(runtime, "borderWidth"))) return false;
+      if (!JSIConverter<std::optional<std::variant<std::string, margelo::nitro::nitromap::MarkerColor>>>::canConvert(runtime, obj.getProperty(runtime, "borderColor"))) return false;
+      if (!JSIConverter<std::optional<bool>>::canConvert(runtime, obj.getProperty(runtime, "animatesClusters"))) return false;
+      if (!JSIConverter<std::optional<double>>::canConvert(runtime, obj.getProperty(runtime, "animationDuration"))) return false;
+      if (!JSIConverter<std::optional<margelo::nitro::nitromap::ClusterAnimationStyle>>::canConvert(runtime, obj.getProperty(runtime, "animationStyle"))) return false;
+      if (!JSIConverter<std::optional<bool>>::canConvert(runtime, obj.getProperty(runtime, "realtimeClustering"))) return false;
+      if (!JSIConverter<std::optional<double>>::canConvert(runtime, obj.getProperty(runtime, "renderBuffer"))) return false;
+      if (!JSIConverter<std::optional<double>>::canConvert(runtime, obj.getProperty(runtime, "throttleInterval"))) return false;
       return true;
     }
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maydon_tech/react-native-nitro-maps",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "description": "A high-performance React Native map library powered by Nitro Modules with support for Apple Maps, Google Maps, and Yandex Maps. Features native clustering, custom markers, and seamless cross-platform integration.",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",

package/src/components/NitroMap.tsx

@@ -247,6 +247,7 @@ const NitroMapInner = forwardRef<NitroMapRef, NitroMapProps>(
     const combinedStyle = useMemo(() => [styles.default, style], [style]);
 
     // Parse cluster config colors (convert hex strings to MarkerColor objects)
+    // and fill in defaults for optional fields
     const parsedClusterConfig = useMemo(() => {
       if (!clusterConfig) return undefined;
 
@@ -255,12 +256,23 @@ const NitroMapInner = forwardRef<NitroMapRef, NitroMapProps>(
       const defaultBorderColor: MarkerColor = Colors.white;
 
       return {
-        ...clusterConfig,
+        enabled: clusterConfig.enabled,
+        strategy: clusterConfig.strategy ?? 'supercluster',
+        radius: clusterConfig.radius ?? 80,
+        minimumClusterSize: clusterConfig.minimumClusterSize ?? 2,
+        maxZoom: clusterConfig.maxZoom ?? 20,
         backgroundColor:
           parseColor(clusterConfig.backgroundColor) ?? defaultColor,
         textColor: parseColor(clusterConfig.textColor) ?? defaultTextColor,
+        borderWidth: clusterConfig.borderWidth ?? 2,
         borderColor:
           parseColor(clusterConfig.borderColor) ?? defaultBorderColor,
+        animatesClusters: clusterConfig.animatesClusters ?? true,
+        animationDuration: clusterConfig.animationDuration ?? 0.3,
+        animationStyle: clusterConfig.animationStyle ?? 'default',
+        realtimeClustering: clusterConfig.realtimeClustering ?? false,
+        renderBuffer: clusterConfig.renderBuffer ?? 0,
+        throttleInterval: clusterConfig.throttleInterval ?? 150,
       };
     }, [clusterConfig]);
 

package/src/types/marker.ts

@@ -217,51 +217,51 @@ export type ClusterConfig = {
    * - `'hideOnOverlap'` — lower-priority overlapping icons hidden
    * @default 'supercluster'
    */
-  strategy: ClusterStrategy;
+  strategy?: ClusterStrategy;
   /**
    * Clustering radius in pixels.
    * Controls how aggressively markers group together.
    * Higher = fewer, larger clusters. Lower = more, smaller clusters.
    * @default 80
    */
-  radius: number;
-  /** Minimum number of markers to form a cluster */
-  minimumClusterSize: number;
-  /** Maximum zoom level at which clustering occurs */
-  maxZoom: number;
+  radius?: number;
+  /** Minimum number of markers to form a cluster @default 2 */
+  minimumClusterSize?: number;
+  /** Maximum zoom level at which clustering occurs @default 20 */
+  maxZoom?: number;
   /** Background color of cluster circles (hex string or MarkerColor) */
-  backgroundColor: ColorValue;
+  backgroundColor?: ColorValue;
   /** Text color for cluster count numbers (hex string or MarkerColor) */
-  textColor: ColorValue;
-  /** Border thickness in pixels */
-  borderWidth: number;
+  textColor?: ColorValue;
+  /** Border thickness in pixels @default 2 */
+  borderWidth?: number;
   /** Border color of cluster circles (hex string or MarkerColor) */
-  borderColor: ColorValue;
-  /** Enable cluster animations */
-  animatesClusters: boolean;
-  /** Animation duration in seconds (e.g., 0.3) */
-  animationDuration: number;
-  /** Animation style for cluster expand/collapse */
-  animationStyle: ClusterAnimationStyle;
+  borderColor?: ColorValue;
+  /** Enable cluster animations @default true */
+  animatesClusters?: boolean;
+  /** Animation duration in seconds (e.g., 0.3) @default 0.3 */
+  animationDuration?: number;
+  /** Animation style for cluster expand/collapse @default 'default' */
+  animationStyle?: ClusterAnimationStyle;
   /**
    * When true, clusters update live during pan/zoom gestures (throttled).
    * When false, clusters only update after the gesture ends (debounced).
    * Live mode provides smoother UX but uses more CPU.
    * @default false
    */
-  realtimeClustering: boolean;
+  realtimeClustering?: boolean;
   /**
    * Extra buffer around the visible viewport for pre-computing clusters.
    * Expressed as a fraction of the viewport size (0 = no buffer, 0.5 = 50% extra on each side).
    * Prevents markers from "popping in" at edges during pan.
    * @default 0
    */
-  renderBuffer: number;
+  renderBuffer?: number;
   /**
    * Throttle interval in milliseconds for live clustering during gestures.
    * Only used when `realtimeClustering` is true.
    * Higher = better performance, lower = smoother updates.
    * @default 150
    */
-  throttleInterval: number;
+  throttleInterval?: number;
 };