@pixodesk/svg-animator-core 1.0.44 → 1.0.45

package/dist/index.cjs

@@ -2341,6 +2341,38 @@ function toDomProps(props) {
   return propsCopy;
 }
 
+// src/animation/PxStaticTransformMerge.ts
+function mergeStaticTransformIntoAnimDef(animDef, staticTransform) {
+  if (!animDef) return animDef;
+  const staticParts = staticTransform && typeof staticTransform === "object" && !Array.isArray(staticTransform) ? staticTransform : parseTransformParts(staticTransform);
+  if (!staticParts || !Object.keys(staticParts).length) return animDef;
+  const mergeKfValue = (v) => v && typeof v === "object" && !Array.isArray(v) ? __spreadValues(__spreadValues({}, staticParts), v) : v;
+  const transformAnim = animDef[TRANSFORM_ATTR];
+  if (transformAnim && typeof transformAnim === "object") {
+    const anim = transformAnim;
+    if (Array.isArray(anim.keyframes)) {
+      const out = __spreadProps(__spreadValues({}, anim), {
+        keyframes: anim.keyframes.map((kf) => __spreadProps(__spreadValues({}, kf), { value: mergeKfValue(kf.value) }))
+      });
+      if (out.value !== void 0) out.value = mergeKfValue(out.value);
+      return __spreadProps(__spreadValues({}, animDef), { transform: out });
+    }
+    return animDef;
+  }
+  const channels = Object.keys(animDef).filter((k) => PX_TRANSFORM_FN_NAMES.has(k));
+  if (channels.length !== 1) return animDef;
+  const ch = channels[0];
+  const chAnim = animDef[ch];
+  if (!chAnim || typeof chAnim !== "object" || !Array.isArray(chAnim.keyframes)) return animDef;
+  const lifted = __spreadProps(__spreadValues({}, chAnim), {
+    keyframes: chAnim.keyframes.map((kf) => __spreadProps(__spreadValues({}, kf), { value: __spreadProps(__spreadValues({}, staticParts), { [ch]: kf.value }) }))
+  });
+  if (lifted.value !== void 0) lifted.value = __spreadProps(__spreadValues({}, staticParts), { [ch]: lifted.value });
+  const rest = __spreadValues({}, animDef);
+  delete rest[ch];
+  return __spreadProps(__spreadValues({}, rest), { transform: lifted });
+}
+
 // src/materialize/PxMotionPath.ts
 function getKfTranslate(kf) {
   const v = keyframeValue(kf);
@@ -2710,7 +2742,7 @@ function walkAndMaterialize(node, opts) {
   let newAnimate;
   const animBucket = node.animate;
   if (animBucket && typeof animBucket === "object" && !Array.isArray(animBucket)) {
-    const animDef = animBucket;
+    const animDef = mergeStaticTransformIntoAnimDef(animBucket, node.transform);
     const transformAnim = animDef.transform;
     if (transformAnim && typeof transformAnim === "object" && propAnimIsMotionPath(transformAnim)) {
       const materialized = materializeMotionPathInPropAnim(transformAnim, opts);
@@ -3224,36 +3256,6 @@ var _elementIdCounter = 0;
 function generateElementId() {
   return "_px_el_" + ++_elementIdCounter;
 }
-function mergeStaticTransformIntoAnimDef(animDef, staticTransform) {
-  if (!animDef) return animDef;
-  const staticParts = staticTransform && typeof staticTransform === "object" && !Array.isArray(staticTransform) ? staticTransform : parseTransformParts(staticTransform);
-  if (!staticParts || !Object.keys(staticParts).length) return animDef;
-  const mergeKfValue = (v) => v && typeof v === "object" && !Array.isArray(v) ? __spreadValues(__spreadValues({}, staticParts), v) : v;
-  const transformAnim = animDef[TRANSFORM_ATTR];
-  if (transformAnim && typeof transformAnim === "object") {
-    const anim = transformAnim;
-    if (Array.isArray(anim.keyframes)) {
-      const out = __spreadProps(__spreadValues({}, anim), {
-        keyframes: anim.keyframes.map((kf) => __spreadProps(__spreadValues({}, kf), { value: mergeKfValue(kf.value) }))
-      });
-      if (out.value !== void 0) out.value = mergeKfValue(out.value);
-      return __spreadProps(__spreadValues({}, animDef), { transform: out });
-    }
-    return animDef;
-  }
-  const channels = Object.keys(animDef).filter((k) => PX_TRANSFORM_FN_NAMES.has(k));
-  if (channels.length !== 1) return animDef;
-  const ch = channels[0];
-  const chAnim = animDef[ch];
-  if (!chAnim || typeof chAnim !== "object" || !Array.isArray(chAnim.keyframes)) return animDef;
-  const lifted = __spreadProps(__spreadValues({}, chAnim), {
-    keyframes: chAnim.keyframes.map((kf) => __spreadProps(__spreadValues({}, kf), { value: __spreadProps(__spreadValues({}, staticParts), { [ch]: kf.value }) }))
-  });
-  if (lifted.value !== void 0) lifted.value = __spreadProps(__spreadValues({}, staticParts), { [ch]: lifted.value });
-  const rest = __spreadValues({}, animDef);
-  delete rest[ch];
-  return __spreadProps(__spreadValues({}, rest), { transform: lifted });
-}
 function normalizeAnimationDefinition(animDef, duration, defs, engine = PxTimelineEngine.native) {
   const normalized = {};
   for (const [propName, propAnim] of Object.entries(animDef)) {
@@ -3336,7 +3338,7 @@ function getKeyframesPair(keyframes, progress) {
   return { prevKf, nextKf };
 }
 function calcPropertyValue(propName, propAnim, progress) {
-  var _a2, _b, _c, _d;
+  var _a2, _b, _c, _d, _e;
   const keyframes = propAnim.keyframes || [];
   if (keyframes.length === 0) return null;
   const { prevKf, nextKf } = getKeyframesPair(keyframes, progress);
@@ -3405,7 +3407,7 @@ function calcPropertyValue(propName, propAnim, progress) {
           !!propAnim.autoOrient
         );
         partsResult.translate = [sample.translate[0], sample.translate[1]];
-        if (sample.rotateDeg !== void 0) partsResult.rotate = sample.rotateDeg;
+        if (sample.rotateDeg !== void 0) partsResult.rotate = sample.rotateDeg + ((_e = partsResult.rotate) != null ? _e : 0);
       }
     }
     cssValue = composeTransformParts(partsResult, { withUnits: false });
@@ -5888,12 +5890,17 @@ function buildOffsetPath(propAnim) {
   const first = keyframeValue(kfs[0]);
   const anchor = (first == null ? void 0 : first.origin) && first.origin.length >= 2 ? [first.origin[0], first.origin[1]] : [0, 0];
   const points = [];
+  let keyframesCarryRotate = false;
   for (const kf of kfs) {
     const v = keyframeValue(kf);
     const tr = v == null ? void 0 : v.translate;
     if (!tr || tr.length < 2) return void 0;
     const parts = Object.keys(v);
-    if (parts.some((p) => p !== "translate" && p !== "origin")) return void 0;
+    if (parts.some((p) => p !== TRANSFORM_PART.translate && p !== TRANSFORM_PART.origin && p !== TRANSFORM_PART.rotate)) return void 0;
+    if ((v == null ? void 0 : v.rotate) !== void 0) {
+      if (v.rotate !== 0) return void 0;
+      keyframesCarryRotate = true;
+    }
     const o = (_a2 = v == null ? void 0 : v.origin) != null ? _a2 : [0, 0];
     if (o[0] !== anchor[0] || o[1] !== anchor[1]) return void 0;
     points.push([tr[0] + anchor[0], tr[1] + anchor[1]]);
@@ -5921,7 +5928,7 @@ function buildOffsetPath(propAnim) {
     if (e !== void 0) out.e = e;
     distanceKfs.push(out);
   }
-  return { pathStr: d, distanceKfs, autoOrient: !!propAnim.autoOrient, anchor };
+  return { pathStr: d, distanceKfs, autoOrient: !!propAnim.autoOrient, anchor, keyframesCarryRotate };
 }
 function materializeOffsetPathsInTree(root) {
   const walk = (node) => {
@@ -5943,6 +5950,7 @@ function materializeOffsetPathsInTree(root) {
           const t = __spreadValues({}, staticTr);
           delete t[TRANSFORM_PART.translate];
           delete t[TRANSFORM_PART.origin];
+          if (built.keyframesCarryRotate) delete t[TRANSFORM_PART.rotate];
           newTransform = Object.keys(t).length ? t : void 0;
         }
         out = __spreadProps(__spreadValues({}, node), {
@@ -6115,6 +6123,78 @@ function walkAndMaterialize2(node, idMap, animatedIds, genId3, defsCollector, ro
   return changed ? __spreadProps(__spreadValues({}, node), { children: newChildren }) : node;
 }
 
+// src/materialize/PxRestPose.ts
+var TRANSFORM_CHANNEL = "transform";
+var REVERSED_DIRECTIONS = /* @__PURE__ */ new Set(["reverse", "alternate-reverse"]);
+var SCRATCH_ID_PREFIX = "__px_rest_";
+function materializeRestPosesInTree(root, engine) {
+  var _a2;
+  const out = deepClone(root);
+  const config = getAnimatorConfig(out) || {};
+  const duration = +(config.duration || PX_DEFAULT_DURATION_MS);
+  const firstFrameTime = REVERSED_DIRECTIONS.has(String(config.direction)) ? duration : 0;
+  const nodes = animatedNodes(out);
+  if (!nodes.size) return out;
+  const before = bindingsOf(out, engine);
+  const added = /* @__PURE__ */ new Map();
+  for (const [key, animate] of before) {
+    const node = nodes.get(key);
+    if (!node) continue;
+    for (const channel of Object.keys(animate)) {
+      if (!mayCarryRestPose(node, channel)) continue;
+      const value = firstFrameValue(animate, channel, firstFrameTime);
+      if (value === void 0) continue;
+      node[channel] = value;
+      added.set(key, [...(_a2 = added.get(key)) != null ? _a2 : [], channel]);
+    }
+  }
+  if (added.size) {
+    const after = bindingsOf(out, engine);
+    for (const [key, channels] of added) {
+      if (JSON.stringify(after.get(key)) === JSON.stringify(before.get(key))) continue;
+      const node = nodes.get(key);
+      if (node) for (const channel of channels) delete node[channel];
+    }
+  }
+  return out;
+}
+function mayCarryRestPose(node, channel) {
+  if (node[channel] !== void 0) return false;
+  if (PX_TRANSFORM_FN_NAMES.has(channel)) return false;
+  if (channel === TRANSFORM_CHANNEL) {
+    for (const part of PX_TRANSFORM_FN_NAMES) if (node[part] !== void 0) return false;
+  }
+  return true;
+}
+function firstFrameValue(animate, channel, timeMs) {
+  const values = Object.values(calcAnimationValues({ [channel]: animate[channel] }, timeMs));
+  return values.length === 1 && values[0] !== "" ? values[0] : void 0;
+}
+function bindingsOf(tree, engine) {
+  const scratch = deepClone(tree);
+  const keyById = /* @__PURE__ */ new Map();
+  for (const [key, node] of animatedNodes(scratch)) {
+    if (node.id === void 0) node.id = SCRATCH_ID_PREFIX + key;
+    keyById.set(String(node.id), key);
+  }
+  const out = /* @__PURE__ */ new Map();
+  for (const binding of normalizeBindings(scratch, engine)) {
+    const key = keyById.get(binding.id);
+    if (key !== void 0) out.set(key, binding.animate);
+  }
+  return out;
+}
+function animatedNodes(tree) {
+  const out = /* @__PURE__ */ new Map();
+  let counter = 0;
+  const visit = (node) => {
+    if (node.animate) out.set(String(counter++), node);
+    if (node.children) for (const child of node.children) visit(child);
+  };
+  if (tree.children) for (const child of tree.children) visit(child);
+  return out;
+}
+
 // src/materialize/PxAnimatorMaterializeAll.ts
 function materializeAllInTree(doc, engine, options) {
   var _a2, _b;
@@ -6127,6 +6207,7 @@ function materializeAllInTree(doc, engine, options) {
     root = materializeAnimatedUseInstances(root);
     root = pruneUnreferencedDefs(root);
   }
+  root = materializeRestPosesInTree(root, engine);
   return root;
 }
 function pruneUnreferencedDefs(root) {