@atlaskit/editor-plugin-table 7.24.7 → 7.24.8

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.
package/CHANGELOG.md CHANGED
@@ -1,5 +1,13 @@
1
1
  # @atlaskit/editor-plugin-table
2
2
 
3
+ ## 7.24.8
4
+
5
+ ### Patch Changes
6
+
7
+ - [#127766](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/127766)
8
+ [`8a9803d7d9555`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/8a9803d7d9555) -
9
+ ED-24425: Fixed the drag handle show hover state when hover delete column on the next column/row
10
+
3
11
  ## 7.24.7
4
12
 
5
13
  ### Patch Changes
@@ -60,8 +60,11 @@ var DragHandleComponent = function DragHandleComponent(_ref) {
60
60
  isDragMenuOpen = _getDnDPluginState.isDragMenuOpen;
61
61
  var isRow = direction === 'row';
62
62
  var isColumn = direction === 'column';
63
- var isRowHandleHovered = isRow && hoveredRows.length > 0;
64
- var isColumnHandleHovered = isColumn && hoveredColumns.length > 0;
63
+
64
+ // Added !isDragMenuOpen check so when hover 'Delete column/row' from drag menu
65
+ // the handle of the next column/row does not show the 'hovered' state icon
66
+ var isRowHandleHovered = isRow && hoveredRows.length > 0 && !isDragMenuOpen;
67
+ var isColumnHandleHovered = isColumn && hoveredColumns.length > 0 && !isDragMenuOpen;
65
68
  var hasMergedCells = (0, _react.useMemo)(function () {
66
69
  var table = (0, _editorTables.findTable)(selection);
67
70
  if (!table) {
@@ -51,8 +51,11 @@ const DragHandleComponent = ({
51
51
  } = getDnDPluginState(state);
52
52
  const isRow = direction === 'row';
53
53
  const isColumn = direction === 'column';
54
- const isRowHandleHovered = isRow && hoveredRows.length > 0;
55
- const isColumnHandleHovered = isColumn && hoveredColumns.length > 0;
54
+
55
+ // Added !isDragMenuOpen check so when hover 'Delete column/row' from drag menu
56
+ // the handle of the next column/row does not show the 'hovered' state icon
57
+ const isRowHandleHovered = isRow && hoveredRows.length > 0 && !isDragMenuOpen;
58
+ const isColumnHandleHovered = isColumn && hoveredColumns.length > 0 && !isDragMenuOpen;
56
59
  const hasMergedCells = useMemo(() => {
57
60
  const table = findTable(selection);
58
61
  if (!table) {
@@ -50,8 +50,11 @@ var DragHandleComponent = function DragHandleComponent(_ref) {
50
50
  isDragMenuOpen = _getDnDPluginState.isDragMenuOpen;
51
51
  var isRow = direction === 'row';
52
52
  var isColumn = direction === 'column';
53
- var isRowHandleHovered = isRow && hoveredRows.length > 0;
54
- var isColumnHandleHovered = isColumn && hoveredColumns.length > 0;
53
+
54
+ // Added !isDragMenuOpen check so when hover 'Delete column/row' from drag menu
55
+ // the handle of the next column/row does not show the 'hovered' state icon
56
+ var isRowHandleHovered = isRow && hoveredRows.length > 0 && !isDragMenuOpen;
57
+ var isColumnHandleHovered = isColumn && hoveredColumns.length > 0 && !isDragMenuOpen;
55
58
  var hasMergedCells = useMemo(function () {
56
59
  var table = findTable(selection);
57
60
  if (!table) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-plugin-table",
3
- "version": "7.24.7",
3
+ "version": "7.24.8",
4
4
  "description": "Table plugin for the @atlaskit/editor",
5
5
  "publishConfig": {
6
6
  "registry": "https://registry.npmjs.org/"
@@ -44,7 +44,7 @@
44
44
  "@atlaskit/editor-shared-styles": "^2.13.0",
45
45
  "@atlaskit/editor-tables": "^2.8.0",
46
46
  "@atlaskit/icon": "^22.10.0",
47
- "@atlaskit/menu": "^2.9.0",
47
+ "@atlaskit/menu": "^2.10.0",
48
48
  "@atlaskit/platform-feature-flags": "^0.3.0",
49
49
  "@atlaskit/pragmatic-drag-and-drop": "^1.2.0",
50
50
  "@atlaskit/pragmatic-drag-and-drop-auto-scroll": "^1.4.0",
@@ -53,7 +53,7 @@
53
53
  "@atlaskit/theme": "^12.11.0",
54
54
  "@atlaskit/toggle": "^13.2.0",
55
55
  "@atlaskit/tokens": "^1.57.0",
56
- "@atlaskit/tooltip": "^18.5.0",
56
+ "@atlaskit/tooltip": "^18.6.0",
57
57
  "@babel/runtime": "^7.0.0",
58
58
  "@emotion/react": "^11.7.1",
59
59
  "classnames": "^2.2.5",
@@ -77,8 +77,10 @@ const DragHandleComponent = ({
77
77
  const isRow = direction === 'row';
78
78
  const isColumn = direction === 'column';
79
79
 
80
- const isRowHandleHovered = isRow && hoveredRows.length > 0;
81
- const isColumnHandleHovered = isColumn && hoveredColumns.length > 0;
80
+ // Added !isDragMenuOpen check so when hover 'Delete column/row' from drag menu
81
+ // the handle of the next column/row does not show the 'hovered' state icon
82
+ const isRowHandleHovered = isRow && hoveredRows.length > 0 && !isDragMenuOpen;
83
+ const isColumnHandleHovered = isColumn && hoveredColumns.length > 0 && !isDragMenuOpen;
82
84
 
83
85
  const hasMergedCells = useMemo(() => {
84
86
  const table = findTable(selection);