wip: round 3

Author: aleclarson

src/animated/Controller.ts

@@ -41,28 +41,30 @@ class Controller<DS extends object = any> {
 
   getValues = () => this.interpolations
 
-  /** update(props)
-   *  This function filters input props and creates an array of tasks which are executed in .start()
-   *  Each task is allowed to carry a delay, which means it can execute asnychroneously */
-  update(args: UpdateProps<DS>) {
+  /**
+   * Update the controller by merging the given props into an array of tasks.
+   * Individual tasks may be async and/or delayed.
+   */
+  update(props: UpdateProps<DS>) {
     // Extract delay and the to-prop from props
-    const { delay = 0, to, ...props } = interpolateTo(args) as any
+    const { delay = 0, to, ...restProps } = interpolateTo(props) as any
 
     // If config is either a function or an array, queue it up as is
     if (is.arr(to) || is.fun(to)) {
-      this.queue.push({ ...props, delay, to })
+      this.queue.push({ ...restProps, delay, to })
     }
     // Otherwise go through each key since it could be delayed individually
     else if (to) {
       let ops: any[] = []
       Object.entries(to).forEach(([k, v]) => {
-        // Fetch delay and create an entry, consisting of the to-props, the delay, and basic props
-        const entry = { to: { [k]: v }, delay: callProp(delay, k), ...props }
-        const previous = ops[entry.delay] && ops[entry.delay].to
-        ops[entry.delay] = {
-          ...ops[entry.delay],
-          ...entry,
-          to: { ...previous, ...entry.to },
+        // Merge entries with the same delay
+        const dt = callProp(delay, k)
+        const previous = ops[dt]
+        ops[dt] = {
+          ...previous,
+          ...restProps,
+          delay: dt,
+          to: { ...previous.to, [k]: v },
         }
       })
       ops.forEach(op => this.queue.push(op))
@@ -72,7 +74,7 @@ class Controller<DS extends object = any> {
     this.queue.sort((a, b) => a.delay - b.delay)
 
     // Diff the reduced props immediately (they'll contain the from-prop and some config)
-    if (hasKeys(props)) this._diff(props)
+    if (hasKeys(restProps)) this._diff(restProps)
 
     return this
   }
@@ -105,12 +107,12 @@ class Controller<DS extends object = any> {
       this.onEndQueue.length = 0
 
       // Never assume that the last update always finishes last, since that's
-      // not true when 2+ async animations have indeterminate durations.
+      // not true when 2+ async updates have indeterminate durations.
       let remaining = queue.length
       const didEnd =
         onEnd &&
         ((finished?: boolean) => {
-          if (--remaining < 0 || guid !== this.guid) return
+          if (--remaining > 0 || guid !== this.guid) return
           onEnd(finished)
         })