@atlaskit/editor-plugin-table 7.16.11 → 7.16.12
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 +8 -0
- package/dist/cjs/commands/misc.js +3 -3
- package/dist/cjs/nodeviews/TableCell.js +10 -10
- package/dist/cjs/nodeviews/TableContainer.js +41 -6
- package/dist/cjs/nodeviews/TableResizer.js +7 -7
- 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/merged-cells.js +3 -3
- package/dist/es2019/commands/misc.js +3 -3
- package/dist/es2019/nodeviews/TableContainer.js +43 -5
- package/dist/es2019/nodeviews/TableResizer.js +7 -7
- 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/merged-cells.js +3 -3
- package/dist/esm/commands/misc.js +3 -3
- package/dist/esm/nodeviews/TableCell.js +10 -10
- package/dist/esm/nodeviews/TableContainer.js +42 -7
- package/dist/esm/nodeviews/TableResizer.js +7 -7
- 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/merged-cells.js +3 -3
- 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-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/docs/0-intro.tsx +9 -7
- package/package.json +2 -2
- 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 +363 -339
- package/src/nodeviews/TableNodeViewBase.ts +19 -24
- package/src/nodeviews/TableResizer.tsx +565 -657
- 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 +10 -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 +84 -97
- package/src/utils/table.ts +44 -44
- package/src/utils/transforms.ts +5 -5
- package/src/utils/update-plugin-state-decorations.ts +5 -9
|
@@ -5,41 +5,39 @@ import reducer from '../reducer';
|
|
|
5
5
|
|
|
6
6
|
import { pluginKey } from './plugin-key';
|
|
7
7
|
|
|
8
|
-
export const { createPluginState, createCommand, getPluginState } =
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
8
|
+
export const { createPluginState, createCommand, getPluginState } = pluginFactory(
|
|
9
|
+
pluginKey,
|
|
10
|
+
reducer,
|
|
11
|
+
{
|
|
12
|
+
mapping: (tr, pluginState) => {
|
|
13
|
+
if (tr.docChanged) {
|
|
14
|
+
let updatedTargetCell = {};
|
|
15
|
+
if (pluginState.targetCellPosition) {
|
|
16
|
+
const { pos, deleted } = tr.mapping.mapResult(pluginState.targetCellPosition);
|
|
17
17
|
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
18
|
+
updatedTargetCell = {
|
|
19
|
+
targetCellPosition: deleted ? undefined : pos,
|
|
20
|
+
};
|
|
21
|
+
}
|
|
22
22
|
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
pluginState.tablePos,
|
|
27
|
-
-1,
|
|
28
|
-
);
|
|
23
|
+
let updatedTablePos = {};
|
|
24
|
+
if (pluginState.tablePos) {
|
|
25
|
+
const { pos, deleted } = tr.mapping.mapResult(pluginState.tablePos, -1);
|
|
29
26
|
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
27
|
+
updatedTablePos = {
|
|
28
|
+
tablePos: deleted ? undefined : pos,
|
|
29
|
+
};
|
|
30
|
+
}
|
|
34
31
|
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
32
|
+
return {
|
|
33
|
+
...pluginState,
|
|
34
|
+
...updatedTargetCell,
|
|
35
|
+
...updatedTablePos,
|
|
36
|
+
};
|
|
37
|
+
}
|
|
38
|
+
return pluginState;
|
|
39
|
+
},
|
|
40
|
+
onDocChanged: handleDocOrSelectionChanged,
|
|
41
|
+
onSelectionChanged: handleDocOrSelectionChanged,
|
|
42
|
+
},
|
|
43
|
+
);
|
|
@@ -9,108 +9,94 @@ import type { EditorView } from '@atlaskit/editor-prosemirror/view';
|
|
|
9
9
|
import { Decoration, DecorationSet } from '@atlaskit/editor-prosemirror/view';
|
|
10
10
|
|
|
11
11
|
interface SafariDeleteCompositionTextIssueWorkaroundPluginState {
|
|
12
|
-
|
|
13
|
-
|
|
12
|
+
renderSpan: boolean;
|
|
13
|
+
decorations: DecorationSet;
|
|
14
14
|
}
|
|
15
15
|
|
|
16
16
|
export const tableSafariDeleteCompositionTextIssueWorkaroundKey =
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
17
|
+
new PluginKey<SafariDeleteCompositionTextIssueWorkaroundPluginState>(
|
|
18
|
+
'tableSafariDeleteCompositionTextIssueWorkaround',
|
|
19
|
+
);
|
|
20
20
|
|
|
21
21
|
export const createPlugin = () => {
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
tableSafariDeleteCompositionTextIssueWorkaroundKey,
|
|
35
|
-
);
|
|
36
|
-
if (typeof renderSpan === 'undefined') {
|
|
37
|
-
return value;
|
|
38
|
-
}
|
|
22
|
+
return new SafePlugin<SafariDeleteCompositionTextIssueWorkaroundPluginState>({
|
|
23
|
+
key: tableSafariDeleteCompositionTextIssueWorkaroundKey,
|
|
24
|
+
state: {
|
|
25
|
+
init: (): SafariDeleteCompositionTextIssueWorkaroundPluginState => ({
|
|
26
|
+
renderSpan: false,
|
|
27
|
+
decorations: DecorationSet.empty,
|
|
28
|
+
}),
|
|
29
|
+
apply: (tr, value): SafariDeleteCompositionTextIssueWorkaroundPluginState => {
|
|
30
|
+
const renderSpan: boolean = tr.getMeta(tableSafariDeleteCompositionTextIssueWorkaroundKey);
|
|
31
|
+
if (typeof renderSpan === 'undefined') {
|
|
32
|
+
return value;
|
|
33
|
+
}
|
|
39
34
|
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
35
|
+
let decorations;
|
|
36
|
+
if (renderSpan) {
|
|
37
|
+
// Find position of the first text node in case it has multiple text nodes created by Japanese IME
|
|
38
|
+
const { $from } = tr.selection;
|
|
39
|
+
const pos = $from.before($from.depth);
|
|
40
|
+
const spanDecoration = Decoration.widget(pos, () => {
|
|
41
|
+
const spanElement = document.createElement('span');
|
|
42
|
+
return spanElement;
|
|
43
|
+
});
|
|
44
|
+
decorations = DecorationSet.create(tr.doc, [spanDecoration]);
|
|
45
|
+
} else {
|
|
46
|
+
decorations = DecorationSet.empty;
|
|
47
|
+
}
|
|
53
48
|
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
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
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
}
|
|
108
|
-
const { tr } = view.state;
|
|
109
|
-
tr.setMeta(tableSafariDeleteCompositionTextIssueWorkaroundKey, false);
|
|
110
|
-
view.dispatch(tr);
|
|
111
|
-
return false;
|
|
112
|
-
},
|
|
113
|
-
},
|
|
114
|
-
},
|
|
115
|
-
});
|
|
49
|
+
return {
|
|
50
|
+
renderSpan,
|
|
51
|
+
decorations,
|
|
52
|
+
};
|
|
53
|
+
},
|
|
54
|
+
},
|
|
55
|
+
props: {
|
|
56
|
+
decorations: (state) =>
|
|
57
|
+
tableSafariDeleteCompositionTextIssueWorkaroundKey.getState(state)?.decorations,
|
|
58
|
+
handleDOMEvents: {
|
|
59
|
+
beforeinput: (view: EditorView, event: Event): boolean => {
|
|
60
|
+
if ((event as InputEvent)?.inputType !== 'deleteCompositionText') {
|
|
61
|
+
return false;
|
|
62
|
+
}
|
|
63
|
+
const selection = window.getSelection();
|
|
64
|
+
if (!selection || selection.rangeCount <= 0 || selection.type !== 'Range') {
|
|
65
|
+
return false;
|
|
66
|
+
}
|
|
67
|
+
const range = selection.getRangeAt(0);
|
|
68
|
+
const { startContainer, endContainer, endOffset, startOffset } = range;
|
|
69
|
+
/**
|
|
70
|
+
* On Safari when composition text is deleted, it deletes any empty elements it finds up the dom tree. Prosemirror can sometimes be confused by this
|
|
71
|
+
* and will think that we meant to delete those elements. This fix forces the resulting node to not be empty.
|
|
72
|
+
* The condition here checks to see if the entire text node is about to be swapped inside of an element
|
|
73
|
+
*/
|
|
74
|
+
if (
|
|
75
|
+
startContainer.nodeType === Node.TEXT_NODE &&
|
|
76
|
+
startContainer === endContainer &&
|
|
77
|
+
startOffset === 0 &&
|
|
78
|
+
endOffset === (startContainer as Text).length
|
|
79
|
+
) {
|
|
80
|
+
const { tr } = view.state;
|
|
81
|
+
tr.setMeta(tableSafariDeleteCompositionTextIssueWorkaroundKey, true);
|
|
82
|
+
view.dispatch(tr);
|
|
83
|
+
}
|
|
84
|
+
return false;
|
|
85
|
+
},
|
|
86
|
+
input: (view: EditorView, event: Event): boolean => {
|
|
87
|
+
if ((event as InputEvent)?.inputType !== 'deleteCompositionText') {
|
|
88
|
+
return false;
|
|
89
|
+
}
|
|
90
|
+
const selection = window.getSelection();
|
|
91
|
+
if (!selection) {
|
|
92
|
+
return false;
|
|
93
|
+
}
|
|
94
|
+
const { tr } = view.state;
|
|
95
|
+
tr.setMeta(tableSafariDeleteCompositionTextIssueWorkaroundKey, false);
|
|
96
|
+
view.dispatch(tr);
|
|
97
|
+
return false;
|
|
98
|
+
},
|
|
99
|
+
},
|
|
100
|
+
},
|
|
101
|
+
});
|
|
116
102
|
};
|
|
@@ -2,11 +2,7 @@ import { createCommand } from './plugin-state';
|
|
|
2
2
|
import type { RowStickyState } from './types';
|
|
3
3
|
|
|
4
4
|
export const updateStickyState = (rowState: RowStickyState) =>
|
|
5
|
-
|
|
6
|
-
tr.setMeta('addToHistory', false),
|
|
7
|
-
);
|
|
5
|
+
createCommand({ name: 'UPDATE', state: rowState }, (tr) => tr.setMeta('addToHistory', false));
|
|
8
6
|
|
|
9
7
|
export const removeStickyState = (pos: number) =>
|
|
10
|
-
|
|
11
|
-
tr.setMeta('addToHistory', false),
|
|
12
|
-
);
|
|
8
|
+
createCommand({ name: 'REMOVE', pos }, (tr) => tr.setMeta('addToHistory', false));
|
|
@@ -2,6 +2,4 @@ import { PluginKey } from '@atlaskit/editor-prosemirror/state';
|
|
|
2
2
|
|
|
3
3
|
import type { StickyPluginState } from './types';
|
|
4
4
|
|
|
5
|
-
export const pluginKey = new PluginKey<StickyPluginState>(
|
|
6
|
-
'stickyHeadersPlugin',
|
|
7
|
-
);
|
|
5
|
+
export const pluginKey = new PluginKey<StickyPluginState>('stickyHeadersPlugin');
|
|
@@ -3,53 +3,50 @@ import { pluginFactory } from '@atlaskit/editor-common/utils';
|
|
|
3
3
|
import { pluginKey } from './plugin-key';
|
|
4
4
|
import type { StickyPluginAction, StickyPluginState } from './types';
|
|
5
5
|
|
|
6
|
-
const reducer = (
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
)
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
}
|
|
31
|
-
|
|
32
|
-
return pluginState;
|
|
6
|
+
const reducer = (pluginState: StickyPluginState, action: StickyPluginAction): StickyPluginState => {
|
|
7
|
+
if (action.name === 'UPDATE') {
|
|
8
|
+
let updated = false;
|
|
9
|
+
const updatedState = pluginState.map((oldTableState) => {
|
|
10
|
+
const replace = oldTableState.pos === action.state.pos;
|
|
11
|
+
|
|
12
|
+
if (replace) {
|
|
13
|
+
updated = true;
|
|
14
|
+
}
|
|
15
|
+
|
|
16
|
+
return replace ? action.state : oldTableState;
|
|
17
|
+
});
|
|
18
|
+
|
|
19
|
+
if (!updated) {
|
|
20
|
+
// new, add it
|
|
21
|
+
updatedState.push(action.state);
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
return updatedState;
|
|
25
|
+
} else if (action.name === 'REMOVE') {
|
|
26
|
+
return pluginState.filter((rowState) => rowState.pos !== action.pos);
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
return pluginState;
|
|
33
30
|
};
|
|
34
31
|
|
|
35
32
|
const { createPluginState, createCommand } = pluginFactory(pluginKey, reducer, {
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
33
|
+
mapping: (tr, pluginState) => {
|
|
34
|
+
if (tr.docChanged) {
|
|
35
|
+
return pluginState
|
|
36
|
+
.map((rowInfo) => {
|
|
37
|
+
const remapped = tr.mapping.mapResult(rowInfo.pos);
|
|
38
|
+
return remapped
|
|
39
|
+
? {
|
|
40
|
+
...rowInfo,
|
|
41
|
+
pos: remapped.pos,
|
|
42
|
+
}
|
|
43
|
+
: undefined;
|
|
44
|
+
})
|
|
45
|
+
.filter((f) => f !== undefined) as StickyPluginState;
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
return pluginState;
|
|
49
|
+
},
|
|
53
50
|
});
|
|
54
51
|
|
|
55
52
|
export { createPluginState, createCommand };
|
|
@@ -5,8 +5,8 @@ import { pluginKey } from './plugin-key';
|
|
|
5
5
|
import { createPluginState } from './plugin-state';
|
|
6
6
|
|
|
7
7
|
export const createPlugin = (dispatch: Dispatch, initialState = () => []) => {
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
8
|
+
return new SafePlugin({
|
|
9
|
+
state: createPluginState(dispatch, initialState),
|
|
10
|
+
key: pluginKey,
|
|
11
|
+
});
|
|
12
12
|
};
|
|
@@ -1,20 +1,20 @@
|
|
|
1
1
|
export type RowStickyState = {
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
2
|
+
pos: number;
|
|
3
|
+
top: number;
|
|
4
|
+
padding: number;
|
|
5
|
+
sticky: boolean;
|
|
6
6
|
};
|
|
7
7
|
|
|
8
8
|
export type StickyPluginState = RowStickyState[];
|
|
9
9
|
|
|
10
10
|
export type UpdateSticky = {
|
|
11
|
-
|
|
12
|
-
|
|
11
|
+
name: 'UPDATE';
|
|
12
|
+
state: RowStickyState;
|
|
13
13
|
};
|
|
14
14
|
|
|
15
15
|
export type RemoveSticky = {
|
|
16
|
-
|
|
17
|
-
|
|
16
|
+
name: 'REMOVE';
|
|
17
|
+
pos: number;
|
|
18
18
|
};
|
|
19
19
|
|
|
20
20
|
export type StickyPluginAction = UpdateSticky | RemoveSticky;
|
|
@@ -2,17 +2,17 @@ import type { StickyPluginState } from './types';
|
|
|
2
2
|
|
|
3
3
|
// only worry about the first row for now
|
|
4
4
|
export const findStickyHeaderForTable = (
|
|
5
|
-
|
|
6
|
-
|
|
5
|
+
state: StickyPluginState,
|
|
6
|
+
tablePos: number | undefined,
|
|
7
7
|
) => {
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
8
|
+
if (!state || tablePos === undefined) {
|
|
9
|
+
return undefined;
|
|
10
|
+
}
|
|
11
11
|
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
12
|
+
const rowInfo = state.find((rowInfo) => rowInfo.pos === tablePos + 1);
|
|
13
|
+
if (!rowInfo) {
|
|
14
|
+
return undefined;
|
|
15
|
+
}
|
|
16
16
|
|
|
17
|
-
|
|
17
|
+
return rowInfo.sticky ? rowInfo : undefined;
|
|
18
18
|
};
|
|
@@ -2,10 +2,10 @@
|
|
|
2
2
|
* A plugin is created for collecting payload data for tableOverflowChanged analytics event
|
|
3
3
|
*/
|
|
4
4
|
import {
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
5
|
+
ACTION_SUBJECT,
|
|
6
|
+
EVENT_TYPE,
|
|
7
|
+
TABLE_ACTION,
|
|
8
|
+
TABLE_OVERFLOW_CHANGE_TRIGGER,
|
|
9
9
|
} from '@atlaskit/editor-common/analytics';
|
|
10
10
|
import type { DispatchAnalyticsEvent } from '@atlaskit/editor-common/analytics';
|
|
11
11
|
import type { Dispatch } from '@atlaskit/editor-common/event-dispatcher';
|
|
@@ -13,90 +13,88 @@ import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
|
|
|
13
13
|
import { PluginKey } from '@atlaskit/editor-prosemirror/state';
|
|
14
14
|
|
|
15
15
|
interface LastTrigger {
|
|
16
|
-
|
|
16
|
+
name: TABLE_OVERFLOW_CHANGE_TRIGGER;
|
|
17
17
|
}
|
|
18
18
|
|
|
19
19
|
type TableAnalyticsPluginState = {
|
|
20
|
-
|
|
20
|
+
lastTrigger: LastTrigger | undefined;
|
|
21
21
|
};
|
|
22
22
|
|
|
23
|
-
export const pluginKey = new PluginKey<TableAnalyticsPluginState>(
|
|
24
|
-
'tableOverflowAnalyticsPlugin',
|
|
25
|
-
);
|
|
23
|
+
export const pluginKey = new PluginKey<TableAnalyticsPluginState>('tableOverflowAnalyticsPlugin');
|
|
26
24
|
|
|
27
25
|
export const META_KEYS = {
|
|
28
|
-
|
|
29
|
-
|
|
26
|
+
OVERFLOW_TRIGGER: 'tableOverflowTrigger',
|
|
27
|
+
OVERFLOW_STATE_CHANGED: 'tableOverflowStateChanged',
|
|
30
28
|
};
|
|
31
29
|
|
|
32
30
|
const createPlugin = (
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
31
|
+
dispatch: Dispatch,
|
|
32
|
+
dispatchAnalyticsEvent: DispatchAnalyticsEvent,
|
|
33
|
+
tableResizingEnabled: boolean,
|
|
36
34
|
) =>
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
35
|
+
new SafePlugin({
|
|
36
|
+
key: pluginKey,
|
|
37
|
+
state: {
|
|
38
|
+
init() {
|
|
39
|
+
return {
|
|
40
|
+
lastTrigger: undefined,
|
|
41
|
+
};
|
|
42
|
+
},
|
|
43
|
+
apply(tr, pluginState) {
|
|
44
|
+
const meta = tr.getMeta(META_KEYS.OVERFLOW_TRIGGER);
|
|
45
|
+
const newState = { ...pluginState };
|
|
46
|
+
if (meta) {
|
|
47
|
+
newState.lastTrigger = { ...meta };
|
|
48
|
+
dispatch(pluginKey, newState);
|
|
49
|
+
return newState;
|
|
50
|
+
}
|
|
53
51
|
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
52
|
+
return pluginState;
|
|
53
|
+
},
|
|
54
|
+
},
|
|
55
|
+
appendTransaction: (transactions, oldState, newState) => {
|
|
56
|
+
const newPluginState = pluginKey.getState(newState);
|
|
57
|
+
let hasAnalyticsBeenDispatched = false;
|
|
58
|
+
let lastTriggerName =
|
|
59
|
+
newPluginState?.lastTrigger?.name ||
|
|
60
|
+
// NOTE: We assume that we know and can correctly differentiate
|
|
61
|
+
// between all triggers of table overflow state change.
|
|
62
|
+
// The only trigger we can't identify is viewport width change.
|
|
63
|
+
// However, since there is still a chance that there are other triggers we didn't think of,
|
|
64
|
+
// all these unknown triggers and viwport width change trigger are captured as EXTERNAL.
|
|
65
|
+
TABLE_OVERFLOW_CHANGE_TRIGGER.EXTERNAL;
|
|
68
66
|
|
|
69
|
-
|
|
70
|
-
|
|
67
|
+
transactions.forEach((tr) => {
|
|
68
|
+
const payload = tr.getMeta(META_KEYS.OVERFLOW_STATE_CHANGED);
|
|
71
69
|
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
70
|
+
if (payload) {
|
|
71
|
+
dispatchAnalyticsEvent({
|
|
72
|
+
action: TABLE_ACTION.OVERFLOW_CHANGED,
|
|
73
|
+
actionSubject: ACTION_SUBJECT.TABLE,
|
|
74
|
+
actionSubjectId: null,
|
|
75
|
+
eventType: EVENT_TYPE.TRACK,
|
|
76
|
+
attributes: {
|
|
77
|
+
editorWidth: payload.editorWidth,
|
|
78
|
+
parentWidth: payload.parentWidth,
|
|
79
|
+
isOverflowing: payload.isOverflowing,
|
|
80
|
+
wasOverflowing: payload.wasOverflowing,
|
|
81
|
+
width: payload.width,
|
|
82
|
+
tableResizingEnabled,
|
|
83
|
+
trigger: lastTriggerName,
|
|
84
|
+
},
|
|
85
|
+
});
|
|
88
86
|
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
87
|
+
hasAnalyticsBeenDispatched = true;
|
|
88
|
+
}
|
|
89
|
+
});
|
|
92
90
|
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
91
|
+
if (hasAnalyticsBeenDispatched) {
|
|
92
|
+
const tr = newState.tr;
|
|
93
|
+
return tr.setMeta(META_KEYS.OVERFLOW_TRIGGER, {});
|
|
94
|
+
}
|
|
97
95
|
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
96
|
+
return undefined;
|
|
97
|
+
},
|
|
98
|
+
});
|
|
101
99
|
|
|
102
100
|
export { createPlugin };
|