@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
|
@@ -1,23 +1,21 @@
|
|
|
1
1
|
import type { RowOrColumnMovedState } from './types';
|
|
2
2
|
|
|
3
3
|
export enum AnalyticPluginTypes {
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
4
|
+
UpdateOverflowTriggerNameAction,
|
|
5
|
+
UpdateRowOrColumnMovedAction,
|
|
6
|
+
RemoveRowOrColumnMovedAction,
|
|
7
|
+
RemoveOverFlowTriggerNameAction,
|
|
8
|
+
UpdateRowOrColumnMovedAndOverflowTrigger,
|
|
9
9
|
}
|
|
10
10
|
|
|
11
11
|
export type UpdateRowOrColumnMovedAction = {
|
|
12
|
-
|
|
13
|
-
|
|
12
|
+
type: AnalyticPluginTypes.UpdateRowOrColumnMovedAction;
|
|
13
|
+
data: RowOrColumnMovedState;
|
|
14
14
|
};
|
|
15
15
|
|
|
16
16
|
export type RemoveRowOrColumnMovedAction = {
|
|
17
|
-
|
|
18
|
-
|
|
17
|
+
type: AnalyticPluginTypes.RemoveRowOrColumnMovedAction;
|
|
18
|
+
data: undefined;
|
|
19
19
|
};
|
|
20
20
|
|
|
21
|
-
export type AnalyticPluginAction =
|
|
22
|
-
| UpdateRowOrColumnMovedAction
|
|
23
|
-
| RemoveRowOrColumnMovedAction;
|
|
21
|
+
export type AnalyticPluginAction = UpdateRowOrColumnMovedAction | RemoveRowOrColumnMovedAction;
|
|
@@ -1,7 +1,4 @@
|
|
|
1
|
-
import type {
|
|
2
|
-
EditorState,
|
|
3
|
-
Transaction,
|
|
4
|
-
} from '@atlaskit/editor-prosemirror/state';
|
|
1
|
+
import type { EditorState, Transaction } from '@atlaskit/editor-prosemirror/state';
|
|
5
2
|
|
|
6
3
|
import { AnalyticPluginTypes } from './actions';
|
|
7
4
|
import { createCommand, getPluginState } from './plugin-factory';
|
|
@@ -10,44 +7,41 @@ import type { ActionType, RowOrColumnMovedState } from './types';
|
|
|
10
7
|
import { getMovedPayload } from './utils/moved-event';
|
|
11
8
|
|
|
12
9
|
export const updateRowOrColumnMoved = (
|
|
13
|
-
|
|
14
|
-
|
|
10
|
+
nextState: Omit<RowOrColumnMovedState, 'currentActions'>,
|
|
11
|
+
nextAction: ActionType,
|
|
15
12
|
) =>
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
13
|
+
createCommand(
|
|
14
|
+
(state) => {
|
|
15
|
+
const { rowOrColumnMoved } = getPluginState(state);
|
|
16
|
+
const data = getMovedPayload(nextState, nextAction, rowOrColumnMoved);
|
|
17
|
+
|
|
18
|
+
return {
|
|
19
|
+
type: AnalyticPluginTypes.UpdateRowOrColumnMovedAction,
|
|
20
|
+
data,
|
|
21
|
+
};
|
|
22
|
+
},
|
|
23
|
+
(tr) => tr.setMeta('addToHistory', false),
|
|
24
|
+
);
|
|
28
25
|
|
|
29
26
|
// --- transforms, prefer these over commands to avoid an extra 'dispatch'
|
|
30
27
|
export const resetRowOrColumnMovedTransform = () => (tr: Transaction) => {
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
28
|
+
const payload = {
|
|
29
|
+
type: AnalyticPluginTypes.RemoveRowOrColumnMovedAction,
|
|
30
|
+
};
|
|
34
31
|
|
|
35
|
-
|
|
32
|
+
return tr.setMeta(pluginKey, payload);
|
|
36
33
|
};
|
|
37
34
|
|
|
38
35
|
export const updateRowOrColumnMovedTransform =
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
return tr.setMeta(pluginKey, payload);
|
|
53
|
-
};
|
|
36
|
+
(nextState: Omit<RowOrColumnMovedState, 'currentActions'>, nextAction: ActionType) =>
|
|
37
|
+
(state: EditorState, tr: Transaction) => {
|
|
38
|
+
const { rowOrColumnMoved } = getPluginState(state);
|
|
39
|
+
const data = getMovedPayload(nextState, nextAction, rowOrColumnMoved);
|
|
40
|
+
|
|
41
|
+
const payload = {
|
|
42
|
+
type: AnalyticPluginTypes.UpdateRowOrColumnMovedAction,
|
|
43
|
+
data,
|
|
44
|
+
};
|
|
45
|
+
|
|
46
|
+
return tr.setMeta(pluginKey, payload);
|
|
47
|
+
};
|
|
@@ -3,5 +3,7 @@ import { pluginFactory } from '@atlaskit/editor-common/utils';
|
|
|
3
3
|
import { pluginKey } from './plugin-key';
|
|
4
4
|
import { reducer } from './reducer';
|
|
5
5
|
|
|
6
|
-
export const { createPluginState, createCommand, getPluginState } =
|
|
7
|
-
|
|
6
|
+
export const { createPluginState, createCommand, getPluginState } = pluginFactory(
|
|
7
|
+
pluginKey,
|
|
8
|
+
reducer,
|
|
9
|
+
);
|
|
@@ -2,6 +2,4 @@ import { PluginKey } from '@atlaskit/editor-prosemirror/state';
|
|
|
2
2
|
|
|
3
3
|
import type { AnalyticPluginState } from './types';
|
|
4
4
|
|
|
5
|
-
export const pluginKey = new PluginKey<AnalyticPluginState>(
|
|
6
|
-
'tableAnalyticPlugin',
|
|
7
|
-
);
|
|
5
|
+
export const pluginKey = new PluginKey<AnalyticPluginState>('tableAnalyticPlugin');
|
|
@@ -1,89 +1,79 @@
|
|
|
1
1
|
import type { DispatchAnalyticsEvent } from '@atlaskit/editor-common/analytics';
|
|
2
|
-
import {
|
|
3
|
-
ACTION_SUBJECT,
|
|
4
|
-
EVENT_TYPE,
|
|
5
|
-
TABLE_ACTION,
|
|
6
|
-
} from '@atlaskit/editor-common/analytics';
|
|
2
|
+
import { ACTION_SUBJECT, EVENT_TYPE, TABLE_ACTION } from '@atlaskit/editor-common/analytics';
|
|
7
3
|
import type { Dispatch } from '@atlaskit/editor-common/event-dispatcher';
|
|
8
4
|
import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
|
|
9
5
|
|
|
10
6
|
import {
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
7
|
+
countCellsInSlice,
|
|
8
|
+
getTableElementMoveTypeBySlice,
|
|
9
|
+
getTableSelectionType,
|
|
10
|
+
isInsideFirstCellOfRowOrColumn,
|
|
15
11
|
} from '../../commands/misc';
|
|
16
12
|
|
|
17
|
-
import {
|
|
18
|
-
resetRowOrColumnMovedTransform,
|
|
19
|
-
updateRowOrColumnMoved,
|
|
20
|
-
} from './commands';
|
|
13
|
+
import { resetRowOrColumnMovedTransform, updateRowOrColumnMoved } from './commands';
|
|
21
14
|
import { createPluginState } from './plugin-factory';
|
|
22
15
|
import { pluginKey } from './plugin-key';
|
|
23
16
|
import { defaultState } from './types';
|
|
24
17
|
|
|
25
|
-
export const createPlugin = (
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
)
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
const tr = transactions.find((tr) =>
|
|
34
|
-
tr.getMeta(pluginKey)?.data?.currentActions?.includes('pasted'),
|
|
35
|
-
);
|
|
18
|
+
export const createPlugin = (dispatch: Dispatch, dispatchAnalyticsEvent: DispatchAnalyticsEvent) =>
|
|
19
|
+
new SafePlugin({
|
|
20
|
+
key: pluginKey,
|
|
21
|
+
state: createPluginState(dispatch, defaultState),
|
|
22
|
+
appendTransaction: (transactions, oldState, newState) => {
|
|
23
|
+
const tr = transactions.find((tr) =>
|
|
24
|
+
tr.getMeta(pluginKey)?.data?.currentActions?.includes('pasted'),
|
|
25
|
+
);
|
|
36
26
|
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
27
|
+
if (tr) {
|
|
28
|
+
dispatchAnalyticsEvent({
|
|
29
|
+
action: TABLE_ACTION.ROW_OR_COLUMN_MOVED,
|
|
30
|
+
actionSubject: ACTION_SUBJECT.TABLE,
|
|
31
|
+
actionSubjectId: null,
|
|
32
|
+
eventType: EVENT_TYPE.TRACK,
|
|
33
|
+
attributes: {
|
|
34
|
+
type: tr.getMeta(pluginKey)?.data?.type,
|
|
35
|
+
},
|
|
36
|
+
});
|
|
37
|
+
return resetRowOrColumnMovedTransform()(tr);
|
|
38
|
+
}
|
|
49
39
|
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
40
|
+
return undefined;
|
|
41
|
+
},
|
|
42
|
+
props: {
|
|
43
|
+
handlePaste: ({ state, dispatch }, event, slice) => {
|
|
44
|
+
const { schema } = state;
|
|
45
|
+
const type = getTableElementMoveTypeBySlice(slice, state);
|
|
56
46
|
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
47
|
+
// if the selection wasn't in the first cell of a row or column, don't count it
|
|
48
|
+
if (!type || !isInsideFirstCellOfRowOrColumn(state.selection, type)) {
|
|
49
|
+
return;
|
|
50
|
+
}
|
|
61
51
|
|
|
62
|
-
|
|
52
|
+
const count = countCellsInSlice(slice, schema, type);
|
|
63
53
|
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
54
|
+
updateRowOrColumnMoved(
|
|
55
|
+
{
|
|
56
|
+
numberOfCells: count,
|
|
57
|
+
type,
|
|
58
|
+
},
|
|
59
|
+
'pasted',
|
|
60
|
+
)(state, dispatch);
|
|
61
|
+
},
|
|
62
|
+
transformCopied: (slice, { state, dispatch }) => {
|
|
63
|
+
const { schema } = state;
|
|
74
64
|
|
|
75
|
-
|
|
76
|
-
|
|
65
|
+
const type = getTableSelectionType(state.selection);
|
|
66
|
+
const count = countCellsInSlice(slice, schema, type);
|
|
77
67
|
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
68
|
+
updateRowOrColumnMoved(
|
|
69
|
+
{
|
|
70
|
+
numberOfCells: count,
|
|
71
|
+
type,
|
|
72
|
+
},
|
|
73
|
+
'copyOrCut',
|
|
74
|
+
)(state, dispatch);
|
|
85
75
|
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
76
|
+
return slice;
|
|
77
|
+
},
|
|
78
|
+
},
|
|
79
|
+
});
|
|
@@ -4,24 +4,24 @@ import type { AnalyticPluginState } from './types';
|
|
|
4
4
|
import { defaultState } from './types';
|
|
5
5
|
|
|
6
6
|
export const reducer = (
|
|
7
|
-
|
|
8
|
-
|
|
7
|
+
state: AnalyticPluginState,
|
|
8
|
+
action: AnalyticPluginAction,
|
|
9
9
|
): AnalyticPluginState => {
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
10
|
+
switch (action.type) {
|
|
11
|
+
case AnalyticPluginTypes.UpdateRowOrColumnMovedAction:
|
|
12
|
+
return {
|
|
13
|
+
...state,
|
|
14
|
+
rowOrColumnMoved: {
|
|
15
|
+
...state.rowOrColumnMoved,
|
|
16
|
+
...action.data,
|
|
17
|
+
},
|
|
18
|
+
};
|
|
19
|
+
case AnalyticPluginTypes.RemoveRowOrColumnMovedAction:
|
|
20
|
+
return {
|
|
21
|
+
...state,
|
|
22
|
+
rowOrColumnMoved: defaultState.rowOrColumnMoved,
|
|
23
|
+
};
|
|
24
|
+
default:
|
|
25
|
+
return state;
|
|
26
|
+
}
|
|
27
27
|
};
|
|
@@ -1,20 +1,20 @@
|
|
|
1
1
|
export type ActionType = 'none' | 'addRowOrColumn' | 'copyOrCut' | 'pasted';
|
|
2
2
|
|
|
3
3
|
export type RowOrColumnMovedState = {
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
4
|
+
type?: 'row' | 'column';
|
|
5
|
+
/** used to confirm if same number of cells was copied and pasted */
|
|
6
|
+
numberOfCells?: number;
|
|
7
|
+
currentActions: Array<ActionType>;
|
|
8
8
|
};
|
|
9
9
|
|
|
10
10
|
export type AnalyticPluginState = {
|
|
11
|
-
|
|
11
|
+
rowOrColumnMoved: RowOrColumnMovedState;
|
|
12
12
|
};
|
|
13
13
|
|
|
14
14
|
export const defaultState = {
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
15
|
+
rowOrColumnMoved: {
|
|
16
|
+
type: undefined,
|
|
17
|
+
numberOfCells: undefined,
|
|
18
|
+
currentActions: [],
|
|
19
|
+
},
|
|
20
20
|
} as AnalyticPluginState;
|
|
@@ -2,50 +2,50 @@ import type { ActionType, RowOrColumnMovedState } from '../types';
|
|
|
2
2
|
import { defaultState } from '../types';
|
|
3
3
|
|
|
4
4
|
const getNextActionType = (
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
5
|
+
nextState: Omit<RowOrColumnMovedState, 'currentActions'>,
|
|
6
|
+
nextAction: ActionType,
|
|
7
|
+
prevState?: RowOrColumnMovedState,
|
|
8
8
|
) => {
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
9
|
+
if (nextAction === 'pasted') {
|
|
10
|
+
if (
|
|
11
|
+
prevState &&
|
|
12
|
+
prevState.currentActions.includes('copyOrCut') &&
|
|
13
|
+
prevState.currentActions.includes('addRowOrColumn') &&
|
|
14
|
+
prevState.numberOfCells === nextState.numberOfCells &&
|
|
15
|
+
prevState.type === nextState.type
|
|
16
|
+
) {
|
|
17
|
+
return 'pasted';
|
|
18
|
+
}
|
|
19
|
+
return 'none';
|
|
20
|
+
}
|
|
21
|
+
return nextAction;
|
|
22
22
|
};
|
|
23
23
|
|
|
24
24
|
export const getMovedPayload = (
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
25
|
+
nextState: Omit<RowOrColumnMovedState, 'currentActions'>,
|
|
26
|
+
nextAction: ActionType,
|
|
27
|
+
prevState: RowOrColumnMovedState,
|
|
28
28
|
) => {
|
|
29
|
-
|
|
29
|
+
const nextActionType = getNextActionType(nextState, nextAction, prevState);
|
|
30
30
|
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
31
|
+
if (nextActionType === 'none') {
|
|
32
|
+
return defaultState.rowOrColumnMoved;
|
|
33
|
+
}
|
|
34
34
|
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
35
|
+
// a new workflow has started in the opposite axis (e.g. inserted a row, but copied a column) remove old state
|
|
36
|
+
if (prevState.type !== nextState.type) {
|
|
37
|
+
return {
|
|
38
|
+
currentActions: [nextActionType],
|
|
39
|
+
numberOfCells: nextState?.numberOfCells,
|
|
40
|
+
type: nextState.type,
|
|
41
|
+
};
|
|
42
|
+
}
|
|
43
43
|
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
44
|
+
return {
|
|
45
|
+
currentActions: prevState.currentActions.includes(nextActionType)
|
|
46
|
+
? prevState.currentActions
|
|
47
|
+
: [...prevState.currentActions, nextActionType],
|
|
48
|
+
numberOfCells: nextState?.numberOfCells || prevState.numberOfCells,
|
|
49
|
+
type: nextState?.type,
|
|
50
|
+
};
|
|
51
51
|
};
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
|
|
2
2
|
import type {
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
3
|
+
EditorState,
|
|
4
|
+
// @ts-ignore -- ReadonlyTransaction is a local declaration and will cause a TS2305 error in CCFE typecheck
|
|
5
|
+
ReadonlyTransaction,
|
|
6
|
+
Transaction,
|
|
7
7
|
} from '@atlaskit/editor-prosemirror/state';
|
|
8
8
|
import { PluginKey } from '@atlaskit/editor-prosemirror/state';
|
|
9
9
|
import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
|
|
@@ -13,94 +13,75 @@ import { pluginKey as tablePluginKey } from '../plugin-key';
|
|
|
13
13
|
import { pluginKey as tableWidthPluginKey } from '../table-width';
|
|
14
14
|
|
|
15
15
|
import {
|
|
16
|
-
|
|
17
|
-
|
|
16
|
+
buildColumnControlsDecorations,
|
|
17
|
+
maybeUpdateColumnControlsSelectedDecoration,
|
|
18
18
|
} from './utils';
|
|
19
19
|
|
|
20
20
|
export const pluginKey = new PluginKey('tableDecorationsPlugin');
|
|
21
21
|
|
|
22
|
-
export const getDecorations = (state: EditorState): DecorationSet =>
|
|
23
|
-
pluginKey.getState(state);
|
|
22
|
+
export const getDecorations = (state: EditorState): DecorationSet => pluginKey.getState(state);
|
|
24
23
|
|
|
25
24
|
export const handleDocOrSelectionChanged = (
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
25
|
+
tr: Transaction | ReadonlyTransaction,
|
|
26
|
+
decorationSet: DecorationSet,
|
|
27
|
+
oldState: EditorState,
|
|
28
|
+
newState: EditorState,
|
|
30
29
|
): DecorationSet => {
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
tablePluginKey.getState(newState) || {};
|
|
30
|
+
const isResizing = tableWidthPluginKey.getState(newState)?.resizing;
|
|
31
|
+
const wasResizing = tableWidthPluginKey.getState(oldState)?.resizing;
|
|
32
|
+
const { isDragAndDropEnabled = false } = tablePluginKey.getState(newState) || {};
|
|
35
33
|
|
|
36
|
-
|
|
34
|
+
const changedResizing = isResizing !== wasResizing;
|
|
37
35
|
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
oldState.selection instanceof CellSelection
|
|
59
|
-
) {
|
|
60
|
-
return maybeUpdateColumnControlsSelectedDecoration({
|
|
61
|
-
decorationSet,
|
|
62
|
-
tr,
|
|
63
|
-
});
|
|
64
|
-
}
|
|
65
|
-
}
|
|
36
|
+
// Remove column controls when resizing and don't add column decoration controls when DnD enabled
|
|
37
|
+
if (isResizing) {
|
|
38
|
+
return DecorationSet.empty;
|
|
39
|
+
} else if (tr.docChanged || tr.selection instanceof CellSelection || changedResizing) {
|
|
40
|
+
return buildColumnControlsDecorations({
|
|
41
|
+
decorationSet,
|
|
42
|
+
tr,
|
|
43
|
+
options: {
|
|
44
|
+
isDragAndDropEnabled,
|
|
45
|
+
},
|
|
46
|
+
});
|
|
47
|
+
} else if (tr.selectionSet) {
|
|
48
|
+
const isTransactionFromMouseClick = !tr.docChanged && tr.selectionSet && tr.getMeta('pointer');
|
|
49
|
+
if (isTransactionFromMouseClick || oldState.selection instanceof CellSelection) {
|
|
50
|
+
return maybeUpdateColumnControlsSelectedDecoration({
|
|
51
|
+
decorationSet,
|
|
52
|
+
tr,
|
|
53
|
+
});
|
|
54
|
+
}
|
|
55
|
+
}
|
|
66
56
|
|
|
67
|
-
|
|
57
|
+
return decorationSet;
|
|
68
58
|
};
|
|
69
59
|
|
|
70
60
|
export const createPlugin = () => {
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
61
|
+
return new SafePlugin({
|
|
62
|
+
state: {
|
|
63
|
+
init: () => DecorationSet.empty,
|
|
74
64
|
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
65
|
+
apply: (tr, decorationSet, oldState, newState) => {
|
|
66
|
+
let pluginState = decorationSet;
|
|
67
|
+
// main table plugin --->
|
|
68
|
+
const meta = tr.getMeta(tablePluginKey);
|
|
79
69
|
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
70
|
+
if (meta && meta.data && meta.data.decorationSet) {
|
|
71
|
+
pluginState = meta.data.decorationSet;
|
|
72
|
+
}
|
|
83
73
|
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
) {
|
|
89
|
-
pluginState = pluginState.map(tr.mapping, tr.doc);
|
|
90
|
-
return handleDocOrSelectionChanged(
|
|
91
|
-
tr,
|
|
92
|
-
pluginState,
|
|
93
|
-
oldState,
|
|
94
|
-
newState,
|
|
95
|
-
);
|
|
96
|
-
}
|
|
74
|
+
if (tr.docChanged || tr.selectionSet || tr.getMeta(tableWidthPluginKey)) {
|
|
75
|
+
pluginState = pluginState.map(tr.mapping, tr.doc);
|
|
76
|
+
return handleDocOrSelectionChanged(tr, pluginState, oldState, newState);
|
|
77
|
+
}
|
|
97
78
|
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
79
|
+
return pluginState;
|
|
80
|
+
},
|
|
81
|
+
},
|
|
82
|
+
key: pluginKey,
|
|
83
|
+
props: {
|
|
84
|
+
decorations: (state) => getDecorations(state),
|
|
85
|
+
},
|
|
86
|
+
});
|
|
106
87
|
};
|