@atlaskit/editor-plugin-table 7.25.8 → 7.25.10
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 +17 -0
- package/dist/cjs/nodeviews/TableComponent.js +4 -10
- package/dist/cjs/nodeviews/table.js +3 -6
- package/dist/cjs/pm-plugins/main.js +0 -2
- package/dist/cjs/ui/DragHandle/index.js +3 -1
- package/dist/cjs/ui/TableFloatingControls/RowControls/DragControls.js +3 -1
- package/dist/es2019/nodeviews/TableComponent.js +4 -10
- package/dist/es2019/nodeviews/table.js +3 -6
- package/dist/es2019/pm-plugins/main.js +1 -3
- package/dist/es2019/ui/DragHandle/index.js +3 -1
- package/dist/es2019/ui/TableFloatingControls/RowControls/DragControls.js +3 -1
- package/dist/esm/nodeviews/TableComponent.js +4 -10
- package/dist/esm/nodeviews/table.js +3 -6
- package/dist/esm/pm-plugins/main.js +1 -3
- package/dist/esm/ui/DragHandle/index.js +3 -1
- package/dist/esm/ui/TableFloatingControls/RowControls/DragControls.js +3 -1
- package/package.json +4 -10
- package/src/nodeviews/TableComponent.tsx +2 -6
- package/src/nodeviews/table.tsx +3 -7
- package/src/pm-plugins/main.ts +0 -5
- package/src/ui/DragHandle/index.tsx +2 -0
- package/src/ui/TableFloatingControls/RowControls/DragControls.tsx +2 -0
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,22 @@
|
|
|
1
1
|
# @atlaskit/editor-plugin-table
|
|
2
2
|
|
|
3
|
+
## 7.25.10
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [#133080](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/133080)
|
|
8
|
+
[`ad996e0558acc`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/ad996e0558acc) -
|
|
9
|
+
EO2024-19: Fixed table insert row dot finickiness"
|
|
10
|
+
- Updated dependencies
|
|
11
|
+
|
|
12
|
+
## 7.25.9
|
|
13
|
+
|
|
14
|
+
### Patch Changes
|
|
15
|
+
|
|
16
|
+
- [#131697](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/131697)
|
|
17
|
+
[`b62fbe67743eb`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/b62fbe67743eb) -
|
|
18
|
+
Clean up React 18 feature flags
|
|
19
|
+
|
|
3
20
|
## 7.25.8
|
|
4
21
|
|
|
5
22
|
### Patch Changes
|
|
@@ -360,7 +360,7 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
|
|
|
360
360
|
(0, _createClass2.default)(TableComponent, [{
|
|
361
361
|
key: "componentDidMount",
|
|
362
362
|
value: function componentDidMount() {
|
|
363
|
-
var _this$props$pluginInj, _this$table2;
|
|
363
|
+
var _this$props$pluginInj, _this$table2, _this$table3;
|
|
364
364
|
var _this$props7 = this.props,
|
|
365
365
|
allowColumnResizing = _this$props7.allowColumnResizing,
|
|
366
366
|
eventDispatcher = _this$props7.eventDispatcher,
|
|
@@ -376,10 +376,7 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
|
|
|
376
376
|
this === null || this === void 0 || (_this$table = this.table) === null || _this$table === void 0 || _this$table.addEventListener('mouseenter', this.handleMouseEnter);
|
|
377
377
|
}
|
|
378
378
|
this === null || this === void 0 || (_this$table2 = this.table) === null || _this$table2 === void 0 || _this$table2.addEventListener('mouseout', this.handleMouseOut);
|
|
379
|
-
|
|
380
|
-
var _this$table3;
|
|
381
|
-
this === null || this === void 0 || (_this$table3 = this.table) === null || _this$table3 === void 0 || _this$table3.addEventListener('mouseover', this.handleMouseOver);
|
|
382
|
-
}
|
|
379
|
+
this === null || this === void 0 || (_this$table3 = this.table) === null || _this$table3 === void 0 || _this$table3.addEventListener('mouseover', this.handleMouseOver);
|
|
383
380
|
var _getEditorFeatureFlag = getEditorFeatureFlags(),
|
|
384
381
|
_getEditorFeatureFlag2 = _getEditorFeatureFlag.tableWithFixedColumnWidthsOption,
|
|
385
382
|
tableWithFixedColumnWidthsOption = _getEditorFeatureFlag2 === void 0 ? false : _getEditorFeatureFlag2,
|
|
@@ -429,7 +426,7 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
|
|
|
429
426
|
}, {
|
|
430
427
|
key: "componentWillUnmount",
|
|
431
428
|
value: function componentWillUnmount() {
|
|
432
|
-
var _this$resizeObserver, _this$table4, _this$table5;
|
|
429
|
+
var _this$resizeObserver, _this$table4, _this$table5, _this$table6;
|
|
433
430
|
var _this$props8 = this.props,
|
|
434
431
|
allowColumnResizing = _this$props8.allowColumnResizing,
|
|
435
432
|
eventDispatcher = _this$props8.eventDispatcher,
|
|
@@ -462,10 +459,7 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
|
|
|
462
459
|
}
|
|
463
460
|
this === null || this === void 0 || (_this$table4 = this.table) === null || _this$table4 === void 0 || _this$table4.removeEventListener('mouseenter', this.handleMouseEnter);
|
|
464
461
|
this === null || this === void 0 || (_this$table5 = this.table) === null || _this$table5 === void 0 || _this$table5.removeEventListener('mouseout', this.handleMouseOut);
|
|
465
|
-
|
|
466
|
-
var _this$table6;
|
|
467
|
-
this === null || this === void 0 || (_this$table6 = this.table) === null || _this$table6 === void 0 || _this$table6.removeEventListener('mouseover', this.handleMouseOver);
|
|
468
|
-
}
|
|
462
|
+
this === null || this === void 0 || (_this$table6 = this.table) === null || _this$table6 === void 0 || _this$table6.removeEventListener('mouseover', this.handleMouseOver);
|
|
469
463
|
if (this.overflowShadowsObserver) {
|
|
470
464
|
this.overflowShadowsObserver.dispose();
|
|
471
465
|
}
|
|
@@ -275,13 +275,10 @@ var TableView = exports.default = /*#__PURE__*/function (_ReactNodeView) {
|
|
|
275
275
|
if (type === 'selection' && (nodeName === null || nodeName === void 0 ? void 0 : nodeName.toUpperCase()) === 'TABLE' && ((firstChild === null || firstChild === void 0 ? void 0 : firstChild.nodeName.toUpperCase()) === 'COLGROUP' || (firstChild === null || firstChild === void 0 ? void 0 : firstChild.nodeName.toUpperCase()) === 'SPAN')) {
|
|
276
276
|
return false;
|
|
277
277
|
}
|
|
278
|
-
if (
|
|
279
|
-
|
|
280
|
-
return true;
|
|
281
|
-
}
|
|
282
|
-
return !this.contentDOM.contains(mutation.target) && mutation.type !== 'selection';
|
|
278
|
+
if (!this.contentDOM) {
|
|
279
|
+
return true;
|
|
283
280
|
}
|
|
284
|
-
return
|
|
281
|
+
return !this.contentDOM.contains(mutation.target) && mutation.type !== 'selection';
|
|
285
282
|
}
|
|
286
283
|
}, {
|
|
287
284
|
key: "destroy",
|
|
@@ -14,7 +14,6 @@ var _utils = require("@atlaskit/editor-common/utils");
|
|
|
14
14
|
var _utils2 = require("@atlaskit/editor-prosemirror/utils");
|
|
15
15
|
var _editorTables = require("@atlaskit/editor-tables");
|
|
16
16
|
var _utils3 = require("@atlaskit/editor-tables/utils");
|
|
17
|
-
var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
|
|
18
17
|
var _commands = require("../commands");
|
|
19
18
|
var _columnResize = require("../commands/column-resize");
|
|
20
19
|
var _misc = require("../commands/misc");
|
|
@@ -279,7 +278,6 @@ var createPlugin = exports.createPlugin = function createPlugin(dispatchAnalytic
|
|
|
279
278
|
focus: _eventHandlers.handleFocus,
|
|
280
279
|
blur: _eventHandlers.handleBlur,
|
|
281
280
|
mousedown: (0, _eventHandlers.withCellTracking)(_eventHandlers.handleMouseDown),
|
|
282
|
-
mouseover: (0, _platformFeatureFlags.fg)('platform_editor_react_18_table_column_resize_hover') ? undefined : (0, _eventHandlers.withCellTracking)((0, _eventHandlers.whenTableInFocus)(_eventHandlers.handleMouseOver)),
|
|
283
281
|
mouseleave: _eventHandlers.handleMouseLeave,
|
|
284
282
|
mousemove: (0, _eventHandlers.whenTableInFocus)(_eventHandlers.handleMouseMove),
|
|
285
283
|
mouseenter: _eventHandlers.handleMouseEnter,
|
|
@@ -175,7 +175,9 @@ var DragHandleComponent = function DragHandleComponent(_ref) {
|
|
|
175
175
|
left: isRow ? "var(--ds-space-050, 4px)" : undefined,
|
|
176
176
|
bottom: isColumn ? "var(--ds-space-0, 0px)" : undefined,
|
|
177
177
|
alignSelf: isColumn ? 'none' : 'center',
|
|
178
|
-
zIndex: isColumn ? '-1' : 'auto'
|
|
178
|
+
zIndex: isColumn ? '-1' : 'auto',
|
|
179
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop
|
|
180
|
+
pointerEvents: 'auto'
|
|
179
181
|
},
|
|
180
182
|
onMouseUp: function onMouseUp(e) {
|
|
181
183
|
// should toggle menu if current drag menu open.
|
|
@@ -146,7 +146,9 @@ var DragControlsComponent = function DragControlsComponent(_ref) {
|
|
|
146
146
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
|
|
147
147
|
position: 'relative',
|
|
148
148
|
// eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage/preview, @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
|
|
149
|
-
right: '-0.5px'
|
|
149
|
+
right: '-0.5px',
|
|
150
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop
|
|
151
|
+
pointerEvents: 'none'
|
|
150
152
|
},
|
|
151
153
|
"data-testid": "table-floating-row-".concat(isHover ? rowIndex : selectedRowIndexes[0], "-drag-handle")
|
|
152
154
|
}, /*#__PURE__*/_react.default.createElement(_DragHandle.DragHandle, {
|
|
@@ -342,7 +342,7 @@ class TableComponent extends React.Component {
|
|
|
342
342
|
}
|
|
343
343
|
}
|
|
344
344
|
componentDidMount() {
|
|
345
|
-
var _this$props$pluginInj, _this$props$pluginInj2, _this$table2;
|
|
345
|
+
var _this$props$pluginInj, _this$props$pluginInj2, _this$table2, _this$table3;
|
|
346
346
|
const {
|
|
347
347
|
allowColumnResizing,
|
|
348
348
|
eventDispatcher,
|
|
@@ -360,10 +360,7 @@ class TableComponent extends React.Component {
|
|
|
360
360
|
this === null || this === void 0 ? void 0 : (_this$table = this.table) === null || _this$table === void 0 ? void 0 : _this$table.addEventListener('mouseenter', this.handleMouseEnter);
|
|
361
361
|
}
|
|
362
362
|
this === null || this === void 0 ? void 0 : (_this$table2 = this.table) === null || _this$table2 === void 0 ? void 0 : _this$table2.addEventListener('mouseout', this.handleMouseOut);
|
|
363
|
-
|
|
364
|
-
var _this$table3;
|
|
365
|
-
this === null || this === void 0 ? void 0 : (_this$table3 = this.table) === null || _this$table3 === void 0 ? void 0 : _this$table3.addEventListener('mouseover', this.handleMouseOver);
|
|
366
|
-
}
|
|
363
|
+
this === null || this === void 0 ? void 0 : (_this$table3 = this.table) === null || _this$table3 === void 0 ? void 0 : _this$table3.addEventListener('mouseover', this.handleMouseOver);
|
|
367
364
|
const {
|
|
368
365
|
tableWithFixedColumnWidthsOption = false,
|
|
369
366
|
stickyScrollbar
|
|
@@ -411,7 +408,7 @@ class TableComponent extends React.Component {
|
|
|
411
408
|
}
|
|
412
409
|
}
|
|
413
410
|
componentWillUnmount() {
|
|
414
|
-
var _this$resizeObserver, _this$table4, _this$table5;
|
|
411
|
+
var _this$resizeObserver, _this$table4, _this$table5, _this$table6;
|
|
415
412
|
const {
|
|
416
413
|
allowColumnResizing,
|
|
417
414
|
eventDispatcher,
|
|
@@ -446,10 +443,7 @@ class TableComponent extends React.Component {
|
|
|
446
443
|
}
|
|
447
444
|
this === null || this === void 0 ? void 0 : (_this$table4 = this.table) === null || _this$table4 === void 0 ? void 0 : _this$table4.removeEventListener('mouseenter', this.handleMouseEnter);
|
|
448
445
|
this === null || this === void 0 ? void 0 : (_this$table5 = this.table) === null || _this$table5 === void 0 ? void 0 : _this$table5.removeEventListener('mouseout', this.handleMouseOut);
|
|
449
|
-
|
|
450
|
-
var _this$table6;
|
|
451
|
-
this === null || this === void 0 ? void 0 : (_this$table6 = this.table) === null || _this$table6 === void 0 ? void 0 : _this$table6.removeEventListener('mouseover', this.handleMouseOver);
|
|
452
|
-
}
|
|
446
|
+
this === null || this === void 0 ? void 0 : (_this$table6 = this.table) === null || _this$table6 === void 0 ? void 0 : _this$table6.removeEventListener('mouseover', this.handleMouseOver);
|
|
453
447
|
if (this.overflowShadowsObserver) {
|
|
454
448
|
this.overflowShadowsObserver.dispose();
|
|
455
449
|
}
|
|
@@ -244,13 +244,10 @@ export default class TableView extends ReactNodeView {
|
|
|
244
244
|
if (type === 'selection' && (nodeName === null || nodeName === void 0 ? void 0 : nodeName.toUpperCase()) === 'TABLE' && ((firstChild === null || firstChild === void 0 ? void 0 : firstChild.nodeName.toUpperCase()) === 'COLGROUP' || (firstChild === null || firstChild === void 0 ? void 0 : firstChild.nodeName.toUpperCase()) === 'SPAN')) {
|
|
245
245
|
return false;
|
|
246
246
|
}
|
|
247
|
-
if (
|
|
248
|
-
|
|
249
|
-
return true;
|
|
250
|
-
}
|
|
251
|
-
return !this.contentDOM.contains(mutation.target) && mutation.type !== 'selection';
|
|
247
|
+
if (!this.contentDOM) {
|
|
248
|
+
return true;
|
|
252
249
|
}
|
|
253
|
-
return
|
|
250
|
+
return !this.contentDOM.contains(mutation.target) && mutation.type !== 'selection';
|
|
254
251
|
}
|
|
255
252
|
destroy() {
|
|
256
253
|
var _this$eventDispatcher;
|
|
@@ -6,11 +6,10 @@ import { browser, closestElement } from '@atlaskit/editor-common/utils';
|
|
|
6
6
|
import { findParentDomRefOfType, findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
|
|
7
7
|
import { TableMap } from '@atlaskit/editor-tables';
|
|
8
8
|
import { findTable } from '@atlaskit/editor-tables/utils';
|
|
9
|
-
import { fg } from '@atlaskit/platform-feature-flags';
|
|
10
9
|
import { addBoldInEmptyHeaderCells, clearHoverSelection, setTableRef } from '../commands';
|
|
11
10
|
import { stopKeyboardColumnResizing } from '../commands/column-resize';
|
|
12
11
|
import { removeResizeHandleDecorations, transformSliceRemoveCellBackgroundColor, transformSliceToAddTableHeaders, transformSliceToRemoveColumnsWidths } from '../commands/misc';
|
|
13
|
-
import { handleBlur, handleClick, handleCut, handleFocus, handleMouseDown, handleMouseEnter, handleMouseLeave, handleMouseMove,
|
|
12
|
+
import { handleBlur, handleClick, handleCut, handleFocus, handleMouseDown, handleMouseEnter, handleMouseLeave, handleMouseMove, handleMouseUp, handleTripleClick, whenTableInFocus, withCellTracking } from '../event-handlers';
|
|
14
13
|
import { lazyTableCellView, lazyTableHeaderView, lazyTableRowView, lazyTableView } from '../nodeviews/lazy-node-views';
|
|
15
14
|
import { pluginKey as decorationsPluginKey } from '../pm-plugins/decorations/plugin';
|
|
16
15
|
import { fixTables, replaceSelectedTable } from '../transforms';
|
|
@@ -277,7 +276,6 @@ export const createPlugin = (dispatchAnalyticsEvent, dispatch, portalProviderAPI
|
|
|
277
276
|
focus: handleFocus,
|
|
278
277
|
blur: handleBlur,
|
|
279
278
|
mousedown: withCellTracking(handleMouseDown),
|
|
280
|
-
mouseover: fg('platform_editor_react_18_table_column_resize_hover') ? undefined : withCellTracking(whenTableInFocus(handleMouseOver)),
|
|
281
279
|
mouseleave: handleMouseLeave,
|
|
282
280
|
mousemove: whenTableInFocus(handleMouseMove),
|
|
283
281
|
mouseenter: handleMouseEnter,
|
|
@@ -168,7 +168,9 @@ const DragHandleComponent = ({
|
|
|
168
168
|
left: isRow ? `${"var(--ds-space-050, 4px)"}` : undefined,
|
|
169
169
|
bottom: isColumn ? `${"var(--ds-space-0, 0px)"}` : undefined,
|
|
170
170
|
alignSelf: isColumn ? 'none' : 'center',
|
|
171
|
-
zIndex: isColumn ? '-1' : 'auto'
|
|
171
|
+
zIndex: isColumn ? '-1' : 'auto',
|
|
172
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop
|
|
173
|
+
pointerEvents: 'auto'
|
|
172
174
|
},
|
|
173
175
|
onMouseUp: e => {
|
|
174
176
|
// should toggle menu if current drag menu open.
|
|
@@ -134,7 +134,9 @@ const DragControlsComponent = ({
|
|
|
134
134
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
|
|
135
135
|
position: 'relative',
|
|
136
136
|
// eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage/preview, @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
|
|
137
|
-
right: '-0.5px'
|
|
137
|
+
right: '-0.5px',
|
|
138
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop
|
|
139
|
+
pointerEvents: 'none'
|
|
138
140
|
},
|
|
139
141
|
"data-testid": `table-floating-row-${isHover ? rowIndex : selectedRowIndexes[0]}-drag-handle`
|
|
140
142
|
}, /*#__PURE__*/React.createElement(DragHandle, {
|
|
@@ -353,7 +353,7 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
|
|
|
353
353
|
_createClass(TableComponent, [{
|
|
354
354
|
key: "componentDidMount",
|
|
355
355
|
value: function componentDidMount() {
|
|
356
|
-
var _this$props$pluginInj, _this$table2;
|
|
356
|
+
var _this$props$pluginInj, _this$table2, _this$table3;
|
|
357
357
|
var _this$props7 = this.props,
|
|
358
358
|
allowColumnResizing = _this$props7.allowColumnResizing,
|
|
359
359
|
eventDispatcher = _this$props7.eventDispatcher,
|
|
@@ -369,10 +369,7 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
|
|
|
369
369
|
this === null || this === void 0 || (_this$table = this.table) === null || _this$table === void 0 || _this$table.addEventListener('mouseenter', this.handleMouseEnter);
|
|
370
370
|
}
|
|
371
371
|
this === null || this === void 0 || (_this$table2 = this.table) === null || _this$table2 === void 0 || _this$table2.addEventListener('mouseout', this.handleMouseOut);
|
|
372
|
-
|
|
373
|
-
var _this$table3;
|
|
374
|
-
this === null || this === void 0 || (_this$table3 = this.table) === null || _this$table3 === void 0 || _this$table3.addEventListener('mouseover', this.handleMouseOver);
|
|
375
|
-
}
|
|
372
|
+
this === null || this === void 0 || (_this$table3 = this.table) === null || _this$table3 === void 0 || _this$table3.addEventListener('mouseover', this.handleMouseOver);
|
|
376
373
|
var _getEditorFeatureFlag = getEditorFeatureFlags(),
|
|
377
374
|
_getEditorFeatureFlag2 = _getEditorFeatureFlag.tableWithFixedColumnWidthsOption,
|
|
378
375
|
tableWithFixedColumnWidthsOption = _getEditorFeatureFlag2 === void 0 ? false : _getEditorFeatureFlag2,
|
|
@@ -422,7 +419,7 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
|
|
|
422
419
|
}, {
|
|
423
420
|
key: "componentWillUnmount",
|
|
424
421
|
value: function componentWillUnmount() {
|
|
425
|
-
var _this$resizeObserver, _this$table4, _this$table5;
|
|
422
|
+
var _this$resizeObserver, _this$table4, _this$table5, _this$table6;
|
|
426
423
|
var _this$props8 = this.props,
|
|
427
424
|
allowColumnResizing = _this$props8.allowColumnResizing,
|
|
428
425
|
eventDispatcher = _this$props8.eventDispatcher,
|
|
@@ -455,10 +452,7 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
|
|
|
455
452
|
}
|
|
456
453
|
this === null || this === void 0 || (_this$table4 = this.table) === null || _this$table4 === void 0 || _this$table4.removeEventListener('mouseenter', this.handleMouseEnter);
|
|
457
454
|
this === null || this === void 0 || (_this$table5 = this.table) === null || _this$table5 === void 0 || _this$table5.removeEventListener('mouseout', this.handleMouseOut);
|
|
458
|
-
|
|
459
|
-
var _this$table6;
|
|
460
|
-
this === null || this === void 0 || (_this$table6 = this.table) === null || _this$table6 === void 0 || _this$table6.removeEventListener('mouseover', this.handleMouseOver);
|
|
461
|
-
}
|
|
455
|
+
this === null || this === void 0 || (_this$table6 = this.table) === null || _this$table6 === void 0 || _this$table6.removeEventListener('mouseover', this.handleMouseOver);
|
|
462
456
|
if (this.overflowShadowsObserver) {
|
|
463
457
|
this.overflowShadowsObserver.dispose();
|
|
464
458
|
}
|
|
@@ -268,13 +268,10 @@ var TableView = /*#__PURE__*/function (_ReactNodeView) {
|
|
|
268
268
|
if (type === 'selection' && (nodeName === null || nodeName === void 0 ? void 0 : nodeName.toUpperCase()) === 'TABLE' && ((firstChild === null || firstChild === void 0 ? void 0 : firstChild.nodeName.toUpperCase()) === 'COLGROUP' || (firstChild === null || firstChild === void 0 ? void 0 : firstChild.nodeName.toUpperCase()) === 'SPAN')) {
|
|
269
269
|
return false;
|
|
270
270
|
}
|
|
271
|
-
if (
|
|
272
|
-
|
|
273
|
-
return true;
|
|
274
|
-
}
|
|
275
|
-
return !this.contentDOM.contains(mutation.target) && mutation.type !== 'selection';
|
|
271
|
+
if (!this.contentDOM) {
|
|
272
|
+
return true;
|
|
276
273
|
}
|
|
277
|
-
return
|
|
274
|
+
return !this.contentDOM.contains(mutation.target) && mutation.type !== 'selection';
|
|
278
275
|
}
|
|
279
276
|
}, {
|
|
280
277
|
key: "destroy",
|
|
@@ -9,11 +9,10 @@ import { browser, closestElement } from '@atlaskit/editor-common/utils';
|
|
|
9
9
|
import { findParentDomRefOfType, findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
|
|
10
10
|
import { TableMap } from '@atlaskit/editor-tables';
|
|
11
11
|
import { findTable } from '@atlaskit/editor-tables/utils';
|
|
12
|
-
import { fg } from '@atlaskit/platform-feature-flags';
|
|
13
12
|
import { addBoldInEmptyHeaderCells, clearHoverSelection, setTableRef } from '../commands';
|
|
14
13
|
import { stopKeyboardColumnResizing } from '../commands/column-resize';
|
|
15
14
|
import { removeResizeHandleDecorations, transformSliceRemoveCellBackgroundColor, transformSliceToAddTableHeaders, transformSliceToRemoveColumnsWidths } from '../commands/misc';
|
|
16
|
-
import { handleBlur, handleClick, handleCut, handleFocus, handleMouseDown, handleMouseEnter, handleMouseLeave, handleMouseMove,
|
|
15
|
+
import { handleBlur, handleClick, handleCut, handleFocus, handleMouseDown, handleMouseEnter, handleMouseLeave, handleMouseMove, handleMouseUp, handleTripleClick, whenTableInFocus, withCellTracking } from '../event-handlers';
|
|
17
16
|
import { lazyTableCellView, lazyTableHeaderView, lazyTableRowView, lazyTableView } from '../nodeviews/lazy-node-views';
|
|
18
17
|
import { pluginKey as decorationsPluginKey } from '../pm-plugins/decorations/plugin';
|
|
19
18
|
import { fixTables, replaceSelectedTable } from '../transforms';
|
|
@@ -272,7 +271,6 @@ export var createPlugin = function createPlugin(dispatchAnalyticsEvent, dispatch
|
|
|
272
271
|
focus: handleFocus,
|
|
273
272
|
blur: handleBlur,
|
|
274
273
|
mousedown: withCellTracking(handleMouseDown),
|
|
275
|
-
mouseover: fg('platform_editor_react_18_table_column_resize_hover') ? undefined : withCellTracking(whenTableInFocus(handleMouseOver)),
|
|
276
274
|
mouseleave: handleMouseLeave,
|
|
277
275
|
mousemove: whenTableInFocus(handleMouseMove),
|
|
278
276
|
mouseenter: handleMouseEnter,
|
|
@@ -165,7 +165,9 @@ var DragHandleComponent = function DragHandleComponent(_ref) {
|
|
|
165
165
|
left: isRow ? "var(--ds-space-050, 4px)" : undefined,
|
|
166
166
|
bottom: isColumn ? "var(--ds-space-0, 0px)" : undefined,
|
|
167
167
|
alignSelf: isColumn ? 'none' : 'center',
|
|
168
|
-
zIndex: isColumn ? '-1' : 'auto'
|
|
168
|
+
zIndex: isColumn ? '-1' : 'auto',
|
|
169
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop
|
|
170
|
+
pointerEvents: 'auto'
|
|
169
171
|
},
|
|
170
172
|
onMouseUp: function onMouseUp(e) {
|
|
171
173
|
// should toggle menu if current drag menu open.
|
|
@@ -136,7 +136,9 @@ var DragControlsComponent = function DragControlsComponent(_ref) {
|
|
|
136
136
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
|
|
137
137
|
position: 'relative',
|
|
138
138
|
// eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage/preview, @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
|
|
139
|
-
right: '-0.5px'
|
|
139
|
+
right: '-0.5px',
|
|
140
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop
|
|
141
|
+
pointerEvents: 'none'
|
|
140
142
|
},
|
|
141
143
|
"data-testid": "table-floating-row-".concat(isHover ? rowIndex : selectedRowIndexes[0], "-drag-handle")
|
|
142
144
|
}, /*#__PURE__*/React.createElement(DragHandle, {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atlaskit/editor-plugin-table",
|
|
3
|
-
"version": "7.25.
|
|
3
|
+
"version": "7.25.10",
|
|
4
4
|
"description": "Table plugin for the @atlaskit/editor",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"registry": "https://registry.npmjs.org/"
|
|
@@ -31,10 +31,10 @@
|
|
|
31
31
|
"@atlaskit/adf-schema": "^40.8.1",
|
|
32
32
|
"@atlaskit/button": "^20.1.0",
|
|
33
33
|
"@atlaskit/custom-steps": "^0.7.0",
|
|
34
|
-
"@atlaskit/editor-common": "^
|
|
34
|
+
"@atlaskit/editor-common": "^88.0.0",
|
|
35
35
|
"@atlaskit/editor-palette": "1.6.0",
|
|
36
36
|
"@atlaskit/editor-plugin-accessibility-utils": "^1.2.0",
|
|
37
|
-
"@atlaskit/editor-plugin-analytics": "^1.
|
|
37
|
+
"@atlaskit/editor-plugin-analytics": "^1.8.0",
|
|
38
38
|
"@atlaskit/editor-plugin-content-insertion": "^1.8.0",
|
|
39
39
|
"@atlaskit/editor-plugin-editor-viewmode": "^2.1.0",
|
|
40
40
|
"@atlaskit/editor-plugin-guideline": "^1.2.0",
|
|
@@ -43,7 +43,7 @@
|
|
|
43
43
|
"@atlaskit/editor-prosemirror": "5.0.1",
|
|
44
44
|
"@atlaskit/editor-shared-styles": "^2.13.0",
|
|
45
45
|
"@atlaskit/editor-tables": "^2.8.0",
|
|
46
|
-
"@atlaskit/icon": "^22.
|
|
46
|
+
"@atlaskit/icon": "^22.14.0",
|
|
47
47
|
"@atlaskit/menu": "^2.12.0",
|
|
48
48
|
"@atlaskit/platform-feature-flags": "^0.3.0",
|
|
49
49
|
"@atlaskit/pragmatic-drag-and-drop": "^1.3.0",
|
|
@@ -119,12 +119,6 @@
|
|
|
119
119
|
},
|
|
120
120
|
"platform_editor_announce_cell_options_hotkeys": {
|
|
121
121
|
"type": "boolean"
|
|
122
|
-
},
|
|
123
|
-
"platform_editor_react_18_table_column_resize_hover": {
|
|
124
|
-
"type": "boolean"
|
|
125
|
-
},
|
|
126
|
-
"platform_editor_react_18_table_insertion_cursor": {
|
|
127
|
-
"type": "boolean"
|
|
128
122
|
}
|
|
129
123
|
}
|
|
130
124
|
}
|
|
@@ -225,9 +225,7 @@ class TableComponent extends React.Component<ComponentProps, TableState> {
|
|
|
225
225
|
|
|
226
226
|
this?.table?.addEventListener('mouseout', this.handleMouseOut);
|
|
227
227
|
|
|
228
|
-
|
|
229
|
-
this?.table?.addEventListener('mouseover', this.handleMouseOver);
|
|
230
|
-
}
|
|
228
|
+
this?.table?.addEventListener('mouseover', this.handleMouseOver);
|
|
231
229
|
|
|
232
230
|
const { tableWithFixedColumnWidthsOption = false, stickyScrollbar } = getEditorFeatureFlags();
|
|
233
231
|
|
|
@@ -333,9 +331,7 @@ class TableComponent extends React.Component<ComponentProps, TableState> {
|
|
|
333
331
|
|
|
334
332
|
this?.table?.removeEventListener('mouseout', this.handleMouseOut);
|
|
335
333
|
|
|
336
|
-
|
|
337
|
-
this?.table?.removeEventListener('mouseover', this.handleMouseOver);
|
|
338
|
-
}
|
|
334
|
+
this?.table?.removeEventListener('mouseover', this.handleMouseOver);
|
|
339
335
|
|
|
340
336
|
if (this.overflowShadowsObserver) {
|
|
341
337
|
this.overflowShadowsObserver.dispose();
|
package/src/nodeviews/table.tsx
CHANGED
|
@@ -340,14 +340,10 @@ export default class TableView extends ReactNodeView<Props> {
|
|
|
340
340
|
return false;
|
|
341
341
|
}
|
|
342
342
|
|
|
343
|
-
if (
|
|
344
|
-
|
|
345
|
-
return true;
|
|
346
|
-
}
|
|
347
|
-
return !this.contentDOM.contains(mutation.target) && mutation.type !== 'selection';
|
|
343
|
+
if (!this.contentDOM) {
|
|
344
|
+
return true;
|
|
348
345
|
}
|
|
349
|
-
|
|
350
|
-
return true;
|
|
346
|
+
return !this.contentDOM.contains(mutation.target) && mutation.type !== 'selection';
|
|
351
347
|
}
|
|
352
348
|
|
|
353
349
|
destroy() {
|
package/src/pm-plugins/main.ts
CHANGED
|
@@ -25,7 +25,6 @@ import { findParentDomRefOfType, findParentNodeOfType } from '@atlaskit/editor-p
|
|
|
25
25
|
import type { EditorView } from '@atlaskit/editor-prosemirror/view';
|
|
26
26
|
import { TableMap } from '@atlaskit/editor-tables';
|
|
27
27
|
import { findTable } from '@atlaskit/editor-tables/utils';
|
|
28
|
-
import { fg } from '@atlaskit/platform-feature-flags';
|
|
29
28
|
|
|
30
29
|
import { addBoldInEmptyHeaderCells, clearHoverSelection, setTableRef } from '../commands';
|
|
31
30
|
import { stopKeyboardColumnResizing } from '../commands/column-resize';
|
|
@@ -44,7 +43,6 @@ import {
|
|
|
44
43
|
handleMouseEnter,
|
|
45
44
|
handleMouseLeave,
|
|
46
45
|
handleMouseMove,
|
|
47
|
-
handleMouseOver,
|
|
48
46
|
handleMouseUp,
|
|
49
47
|
handleTripleClick,
|
|
50
48
|
whenTableInFocus,
|
|
@@ -371,9 +369,6 @@ export const createPlugin = (
|
|
|
371
369
|
focus: handleFocus,
|
|
372
370
|
blur: handleBlur,
|
|
373
371
|
mousedown: withCellTracking(handleMouseDown),
|
|
374
|
-
mouseover: fg('platform_editor_react_18_table_column_resize_hover')
|
|
375
|
-
? undefined
|
|
376
|
-
: withCellTracking(whenTableInFocus(handleMouseOver)),
|
|
377
372
|
mouseleave: handleMouseLeave,
|
|
378
373
|
mousemove: whenTableInFocus(handleMouseMove),
|
|
379
374
|
mouseenter: handleMouseEnter,
|
|
@@ -212,6 +212,8 @@ const DragHandleComponent = ({
|
|
|
212
212
|
bottom: isColumn ? `${token('space.0', '0px')}` : undefined,
|
|
213
213
|
alignSelf: isColumn ? 'none' : 'center',
|
|
214
214
|
zIndex: isColumn ? '-1' : 'auto',
|
|
215
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop
|
|
216
|
+
pointerEvents: 'auto',
|
|
215
217
|
}}
|
|
216
218
|
onMouseUp={(e) => {
|
|
217
219
|
// should toggle menu if current drag menu open.
|
|
@@ -195,6 +195,8 @@ const DragControlsComponent = ({
|
|
|
195
195
|
position: 'relative',
|
|
196
196
|
// eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage/preview, @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
|
|
197
197
|
right: '-0.5px',
|
|
198
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop
|
|
199
|
+
pointerEvents: 'none',
|
|
198
200
|
}}
|
|
199
201
|
data-testid={`table-floating-row-${isHover ? rowIndex : selectedRowIndexes[0]}-drag-handle`}
|
|
200
202
|
>
|