@tamagui/animations-react-native 1.22.9 → 1.22.11
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/dist/cjs/createAnimations.js +13 -13
- package/dist/cjs/createAnimations.js.map +1 -1
- package/dist/esm/createAnimations.js +13 -13
- package/dist/esm/createAnimations.js.map +1 -1
- package/dist/esm/createAnimations.mjs +13 -13
- package/dist/esm/createAnimations.mjs.map +1 -1
- package/package.json +4 -4
- package/src/createAnimations.tsx +17 -15
- package/types/createAnimations.d.ts.map +1 -1
|
@@ -196,14 +196,14 @@ function createAnimations(animations) {
|
|
|
196
196
|
var _a2;
|
|
197
197
|
return [
|
|
198
198
|
k,
|
|
199
|
-
((_a2 = animationsState.current.get(v)) == null ? void 0 : _a2.
|
|
199
|
+
((_a2 = animationsState.current.get(v)) == null ? void 0 : _a2.interpolation) || v
|
|
200
200
|
];
|
|
201
201
|
})
|
|
202
202
|
),
|
|
203
203
|
transform: animatedTranforms.current.map((r) => {
|
|
204
204
|
var _a2;
|
|
205
205
|
const key = Object.keys(r)[0];
|
|
206
|
-
const val = ((_a2 = animationsState.current.get(r[key])) == null ? void 0 : _a2.
|
|
206
|
+
const val = ((_a2 = animationsState.current.get(r[key])) == null ? void 0 : _a2.interpolation) || r[key];
|
|
207
207
|
return { [key]: val };
|
|
208
208
|
})
|
|
209
209
|
};
|
|
@@ -215,33 +215,33 @@ function createAnimations(animations) {
|
|
|
215
215
|
function update(key, animated, valIn) {
|
|
216
216
|
const isColorStyleKey = colorStyleKey[key];
|
|
217
217
|
const [val, type] = isColorStyleKey ? [0, void 0] : getValue(valIn);
|
|
218
|
-
let
|
|
218
|
+
let animateToValue = val;
|
|
219
219
|
const value = animated || new import_react_native.Animated.Value(val);
|
|
220
|
+
const curInterpolation = animationsState.current.get(value);
|
|
220
221
|
let interpolateArgs;
|
|
221
222
|
if (type) {
|
|
222
|
-
const curInterpolation = animationsState.current.get(value);
|
|
223
223
|
interpolateArgs = getInterpolated(
|
|
224
224
|
(curInterpolation == null ? void 0 : curInterpolation.current) ?? value["_value"],
|
|
225
225
|
val,
|
|
226
226
|
type
|
|
227
227
|
);
|
|
228
228
|
animationsState.current.set(value, {
|
|
229
|
-
|
|
229
|
+
interpolation: value.interpolate(interpolateArgs),
|
|
230
230
|
current: val
|
|
231
231
|
});
|
|
232
232
|
}
|
|
233
233
|
if (isColorStyleKey) {
|
|
234
|
-
|
|
234
|
+
animateToValue = (curInterpolation == null ? void 0 : curInterpolation.animateToValue) ? 0 : 1;
|
|
235
235
|
interpolateArgs = getColorInterpolated(
|
|
236
236
|
curInterpolation == null ? void 0 : curInterpolation.current,
|
|
237
|
-
// valIn is the
|
|
237
|
+
// valIn is the next color
|
|
238
238
|
valIn,
|
|
239
|
-
|
|
239
|
+
animateToValue
|
|
240
240
|
);
|
|
241
|
-
animateToVal = value["_value"] === 1 ? 0 : 1;
|
|
242
241
|
animationsState.current.set(value, {
|
|
243
242
|
current: valIn,
|
|
244
|
-
|
|
243
|
+
interpolation: value.interpolate(interpolateArgs),
|
|
244
|
+
animateToValue: (curInterpolation == null ? void 0 : curInterpolation.animateToValue) ? 0 : 1
|
|
245
245
|
});
|
|
246
246
|
}
|
|
247
247
|
if (value) {
|
|
@@ -255,7 +255,7 @@ function createAnimations(animations) {
|
|
|
255
255
|
value.stopAnimation();
|
|
256
256
|
function getAnimation() {
|
|
257
257
|
return import_react_native.Animated[animationConfig.type || "spring"](value, {
|
|
258
|
-
toValue:
|
|
258
|
+
toValue: animateToValue,
|
|
259
259
|
useNativeDriver: !import_web.isWeb && !isThereNoNativeStyleKeys,
|
|
260
260
|
...animationConfig
|
|
261
261
|
});
|
|
@@ -303,10 +303,10 @@ function createAnimations(animations) {
|
|
|
303
303
|
}
|
|
304
304
|
};
|
|
305
305
|
}
|
|
306
|
-
function getColorInterpolated(currentColor, nextColor,
|
|
306
|
+
function getColorInterpolated(currentColor, nextColor, animateToValue) {
|
|
307
307
|
const inputRange = [0, 1];
|
|
308
308
|
const outputRange = [currentColor ? currentColor : nextColor, nextColor];
|
|
309
|
-
if (
|
|
309
|
+
if (animateToValue === 0) {
|
|
310
310
|
outputRange.reverse();
|
|
311
311
|
}
|
|
312
312
|
return {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/createAnimations.tsx"],
|
|
4
|
-
"mappings": "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
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["_a", "res"]
|
|
6
6
|
}
|
|
@@ -173,14 +173,14 @@ function createAnimations(animations) {
|
|
|
173
173
|
var _a2;
|
|
174
174
|
return [
|
|
175
175
|
k,
|
|
176
|
-
((_a2 = animationsState.current.get(v)) == null ? void 0 : _a2.
|
|
176
|
+
((_a2 = animationsState.current.get(v)) == null ? void 0 : _a2.interpolation) || v
|
|
177
177
|
];
|
|
178
178
|
})
|
|
179
179
|
),
|
|
180
180
|
transform: animatedTranforms.current.map((r) => {
|
|
181
181
|
var _a2;
|
|
182
182
|
const key = Object.keys(r)[0];
|
|
183
|
-
const val = ((_a2 = animationsState.current.get(r[key])) == null ? void 0 : _a2.
|
|
183
|
+
const val = ((_a2 = animationsState.current.get(r[key])) == null ? void 0 : _a2.interpolation) || r[key];
|
|
184
184
|
return { [key]: val };
|
|
185
185
|
})
|
|
186
186
|
};
|
|
@@ -192,33 +192,33 @@ function createAnimations(animations) {
|
|
|
192
192
|
function update(key, animated, valIn) {
|
|
193
193
|
const isColorStyleKey = colorStyleKey[key];
|
|
194
194
|
const [val, type] = isColorStyleKey ? [0, void 0] : getValue(valIn);
|
|
195
|
-
let
|
|
195
|
+
let animateToValue = val;
|
|
196
196
|
const value = animated || new Animated.Value(val);
|
|
197
|
+
const curInterpolation = animationsState.current.get(value);
|
|
197
198
|
let interpolateArgs;
|
|
198
199
|
if (type) {
|
|
199
|
-
const curInterpolation = animationsState.current.get(value);
|
|
200
200
|
interpolateArgs = getInterpolated(
|
|
201
201
|
(curInterpolation == null ? void 0 : curInterpolation.current) ?? value["_value"],
|
|
202
202
|
val,
|
|
203
203
|
type
|
|
204
204
|
);
|
|
205
205
|
animationsState.current.set(value, {
|
|
206
|
-
|
|
206
|
+
interpolation: value.interpolate(interpolateArgs),
|
|
207
207
|
current: val
|
|
208
208
|
});
|
|
209
209
|
}
|
|
210
210
|
if (isColorStyleKey) {
|
|
211
|
-
|
|
211
|
+
animateToValue = (curInterpolation == null ? void 0 : curInterpolation.animateToValue) ? 0 : 1;
|
|
212
212
|
interpolateArgs = getColorInterpolated(
|
|
213
213
|
curInterpolation == null ? void 0 : curInterpolation.current,
|
|
214
|
-
// valIn is the
|
|
214
|
+
// valIn is the next color
|
|
215
215
|
valIn,
|
|
216
|
-
|
|
216
|
+
animateToValue
|
|
217
217
|
);
|
|
218
|
-
animateToVal = value["_value"] === 1 ? 0 : 1;
|
|
219
218
|
animationsState.current.set(value, {
|
|
220
219
|
current: valIn,
|
|
221
|
-
|
|
220
|
+
interpolation: value.interpolate(interpolateArgs),
|
|
221
|
+
animateToValue: (curInterpolation == null ? void 0 : curInterpolation.animateToValue) ? 0 : 1
|
|
222
222
|
});
|
|
223
223
|
}
|
|
224
224
|
if (value) {
|
|
@@ -232,7 +232,7 @@ function createAnimations(animations) {
|
|
|
232
232
|
value.stopAnimation();
|
|
233
233
|
function getAnimation() {
|
|
234
234
|
return Animated[animationConfig.type || "spring"](value, {
|
|
235
|
-
toValue:
|
|
235
|
+
toValue: animateToValue,
|
|
236
236
|
useNativeDriver: !isWeb && !isThereNoNativeStyleKeys,
|
|
237
237
|
...animationConfig
|
|
238
238
|
});
|
|
@@ -280,10 +280,10 @@ function createAnimations(animations) {
|
|
|
280
280
|
}
|
|
281
281
|
};
|
|
282
282
|
}
|
|
283
|
-
function getColorInterpolated(currentColor, nextColor,
|
|
283
|
+
function getColorInterpolated(currentColor, nextColor, animateToValue) {
|
|
284
284
|
const inputRange = [0, 1];
|
|
285
285
|
const outputRange = [currentColor ? currentColor : nextColor, nextColor];
|
|
286
|
-
if (
|
|
286
|
+
if (animateToValue === 0) {
|
|
287
287
|
outputRange.reverse();
|
|
288
288
|
}
|
|
289
289
|
return {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/createAnimations.tsx"],
|
|
4
|
-
"mappings": "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
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["_a", "res"]
|
|
6
6
|
}
|
|
@@ -173,14 +173,14 @@ function createAnimations(animations) {
|
|
|
173
173
|
var _a2;
|
|
174
174
|
return [
|
|
175
175
|
k,
|
|
176
|
-
((_a2 = animationsState.current.get(v)) == null ? void 0 : _a2.
|
|
176
|
+
((_a2 = animationsState.current.get(v)) == null ? void 0 : _a2.interpolation) || v
|
|
177
177
|
];
|
|
178
178
|
})
|
|
179
179
|
),
|
|
180
180
|
transform: animatedTranforms.current.map((r) => {
|
|
181
181
|
var _a2;
|
|
182
182
|
const key = Object.keys(r)[0];
|
|
183
|
-
const val = ((_a2 = animationsState.current.get(r[key])) == null ? void 0 : _a2.
|
|
183
|
+
const val = ((_a2 = animationsState.current.get(r[key])) == null ? void 0 : _a2.interpolation) || r[key];
|
|
184
184
|
return { [key]: val };
|
|
185
185
|
})
|
|
186
186
|
};
|
|
@@ -192,33 +192,33 @@ function createAnimations(animations) {
|
|
|
192
192
|
function update(key, animated, valIn) {
|
|
193
193
|
const isColorStyleKey = colorStyleKey[key];
|
|
194
194
|
const [val, type] = isColorStyleKey ? [0, void 0] : getValue(valIn);
|
|
195
|
-
let
|
|
195
|
+
let animateToValue = val;
|
|
196
196
|
const value = animated || new Animated.Value(val);
|
|
197
|
+
const curInterpolation = animationsState.current.get(value);
|
|
197
198
|
let interpolateArgs;
|
|
198
199
|
if (type) {
|
|
199
|
-
const curInterpolation = animationsState.current.get(value);
|
|
200
200
|
interpolateArgs = getInterpolated(
|
|
201
201
|
(curInterpolation == null ? void 0 : curInterpolation.current) ?? value["_value"],
|
|
202
202
|
val,
|
|
203
203
|
type
|
|
204
204
|
);
|
|
205
205
|
animationsState.current.set(value, {
|
|
206
|
-
|
|
206
|
+
interpolation: value.interpolate(interpolateArgs),
|
|
207
207
|
current: val
|
|
208
208
|
});
|
|
209
209
|
}
|
|
210
210
|
if (isColorStyleKey) {
|
|
211
|
-
|
|
211
|
+
animateToValue = (curInterpolation == null ? void 0 : curInterpolation.animateToValue) ? 0 : 1;
|
|
212
212
|
interpolateArgs = getColorInterpolated(
|
|
213
213
|
curInterpolation == null ? void 0 : curInterpolation.current,
|
|
214
|
-
// valIn is the
|
|
214
|
+
// valIn is the next color
|
|
215
215
|
valIn,
|
|
216
|
-
|
|
216
|
+
animateToValue
|
|
217
217
|
);
|
|
218
|
-
animateToVal = value["_value"] === 1 ? 0 : 1;
|
|
219
218
|
animationsState.current.set(value, {
|
|
220
219
|
current: valIn,
|
|
221
|
-
|
|
220
|
+
interpolation: value.interpolate(interpolateArgs),
|
|
221
|
+
animateToValue: (curInterpolation == null ? void 0 : curInterpolation.animateToValue) ? 0 : 1
|
|
222
222
|
});
|
|
223
223
|
}
|
|
224
224
|
if (value) {
|
|
@@ -232,7 +232,7 @@ function createAnimations(animations) {
|
|
|
232
232
|
value.stopAnimation();
|
|
233
233
|
function getAnimation() {
|
|
234
234
|
return Animated[animationConfig.type || "spring"](value, {
|
|
235
|
-
toValue:
|
|
235
|
+
toValue: animateToValue,
|
|
236
236
|
useNativeDriver: !isWeb && !isThereNoNativeStyleKeys,
|
|
237
237
|
...animationConfig
|
|
238
238
|
});
|
|
@@ -280,10 +280,10 @@ function createAnimations(animations) {
|
|
|
280
280
|
}
|
|
281
281
|
};
|
|
282
282
|
}
|
|
283
|
-
function getColorInterpolated(currentColor, nextColor,
|
|
283
|
+
function getColorInterpolated(currentColor, nextColor, animateToValue) {
|
|
284
284
|
const inputRange = [0, 1];
|
|
285
285
|
const outputRange = [currentColor ? currentColor : nextColor, nextColor];
|
|
286
|
-
if (
|
|
286
|
+
if (animateToValue === 0) {
|
|
287
287
|
outputRange.reverse();
|
|
288
288
|
}
|
|
289
289
|
return {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/createAnimations.tsx"],
|
|
4
|
-
"mappings": "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
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["_a", "res"]
|
|
6
6
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tamagui/animations-react-native",
|
|
3
|
-
"version": "1.22.
|
|
3
|
+
"version": "1.22.11",
|
|
4
4
|
"source": "src/index.ts",
|
|
5
5
|
"sideEffects": [
|
|
6
6
|
"./polyfill.js"
|
|
@@ -15,11 +15,11 @@
|
|
|
15
15
|
"dist"
|
|
16
16
|
],
|
|
17
17
|
"dependencies": {
|
|
18
|
-
"@tamagui/use-presence": "1.22.
|
|
19
|
-
"@tamagui/web": "1.22.
|
|
18
|
+
"@tamagui/use-presence": "1.22.11",
|
|
19
|
+
"@tamagui/web": "1.22.11"
|
|
20
20
|
},
|
|
21
21
|
"devDependencies": {
|
|
22
|
-
"@tamagui/build": "1.22.
|
|
22
|
+
"@tamagui/build": "1.22.11",
|
|
23
23
|
"react": "^18.2.0",
|
|
24
24
|
"react-native": "^0.71.7"
|
|
25
25
|
},
|
package/src/createAnimations.tsx
CHANGED
|
@@ -177,8 +177,10 @@ export function createAnimations<A extends AnimationsConfig>(
|
|
|
177
177
|
new WeakMap<
|
|
178
178
|
Animated.Value,
|
|
179
179
|
{
|
|
180
|
-
|
|
180
|
+
interpolation: Animated.AnimatedInterpolation<any>
|
|
181
181
|
current?: number | string | undefined
|
|
182
|
+
// only for colors
|
|
183
|
+
animateToValue?: number
|
|
182
184
|
}
|
|
183
185
|
>()
|
|
184
186
|
)
|
|
@@ -238,12 +240,12 @@ export function createAnimations<A extends AnimationsConfig>(
|
|
|
238
240
|
...Object.fromEntries(
|
|
239
241
|
Object.entries(animateStyles.current).map(([k, v]) => [
|
|
240
242
|
k,
|
|
241
|
-
animationsState.current!.get(v)?.
|
|
243
|
+
animationsState.current!.get(v)?.interpolation || v,
|
|
242
244
|
])
|
|
243
245
|
),
|
|
244
246
|
transform: animatedTranforms.current.map((r) => {
|
|
245
247
|
const key = Object.keys(r)[0]
|
|
246
|
-
const val = animationsState.current!.get(r[key])?.
|
|
248
|
+
const val = animationsState.current!.get(r[key])?.interpolation || r[key]
|
|
247
249
|
return { [key]: val }
|
|
248
250
|
}),
|
|
249
251
|
}
|
|
@@ -261,35 +263,35 @@ export function createAnimations<A extends AnimationsConfig>(
|
|
|
261
263
|
) {
|
|
262
264
|
const isColorStyleKey = colorStyleKey[key]
|
|
263
265
|
const [val, type] = isColorStyleKey ? [0, undefined] : getValue(valIn)
|
|
264
|
-
let
|
|
266
|
+
let animateToValue = val
|
|
265
267
|
const value = animated || new Animated.Value(val)
|
|
266
268
|
|
|
269
|
+
const curInterpolation = animationsState.current.get(value)
|
|
267
270
|
let interpolateArgs: any
|
|
268
271
|
if (type) {
|
|
269
|
-
const curInterpolation = animationsState.current.get(value)
|
|
270
272
|
interpolateArgs = getInterpolated(
|
|
271
273
|
curInterpolation?.current ?? value['_value'],
|
|
272
274
|
val,
|
|
273
275
|
type
|
|
274
276
|
)
|
|
275
277
|
animationsState.current!.set(value, {
|
|
276
|
-
|
|
278
|
+
interpolation: value.interpolate(interpolateArgs),
|
|
277
279
|
current: val,
|
|
278
280
|
})
|
|
279
281
|
}
|
|
280
282
|
|
|
281
283
|
if (isColorStyleKey) {
|
|
282
|
-
|
|
284
|
+
animateToValue = curInterpolation?.animateToValue ? 0 : 1
|
|
283
285
|
interpolateArgs = getColorInterpolated(
|
|
284
286
|
curInterpolation?.current as string,
|
|
285
|
-
// valIn is the
|
|
287
|
+
// valIn is the next color
|
|
286
288
|
valIn as string,
|
|
287
|
-
|
|
289
|
+
animateToValue
|
|
288
290
|
)
|
|
289
|
-
animateToVal = value['_value'] === 1 ? 0 : 1
|
|
290
291
|
animationsState.current!.set(value, {
|
|
291
292
|
current: valIn,
|
|
292
|
-
|
|
293
|
+
interpolation: value.interpolate(interpolateArgs),
|
|
294
|
+
animateToValue: curInterpolation?.animateToValue ? 0 : 1,
|
|
293
295
|
})
|
|
294
296
|
}
|
|
295
297
|
|
|
@@ -307,7 +309,7 @@ export function createAnimations<A extends AnimationsConfig>(
|
|
|
307
309
|
|
|
308
310
|
function getAnimation() {
|
|
309
311
|
return Animated[animationConfig.type || 'spring'](value, {
|
|
310
|
-
toValue:
|
|
312
|
+
toValue: animateToValue,
|
|
311
313
|
useNativeDriver: !isWeb && !isThereNoNativeStyleKeys,
|
|
312
314
|
...animationConfig,
|
|
313
315
|
})
|
|
@@ -369,12 +371,12 @@ export function createAnimations<A extends AnimationsConfig>(
|
|
|
369
371
|
function getColorInterpolated(
|
|
370
372
|
currentColor: string | undefined,
|
|
371
373
|
nextColor: string,
|
|
372
|
-
|
|
374
|
+
animateToValue: number
|
|
373
375
|
) {
|
|
374
376
|
const inputRange = [0, 1]
|
|
375
377
|
const outputRange = [currentColor ? currentColor : nextColor, nextColor]
|
|
376
|
-
if (
|
|
377
|
-
// because
|
|
378
|
+
if (animateToValue === 0) {
|
|
379
|
+
// because we are animating from value 1 to 0, we need to put target color at the beginning
|
|
378
380
|
outputRange.reverse()
|
|
379
381
|
}
|
|
380
382
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createAnimations.d.ts","sourceRoot":"","sources":["../src/createAnimations.tsx"],"names":[],"mappings":"AACA,OAAO,EAEL,eAAe,EAEf,uBAAuB,EAKxB,MAAM,cAAc,CAAA;AAErB,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAA;AAEvC,KAAK,gBAAgB,CAAC,CAAC,SAAS,MAAM,GAAG,GAAG,IAAI;KAC7C,GAAG,IAAI,MAAM,CAAC,GAAG,eAAe;CAClC,CAAA;AAED,KAAK,YAAY,GAAG;IAAE,IAAI,CAAC,EAAE,QAAQ,CAAA;CAAE,GAAG,OAAO,CAC/C,IAAI,CACF,QAAQ,CAAC,qBAAqB,EAC5B,OAAO,GACP,YAAY,GACZ,SAAS,GACT,UAAU,GACV,MAAM,GACN,mBAAmB,GACnB,OAAO,GACP,WAAW,GACX,SAAS,GACT,UAAU,CACb,CACF,CAAA;AAED,KAAK,YAAY,GAAG;IAAE,IAAI,EAAE,QAAQ,CAAA;CAAE,GAAG,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAC,CAAA;AAEhF,KAAK,eAAe,GAAG,YAAY,GAAG,YAAY,CAAA;AAgClD,eAAO,MAAM,YAAY,gEAAgB,CAAA;AACzC,eAAO,MAAM,YAAY,gEAAgB,CAAA;AAEzC,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,MAAM,GACd,uBAAuB,CAAC,QAAQ,CAAC,KAAK,CAAC,CAoDzC;AAED,wBAAgB,yBAAyB,CACvC,EACE,KAAK,GACN,EAAE;IACD,KAAK,EAAE,uBAAuB,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;CAC/C,EACD,OAAO,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,QAYnC;AAED,wBAAgB,sBAAsB,CAAC,CAAC,SAAS,uBAAuB,CAAC,QAAQ,CAAC,KAAK,CAAC,EACtF,KAAK,EAAE,CAAC,EACR,QAAQ,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,GAAG,OAG9B;AAED,wBAAgB,gBAAgB,CAAC,CAAC,SAAS,gBAAgB,EACzD,UAAU,EAAE,CAAC,GACZ,eAAe,CAAC,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"createAnimations.d.ts","sourceRoot":"","sources":["../src/createAnimations.tsx"],"names":[],"mappings":"AACA,OAAO,EAEL,eAAe,EAEf,uBAAuB,EAKxB,MAAM,cAAc,CAAA;AAErB,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAA;AAEvC,KAAK,gBAAgB,CAAC,CAAC,SAAS,MAAM,GAAG,GAAG,IAAI;KAC7C,GAAG,IAAI,MAAM,CAAC,GAAG,eAAe;CAClC,CAAA;AAED,KAAK,YAAY,GAAG;IAAE,IAAI,CAAC,EAAE,QAAQ,CAAA;CAAE,GAAG,OAAO,CAC/C,IAAI,CACF,QAAQ,CAAC,qBAAqB,EAC5B,OAAO,GACP,YAAY,GACZ,SAAS,GACT,UAAU,GACV,MAAM,GACN,mBAAmB,GACnB,OAAO,GACP,WAAW,GACX,SAAS,GACT,UAAU,CACb,CACF,CAAA;AAED,KAAK,YAAY,GAAG;IAAE,IAAI,EAAE,QAAQ,CAAA;CAAE,GAAG,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAC,CAAA;AAEhF,KAAK,eAAe,GAAG,YAAY,GAAG,YAAY,CAAA;AAgClD,eAAO,MAAM,YAAY,gEAAgB,CAAA;AACzC,eAAO,MAAM,YAAY,gEAAgB,CAAA;AAEzC,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,MAAM,GACd,uBAAuB,CAAC,QAAQ,CAAC,KAAK,CAAC,CAoDzC;AAED,wBAAgB,yBAAyB,CACvC,EACE,KAAK,GACN,EAAE;IACD,KAAK,EAAE,uBAAuB,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;CAC/C,EACD,OAAO,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,QAYnC;AAED,wBAAgB,sBAAsB,CAAC,CAAC,SAAS,uBAAuB,CAAC,QAAQ,CAAC,KAAK,CAAC,EACtF,KAAK,EAAE,CAAC,EACR,QAAQ,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,GAAG,OAG9B;AAED,wBAAgB,gBAAgB,CAAC,CAAC,SAAS,gBAAgB,EACzD,UAAU,EAAE,CAAC,GACZ,eAAe,CAAC,CAAC,CAAC,CAoNpB"}
|