Merge branch 'master' of https://github.com/react-spring/react-spring

Author: drcmda

package.json

@@ -80,12 +80,14 @@
     "husky": "1.3.1",
     "jest": "24.1.0",
     "json": "9.0.6",
+    "konva": "^2.6.0",
     "lint-staged": "8.1.3",
     "mock-raf": "1.0.1",
     "npm-run-all": "4.1.5",
     "prettier": "1.16.4",
     "react": "16.8.1",
     "react-dom": "16.8.1",
+    "react-konva": "^16.7.1",
     "react-test-renderer": "16.8.1",
     "react-testing-library": "5.6.0",
     "rimraf": "2.6.3",

src/animated/Controller.js

@@ -122,7 +122,7 @@ export default class Controller {
     return this
   }
 
-  stop(finished, noChange) {
+  stop(finished) {
     this.listeners.forEach(onEnd => onEnd(finished))
     this.listeners = []
     return this

src/animated/FrameLoop.js

@@ -7,7 +7,6 @@ const controllers = new Set()
 const frameLoop = () => {
   let time = now()
   for (let controller of controllers) {
-    let noChange = true
     let isActive = false
 
     for (
@@ -39,9 +38,6 @@ const frameLoop = () => {
           continue
         }
 
-        // Flag change
-        noChange = false
-
         // Break animation when string values are involved
         if (typeof from === 'string' || typeof to === 'string') {
           animation.updateValue(to)
@@ -124,7 +120,7 @@ const frameLoop = () => {
     // Either call onEnd or next frame
     if (!isActive) {
       controllers.delete(controller)
-      controller.stop(true, noChange)
+      controller.stop(true)
     }
   }
 

src/shared/helpers.ts

@@ -48,7 +48,29 @@ export function callProp<T>(
   return is.fun(obj) ? obj(...args) : obj
 }
 
-function getForwardProps(props: any) {
+type PartialExcludedProps = Partial<{ 
+  to: any, 
+  from: any, 
+  config: any, 
+  onStart: any, 
+  onRest: any, 
+  onFrame: any, 
+  children: any, 
+  reset: any, 
+  reverse: any, 
+  force: any, 
+  immediate: any,
+  delay: any,
+  attach: any,
+  destroyed: any,
+  interpolateTo: any,
+  ref: any,
+  lazy: any
+}> & object;
+
+export type ForwardedProps<T> = Pick<T, Exclude<keyof T, keyof PartialExcludedProps>>
+
+function getForwardProps<P extends PartialExcludedProps>(props: P): ForwardedProps<P> {
   const {
     to,
     from,

types/web.d.ts

@@ -16,7 +16,6 @@ type ExcludedProps =
   | 'to'
   | 'from'
   | 'config'
-  | 'native'
   | 'onStart'
   | 'onRest'
   | 'onFrame'
@@ -25,15 +24,12 @@ type ExcludedProps =
   | 'reverse'
   | 'force'
   | 'immediate'
-  | 'impl'
-  | 'inject'
   | 'delay'
   | 'attach'
   | 'destroyed'
-  | 'track'
   | 'interpolateTo'
-  | 'autoStart'
   | 'ref'
+  | 'lazy'
 
 // The config options for an interoplation. It maps out from in "in" type
 // to an "out" type.
@@ -213,14 +209,16 @@ export function useTransition<TItem, DS extends CSSProperties>(
   keys:
     | ((item: TItem) => TransitionKeyProps)
     | ReadonlyArray<TransitionKeyProps>
-    | TransitionKeyProps,
+    | TransitionKeyProps
+    | null,
   values: Merge<DS & CSSProperties, UseTransitionProps<TItem, DS>>
 ): UseTransitionResult<TItem, ForwardedProps<DS>>[] // result array is safe to modify
 export function useTransition<TItem, DS extends object>(
   items: ReadonlyArray<TItem> | TItem | null | undefined,
   keys:
     | ((item: TItem) => TransitionKeyProps)
     | ReadonlyArray<TransitionKeyProps>
-    | TransitionKeyProps,
+    | TransitionKeyProps           
+    | null,
   values: Merge<DS, UseTransitionProps<TItem, DS>>
 ): UseTransitionResult<TItem, AnimatedValue<ForwardedProps<DS>>>[] // result array is safe to modify