@lugg/maps 0.2.0-alpha.13 → 0.2.0-alpha.15

package/lib/module/MapView.web.js

@@ -1,14 +1,11 @@
 "use strict";
 
-import { Children, forwardRef, isValidElement, useEffect, useId, useImperativeHandle, useMemo, useRef, useState } from 'react';
-import { View } from 'react-native';
+import { forwardRef, useEffect, useId, useImperativeHandle, useRef, useState } from 'react';
+import { View, StyleSheet } from 'react-native';
 import { Map, useMap } from '@vis.gl/react-google-maps';
 import { Marker } from "./components/Marker.web.js";
-import { Polyline } from "./components/Polyline.web.js";
 import { MapIdContext } from "./MapProvider.web.js";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-const MAP_COMPONENT_TYPES = new Set([Marker, Polyline]);
-const isMapComponent = child => MAP_COMPONENT_TYPES.has(child.type);
 const createSyntheticEvent = nativeEvent => ({
   nativeEvent,
   currentTarget: null,
@@ -91,6 +88,8 @@ export const MapView = /*#__PURE__*/forwardRef(function MapView(props, ref) {
   const id = useId();
   const map = useMap(id);
   const readyFired = useRef(false);
+  const isDragging = useRef(false);
+  const wasGesture = useRef(false);
   useImperativeHandle(ref, () => ({
     moveCamera(coordinate, options) {
       if (!map) return;
@@ -151,83 +150,54 @@ export const MapView = /*#__PURE__*/forwardRef(function MapView(props, ref) {
       onReady?.();
     }
   }, [map, onReady]);
-  useEffect(() => {
-    if (!map) return;
-    const createPayload = gesture => {
-      const center = map.getCenter();
-      return {
-        coordinate: {
-          latitude: center?.lat() ?? 0,
-          longitude: center?.lng() ?? 0
-        },
-        zoom: map.getZoom() ?? 0,
-        gesture
-      };
+  const handleDragStart = () => {
+    isDragging.current = true;
+    wasGesture.current = true;
+  };
+  const handleDragEnd = () => {
+    isDragging.current = false;
+  };
+  const handleCameraChanged = event => {
+    const payload = {
+      coordinate: {
+        latitude: event.detail.center.lat,
+        longitude: event.detail.center.lng
+      },
+      zoom: event.detail.zoom,
+      gesture: isDragging.current
     };
-    let isDragging = false;
-    let wasGesture = false;
-    const dragStartListener = map.addListener('dragstart', () => {
-      isDragging = true;
-      wasGesture = true;
-    });
-    const dragEndListener = map.addListener('dragend', () => {
-      isDragging = false;
-    });
-    const centerListener = map.addListener('center_changed', () => {
-      onCameraMove?.(createSyntheticEvent(createPayload(isDragging)));
-    });
-    const idleListener = map.addListener('idle', () => {
-      onCameraIdle?.(createSyntheticEvent(createPayload(wasGesture)));
-      wasGesture = false;
-    });
-    return () => {
-      google.maps.event.removeListener(dragStartListener);
-      google.maps.event.removeListener(dragEndListener);
-      google.maps.event.removeListener(centerListener);
-      google.maps.event.removeListener(idleListener);
+    onCameraMove?.(createSyntheticEvent(payload));
+  };
+  const handleIdle = event => {
+    const center = event.map.getCenter();
+    const payload = {
+      coordinate: {
+        latitude: center?.lat() ?? 0,
+        longitude: center?.lng() ?? 0
+      },
+      zoom: event.map.getZoom() ?? 0,
+      gesture: wasGesture.current
     };
-  }, [map, onCameraMove, onCameraIdle]);
+    onCameraIdle?.(createSyntheticEvent(payload));
+    wasGesture.current = false;
+  };
   const gestureHandling = scrollEnabled === false && zoomEnabled === false ? 'none' : scrollEnabled === false ? 'cooperative' : 'auto';
   const defaultCenter = initialCoordinate ? {
     lat: initialCoordinate.latitude,
     lng: initialCoordinate.longitude
   } : undefined;
-  const {
-    mapChildren,
-    overlayChildren
-  } = useMemo(() => {
-    const mapNodes = [];
-    const overlayNodes = [];
-    Children.forEach(children, child => {
-      if (! /*#__PURE__*/isValidElement(child)) return;
-      if (isMapComponent(child)) {
-        mapNodes.push(child);
-      } else {
-        overlayNodes.push(child);
-      }
-    });
-    return {
-      mapChildren: mapNodes,
-      overlayChildren: overlayNodes
-    };
-  }, [children]);
-  const mapContainerStyle = {
-    position: 'absolute',
-    top: padding?.top ?? 0,
-    left: padding?.left ?? 0,
-    right: padding?.right ?? 0,
-    bottom: padding?.bottom ?? 0
-  };
-  const mapStyle = {
-    width: '100%',
-    height: '100%'
+  const paddingStyle = {
+    paddingTop: padding?.top ?? 0,
+    paddingLeft: padding?.left ?? 0,
+    paddingRight: padding?.right ?? 0,
+    paddingBottom: padding?.bottom ?? 0
   };
   return /*#__PURE__*/_jsx(MapIdContext.Provider, {
     value: id,
-    children: /*#__PURE__*/_jsxs(View, {
+    children: /*#__PURE__*/_jsx(View, {
       style: style,
-      children: [/*#__PURE__*/_jsx(View, {
-        style: mapContainerStyle,
+      children: /*#__PURE__*/_jsx(View, {
+        style: [StyleSheet.absoluteFill, paddingStyle],
         children: /*#__PURE__*/_jsxs(Map, {
           id: id,
           mapId: mapId,
@@ -237,13 +207,17 @@ export const MapView = /*#__PURE__*/forwardRef(function MapView(props, ref) {
           maxZoom: maxZoom,
           gestureHandling: gestureHandling,
           disableDefaultUI: true,
+          isFractionalZoomEnabled: true,
           tilt: pitchEnabled === false ? 0 : undefined,
-          style: mapStyle,
+          onDragstart: handleDragStart,
+          onDragend: handleDragEnd,
+          onCameraChanged: handleCameraChanged,
+          onIdle: handleIdle,
           children: [/*#__PURE__*/_jsx(UserLocationMarker, {
             enabled: userLocationEnabled
-          }), mapChildren]
+          }), children]
         })
-      }), overlayChildren]
+      })
     })
   });
 });

package/lib/module/MapView.web.js.map

@@ -1 +1 @@
-{"version":3,"names":["Children","forwardRef","isValidElement","useEffect","useId","useImperativeHandle","useMemo","useRef","useState","View","Map","useMap","Marker","Polyline","MapIdContext","jsx","_jsx","jsxs","_jsxs","MAP_COMPONENT_TYPES","Set","isMapComponent","child","has","type","createSyntheticEvent","nativeEvent","currentTarget","target","bubbles","cancelable","defaultPrevented","eventPhase","isTrusted","preventDefault","stopPropagation","isDefaultPrevented","isPropagationStopped","persist","timeStamp","Date","now","userLocationDotStyle","width","height","backgroundColor","border","borderRadius","boxShadow","UserLocationMarker","enabled","coordinate","setCoordinate","watchId","updateLocation","position","latitude","coords","longitude","navigator","geolocation","getCurrentPosition","watchPosition","clearWatch","anchor","x","y","children","style","MapView","props","ref","mapId","google","maps","DEMO_MAP_ID","initialCoordinate","initialZoom","minZoom","maxZoom","zoomEnabled","scrollEnabled","pitchEnabled","padding","userLocationEnabled","onCameraMove","onCameraIdle","onReady","id","map","readyFired","moveCamera","options","zoom","duration","center","lat","lng","currentZoom","getZoom","zoomChanged","undefined","setZoom","panTo","fitCoordinates","coordinates","first","fitPadding","length","bounds","LatLngBounds","forEach","coord","extend","fitBounds","top","left","bottom","right","current","createPayload","gesture","getCenter","isDragging","wasGesture","dragStartListener","addListener","dragEndListener","centerListener","idleListener","event","removeListener","gestureHandling","defaultCenter","mapChildren","overlayChildren","mapNodes","overlayNodes","push","mapContainerStyle","mapStyle","Provider","value","defaultZoom","disableDefaultUI","tilt"],"sourceRoot":"../../src","sources":["MapView.web.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["forwardRef","useEffect","useId","useImperativeHandle","useRef","useState","View","StyleSheet","Map","useMap","Marker","MapIdContext","jsx","_jsx","jsxs","_jsxs","createSyntheticEvent","nativeEvent","currentTarget","target","bubbles","cancelable","defaultPrevented","eventPhase","isTrusted","preventDefault","stopPropagation","isDefaultPrevented","isPropagationStopped","persist","timeStamp","Date","now","type","userLocationDotStyle","width","height","backgroundColor","border","borderRadius","boxShadow","UserLocationMarker","enabled","coordinate","setCoordinate","watchId","updateLocation","position","latitude","coords","longitude","navigator","geolocation","getCurrentPosition","watchPosition","clearWatch","anchor","x","y","children","style","MapView","props","ref","mapId","google","maps","DEMO_MAP_ID","initialCoordinate","initialZoom","minZoom","maxZoom","zoomEnabled","scrollEnabled","pitchEnabled","padding","userLocationEnabled","onCameraMove","onCameraIdle","onReady","id","map","readyFired","isDragging","wasGesture","moveCamera","options","zoom","duration","center","lat","lng","currentZoom","getZoom","zoomChanged","undefined","setZoom","panTo","fitCoordinates","coordinates","first","fitPadding","length","bounds","LatLngBounds","forEach","coord","extend","fitBounds","top","left","bottom","right","current","handleDragStart","handleDragEnd","handleCameraChanged","event","payload","detail","gesture","handleIdle","getCenter","gestureHandling","defaultCenter","paddingStyle","paddingTop","paddingLeft","paddingRight","paddingBottom","Provider","value","absoluteFill","defaultZoom","disableDefaultUI","isFractionalZoomEnabled","tilt","onDragstart","onDragend","onCameraChanged","onIdle"],"sourceRoot":"../../src","sources":["MapView.web.tsx"],"mappings":"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","ignoreList":[]}

package/lib/typescript/src/MapView.web.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MapView.web.d.ts","sourceRoot":"","sources":["../../../src/MapView.web.tsx"],"names":[],"mappings":"AAqBA,OAAO,KAAK,EACV,YAAY,EACZ,UAAU,EAIX,MAAM,iBAAiB,CAAC;AAyEzB,eAAO,MAAM,OAAO,qGAiMlB,CAAC"}
+{"version":3,"file":"MapView.web.d.ts","sourceRoot":"","sources":["../../../src/MapView.web.tsx"],"names":[],"mappings":"AAoBA,OAAO,KAAK,EACV,YAAY,EACZ,UAAU,EAIX,MAAM,iBAAiB,CAAC;AAoEzB,eAAO,MAAM,OAAO,qGAuKlB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lugg/maps",
-  "version": "0.2.0-alpha.13",
+  "version": "0.2.0-alpha.15",
   "description": "Universal maps for React Native.",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",

package/src/MapView.web.tsx

@@ -1,22 +1,21 @@
 import {
-  Children,
   forwardRef,
-  isValidElement,
   useEffect,
   useId,
   useImperativeHandle,
-  useMemo,
   useRef,
   useState,
   type CSSProperties,
-  type ReactElement,
-  type ReactNode,
 } from 'react';
 import type { NativeSyntheticEvent, ViewStyle } from 'react-native';
-import { View } from 'react-native';
-import { Map, useMap } from '@vis.gl/react-google-maps';
+import { View, StyleSheet } from 'react-native';
+import {
+  Map,
+  useMap,
+  type MapCameraChangedEvent,
+  type MapEvent,
+} from '@vis.gl/react-google-maps';
 import { Marker } from './components/Marker.web';
-import { Polyline } from './components/Polyline.web';
 import { MapIdContext } from './MapProvider.web';
 
 import type {
@@ -28,11 +27,6 @@ import type {
 } from './MapView.types';
 import type { Coordinate } from './types';
 
-const MAP_COMPONENT_TYPES = new Set([Marker, Polyline]);
-
-const isMapComponent = (child: ReactElement): boolean =>
-  MAP_COMPONENT_TYPES.has(child.type as typeof Marker | typeof Polyline);
-
 const createSyntheticEvent = <T,>(nativeEvent: T): NativeSyntheticEvent<T> =>
   ({
     nativeEvent,
@@ -123,6 +117,8 @@ export const MapView = forwardRef<MapViewRef, MapViewProps>(function MapView(
   const id = useId();
   const map = useMap(id);
   const readyFired = useRef(false);
+  const isDragging = useRef(false);
+  const wasGesture = useRef(false);
 
   useImperativeHandle(
     ref,
@@ -183,49 +179,40 @@ export const MapView = forwardRef<MapViewRef, MapViewProps>(function MapView(
     }
   }, [map, onReady]);
 
-  useEffect(() => {
-    if (!map) return;
-
-    const createPayload = (gesture: boolean): CameraEventPayload => {
-      const center = map.getCenter();
-      return {
-        coordinate: {
-          latitude: center?.lat() ?? 0,
-          longitude: center?.lng() ?? 0,
-        },
-        zoom: map.getZoom() ?? 0,
-        gesture,
-      };
-    };
-
-    let isDragging = false;
-    let wasGesture = false;
-
-    const dragStartListener = map.addListener('dragstart', () => {
-      isDragging = true;
-      wasGesture = true;
-    });
-
-    const dragEndListener = map.addListener('dragend', () => {
-      isDragging = false;
-    });
+  const handleDragStart = () => {
+    isDragging.current = true;
+    wasGesture.current = true;
+  };
 
-    const centerListener = map.addListener('center_changed', () => {
-      onCameraMove?.(createSyntheticEvent(createPayload(isDragging)));
-    });
+  const handleDragEnd = () => {
+    isDragging.current = false;
+  };
 
-    const idleListener = map.addListener('idle', () => {
-      onCameraIdle?.(createSyntheticEvent(createPayload(wasGesture)));
-      wasGesture = false;
-    });
+  const handleCameraChanged = (event: MapCameraChangedEvent) => {
+    const payload: CameraEventPayload = {
+      coordinate: {
+        latitude: event.detail.center.lat,
+        longitude: event.detail.center.lng,
+      },
+      zoom: event.detail.zoom,
+      gesture: isDragging.current,
+    };
+    onCameraMove?.(createSyntheticEvent(payload));
+  };
 
-    return () => {
-      google.maps.event.removeListener(dragStartListener);
-      google.maps.event.removeListener(dragEndListener);
-      google.maps.event.removeListener(centerListener);
-      google.maps.event.removeListener(idleListener);
+  const handleIdle = (event: MapEvent) => {
+    const center = event.map.getCenter();
+    const payload: CameraEventPayload = {
+      coordinate: {
+        latitude: center?.lat() ?? 0,
+        longitude: center?.lng() ?? 0,
+      },
+      zoom: event.map.getZoom() ?? 0,
+      gesture: wasGesture.current,
     };
-  }, [map, onCameraMove, onCameraIdle]);
+    onCameraIdle?.(createSyntheticEvent(payload));
+    wasGesture.current = false;
+  };
 
   const gestureHandling =
     scrollEnabled === false && zoomEnabled === false
@@ -238,39 +225,17 @@ export const MapView = forwardRef<MapViewRef, MapViewProps>(function MapView(
     ? { lat: initialCoordinate.latitude, lng: initialCoordinate.longitude }
     : undefined;
 
-  const { mapChildren, overlayChildren } = useMemo(() => {
-    const mapNodes: ReactNode[] = [];
-    const overlayNodes: ReactNode[] = [];
-
-    Children.forEach(children, (child) => {
-      if (!isValidElement(child)) return;
-      if (isMapComponent(child)) {
-        mapNodes.push(child);
-      } else {
-        overlayNodes.push(child);
-      }
-    });
-
-    return { mapChildren: mapNodes, overlayChildren: overlayNodes };
-  }, [children]);
-
-  const mapContainerStyle: ViewStyle = {
-    position: 'absolute',
-    top: padding?.top ?? 0,
-    left: padding?.left ?? 0,
-    right: padding?.right ?? 0,
-    bottom: padding?.bottom ?? 0,
-  };
-
-  const mapStyle: CSSProperties = {
-    width: '100%',
-    height: '100%',
+  const paddingStyle: ViewStyle = {
+    paddingTop: padding?.top ?? 0,
+    paddingLeft: padding?.left ?? 0,
+    paddingRight: padding?.right ?? 0,
+    paddingBottom: padding?.bottom ?? 0,
   };
 
   return (
     <MapIdContext.Provider value={id}>
       <View style={style}>
-        <View style={mapContainerStyle}>
+        <View style={[StyleSheet.absoluteFill, paddingStyle]}>
           <Map
             id={id}
             mapId={mapId}
@@ -280,14 +245,17 @@ export const MapView = forwardRef<MapViewRef, MapViewProps>(function MapView(
             maxZoom={maxZoom}
             gestureHandling={gestureHandling}
             disableDefaultUI
+            isFractionalZoomEnabled
             tilt={pitchEnabled === false ? 0 : undefined}
-            style={mapStyle}
+            onDragstart={handleDragStart}
+            onDragend={handleDragEnd}
+            onCameraChanged={handleCameraChanged}
+            onIdle={handleIdle}
           >
             <UserLocationMarker enabled={userLocationEnabled} />
-            {mapChildren}
+            {children}
           </Map>
         </View>
-        {overlayChildren}
       </View>
     </MapIdContext.Provider>
   );