Skip to content

Commit eba2559

Browse files
committed
bump interact.js to 1.10.0 and changes imports to use tree shaking (taye/interact.js#800)
1 parent fb90072 commit eba2559

File tree

5 files changed

+24
-300
lines changed

5 files changed

+24
-300
lines changed

package.json

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,12 @@
2727
"lint": "vue-cli-service lint"
2828
},
2929
"dependencies": {
30-
"element-resize-detector": "^1.1.15",
31-
"interactjs": "^1.9.22"
30+
"element-resize-detector": "^1.2.1",
31+
"@interactjs/interactjs": "^1.10.0",
32+
"@interactjs/auto-start": "^1.10.0",
33+
"@interactjs/actions": "^1.10.0",
34+
"@interactjs/modifiers": "^1.10.0",
35+
"@interactjs/dev-tools": "^1.10.0"
3236
},
3337
"devDependencies": {
3438
"@vue/cli-plugin-babel": "^3.4.1",
@@ -41,6 +45,6 @@
4145
"sass-loader": "^7.0.1",
4246
"vue": "^2.6.12",
4347
"vue-template-compiler": "^2.6.12",
44-
"webpack-bundle-analyzer": "^3.4.1"
48+
"webpack-bundle-analyzer": "^3.9.0"
4549
}
4650
}

src/App.vue

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,8 @@
6262
:w="item.w"
6363
:h="item.h"
6464
:i="item.i"
65+
:min-w="item.minW"
66+
:max-w="item.maxW"
6567
:min-x="item.minX"
6668
:max-x="item.maxX"
6769
:min-y="item.minY"
@@ -117,7 +119,7 @@
117119
let testLayout = [
118120
{"x":0,"y":0,"w":2,"h":2,"i":"0", resizable: true, draggable: true, static: false, minY: 0, maxY: 2},
119121
{"x":2,"y":0,"w":2,"h":4,"i":"1", resizable: null, draggable: null, static: true},
120-
{"x":4,"y":0,"w":2,"h":5,"i":"2", resizable: false, draggable: false, static: false, minX: 4, maxX: 4},
122+
{"x":4,"y":0,"w":2,"h":5,"i":"2", resizable: false, draggable: false, static: false, minX: 4, maxX: 4, minW: 2, maxW: 2},
121123
{"x":6,"y":0,"w":2,"h":3,"i":"3", resizable: false, draggable: false, static: false},
122124
{"x":8,"y":0,"w":2,"h":3,"i":"4", resizable: false, draggable: false, static: false},
123125
{"x":10,"y":0,"w":2,"h":3,"i":"5", resizable: false, draggable: false, static: false},
@@ -193,7 +195,7 @@
193195
addItemDynamically: function() {
194196
let item = {
195197
x: (this.layout.length * 2) % (this.colNum || 12),
196-
y: this.layout.length + (this.colNum || 12),
198+
y: this.layout.length + (this.colNum || 12),
197199
w: 2,
198200
h: 2,
199201
i: this.index+"",

src/components/GridItem.vue

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,12 +86,17 @@
8686
}
8787
</style>
8888
<script>
89-
import {setTopLeft, setTopRight, setTransformRtl, setTransform} from '../helpers/utils';
90-
import {getControlPosition, createCoreData} from '../helpers/draggableUtils';
91-
import {getDocumentDir} from "../helpers/DOM";
89+
import {setTopLeft, setTopRight, setTransformRtl, setTransform} from '@/helpers/utils';
90+
import {getControlPosition, createCoreData} from '@/helpers/draggableUtils';
91+
import {getDocumentDir} from "@/helpers/DOM";
9292
// var eventBus = require('./eventBus');
9393
94-
let interact = require("interactjs");
94+
import '@interactjs/auto-start'
95+
import '@interactjs/actions/drag'
96+
import '@interactjs/actions/resize'
97+
import '@interactjs/modifiers'
98+
import '@interactjs/dev-tools'
99+
import interact from '@interactjs/interact'
95100
96101
export default {
97102
name: "GridItem",

src/components/GridLayout.vue

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@
1818
</style>
1919
<script>
2020
import Vue from 'vue';
21-
var elementResizeDetectorMaker = require("element-resize-detector");
21+
const elementResizeDetectorMaker = require("element-resize-detector");
2222
23-
import {bottom, compact, getLayoutItem, moveElement, validateLayout, cloneLayout, getAllCollisions} from '../helpers/utils';
24-
import {getBreakpointFromWidth, getColsFromBreakpoint, findOrGenerateResponsiveLayout} from "../helpers/responsiveUtils";
23+
import {bottom, compact, getLayoutItem, moveElement, validateLayout, cloneLayout, getAllCollisions} from '@/helpers/utils';
24+
import {getBreakpointFromWidth, getColsFromBreakpoint, findOrGenerateResponsiveLayout} from "@/helpers/responsiveUtils";
2525
//var eventBus = require('./eventBus');
2626
2727
import GridItem from './GridItem.vue'
28-
import {addWindowEventListener, removeWindowEventListener} from "../helpers/DOM";
28+
import {addWindowEventListener, removeWindowEventListener} from "@/helpers/DOM";
2929
3030
export default {
3131
name: "GridLayout",

src/components/ResponsiveGridLayout.vue

Lines changed: 0 additions & 287 deletions
This file was deleted.

0 commit comments

Comments
 (0)