Move state and previousState to event props