@atlaskit/editor-plugin-table 7.16.11 → 7.16.13
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/.eslintrc.js +3 -3
- package/CHANGELOG.md +16 -0
- package/dist/cjs/commands/misc.js +3 -3
- package/dist/cjs/nodeviews/TableCell.js +10 -10
- package/dist/cjs/nodeviews/TableContainer.js +83 -27
- package/dist/cjs/nodeviews/TableResizer.js +40 -19
- package/dist/cjs/nodeviews/TableRow.js +23 -23
- package/dist/cjs/pm-plugins/table-resizing/plugin.js +3 -3
- package/dist/cjs/pm-plugins/table-resizing/utils/resize-state.js +4 -4
- package/dist/cjs/pm-plugins/table-resizing/utils/scale-table.js +3 -3
- package/dist/cjs/ui/FloatingContextualMenu/styles.js +1 -1
- package/dist/cjs/ui/FloatingDragMenu/styles.js +1 -1
- package/dist/cjs/ui/common-styles.js +13 -13
- package/dist/cjs/ui/ui-styles.js +25 -25
- package/dist/cjs/utils/guidelines.js +7 -4
- package/dist/cjs/utils/merged-cells.js +3 -3
- package/dist/cjs/utils/snapping.js +7 -8
- package/dist/es2019/commands/misc.js +3 -3
- package/dist/es2019/nodeviews/TableContainer.js +70 -9
- package/dist/es2019/nodeviews/TableResizer.js +42 -21
- package/dist/es2019/nodeviews/TableRow.js +21 -21
- package/dist/es2019/pm-plugins/table-resizing/plugin.js +3 -3
- package/dist/es2019/pm-plugins/table-resizing/utils/resize-state.js +4 -4
- package/dist/es2019/pm-plugins/table-resizing/utils/scale-table.js +3 -3
- package/dist/es2019/ui/FloatingContextualMenu/styles.js +47 -47
- package/dist/es2019/ui/FloatingDragMenu/styles.js +30 -30
- package/dist/es2019/ui/common-styles.js +802 -816
- package/dist/es2019/ui/ui-styles.js +665 -678
- package/dist/es2019/utils/guidelines.js +5 -2
- package/dist/es2019/utils/merged-cells.js +3 -3
- package/dist/es2019/utils/snapping.js +5 -6
- package/dist/esm/commands/misc.js +3 -3
- package/dist/esm/nodeviews/TableCell.js +10 -10
- package/dist/esm/nodeviews/TableContainer.js +85 -29
- package/dist/esm/nodeviews/TableResizer.js +42 -21
- package/dist/esm/nodeviews/TableRow.js +23 -23
- package/dist/esm/pm-plugins/table-resizing/plugin.js +3 -3
- package/dist/esm/pm-plugins/table-resizing/utils/resize-state.js +4 -4
- package/dist/esm/pm-plugins/table-resizing/utils/scale-table.js +3 -3
- package/dist/esm/ui/FloatingContextualMenu/styles.js +1 -1
- package/dist/esm/ui/FloatingDragMenu/styles.js +1 -1
- package/dist/esm/ui/common-styles.js +13 -13
- package/dist/esm/ui/ui-styles.js +25 -25
- package/dist/esm/utils/guidelines.js +6 -3
- package/dist/esm/utils/merged-cells.js +3 -3
- package/dist/esm/utils/snapping.js +6 -7
- package/dist/types/nodeviews/TableResizer.d.ts +2 -1
- package/dist/types/pm-plugins/decorations/utils/index.d.ts +1 -1
- package/dist/types/pm-plugins/drag-and-drop/utils/autoscrollers.d.ts +1 -1
- package/dist/types/pm-plugins/drag-and-drop/utils/getDragBehaviour.d.ts +1 -1
- package/dist/types/pm-plugins/table-resizing/utils/index.d.ts +1 -1
- package/dist/types/ui/ColumnResizeWidget/index.d.ts +1 -1
- package/dist/types/ui/FloatingAlignmentButtons/FloatingAlignmentButtons.d.ts +1 -1
- package/dist/types/ui/FloatingToolbarLabel/FloatingToolbarLabel.d.ts +1 -1
- package/dist/types/ui/TableFloatingColumnControls/ColumnDropTargets/ColumnDropTarget.d.ts +1 -1
- package/dist/types/ui/TableFloatingControls/CornerControls/index.d.ts +1 -1
- package/dist/types/ui/icons/DragHandleDisabledIcon.d.ts +1 -1
- package/dist/types/utils/guidelines.d.ts +2 -1
- package/dist/types/utils/snapping.d.ts +3 -2
- package/dist/types-ts4.5/nodeviews/TableResizer.d.ts +2 -1
- package/dist/types-ts4.5/pm-plugins/decorations/utils/index.d.ts +1 -1
- package/dist/types-ts4.5/pm-plugins/drag-and-drop/utils/autoscrollers.d.ts +1 -1
- package/dist/types-ts4.5/pm-plugins/drag-and-drop/utils/getDragBehaviour.d.ts +1 -1
- package/dist/types-ts4.5/pm-plugins/table-resizing/utils/index.d.ts +1 -1
- package/dist/types-ts4.5/ui/ColumnResizeWidget/index.d.ts +1 -1
- package/dist/types-ts4.5/ui/FloatingAlignmentButtons/FloatingAlignmentButtons.d.ts +1 -1
- package/dist/types-ts4.5/ui/FloatingToolbarLabel/FloatingToolbarLabel.d.ts +1 -1
- package/dist/types-ts4.5/ui/TableFloatingColumnControls/ColumnDropTargets/ColumnDropTarget.d.ts +1 -1
- package/dist/types-ts4.5/ui/TableFloatingControls/CornerControls/index.d.ts +1 -1
- package/dist/types-ts4.5/ui/icons/DragHandleDisabledIcon.d.ts +1 -1
- package/dist/types-ts4.5/utils/guidelines.d.ts +2 -1
- package/dist/types-ts4.5/utils/snapping.d.ts +3 -2
- package/docs/0-intro.tsx +9 -7
- package/package.json +3 -3
- package/report.api.md +67 -66
- package/src/commands/clear.ts +36 -44
- package/src/commands/collapse.ts +8 -8
- package/src/commands/column-resize.ts +412 -452
- package/src/commands/delete.ts +14 -14
- package/src/commands/display-mode.ts +10 -11
- package/src/commands/go-to-next-cell.ts +48 -54
- package/src/commands/hover.ts +210 -227
- package/src/commands/index.ts +35 -35
- package/src/commands/insert.ts +208 -235
- package/src/commands/misc.ts +655 -748
- package/src/commands/referentiality.ts +9 -9
- package/src/commands/selection.ts +433 -563
- package/src/commands/sort.ts +68 -86
- package/src/commands/split-cell.ts +14 -14
- package/src/commands/toggle.ts +69 -67
- package/src/commands-with-analytics.ts +570 -639
- package/src/create-plugin-config.ts +13 -13
- package/src/event-handlers.ts +513 -612
- package/src/handlers.ts +120 -133
- package/src/nodeviews/ExternalDropTargets.tsx +68 -73
- package/src/nodeviews/OverflowShadowsObserver.ts +148 -157
- package/src/nodeviews/TableCell.ts +47 -54
- package/src/nodeviews/TableComponent.tsx +1018 -1112
- package/src/nodeviews/TableComponentWithSharedState.tsx +91 -94
- package/src/nodeviews/TableContainer.tsx +384 -340
- package/src/nodeviews/TableNodeViewBase.ts +19 -24
- package/src/nodeviews/TableResizer.tsx +642 -653
- package/src/nodeviews/TableRow.ts +580 -629
- package/src/nodeviews/TableStickyScrollbar.ts +173 -190
- package/src/nodeviews/__mocks__/OverflowShadowsObserver.ts +8 -8
- package/src/nodeviews/__mocks__/OverridableMock.ts +14 -15
- package/src/nodeviews/table.tsx +345 -375
- package/src/nodeviews/types.ts +21 -24
- package/src/nodeviews/update-overflow-shadows.ts +8 -14
- package/src/plugin.tsx +578 -603
- package/src/pm-plugins/analytics/actions.ts +10 -12
- package/src/pm-plugins/analytics/commands.ts +31 -37
- package/src/pm-plugins/analytics/plugin-factory.ts +4 -2
- package/src/pm-plugins/analytics/plugin-key.ts +1 -3
- package/src/pm-plugins/analytics/plugin.ts +60 -70
- package/src/pm-plugins/analytics/reducer.ts +19 -19
- package/src/pm-plugins/analytics/types.ts +10 -10
- package/src/pm-plugins/analytics/utils/moved-event.ts +38 -38
- package/src/pm-plugins/decorations/plugin.ts +58 -77
- package/src/pm-plugins/decorations/utils/column-controls.ts +59 -71
- package/src/pm-plugins/decorations/utils/column-resizing.ts +50 -57
- package/src/pm-plugins/decorations/utils/compose-decorations.ts +6 -6
- package/src/pm-plugins/decorations/utils/index.ts +3 -6
- package/src/pm-plugins/decorations/utils/types.ts +7 -12
- package/src/pm-plugins/default-table-selection.ts +3 -3
- package/src/pm-plugins/drag-and-drop/actions.ts +25 -25
- package/src/pm-plugins/drag-and-drop/commands-with-analytics.ts +158 -190
- package/src/pm-plugins/drag-and-drop/commands.ts +154 -170
- package/src/pm-plugins/drag-and-drop/consts.ts +4 -5
- package/src/pm-plugins/drag-and-drop/plugin-factory.ts +23 -20
- package/src/pm-plugins/drag-and-drop/plugin-key.ts +1 -3
- package/src/pm-plugins/drag-and-drop/plugin.ts +329 -383
- package/src/pm-plugins/drag-and-drop/reducer.ts +30 -30
- package/src/pm-plugins/drag-and-drop/types.ts +8 -8
- package/src/pm-plugins/drag-and-drop/utils/autoscrollers.ts +38 -41
- package/src/pm-plugins/drag-and-drop/utils/getDragBehaviour.ts +3 -6
- package/src/pm-plugins/drag-and-drop/utils/monitor.ts +57 -70
- package/src/pm-plugins/keymap.ts +208 -220
- package/src/pm-plugins/main.ts +348 -400
- package/src/pm-plugins/plugin-factory.ts +32 -34
- package/src/pm-plugins/safari-delete-composition-text-issue-workaround.ts +83 -97
- package/src/pm-plugins/sticky-headers/commands.ts +2 -6
- package/src/pm-plugins/sticky-headers/plugin-key.ts +1 -3
- package/src/pm-plugins/sticky-headers/plugin-state.ts +41 -44
- package/src/pm-plugins/sticky-headers/plugin.ts +4 -4
- package/src/pm-plugins/sticky-headers/types.ts +8 -8
- package/src/pm-plugins/sticky-headers/util.ts +10 -10
- package/src/pm-plugins/table-analytics.ts +70 -72
- package/src/pm-plugins/table-local-id.ts +180 -184
- package/src/pm-plugins/table-resizing/commands.ts +72 -85
- package/src/pm-plugins/table-resizing/event-handlers.ts +298 -317
- package/src/pm-plugins/table-resizing/plugin-factory.ts +10 -10
- package/src/pm-plugins/table-resizing/plugin-key.ts +1 -3
- package/src/pm-plugins/table-resizing/plugin.ts +61 -68
- package/src/pm-plugins/table-resizing/reducer.ts +30 -33
- package/src/pm-plugins/table-resizing/utils/colgroup.ts +84 -84
- package/src/pm-plugins/table-resizing/utils/column-state.ts +78 -81
- package/src/pm-plugins/table-resizing/utils/content-width.ts +94 -114
- package/src/pm-plugins/table-resizing/utils/dom.ts +93 -110
- package/src/pm-plugins/table-resizing/utils/index.ts +29 -34
- package/src/pm-plugins/table-resizing/utils/misc.ts +94 -119
- package/src/pm-plugins/table-resizing/utils/resize-column.ts +93 -106
- package/src/pm-plugins/table-resizing/utils/resize-logic.ts +240 -257
- package/src/pm-plugins/table-resizing/utils/resize-state.ts +343 -372
- package/src/pm-plugins/table-resizing/utils/scale-table.ts +202 -207
- package/src/pm-plugins/table-resizing/utils/types.ts +17 -17
- package/src/pm-plugins/table-resizing/utils/unit-to-number.ts +1 -2
- package/src/pm-plugins/table-selection-keymap.ts +25 -51
- package/src/pm-plugins/table-width.ts +191 -204
- package/src/pm-plugins/view-mode-sort/index.ts +223 -227
- package/src/pm-plugins/view-mode-sort/plugin-key.ts +3 -2
- package/src/pm-plugins/view-mode-sort/types.ts +12 -12
- package/src/pm-plugins/view-mode-sort/utils.ts +108 -117
- package/src/reducer.ts +139 -155
- package/src/toolbar.tsx +815 -905
- package/src/transforms/column-width.ts +186 -213
- package/src/transforms/delete-columns.ts +208 -222
- package/src/transforms/delete-rows.ts +117 -121
- package/src/transforms/fix-tables.ts +190 -215
- package/src/transforms/merge.ts +263 -269
- package/src/transforms/replace-table.ts +27 -43
- package/src/transforms/split.ts +65 -75
- package/src/types.ts +421 -427
- package/src/ui/ColumnResizeWidget/index.tsx +40 -47
- package/src/ui/DragHandle/HandleIconComponent.tsx +9 -13
- package/src/ui/DragHandle/index.tsx +221 -250
- package/src/ui/DragPreview/index.tsx +35 -35
- package/src/ui/FloatingAlignmentButtons/FloatingAlignmentButtons.tsx +33 -41
- package/src/ui/FloatingContextualButton/FixedButton.tsx +154 -157
- package/src/ui/FloatingContextualButton/index.tsx +109 -115
- package/src/ui/FloatingContextualButton/styles.ts +43 -46
- package/src/ui/FloatingContextualMenu/ContextualMenu.tsx +634 -694
- package/src/ui/FloatingContextualMenu/index.tsx +83 -101
- package/src/ui/FloatingContextualMenu/styles.ts +57 -65
- package/src/ui/FloatingDeleteButton/DeleteButton.tsx +37 -37
- package/src/ui/FloatingDeleteButton/getPopUpOptions.ts +47 -57
- package/src/ui/FloatingDeleteButton/index.tsx +319 -350
- package/src/ui/FloatingDragMenu/DragMenu.tsx +555 -596
- package/src/ui/FloatingDragMenu/DropdownMenu.tsx +152 -162
- package/src/ui/FloatingDragMenu/index.tsx +88 -102
- package/src/ui/FloatingDragMenu/styles.ts +51 -54
- package/src/ui/FloatingInsertButton/InsertButton.tsx +204 -217
- package/src/ui/FloatingInsertButton/getPopupOptions.ts +100 -115
- package/src/ui/FloatingInsertButton/index.tsx +248 -292
- package/src/ui/FloatingToolbarLabel/FloatingToolbarLabel.tsx +24 -29
- package/src/ui/TableFloatingColumnControls/ColumnControls/index.tsx +308 -329
- package/src/ui/TableFloatingColumnControls/ColumnDropTargets/ColumnDropTarget.tsx +85 -94
- package/src/ui/TableFloatingColumnControls/ColumnDropTargets/index.tsx +46 -46
- package/src/ui/TableFloatingColumnControls/index.tsx +116 -136
- package/src/ui/TableFloatingControls/CornerControls/ClassicCornerControls.tsx +79 -91
- package/src/ui/TableFloatingControls/CornerControls/DragCornerControls.tsx +95 -102
- package/src/ui/TableFloatingControls/CornerControls/index.tsx +1 -4
- package/src/ui/TableFloatingControls/CornerControls/types.ts +8 -8
- package/src/ui/TableFloatingControls/FloatingControlsWithSelection.tsx +50 -50
- package/src/ui/TableFloatingControls/NumberColumn/index.tsx +111 -124
- package/src/ui/TableFloatingControls/RowControls/ClassicControls.tsx +86 -105
- package/src/ui/TableFloatingControls/RowControls/DragControls.tsx +305 -341
- package/src/ui/TableFloatingControls/RowDropTarget/index.tsx +72 -75
- package/src/ui/TableFloatingControls/index.tsx +191 -193
- package/src/ui/TableFullWidthLabel/index.tsx +20 -20
- package/src/ui/common-styles.ts +880 -912
- package/src/ui/consts.ts +29 -74
- package/src/ui/icons/AddColLeftIcon.tsx +33 -39
- package/src/ui/icons/AddColRightIcon.tsx +33 -39
- package/src/ui/icons/AddRowAboveIcon.tsx +16 -22
- package/src/ui/icons/AddRowBelowIcon.tsx +33 -39
- package/src/ui/icons/DisplayModeIcon.tsx +31 -31
- package/src/ui/icons/DragHandleDisabledIcon.tsx +19 -21
- package/src/ui/icons/DragHandleIcon.tsx +12 -12
- package/src/ui/icons/DragInMotionIcon.tsx +45 -52
- package/src/ui/icons/MergeCellsIcon.tsx +22 -28
- package/src/ui/icons/MinimisedHandle.tsx +9 -9
- package/src/ui/icons/SplitCellIcon.tsx +30 -36
- package/src/ui/ui-styles.ts +769 -798
- package/src/utils/alignment.ts +1 -1
- package/src/utils/analytics.ts +192 -208
- package/src/utils/collapse.ts +55 -64
- package/src/utils/column-controls.ts +237 -254
- package/src/utils/create.ts +30 -30
- package/src/utils/decoration.ts +482 -502
- package/src/utils/dom.ts +127 -134
- package/src/utils/drag-menu.ts +322 -373
- package/src/utils/get-allow-add-column-custom-step.ts +4 -5
- package/src/utils/guidelines.ts +16 -21
- package/src/utils/index.ts +68 -68
- package/src/utils/merged-cells.ts +245 -254
- package/src/utils/nodes.ts +91 -106
- package/src/utils/paste.ts +119 -135
- package/src/utils/row-controls.ts +199 -213
- package/src/utils/selection.ts +77 -87
- package/src/utils/snapping.ts +87 -100
- package/src/utils/table.ts +44 -44
- package/src/utils/transforms.ts +5 -5
- package/src/utils/update-plugin-state-decorations.ts +5 -9
|
@@ -3,46 +3,42 @@ import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
|
|
|
3
3
|
import type { Transaction } from '@atlaskit/editor-prosemirror/state';
|
|
4
4
|
import type { EditorView } from '@atlaskit/editor-prosemirror/view';
|
|
5
5
|
import {
|
|
6
|
-
|
|
7
|
-
|
|
6
|
+
akEditorDefaultLayoutWidth,
|
|
7
|
+
akEditorWideLayoutWidth,
|
|
8
8
|
} from '@atlaskit/editor-shared-styles';
|
|
9
9
|
|
|
10
10
|
import {
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
11
|
+
calculateColumnWidth,
|
|
12
|
+
contentWidth,
|
|
13
|
+
getCellsRefsInColumn,
|
|
14
|
+
getLayoutSize,
|
|
15
15
|
} from '../pm-plugins/table-resizing/utils';
|
|
16
16
|
import type { ReportInvalidNodeAttrs } from '../types';
|
|
17
17
|
|
|
18
18
|
const validateTableCellNodeAttrs = (
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
rowspan,
|
|
22
|
-
tableLocalId,
|
|
23
|
-
}: { colspan?: number; rowspan?: number; tableLocalId: string },
|
|
24
|
-
reportInvalidTableCellSpanAttrs: ReportInvalidNodeAttrs,
|
|
19
|
+
{ colspan, rowspan, tableLocalId }: { colspan?: number; rowspan?: number; tableLocalId: string },
|
|
20
|
+
reportInvalidTableCellSpanAttrs: ReportInvalidNodeAttrs,
|
|
25
21
|
): void => {
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
22
|
+
if (colspan && colspan < 0) {
|
|
23
|
+
reportInvalidTableCellSpanAttrs({
|
|
24
|
+
nodeType: 'tableCell',
|
|
25
|
+
attribute: 'colspan',
|
|
26
|
+
reason: 'negative value',
|
|
27
|
+
tableLocalId,
|
|
28
|
+
spanValue: colspan,
|
|
29
|
+
});
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
if (rowspan && rowspan < 0) {
|
|
33
|
+
reportInvalidTableCellSpanAttrs({
|
|
34
|
+
nodeType: 'tableCell',
|
|
35
|
+
attribute: 'rowspan',
|
|
36
|
+
reason: 'negative value',
|
|
37
|
+
tableLocalId,
|
|
38
|
+
spanValue: rowspan,
|
|
39
|
+
});
|
|
40
|
+
}
|
|
41
|
+
return;
|
|
46
42
|
};
|
|
47
43
|
|
|
48
44
|
// We attempt to patch the document when we have extra, unneeded, column widths
|
|
@@ -53,65 +49,65 @@ const validateTableCellNodeAttrs = (
|
|
|
53
49
|
// This row only spans two columns, yet it contains widths for 3.
|
|
54
50
|
// We remove the third width here, assumed duplicate content.
|
|
55
51
|
export const removeExtraneousColumnWidths = (
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
52
|
+
node: PMNode,
|
|
53
|
+
basePos: number,
|
|
54
|
+
tr: Transaction,
|
|
55
|
+
reportInvalidTableCellSpanAttrs?: ReportInvalidNodeAttrs,
|
|
60
56
|
): boolean => {
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
57
|
+
let hasProblems = false;
|
|
58
|
+
|
|
59
|
+
tr = replaceCells(tr, node, basePos, (cell) => {
|
|
60
|
+
const { colwidth, colspan, rowspan } = cell.attrs;
|
|
61
|
+
|
|
62
|
+
if (reportInvalidTableCellSpanAttrs) {
|
|
63
|
+
validateTableCellNodeAttrs(
|
|
64
|
+
{ colspan, rowspan, tableLocalId: node.attrs.localId },
|
|
65
|
+
reportInvalidTableCellSpanAttrs,
|
|
66
|
+
);
|
|
67
|
+
}
|
|
68
|
+
|
|
69
|
+
if (colwidth && colwidth.length > colspan) {
|
|
70
|
+
hasProblems = true;
|
|
71
|
+
return cell.type.createChecked(
|
|
72
|
+
{
|
|
73
|
+
...cell.attrs,
|
|
74
|
+
colwidth: colwidth.slice(0, colspan),
|
|
75
|
+
},
|
|
76
|
+
cell.content,
|
|
77
|
+
cell.marks,
|
|
78
|
+
);
|
|
79
|
+
}
|
|
80
|
+
|
|
81
|
+
return cell;
|
|
82
|
+
});
|
|
83
|
+
|
|
84
|
+
if (hasProblems) {
|
|
85
|
+
return true;
|
|
86
|
+
}
|
|
87
|
+
|
|
88
|
+
return false;
|
|
93
89
|
};
|
|
94
90
|
|
|
95
91
|
export const fixTables = (
|
|
96
|
-
|
|
97
|
-
|
|
92
|
+
tr: Transaction,
|
|
93
|
+
reportInvalidTableCellSpanAttrs?: ReportInvalidNodeAttrs,
|
|
98
94
|
): Transaction | undefined => {
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
95
|
+
let hasProblems = false;
|
|
96
|
+
tr.doc.descendants((node, pos) => {
|
|
97
|
+
if (node.type.name === 'table') {
|
|
98
|
+
// in the unlikely event of having to fix multiple tables at the same time
|
|
99
|
+
hasProblems = removeExtraneousColumnWidths(
|
|
100
|
+
node,
|
|
101
|
+
tr.mapping.map(pos),
|
|
102
|
+
tr,
|
|
103
|
+
reportInvalidTableCellSpanAttrs,
|
|
104
|
+
);
|
|
105
|
+
}
|
|
106
|
+
});
|
|
107
|
+
|
|
108
|
+
if (hasProblems) {
|
|
109
|
+
return tr;
|
|
110
|
+
}
|
|
115
111
|
};
|
|
116
112
|
|
|
117
113
|
// When we get a table with an 'auto' attribute, we want to:
|
|
@@ -126,151 +122,130 @@ export const fixTables = (
|
|
|
126
122
|
// We use this when migrating TinyMCE tables for Confluence, for example:
|
|
127
123
|
// https://pug.jira-dev.com/wiki/spaces/AEC/pages/3362882215/How+do+we+map+TinyMCE+tables+to+Fabric+tables
|
|
128
124
|
export const fixAutoSizedTable = (
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
125
|
+
view: EditorView,
|
|
126
|
+
tableNode: PMNode,
|
|
127
|
+
tableRef: HTMLTableElement,
|
|
128
|
+
tablePos: number,
|
|
129
|
+
opts: { containerWidth: number },
|
|
134
130
|
): Transaction => {
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
cell.content,
|
|
174
|
-
cell.marks,
|
|
175
|
-
);
|
|
176
|
-
});
|
|
177
|
-
|
|
178
|
-
// clear autosizing on the table node
|
|
179
|
-
return tr
|
|
180
|
-
.setNodeMarkup(tablePos, undefined, {
|
|
181
|
-
...tableNode.attrs,
|
|
182
|
-
layout: tableLayout,
|
|
183
|
-
__autoSize: false,
|
|
184
|
-
})
|
|
185
|
-
.setMeta('addToHistory', false);
|
|
131
|
+
let { tr } = view.state;
|
|
132
|
+
const domAtPos = view.domAtPos.bind(view);
|
|
133
|
+
const tableStart = tablePos + 1;
|
|
134
|
+
const colWidths = parseDOMColumnWidths(domAtPos, tableNode, tableStart, tableRef);
|
|
135
|
+
const totalContentWidth = colWidths.reduce((acc, current) => acc + current, 0);
|
|
136
|
+
const tableLayout = getLayoutBasedOnWidth(totalContentWidth);
|
|
137
|
+
const maxLayoutSize = getLayoutSize(tableLayout, opts.containerWidth, {});
|
|
138
|
+
|
|
139
|
+
// Content width will generally not meet the constraints of the layout
|
|
140
|
+
// whether it be below or above, so we scale our columns widths
|
|
141
|
+
// to meet these requirements
|
|
142
|
+
let scale = 1;
|
|
143
|
+
if (totalContentWidth !== maxLayoutSize) {
|
|
144
|
+
scale = maxLayoutSize / totalContentWidth;
|
|
145
|
+
}
|
|
146
|
+
|
|
147
|
+
const scaledColumnWidths = colWidths.map((width) => Math.floor(width * scale));
|
|
148
|
+
|
|
149
|
+
tr = replaceCells(tr, tableNode, tablePos, (cell, _rowIndex, colIndex) => {
|
|
150
|
+
const newColWidths = scaledColumnWidths.slice(colIndex, colIndex + cell.attrs.colspan);
|
|
151
|
+
return cell.type.createChecked(
|
|
152
|
+
{
|
|
153
|
+
...cell.attrs,
|
|
154
|
+
colwidth: newColWidths.length ? newColWidths : null,
|
|
155
|
+
},
|
|
156
|
+
cell.content,
|
|
157
|
+
cell.marks,
|
|
158
|
+
);
|
|
159
|
+
});
|
|
160
|
+
|
|
161
|
+
// clear autosizing on the table node
|
|
162
|
+
return tr
|
|
163
|
+
.setNodeMarkup(tablePos, undefined, {
|
|
164
|
+
...tableNode.attrs,
|
|
165
|
+
layout: tableLayout,
|
|
166
|
+
__autoSize: false,
|
|
167
|
+
})
|
|
168
|
+
.setMeta('addToHistory', false);
|
|
186
169
|
};
|
|
187
170
|
|
|
188
171
|
const getLayoutBasedOnWidth = (totalWidth: number) => {
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
} else {
|
|
197
|
-
return 'default';
|
|
198
|
-
}
|
|
172
|
+
if (totalWidth > akEditorWideLayoutWidth) {
|
|
173
|
+
return 'full-width';
|
|
174
|
+
} else if (totalWidth > akEditorDefaultLayoutWidth && totalWidth < akEditorWideLayoutWidth) {
|
|
175
|
+
return 'wide';
|
|
176
|
+
} else {
|
|
177
|
+
return 'default';
|
|
178
|
+
}
|
|
199
179
|
};
|
|
200
180
|
|
|
201
181
|
function parseDOMColumnWidths(
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
182
|
+
domAtPos: (pos: number) => { node: Node; offset: number },
|
|
183
|
+
tableNode: PMNode,
|
|
184
|
+
tableStart: number,
|
|
185
|
+
tableRef: HTMLTableElement,
|
|
206
186
|
): Array<number> {
|
|
207
|
-
|
|
187
|
+
const row = tableRef.querySelector('tr');
|
|
208
188
|
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
189
|
+
if (!row) {
|
|
190
|
+
return [];
|
|
191
|
+
}
|
|
212
192
|
|
|
213
|
-
|
|
193
|
+
let cols: Array<number> = [];
|
|
214
194
|
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
domAtPos,
|
|
225
|
-
);
|
|
226
|
-
const colWidth = calculateColumnWidth(cells, (_, col) => {
|
|
227
|
-
return contentWidth(col as HTMLElement, tableRef).width;
|
|
228
|
-
});
|
|
195
|
+
for (let col = 0; col < row.childElementCount; col++) {
|
|
196
|
+
const currentCol = row.children[col];
|
|
197
|
+
const colspan = Number(currentCol.getAttribute('colspan') || 1);
|
|
198
|
+
for (let span = 0; span < colspan; span++) {
|
|
199
|
+
const colIdx = col + span;
|
|
200
|
+
const cells = getCellsRefsInColumn(colIdx, tableNode, tableStart, domAtPos);
|
|
201
|
+
const colWidth = calculateColumnWidth(cells, (_, col) => {
|
|
202
|
+
return contentWidth(col as HTMLElement, tableRef).width;
|
|
203
|
+
});
|
|
229
204
|
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
205
|
+
cols[colIdx] = Math.max(colWidth, tableCellMinWidth);
|
|
206
|
+
}
|
|
207
|
+
}
|
|
233
208
|
|
|
234
|
-
|
|
209
|
+
return cols;
|
|
235
210
|
}
|
|
236
211
|
|
|
237
212
|
// TODO: move to prosemirror-utils
|
|
238
213
|
const replaceCells = (
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
214
|
+
tr: Transaction,
|
|
215
|
+
table: PMNode,
|
|
216
|
+
tablePos: number,
|
|
217
|
+
modifyCell: (cell: PMNode, rowIndex: number, colIndex: number) => PMNode,
|
|
243
218
|
): Transaction => {
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
219
|
+
const rows: PMNode[] = [];
|
|
220
|
+
let modifiedCells = 0;
|
|
221
|
+
for (let rowIndex = 0; rowIndex < table.childCount; rowIndex++) {
|
|
222
|
+
const row = table.child(rowIndex);
|
|
223
|
+
const cells: PMNode[] = [];
|
|
224
|
+
|
|
225
|
+
for (let colIndex = 0; colIndex < row.childCount; colIndex++) {
|
|
226
|
+
const cell = row.child(colIndex);
|
|
227
|
+
|
|
228
|
+
// FIXME
|
|
229
|
+
// The rowIndex and colIndex are not accurate in a merged cell scenario
|
|
230
|
+
// e.g. table with 5 columns might have only one cell in a row, colIndex will be 1, where it should be 4
|
|
231
|
+
const node = modifyCell(cell, rowIndex, colIndex);
|
|
232
|
+
if (node.sameMarkup(cell) === false) {
|
|
233
|
+
modifiedCells++;
|
|
234
|
+
}
|
|
235
|
+
cells.push(node);
|
|
236
|
+
}
|
|
237
|
+
|
|
238
|
+
if (cells.length) {
|
|
239
|
+
rows.push(row.type.createChecked(row.attrs, cells, row.marks));
|
|
240
|
+
}
|
|
241
|
+
}
|
|
242
|
+
|
|
243
|
+
// Check if the table has changed before replacing.
|
|
244
|
+
// If no cells are modified our counter will be zero.
|
|
245
|
+
if (rows.length && modifiedCells !== 0) {
|
|
246
|
+
const newTable = table.type.createChecked(table.attrs, rows, table.marks);
|
|
247
|
+
return tr.replaceWith(tablePos, tablePos + table.nodeSize, newTable);
|
|
248
|
+
}
|
|
249
|
+
|
|
250
|
+
return tr;
|
|
276
251
|
};
|