From d9d664ad3a196c24167fd61c41d29d4e01f2fe36 Mon Sep 17 00:00:00 2001 From: Braks <78412429+bcakmakoglu@users.noreply.github.com> Date: Tue, 17 Aug 2021 17:33:46 +0200 Subject: [PATCH] fix: Transformations not applied on state change * Check if transform fix is enabled before applying position --- src/hooks/useDraggable.ts | 8 ++++++-- src/utils/types.ts | 5 ++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/hooks/useDraggable.ts b/src/hooks/useDraggable.ts index 779ccfc..aaabce7 100644 --- a/src/hooks/useDraggable.ts +++ b/src/hooks/useDraggable.ts @@ -210,7 +210,7 @@ const useDraggable = (target: MaybeRef, options: Partial) }); const transform = () => { - if (!get(node) || get(state).update === false || !get(state).dragging) return; + if (!get(node) || get(state).update === false) return; if (get(state).enableTransformFix) removeTransformFix(); const offset = get(state).positionOffset; @@ -263,7 +263,11 @@ const useDraggable = (target: MaybeRef, options: Partial) get(state).y = pos.y; get(state).prevPropsPosition = { ...pos }; } - transform(); + if (get(state).enableTransformFix) { + applyTransformFix(); + } else { + transform(); + } }; tryOnUnmounted(() => { diff --git a/src/utils/types.ts b/src/utils/types.ts index 65dd02d..718ce1e 100644 --- a/src/utils/types.ts +++ b/src/utils/types.ts @@ -41,8 +41,6 @@ export interface DraggableOptions extends DraggableCoreOptions { defaultPosition: ControlPosition; positionOffset?: PositionOffsetControlPosition; position?: ControlPosition; - x: number; - y: number; } export interface DraggableCoreOptions { @@ -63,7 +61,8 @@ export interface DraggableCoreOptions { export type DraggableCoreState = State & DraggableCoreOptions; -export type DraggableState = State & DraggableOptions & { prevPropsPosition: { x: number; y: number }; isElementSVG: boolean }; +export type DraggableState = State & + DraggableOptions & { x: number; y: number; prevPropsPosition: { x: number; y: number }; isElementSVG: boolean }; interface State { dragging: boolean;