@maplibre/maplibre-react-native 10.1.0 → 10.1.2
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/ios/MLRN/CameraStop.h +1 -1
- package/ios/MLRN/CameraStop.m +58 -60
- package/ios/MLRN/CameraUpdateItem.h +2 -1
- package/ios/MLRN/CameraUpdateItem.m +132 -132
- package/ios/MLRN/CameraUpdateQueue.m +43 -47
- package/ios/MLRN/FilterParser.h +1 -1
- package/ios/MLRN/FilterParser.m +5 -6
- package/ios/MLRN/MLRNBackgroundLayer.m +10 -9
- package/ios/MLRN/MLRNBackgroundLayerManager.m +4 -5
- package/ios/MLRN/MLRNCallout.h +1 -1
- package/ios/MLRN/MLRNCallout.m +37 -36
- package/ios/MLRN/MLRNCalloutManager.m +2 -3
- package/ios/MLRN/MLRNCamera.h +1 -1
- package/ios/MLRN/MLRNCamera.m +169 -182
- package/ios/MLRN/MLRNCameraManager.m +4 -6
- package/ios/MLRN/MLRNCircleLayer.m +17 -14
- package/ios/MLRN/MLRNCircleLayerManager.m +4 -5
- package/ios/MLRN/MLRNCustomHeaders.h +2 -2
- package/ios/MLRN/MLRNCustomHeaders.m +63 -63
- package/ios/MLRN/MLRNEvent.h +3 -3
- package/ios/MLRN/MLRNEvent.m +19 -24
- package/ios/MLRN/MLRNEventProtocol.h +1 -1
- package/ios/MLRN/MLRNFillExtrusionLayer.m +18 -14
- package/ios/MLRN/MLRNFillExtrusionLayerManager.m +4 -5
- package/ios/MLRN/MLRNFillLayer.m +16 -14
- package/ios/MLRN/MLRNFillLayerManager.m +4 -5
- package/ios/MLRN/MLRNHeatmapLayer.m +17 -14
- package/ios/MLRN/MLRNHeatmapLayerManager.m +4 -5
- package/ios/MLRN/MLRNImageQueue.h +4 -1
- package/ios/MLRN/MLRNImageQueue.m +29 -32
- package/ios/MLRN/MLRNImageQueueOperation.h +1 -1
- package/ios/MLRN/MLRNImageQueueOperation.m +92 -91
- package/ios/MLRN/MLRNImageSource.m +36 -38
- package/ios/MLRN/MLRNImageSourceManager.m +2 -3
- package/ios/MLRN/MLRNImageUtils.h +3 -3
- package/ios/MLRN/MLRNImageUtils.m +15 -14
- package/ios/MLRN/MLRNImages.h +0 -1
- package/ios/MLRN/MLRNImages.m +89 -91
- package/ios/MLRN/MLRNImagesManager.m +4 -5
- package/ios/MLRN/MLRNLayer.h +9 -11
- package/ios/MLRN/MLRNLayer.m +170 -182
- package/ios/MLRN/MLRNLight.m +21 -23
- package/ios/MLRN/MLRNLightManager.m +2 -3
- package/ios/MLRN/MLRNLineLayer.m +17 -15
- package/ios/MLRN/MLRNLineLayerManager.m +4 -6
- package/ios/MLRN/MLRNLocation.h +1 -1
- package/ios/MLRN/MLRNLocation.m +16 -17
- package/ios/MLRN/MLRNLocationManager.m +109 -124
- package/ios/MLRN/MLRNLocationManagerDelegate.h +3 -3
- package/ios/MLRN/MLRNLocationModule.h +1 -1
- package/ios/MLRN/MLRNLocationModule.m +40 -55
- package/ios/MLRN/MLRNLogging.h +1 -4
- package/ios/MLRN/MLRNLogging.m +84 -89
- package/ios/MLRN/MLRNMapTouchEvent.h +2 -2
- package/ios/MLRN/MLRNMapTouchEvent.m +50 -49
- package/ios/MLRN/MLRNMapView.h +43 -36
- package/ios/MLRN/MLRNMapView.m +409 -440
- package/ios/MLRN/MLRNMapViewManager.m +489 -502
- package/ios/MLRN/MLRNModule.h +1 -1
- package/ios/MLRN/MLRNModule.m +111 -105
- package/ios/MLRN/MLRNNativeUserLocation.m +24 -27
- package/ios/MLRN/MLRNNativeUserLocationManager.m +4 -8
- package/ios/MLRN/MLRNOfflineModule.h +1 -1
- package/ios/MLRN/MLRNOfflineModule.m +416 -421
- package/ios/MLRN/MLRNPointAnnotation.h +2 -2
- package/ios/MLRN/MLRNPointAnnotation.m +154 -175
- package/ios/MLRN/MLRNPointAnnotationManager.m +2 -3
- package/ios/MLRN/MLRNRasterLayer.m +16 -12
- package/ios/MLRN/MLRNRasterLayerManager.m +4 -5
- package/ios/MLRN/MLRNRasterSource.m +21 -17
- package/ios/MLRN/MLRNRasterSourceManager.m +2 -3
- package/ios/MLRN/MLRNShapeSource.h +17 -16
- package/ios/MLRN/MLRNShapeSource.m +94 -102
- package/ios/MLRN/MLRNShapeSourceManager.h +2 -2
- package/ios/MLRN/MLRNShapeSourceManager.m +86 -90
- package/ios/MLRN/MLRNSnapshotModule.h +1 -1
- package/ios/MLRN/MLRNSnapshotModule.m +51 -53
- package/ios/MLRN/MLRNSource.h +12 -12
- package/ios/MLRN/MLRNSource.m +82 -88
- package/ios/MLRN/MLRNStyleValue.h +1 -1
- package/ios/MLRN/MLRNStyleValue.m +128 -128
- package/ios/MLRN/MLRNSymbolLayer.m +17 -13
- package/ios/MLRN/MLRNSymbolLayerManager.m +4 -5
- package/ios/MLRN/MLRNTileSource.h +1 -1
- package/ios/MLRN/MLRNTileSource.m +21 -20
- package/ios/MLRN/MLRNUserLocation.h +1 -1
- package/ios/MLRN/MLRNUserLocation.m +10 -12
- package/ios/MLRN/MLRNUtils.h +18 -11
- package/ios/MLRN/MLRNUtils.m +168 -160
- package/ios/MLRN/MLRNVectorLayer.m +28 -34
- package/ios/MLRN/MLRNVectorSource.h +3 -1
- package/ios/MLRN/MLRNVectorSource.m +14 -11
- package/ios/MLRN/MLRNVectorSourceManager.h +2 -2
- package/ios/MLRN/MLRNVectorSourceManager.m +36 -39
- package/ios/MLRN/ViewManager.h +1 -1
- package/ios/MLRN/ViewManager.m +29 -35
- package/lib/commonjs/components/MarkerView.js +1 -1
- package/lib/commonjs/components/ShapeSource.js +2 -1
- package/lib/commonjs/components/ShapeSource.js.map +1 -1
- package/lib/commonjs/components/UserLocation.js +8 -38
- package/lib/commonjs/components/UserLocation.js.map +1 -1
- package/lib/commonjs/components/UserLocationPuck.js +52 -0
- package/lib/commonjs/components/UserLocationPuck.js.map +1 -0
- package/lib/commonjs/components/{HeadingIndicator.js → UserLocationPuckHeading.js} +12 -9
- package/lib/commonjs/components/UserLocationPuckHeading.js.map +1 -0
- package/lib/commonjs/utils/animated/AbstractAnimatedCoordinates.js +8 -7
- package/lib/commonjs/utils/animated/AbstractAnimatedCoordinates.js.map +1 -1
- package/lib/commonjs/utils/animated/AnimatedExtractCoordinateFromArray.js +1 -2
- package/lib/commonjs/utils/animated/AnimatedExtractCoordinateFromArray.js.map +1 -1
- package/lib/commonjs/utils/animated/AnimatedRouteCoordinatesArray.js +28 -38
- package/lib/commonjs/utils/animated/AnimatedRouteCoordinatesArray.js.map +1 -1
- package/lib/commonjs/utils/animated/AnimatedShape.js +11 -7
- package/lib/commonjs/utils/animated/AnimatedShape.js.map +1 -1
- package/lib/module/components/MarkerView.js +1 -1
- package/lib/module/components/ShapeSource.js +2 -1
- package/lib/module/components/ShapeSource.js.map +1 -1
- package/lib/module/components/UserLocation.js +7 -36
- package/lib/module/components/UserLocation.js.map +1 -1
- package/lib/module/components/UserLocationPuck.js +48 -0
- package/lib/module/components/UserLocationPuck.js.map +1 -0
- package/lib/module/components/{HeadingIndicator.js → UserLocationPuckHeading.js} +11 -7
- package/lib/module/components/UserLocationPuckHeading.js.map +1 -0
- package/lib/module/utils/animated/AbstractAnimatedCoordinates.js +8 -7
- package/lib/module/utils/animated/AbstractAnimatedCoordinates.js.map +1 -1
- package/lib/module/utils/animated/AnimatedExtractCoordinateFromArray.js +1 -3
- package/lib/module/utils/animated/AnimatedExtractCoordinateFromArray.js.map +1 -1
- package/lib/module/utils/animated/AnimatedRouteCoordinatesArray.js +29 -39
- package/lib/module/utils/animated/AnimatedRouteCoordinatesArray.js.map +1 -1
- package/lib/module/utils/animated/AnimatedShape.js +11 -7
- package/lib/module/utils/animated/AnimatedShape.js.map +1 -1
- package/lib/typescript/commonjs/src/components/MarkerView.d.ts +1 -1
- package/lib/typescript/commonjs/src/components/ShapeSource.d.ts +1 -1
- package/lib/typescript/commonjs/src/components/ShapeSource.d.ts.map +1 -1
- package/lib/typescript/commonjs/src/components/UserLocation.d.ts +0 -1
- package/lib/typescript/commonjs/src/components/UserLocation.d.ts.map +1 -1
- package/lib/typescript/commonjs/src/components/UserLocationPuck.d.ts +9 -0
- package/lib/typescript/commonjs/src/components/UserLocationPuck.d.ts.map +1 -0
- package/lib/typescript/commonjs/src/components/UserLocationPuckHeading.d.ts +9 -0
- package/lib/typescript/commonjs/src/components/UserLocationPuckHeading.d.ts.map +1 -0
- package/lib/typescript/commonjs/src/utils/animated/AbstractAnimatedCoordinates.d.ts +12 -13
- package/lib/typescript/commonjs/src/utils/animated/AbstractAnimatedCoordinates.d.ts.map +1 -1
- package/lib/typescript/commonjs/src/utils/animated/AnimatedExtractCoordinateFromArray.d.ts +5 -4
- package/lib/typescript/commonjs/src/utils/animated/AnimatedExtractCoordinateFromArray.d.ts.map +1 -1
- package/lib/typescript/commonjs/src/utils/animated/AnimatedPoint.d.ts +0 -1
- package/lib/typescript/commonjs/src/utils/animated/AnimatedPoint.d.ts.map +1 -1
- package/lib/typescript/commonjs/src/utils/animated/AnimatedRouteCoordinatesArray.d.ts +33 -21
- package/lib/typescript/commonjs/src/utils/animated/AnimatedRouteCoordinatesArray.d.ts.map +1 -1
- package/lib/typescript/commonjs/src/utils/animated/AnimatedShape.d.ts +8 -5
- package/lib/typescript/commonjs/src/utils/animated/AnimatedShape.d.ts.map +1 -1
- package/lib/typescript/module/src/components/MarkerView.d.ts +1 -1
- package/lib/typescript/module/src/components/ShapeSource.d.ts +1 -1
- package/lib/typescript/module/src/components/ShapeSource.d.ts.map +1 -1
- package/lib/typescript/module/src/components/UserLocation.d.ts +0 -1
- package/lib/typescript/module/src/components/UserLocation.d.ts.map +1 -1
- package/lib/typescript/module/src/components/UserLocationPuck.d.ts +9 -0
- package/lib/typescript/module/src/components/UserLocationPuck.d.ts.map +1 -0
- package/lib/typescript/module/src/components/UserLocationPuckHeading.d.ts +9 -0
- package/lib/typescript/module/src/components/UserLocationPuckHeading.d.ts.map +1 -0
- package/lib/typescript/module/src/utils/animated/AbstractAnimatedCoordinates.d.ts +12 -13
- package/lib/typescript/module/src/utils/animated/AbstractAnimatedCoordinates.d.ts.map +1 -1
- package/lib/typescript/module/src/utils/animated/AnimatedExtractCoordinateFromArray.d.ts +5 -4
- package/lib/typescript/module/src/utils/animated/AnimatedExtractCoordinateFromArray.d.ts.map +1 -1
- package/lib/typescript/module/src/utils/animated/AnimatedPoint.d.ts +0 -1
- package/lib/typescript/module/src/utils/animated/AnimatedPoint.d.ts.map +1 -1
- package/lib/typescript/module/src/utils/animated/AnimatedRouteCoordinatesArray.d.ts +33 -21
- package/lib/typescript/module/src/utils/animated/AnimatedRouteCoordinatesArray.d.ts.map +1 -1
- package/lib/typescript/module/src/utils/animated/AnimatedShape.d.ts +8 -5
- package/lib/typescript/module/src/utils/animated/AnimatedShape.d.ts.map +1 -1
- package/package.json +8 -8
- package/src/components/MarkerView.tsx +1 -1
- package/src/components/ShapeSource.tsx +58 -53
- package/src/components/UserLocation.tsx +13 -51
- package/src/components/UserLocationPuck.tsx +62 -0
- package/src/components/UserLocationPuckHeading.tsx +33 -0
- package/src/utils/animated/AbstractAnimatedCoordinates.ts +26 -15
- package/src/utils/animated/AnimatedExtractCoordinateFromArray.ts +10 -6
- package/src/utils/animated/AnimatedRouteCoordinatesArray.ts +63 -51
- package/src/utils/animated/AnimatedShape.ts +22 -13
- package/lib/commonjs/components/HeadingIndicator.js.map +0 -1
- package/lib/module/components/HeadingIndicator.js.map +0 -1
- package/lib/typescript/commonjs/src/components/HeadingIndicator.d.ts +0 -7
- package/lib/typescript/commonjs/src/components/HeadingIndicator.d.ts.map +0 -1
- package/lib/typescript/module/src/components/HeadingIndicator.d.ts +0 -7
- package/lib/typescript/module/src/components/HeadingIndicator.d.ts.map +0 -1
- package/src/components/HeadingIndicator.tsx +0 -26
|
@@ -14,12 +14,12 @@ class AnimatedRouteCoordinatesArray extends _AbstractAnimatedCoordinates.Abstrac
|
|
|
14
14
|
/**
|
|
15
15
|
* Calculate initial state
|
|
16
16
|
*
|
|
17
|
-
* @param {
|
|
18
|
-
* @returns {
|
|
17
|
+
* @param {AnimatedCoordinates[]} coordinatesArray
|
|
18
|
+
* @returns {AnimatedRouteState}
|
|
19
19
|
*/
|
|
20
20
|
onInitialState(coordinatesArray) {
|
|
21
21
|
return {
|
|
22
|
-
fullRoute: coordinatesArray.map(
|
|
22
|
+
fullRoute: coordinatesArray.map(coordinates => [coordinates[0], coordinates[1]]),
|
|
23
23
|
end: {
|
|
24
24
|
from: 0,
|
|
25
25
|
to: 0
|
|
@@ -28,10 +28,10 @@ class AnimatedRouteCoordinatesArray extends _AbstractAnimatedCoordinates.Abstrac
|
|
|
28
28
|
}
|
|
29
29
|
|
|
30
30
|
/**
|
|
31
|
-
* Calculate value from state
|
|
31
|
+
* Calculate value from state
|
|
32
32
|
*
|
|
33
|
-
* @param {
|
|
34
|
-
* @returns {
|
|
33
|
+
* @param {AnimatedRouteState} state Previous state
|
|
34
|
+
* @returns {AnimatedCoordinates[]}
|
|
35
35
|
*/
|
|
36
36
|
onGetValue(state) {
|
|
37
37
|
return state.actRoute || state.fullRoute;
|
|
@@ -40,9 +40,9 @@ class AnimatedRouteCoordinatesArray extends _AbstractAnimatedCoordinates.Abstrac
|
|
|
40
40
|
/**
|
|
41
41
|
* Calculates state based on startingState and progress, returns a new state
|
|
42
42
|
*
|
|
43
|
-
* @param {
|
|
44
|
-
* @param {number} progress
|
|
45
|
-
* @returns {
|
|
43
|
+
* @param {AnimatedRouteState} state Previous state
|
|
44
|
+
* @param {number} progress Value between 0 and 1
|
|
45
|
+
* @returns {AnimatedRouteState}
|
|
46
46
|
*/
|
|
47
47
|
onCalculate(state, progress) {
|
|
48
48
|
const {
|
|
@@ -50,17 +50,17 @@ class AnimatedRouteCoordinatesArray extends _AbstractAnimatedCoordinates.Abstrac
|
|
|
50
50
|
end
|
|
51
51
|
} = state;
|
|
52
52
|
const currentEnd = end.from * (1.0 - progress) + progress * end.to;
|
|
53
|
-
let
|
|
54
|
-
let
|
|
53
|
+
let prevSum = 0;
|
|
54
|
+
let actSum = 0;
|
|
55
55
|
let i = fullRoute.length - 1;
|
|
56
|
-
while (
|
|
57
|
-
|
|
56
|
+
while (actSum < currentEnd && i > 0) {
|
|
57
|
+
prevSum = actSum;
|
|
58
58
|
const start = fullRoute[i];
|
|
59
59
|
const end = fullRoute[i - 1];
|
|
60
|
-
|
|
60
|
+
actSum += start && end ? (0, _distance.default)((0, _helpers.point)(start), (0, _helpers.point)(end), this.distconf) : 0;
|
|
61
61
|
i -= 1;
|
|
62
62
|
}
|
|
63
|
-
if (
|
|
63
|
+
if (actSum <= currentEnd) {
|
|
64
64
|
const actRoute = [...fullRoute.slice(0, i + 1)];
|
|
65
65
|
return {
|
|
66
66
|
fullRoute,
|
|
@@ -71,7 +71,7 @@ class AnimatedRouteCoordinatesArray extends _AbstractAnimatedCoordinates.Abstrac
|
|
|
71
71
|
actRoute
|
|
72
72
|
};
|
|
73
73
|
}
|
|
74
|
-
const r = (currentEnd -
|
|
74
|
+
const r = (currentEnd - prevSum) / (actSum - prevSum);
|
|
75
75
|
const or = 1.0 - r;
|
|
76
76
|
const actRoute = [...fullRoute.slice(0, i + 1), [(fullRoute[i]?.[0] ?? 0) * r + (fullRoute[i + 1]?.[0] ?? 0) * or, (fullRoute[i]?.[1] ?? 0) * r + (fullRoute[i + 1]?.[1] ?? 0) * or]];
|
|
77
77
|
return {
|
|
@@ -87,8 +87,8 @@ class AnimatedRouteCoordinatesArray extends _AbstractAnimatedCoordinates.Abstrac
|
|
|
87
87
|
/**
|
|
88
88
|
* Subclasses can override to start a new animation
|
|
89
89
|
*
|
|
90
|
+
* @param {AnimatedRouteState} state
|
|
90
91
|
* @param {*} toValue - to value from animate
|
|
91
|
-
* @param {*} actCoords - the current coordinates array to start from
|
|
92
92
|
* @returns {object} The state
|
|
93
93
|
*/
|
|
94
94
|
onStart(state, toValue) {
|
|
@@ -96,38 +96,28 @@ class AnimatedRouteCoordinatesArray extends _AbstractAnimatedCoordinates.Abstrac
|
|
|
96
96
|
fullRoute,
|
|
97
97
|
end
|
|
98
98
|
} = state;
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
}
|
|
103
|
-
if (toValue.end.along) {
|
|
99
|
+
const fullRouteLineString = (0, _helpers.lineString)(fullRoute);
|
|
100
|
+
let to = undefined;
|
|
101
|
+
if ("along" in toValue.end) {
|
|
104
102
|
const {
|
|
105
103
|
units
|
|
106
104
|
} = toValue;
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
toDist = (0, _length.default)(ls) - toDist;
|
|
110
|
-
}
|
|
111
|
-
if (toDist != null) {
|
|
112
|
-
if (toValue.end.point) {
|
|
113
|
-
console.warn("RouteCoordinatesArray: toValue.end: has both along and point, point is ignored");
|
|
105
|
+
if (units !== undefined) {
|
|
106
|
+
console.warn("RouteCoordinatesArray: `toValue.units` is deprecated, use `toValue.end.units` instead.");
|
|
114
107
|
}
|
|
115
|
-
|
|
116
|
-
const ls = (0, _helpers.lineString)(fullRoute);
|
|
117
|
-
const nearest = (0, _nearestPointOnLine.default)(ls, toValue.end.point);
|
|
118
|
-
toDist = (0, _length.default)(ls) - nearest.properties.location;
|
|
108
|
+
to = (0, _length.default)(fullRouteLineString) - (0, _helpers.convertLength)(toValue.end.along, toValue.end.units ?? units);
|
|
119
109
|
} else {
|
|
120
|
-
|
|
110
|
+
const nearest = (0, _nearestPointOnLine.default)(fullRouteLineString, toValue.end.point);
|
|
111
|
+
to = (0, _length.default)(fullRouteLineString) - nearest.properties.location;
|
|
121
112
|
}
|
|
122
|
-
|
|
113
|
+
return {
|
|
123
114
|
fullRoute,
|
|
124
115
|
end: {
|
|
125
116
|
...end,
|
|
126
|
-
from: end.current
|
|
127
|
-
to
|
|
117
|
+
from: end.current ?? end.from,
|
|
118
|
+
to
|
|
128
119
|
}
|
|
129
120
|
};
|
|
130
|
-
return result;
|
|
131
121
|
}
|
|
132
122
|
get originalRoute() {
|
|
133
123
|
return this.state.fullRoute;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_distance","_interopRequireDefault","require","_helpers","_length","_nearestPointOnLine","_AbstractAnimatedCoordinates","e","__esModule","default","AnimatedRouteCoordinatesArray","AbstractAnimatedCoordinates","onInitialState","coordinatesArray","fullRoute","map","
|
|
1
|
+
{"version":3,"names":["_distance","_interopRequireDefault","require","_helpers","_length","_nearestPointOnLine","_AbstractAnimatedCoordinates","e","__esModule","default","AnimatedRouteCoordinatesArray","AbstractAnimatedCoordinates","onInitialState","coordinatesArray","fullRoute","map","coordinates","end","from","to","onGetValue","state","actRoute","onCalculate","progress","currentEnd","prevSum","actSum","i","length","start","distance","point","distconf","slice","current","r","or","onStart","toValue","fullRouteLineString","lineString","undefined","units","console","warn","convertLength","along","nearest","nearestPointOnLine","properties","location","originalRoute","exports"],"sourceRoot":"../../../../src","sources":["utils/animated/AnimatedRouteCoordinatesArray.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -7,8 +7,7 @@ exports.AnimatedShape = void 0;
|
|
|
7
7
|
var _reactNative = require("react-native");
|
|
8
8
|
/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
|
|
9
9
|
|
|
10
|
-
//
|
|
11
|
-
// https://github.com/facebook/react-native/blob/master/Libraries/Animated/src/nodes/AnimatedWithChildren.js
|
|
10
|
+
// https://github.com/facebook/react-native/blob/main/packages/react-native/Libraries/Animated/nodes/AnimatedWithChildren.js
|
|
12
11
|
const AnimatedWithChildren = Object.getPrototypeOf(_reactNative.Animated.ValueXY);
|
|
13
12
|
if (__DEV__) {
|
|
14
13
|
if (AnimatedWithChildren.name !== "AnimatedWithChildren") {
|
|
@@ -17,13 +16,14 @@ if (__DEV__) {
|
|
|
17
16
|
}
|
|
18
17
|
/**
|
|
19
18
|
* AnimatedShape can be used to have animated properties inside the shape property
|
|
19
|
+
*
|
|
20
|
+
* Equivalent of AnimatedStyle for shapes
|
|
21
|
+
* https://github.com/facebook/react-native/blob/main/packages/react-native/Libraries/Animated/nodes/AnimatedStyle.js
|
|
22
|
+
*
|
|
20
23
|
* @example
|
|
21
24
|
* <AnimatedShapeSource ... shape={new AnimatedShape({type:'LineString', coordinates: animatedCoords})} />
|
|
22
25
|
*/
|
|
23
26
|
class AnimatedShape extends AnimatedWithChildren {
|
|
24
|
-
// equivalent of AnimatedStyle for shapes
|
|
25
|
-
// https://github.com/facebook/react-native/blob/master/Libraries/Animated/src/nodes/AnimatedStyle.js
|
|
26
|
-
|
|
27
27
|
constructor(shape) {
|
|
28
28
|
super();
|
|
29
29
|
this.shape = shape;
|
|
@@ -32,6 +32,7 @@ class AnimatedShape extends AnimatedWithChildren {
|
|
|
32
32
|
if (Array.isArray(value)) {
|
|
33
33
|
return value.map(i => this._walkShapeAndGetValues(i));
|
|
34
34
|
}
|
|
35
|
+
|
|
35
36
|
// @ts-expect-error Animated.Node is not exported
|
|
36
37
|
if (value instanceof _reactNative.Animated.Node) {
|
|
37
38
|
return value.__getValue();
|
|
@@ -46,8 +47,11 @@ class AnimatedShape extends AnimatedWithChildren {
|
|
|
46
47
|
return value;
|
|
47
48
|
}
|
|
48
49
|
__getValue() {
|
|
49
|
-
const
|
|
50
|
-
|
|
50
|
+
const shape = this._walkShapeAndGetValues(this.shape);
|
|
51
|
+
if (shape.type === "LineString" && shape.coordinates.length === 1) {
|
|
52
|
+
shape.coordinates = [...shape.coordinates, ...shape.coordinates];
|
|
53
|
+
}
|
|
54
|
+
return shape;
|
|
51
55
|
}
|
|
52
56
|
|
|
53
57
|
// @ts-expect-error Animated.Node is not exported
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_reactNative","require","AnimatedWithChildren","Object","getPrototypeOf","Animated","ValueXY","__DEV__","name","console","error","AnimatedShape","constructor","shape","_walkShapeAndGetValues","value","Array","isArray","map","i","Node","__getValue","result","key","_walkAndProcess","cb","forEach","__attach","v","__addChild","__detach","__removeChild","exports"],"sourceRoot":"../../../../src","sources":["utils/animated/AnimatedShape.ts"],"mappings":";;;;;;AAEA,IAAAA,YAAA,GAAAC,OAAA;AAFA;;AAQA;AACA
|
|
1
|
+
{"version":3,"names":["_reactNative","require","AnimatedWithChildren","Object","getPrototypeOf","Animated","ValueXY","__DEV__","name","console","error","AnimatedShape","constructor","shape","_walkShapeAndGetValues","value","Array","isArray","map","i","Node","__getValue","result","key","type","coordinates","length","_walkAndProcess","cb","forEach","__attach","v","__addChild","__detach","__removeChild","exports"],"sourceRoot":"../../../../src","sources":["utils/animated/AnimatedShape.ts"],"mappings":";;;;;;AAEA,IAAAA,YAAA,GAAAC,OAAA;AAFA;;AAQA;AACA,MAAMC,oBAAoB,GAAGC,MAAM,CAACC,cAAc,CAACC,qBAAQ,CAACC,OAAO,CAAC;AAEpE,IAAIC,OAAO,EAAE;EACX,IAAIL,oBAAoB,CAACM,IAAI,KAAK,sBAAsB,EAAE;IACxDC,OAAO,CAACC,KAAK,CACX,gEACF,CAAC;EACH;AACF;AAYA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,MAAMC,aAAa,SAAST,oBAAoB,CAAC;EACtDU,WAAWA,CAACC,KAAY,EAAE;IACxB,KAAK,CAAC,CAAC;IACP,IAAI,CAACA,KAAK,GAAGA,KAAK;EACpB;EAEAC,sBAAsBA,CAACC,KAAU,EAAO;IACtC,IAAIC,KAAK,CAACC,OAAO,CAACF,KAAK,CAAC,EAAE;MACxB,OAAOA,KAAK,CAACG,GAAG,CAAEC,CAAC,IAAK,IAAI,CAACL,sBAAsB,CAACK,CAAC,CAAC,CAAC;IACzD;;IAEA;IACA,IAAIJ,KAAK,YAAYV,qBAAQ,CAACe,IAAI,EAAE;MAClC,OAAQL,KAAK,CAASM,UAAU,CAAC,CAAC;IACpC;IAEA,IAAI,OAAON,KAAK,KAAK,QAAQ,EAAE;MAC7B,MAAMO,MAA8B,GAAG,CAAC,CAAC;MAEzC,KAAK,MAAMC,GAAG,IAAIR,KAAK,EAAE;QACvBO,MAAM,CAACC,GAAG,CAAC,GAAG,IAAI,CAACT,sBAAsB,CAACC,KAAK,CAACQ,GAAG,CAAC,CAAC;MACvD;MAEA,OAAOD,MAAM;IACf;IAEA,OAAOP,KAAK;EACd;EAEAM,UAAUA,CAAA,EAAuC;IAC/C,MAAMR,KAAK,GAAG,IAAI,CAACC,sBAAsB,CAAC,IAAI,CAACD,KAAK,CAAC;IAErD,IAAIA,KAAK,CAACW,IAAI,KAAK,YAAY,IAAIX,KAAK,CAACY,WAAW,CAACC,MAAM,KAAK,CAAC,EAAE;MACjEb,KAAK,CAACY,WAAW,GAAG,CAAC,GAAGZ,KAAK,CAACY,WAAW,EAAE,GAAGZ,KAAK,CAACY,WAAW,CAAC;IAClE;IAEA,OAAOZ,KAAK;EACd;;EAEA;EACAc,eAAeA,CAACZ,KAAU,EAAEa,EAAkC,EAAQ;IACpE,IAAIZ,KAAK,CAACC,OAAO,CAACF,KAAK,CAAC,EAAE;MACxBA,KAAK,CAACc,OAAO,CAAEV,CAAC,IAAK,IAAI,CAACQ,eAAe,CAACR,CAAC,EAAES,EAAE,CAAC,CAAC;MACjD;IACF,CAAC,MAAM,IAAIb,KAAK,YAAYV,qBAAQ,CAACe,IAAI,EAAE;MACzCQ,EAAE,CAACb,KAAK,CAAC;IACX,CAAC,MAAM,IAAI,OAAOA,KAAK,KAAK,QAAQ,EAAE;MACpC,KAAK,MAAMQ,GAAG,IAAIR,KAAK,EAAE;QACvB,IAAI,CAACY,eAAe,CAACZ,KAAK,CAACQ,GAAG,CAAC,EAAEK,EAAE,CAAC;MACtC;IACF;EACF;EAEAE,QAAQA,CAAA,EAAS;IACf,IAAI,CAACH,eAAe,CAAC,IAAI,CAACd,KAAK,EAAGkB,CAAC,IAAMA,CAAC,CAASC,UAAU,CAAC,IAAI,CAAC,CAAC;EACtE;EAEAC,QAAQA,CAAA,EAAS;IACf,IAAI,CAACN,eAAe,CAAC,IAAI,CAACd,KAAK,EAAGkB,CAAC,IAAMA,CAAC,CAASG,aAAa,CAAC,IAAI,CAAC,CAAC;IACvE,KAAK,CAACD,QAAQ,CAAC,CAAC;EAClB;AACF;AAACE,OAAA,CAAAxB,aAAA,GAAAA,aAAA","ignoreList":[]}
|
|
@@ -12,7 +12,7 @@ export const NATIVE_MODULE_NAME = "MLRNMarkerView";
|
|
|
12
12
|
*
|
|
13
13
|
* If you have static view consider using PointAnnotation or SymbolLayer they'll offer much better performance
|
|
14
14
|
* .
|
|
15
|
-
* This is based on [MakerView plugin](https://
|
|
15
|
+
* This is based on [MakerView plugin](https://github.com/maplibre/maplibre-plugins-android/tree/main/plugin-markerview) on Android
|
|
16
16
|
* and PointAnnotation on iOS.
|
|
17
17
|
*/
|
|
18
18
|
export const MarkerView = ({
|
|
@@ -17,6 +17,7 @@ export const ShapeSource = /*#__PURE__*/memo(/*#__PURE__*/forwardRef(({
|
|
|
17
17
|
...props
|
|
18
18
|
}, ref) => {
|
|
19
19
|
useImperativeHandle(ref, () => ({
|
|
20
|
+
..._nativeRef.current,
|
|
20
21
|
/**
|
|
21
22
|
* Returns all features from the source that match the query parameters regardless of whether or not the feature is
|
|
22
23
|
* currently rendered on the map.
|
|
@@ -106,7 +107,7 @@ export const ShapeSource = /*#__PURE__*/memo(/*#__PURE__*/forwardRef(({
|
|
|
106
107
|
const shallowProps = Object.assign({}, nativeProps);
|
|
107
108
|
|
|
108
109
|
// Adds support for Animated
|
|
109
|
-
if (shallowProps.shape && typeof shallowProps !== "string") {
|
|
110
|
+
if (shallowProps.shape && typeof shallowProps.shape !== "string") {
|
|
110
111
|
shallowProps.shape = JSON.stringify(shallowProps.shape);
|
|
111
112
|
}
|
|
112
113
|
_nativeRef.current.setNativeProps(shallowProps);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["forwardRef","memo","useImperativeHandle","useRef","NativeModules","requireNativeComponent","useNativeBridge","cloneReactChildrenWithProps","isAndroid","isFunction","toJSONString","getFilter","jsx","_jsx","MLRNModule","NATIVE_MODULE_NAME","ShapeSource","id","shapeId","StyleSource","DefaultSourceID","props","ref","features","getClusterExpansionZoom","getClusterLeaves","getClusterChildren","setNativeProps","onPress","
|
|
1
|
+
{"version":3,"names":["forwardRef","memo","useImperativeHandle","useRef","NativeModules","requireNativeComponent","useNativeBridge","cloneReactChildrenWithProps","isAndroid","isFunction","toJSONString","getFilter","jsx","_jsx","MLRNModule","NATIVE_MODULE_NAME","ShapeSource","id","shapeId","StyleSource","DefaultSourceID","props","ref","_nativeRef","current","features","getClusterExpansionZoom","getClusterLeaves","getClusterChildren","setNativeProps","onPress","_runNativeCommand","_runPendingNativeCommands","_onAndroidCallback","_setNativeRef","nativeRef","filter","res","JSON","parse","data","feature","stringify","limit","offset","nativeProps","shallowProps","Object","assign","shape","_getShape","undefined","event","nativeEvent","payload","coordinates","point","shapeProps","url","hitbox","hasPressListener","onMapboxShapeSourcePress","bind","cluster","clusterRadius","clusterMaxZoomLevel","clusterProperties","maxZoomLevel","buffer","tolerance","lineMetrics","onAndroidCallback","MLRNShapeSource","children","sourceID"],"sourceRoot":"../../../src","sources":["components/ShapeSource.tsx"],"mappings":"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","ignoreList":[]}
|
|
@@ -2,43 +2,11 @@
|
|
|
2
2
|
|
|
3
3
|
import { forwardRef, memo, useEffect, useImperativeHandle, useRef, useState } from "react";
|
|
4
4
|
import { Annotation } from "./Annotation.js";
|
|
5
|
-
import { CircleLayer } from "./CircleLayer.js";
|
|
6
|
-
import { HeadingIndicator } from "./HeadingIndicator.js";
|
|
7
5
|
import { NativeUserLocation } from "./NativeUserLocation.js";
|
|
6
|
+
import { UserLocationPuck } from "./UserLocationPuck.js";
|
|
8
7
|
import { LocationManager } from "../modules/location/LocationManager.js";
|
|
9
8
|
import { jsx as _jsx } from "react/jsx-runtime";
|
|
10
|
-
const
|
|
11
|
-
const layerStyles = {
|
|
12
|
-
pluse: {
|
|
13
|
-
circleRadius: 15,
|
|
14
|
-
circleColor: mapboxBlue,
|
|
15
|
-
circleOpacity: 0.2,
|
|
16
|
-
circlePitchAlignment: "map"
|
|
17
|
-
},
|
|
18
|
-
background: {
|
|
19
|
-
circleRadius: 9,
|
|
20
|
-
circleColor: "#fff",
|
|
21
|
-
circlePitchAlignment: "map"
|
|
22
|
-
},
|
|
23
|
-
foreground: {
|
|
24
|
-
circleRadius: 6,
|
|
25
|
-
circleColor: mapboxBlue,
|
|
26
|
-
circlePitchAlignment: "map"
|
|
27
|
-
}
|
|
28
|
-
};
|
|
29
|
-
export const normalIcon = (showsUserHeadingIndicator, heading) => [/*#__PURE__*/_jsx(CircleLayer, {
|
|
30
|
-
id: "mapboxUserLocationPluseCircle",
|
|
31
|
-
style: layerStyles.pluse
|
|
32
|
-
}, "mapboxUserLocationPluseCircle"), /*#__PURE__*/_jsx(CircleLayer, {
|
|
33
|
-
id: "mapboxUserLocationWhiteCircle",
|
|
34
|
-
style: layerStyles.background
|
|
35
|
-
}, "mapboxUserLocationWhiteCircle"), /*#__PURE__*/_jsx(CircleLayer, {
|
|
36
|
-
id: "mapboxUserLocationBlueCicle",
|
|
37
|
-
aboveLayerID: "mapboxUserLocationWhiteCircle",
|
|
38
|
-
style: layerStyles.foreground
|
|
39
|
-
}, "mapboxUserLocationBlueCicle"), ...(showsUserHeadingIndicator && heading ? [HeadingIndicator({
|
|
40
|
-
heading
|
|
41
|
-
})] : [])];
|
|
9
|
+
const USER_LOCATION_SOURCE_ID = "mlrn-user-location";
|
|
42
10
|
export let UserLocationRenderMode = /*#__PURE__*/function (UserLocationRenderMode) {
|
|
43
11
|
UserLocationRenderMode["Native"] = "native";
|
|
44
12
|
UserLocationRenderMode["Normal"] = "normal";
|
|
@@ -169,13 +137,16 @@ export const UserLocation = /*#__PURE__*/memo(/*#__PURE__*/forwardRef(({
|
|
|
169
137
|
}
|
|
170
138
|
return /*#__PURE__*/_jsx(Annotation, {
|
|
171
139
|
animated: animated,
|
|
172
|
-
id:
|
|
140
|
+
id: USER_LOCATION_SOURCE_ID,
|
|
173
141
|
onPress: onPress,
|
|
174
142
|
coordinates: userLocationState.coordinates,
|
|
175
143
|
style: {
|
|
176
144
|
iconRotate: userLocationState.heading
|
|
177
145
|
},
|
|
178
|
-
children: children ||
|
|
146
|
+
children: children || /*#__PURE__*/_jsx(UserLocationPuck, {
|
|
147
|
+
sourceID: USER_LOCATION_SOURCE_ID,
|
|
148
|
+
heading: showsUserHeadingIndicator ? userLocationState.heading : undefined
|
|
149
|
+
})
|
|
179
150
|
});
|
|
180
151
|
}));
|
|
181
152
|
//# sourceMappingURL=UserLocation.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["forwardRef","memo","useEffect","useImperativeHandle","useRef","useState","Annotation","
|
|
1
|
+
{"version":3,"names":["forwardRef","memo","useEffect","useImperativeHandle","useRef","useState","Annotation","NativeUserLocation","UserLocationPuck","LocationManager","jsx","_jsx","USER_LOCATION_SOURCE_ID","UserLocationRenderMode","UserLocation","animated","visible","showsUserHeadingIndicator","minDisplacement","renderMode","androidRenderMode","androidPreferredFramesPerSecond","children","onUpdate","onPress","ref","_isMounted","locationManagerRunning","userLocationState","setUserLocationState","shouldShowUserLocation","setLocationManager","needsLocationManagerRunning","_onLocationUpdate","current","running","then","Native","setMinDisplacement","addListener","location","getLastKnownLocation","removeListener","Normal","coordinates","heading","coords","longitude","latitude","props","iosShowsUserHeadingIndicator","id","style","iconRotate","sourceID","undefined"],"sourceRoot":"../../../src","sources":["components/UserLocation.tsx"],"mappings":"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","ignoreList":[]}
|
|
@@ -0,0 +1,48 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
import { memo } from "react";
|
|
4
|
+
import { CircleLayer } from "./CircleLayer.js";
|
|
5
|
+
import { UserLocationPuckHeading } from "./UserLocationPuckHeading.js";
|
|
6
|
+
import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
|
|
7
|
+
const blue = "#33B5E5";
|
|
8
|
+
const layerStyles = {
|
|
9
|
+
pulse: {
|
|
10
|
+
circleRadius: 15,
|
|
11
|
+
circleColor: blue,
|
|
12
|
+
circleOpacity: 0.2,
|
|
13
|
+
circlePitchAlignment: "map"
|
|
14
|
+
},
|
|
15
|
+
white: {
|
|
16
|
+
circleRadius: 9,
|
|
17
|
+
circleColor: "#fff",
|
|
18
|
+
circlePitchAlignment: "map"
|
|
19
|
+
},
|
|
20
|
+
blue: {
|
|
21
|
+
circleRadius: 6,
|
|
22
|
+
circleColor: blue,
|
|
23
|
+
circlePitchAlignment: "map"
|
|
24
|
+
}
|
|
25
|
+
};
|
|
26
|
+
export const UserLocationPuck = /*#__PURE__*/memo(({
|
|
27
|
+
sourceID,
|
|
28
|
+
heading
|
|
29
|
+
}) => /*#__PURE__*/_jsxs(_Fragment, {
|
|
30
|
+
children: [/*#__PURE__*/_jsx(CircleLayer, {
|
|
31
|
+
id: "mlrn-user-location-puck-pulse",
|
|
32
|
+
sourceID: sourceID,
|
|
33
|
+
style: layerStyles.pulse
|
|
34
|
+
}), /*#__PURE__*/_jsx(CircleLayer, {
|
|
35
|
+
id: "mlrn-user-location-puck-white",
|
|
36
|
+
sourceID: sourceID,
|
|
37
|
+
style: layerStyles.white
|
|
38
|
+
}), /*#__PURE__*/_jsx(CircleLayer, {
|
|
39
|
+
id: "mlrn-user-location-puck-blue",
|
|
40
|
+
sourceID: sourceID,
|
|
41
|
+
style: layerStyles.blue
|
|
42
|
+
}), typeof heading === "number" && /*#__PURE__*/_jsx(UserLocationPuckHeading, {
|
|
43
|
+
sourceID: sourceID,
|
|
44
|
+
belowLayerID: "mlrn-user-location-puck-white",
|
|
45
|
+
heading: heading
|
|
46
|
+
})]
|
|
47
|
+
}));
|
|
48
|
+
//# sourceMappingURL=UserLocationPuck.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"names":["memo","CircleLayer","UserLocationPuckHeading","jsx","_jsx","Fragment","_Fragment","jsxs","_jsxs","blue","layerStyles","pulse","circleRadius","circleColor","circleOpacity","circlePitchAlignment","white","UserLocationPuck","sourceID","heading","children","id","style","belowLayerID"],"sourceRoot":"../../../src","sources":["components/UserLocationPuck.tsx"],"mappings":";;AAAA,SAASA,IAAI,QAAQ,OAAO;AAE5B,SAASC,WAAW,QAAQ,kBAAe;AAC3C,SAASC,uBAAuB,QAAQ,8BAA2B;AAAC,SAAAC,GAAA,IAAAC,IAAA,EAAAC,QAAA,IAAAC,SAAA,EAAAC,IAAA,IAAAC,KAAA;AAIpE,MAAMC,IAAI,GAAG,SAAS;AAEtB,MAAMC,WAAiE,GAAG;EACxEC,KAAK,EAAE;IACLC,YAAY,EAAE,EAAE;IAChBC,WAAW,EAAEJ,IAAI;IACjBK,aAAa,EAAE,GAAG;IAClBC,oBAAoB,EAAE;EACxB,CAAC;EACDC,KAAK,EAAE;IACLJ,YAAY,EAAE,CAAC;IACfC,WAAW,EAAE,MAAM;IACnBE,oBAAoB,EAAE;EACxB,CAAC;EACDN,IAAI,EAAE;IACJG,YAAY,EAAE,CAAC;IACfC,WAAW,EAAEJ,IAAI;IACjBM,oBAAoB,EAAE;EACxB;AACF,CAAC;AAQD,OAAO,MAAME,gBAAgB,gBAAGjB,IAAI,CAClC,CAAC;EAAEkB,QAAQ;EAAEC;AAA+B,CAAC,kBAC3CX,KAAA,CAAAF,SAAA;EAAAc,QAAA,gBACEhB,IAAA,CAACH,WAAW;IACVoB,EAAE,EAAC,+BAA+B;IAClCH,QAAQ,EAAEA,QAAS;IACnBI,KAAK,EAAEZ,WAAW,CAACC;EAAM,CAC1B,CAAC,eACFP,IAAA,CAACH,WAAW;IACVoB,EAAE,EAAC,+BAA+B;IAClCH,QAAQ,EAAEA,QAAS;IACnBI,KAAK,EAAEZ,WAAW,CAACM;EAAM,CAC1B,CAAC,eACFZ,IAAA,CAACH,WAAW;IACVoB,EAAE,EAAC,8BAA8B;IACjCH,QAAQ,EAAEA,QAAS;IACnBI,KAAK,EAAEZ,WAAW,CAACD;EAAK,CACzB,CAAC,EACD,OAAOU,OAAO,KAAK,QAAQ,iBAC1Bf,IAAA,CAACF,uBAAuB;IACtBgB,QAAQ,EAAEA,QAAS;IACnBK,YAAY,EAAC,+BAA+B;IAC5CJ,OAAO,EAAEA;EAAQ,CAClB,CACF;AAAA,CACD,CAEN,CAAC","ignoreList":[]}
|
|
@@ -1,22 +1,26 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
+
import { memo } from "react";
|
|
3
4
|
import { SymbolLayer } from "./SymbolLayer.js";
|
|
4
5
|
import headingIcon from "../assets/heading.png";
|
|
5
6
|
import { jsx as _jsx } from "react/jsx-runtime";
|
|
6
|
-
const
|
|
7
|
+
const layerStyle = {
|
|
7
8
|
iconImage: headingIcon,
|
|
8
9
|
iconAllowOverlap: true,
|
|
9
10
|
iconPitchAlignment: "map",
|
|
10
11
|
iconRotationAlignment: "map"
|
|
11
12
|
};
|
|
12
|
-
export const
|
|
13
|
+
export const UserLocationPuckHeading = /*#__PURE__*/memo(({
|
|
14
|
+
sourceID,
|
|
15
|
+
belowLayerID,
|
|
13
16
|
heading
|
|
14
17
|
}) => /*#__PURE__*/_jsx(SymbolLayer, {
|
|
15
|
-
id: "
|
|
16
|
-
|
|
18
|
+
id: "mlrn-user-location-puck-heading",
|
|
19
|
+
sourceID: sourceID,
|
|
20
|
+
belowLayerID: belowLayerID,
|
|
17
21
|
style: {
|
|
18
22
|
iconRotate: heading,
|
|
19
|
-
...
|
|
23
|
+
...layerStyle
|
|
20
24
|
}
|
|
21
|
-
}
|
|
22
|
-
//# sourceMappingURL=
|
|
25
|
+
}));
|
|
26
|
+
//# sourceMappingURL=UserLocationPuckHeading.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"names":["memo","SymbolLayer","headingIcon","jsx","_jsx","layerStyle","iconImage","iconAllowOverlap","iconPitchAlignment","iconRotationAlignment","UserLocationPuckHeading","sourceID","belowLayerID","heading","id","style","iconRotate"],"sourceRoot":"../../../src","sources":["components/UserLocationPuckHeading.tsx"],"mappings":";;AAAA,SAASA,IAAI,QAAQ,OAAO;AAE5B,SAASC,WAAW,QAAQ,kBAAe;AAC3C,OAAOC,WAAW,MAAM,uBAAuB;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAIhD,MAAMC,UAA4B,GAAG;EACnCC,SAAS,EAAEJ,WAAW;EACtBK,gBAAgB,EAAE,IAAI;EACtBC,kBAAkB,EAAE,KAAK;EACzBC,qBAAqB,EAAE;AACzB,CAAC;AAQD,OAAO,MAAMC,uBAAuB,gBAAGV,IAAI,CACzC,CAAC;EAAEW,QAAQ;EAAEC,YAAY;EAAEC;AAAsC,CAAC,kBAChET,IAAA,CAACH,WAAW;EACVa,EAAE,EAAC,iCAAiC;EACpCH,QAAQ,EAAEA,QAAS;EACnBC,YAAY,EAAEA,YAAa;EAC3BG,KAAK,EAAE;IACLC,UAAU,EAAEH,OAAO;IACnB,GAAGR;EACL;AAAE,CACH,CAEL,CAAC","ignoreList":[]}
|
|
@@ -2,8 +2,7 @@
|
|
|
2
2
|
|
|
3
3
|
import { Animated } from "react-native";
|
|
4
4
|
|
|
5
|
-
//
|
|
6
|
-
// https://github.com/facebook/react-native/blob/master/Libraries/Animated/src/nodes/AnimatedWithChildren.js
|
|
5
|
+
// https://github.com/facebook/react-native/blob/main/packages/react-native/Libraries/Animated/nodes/AnimatedWithChildren.js
|
|
7
6
|
const AnimatedWithChildren = Object.getPrototypeOf(Animated.ValueXY);
|
|
8
7
|
if (__DEV__) {
|
|
9
8
|
if (AnimatedWithChildren.name !== "AnimatedWithChildren") {
|
|
@@ -14,16 +13,16 @@ const defaultConfig = {
|
|
|
14
13
|
useNativeDriver: false
|
|
15
14
|
};
|
|
16
15
|
export class AbstractAnimatedCoordinates extends AnimatedWithChildren {
|
|
17
|
-
constructor(
|
|
16
|
+
constructor(coordinates) {
|
|
18
17
|
super();
|
|
19
|
-
this.state = this.onInitialState(
|
|
18
|
+
this.state = this.onInitialState(coordinates);
|
|
20
19
|
}
|
|
21
20
|
|
|
22
21
|
/**
|
|
23
22
|
* Subclasses can override to calculate initial state
|
|
24
23
|
*
|
|
25
|
-
* @param {AnimatedCoordinates} coordinatesArray - to value from animate
|
|
26
24
|
* @returns {object} - the state object
|
|
25
|
+
* @param coordinates
|
|
27
26
|
*/
|
|
28
27
|
|
|
29
28
|
/**
|
|
@@ -37,7 +36,6 @@ export class AbstractAnimatedCoordinates extends AnimatedWithChildren {
|
|
|
37
36
|
animate(progressValue, progressAnimation, config) {
|
|
38
37
|
const onAnimationStart = animation => {
|
|
39
38
|
if (this.animation) {
|
|
40
|
-
// there was a started but not finsihed animation
|
|
41
39
|
const actProgress = this.progressValue.__getValue();
|
|
42
40
|
this.animation.stop();
|
|
43
41
|
this.state = this.onCalculate(this.state, actProgress);
|
|
@@ -64,7 +62,10 @@ export class AbstractAnimatedCoordinates extends AnimatedWithChildren {
|
|
|
64
62
|
...defaultConfig,
|
|
65
63
|
...config,
|
|
66
64
|
toValue: 1.0
|
|
67
|
-
}),
|
|
65
|
+
}), {
|
|
66
|
+
...defaultConfig,
|
|
67
|
+
...config
|
|
68
|
+
});
|
|
68
69
|
}
|
|
69
70
|
spring(config) {
|
|
70
71
|
const progressValue = new Animated.Value(0.0);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["Animated","AnimatedWithChildren","Object","getPrototypeOf","ValueXY","__DEV__","name","console","error","defaultConfig","useNativeDriver","AbstractAnimatedCoordinates","constructor","
|
|
1
|
+
{"version":3,"names":["Animated","AnimatedWithChildren","Object","getPrototypeOf","ValueXY","__DEV__","name","console","error","defaultConfig","useNativeDriver","AbstractAnimatedCoordinates","constructor","coordinates","state","onInitialState","animate","progressValue","progressAnimation","config","onAnimationStart","animation","actProgress","__getValue","stop","onCalculate","__removeChild","__addChild","onStart","toValue","origAnimationStart","start","newAnimation","args","timing","Value","spring","decay","onGetValue"],"sourceRoot":"../../../../src","sources":["utils/animated/AbstractAnimatedCoordinates.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -1,9 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
3
|
import { Animated } from "react-native";
|
|
4
|
-
|
|
5
|
-
// see
|
|
6
|
-
// https://github.com/facebook/react-native/blob/master/Libraries/Animated/src/nodes/AnimatedWithChildren.js
|
|
4
|
+
// https://github.com/facebook/react-native/blob/main/packages/react-native/Libraries/Animated/nodes/AnimatedWithChildren.js
|
|
7
5
|
const AnimatedWithChildren = Object.getPrototypeOf(Animated.ValueXY);
|
|
8
6
|
if (__DEV__) {
|
|
9
7
|
if (AnimatedWithChildren.name !== "AnimatedWithChildren") {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["Animated","AnimatedWithChildren","Object","getPrototypeOf","ValueXY","__DEV__","name","console","error","AnimatedExtractCoordinateFromArray","_index","constructor","array","index","_array","__getValue","actArray","length","__attach","__addChild","__detach","__removeChild"],"sourceRoot":"../../../../src","sources":["utils/animated/AnimatedExtractCoordinateFromArray.ts"],"mappings":";;AAAA,SAASA,QAAQ,QAAQ,cAAc
|
|
1
|
+
{"version":3,"names":["Animated","AnimatedWithChildren","Object","getPrototypeOf","ValueXY","__DEV__","name","console","error","AnimatedExtractCoordinateFromArray","_index","constructor","array","index","_array","__getValue","actArray","length","__attach","__addChild","__detach","__removeChild"],"sourceRoot":"../../../../src","sources":["utils/animated/AnimatedExtractCoordinateFromArray.ts"],"mappings":";;AAAA,SAASA,QAAQ,QAAQ,cAAc;AAKvC;AACA,MAAMC,oBAAoB,GAAGC,MAAM,CAACC,cAAc,CAACH,QAAQ,CAACI,OAAO,CAAC;AAEpE,IAAIC,OAAO,EAAE;EACX,IAAIJ,oBAAoB,CAACK,IAAI,KAAK,sBAAsB,EAAE;IACxDC,OAAO,CAACC,KAAK,CACX,2EACF,CAAC;EACH;AACF;AAEA,OAAO,MAAMC,kCAAkC,SAASR,oBAAoB,CAAC;EAG3ES,MAAM,GAAG,CAAC;EAEVC,WAAWA,CAACC,KAAoC,EAAEC,KAAa,EAAE;IAC/D,KAAK,CAAC,CAAC;IACP,IAAI,CAACC,MAAM,GAAGF,KAAK;IACnB,IAAI,CAACF,MAAM,GAAGG,KAAK;EACrB;EAEAE,UAAUA,CAAA,EAAwB;IAChC,MAAMC,QAAQ,GAAG,IAAI,CAACF,MAAM,CAACC,UAAU,CAAC,CAAC;IACzC,IAAIF,KAAK,GAAG,IAAI,CAACH,MAAM;IAEvB,IAAIG,KAAK,GAAG,CAAC,EAAE;MACbA,KAAK,IAAIG,QAAQ,CAACC,MAAM;IAC1B;IAEA,OAAOD,QAAQ,CAACH,KAAK,CAAC;EACxB;EAEAK,QAAQA,CAAA,EAAS;IACf,IAAI,CAACJ,MAAM,CAACK,UAAU,CAAC,IAAI,CAAC;EAC9B;EAEAC,QAAQA,CAAA,EAAS;IACf,IAAI,CAACN,MAAM,CAACO,aAAa,CAAC,IAAI,CAAC;IAC/B,KAAK,CAACD,QAAQ,CAAC,CAAC;EAClB;AACF","ignoreList":[]}
|