|
53 | 53 |
|
54 | 54 | if (hasArgs(selectedKeyframe.easing)) getEasingArgs()
|
55 | 55 |
|
56 |
| - console.log(match[2].toLowerCase(), match[1].toLowerCase()) |
57 | 56 | return {
|
58 | 57 | type: match?.[2].toLowerCase(),
|
59 | 58 | mode: match?.[1].toLowerCase(),
|
|
76 | 75 | easingMode = mode
|
77 | 76 | }
|
78 | 77 |
|
79 |
| - let unsub: () => void |
| 78 | + let unsub: (() => void) | undefined |
80 | 79 | function getEasingArgs() {
|
81 | 80 | if (!selectedKeyframe) return
|
82 | 81 | unsub && unsub()
|
83 | 82 | if (hasArgs(selectedKeyframe.easing)) {
|
84 |
| - easingArg = new Valuable(getEasingArgDefault(selectedKeyframe) || 0) |
85 |
| - unsub = easingArg.subscribe(value => setEasingArgs(value)) |
| 83 | + easingArg = new Valuable( |
| 84 | + selectedKeyframe.easingArgs?.[0] || getEasingArgDefault(selectedKeyframe) || 0, |
| 85 | + ) |
| 86 | + unsub = easingArg?.subscribe(value => setEasingArgs(value)) |
86 | 87 | } else {
|
87 | 88 | easingArg = undefined
|
88 | 89 | }
|
89 | 90 | }
|
90 | 91 |
|
91 |
| - function setEasingArgs(arg: number) { |
| 92 | + function setEasingArgs(arg: number | undefined) { |
92 | 93 | if (!selectedKeyframe) return
|
| 94 | + if (!arg) { |
| 95 | + selectedKeyframe.easingArgs = undefined |
| 96 | + return |
| 97 | + } |
93 | 98 | selectedKeyframe.easingArgs = [arg]
|
94 | 99 | }
|
95 | 100 |
|
|
111 | 116 | ['position', 'rotation', 'scale'].includes(keyframe.channel) &&
|
112 | 117 | !isFirstKeyframe(keyframe)
|
113 | 118 | ) {
|
114 |
| - console.log(keyframe) |
115 | 119 | selectedKeyframe = keyframe
|
116 | 120 | const easing = getSelectedEasing()
|
117 | 121 | if (easing) {
|
|
124 | 128 | })
|
125 | 129 |
|
126 | 130 | events.UNSELECT_KEYFRAME.subscribe(() => {
|
| 131 | + setEasingArgs($easingArg) |
127 | 132 | selectedKeyframe = undefined
|
128 | 133 | })
|
129 | 134 |
|
130 | 135 | events.UNSELECT_AJ_PROJECT.subscribe(() => {
|
| 136 | + setEasingArgs($easingArg) |
131 | 137 | selectedKeyframe = undefined
|
132 | 138 | })
|
133 | 139 | </script>
|
|
0 commit comments