@lugg/maps 1.1.3 → 1.1.5
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.
- package/android/src/main/java/com/luggmaps/core/GoogleMapProvider.kt +59 -25
- package/ios/LuggMapView.mm +15 -6
- package/ios/core/AppleMapProvider.mm +5 -0
- package/lib/module/MapView.web.js +6 -1
- package/lib/module/MapView.web.js.map +1 -1
- package/lib/typescript/src/MapView.web.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/MapView.web.tsx +5 -1
|
@@ -4,6 +4,7 @@ import android.annotation.SuppressLint
|
|
|
4
4
|
import android.content.ComponentCallbacks2
|
|
5
5
|
import android.content.Context
|
|
6
6
|
import android.content.res.Configuration
|
|
7
|
+
import android.os.SystemClock
|
|
7
8
|
import android.view.View
|
|
8
9
|
import android.view.ViewTreeObserver
|
|
9
10
|
import android.widget.ImageView
|
|
@@ -11,6 +12,7 @@ import androidx.core.graphics.createBitmap
|
|
|
11
12
|
import androidx.core.view.ViewCompat
|
|
12
13
|
import androidx.core.view.WindowInsetsCompat
|
|
13
14
|
import com.facebook.react.uimanager.PixelUtil.dpToPx
|
|
15
|
+
import com.google.android.gms.maps.CameraUpdate
|
|
14
16
|
import com.google.android.gms.maps.CameraUpdateFactory
|
|
15
17
|
import com.google.android.gms.maps.GoogleMap
|
|
16
18
|
import com.google.android.gms.maps.GoogleMapOptions
|
|
@@ -133,6 +135,9 @@ class GoogleMapProvider(private val context: Context) :
|
|
|
133
135
|
// Edge Insets
|
|
134
136
|
private var edgeInsets: EdgeInsets = EdgeInsets()
|
|
135
137
|
|
|
138
|
+
// The moveCamera or fitCoordinates animation in flight, if any
|
|
139
|
+
private var cameraAnimation: CameraAnimation? = null
|
|
140
|
+
|
|
136
141
|
// Inset adjustment
|
|
137
142
|
private var insetAdjustment: String = "never"
|
|
138
143
|
private var systemInsets: EdgeInsets = EdgeInsets()
|
|
@@ -212,6 +217,7 @@ class GoogleMapProvider(private val context: Context) :
|
|
|
212
217
|
groundOverlayToViewMap.clear()
|
|
213
218
|
markerToViewMap.clear()
|
|
214
219
|
wrapperView?.touchEventHandler = null
|
|
220
|
+
cameraAnimation = null
|
|
215
221
|
// The wrapper outlives the provider on reload; don't leave the dead map
|
|
216
222
|
// view in it
|
|
217
223
|
mapView?.let { wrapperView?.removeView(it) }
|
|
@@ -603,7 +609,18 @@ class GoogleMapProvider(private val context: Context) :
|
|
|
603
609
|
val oldInsets = this.edgeInsets
|
|
604
610
|
this.edgeInsets = edgeInsets
|
|
605
611
|
|
|
606
|
-
|
|
612
|
+
val animation = cameraAnimation
|
|
613
|
+
if (map != null && oldInsets != edgeInsets && animation != null) {
|
|
614
|
+
// Any camera update cancels the animation in flight, and its target was resolved against
|
|
615
|
+
// the old insets. Re-apply it for the time it has left so it lands on the new insets.
|
|
616
|
+
applyEdgeInsets(duration)
|
|
617
|
+
val remaining = if (animation.duration > 0) {
|
|
618
|
+
(animation.endTime - SystemClock.uptimeMillis()).toInt().coerceAtLeast(0)
|
|
619
|
+
} else {
|
|
620
|
+
animation.duration
|
|
621
|
+
}
|
|
622
|
+
applyCameraUpdate(animation.update, remaining, animation.padding)
|
|
623
|
+
} else if (map != null && oldInsets != edgeInsets) {
|
|
607
624
|
val cameraUpdate = CameraUpdateFactory.newCameraPosition(map.cameraPosition)
|
|
608
625
|
applyEdgeInsets(duration)
|
|
609
626
|
when {
|
|
@@ -1262,12 +1279,7 @@ class GoogleMapProvider(private val context: Context) :
|
|
|
1262
1279
|
.target(position)
|
|
1263
1280
|
.zoom(targetZoom)
|
|
1264
1281
|
.build()
|
|
1265
|
-
|
|
1266
|
-
when {
|
|
1267
|
-
duration < 0 -> map.animateCamera(cameraUpdate)
|
|
1268
|
-
duration > 0 -> map.animateCamera(cameraUpdate, duration, null)
|
|
1269
|
-
else -> map.moveCamera(cameraUpdate)
|
|
1270
|
-
}
|
|
1282
|
+
applyCameraUpdate(CameraUpdateFactory.newCameraPosition(cameraPosition), duration)
|
|
1271
1283
|
}
|
|
1272
1284
|
|
|
1273
1285
|
override fun fitCoordinates(
|
|
@@ -1278,8 +1290,7 @@ class GoogleMapProvider(private val context: Context) :
|
|
|
1278
1290
|
edgeInsetsRight: Int,
|
|
1279
1291
|
duration: Int
|
|
1280
1292
|
) {
|
|
1281
|
-
|
|
1282
|
-
if (coordinates.isEmpty()) return
|
|
1293
|
+
if (googleMap == null || coordinates.isEmpty()) return
|
|
1283
1294
|
|
|
1284
1295
|
val latLongs = coordinates.filterIsInstance<LatLng>()
|
|
1285
1296
|
if (latLongs.isEmpty()) return
|
|
@@ -1298,23 +1309,11 @@ class GoogleMapProvider(private val context: Context) :
|
|
|
1298
1309
|
latLongs.forEach { boundsBuilder.include(it) }
|
|
1299
1310
|
val bounds = boundsBuilder.build()
|
|
1300
1311
|
|
|
1301
|
-
|
|
1302
|
-
|
|
1303
|
-
|
|
1304
|
-
|
|
1305
|
-
combined.right + right,
|
|
1306
|
-
combined.bottom + bottom
|
|
1312
|
+
applyCameraUpdate(
|
|
1313
|
+
CameraUpdateFactory.newLatLngBounds(bounds, 0),
|
|
1314
|
+
duration,
|
|
1315
|
+
EdgeInsets(top, left, bottom, right)
|
|
1307
1316
|
)
|
|
1308
|
-
|
|
1309
|
-
val cameraUpdate = CameraUpdateFactory.newLatLngBounds(bounds, 0)
|
|
1310
|
-
|
|
1311
|
-
when {
|
|
1312
|
-
duration < 0 -> map.animateCamera(cameraUpdate)
|
|
1313
|
-
duration > 0 -> map.animateCamera(cameraUpdate, duration, null)
|
|
1314
|
-
else -> map.moveCamera(cameraUpdate)
|
|
1315
|
-
}
|
|
1316
|
-
|
|
1317
|
-
map.setPadding(combined.left, combined.top, combined.right, combined.bottom)
|
|
1318
1317
|
}
|
|
1319
1318
|
|
|
1320
1319
|
// endregion
|
|
@@ -1367,6 +1366,39 @@ class GoogleMapProvider(private val context: Context) :
|
|
|
1367
1366
|
edgeInsets
|
|
1368
1367
|
}
|
|
1369
1368
|
|
|
1369
|
+
// A camera update resolves against the map's padding when it is applied, so `padding` is added
|
|
1370
|
+
// to the insets only for the call
|
|
1371
|
+
private fun applyCameraUpdate(update: CameraUpdate, duration: Int, padding: EdgeInsets = EdgeInsets()) {
|
|
1372
|
+
val map = googleMap ?: return
|
|
1373
|
+
val combined = combinedEdgeInsets()
|
|
1374
|
+
map.setPadding(
|
|
1375
|
+
combined.left + padding.left,
|
|
1376
|
+
combined.top + padding.top,
|
|
1377
|
+
combined.right + padding.right,
|
|
1378
|
+
combined.bottom + padding.bottom
|
|
1379
|
+
)
|
|
1380
|
+
|
|
1381
|
+
if (duration == 0) {
|
|
1382
|
+
cameraAnimation = null
|
|
1383
|
+
map.moveCamera(update)
|
|
1384
|
+
} else {
|
|
1385
|
+
val animation = CameraAnimation(update, padding, duration, SystemClock.uptimeMillis() + duration)
|
|
1386
|
+
cameraAnimation = animation
|
|
1387
|
+
val callback = object : GoogleMap.CancelableCallback {
|
|
1388
|
+
override fun onFinish() {
|
|
1389
|
+
if (cameraAnimation === animation) cameraAnimation = null
|
|
1390
|
+
}
|
|
1391
|
+
|
|
1392
|
+
override fun onCancel() {
|
|
1393
|
+
if (cameraAnimation === animation) cameraAnimation = null
|
|
1394
|
+
}
|
|
1395
|
+
}
|
|
1396
|
+
if (duration < 0) map.animateCamera(update, callback) else map.animateCamera(update, duration, callback)
|
|
1397
|
+
}
|
|
1398
|
+
|
|
1399
|
+
map.setPadding(combined.left, combined.top, combined.right, combined.bottom)
|
|
1400
|
+
}
|
|
1401
|
+
|
|
1370
1402
|
private fun applyEdgeInsets(duration: Int = 0) {
|
|
1371
1403
|
val combined = combinedEdgeInsets()
|
|
1372
1404
|
// Lite mode misrenders padding: the static image is drawn only within
|
|
@@ -1592,6 +1624,8 @@ class GoogleMapProvider(private val context: Context) :
|
|
|
1592
1624
|
|
|
1593
1625
|
// endregion
|
|
1594
1626
|
|
|
1627
|
+
private class CameraAnimation(val update: CameraUpdate, val padding: EdgeInsets, val duration: Int, val endTime: Long)
|
|
1628
|
+
|
|
1595
1629
|
companion object {
|
|
1596
1630
|
const val DEMO_MAP_ID = "DEMO_MAP_ID"
|
|
1597
1631
|
|
package/ios/LuggMapView.mm
CHANGED
|
@@ -69,7 +69,7 @@ static NSCache<NSString *, UIImage *> *StaticSnapshotCache(void) {
|
|
|
69
69
|
double _minZoom;
|
|
70
70
|
double _maxZoom;
|
|
71
71
|
UIEdgeInsets _edgeInsets;
|
|
72
|
-
UIEdgeInsets
|
|
72
|
+
UIEdgeInsets _edgeInsetsProp;
|
|
73
73
|
LuggMapViewInsetAdjustment _insetAdjustment;
|
|
74
74
|
}
|
|
75
75
|
|
|
@@ -284,9 +284,11 @@ static NSCache<NSString *, UIImage *> *StaticSnapshotCache(void) {
|
|
|
284
284
|
// staticKey identifies the map's content; when it changes (e.g. a recycled
|
|
285
285
|
// list row bound to a new item), any live warmup or displayed snapshot is
|
|
286
286
|
// stale and the static lifecycle restarts. Without this, an in-flight
|
|
287
|
-
// warmup caches the old item's map under the new key.
|
|
287
|
+
// warmup caches the old item's map under the new key. Insets from the
|
|
288
|
+
// setEdgeInsets command belong to the old item, so the prop insets return.
|
|
288
289
|
- (void)resetStaticContent {
|
|
289
290
|
_staticSnapshotDone = NO;
|
|
291
|
+
_edgeInsets = _edgeInsetsProp;
|
|
290
292
|
|
|
291
293
|
if (_provider) {
|
|
292
294
|
[_provider destroy];
|
|
@@ -303,6 +305,8 @@ static NSCache<NSString *, UIImage *> *StaticSnapshotCache(void) {
|
|
|
303
305
|
[super prepareForRecycle];
|
|
304
306
|
|
|
305
307
|
_staticSnapshotDone = NO;
|
|
308
|
+
_edgeInsets = UIEdgeInsetsZero;
|
|
309
|
+
_edgeInsetsProp = UIEdgeInsetsZero;
|
|
306
310
|
|
|
307
311
|
[_provider destroy];
|
|
308
312
|
_provider = nil;
|
|
@@ -546,10 +550,15 @@ static NSCache<NSString *, UIImage *> *StaticSnapshotCache(void) {
|
|
|
546
550
|
UIEdgeInsets newEdgeInsets = UIEdgeInsetsMake(
|
|
547
551
|
newViewProps.edgeInsets.top, newViewProps.edgeInsets.left,
|
|
548
552
|
newViewProps.edgeInsets.bottom, newViewProps.edgeInsets.right);
|
|
549
|
-
|
|
550
|
-
|
|
551
|
-
|
|
552
|
-
|
|
553
|
+
// Compare with the last prop, not _edgeInsets: the setEdgeInsets command
|
|
554
|
+
// writes _edgeInsets, and unrelated prop updates carry the old edgeInsets
|
|
555
|
+
if (!UIEdgeInsetsEqualToEdgeInsets(newEdgeInsets, _edgeInsetsProp)) {
|
|
556
|
+
_edgeInsetsProp = newEdgeInsets;
|
|
557
|
+
[self setEdgeInsets:newEdgeInsets.top
|
|
558
|
+
left:newEdgeInsets.left
|
|
559
|
+
bottom:newEdgeInsets.bottom
|
|
560
|
+
right:newEdgeInsets.right
|
|
561
|
+
duration:0];
|
|
553
562
|
}
|
|
554
563
|
|
|
555
564
|
[super updateProps:props oldProps:oldProps];
|
|
@@ -490,6 +490,11 @@ MKMapType LuggMKMapTypeFromMapType(LuggMapViewMapType mapType) {
|
|
|
490
490
|
- (void)setEdgeInsets:(UIEdgeInsets)edgeInsets
|
|
491
491
|
oldEdgeInsets:(UIEdgeInsets)oldEdgeInsets
|
|
492
492
|
duration:(double)duration {
|
|
493
|
+
// An interrupted animation leaves the map at its in-flight insets, not at
|
|
494
|
+
// the caller's last target
|
|
495
|
+
if (_edgeInsetsDisplayLink) {
|
|
496
|
+
oldEdgeInsets = _edgeInsetsCurrent;
|
|
497
|
+
}
|
|
493
498
|
[self stopEdgeInsetsAnimation];
|
|
494
499
|
|
|
495
500
|
if (duration != 0 && _mapView) {
|
|
@@ -98,6 +98,7 @@ export const MapView = /*#__PURE__*/memo(/*#__PURE__*/forwardRef(function MapVie
|
|
|
98
98
|
const isDraggingRef = useRef(false);
|
|
99
99
|
const wasGesture = useRef(false);
|
|
100
100
|
const prevEdgeInsets = useRef(edgeInsets);
|
|
101
|
+
const prevEdgeInsetsProp = useRef(edgeInsets);
|
|
101
102
|
// Bumped by reload() to remount the map at the camera captured then
|
|
102
103
|
const [reloadState, setReloadState] = useState({
|
|
103
104
|
key: 0
|
|
@@ -229,9 +230,13 @@ export const MapView = /*#__PURE__*/memo(/*#__PURE__*/forwardRef(function MapVie
|
|
|
229
230
|
}, [map, onReady]);
|
|
230
231
|
useEffect(() => {
|
|
231
232
|
if (!map || !edgeInsets) return;
|
|
232
|
-
|
|
233
|
+
|
|
234
|
+
// Compare with the last prop, not prevEdgeInsets: the setEdgeInsets
|
|
235
|
+
// ref method writes prevEdgeInsets, and re-renders carry the old prop
|
|
236
|
+
const prev = prevEdgeInsetsProp.current;
|
|
233
237
|
const changed = prev?.top !== edgeInsets.top || prev?.left !== edgeInsets.left || prev?.bottom !== edgeInsets.bottom || prev?.right !== edgeInsets.right;
|
|
234
238
|
if (changed) {
|
|
239
|
+
prevEdgeInsetsProp.current = edgeInsets;
|
|
235
240
|
applyEdgeInsets(edgeInsets);
|
|
236
241
|
}
|
|
237
242
|
}, [map, edgeInsets, applyEdgeInsets]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["forwardRef","memo","useCallback","useEffect","useId","useImperativeHandle","useMemo","useRef","useState","View","ColorScheme","Map","useMap","Marker","MapContext","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","mapType","mapId","initialCoordinate","initialZoom","minZoom","maxZoom","zoomEnabled","scrollEnabled","pitchEnabled","compassEnabled","staticMode","edgeInsets","userLocationEnabled","theme","onPress","onLongPress","onCameraMove","onCameraIdle","onReady","id","map","containerRef","readyMap","isDraggingRef","wasGesture","prevEdgeInsets","reloadState","setReloadState","key","offsetCenter","coord","zoom","insets","reverse","p","current","lat","lng","dir","scale","Math","pow","offsetX","right","left","offsetY","bottom","top","latRad","PI","log","tan","cos","atan","sinh","applyEdgeInsets","newEdgeInsets","duration","prev","center","getCenter","getZoom","logicalCenter","newCenter","moveCamera","panTo","panToCoordinate","undefined","options","targetZoom","currentZoom","zoomChanged","setZoom","fitCoordinates","coordinates","first","padding","fitPadding","length","bounds","google","maps","LatLngBounds","forEach","extend","ei","fitBounds","setEdgeInsets","reload","state","toJSON","changed","longPressTimer","longPressFired","calloutListeners","Set","onCalloutClose","listener","add","delete","closeCallouts","except","l","getPoint","domEvent","el","rect","getBoundingClientRect","e","clientX","clientY","handleClick","event","latLng","detail","point","handleMouseDown","setTimeout","handleMouseUp","clearTimeout","listeners","addListener","removeListener","handleDragStart","handleDragEnd","handleCameraChanged","payload","gesture","handleIdle","mapTypeId","gestureHandling","colorScheme","DARK","LIGHT","FOLLOW_SYSTEM","defaultCenter","Provider","value","defaultZoom","disableDefaultUI","rotateControl","clickableIcons","keyboardShortcuts","isFractionalZoomEnabled","tilt","onClick","onDragstart","onDragend","onCameraChanged","onIdle"],"sourceRoot":"../../src","sources":["MapView.web.tsx"],"mappings":"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","ignoreList":[]}
|
|
1
|
+
{"version":3,"names":["forwardRef","memo","useCallback","useEffect","useId","useImperativeHandle","useMemo","useRef","useState","View","ColorScheme","Map","useMap","Marker","MapContext","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","mapType","mapId","initialCoordinate","initialZoom","minZoom","maxZoom","zoomEnabled","scrollEnabled","pitchEnabled","compassEnabled","staticMode","edgeInsets","userLocationEnabled","theme","onPress","onLongPress","onCameraMove","onCameraIdle","onReady","id","map","containerRef","readyMap","isDraggingRef","wasGesture","prevEdgeInsets","prevEdgeInsetsProp","reloadState","setReloadState","key","offsetCenter","coord","zoom","insets","reverse","p","current","lat","lng","dir","scale","Math","pow","offsetX","right","left","offsetY","bottom","top","latRad","PI","log","tan","cos","atan","sinh","applyEdgeInsets","newEdgeInsets","duration","prev","center","getCenter","getZoom","logicalCenter","newCenter","moveCamera","panTo","panToCoordinate","undefined","options","targetZoom","currentZoom","zoomChanged","setZoom","fitCoordinates","coordinates","first","padding","fitPadding","length","bounds","google","maps","LatLngBounds","forEach","extend","ei","fitBounds","setEdgeInsets","reload","state","toJSON","changed","longPressTimer","longPressFired","calloutListeners","Set","onCalloutClose","listener","add","delete","closeCallouts","except","l","getPoint","domEvent","el","rect","getBoundingClientRect","e","clientX","clientY","handleClick","event","latLng","detail","point","handleMouseDown","setTimeout","handleMouseUp","clearTimeout","listeners","addListener","removeListener","handleDragStart","handleDragEnd","handleCameraChanged","payload","gesture","handleIdle","mapTypeId","gestureHandling","colorScheme","DARK","LIGHT","FOLLOW_SYSTEM","defaultCenter","Provider","value","defaultZoom","disableDefaultUI","rotateControl","clickableIcons","keyboardShortcuts","isFractionalZoomEnabled","tilt","onClick","onDragstart","onDragend","onCameraChanged","onIdle"],"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":"AAyBA,OAAO,KAAK,EACV,YAAY,EACZ,UAAU,EAKX,MAAM,iBAAiB,CAAC;AAoEzB,eAAO,MAAM,OAAO,
|
|
1
|
+
{"version":3,"file":"MapView.web.d.ts","sourceRoot":"","sources":["../../../src/MapView.web.tsx"],"names":[],"mappings":"AAyBA,OAAO,KAAK,EACV,YAAY,EACZ,UAAU,EAKX,MAAM,iBAAiB,CAAC;AAoEzB,eAAO,MAAM,OAAO,gGAkbnB,CAAC"}
|
package/package.json
CHANGED
package/src/MapView.web.tsx
CHANGED
|
@@ -131,6 +131,7 @@ export const MapView = memo(
|
|
|
131
131
|
const isDraggingRef = useRef(false);
|
|
132
132
|
const wasGesture = useRef(false);
|
|
133
133
|
const prevEdgeInsets = useRef(edgeInsets);
|
|
134
|
+
const prevEdgeInsetsProp = useRef(edgeInsets);
|
|
134
135
|
// Bumped by reload() to remount the map at the camera captured then
|
|
135
136
|
const [reloadState, setReloadState] = useState<{
|
|
136
137
|
key: number;
|
|
@@ -300,7 +301,9 @@ export const MapView = memo(
|
|
|
300
301
|
useEffect(() => {
|
|
301
302
|
if (!map || !edgeInsets) return;
|
|
302
303
|
|
|
303
|
-
|
|
304
|
+
// Compare with the last prop, not prevEdgeInsets: the setEdgeInsets
|
|
305
|
+
// ref method writes prevEdgeInsets, and re-renders carry the old prop
|
|
306
|
+
const prev = prevEdgeInsetsProp.current;
|
|
304
307
|
const changed =
|
|
305
308
|
prev?.top !== edgeInsets.top ||
|
|
306
309
|
prev?.left !== edgeInsets.left ||
|
|
@@ -308,6 +311,7 @@ export const MapView = memo(
|
|
|
308
311
|
prev?.right !== edgeInsets.right;
|
|
309
312
|
|
|
310
313
|
if (changed) {
|
|
314
|
+
prevEdgeInsetsProp.current = edgeInsets;
|
|
311
315
|
applyEdgeInsets(edgeInsets);
|
|
312
316
|
}
|
|
313
317
|
}, [map, edgeInsets, applyEdgeInsets]);
|