fix: scale being incorrect when passed to draggable causing weirdly fast drags

chore: upgrade revue-draggable to latest on tag next
This commit is contained in:
Braks
2021-07-20 20:39:42 +02:00
parent 1a7f3da0b6
commit 86ead92839
3 changed files with 10 additions and 8 deletions
+1 -1
View File
@@ -28,7 +28,7 @@
"lint": "yarn lint:js" "lint": "yarn lint:js"
}, },
"dependencies": { "dependencies": {
"@braks/revue-draggable": "^0.2.1-5", "@braks/revue-draggable": "^0.2.1-6",
"@types/d3": "^7.0.0", "@types/d3": "^7.0.0",
"d3": "^7.0.0", "d3": "^7.0.0",
"d3-selection": "^3.0.0", "d3-selection": "^3.0.0",
+5 -3
View File
@@ -1,5 +1,5 @@
import { Node, RevueFlowStore, WrapNodeProps } from '../../types'; import { Node, RevueFlowStore, WrapNodeProps } from '../../types';
import { computed, CSSProperties, DefineComponent, defineComponent, inject, onMounted, provide, ref, watchEffect } from 'vue'; import { computed, CSSProperties, DefineComponent, defineComponent, inject, onMounted, onUpdated, provide, ref } from 'vue';
import { DraggableEventHandler, DraggableCore } from '@braks/revue-draggable'; import { DraggableEventHandler, DraggableCore } from '@braks/revue-draggable';
export default (NodeComponent: DefineComponent<WrapNodeProps>) => { export default (NodeComponent: DefineComponent<WrapNodeProps>) => {
@@ -134,7 +134,7 @@ export default (NodeComponent: DefineComponent<WrapNodeProps>) => {
props.onNodeDragStop?.(event as MouseEvent, node.value as Node); props.onNodeDragStop?.(event as MouseEvent, node.value as Node);
}; };
watchEffect(() => { onUpdated(() => {
if (nodeElement.value && !props.isHidden) { if (nodeElement.value && !props.isHidden) {
store?.updateNodeDimensions([{ id: props.id || '', nodeElement: nodeElement.value, forceUpdate: true }]); store?.updateNodeDimensions([{ id: props.id || '', nodeElement: nodeElement.value, forceUpdate: true }]);
} }
@@ -162,12 +162,14 @@ export default (NodeComponent: DefineComponent<WrapNodeProps>) => {
} }
]); ]);
const scale = computed(() => store.transform[2] || 1);
return () => ( return () => (
<DraggableCore <DraggableCore
start={onDragStart} start={onDragStart}
move={onDrag} move={onDrag}
stop={onDragStop} stop={onDragStop}
scale={store.transform[2]} scale={scale.value}
disabled={!props.isDraggable} disabled={!props.isDraggable}
cancel=".nodrag" cancel=".nodrag"
grid={grid.value} grid={grid.value}
+4 -4
View File
@@ -262,10 +262,10 @@
"@babel/helper-validator-identifier" "^7.14.5" "@babel/helper-validator-identifier" "^7.14.5"
to-fast-properties "^2.0.0" to-fast-properties "^2.0.0"
"@braks/revue-draggable@^0.2.1-5": "@braks/revue-draggable@^0.2.1-6":
version "0.2.1-5" version "0.2.1-6"
resolved "https://registry.yarnpkg.com/@braks/revue-draggable/-/revue-draggable-0.2.1-5.tgz#280f9cb4dfd5c3bc88dff0f8c70ffa8966536328" resolved "https://registry.yarnpkg.com/@braks/revue-draggable/-/revue-draggable-0.2.1-6.tgz#6a0b5bf837d7c6a5b2380f3a2b6687271121980b"
integrity sha512-+oDuUvTVd5ST6brdtfXYJMnFrmyQat9W7yUKpKBTI0od3ycfaGgMCT9w+OoQ3rlBi2cV6gFXlhZVIeLi+v55aA== integrity sha512-umY2rLspfkrYfRqDCnV3RvvSiqQPio4Mjdpcp/T+IF/kj0ym7UgA11c017wEQmzUmXwHrgL050bC/LBW5/KJNQ==
dependencies: dependencies:
"@vueuse/core" "^5.1.3" "@vueuse/core" "^5.1.3"
vue-demi latest vue-demi latest