Skip to content

Commit 9e50eef

Browse files
kangjm103kangjm103
committed
Fix: item position when start drag (jbaysolutions#400)
1 parent 6d756de commit 9e50eef

File tree

1 file changed

+20
-17
lines changed

1 file changed

+20
-17
lines changed

‎dist/vue-grid-layout.common.js

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1903,7 +1903,7 @@ module.exports = function (that, target, C) {
19031903
/* harmony import */ var _node_modules_vue_style_loader_index_js_ref_6_oneOf_1_0_node_modules_css_loader_index_js_ref_6_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_2_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_GridItem_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("6e21");
19041904
/* harmony import */ var _node_modules_vue_style_loader_index_js_ref_6_oneOf_1_0_node_modules_css_loader_index_js_ref_6_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_2_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_GridItem_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_vue_style_loader_index_js_ref_6_oneOf_1_0_node_modules_css_loader_index_js_ref_6_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_2_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_GridItem_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0__);
19051905
/* unused harmony reexport * */
1906-
/* unused harmony default export */ var _unused_webpack_default_export = (_node_modules_vue_style_loader_index_js_ref_6_oneOf_1_0_node_modules_css_loader_index_js_ref_6_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_2_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_GridItem_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0___default.a);
1906+
/* unused harmony default export */ var _unused_webpack_default_export = (_node_modules_vue_style_loader_index_js_ref_6_oneOf_1_0_node_modules_css_loader_index_js_ref_6_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_2_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_GridItem_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0___default.a);
19071907

19081908
/***/ }),
19091909

@@ -3942,7 +3942,7 @@ module.exports = (
39423942
/* harmony import */ var _node_modules_vue_style_loader_index_js_ref_6_oneOf_1_0_node_modules_css_loader_index_js_ref_6_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_2_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_GridLayout_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("1156");
39433943
/* harmony import */ var _node_modules_vue_style_loader_index_js_ref_6_oneOf_1_0_node_modules_css_loader_index_js_ref_6_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_2_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_GridLayout_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_vue_style_loader_index_js_ref_6_oneOf_1_0_node_modules_css_loader_index_js_ref_6_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_2_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_GridLayout_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0__);
39443944
/* unused harmony reexport * */
3945-
/* unused harmony default export */ var _unused_webpack_default_export = (_node_modules_vue_style_loader_index_js_ref_6_oneOf_1_0_node_modules_css_loader_index_js_ref_6_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_2_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_GridLayout_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0___default.a);
3945+
/* unused harmony default export */ var _unused_webpack_default_export = (_node_modules_vue_style_loader_index_js_ref_6_oneOf_1_0_node_modules_css_loader_index_js_ref_6_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_2_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_GridLayout_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0___default.a);
39463946

39473947
/***/ }),
39483948

@@ -5862,16 +5862,19 @@ var interact = __webpack_require__("fb3a");
58625862
{
58635863
this.previousX = this.innerX;
58645864
this.previousY = this.innerY;
5865-
var parentRect = event.target.offsetParent.getBoundingClientRect();
5865+
5866+
var offsetParent = event.target.offsetParent || document.body;
5867+
var parentRect = offsetParent.getBoundingClientRect();
58665868
var clientRect = event.target.getBoundingClientRect();
58675869

58685870
if (this.renderRtl) {
5869-
newPosition.left = (clientRect.right - parentRect.right) * -1;
5871+
newPosition.left =
5872+
((clientRect.right - parentRect.right) + offsetParent.scrollLeft) * -1;
58705873
} else {
5871-
newPosition.left = clientRect.left - parentRect.left;
5874+
newPosition.left = (clientRect.left - parentRect.left) + offsetParent.scrollLeft;
58725875
}
58735876

5874-
newPosition.top = clientRect.top - parentRect.top;
5877+
newPosition.top = (clientRect.top - parentRect.top) + offsetParent.scrollTop;
58755878
this.dragging = newPosition;
58765879
this.isDragging = true;
58775880
break;
@@ -5881,19 +5884,19 @@ var interact = __webpack_require__("fb3a");
58815884
{
58825885
if (!this.isDragging) return;
58835886

5884-
var _parentRect = event.target.offsetParent.getBoundingClientRect();
5885-
5887+
var _offsetParent = event.target.offsetParent || document.body;
5888+
var _parentRect = offsetParent.getBoundingClientRect();
58865889
var _clientRect = event.target.getBoundingClientRect(); // Add rtl support
58875890

58885891

58895892
if (this.renderRtl) {
5890-
newPosition.left = (_clientRect.right - _parentRect.right) * -1;
5893+
newPosition.left =
5894+
((_clientRect.right - _parentRect.right) + _offsetParent.scrollLeft) * -1;
58915895
} else {
5892-
newPosition.left = _clientRect.left - _parentRect.left;
5896+
newPosition.left = (_clientRect.left - _parentRect.left) + _offsetParent.scrollLeft;
58935897
}
58945898

5895-
newPosition.top = _clientRect.top - _parentRect.top; // console.log("### drag end => " + JSON.stringify(newPosition));
5896-
// console.log("### DROP: " + JSON.stringify(newPosition));
5899+
newPosition.top = (_clientRect.top - _parentRect.top) + _offsetParent.scrollTop;
58975900

58985901
this.dragging = null;
58995902
this.isDragging = false; // shouldUpdate = true;
@@ -6155,7 +6158,7 @@ var interact = __webpack_require__("fb3a");
61556158
}
61566159
});
61576160
// CONCATENATED MODULE: ./src/components/GridItem.vue?vue&type=script&lang=js&
6158-
/* harmony default export */ var components_GridItemvue_type_script_lang_js_ = (GridItemvue_type_script_lang_js_);
6161+
/* harmony default export */ var components_GridItemvue_type_script_lang_js_ = (GridItemvue_type_script_lang_js_);
61596162
// EXTERNAL MODULE: ./src/components/GridItem.vue?vue&type=style&index=0&lang=css&
61606163
var GridItemvue_type_style_index_0_lang_css_ = __webpack_require__("5ed4");
61616164

@@ -6271,7 +6274,7 @@ var component = normalizeComponent(
62716274
null,
62726275
null,
62736276
null
6274-
6277+
62756278
)
62766279

62776280
/* harmony default export */ var GridItem = (component.exports);
@@ -6934,7 +6937,7 @@ var elementResizeDetectorMaker = __webpack_require__("eec4");
69346937
}
69356938
});
69366939
// CONCATENATED MODULE: ./src/components/GridLayout.vue?vue&type=script&lang=js&
6937-
/* harmony default export */ var components_GridLayoutvue_type_script_lang_js_ = (GridLayoutvue_type_script_lang_js_);
6940+
/* harmony default export */ var components_GridLayoutvue_type_script_lang_js_ = (GridLayoutvue_type_script_lang_js_);
69386941
// EXTERNAL MODULE: ./src/components/GridLayout.vue?vue&type=style&index=0&lang=css&
69396942
var GridLayoutvue_type_style_index_0_lang_css_ = __webpack_require__("e279");
69406943

@@ -6955,7 +6958,7 @@ var GridLayout_component = normalizeComponent(
69556958
null,
69566959
null,
69576960
null
6958-
6961+
69596962
)
69606963

69616964
/* harmony default export */ var GridLayout = (GridLayout_component.exports);
@@ -17043,4 +17046,4 @@ module.exports = '\x09\x0A\x0B\x0C\x0D\x20\xA0\u1680\u180E\u2000\u2001\u2002\u20
1704317046
/***/ })
1704417047

1704517048
/******/ })["default"];
17046-
//# sourceMappingURL=vue-grid-layout.common.js.map
17049+
//# sourceMappingURL=vue-grid-layout.common.js.map

0 commit comments

Comments
 (0)