@gravity-ui/dashkit 8.8.1-beta.0 → 8.8.1-beta.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/build/cjs/components/GridLayout/GridLayout.js +6 -6
  2. package/build/cjs/components/GridLayout/ReactGridLayout.js +9 -6
  3. package/build/esm/components/GridLayout/GridLayout.js +6 -6
  4. package/build/esm/components/GridLayout/ReactGridLayout.js +9 -6
  5. package/package.json +1 -1
package/build/cjs/components/GridLayout/GridLayout.js CHANGED
@@ -97,16 +97,16 @@ class GridLayout extends react_1.default.PureComponent {
97
97
  this._onDragStart = (group, _newLayout, layoutItem) => {
98
98
  if (this.temporaryLayout)
99
99
  return;
100
- let currentDraggingElement = this.state.currentDraggingElement;
101
- if (!currentDraggingElement) {
102
- const _id = layoutItem.i;
103
- const item = this.context.config.items.find(({ id }) => id === _id);
104
- currentDraggingElement = [group, layoutItem, item];
105
- }
106
100
  if (this.context.dragOverPlugin) {
107
101
  this.setState({ isDragging: true });
108
102
  }
109
103
  else {
104
+ let currentDraggingElement = this.state.currentDraggingElement;
105
+ if (!currentDraggingElement) {
106
+ const _id = layoutItem.i;
107
+ const item = this.context.config.items.find(({ id }) => id === _id);
108
+ currentDraggingElement = [group, layoutItem, item];
109
+ }
110
110
  this.setState({
111
111
  isDragging: true,
112
112
  currentDraggingElement,
package/build/cjs/components/GridLayout/ReactGridLayout.js CHANGED
@@ -51,19 +51,18 @@ class DragOverLayout extends react_grid_layout_1.default {
51
51
  return { layout: savedLayout, id: hiddenElement.i };
52
52
  };
53
53
  this.extendedOnDrag = (i, x, y, sintEv) => {
54
- var _a, _b;
55
54
  if (!this._isMouseOver) {
56
55
  if (!this._savedDragoutState) {
57
56
  this._savedDragoutState = this.hideLocalPlaceholder(i);
58
- (_b = (_a = this.props).onDragExit) === null || _b === void 0 ? void 0 : _b.call(_a);
59
57
  }
60
58
  return;
61
59
  }
60
+ this._savedDragoutState = null;
62
61
  // parent onDrag will show new placeholder again
63
62
  this.parentOnDrag(i, x, y, sintEv);
64
63
  };
65
64
  this.extendedOnDragStop = (i, x, y, sintEv) => {
66
- // Restoring layout if item was dropped outside of the grid and wasn't captured
65
+ // Restoring layout if item was dropped outside of the grid
67
66
  if (this._savedDragoutState) {
68
67
  const savedLayout = this._savedDragoutState.layout;
69
68
  const l = react_grid_layout_1.utils.getLayoutItem(savedLayout, i);
@@ -90,11 +89,13 @@ class DragOverLayout extends react_grid_layout_1.default {
90
89
  };
91
90
  this.extendedOnDragEnter = (...args) => {
92
91
  this._isMouseOver = true;
93
- return this.parentOnDragEnter(...args);
92
+ this.parentOnDragEnter(...args);
94
93
  };
95
94
  this.extendedOnDragLeave = (...args) => {
96
- this._isMouseOver = true;
97
- return this.parentOnDragLeave(...args);
95
+ var _a, _b;
96
+ this._isMouseOver = false;
97
+ this.parentOnDragLeave(...args);
98
+ (_b = (_a = this.props).onDragExit) === null || _b === void 0 ? void 0 : _b.call(_a);
98
99
  };
99
100
  // Proxy mouse events -> drag methods for dnd between groups
100
101
  this.mouseEnterHandler = (e) => {
@@ -104,9 +105,11 @@ class DragOverLayout extends react_grid_layout_1.default {
104
105
  }
105
106
  };
106
107
  this.mouseLeaveHandler = (e) => {
108
+ var _a, _b;
107
109
  this._isMouseOver = false;
108
110
  if (this.props.hasSharedDragItem) {
109
111
  this.parentOnDragLeave(e);
112
+ (_b = (_a = this.props).onDragExit) === null || _b === void 0 ? void 0 : _b.call(_a);
110
113
  }
111
114
  };
112
115
  this.mouseMoveHandler = (e) => {
package/build/esm/components/GridLayout/GridLayout.js CHANGED
@@ -94,16 +94,16 @@ class GridLayout extends React.PureComponent {
94
94
  this._onDragStart = (group, _newLayout, layoutItem) => {
95
95
  if (this.temporaryLayout)
96
96
  return;
97
- let currentDraggingElement = this.state.currentDraggingElement;
98
- if (!currentDraggingElement) {
99
- const _id = layoutItem.i;
100
- const item = this.context.config.items.find(({ id }) => id === _id);
101
- currentDraggingElement = [group, layoutItem, item];
102
- }
103
97
  if (this.context.dragOverPlugin) {
104
98
  this.setState({ isDragging: true });
105
99
  }
106
100
  else {
101
+ let currentDraggingElement = this.state.currentDraggingElement;
102
+ if (!currentDraggingElement) {
103
+ const _id = layoutItem.i;
104
+ const item = this.context.config.items.find(({ id }) => id === _id);
105
+ currentDraggingElement = [group, layoutItem, item];
106
+ }
107
107
  this.setState({
108
108
  isDragging: true,
109
109
  currentDraggingElement,
package/build/esm/components/GridLayout/ReactGridLayout.js CHANGED
@@ -47,19 +47,18 @@ class DragOverLayout extends ReactGridLayout {
47
47
  return { layout: savedLayout, id: hiddenElement.i };
48
48
  };
49
49
  this.extendedOnDrag = (i, x, y, sintEv) => {
50
- var _a, _b;
51
50
  if (!this._isMouseOver) {
52
51
  if (!this._savedDragoutState) {
53
52
  this._savedDragoutState = this.hideLocalPlaceholder(i);
54
- (_b = (_a = this.props).onDragExit) === null || _b === void 0 ? void 0 : _b.call(_a);
55
53
  }
56
54
  return;
57
55
  }
56
+ this._savedDragoutState = null;
58
57
  // parent onDrag will show new placeholder again
59
58
  this.parentOnDrag(i, x, y, sintEv);
60
59
  };
61
60
  this.extendedOnDragStop = (i, x, y, sintEv) => {
62
- // Restoring layout if item was dropped outside of the grid and wasn't captured
61
+ // Restoring layout if item was dropped outside of the grid
63
62
  if (this._savedDragoutState) {
64
63
  const savedLayout = this._savedDragoutState.layout;
65
64
  const l = utils.getLayoutItem(savedLayout, i);
@@ -86,11 +85,13 @@ class DragOverLayout extends ReactGridLayout {
86
85
  };
87
86
  this.extendedOnDragEnter = (...args) => {
88
87
  this._isMouseOver = true;
89
- return this.parentOnDragEnter(...args);
88
+ this.parentOnDragEnter(...args);
90
89
  };
91
90
  this.extendedOnDragLeave = (...args) => {
92
- this._isMouseOver = true;
93
- return this.parentOnDragLeave(...args);
91
+ var _a, _b;
92
+ this._isMouseOver = false;
93
+ this.parentOnDragLeave(...args);
94
+ (_b = (_a = this.props).onDragExit) === null || _b === void 0 ? void 0 : _b.call(_a);
94
95
  };
95
96
  // Proxy mouse events -> drag methods for dnd between groups
96
97
  this.mouseEnterHandler = (e) => {
@@ -100,9 +101,11 @@ class DragOverLayout extends ReactGridLayout {
100
101
  }
101
102
  };
102
103
  this.mouseLeaveHandler = (e) => {
104
+ var _a, _b;
103
105
  this._isMouseOver = false;
104
106
  if (this.props.hasSharedDragItem) {
105
107
  this.parentOnDragLeave(e);
108
+ (_b = (_a = this.props).onDragExit) === null || _b === void 0 ? void 0 : _b.call(_a);
106
109
  }
107
110
  };
108
111
  this.mouseMoveHandler = (e) => {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@gravity-ui/dashkit",
3
- "version": "8.8.1-beta.0",
3
+ "version": "8.8.1-beta.2",
4
4
  "description": "Library for rendering dashboard grid layout",
5
5
  "license": "MIT",
6
6
  "repository": {