Skip to content

Commit 1e26de4

Browse files
llezenelrahcguangyao.huang
and
guangyao.huang
authored
add dependency for @interactjs/auto-scroll and add item option for interact js pass through (#580)
Co-authored-by: guangyao.huang <[email protected]>
1 parent 4a5d0a6 commit 1e26de4

File tree

2 files changed

+20
-6
lines changed

2 files changed

+20
-6
lines changed

package.json

+5-4
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,13 @@
2929
"test:cover": "vue-cli-service test:unit --coverage"
3030
},
3131
"dependencies": {
32-
"element-resize-detector": "^1.2.1",
33-
"@interactjs/interactjs": "^1.10.2",
34-
"@interactjs/auto-start": "^1.10.2",
3532
"@interactjs/actions": "^1.10.2",
33+
"@interactjs/auto-scroll": "^1.10.8",
34+
"@interactjs/auto-start": "^1.10.2",
35+
"@interactjs/dev-tools": "^1.10.2",
36+
"@interactjs/interactjs": "^1.10.2",
3637
"@interactjs/modifiers": "^1.10.2",
37-
"@interactjs/dev-tools": "^1.10.2"
38+
"element-resize-detector": "^1.2.1"
3839
},
3940
"devDependencies": {
4041
"@babel/preset-env": "^7.12.11",

src/components/GridItem.vue

+15-2
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@
9393
// var eventBus = require('./eventBus');
9494
9595
import '@interactjs/auto-start'
96+
import '@interactjs/auto-scroll'
9697
import '@interactjs/actions/drag'
9798
import '@interactjs/actions/resize'
9899
import '@interactjs/modifiers'
@@ -201,6 +202,16 @@
201202
type: Boolean,
202203
required: false,
203204
default: false,
205+
},
206+
dragOption:{
207+
type:Object,
208+
required: false,
209+
default: ()=>({}),
210+
},
211+
resizeOption:{
212+
type:Object,
213+
required: false,
214+
default: ()=>({}),
204215
}
205216
},
206217
inject: ["eventBus", "layout"],
@@ -769,7 +780,8 @@
769780
if (this.draggable && !this.static) {
770781
const opts = {
771782
ignoreFrom: this.dragIgnoreFrom,
772-
allowFrom: this.dragAllowFrom
783+
allowFrom: this.dragAllowFrom,
784+
...this.dragOption
773785
};
774786
this.interactObj.draggable(opts);
775787
/*this.interactObj.draggable({allowFrom: '.vue-draggable-handle'});*/
@@ -818,7 +830,8 @@
818830
height: maximum.height,
819831
width: maximum.width
820832
}
821-
}
833+
},
834+
...this.resizeOption,
822835
};
823836
824837
if (this.preserveAspectRatio) {

0 commit comments

Comments
 (0)