修复在火狐下的bug

Foveluy · Mar 1, 2018 · 7d6f217 · 7d6f217
1 parent 86bc00b
commit 7d6f217
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/build/react-dragger-layout.js b/build/react-dragger-layout.js
diff --git a/dist/lib/GridItem.js b/dist/lib/GridItem.js
@@ -114,7 +114,7 @@ var GridItem = /** @class */ (function (_super) {
             return;
         var _b = this.calGridXY(x, y), GridX = _b.GridX, GridY = _b.GridY;
         this.props.onDragStart && this.props.onDragStart({
-            event: event, GridX: GridX, GridY: GridY, w: w, h: h, UniqueKey: UniqueKey + ''
+            event: null, GridX: GridX, GridY: GridY, w: w, h: h, UniqueKey: UniqueKey + ''
         });
     };
     GridItem.prototype.onDrag = function (event, x, y) {

diff --git a/src/lib/dragger/index.tsx b/src/lib/dragger/index.tsx
@@ -207,6 +207,7 @@ export class Dragger extends React.Component<DraggerProps, {}> {
         /** 保证用户在移动元素的时候不会选择到元素内部的东西 */
         doc.body.style.userSelect = 'none'
 
+
 
         // if (event.target.id !== 'dragact-handle') return
 
@@ -243,9 +244,11 @@ export class Dragger extends React.Component<DraggerProps, {}> {
             this.self = event.currentTarget
         }
 
-        this.props.onDragStart && this.props.onDragStart(this.state.x, this.state.y)
+
 
+        this.props.onDragStart && this.props.onDragStart(this.state.x, this.state.y)
 
+
         let originX, originY;
         if (event.type.indexOf('mouse') >= 0) {
             originX = (event as MouseEvent).clientX
@@ -255,6 +258,8 @@ export class Dragger extends React.Component<DraggerProps, {}> {
             originY = (event as TouchEvent).touches[0].clientY
         }
 
+
+
         this.setState({
             originX: originX,
             originY: originY,

diff --git a/src/lib/gridItem.tsx b/src/lib/gridItem.tsx
@@ -31,7 +31,7 @@ export interface GridItemProps {
 
     isUserMove: Boolean
 
-    UniqueKey?: string 
+    UniqueKey?: string
 
     static?: Boolean
 
@@ -163,12 +163,13 @@ export default class GridItem extends React.Component<GridItemProps, {}> {
 
     onDragStart(x: number, y: number) {
         const { w, h, UniqueKey } = this.props;
+
         if (this.props.static) return;
 
         const { GridX, GridY } = this.calGridXY(x, y)
 
         this.props.onDragStart && this.props.onDragStart({
-            event, GridX, GridY, w, h, UniqueKey: UniqueKey + ''
+            event: null, GridX, GridY, w, h, UniqueKey: UniqueKey + ''
         })
     }
     onDrag(event: any, x: number, y: number) {