@xtia/timeline 1.1.15 → 1.1.16

package/internal/emitters.js

@@ -139,10 +139,14 @@ export class RangeProgression extends Emitter {
      * @returns Listenable: emits the sampled values
      */
     sample(source) {
+        if (source.length === 0) {
+            throw new Error("Sample source is empty");
+        }
+        const sourceArray = Array.from(source);
         const listen = this.transform((value, emit) => {
             const clampedProgress = clamp(value);
-            const index = Math.floor(clampedProgress * (source.length - 1));
-            emit(source[index]);
+            const index = Math.floor(clampedProgress * (sourceArray.length - 1));
+            emit(sourceArray[index]);
         });
         return new Emitter(listen);
     }

package/internal/tween.js

@@ -132,21 +132,18 @@ function parseColour(code) {
         rawHex += "ff";
     return [...rawHex.matchAll(/../g)].map(hex => parseInt(hex[0], 16));
 }
-function blendColours(from, to, bias) {
-    const blended = from.map((val, i) => clamp(blendNumbers(val, to[i], bias), 0, 255));
-    if (blended[3] === 255) {
-        return "#" +
-            Math.round(blended[0]).toString(16).padStart(2, "0") +
-            Math.round(blended[1]).toString(16).padStart(2, "0") +
-            Math.round(blended[2]).toString(16).padStart(2, "0");
-    }
-    else {
-        return "#" +
-            Math.round(blended[0]).toString(16).padStart(2, "0") +
-            Math.round(blended[1]).toString(16).padStart(2, "0") +
-            Math.round(blended[2]).toString(16).padStart(2, "0") +
-            Math.round(blended[3]).toString(16).padStart(2, "0");
-    }
+const hexLookup = new Array(256);
+for (let i = 0; i < 256; i++) {
+    hexLookup[i] = i.toString(16).padStart(2, "0");
+}
+function blendColours([fromR, fromG, fromB, fromA], [toR, toG, toB, toA], bias) {
+    const r = Math.max(0, Math.min(255, Math.round(fromR + bias * (toR - fromR))));
+    const g = Math.max(0, Math.min(255, Math.round(fromG + bias * (toG - fromG))));
+    const b = Math.max(0, Math.min(255, Math.round(fromB + bias * (toB - fromB))));
+    const a = Math.max(0, Math.min(255, Math.round(fromA + bias * (toA - fromA))));
+    return a === 255
+        ? "#" + hexLookup[r] + hexLookup[g] + hexLookup[b]
+        : "#" + hexLookup[r] + hexLookup[g] + hexLookup[b] + hexLookup[a];
 }
 const tweenableTokenRegex = /(#(?:[0-9a-fA-F]{3,4}|[0-9a-fA-F]{6}|[0-9a-fA-F]{8})\b|[-+]?\d*\.?\d+(?:[eE][-+]?\d+)?)/g;
 function tokenise(s) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xtia/timeline",
-  "version": "1.1.15",
+  "version": "1.1.16",
   "repository": {
     "url": "https://github.com/tiadrop/timeline",
     "type": "github"