@lugg/maps 0.2.0-alpha.7 → 0.2.0-alpha.9

package/lib/module/MapView.web.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import React from 'react';
+import { Children, Component, isValidElement, useEffect, useRef, useState } from 'react';
 import { View } from 'react-native';
 import { Map, useMap } from '@vis.gl/react-google-maps';
 import { Marker } from "./components/Marker.web.js";
@@ -26,6 +26,50 @@ const createSyntheticEvent = nativeEvent => ({
   timeStamp: Date.now(),
   type: ''
 });
+const userLocationDotStyle = {
+  width: 16,
+  height: 16,
+  backgroundColor: '#4285F4',
+  border: '2px solid white',
+  borderRadius: '50%',
+  boxShadow: '0 1px 4px rgba(0,0,0,0.3)'
+};
+function UserLocationMarker({
+  enabled
+}) {
+  const [coordinate, setCoordinate] = useState(null);
+  useEffect(() => {
+    if (!enabled) {
+      setCoordinate(null);
+      return;
+    }
+    let watchId = null;
+    const updateLocation = position => {
+      setCoordinate({
+        latitude: position.coords.latitude,
+        longitude: position.coords.longitude
+      });
+    };
+    navigator.geolocation.getCurrentPosition(updateLocation, () => {});
+    watchId = navigator.geolocation.watchPosition(updateLocation, () => {});
+    return () => {
+      if (watchId !== null) {
+        navigator.geolocation.clearWatch(watchId);
+      }
+    };
+  }, [enabled]);
+  if (!coordinate) return null;
+  return /*#__PURE__*/_jsx(Marker, {
+    coordinate: coordinate,
+    anchor: {
+      x: 0.5,
+      y: 0.5
+    },
+    children: /*#__PURE__*/_jsx("div", {
+      style: userLocationDotStyle
+    })
+  });
+}
 function MapController({
   onMapReady,
   onCameraMove,
@@ -33,8 +77,8 @@ function MapController({
   onReady
 }) {
   const map = useMap();
-  const readyFired = React.useRef(false);
-  React.useEffect(() => {
+  const readyFired = useRef(false);
+  useEffect(() => {
     if (!map) return;
     onMapReady(map);
     if (!readyFired.current) {
@@ -42,7 +86,7 @@ function MapController({
       onReady?.();
     }
   }, [map, onMapReady, onReady]);
-  React.useEffect(() => {
+  useEffect(() => {
     if (!map) return;
     const createPayload = gesture => {
       const center = map.getCenter();
@@ -77,9 +121,10 @@ function MapController({
   }, [map, onCameraMove, onCameraIdle]);
   return null;
 }
-export class MapView extends React.Component {
+export class MapView extends Component {
   static defaultProps = {
     provider: 'google',
+    mapId: 'DEMO_MAP_ID',
     initialZoom: 10,
     zoomEnabled: true,
     scrollEnabled: true,
@@ -101,11 +146,11 @@ export class MapView extends React.Component {
       lat: coordinate.latitude,
       lng: coordinate.longitude
     };
-    if (duration > 0) {
-      map.panTo(center);
+    if (duration === 0) {
+      map.setCenter(center);
       map.setZoom(zoom);
     } else {
-      map.setCenter(center);
+      map.panTo(center);
       map.setZoom(zoom);
     }
   }
@@ -150,6 +195,7 @@ export class MapView extends React.Component {
       scrollEnabled,
       pitchEnabled,
       padding,
+      userLocationEnabled,
       onCameraMove,
       onCameraIdle,
       onReady,
@@ -165,8 +211,8 @@ export class MapView extends React.Component {
     // Separate map children (Marker, Polyline) from overlay children (regular Views)
     const mapChildren = [];
     const overlayChildren = [];
-    React.Children.forEach(children, child => {
-      if (! /*#__PURE__*/React.isValidElement(child)) return;
+    Children.forEach(children, child => {
+      if (! /*#__PURE__*/isValidElement(child)) return;
       if (isMapComponent(child)) {
         mapChildren.push(child);
       } else {
@@ -203,6 +249,8 @@ export class MapView extends React.Component {
             onCameraMove: onCameraMove,
             onCameraIdle: onCameraIdle,
             onReady: onReady
+          }), /*#__PURE__*/_jsx(UserLocationMarker, {
+            enabled: userLocationEnabled
           }), mapChildren]
         })
       }), overlayChildren]

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

@@ -1 +1 @@
-{"version":3,"names":["React","View","Map","useMap","Marker","Polyline","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","MapController","onMapReady","onCameraMove","onCameraIdle","onReady","map","readyFired","useRef","useEffect","current","createPayload","gesture","center","getCenter","coordinate","latitude","lat","longitude","lng","zoom","getZoom","isDragging","dragStartListener","addListener","dragEndListener","centerListener","idleListener","google","maps","event","removeListener","MapView","Component","defaultProps","provider","initialZoom","zoomEnabled","scrollEnabled","rotateEnabled","pitchEnabled","mapInstance","handleMapReady","moveCamera","options","duration","panTo","setZoom","setCenter","fitCoordinates","coordinates","first","padding","length","props","bounds","LatLngBounds","forEach","coord","extend","fitBounds","top","left","bottom","right","render","mapId","initialCoordinate","minZoom","maxZoom","children","style","gestureHandling","defaultCenter","undefined","mapChildren","overlayChildren","Children","isValidElement","push","mapContainerStyle","position","mapStyle","width","height","defaultZoom","disableDefaultUI","tilt"],"sourceRoot":"../../src","sources":["MapView.web.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["Children","Component","isValidElement","useEffect","useRef","useState","View","Map","useMap","Marker","Polyline","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","MapController","onMapReady","onCameraMove","onCameraIdle","onReady","map","readyFired","current","createPayload","gesture","center","getCenter","lat","lng","zoom","getZoom","isDragging","dragStartListener","addListener","dragEndListener","centerListener","idleListener","google","maps","event","removeListener","MapView","defaultProps","provider","mapId","initialZoom","zoomEnabled","scrollEnabled","rotateEnabled","pitchEnabled","mapInstance","handleMapReady","moveCamera","options","duration","setCenter","setZoom","panTo","fitCoordinates","coordinates","first","padding","length","props","bounds","LatLngBounds","forEach","coord","extend","fitBounds","top","left","bottom","right","render","initialCoordinate","minZoom","maxZoom","userLocationEnabled","gestureHandling","defaultCenter","undefined","mapChildren","overlayChildren","push","mapContainerStyle","mapStyle","defaultZoom","disableDefaultUI","tilt"],"sourceRoot":"../../src","sources":["MapView.web.tsx"],"mappings":"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","ignoreList":[]}

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

@@ -1,7 +1,7 @@
-import React from 'react';
+import { Component } from 'react';
 import type { MapViewProps, MapViewRef, MoveCameraOptions, FitCoordinatesOptions } from './MapView.types';
 import type { Coordinate } from './types';
-export declare class MapView extends React.Component<MapViewProps> implements MapViewRef {
+export declare class MapView extends Component<MapViewProps> implements MapViewRef {
     static defaultProps: Partial<MapViewProps>;
     private mapInstance;
     private handleMapReady;

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":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAO1B,OAAO,KAAK,EACV,YAAY,EACZ,UAAU,EACV,iBAAiB,EACjB,qBAAqB,EAEtB,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAiG1C,qBAAa,OACX,SAAQ,KAAK,CAAC,SAAS,CAAC,YAAY,CACpC,YAAW,UAAU;IAErB,MAAM,CAAC,YAAY,EAAE,OAAO,CAAC,YAAY,CAAC,CAOxC;IAEF,OAAO,CAAC,WAAW,CAAgC;IAEnD,OAAO,CAAC,cAAc,CAEpB;IAEF,UAAU,CAAC,UAAU,EAAE,UAAU,EAAE,OAAO,EAAE,iBAAiB;IAgB7D,cAAc,CAAC,WAAW,EAAE,UAAU,EAAE,EAAE,OAAO,CAAC,EAAE,qBAAqB;IA0BzE,MAAM;CAkFP"}
+{"version":3,"file":"MapView.web.d.ts","sourceRoot":"","sources":["../../../src/MapView.web.tsx"],"names":[],"mappings":"AAAA,OAAO,EAEL,SAAS,EAQV,MAAM,OAAO,CAAC;AAOf,OAAO,KAAK,EACV,YAAY,EACZ,UAAU,EACV,iBAAiB,EACjB,qBAAqB,EAEtB,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAmJ1C,qBAAa,OAAQ,SAAQ,SAAS,CAAC,YAAY,CAAE,YAAW,UAAU;IACxE,MAAM,CAAC,YAAY,EAAE,OAAO,CAAC,YAAY,CAAC,CAQxC;IAEF,OAAO,CAAC,WAAW,CAAgC;IAEnD,OAAO,CAAC,cAAc,CAEpB;IAEF,UAAU,CAAC,UAAU,EAAE,UAAU,EAAE,OAAO,EAAE,iBAAiB;IAgB7D,cAAc,CAAC,WAAW,EAAE,UAAU,EAAE,EAAE,OAAO,CAAC,EAAE,qBAAqB;IA0BzE,MAAM;CAoFP"}

package/package.json

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

package/src/MapView.web.tsx

@@ -1,4 +1,14 @@
-import React from 'react';
+import {
+  Children,
+  Component,
+  isValidElement,
+  useEffect,
+  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';
@@ -17,7 +27,7 @@ import type { Coordinate } from './types';
 // Map-specific component types that render inside the Google Map
 const MAP_COMPONENT_TYPES = new Set([Marker, Polyline]);
 
-const isMapComponent = (child: React.ReactElement): boolean =>
+const isMapComponent = (child: ReactElement): boolean =>
   MAP_COMPONENT_TYPES.has(child.type as typeof Marker | typeof Polyline);
 
 const createSyntheticEvent = <T,>(nativeEvent: T): NativeSyntheticEvent<T> =>
@@ -46,6 +56,56 @@ interface MapControllerProps {
   onReady?: () => void;
 }
 
+interface UserLocationMarkerProps {
+  enabled?: boolean;
+}
+
+const userLocationDotStyle: CSSProperties = {
+  width: 16,
+  height: 16,
+  backgroundColor: '#4285F4',
+  border: '2px solid white',
+  borderRadius: '50%',
+  boxShadow: '0 1px 4px rgba(0,0,0,0.3)',
+};
+
+function UserLocationMarker({ enabled }: UserLocationMarkerProps) {
+  const [coordinate, setCoordinate] = useState<Coordinate | null>(null);
+
+  useEffect(() => {
+    if (!enabled) {
+      setCoordinate(null);
+      return;
+    }
+
+    let watchId: number | null = null;
+
+    const updateLocation = (position: GeolocationPosition) => {
+      setCoordinate({
+        latitude: position.coords.latitude,
+        longitude: position.coords.longitude,
+      });
+    };
+
+    navigator.geolocation.getCurrentPosition(updateLocation, () => {});
+    watchId = navigator.geolocation.watchPosition(updateLocation, () => {});
+
+    return () => {
+      if (watchId !== null) {
+        navigator.geolocation.clearWatch(watchId);
+      }
+    };
+  }, [enabled]);
+
+  if (!coordinate) return null;
+
+  return (
+    <Marker coordinate={coordinate} anchor={{ x: 0.5, y: 0.5 }}>
+      <div style={userLocationDotStyle} />
+    </Marker>
+  );
+}
+
 function MapController({
   onMapReady,
   onCameraMove,
@@ -53,9 +113,9 @@ function MapController({
   onReady,
 }: MapControllerProps) {
   const map = useMap();
-  const readyFired = React.useRef(false);
+  const readyFired = useRef(false);
 
-  React.useEffect(() => {
+  useEffect(() => {
     if (!map) return;
     onMapReady(map);
 
@@ -65,7 +125,7 @@ function MapController({
     }
   }, [map, onMapReady, onReady]);
 
-  React.useEffect(() => {
+  useEffect(() => {
     if (!map) return;
 
     const createPayload = (gesture: boolean): CameraEventPayload => {
@@ -109,12 +169,10 @@ function MapController({
   return null;
 }
 
-export class MapView
-  extends React.Component<MapViewProps>
-  implements MapViewRef
-{
+export class MapView extends Component<MapViewProps> implements MapViewRef {
   static defaultProps: Partial<MapViewProps> = {
     provider: 'google',
+    mapId: 'DEMO_MAP_ID',
     initialZoom: 10,
     zoomEnabled: true,
     scrollEnabled: true,
@@ -135,11 +193,11 @@ export class MapView
     const { zoom, duration = -1 } = options;
     const center = { lat: coordinate.latitude, lng: coordinate.longitude };
 
-    if (duration > 0) {
-      map.panTo(center);
+    if (duration === 0) {
+      map.setCenter(center);
       map.setZoom(zoom);
     } else {
-      map.setCenter(center);
+      map.panTo(center);
       map.setZoom(zoom);
     }
   }
@@ -181,6 +239,7 @@ export class MapView
       scrollEnabled,
       pitchEnabled,
       padding,
+      userLocationEnabled,
       onCameraMove,
       onCameraIdle,
       onReady,
@@ -200,11 +259,11 @@ export class MapView
       : undefined;
 
     // Separate map children (Marker, Polyline) from overlay children (regular Views)
-    const mapChildren: React.ReactNode[] = [];
-    const overlayChildren: React.ReactNode[] = [];
+    const mapChildren: ReactNode[] = [];
+    const overlayChildren: ReactNode[] = [];
 
-    React.Children.forEach(children, (child) => {
-      if (!React.isValidElement(child)) return;
+    Children.forEach(children, (child) => {
+      if (!isValidElement(child)) return;
       if (isMapComponent(child)) {
         mapChildren.push(child);
       } else {
@@ -220,7 +279,7 @@ export class MapView
       bottom: padding?.bottom ?? 0,
     };
 
-    const mapStyle: React.CSSProperties = {
+    const mapStyle: CSSProperties = {
       width: '100%',
       height: '100%',
     };
@@ -245,6 +304,7 @@ export class MapView
               onCameraIdle={onCameraIdle}
               onReady={onReady}
             />
+            <UserLocationMarker enabled={userLocationEnabled} />
             {mapChildren}
           </Map>
         </View>