@tamagui/animations-moti 1.90.3 → 1.90.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.
@@ -29,8 +29,11 @@ var import_use_presence = require("@tamagui/use-presence"), import_web = require
29
29
  function createTamaguiAnimatedComponent(tag = "div") {
30
30
  const Component = import_react_native_reanimated.default.createAnimatedComponent(
31
31
  (0, import_react.forwardRef)(({ forwardedRef, style, ...props }, ref) => {
32
- const composedRefs = (0, import_web.useComposedRefs)(forwardedRef, ref), Element = props.tag || tag;
33
- return style && Array.isArray(style.transform) && (style.transform = (0, import_web.transformsToString)(style.transform)), /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Element, { ...props, style, ref: composedRefs });
32
+ const composedRefs = (0, import_web.useComposedRefs)(forwardedRef, ref), Element = props.tag || tag, webStyle = style;
33
+ (0, import_web.styleToCSS)(style), Array.isArray(webStyle.transform) && (style.transform = (0, import_web.transformsToString)(style.transform));
34
+ for (const key in style)
35
+ style[key] = (0, import_web.normalizeValueWithProperty)(style[key], key);
36
+ return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Element, { ...props, style, ref: composedRefs });
34
37
  })
35
38
  );
36
39
  return Component.acceptTagProp = !0, Component;
@@ -38,7 +41,11 @@ function createTamaguiAnimatedComponent(tag = "div") {
38
41
  const AnimatedView = createTamaguiAnimatedComponent("div"), AnimatedText = createTamaguiAnimatedComponent("span"), neverAnimate = {
39
42
  alignItems: !0,
40
43
  backdropFilter: !0,
44
+ borderBottomStyle: !0,
45
+ borderLeftStyle: !0,
46
+ borderRightStyle: !0,
41
47
  borderStyle: !0,
48
+ borderTopStyle: !0,
42
49
  boxSizing: !0,
43
50
  contain: !0,
44
51
  cursor: !0,
@@ -49,23 +56,27 @@ const AnimatedView = createTamaguiAnimatedComponent("div"), AnimatedText = creat
49
56
  justifyContent: !0,
50
57
  maxHeight: !0,
51
58
  maxWidth: !0,
59
+ minHeight: !0,
60
+ minWidth: !0,
61
+ outlineStyle: !0,
52
62
  overflow: !0,
53
63
  overflowX: !0,
54
64
  overflowY: !0,
65
+ pointerEvents: !0,
55
66
  position: !0,
56
67
  shadowColor: !0,
57
68
  textAlign: !0,
58
69
  textOverflow: !0,
59
70
  whiteSpace: !0,
60
71
  wordWrap: !0,
61
- zIndex: !0
72
+ zIndex: !0,
73
+ fontFamily: !0,
74
+ lineHeight: !0
62
75
  };
63
76
  function createAnimations(animations) {
64
77
  return {
65
- // View: isWeb ? AnimatedView : Animated.View,
66
- // Text: isWeb ? AnimatedText : Animated.Text,
67
- View: import_react_native_reanimated.default.View,
68
- Text: import_react_native_reanimated.default.Text,
78
+ View: import_web.isWeb ? AnimatedView : import_react_native_reanimated.default.View,
79
+ Text: import_web.isWeb ? AnimatedText : import_react_native_reanimated.default.Text,
69
80
  isReactNative: !0,
70
81
  animations,
71
82
  usePresence: import_use_presence.usePresence,
@@ -120,21 +131,13 @@ function createAnimations(animations) {
120
131
  else {
121
132
  const animateOnly = props.animateOnly;
122
133
  for (const key in style)
123
- neverAnimate[key] || animateOnly && !animateOnly.includes(key) ? dontAnimate[key] = style[key] : animate[key] = style[key];
134
+ !import_web.stylePropsAll[key] || neverAnimate[key] || animateOnly && !animateOnly.includes(key) ? dontAnimate[key] = style[key] : animate[key] = style[key];
124
135
  }
125
- const animateStr = JSON.stringify(animate), styles = (0, import_react.useMemo)(() => JSON.parse(animateStr), [animateStr]), isExiting = !!presence?.[1], sendExitComplete = presence?.[1], onDidAnimateCombined = (0, import_react.useCallback)(() => {
126
- onDidAnimate?.(), sendExitComplete?.();
127
- }, []), motiProps = {
136
+ const animateStr = JSON.stringify(animate), styles = (0, import_react.useMemo)(() => JSON.parse(animateStr), [animateStr]), isExiting = !!presence?.[1], presenceContext = (0, import_react.useContext)(import_use_presence.PresenceContext), usePresenceValue = presence || void 0, motiProps = {
128
137
  animate: isExiting || isHydrating ? {} : styles,
129
138
  transition: animations[animationKey],
130
- // isHydrating
131
- // ? ({ type: 'timing', duration: 0 } as const)
132
- // : componentState.unmounted
133
- // ? { type: 'timing', duration: 0 }
134
- // : animations[animationKey as keyof typeof animations]
135
- onDidAnimate: onDidAnimateCombined,
136
- usePresenceValue: presence,
137
- presenceContext: (0, import_react.useContext)(import_use_presence.PresenceContext),
139
+ usePresenceValue,
140
+ presenceContext,
138
141
  exit: isExiting ? styles : void 0
139
142
  }, moti = (0, import_author.useMotify)(motiProps);
140
143
  return process.env.NODE_ENV === "development" && props.debug && console.info("useMotify(", JSON.stringify(motiProps, null, 2) + ")", {
@@ -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": ["Animated"]
6
6
  }
@@ -85,8 +85,11 @@ function createTamaguiAnimatedComponent() {
85
85
  var forwardedRef = _param.forwardedRef, style = _param.style, props = _object_without_properties(_param, [
86
86
  "forwardedRef",
87
87
  "style"
88
- ]), composedRefs = (0, import_web.useComposedRefs)(forwardedRef, ref), Element = props.tag || tag;
89
- return style && Array.isArray(style.transform) && (style.transform = (0, import_web.transformsToString)(style.transform)), /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Element, _object_spread_props(_object_spread({}, props), {
88
+ ]), composedRefs = (0, import_web.useComposedRefs)(forwardedRef, ref), Element = props.tag || tag, webStyle = style;
89
+ (0, import_web.styleToCSS)(style), Array.isArray(webStyle.transform) && (style.transform = (0, import_web.transformsToString)(style.transform));
90
+ for (var key in style)
91
+ style[key] = (0, import_web.normalizeValueWithProperty)(style[key], key);
92
+ return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Element, _object_spread_props(_object_spread({}, props), {
90
93
  style,
91
94
  ref: composedRefs
92
95
  }));
@@ -96,7 +99,11 @@ function createTamaguiAnimatedComponent() {
96
99
  var AnimatedView = createTamaguiAnimatedComponent("div"), AnimatedText = createTamaguiAnimatedComponent("span"), neverAnimate = {
97
100
  alignItems: !0,
98
101
  backdropFilter: !0,
102
+ borderBottomStyle: !0,
103
+ borderLeftStyle: !0,
104
+ borderRightStyle: !0,
99
105
  borderStyle: !0,
106
+ borderTopStyle: !0,
100
107
  boxSizing: !0,
101
108
  contain: !0,
102
109
  cursor: !0,
@@ -107,23 +114,27 @@ var AnimatedView = createTamaguiAnimatedComponent("div"), AnimatedText = createT
107
114
  justifyContent: !0,
108
115
  maxHeight: !0,
109
116
  maxWidth: !0,
117
+ minHeight: !0,
118
+ minWidth: !0,
119
+ outlineStyle: !0,
110
120
  overflow: !0,
111
121
  overflowX: !0,
112
122
  overflowY: !0,
123
+ pointerEvents: !0,
113
124
  position: !0,
114
125
  shadowColor: !0,
115
126
  textAlign: !0,
116
127
  textOverflow: !0,
117
128
  whiteSpace: !0,
118
129
  wordWrap: !0,
119
- zIndex: !0
130
+ zIndex: !0,
131
+ fontFamily: !0,
132
+ lineHeight: !0
120
133
  };
121
134
  function createAnimations(animations) {
122
135
  return {
123
- // View: isWeb ? AnimatedView : Animated.View,
124
- // Text: isWeb ? AnimatedText : Animated.Text,
125
- View: import_react_native_reanimated.default.View,
126
- Text: import_react_native_reanimated.default.Text,
136
+ View: import_web.isWeb ? AnimatedView : import_react_native_reanimated.default.View,
137
+ Text: import_web.isWeb ? AnimatedText : import_react_native_reanimated.default.Text,
127
138
  isReactNative: !0,
128
139
  animations,
129
140
  usePresence: import_use_presence.usePresence,
@@ -206,25 +217,17 @@ function createAnimations(animations) {
206
217
  else {
207
218
  var animateOnly = props.animateOnly;
208
219
  for (var key in style)
209
- neverAnimate[key] || animateOnly && !animateOnly.includes(key) ? dontAnimate[key] = style[key] : animate[key] = style[key];
220
+ !import_web.stylePropsAll[key] || neverAnimate[key] || animateOnly && !animateOnly.includes(key) ? dontAnimate[key] = style[key] : animate[key] = style[key];
210
221
  }
211
222
  var animateStr = JSON.stringify(animate), styles = (0, import_react.useMemo)(function() {
212
223
  return JSON.parse(animateStr);
213
224
  }, [
214
225
  animateStr
215
- ]), isExiting = !!(presence != null && presence[1]), sendExitComplete = presence == null ? void 0 : presence[1], onDidAnimateCombined = (0, import_react.useCallback)(function() {
216
- onDidAnimate == null || onDidAnimate(), sendExitComplete == null || sendExitComplete();
217
- }, []), motiProps = {
226
+ ]), isExiting = !!(presence != null && presence[1]), presenceContext = (0, import_react.useContext)(import_use_presence.PresenceContext), usePresenceValue = presence || void 0, motiProps = {
218
227
  animate: isExiting || isHydrating ? {} : styles,
219
228
  transition: animations[animationKey],
220
- // isHydrating
221
- // ? ({ type: 'timing', duration: 0 } as const)
222
- // : componentState.unmounted
223
- // ? { type: 'timing', duration: 0 }
224
- // : animations[animationKey as keyof typeof animations]
225
- onDidAnimate: onDidAnimateCombined,
226
- usePresenceValue: presence,
227
- presenceContext: (0, import_react.useContext)(import_use_presence.PresenceContext),
229
+ usePresenceValue,
230
+ presenceContext,
228
231
  exit: isExiting ? styles : void 0
229
232
  }, moti = (0, import_author.useMotify)(motiProps);
230
233
  return process.env.NODE_ENV === "development" && props.debug && console.info("useMotify(", JSON.stringify(motiProps, null, 2) + ")", {
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../src/Users/n8/tamagui/packages/animations-moti/src/createAnimations.tsx"],
4
- "mappings": "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",
5
- "names": ["createTamaguiAnimatedComponent", "tag", "Component", "Animated", "createAnimatedComponent", "forwardRef", "ref", "forwardedRef", "style", "props", "composedRefs", "useComposedRefs", "Element", "Array", "isArray", "transform", "transformsToString", "_jsx", "AnimatedView", "AnimatedText", "neverAnimate", "alignItems", "backdropFilter", "borderStyle", "boxSizing", "contain", "cursor", "display", "flexBasis", "flexDirection", "flexShrink", "justifyContent", "maxHeight", "maxWidth", "overflow", "overflowX", "overflowY", "position", "shadowColor", "textAlign", "textOverflow", "whiteSpace", "wordWrap", "zIndex", "createAnimations", "animations", "View", "Text", "isReactNative", "usePresence", "ResetPresence", "useAnimatedNumber", "initial", "sharedValue", "useSharedValue", "useMemo", "getInstance", "getValue", "value", "setValue", "next", "config", "type", "withSpring", "withTiming", "stop", "cancelAnimation", "useAnimatedNumberReaction", "onValue", "instance", "useAnimatedReaction", "prev", "runOnJS", "useAnimatedNumberStyle", "val", "getStyle", "derivedValue", "useDerivedValue", "useAnimatedStyle", "useAnimations", "animationProps", "presence", "onDidAnimate", "componentState", "animationKey", "animation", "isHydrating", "unmounted", "animate", "dontAnimate", "animateOnly", "key", "includes", "animateStr", "JSON", "stringify", "styles", "parse", "isExiting", "Boolean", "sendExitComplete", "onDidAnimateCombined", "useCallback", "motiProps", "transition", "usePresenceValue", "presenceContext", "useContext", "PresenceContext", "exit", "undefined", "moti", "useMotify", "process", "env", "NODE_ENV", "console", "info"]
4
+ "mappings": "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",
5
+ "names": ["createTamaguiAnimatedComponent", "tag", "Component", "Animated", "createAnimatedComponent", "forwardRef", "ref", "forwardedRef", "style", "props", "composedRefs", "useComposedRefs", "Element", "webStyle", "styleToCSS", "Array", "isArray", "transform", "transformsToString", "key", "normalizeValueWithProperty", "_jsx", "AnimatedView", "AnimatedText", "neverAnimate", "alignItems", "backdropFilter", "borderBottomStyle", "borderLeftStyle", "borderRightStyle", "borderStyle", "borderTopStyle", "boxSizing", "contain", "cursor", "display", "flexBasis", "flexDirection", "flexShrink", "justifyContent", "maxHeight", "maxWidth", "minHeight", "minWidth", "outlineStyle", "overflow", "overflowX", "overflowY", "pointerEvents", "position", "shadowColor", "textAlign", "textOverflow", "whiteSpace", "wordWrap", "zIndex", "fontFamily", "lineHeight", "createAnimations", "animations", "View", "isWeb", "Text", "isReactNative", "usePresence", "ResetPresence", "useAnimatedNumber", "initial", "sharedValue", "useSharedValue", "useMemo", "getInstance", "getValue", "value", "setValue", "next", "config", "type", "withSpring", "withTiming", "stop", "cancelAnimation", "useAnimatedNumberReaction", "onValue", "instance", "useAnimatedReaction", "prev", "runOnJS", "useAnimatedNumberStyle", "val", "getStyle", "derivedValue", "useDerivedValue", "useAnimatedStyle", "useAnimations", "animationProps", "presence", "onDidAnimate", "componentState", "animationKey", "animation", "isHydrating", "unmounted", "animate", "dontAnimate", "animateOnly", "stylePropsAll", "includes", "animateStr", "JSON", "stringify", "styles", "parse", "isExiting", "Boolean", "presenceContext", "useContext", "PresenceContext", "usePresenceValue", "undefined", "motiProps", "transition", "exit", "moti", "useMotify", "process", "env", "NODE_ENV", "console", "info"]
6
6
  }
@@ -1,10 +1,14 @@
1
1
  import { PresenceContext, ResetPresence, usePresence } from "@tamagui/use-presence";
2
2
  import {
3
+ isWeb,
3
4
  transformsToString,
4
- useComposedRefs
5
+ useComposedRefs,
6
+ stylePropsAll,
7
+ styleToCSS,
8
+ normalizeValueWithProperty
5
9
  } from "@tamagui/web";
6
10
  import { useMotify } from "moti/author";
7
- import { forwardRef, useCallback, useContext, useMemo } from "react";
11
+ import { forwardRef, useContext, useMemo } from "react";
8
12
  import Animated, {
9
13
  cancelAnimation,
10
14
  runOnJS,
@@ -19,8 +23,11 @@ import { jsx } from "react/jsx-runtime";
19
23
  function createTamaguiAnimatedComponent(tag = "div") {
20
24
  const Component = Animated.createAnimatedComponent(
21
25
  forwardRef(({ forwardedRef, style, ...props }, ref) => {
22
- const composedRefs = useComposedRefs(forwardedRef, ref), Element = props.tag || tag;
23
- return style && Array.isArray(style.transform) && (style.transform = transformsToString(style.transform)), /* @__PURE__ */ jsx(Element, { ...props, style, ref: composedRefs });
26
+ const composedRefs = useComposedRefs(forwardedRef, ref), Element = props.tag || tag, webStyle = style;
27
+ styleToCSS(style), Array.isArray(webStyle.transform) && (style.transform = transformsToString(style.transform));
28
+ for (const key in style)
29
+ style[key] = normalizeValueWithProperty(style[key], key);
30
+ return /* @__PURE__ */ jsx(Element, { ...props, style, ref: composedRefs });
24
31
  })
25
32
  );
26
33
  return Component.acceptTagProp = !0, Component;
@@ -28,7 +35,11 @@ function createTamaguiAnimatedComponent(tag = "div") {
28
35
  const AnimatedView = createTamaguiAnimatedComponent("div"), AnimatedText = createTamaguiAnimatedComponent("span"), neverAnimate = {
29
36
  alignItems: !0,
30
37
  backdropFilter: !0,
38
+ borderBottomStyle: !0,
39
+ borderLeftStyle: !0,
40
+ borderRightStyle: !0,
31
41
  borderStyle: !0,
42
+ borderTopStyle: !0,
32
43
  boxSizing: !0,
33
44
  contain: !0,
34
45
  cursor: !0,
@@ -39,23 +50,27 @@ const AnimatedView = createTamaguiAnimatedComponent("div"), AnimatedText = creat
39
50
  justifyContent: !0,
40
51
  maxHeight: !0,
41
52
  maxWidth: !0,
53
+ minHeight: !0,
54
+ minWidth: !0,
55
+ outlineStyle: !0,
42
56
  overflow: !0,
43
57
  overflowX: !0,
44
58
  overflowY: !0,
59
+ pointerEvents: !0,
45
60
  position: !0,
46
61
  shadowColor: !0,
47
62
  textAlign: !0,
48
63
  textOverflow: !0,
49
64
  whiteSpace: !0,
50
65
  wordWrap: !0,
51
- zIndex: !0
66
+ zIndex: !0,
67
+ fontFamily: !0,
68
+ lineHeight: !0
52
69
  };
53
70
  function createAnimations(animations) {
54
71
  return {
55
- // View: isWeb ? AnimatedView : Animated.View,
56
- // Text: isWeb ? AnimatedText : Animated.Text,
57
- View: Animated.View,
58
- Text: Animated.Text,
72
+ View: isWeb ? AnimatedView : Animated.View,
73
+ Text: isWeb ? AnimatedText : Animated.Text,
59
74
  isReactNative: !0,
60
75
  animations,
61
76
  usePresence,
@@ -110,21 +125,13 @@ function createAnimations(animations) {
110
125
  else {
111
126
  const animateOnly = props.animateOnly;
112
127
  for (const key in style)
113
- neverAnimate[key] || animateOnly && !animateOnly.includes(key) ? dontAnimate[key] = style[key] : animate[key] = style[key];
128
+ !stylePropsAll[key] || neverAnimate[key] || animateOnly && !animateOnly.includes(key) ? dontAnimate[key] = style[key] : animate[key] = style[key];
114
129
  }
115
- const animateStr = JSON.stringify(animate), styles = useMemo(() => JSON.parse(animateStr), [animateStr]), isExiting = !!presence?.[1], sendExitComplete = presence?.[1], onDidAnimateCombined = useCallback(() => {
116
- onDidAnimate?.(), sendExitComplete?.();
117
- }, []), motiProps = {
130
+ const animateStr = JSON.stringify(animate), styles = useMemo(() => JSON.parse(animateStr), [animateStr]), isExiting = !!presence?.[1], presenceContext = useContext(PresenceContext), usePresenceValue = presence || void 0, motiProps = {
118
131
  animate: isExiting || isHydrating ? {} : styles,
119
132
  transition: animations[animationKey],
120
- // isHydrating
121
- // ? ({ type: 'timing', duration: 0 } as const)
122
- // : componentState.unmounted
123
- // ? { type: 'timing', duration: 0 }
124
- // : animations[animationKey as keyof typeof animations]
125
- onDidAnimate: onDidAnimateCombined,
126
- usePresenceValue: presence,
127
- presenceContext: useContext(PresenceContext),
133
+ usePresenceValue,
134
+ presenceContext,
128
135
  exit: isExiting ? styles : void 0
129
136
  }, moti = useMotify(motiProps);
130
137
  return process.env.NODE_ENV === "development" && props.debug && console.info("useMotify(", JSON.stringify(motiProps, null, 2) + ")", {
@@ -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": []
6
6
  }
@@ -1,7 +1,7 @@
1
1
  import { PresenceContext, ResetPresence, usePresence } from "@tamagui/use-presence";
2
- import { transformsToString, useComposedRefs } from "@tamagui/web";
2
+ import { isWeb, transformsToString, useComposedRefs, stylePropsAll, styleToCSS, normalizeValueWithProperty } from "@tamagui/web";
3
3
  import { useMotify } from "moti/author";
4
- import { forwardRef, useCallback, useContext, useMemo } from "react";
4
+ import { forwardRef, useContext, useMemo } from "react";
5
5
  import Animated, { cancelAnimation, runOnJS, useAnimatedReaction, useAnimatedStyle, useDerivedValue, useSharedValue, withSpring, withTiming } from "react-native-reanimated";
6
6
  import { jsx } from "react/jsx-runtime";
7
7
  function createTamaguiAnimatedComponent(tag = "div") {
@@ -11,8 +11,11 @@ function createTamaguiAnimatedComponent(tag = "div") {
11
11
  ...props
12
12
  }, ref) => {
13
13
  const composedRefs = useComposedRefs(forwardedRef, ref),
14
- Element = props.tag || tag;
15
- return style && Array.isArray(style.transform) && (style.transform = transformsToString(style.transform)), /* @__PURE__ */jsx(Element, {
14
+ Element = props.tag || tag,
15
+ webStyle = style;
16
+ styleToCSS(style), Array.isArray(webStyle.transform) && (style.transform = transformsToString(style.transform));
17
+ for (const key in style) style[key] = normalizeValueWithProperty(style[key], key);
18
+ return /* @__PURE__ */jsx(Element, {
16
19
  ...props,
17
20
  style,
18
21
  ref: composedRefs
@@ -25,7 +28,11 @@ const AnimatedView = createTamaguiAnimatedComponent("div"),
25
28
  neverAnimate = {
26
29
  alignItems: !0,
27
30
  backdropFilter: !0,
31
+ borderBottomStyle: !0,
32
+ borderLeftStyle: !0,
33
+ borderRightStyle: !0,
28
34
  borderStyle: !0,
35
+ borderTopStyle: !0,
29
36
  boxSizing: !0,
30
37
  contain: !0,
31
38
  cursor: !0,
@@ -36,23 +43,27 @@ const AnimatedView = createTamaguiAnimatedComponent("div"),
36
43
  justifyContent: !0,
37
44
  maxHeight: !0,
38
45
  maxWidth: !0,
46
+ minHeight: !0,
47
+ minWidth: !0,
48
+ outlineStyle: !0,
39
49
  overflow: !0,
40
50
  overflowX: !0,
41
51
  overflowY: !0,
52
+ pointerEvents: !0,
42
53
  position: !0,
43
54
  shadowColor: !0,
44
55
  textAlign: !0,
45
56
  textOverflow: !0,
46
57
  whiteSpace: !0,
47
58
  wordWrap: !0,
48
- zIndex: !0
59
+ zIndex: !0,
60
+ fontFamily: !0,
61
+ lineHeight: !0
49
62
  };
50
63
  function createAnimations(animations) {
51
64
  return {
52
- // View: isWeb ? AnimatedView : Animated.View,
53
- // Text: isWeb ? AnimatedText : Animated.Text,
54
- View: Animated.View,
55
- Text: Animated.Text,
65
+ View: isWeb ? AnimatedView : Animated.View,
66
+ Text: isWeb ? AnimatedText : Animated.Text,
56
67
  isReactNative: !0,
57
68
  animations,
58
69
  usePresence,
@@ -116,26 +127,18 @@ function createAnimations(animations) {
116
127
  dontAnimate = {};
117
128
  if (isHydrating) dontAnimate = style;else {
118
129
  const animateOnly = props.animateOnly;
119
- for (const key in style) neverAnimate[key] || animateOnly && !animateOnly.includes(key) ? dontAnimate[key] = style[key] : animate[key] = style[key];
130
+ for (const key in style) !stylePropsAll[key] || neverAnimate[key] || animateOnly && !animateOnly.includes(key) ? dontAnimate[key] = style[key] : animate[key] = style[key];
120
131
  }
121
132
  const animateStr = JSON.stringify(animate),
122
133
  styles = useMemo(() => JSON.parse(animateStr), [animateStr]),
123
134
  isExiting = !!presence?.[1],
124
- sendExitComplete = presence?.[1],
125
- onDidAnimateCombined = useCallback(() => {
126
- onDidAnimate?.(), sendExitComplete?.();
127
- }, []),
135
+ presenceContext = useContext(PresenceContext),
136
+ usePresenceValue = presence || void 0,
128
137
  motiProps = {
129
138
  animate: isExiting || isHydrating ? {} : styles,
130
139
  transition: animations[animationKey],
131
- // isHydrating
132
- // ? ({ type: 'timing', duration: 0 } as const)
133
- // : componentState.unmounted
134
- // ? { type: 'timing', duration: 0 }
135
- // : animations[animationKey as keyof typeof animations]
136
- onDidAnimate: onDidAnimateCombined,
137
- usePresenceValue: presence,
138
- presenceContext: useContext(PresenceContext),
140
+ usePresenceValue,
141
+ presenceContext,
139
142
  exit: isExiting ? styles : void 0
140
143
  },
141
144
  moti = useMotify(motiProps);
@@ -1,8 +1,8 @@
1
1
  import { jsx as _jsx } from "react/jsx-runtime";
2
2
  import { PresenceContext, ResetPresence, usePresence } from "@tamagui/use-presence";
3
- import { transformsToString, useComposedRefs } from "@tamagui/web";
3
+ import { isWeb, transformsToString, useComposedRefs, stylePropsAll, styleToCSS, normalizeValueWithProperty } from "@tamagui/web";
4
4
  import { useMotify } from "moti/author";
5
- import { forwardRef, useCallback, useContext, useMemo } from "react";
5
+ import { forwardRef, useContext, useMemo } from "react";
6
6
  import Animated, { cancelAnimation, runOnJS, useAnimatedReaction, useAnimatedStyle, useDerivedValue, useSharedValue, withSpring, withTiming } from "react-native-reanimated";
7
7
  function _define_property(obj, key, value) {
8
8
  return key in obj ? Object.defineProperty(obj, key, {
@@ -62,8 +62,11 @@ function createTamaguiAnimatedComponent() {
62
62
  var forwardedRef = _param.forwardedRef, style = _param.style, props = _object_without_properties(_param, [
63
63
  "forwardedRef",
64
64
  "style"
65
- ]), composedRefs = useComposedRefs(forwardedRef, ref), Element = props.tag || tag;
66
- return style && Array.isArray(style.transform) && (style.transform = transformsToString(style.transform)), /* @__PURE__ */ _jsx(Element, _object_spread_props(_object_spread({}, props), {
65
+ ]), composedRefs = useComposedRefs(forwardedRef, ref), Element = props.tag || tag, webStyle = style;
66
+ styleToCSS(style), Array.isArray(webStyle.transform) && (style.transform = transformsToString(style.transform));
67
+ for (var key in style)
68
+ style[key] = normalizeValueWithProperty(style[key], key);
69
+ return /* @__PURE__ */ _jsx(Element, _object_spread_props(_object_spread({}, props), {
67
70
  style,
68
71
  ref: composedRefs
69
72
  }));
@@ -73,7 +76,11 @@ function createTamaguiAnimatedComponent() {
73
76
  var AnimatedView = createTamaguiAnimatedComponent("div"), AnimatedText = createTamaguiAnimatedComponent("span"), neverAnimate = {
74
77
  alignItems: !0,
75
78
  backdropFilter: !0,
79
+ borderBottomStyle: !0,
80
+ borderLeftStyle: !0,
81
+ borderRightStyle: !0,
76
82
  borderStyle: !0,
83
+ borderTopStyle: !0,
77
84
  boxSizing: !0,
78
85
  contain: !0,
79
86
  cursor: !0,
@@ -84,23 +91,27 @@ var AnimatedView = createTamaguiAnimatedComponent("div"), AnimatedText = createT
84
91
  justifyContent: !0,
85
92
  maxHeight: !0,
86
93
  maxWidth: !0,
94
+ minHeight: !0,
95
+ minWidth: !0,
96
+ outlineStyle: !0,
87
97
  overflow: !0,
88
98
  overflowX: !0,
89
99
  overflowY: !0,
100
+ pointerEvents: !0,
90
101
  position: !0,
91
102
  shadowColor: !0,
92
103
  textAlign: !0,
93
104
  textOverflow: !0,
94
105
  whiteSpace: !0,
95
106
  wordWrap: !0,
96
- zIndex: !0
107
+ zIndex: !0,
108
+ fontFamily: !0,
109
+ lineHeight: !0
97
110
  };
98
111
  function createAnimations(animations) {
99
112
  return {
100
- // View: isWeb ? AnimatedView : Animated.View,
101
- // Text: isWeb ? AnimatedText : Animated.Text,
102
- View: Animated.View,
103
- Text: Animated.Text,
113
+ View: isWeb ? AnimatedView : Animated.View,
114
+ Text: isWeb ? AnimatedText : Animated.Text,
104
115
  isReactNative: !0,
105
116
  animations,
106
117
  usePresence,
@@ -183,25 +194,17 @@ function createAnimations(animations) {
183
194
  else {
184
195
  var animateOnly = props.animateOnly;
185
196
  for (var key in style)
186
- neverAnimate[key] || animateOnly && !animateOnly.includes(key) ? dontAnimate[key] = style[key] : animate[key] = style[key];
197
+ !stylePropsAll[key] || neverAnimate[key] || animateOnly && !animateOnly.includes(key) ? dontAnimate[key] = style[key] : animate[key] = style[key];
187
198
  }
188
199
  var animateStr = JSON.stringify(animate), styles = useMemo(function() {
189
200
  return JSON.parse(animateStr);
190
201
  }, [
191
202
  animateStr
192
- ]), isExiting = !!(presence != null && presence[1]), sendExitComplete = presence == null ? void 0 : presence[1], onDidAnimateCombined = useCallback(function() {
193
- onDidAnimate == null || onDidAnimate(), sendExitComplete == null || sendExitComplete();
194
- }, []), motiProps = {
203
+ ]), isExiting = !!(presence != null && presence[1]), presenceContext = useContext(PresenceContext), usePresenceValue = presence || void 0, motiProps = {
195
204
  animate: isExiting || isHydrating ? {} : styles,
196
205
  transition: animations[animationKey],
197
- // isHydrating
198
- // ? ({ type: 'timing', duration: 0 } as const)
199
- // : componentState.unmounted
200
- // ? { type: 'timing', duration: 0 }
201
- // : animations[animationKey as keyof typeof animations]
202
- onDidAnimate: onDidAnimateCombined,
203
- usePresenceValue: presence,
204
- presenceContext: useContext(PresenceContext),
206
+ usePresenceValue,
207
+ presenceContext,
205
208
  exit: isExiting ? styles : void 0
206
209
  }, moti = useMotify(motiProps);
207
210
  return process.env.NODE_ENV === "development" && props.debug && console.info("useMotify(", JSON.stringify(motiProps, null, 2) + ")", {
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../src/Users/n8/tamagui/packages/animations-moti/src/createAnimations.tsx"],
4
- "mappings": "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",
5
- "names": ["PresenceContext", "ResetPresence", "usePresence", "transformsToString", "useComposedRefs", "useMotify", "forwardRef", "useCallback", "useContext", "useMemo", "Animated", "cancelAnimation", "runOnJS", "useAnimatedReaction", "useAnimatedStyle", "useDerivedValue", "useSharedValue", "withSpring", "withTiming", "createTamaguiAnimatedComponent", "tag", "Component", "createAnimatedComponent", "ref", "forwardedRef", "style", "props", "composedRefs", "Element", "Array", "isArray", "transform", "AnimatedView", "AnimatedText", "neverAnimate", "alignItems", "backdropFilter", "borderStyle", "boxSizing", "contain", "cursor", "display", "flexBasis", "flexDirection", "flexShrink", "justifyContent", "maxHeight", "maxWidth", "overflow", "overflowX", "overflowY", "position", "shadowColor", "textAlign", "textOverflow", "whiteSpace", "wordWrap", "zIndex", "createAnimations", "animations", "View", "Text", "isReactNative", "useAnimatedNumber", "initial", "sharedValue", "getInstance", "getValue", "value", "setValue", "next", "config", "type", "stop", "useAnimatedNumberReaction", "onValue", "instance", "prev", "useAnimatedNumberStyle", "val", "getStyle", "derivedValue", "useAnimations", "animationProps", "presence", "onDidAnimate", "componentState", "animationKey", "animation", "isHydrating", "unmounted", "animate", "dontAnimate", "animateOnly", "key", "includes", "animateStr", "JSON", "stringify", "styles", "parse", "isExiting", "Boolean", "sendExitComplete", "onDidAnimateCombined", "motiProps", "transition", "usePresenceValue", "presenceContext", "exit", "undefined", "moti", "process", "env", "NODE_ENV", "console", "info"]
4
+ "mappings": "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",
5
+ "names": ["PresenceContext", "ResetPresence", "usePresence", "isWeb", "transformsToString", "useComposedRefs", "stylePropsAll", "styleToCSS", "normalizeValueWithProperty", "useMotify", "forwardRef", "useContext", "useMemo", "Animated", "cancelAnimation", "runOnJS", "useAnimatedReaction", "useAnimatedStyle", "useDerivedValue", "useSharedValue", "withSpring", "withTiming", "createTamaguiAnimatedComponent", "tag", "Component", "createAnimatedComponent", "ref", "forwardedRef", "style", "props", "composedRefs", "Element", "webStyle", "Array", "isArray", "transform", "key", "AnimatedView", "AnimatedText", "neverAnimate", "alignItems", "backdropFilter", "borderBottomStyle", "borderLeftStyle", "borderRightStyle", "borderStyle", "borderTopStyle", "boxSizing", "contain", "cursor", "display", "flexBasis", "flexDirection", "flexShrink", "justifyContent", "maxHeight", "maxWidth", "minHeight", "minWidth", "outlineStyle", "overflow", "overflowX", "overflowY", "pointerEvents", "position", "shadowColor", "textAlign", "textOverflow", "whiteSpace", "wordWrap", "zIndex", "fontFamily", "lineHeight", "createAnimations", "animations", "View", "Text", "isReactNative", "useAnimatedNumber", "initial", "sharedValue", "getInstance", "getValue", "value", "setValue", "next", "config", "type", "stop", "useAnimatedNumberReaction", "onValue", "instance", "prev", "useAnimatedNumberStyle", "val", "getStyle", "derivedValue", "useAnimations", "animationProps", "presence", "onDidAnimate", "componentState", "animationKey", "animation", "isHydrating", "unmounted", "animate", "dontAnimate", "animateOnly", "includes", "animateStr", "JSON", "stringify", "styles", "parse", "isExiting", "Boolean", "presenceContext", "usePresenceValue", "undefined", "motiProps", "transition", "exit", "moti", "process", "env", "NODE_ENV", "console", "info"]
6
6
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@tamagui/animations-moti",
3
- "version": "1.90.3",
3
+ "version": "1.90.5",
4
4
  "source": "src/index.ts",
5
5
  "license": "MIT",
6
6
  "types": "./types/index.d.ts",
@@ -15,13 +15,13 @@
15
15
  "dist"
16
16
  ],
17
17
  "dependencies": {
18
- "@tamagui/use-presence": "1.90.3",
19
- "@tamagui/web": "1.90.3",
20
- "moti": "^0.27.2",
18
+ "@tamagui/use-presence": "1.90.5",
19
+ "@tamagui/web": "1.90.5",
20
+ "moti": "^0.27.4",
21
21
  "react": "^18.2.0"
22
22
  },
23
23
  "devDependencies": {
24
- "@tamagui/build": "1.90.3",
24
+ "@tamagui/build": "1.90.5",
25
25
  "react-native-reanimated": "~3.6.2"
26
26
  },
27
27
  "scripts": {
@@ -1,13 +1,17 @@
1
1
  import { PresenceContext, ResetPresence, usePresence } from '@tamagui/use-presence'
2
2
  import {
3
+ isWeb,
3
4
  transformsToString,
4
5
  useComposedRefs,
6
+ stylePropsAll,
5
7
  type AnimationDriver,
6
8
  type UniversalAnimatedNumber,
9
+ styleToCSS,
10
+ normalizeValueWithProperty,
7
11
  } from '@tamagui/web'
8
12
  import type { MotiTransition } from 'moti'
9
13
  import { useMotify } from 'moti/author'
10
- import { forwardRef, useCallback, useContext, useMemo } from 'react'
14
+ import { forwardRef, useContext, useMemo } from 'react'
11
15
  import type { SharedValue } from 'react-native-reanimated'
12
16
  import Animated, {
13
17
  cancelAnimation,
@@ -27,10 +31,17 @@ function createTamaguiAnimatedComponent(tag = 'div') {
27
31
  forwardRef(({ forwardedRef, style, ...props }: any, ref) => {
28
32
  const composedRefs = useComposedRefs(forwardedRef, ref)
29
33
  const Element = props.tag || tag
30
- // we can probably just use stringifyTransforms? it seems almost fully normalized
31
- if (style && Array.isArray(style.transform)) {
34
+
35
+ // TODO this block should be exported by web as styleToWebStyle()
36
+ const webStyle = style
37
+ styleToCSS(style)
38
+ if (Array.isArray(webStyle.transform)) {
32
39
  style.transform = transformsToString(style.transform)
33
40
  }
41
+ for (const key in style) {
42
+ style[key] = normalizeValueWithProperty(style[key], key)
43
+ }
44
+
34
45
  return <Element {...props} style={style} ref={composedRefs} />
35
46
  })
36
47
  )
@@ -44,7 +55,11 @@ const AnimatedText = createTamaguiAnimatedComponent('span')
44
55
  const neverAnimate = {
45
56
  alignItems: true,
46
57
  backdropFilter: true,
58
+ borderBottomStyle: true,
59
+ borderLeftStyle: true,
60
+ borderRightStyle: true,
47
61
  borderStyle: true,
62
+ borderTopStyle: true,
48
63
  boxSizing: true,
49
64
  contain: true,
50
65
  cursor: true,
@@ -55,9 +70,13 @@ const neverAnimate = {
55
70
  justifyContent: true,
56
71
  maxHeight: true,
57
72
  maxWidth: true,
73
+ minHeight: true,
74
+ minWidth: true,
75
+ outlineStyle: true,
58
76
  overflow: true,
59
77
  overflowX: true,
60
78
  overflowY: true,
79
+ pointerEvents: true,
61
80
  position: true,
62
81
  shadowColor: true,
63
82
  textAlign: true,
@@ -65,16 +84,17 @@ const neverAnimate = {
65
84
  whiteSpace: true,
66
85
  wordWrap: true,
67
86
  zIndex: true,
87
+
88
+ fontFamily: true,
89
+ lineHeight: true,
68
90
  }
69
91
 
70
92
  export function createAnimations<A extends Record<string, MotiTransition>>(
71
93
  animations: A
72
94
  ): AnimationDriver<A> {
73
95
  return {
74
- // View: isWeb ? AnimatedView : Animated.View,
75
- // Text: isWeb ? AnimatedText : Animated.Text,
76
- View: Animated.View,
77
- Text: Animated.Text,
96
+ View: isWeb ? AnimatedView : Animated.View,
97
+ Text: isWeb ? AnimatedText : Animated.Text,
78
98
  isReactNative: true,
79
99
  animations,
80
100
  usePresence,
@@ -163,7 +183,11 @@ export function createAnimations<A extends Record<string, MotiTransition>>(
163
183
  } else {
164
184
  const animateOnly = props.animateOnly as string[]
165
185
  for (const key in style) {
166
- if (neverAnimate[key] || (animateOnly && !animateOnly.includes(key))) {
186
+ if (
187
+ !stylePropsAll[key] ||
188
+ neverAnimate[key] ||
189
+ (animateOnly && !animateOnly.includes(key))
190
+ ) {
167
191
  dontAnimate[key] = style[key]
168
192
  } else {
169
193
  animate[key] = style[key]
@@ -177,26 +201,16 @@ export function createAnimations<A extends Record<string, MotiTransition>>(
177
201
  const styles = useMemo(() => JSON.parse(animateStr), [animateStr])
178
202
 
179
203
  const isExiting = Boolean(presence?.[1])
180
- const sendExitComplete = presence?.[1]
181
-
182
- const onDidAnimateCombined = useCallback(() => {
183
- onDidAnimate?.()
184
- sendExitComplete?.()
185
- }, [])
204
+ const presenceContext = useContext(PresenceContext)
205
+ const usePresenceValue = (presence || undefined) as any
186
206
 
187
207
  type UseMotiProps = Parameters<typeof useMotify>[0]
188
208
 
189
209
  const motiProps = {
190
210
  animate: isExiting || isHydrating ? {} : styles,
191
211
  transition: animations[animationKey as keyof typeof animations],
192
- // isHydrating
193
- // ? ({ type: 'timing', duration: 0 } as const)
194
- // : componentState.unmounted
195
- // ? { type: 'timing', duration: 0 }
196
- // : animations[animationKey as keyof typeof animations]
197
- onDidAnimate: onDidAnimateCombined,
198
- usePresenceValue: presence as any,
199
- presenceContext: useContext(PresenceContext),
212
+ usePresenceValue,
213
+ presenceContext,
200
214
  exit: isExiting ? styles : undefined,
201
215
  } satisfies UseMotiProps
202
216
 
@@ -1 +1 @@
1
- {"version":3,"file":"createAnimations.d.ts","sourceRoot":"","sources":["../src/createAnimations.tsx"],"names":[],"mappings":"AACA,OAAO,EAGL,KAAK,eAAe,EAErB,MAAM,cAAc,CAAA;AACrB,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,MAAM,CAAA;AA8D1C,wBAAgB,gBAAgB,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,EACvE,UAAU,EAAE,CAAC,GACZ,eAAe,CAAC,CAAC,CAAC,CAmJpB"}
1
+ {"version":3,"file":"createAnimations.d.ts","sourceRoot":"","sources":["../src/createAnimations.tsx"],"names":[],"mappings":"AACA,OAAO,EAKL,KAAK,eAAe,EAIrB,MAAM,cAAc,CAAA;AACrB,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,MAAM,CAAA;AAgF1C,wBAAgB,gBAAgB,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,EACvE,UAAU,EAAE,CAAC,GACZ,eAAe,CAAC,CAAC,CAAC,CA2IpB"}