animot-presenter 0.6.7 → 0.6.8
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.
|
@@ -2187,7 +2187,7 @@
|
|
|
2187
2187
|
{@const shapePmProg = crossMorphProg.get(elementId) ?? (animated.pathMorph?.current ?? 1)}
|
|
2188
2188
|
{@const shapeKpmProg = kfPathProg.get(elementId) ?? (animated.pathMorph?.current ?? 1)}
|
|
2189
2189
|
{@const shapeMorphProg = shapeKpm ? shapeKpmProg : shapePmProg}
|
|
2190
|
-
{@const shapeMorphActive = shapeKpm ?? ((shapePm && shapePmProg
|
|
2190
|
+
{@const shapeMorphActive = shapeKpm ?? ((shapePm && shapePmProg < 1) ? shapePm : restingKfMorph(element))}
|
|
2191
2191
|
{#if shapeMorphActive}
|
|
2192
2192
|
<svg class="animot-shape-element" width="100%" height="100%" viewBox={shapeMorphActive.viewBox ?? `0 0 ${Math.max(1, animated.width.current)} ${Math.max(1, animated.height.current)}`} preserveAspectRatio="none">
|
|
2193
2193
|
{#if shapeMorphActive.parts && shapeMorphActive.parts.length > 1}
|
|
@@ -2229,7 +2229,7 @@
|
|
|
2229
2229
|
{@const pmProg = crossMorphProg.get(elementId) ?? (animated.pathMorph?.current ?? 1)}
|
|
2230
2230
|
{@const kpmProg = kfPathProg.get(elementId) ?? (animated.pathMorph?.current ?? 1)}
|
|
2231
2231
|
{@const morphProg = kpm ? kpmProg : pmProg}
|
|
2232
|
-
{@const svgMorph = kpm ?? ((pm && pmProg
|
|
2232
|
+
{@const svgMorph = kpm ?? ((pm && pmProg < 1) ? pm : restingKfMorph(element))}
|
|
2233
2233
|
{#if svgMorph}
|
|
2234
2234
|
<svg class="animot-svg-element" width="100%" height="100%" viewBox={svgMorph.viewBox ?? morphViewBox(element, animated.width.current, animated.height.current)} preserveAspectRatio="none" xmlns="http://www.w3.org/2000/svg">
|
|
2235
2235
|
{#each (svgMorph.parts ?? [{ interp: svgMorph.interp, fromColor: svgMorph.fromColor, toColor: svgMorph.toColor }]) as part}
|
|
@@ -2273,7 +2273,7 @@
|
|
|
2273
2273
|
{@const pmProg = crossMorphProg.get(elementId) ?? (animated.pathMorph?.current ?? 1)}
|
|
2274
2274
|
{@const kpmProg = kfPathProg.get(elementId) ?? (animated.pathMorph?.current ?? 1)}
|
|
2275
2275
|
{@const morphProg = dkpm ? kpmProg : pmProg}
|
|
2276
|
-
{@const drawMorph = dkpm ?? ((dpm && pmProg
|
|
2276
|
+
{@const drawMorph = dkpm ?? ((dpm && pmProg < 1) ? dpm : restingKfMorph(element))}
|
|
2277
2277
|
{@const drawPath = drawElementToPath(drawEl)}
|
|
2278
2278
|
{@const drawMode = drawEl.animation?.mode ?? 'none'}
|
|
2279
2279
|
{@const drawReveal = !drawMorph && (drawMode === 'draw' || drawMode === 'undraw' || drawMode === 'draw-undraw')}
|