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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,14 +1,11 @@
1
1
  "use strict";
2
2
 
3
- import { Children, forwardRef, isValidElement, useEffect, useId, useImperativeHandle, useMemo, useRef, useState } from 'react';
3
+ import { forwardRef, useEffect, useId, useImperativeHandle, useRef, useState } from 'react';
4
4
  import { View } from 'react-native';
5
5
  import { Map, useMap } from '@vis.gl/react-google-maps';
6
6
  import { Marker } from "./components/Marker.web.js";
7
- import { Polyline } from "./components/Polyline.web.js";
8
7
  import { MapIdContext } from "./MapProvider.web.js";
9
8
  import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
10
- const MAP_COMPONENT_TYPES = new Set([Marker, Polyline]);
11
- const isMapComponent = child => MAP_COMPONENT_TYPES.has(child.type);
12
9
  const createSyntheticEvent = nativeEvent => ({
13
10
  nativeEvent,
14
11
  currentTarget: null,
@@ -192,58 +189,31 @@ export const MapView = /*#__PURE__*/forwardRef(function MapView(props, ref) {
192
189
  lat: initialCoordinate.latitude,
193
190
  lng: initialCoordinate.longitude
194
191
  } : undefined;
195
- const {
196
- mapChildren,
197
- overlayChildren
198
- } = useMemo(() => {
199
- const mapNodes = [];
200
- const overlayNodes = [];
201
- Children.forEach(children, child => {
202
- if (! /*#__PURE__*/isValidElement(child)) return;
203
- if (isMapComponent(child)) {
204
- mapNodes.push(child);
205
- } else {
206
- overlayNodes.push(child);
207
- }
208
- });
209
- return {
210
- mapChildren: mapNodes,
211
- overlayChildren: overlayNodes
212
- };
213
- }, [children]);
214
- const mapContainerStyle = {
215
- position: 'absolute',
216
- top: padding?.top ?? 0,
217
- left: padding?.left ?? 0,
218
- right: padding?.right ?? 0,
219
- bottom: padding?.bottom ?? 0
220
- };
221
192
  const mapStyle = {
222
- width: '100%',
223
- height: '100%'
193
+ paddingTop: padding?.top ?? 0,
194
+ paddingLeft: padding?.left ?? 0,
195
+ paddingRight: padding?.right ?? 0,
196
+ paddingBottom: padding?.bottom ?? 0
224
197
  };
225
198
  return /*#__PURE__*/_jsx(MapIdContext.Provider, {
226
199
  value: id,
227
- children: /*#__PURE__*/_jsxs(View, {
200
+ children: /*#__PURE__*/_jsx(View, {
228
201
  style: style,
229
- children: [/*#__PURE__*/_jsx(View, {
230
- style: mapContainerStyle,
231
- children: /*#__PURE__*/_jsxs(Map, {
232
- id: id,
233
- mapId: mapId,
234
- defaultCenter: defaultCenter,
235
- defaultZoom: initialZoom,
236
- minZoom: minZoom,
237
- maxZoom: maxZoom,
238
- gestureHandling: gestureHandling,
239
- disableDefaultUI: true,
240
- tilt: pitchEnabled === false ? 0 : undefined,
241
- style: mapStyle,
242
- children: [/*#__PURE__*/_jsx(UserLocationMarker, {
243
- enabled: userLocationEnabled
244
- }), mapChildren]
245
- })
246
- }), overlayChildren]
202
+ children: /*#__PURE__*/_jsxs(Map, {
203
+ id: id,
204
+ mapId: mapId,
205
+ defaultCenter: defaultCenter,
206
+ defaultZoom: initialZoom,
207
+ minZoom: minZoom,
208
+ maxZoom: maxZoom,
209
+ gestureHandling: gestureHandling,
210
+ disableDefaultUI: true,
211
+ tilt: pitchEnabled === false ? 0 : undefined,
212
+ style: mapStyle,
213
+ children: [/*#__PURE__*/_jsx(UserLocationMarker, {
214
+ enabled: userLocationEnabled
215
+ }), children]
216
+ })
247
217
  })
248
218
  });
249
219
  });
@@ -1 +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":[]}
1
+ {"version":3,"names":["forwardRef","useEffect","useId","useImperativeHandle","useRef","useState","View","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","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","mapStyle","paddingTop","paddingLeft","paddingRight","paddingBottom","Provider","value","defaultZoom","disableDefaultUI","tilt"],"sourceRoot":"../../src","sources":["MapView.web.tsx"],"mappings":"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","ignoreList":[]}
@@ -1 +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"}
1
+ {"version":3,"file":"MapView.web.d.ts","sourceRoot":"","sources":["../../../src/MapView.web.tsx"],"names":[],"mappings":"AAeA,OAAO,KAAK,EACV,YAAY,EACZ,UAAU,EAIX,MAAM,iBAAiB,CAAC;AAoEzB,eAAO,MAAM,OAAO,qGAwKlB,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@lugg/maps",
3
- "version": "0.2.0-alpha.13",
3
+ "version": "0.2.0-alpha.14",
4
4
  "description": "Universal maps for React Native.",
5
5
  "main": "./lib/module/index.js",
6
6
  "types": "./lib/typescript/src/index.d.ts",
@@ -1,22 +1,16 @@
1
1
  import {
2
- Children,
3
2
  forwardRef,
4
- isValidElement,
5
3
  useEffect,
6
4
  useId,
7
5
  useImperativeHandle,
8
- useMemo,
9
6
  useRef,
10
7
  useState,
11
8
  type CSSProperties,
12
- type ReactElement,
13
- type ReactNode,
14
9
  } from 'react';
15
- import type { NativeSyntheticEvent, ViewStyle } from 'react-native';
10
+ import type { NativeSyntheticEvent } from 'react-native';
16
11
  import { View } from 'react-native';
17
12
  import { Map, useMap } from '@vis.gl/react-google-maps';
18
13
  import { Marker } from './components/Marker.web';
19
- import { Polyline } from './components/Polyline.web';
20
14
  import { MapIdContext } from './MapProvider.web';
21
15
 
22
16
  import type {
@@ -28,11 +22,6 @@ import type {
28
22
  } from './MapView.types';
29
23
  import type { Coordinate } from './types';
30
24
 
31
- const MAP_COMPONENT_TYPES = new Set([Marker, Polyline]);
32
-
33
- const isMapComponent = (child: ReactElement): boolean =>
34
- MAP_COMPONENT_TYPES.has(child.type as typeof Marker | typeof Polyline);
35
-
36
25
  const createSyntheticEvent = <T,>(nativeEvent: T): NativeSyntheticEvent<T> =>
37
26
  ({
38
27
  nativeEvent,
@@ -238,56 +227,31 @@ export const MapView = forwardRef<MapViewRef, MapViewProps>(function MapView(
238
227
  ? { lat: initialCoordinate.latitude, lng: initialCoordinate.longitude }
239
228
  : undefined;
240
229
 
241
- const { mapChildren, overlayChildren } = useMemo(() => {
242
- const mapNodes: ReactNode[] = [];
243
- const overlayNodes: ReactNode[] = [];
244
-
245
- Children.forEach(children, (child) => {
246
- if (!isValidElement(child)) return;
247
- if (isMapComponent(child)) {
248
- mapNodes.push(child);
249
- } else {
250
- overlayNodes.push(child);
251
- }
252
- });
253
-
254
- return { mapChildren: mapNodes, overlayChildren: overlayNodes };
255
- }, [children]);
256
-
257
- const mapContainerStyle: ViewStyle = {
258
- position: 'absolute',
259
- top: padding?.top ?? 0,
260
- left: padding?.left ?? 0,
261
- right: padding?.right ?? 0,
262
- bottom: padding?.bottom ?? 0,
263
- };
264
-
265
230
  const mapStyle: CSSProperties = {
266
- width: '100%',
267
- height: '100%',
231
+ paddingTop: padding?.top ?? 0,
232
+ paddingLeft: padding?.left ?? 0,
233
+ paddingRight: padding?.right ?? 0,
234
+ paddingBottom: padding?.bottom ?? 0,
268
235
  };
269
236
 
270
237
  return (
271
238
  <MapIdContext.Provider value={id}>
272
239
  <View style={style}>
273
- <View style={mapContainerStyle}>
274
- <Map
275
- id={id}
276
- mapId={mapId}
277
- defaultCenter={defaultCenter}
278
- defaultZoom={initialZoom}
279
- minZoom={minZoom}
280
- maxZoom={maxZoom}
281
- gestureHandling={gestureHandling}
282
- disableDefaultUI
283
- tilt={pitchEnabled === false ? 0 : undefined}
284
- style={mapStyle}
285
- >
286
- <UserLocationMarker enabled={userLocationEnabled} />
287
- {mapChildren}
288
- </Map>
289
- </View>
290
- {overlayChildren}
240
+ <Map
241
+ id={id}
242
+ mapId={mapId}
243
+ defaultCenter={defaultCenter}
244
+ defaultZoom={initialZoom}
245
+ minZoom={minZoom}
246
+ maxZoom={maxZoom}
247
+ gestureHandling={gestureHandling}
248
+ disableDefaultUI
249
+ tilt={pitchEnabled === false ? 0 : undefined}
250
+ style={mapStyle}
251
+ >
252
+ <UserLocationMarker enabled={userLocationEnabled} />
253
+ {children}
254
+ </Map>
291
255
  </View>
292
256
  </MapIdContext.Provider>
293
257
  );