@atlaskit/editor-plugin-table 7.25.9 → 7.25.11
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 +24 -0
- package/dist/cjs/commands/clear.js +2 -14
- package/dist/cjs/commands/column-resize.js +11 -5
- package/dist/cjs/commands/delete.js +2 -1
- package/dist/cjs/commands/insert.js +8 -5
- package/dist/cjs/commands/selection.js +3 -3
- package/dist/cjs/commands-with-analytics.js +23 -52
- package/dist/cjs/nodeviews/TableComponent.js +29 -14
- package/dist/cjs/nodeviews/TableContainer.js +2 -2
- package/dist/cjs/nodeviews/TableResizer.js +1 -1
- package/dist/cjs/plugin.js +4 -2
- package/dist/cjs/pm-plugins/decorations/utils/index.js +1 -8
- package/dist/cjs/pm-plugins/drag-and-drop/commands.js +3 -3
- package/dist/cjs/pm-plugins/drag-and-drop/index.js +1 -14
- package/dist/cjs/pm-plugins/drag-and-drop/plugin.js +4 -1
- package/dist/cjs/pm-plugins/drag-and-drop/utils/index.js +0 -7
- package/dist/cjs/pm-plugins/safari-delete-composition-text-issue-workaround.js +2 -2
- package/dist/cjs/pm-plugins/sticky-headers/index.js +1 -14
- package/dist/cjs/pm-plugins/table-analytics.js +2 -2
- package/dist/cjs/pm-plugins/table-resizing/commands.js +2 -2
- package/dist/cjs/pm-plugins/table-resizing/event-handlers.js +33 -15
- package/dist/cjs/pm-plugins/table-resizing/utils/colgroup.js +15 -6
- package/dist/cjs/pm-plugins/table-resizing/utils/consts.js +1 -2
- package/dist/cjs/pm-plugins/table-resizing/utils/dom.js +3 -3
- package/dist/cjs/pm-plugins/table-resizing/utils/index.js +0 -103
- package/dist/cjs/pm-plugins/table-resizing/utils/misc.js +23 -15
- package/dist/cjs/pm-plugins/table-resizing/utils/resize-column.js +6 -7
- package/dist/cjs/pm-plugins/table-resizing/utils/resize-state.js +23 -18
- package/dist/cjs/pm-plugins/table-resizing/utils/scale-table.js +13 -8
- package/dist/cjs/pm-plugins/table-selection-keymap.js +1 -3
- package/dist/cjs/pm-plugins/view-mode-sort/utils.js +2 -2
- package/dist/cjs/toolbar.js +9 -9
- package/dist/cjs/transforms/column-width.js +3 -1
- package/dist/cjs/transforms/delete-columns.js +2 -1
- package/dist/cjs/transforms/index.js +0 -6
- package/dist/cjs/ui/DragHandle/index.js +3 -1
- package/dist/cjs/ui/FloatingContextualButton/FixedButton.js +2 -2
- package/dist/cjs/ui/FloatingContextualMenu/ContextualMenu.js +3 -3
- package/dist/cjs/ui/FloatingDeleteButton/index.js +0 -1
- package/dist/cjs/ui/FloatingDragMenu/DragMenu.js +5 -4
- package/dist/cjs/ui/FloatingDragMenu/index.js +4 -2
- package/dist/cjs/ui/FloatingInsertButton/InsertButton.js +2 -2
- package/dist/cjs/ui/FloatingInsertButton/index.js +3 -2
- package/dist/cjs/ui/TableFloatingColumnControls/ColumnControls/index.js +2 -3
- package/dist/cjs/ui/TableFloatingColumnControls/index.js +2 -2
- package/dist/cjs/ui/TableFloatingControls/RowControls/DragControls.js +3 -1
- package/dist/cjs/ui/icons/index.js +0 -7
- package/dist/cjs/utils/column-controls.js +1 -22
- package/dist/cjs/utils/dom.js +1 -4
- package/dist/cjs/utils/drag-menu.js +3 -2
- package/dist/cjs/utils/index.js +0 -108
- package/dist/cjs/utils/merged-cells.js +1 -60
- package/dist/cjs/utils/nodes.js +2 -2
- package/dist/cjs/utils/row-controls.js +1 -8
- package/dist/cjs/utils/selection.js +1 -60
- package/dist/cjs/utils/table.js +1 -11
- package/dist/es2019/commands/clear.js +1 -14
- package/dist/es2019/commands/column-resize.js +11 -5
- package/dist/es2019/commands/delete.js +2 -2
- package/dist/es2019/commands/insert.js +8 -8
- package/dist/es2019/commands/selection.js +2 -2
- package/dist/es2019/commands-with-analytics.js +6 -36
- package/dist/es2019/nodeviews/TableComponent.js +30 -15
- package/dist/es2019/nodeviews/TableContainer.js +1 -1
- package/dist/es2019/nodeviews/TableResizer.js +1 -1
- package/dist/es2019/plugin.js +4 -2
- package/dist/es2019/pm-plugins/decorations/utils/index.js +1 -2
- package/dist/es2019/pm-plugins/drag-and-drop/commands.js +2 -2
- package/dist/es2019/pm-plugins/drag-and-drop/index.js +1 -2
- package/dist/es2019/pm-plugins/drag-and-drop/plugin.js +4 -1
- package/dist/es2019/pm-plugins/drag-and-drop/utils/index.js +0 -1
- package/dist/es2019/pm-plugins/safari-delete-composition-text-issue-workaround.js +1 -1
- package/dist/es2019/pm-plugins/sticky-headers/index.js +1 -2
- package/dist/es2019/pm-plugins/table-analytics.js +1 -1
- package/dist/es2019/pm-plugins/table-resizing/commands.js +1 -1
- package/dist/es2019/pm-plugins/table-resizing/event-handlers.js +32 -14
- package/dist/es2019/pm-plugins/table-resizing/utils/colgroup.js +15 -7
- package/dist/es2019/pm-plugins/table-resizing/utils/consts.js +0 -1
- package/dist/es2019/pm-plugins/table-resizing/utils/dom.js +2 -2
- package/dist/es2019/pm-plugins/table-resizing/utils/index.js +5 -6
- package/dist/es2019/pm-plugins/table-resizing/utils/misc.js +22 -14
- package/dist/es2019/pm-plugins/table-resizing/utils/resize-column.js +6 -7
- package/dist/es2019/pm-plugins/table-resizing/utils/resize-state.js +21 -15
- package/dist/es2019/pm-plugins/table-resizing/utils/scale-table.js +10 -7
- package/dist/es2019/pm-plugins/table-selection-keymap.js +1 -2
- package/dist/es2019/pm-plugins/view-mode-sort/utils.js +1 -1
- package/dist/es2019/toolbar.js +8 -8
- package/dist/es2019/transforms/column-width.js +3 -2
- package/dist/es2019/transforms/delete-columns.js +2 -2
- package/dist/es2019/transforms/index.js +1 -1
- package/dist/es2019/ui/DragHandle/index.js +3 -1
- package/dist/es2019/ui/FloatingContextualButton/FixedButton.js +1 -1
- package/dist/es2019/ui/FloatingContextualMenu/ContextualMenu.js +3 -3
- package/dist/es2019/ui/FloatingDeleteButton/index.js +1 -1
- package/dist/es2019/ui/FloatingDragMenu/DragMenu.js +4 -3
- package/dist/es2019/ui/FloatingDragMenu/index.js +4 -2
- package/dist/es2019/ui/FloatingInsertButton/InsertButton.js +1 -1
- package/dist/es2019/ui/FloatingInsertButton/index.js +3 -2
- package/dist/es2019/ui/TableFloatingColumnControls/ColumnControls/index.js +1 -2
- package/dist/es2019/ui/TableFloatingColumnControls/index.js +1 -1
- package/dist/es2019/ui/TableFloatingControls/RowControls/DragControls.js +3 -1
- package/dist/es2019/ui/icons/index.js +0 -1
- package/dist/es2019/utils/column-controls.js +1 -19
- package/dist/es2019/utils/dom.js +0 -1
- package/dist/es2019/utils/drag-menu.js +3 -3
- package/dist/es2019/utils/index.js +8 -8
- package/dist/es2019/utils/merged-cells.js +0 -47
- package/dist/es2019/utils/nodes.js +1 -1
- package/dist/es2019/utils/row-controls.js +1 -8
- package/dist/es2019/utils/selection.js +0 -60
- package/dist/es2019/utils/table.js +0 -6
- package/dist/esm/commands/clear.js +1 -14
- package/dist/esm/commands/column-resize.js +11 -5
- package/dist/esm/commands/delete.js +2 -1
- package/dist/esm/commands/insert.js +8 -5
- package/dist/esm/commands/selection.js +2 -2
- package/dist/esm/commands-with-analytics.js +24 -52
- package/dist/esm/nodeviews/TableComponent.js +30 -15
- package/dist/esm/nodeviews/TableContainer.js +1 -1
- package/dist/esm/nodeviews/TableResizer.js +1 -1
- package/dist/esm/plugin.js +4 -2
- package/dist/esm/pm-plugins/decorations/utils/index.js +1 -2
- package/dist/esm/pm-plugins/drag-and-drop/commands.js +2 -2
- package/dist/esm/pm-plugins/drag-and-drop/index.js +1 -2
- package/dist/esm/pm-plugins/drag-and-drop/plugin.js +4 -1
- package/dist/esm/pm-plugins/drag-and-drop/utils/index.js +0 -1
- package/dist/esm/pm-plugins/safari-delete-composition-text-issue-workaround.js +1 -1
- package/dist/esm/pm-plugins/sticky-headers/index.js +1 -2
- package/dist/esm/pm-plugins/table-analytics.js +1 -1
- package/dist/esm/pm-plugins/table-resizing/commands.js +1 -1
- package/dist/esm/pm-plugins/table-resizing/event-handlers.js +33 -15
- package/dist/esm/pm-plugins/table-resizing/utils/colgroup.js +15 -6
- package/dist/esm/pm-plugins/table-resizing/utils/consts.js +0 -1
- package/dist/esm/pm-plugins/table-resizing/utils/dom.js +2 -2
- package/dist/esm/pm-plugins/table-resizing/utils/index.js +5 -6
- package/dist/esm/pm-plugins/table-resizing/utils/misc.js +24 -14
- package/dist/esm/pm-plugins/table-resizing/utils/resize-column.js +6 -7
- package/dist/esm/pm-plugins/table-resizing/utils/resize-state.js +22 -17
- package/dist/esm/pm-plugins/table-resizing/utils/scale-table.js +12 -6
- package/dist/esm/pm-plugins/table-selection-keymap.js +1 -2
- package/dist/esm/pm-plugins/view-mode-sort/utils.js +1 -1
- package/dist/esm/toolbar.js +8 -8
- package/dist/esm/transforms/column-width.js +3 -1
- package/dist/esm/transforms/delete-columns.js +2 -1
- package/dist/esm/transforms/index.js +1 -1
- package/dist/esm/ui/DragHandle/index.js +3 -1
- package/dist/esm/ui/FloatingContextualButton/FixedButton.js +1 -1
- package/dist/esm/ui/FloatingContextualMenu/ContextualMenu.js +3 -3
- package/dist/esm/ui/FloatingDeleteButton/index.js +1 -1
- package/dist/esm/ui/FloatingDragMenu/DragMenu.js +4 -3
- package/dist/esm/ui/FloatingDragMenu/index.js +4 -2
- package/dist/esm/ui/FloatingInsertButton/InsertButton.js +1 -1
- package/dist/esm/ui/FloatingInsertButton/index.js +3 -2
- package/dist/esm/ui/TableFloatingColumnControls/ColumnControls/index.js +1 -2
- package/dist/esm/ui/TableFloatingColumnControls/index.js +1 -1
- package/dist/esm/ui/TableFloatingControls/RowControls/DragControls.js +3 -1
- package/dist/esm/ui/icons/index.js +0 -1
- package/dist/esm/utils/column-controls.js +1 -22
- package/dist/esm/utils/dom.js +0 -3
- package/dist/esm/utils/drag-menu.js +3 -2
- package/dist/esm/utils/index.js +8 -8
- package/dist/esm/utils/merged-cells.js +0 -59
- package/dist/esm/utils/nodes.js +1 -1
- package/dist/esm/utils/row-controls.js +1 -8
- package/dist/esm/utils/selection.js +0 -59
- package/dist/esm/utils/table.js +0 -9
- package/dist/types/commands/clear.d.ts +0 -1
- package/dist/types/commands/delete.d.ts +1 -1
- package/dist/types/commands/insert.d.ts +4 -4
- package/dist/types/commands/selection.d.ts +0 -4
- package/dist/types/commands-with-analytics.d.ts +2 -3
- package/dist/types/nodeviews/TableComponent.d.ts +1 -1
- package/dist/types/nodeviews/TableContainer.d.ts +0 -11
- package/dist/types/nodeviews/TableResizer.d.ts +1 -3
- package/dist/types/pm-plugins/analytics/actions.d.ts +3 -2
- package/dist/types/pm-plugins/decorations/utils/index.d.ts +0 -1
- package/dist/types/pm-plugins/decorations/utils/types.d.ts +2 -1
- package/dist/types/pm-plugins/drag-and-drop/actions.d.ts +5 -4
- package/dist/types/pm-plugins/drag-and-drop/commands.d.ts +1 -6
- package/dist/types/pm-plugins/drag-and-drop/index.d.ts +0 -2
- package/dist/types/pm-plugins/drag-and-drop/utils/index.d.ts +0 -1
- package/dist/types/pm-plugins/safari-delete-composition-text-issue-workaround.d.ts +0 -2
- package/dist/types/pm-plugins/sticky-headers/index.d.ts +0 -1
- package/dist/types/pm-plugins/sticky-headers/types.d.ts +3 -2
- package/dist/types/pm-plugins/table-analytics.d.ts +0 -12
- package/dist/types/pm-plugins/table-resizing/commands.d.ts +0 -5
- package/dist/types/pm-plugins/table-resizing/utils/colgroup.d.ts +3 -2
- package/dist/types/pm-plugins/table-resizing/utils/consts.d.ts +0 -1
- package/dist/types/pm-plugins/table-resizing/utils/dom.d.ts +0 -2
- package/dist/types/pm-plugins/table-resizing/utils/index.d.ts +5 -8
- package/dist/types/pm-plugins/table-resizing/utils/misc.d.ts +1 -2
- package/dist/types/pm-plugins/table-resizing/utils/resize-column.d.ts +3 -2
- package/dist/types/pm-plugins/table-resizing/utils/resize-state.d.ts +3 -5
- package/dist/types/pm-plugins/table-resizing/utils/scale-table.d.ts +3 -4
- package/dist/types/pm-plugins/table-selection-keymap.d.ts +0 -1
- package/dist/types/pm-plugins/view-mode-sort/types.d.ts +2 -1
- package/dist/types/pm-plugins/view-mode-sort/utils.d.ts +0 -6
- package/dist/types/toolbar.d.ts +1 -14
- package/dist/types/transforms/column-width.d.ts +1 -1
- package/dist/types/transforms/delete-columns.d.ts +1 -1
- package/dist/types/transforms/index.d.ts +1 -1
- package/dist/types/ui/FloatingContextualButton/FixedButton.d.ts +1 -2
- package/dist/types/ui/FloatingContextualMenu/ContextualMenu.d.ts +2 -2
- package/dist/types/ui/FloatingContextualMenu/index.d.ts +1 -1
- package/dist/types/ui/FloatingDeleteButton/DeleteButton.d.ts +1 -1
- package/dist/types/ui/FloatingDeleteButton/index.d.ts +2 -3
- package/dist/types/ui/FloatingDragMenu/DragMenu.d.ts +1 -2
- package/dist/types/ui/FloatingDragMenu/index.d.ts +3 -2
- package/dist/types/ui/FloatingInsertButton/InsertButton.d.ts +1 -2
- package/dist/types/ui/FloatingInsertButton/index.d.ts +1 -0
- package/dist/types/ui/FloatingToolbarLabel/FloatingToolbarLabel.d.ts +2 -1
- package/dist/types/ui/TableFloatingColumnControls/ColumnControls/index.d.ts +2 -2
- package/dist/types/ui/TableFloatingColumnControls/ColumnDropTargets/ColumnDropTarget.d.ts +2 -1
- package/dist/types/ui/TableFloatingColumnControls/ColumnDropTargets/index.d.ts +2 -1
- package/dist/types/ui/TableFloatingColumnControls/index.d.ts +2 -2
- package/dist/types/ui/TableFloatingControls/NumberColumn/index.d.ts +2 -1
- package/dist/types/ui/TableFloatingControls/RowDropTarget/index.d.ts +1 -1
- package/dist/types/ui/TableFloatingControls/index.d.ts +1 -1
- package/dist/types/ui/icons/index.d.ts +0 -1
- package/dist/types/utils/column-controls.d.ts +0 -2
- package/dist/types/utils/dom.d.ts +0 -1
- package/dist/types/utils/drag-menu.d.ts +1 -1
- package/dist/types/utils/index.d.ts +8 -8
- package/dist/types/utils/merged-cells.d.ts +0 -2
- package/dist/types/utils/nodes.d.ts +0 -1
- package/dist/types/utils/row-controls.d.ts +0 -1
- package/dist/types/utils/selection.d.ts +0 -3
- package/dist/types/utils/table.d.ts +0 -2
- package/dist/types-ts4.5/commands/clear.d.ts +0 -1
- package/dist/types-ts4.5/commands/delete.d.ts +1 -1
- package/dist/types-ts4.5/commands/insert.d.ts +4 -4
- package/dist/types-ts4.5/commands/selection.d.ts +0 -4
- package/dist/types-ts4.5/commands-with-analytics.d.ts +2 -3
- package/dist/types-ts4.5/nodeviews/TableComponent.d.ts +1 -1
- package/dist/types-ts4.5/nodeviews/TableContainer.d.ts +0 -11
- package/dist/types-ts4.5/nodeviews/TableResizer.d.ts +1 -3
- package/dist/types-ts4.5/pm-plugins/analytics/actions.d.ts +3 -2
- package/dist/types-ts4.5/pm-plugins/decorations/utils/index.d.ts +0 -1
- package/dist/types-ts4.5/pm-plugins/decorations/utils/types.d.ts +2 -1
- package/dist/types-ts4.5/pm-plugins/drag-and-drop/actions.d.ts +5 -4
- package/dist/types-ts4.5/pm-plugins/drag-and-drop/commands.d.ts +1 -6
- package/dist/types-ts4.5/pm-plugins/drag-and-drop/index.d.ts +0 -2
- package/dist/types-ts4.5/pm-plugins/drag-and-drop/utils/index.d.ts +0 -1
- package/dist/types-ts4.5/pm-plugins/safari-delete-composition-text-issue-workaround.d.ts +0 -2
- package/dist/types-ts4.5/pm-plugins/sticky-headers/index.d.ts +0 -1
- package/dist/types-ts4.5/pm-plugins/sticky-headers/types.d.ts +3 -2
- package/dist/types-ts4.5/pm-plugins/table-analytics.d.ts +0 -12
- package/dist/types-ts4.5/pm-plugins/table-resizing/commands.d.ts +0 -5
- package/dist/types-ts4.5/pm-plugins/table-resizing/utils/colgroup.d.ts +3 -2
- package/dist/types-ts4.5/pm-plugins/table-resizing/utils/consts.d.ts +0 -1
- package/dist/types-ts4.5/pm-plugins/table-resizing/utils/dom.d.ts +0 -2
- package/dist/types-ts4.5/pm-plugins/table-resizing/utils/index.d.ts +5 -8
- package/dist/types-ts4.5/pm-plugins/table-resizing/utils/misc.d.ts +1 -2
- package/dist/types-ts4.5/pm-plugins/table-resizing/utils/resize-column.d.ts +3 -2
- package/dist/types-ts4.5/pm-plugins/table-resizing/utils/resize-state.d.ts +3 -5
- package/dist/types-ts4.5/pm-plugins/table-resizing/utils/scale-table.d.ts +3 -4
- package/dist/types-ts4.5/pm-plugins/table-selection-keymap.d.ts +0 -1
- package/dist/types-ts4.5/pm-plugins/view-mode-sort/types.d.ts +2 -1
- package/dist/types-ts4.5/pm-plugins/view-mode-sort/utils.d.ts +0 -6
- package/dist/types-ts4.5/toolbar.d.ts +1 -14
- package/dist/types-ts4.5/transforms/column-width.d.ts +1 -1
- package/dist/types-ts4.5/transforms/delete-columns.d.ts +1 -1
- package/dist/types-ts4.5/transforms/index.d.ts +1 -1
- package/dist/types-ts4.5/ui/FloatingContextualButton/FixedButton.d.ts +1 -2
- package/dist/types-ts4.5/ui/FloatingContextualMenu/ContextualMenu.d.ts +2 -2
- package/dist/types-ts4.5/ui/FloatingContextualMenu/index.d.ts +1 -1
- package/dist/types-ts4.5/ui/FloatingDeleteButton/DeleteButton.d.ts +1 -1
- package/dist/types-ts4.5/ui/FloatingDeleteButton/index.d.ts +2 -3
- package/dist/types-ts4.5/ui/FloatingDragMenu/DragMenu.d.ts +1 -2
- package/dist/types-ts4.5/ui/FloatingDragMenu/index.d.ts +3 -2
- package/dist/types-ts4.5/ui/FloatingInsertButton/InsertButton.d.ts +1 -2
- package/dist/types-ts4.5/ui/FloatingInsertButton/index.d.ts +1 -0
- package/dist/types-ts4.5/ui/FloatingToolbarLabel/FloatingToolbarLabel.d.ts +2 -1
- package/dist/types-ts4.5/ui/TableFloatingColumnControls/ColumnControls/index.d.ts +2 -2
- package/dist/types-ts4.5/ui/TableFloatingColumnControls/ColumnDropTargets/ColumnDropTarget.d.ts +2 -1
- package/dist/types-ts4.5/ui/TableFloatingColumnControls/ColumnDropTargets/index.d.ts +2 -1
- package/dist/types-ts4.5/ui/TableFloatingColumnControls/index.d.ts +2 -2
- package/dist/types-ts4.5/ui/TableFloatingControls/NumberColumn/index.d.ts +2 -1
- package/dist/types-ts4.5/ui/TableFloatingControls/RowDropTarget/index.d.ts +1 -1
- package/dist/types-ts4.5/ui/TableFloatingControls/index.d.ts +1 -1
- package/dist/types-ts4.5/ui/icons/index.d.ts +0 -1
- package/dist/types-ts4.5/utils/column-controls.d.ts +0 -2
- package/dist/types-ts4.5/utils/dom.d.ts +0 -1
- package/dist/types-ts4.5/utils/drag-menu.d.ts +1 -1
- package/dist/types-ts4.5/utils/index.d.ts +8 -8
- package/dist/types-ts4.5/utils/merged-cells.d.ts +0 -2
- package/dist/types-ts4.5/utils/nodes.d.ts +0 -1
- package/dist/types-ts4.5/utils/row-controls.d.ts +0 -1
- package/dist/types-ts4.5/utils/selection.d.ts +0 -3
- package/dist/types-ts4.5/utils/table.d.ts +0 -2
- package/package.json +3 -3
- package/src/commands/clear.ts +0 -14
- package/src/commands/column-resize.ts +19 -6
- package/src/commands/delete.ts +2 -0
- package/src/commands/insert.ts +8 -0
- package/src/commands/selection.ts +1 -1
- package/src/commands-with-analytics.ts +5 -40
- package/src/nodeviews/TableComponent.tsx +43 -9
- package/src/nodeviews/TableContainer.tsx +1 -1
- package/src/nodeviews/TableResizer.tsx +2 -4
- package/src/plugin.tsx +2 -0
- package/src/pm-plugins/analytics/actions.ts +2 -2
- package/src/pm-plugins/decorations/utils/index.ts +0 -1
- package/src/pm-plugins/decorations/utils/types.ts +1 -1
- package/src/pm-plugins/drag-and-drop/actions.ts +4 -4
- package/src/pm-plugins/drag-and-drop/commands.ts +2 -2
- package/src/pm-plugins/drag-and-drop/index.ts +0 -3
- package/src/pm-plugins/drag-and-drop/plugin.ts +4 -0
- package/src/pm-plugins/drag-and-drop/utils/index.ts +0 -2
- package/src/pm-plugins/safari-delete-composition-text-issue-workaround.ts +1 -1
- package/src/pm-plugins/sticky-headers/index.ts +0 -1
- package/src/pm-plugins/sticky-headers/types.ts +2 -2
- package/src/pm-plugins/table-analytics.ts +1 -1
- package/src/pm-plugins/table-resizing/commands.ts +1 -1
- package/src/pm-plugins/table-resizing/event-handlers.ts +39 -15
- package/src/pm-plugins/table-resizing/utils/colgroup.ts +18 -7
- package/src/pm-plugins/table-resizing/utils/consts.ts +0 -1
- package/src/pm-plugins/table-resizing/utils/dom.ts +2 -5
- package/src/pm-plugins/table-resizing/utils/index.ts +4 -30
- package/src/pm-plugins/table-resizing/utils/misc.ts +25 -17
- package/src/pm-plugins/table-resizing/utils/resize-column.ts +14 -13
- package/src/pm-plugins/table-resizing/utils/resize-state.ts +28 -21
- package/src/pm-plugins/table-resizing/utils/scale-table.ts +18 -6
- package/src/pm-plugins/table-selection-keymap.ts +0 -2
- package/src/pm-plugins/view-mode-sort/types.ts +1 -1
- package/src/pm-plugins/view-mode-sort/utils.ts +1 -5
- package/src/toolbar.tsx +8 -5
- package/src/transforms/column-width.ts +2 -0
- package/src/transforms/delete-columns.ts +2 -0
- package/src/transforms/index.ts +1 -1
- package/src/ui/DragHandle/index.tsx +2 -0
- package/src/ui/FloatingContextualButton/FixedButton.tsx +2 -2
- package/src/ui/FloatingContextualMenu/ContextualMenu.tsx +5 -2
- package/src/ui/FloatingContextualMenu/index.tsx +1 -1
- package/src/ui/FloatingDeleteButton/DeleteButton.tsx +1 -1
- package/src/ui/FloatingDeleteButton/index.tsx +2 -2
- package/src/ui/FloatingDragMenu/DragMenu.tsx +4 -1
- package/src/ui/FloatingDragMenu/index.tsx +4 -1
- package/src/ui/FloatingInsertButton/InsertButton.tsx +2 -2
- package/src/ui/FloatingInsertButton/index.tsx +3 -0
- package/src/ui/FloatingToolbarLabel/FloatingToolbarLabel.tsx +1 -1
- package/src/ui/TableFloatingColumnControls/ColumnControls/index.tsx +1 -3
- package/src/ui/TableFloatingColumnControls/ColumnDropTargets/ColumnDropTarget.tsx +1 -1
- package/src/ui/TableFloatingColumnControls/ColumnDropTargets/index.tsx +1 -1
- package/src/ui/TableFloatingColumnControls/index.tsx +2 -2
- package/src/ui/TableFloatingControls/NumberColumn/index.tsx +1 -1
- package/src/ui/TableFloatingControls/RowControls/DragControls.tsx +2 -0
- package/src/ui/TableFloatingControls/RowDropTarget/index.tsx +1 -1
- package/src/ui/TableFloatingControls/index.tsx +1 -1
- package/src/ui/icons/index.ts +0 -1
- package/src/utils/column-controls.ts +2 -38
- package/src/utils/dom.ts +0 -4
- package/src/utils/drag-menu.ts +3 -0
- package/src/utils/index.ts +1 -22
- package/src/utils/merged-cells.ts +0 -62
- package/src/utils/nodes.ts +1 -1
- package/src/utils/row-controls.ts +1 -19
- package/src/utils/selection.ts +0 -84
- package/src/utils/table.ts +0 -8
- package/dist/cjs/utils/transforms.js +0 -11
- package/dist/es2019/utils/transforms.js +0 -5
- package/dist/esm/utils/transforms.js +0 -5
- package/dist/types/utils/transforms.d.ts +0 -2
- package/dist/types-ts4.5/utils/transforms.d.ts +0 -2
- package/src/utils/transforms.ts +0 -10
|
@@ -35,8 +35,9 @@ import { findStickyHeaderForTable, pluginKey as stickyHeadersPluginKey } from '.
|
|
|
35
35
|
import { META_KEYS } from '../pm-plugins/table-analytics';
|
|
36
36
|
import { COLUMN_MIN_WIDTH, getLayoutSize, getResizeState, insertColgroupFromNode, scaleTable, updateColgroup } from '../pm-plugins/table-resizing/utils';
|
|
37
37
|
import { hasTableBeenResized } from '../pm-plugins/table-resizing/utils/colgroup';
|
|
38
|
-
import { TABLE_EDITOR_MARGIN } from '../pm-plugins/table-resizing/utils/consts';
|
|
38
|
+
import { TABLE_EDITOR_MARGIN, TABLE_OFFSET_IN_COMMENT_EDITOR } from '../pm-plugins/table-resizing/utils/consts';
|
|
39
39
|
import { updateControls } from '../pm-plugins/table-resizing/utils/dom';
|
|
40
|
+
import { getScalingPercentForTableWithoutWidth, getTableScalingPercent } from '../pm-plugins/table-resizing/utils/misc';
|
|
40
41
|
import { TableCssClassName as ClassName, ShadowEvent } from '../types';
|
|
41
42
|
import TableFloatingColumnControls from '../ui/TableFloatingColumnControls';
|
|
42
43
|
import TableFloatingControls from '../ui/TableFloatingControls';
|
|
@@ -497,14 +498,14 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
|
|
|
497
498
|
isResizing = _this$props10.isResizing,
|
|
498
499
|
view = _this$props10.view,
|
|
499
500
|
getPos = _this$props10.getPos,
|
|
500
|
-
getEditorFeatureFlags = _this$props10.getEditorFeatureFlags
|
|
501
|
+
getEditorFeatureFlags = _this$props10.getEditorFeatureFlags,
|
|
502
|
+
options = _this$props10.options;
|
|
501
503
|
if (!this.table) {
|
|
502
504
|
return;
|
|
503
505
|
}
|
|
504
506
|
|
|
505
507
|
// Remove any widths styles after resizing preview is completed
|
|
506
508
|
this.table.style.width = '';
|
|
507
|
-
var tableRenderWidth = containerWidth.width - TABLE_EDITOR_MARGIN;
|
|
508
509
|
var tableNode = getNode();
|
|
509
510
|
var start = getPos() || 0;
|
|
510
511
|
var depth = view.state.doc.resolve(start).depth;
|
|
@@ -513,12 +514,16 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
|
|
|
513
514
|
}
|
|
514
515
|
var tableNodeWidth = getTableContainerWidth(tableNode);
|
|
515
516
|
var isTableResizedFullWidth = tableNodeWidth === 1800 && this.wasResizing && !isResizing;
|
|
517
|
+
|
|
516
518
|
// Needed for undo / redo
|
|
517
519
|
var isTableWidthChanged = tableNodeWidth !== this.tableNodeWidth;
|
|
520
|
+
var tableRenderWidth = options !== null && options !== void 0 && options.isCommentEditor ? containerWidth.width - (TABLE_OFFSET_IN_COMMENT_EDITOR + 1) // should be the same as this.table.parentElement?.clientWidth - 1, subtract 1 to avoid overflow
|
|
521
|
+
: containerWidth.width - TABLE_EDITOR_MARGIN;
|
|
522
|
+
tableNodeWidth = options !== null && options !== void 0 && options.isCommentEditor && !tableNode.attrs.width ? tableRenderWidth : tableNodeWidth;
|
|
518
523
|
var isTableSquashed = tableRenderWidth < tableNodeWidth;
|
|
519
524
|
var isNumberColumnChanged = tableNode.attrs.isNumberColumnEnabled !== this.node.attrs.isNumberColumnEnabled;
|
|
520
525
|
var isNumberOfColumnsChanged = tablesHaveDifferentNoOfColumns(tableNode, this.node);
|
|
521
|
-
var maybeScale = isTableSquashed || isTableWidthChanged || isTableResizedFullWidth || isNumberColumnChanged || isNumberOfColumnsChanged;
|
|
526
|
+
var maybeScale = isTableSquashed || isTableWidthChanged || isTableResizedFullWidth && !(options !== null && options !== void 0 && options.isCommentEditor) || isNumberColumnChanged || isNumberOfColumnsChanged;
|
|
522
527
|
if (force || maybeScale) {
|
|
523
528
|
var _this$containerWidth, _this$props$options, _this$props$options2, _this$props$options3;
|
|
524
529
|
var containerWidthValue = containerWidth.width;
|
|
@@ -536,7 +541,7 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
|
|
|
536
541
|
// When in comment editor, we need the scaling percent to be 40% while tableWithFixedColumnWidthsOption is not visible
|
|
537
542
|
!!((_this$props$options2 = this.props.options) !== null && _this$props$options2 !== void 0 && _this$props$options2.isTableScalingEnabled) && !!((_this$props$options3 = this.props.options) !== null && _this$props$options3 !== void 0 && _this$props$options3.isCommentEditor);
|
|
538
543
|
if (force || !isResizing && shouldUpdateColgroup) {
|
|
539
|
-
var _this$props$options4;
|
|
544
|
+
var _this$props$options4, _this$props$options5, _this$props$options6, _this$props$options7, _this$props$options8, _this$props$options9;
|
|
540
545
|
var resizeState = getResizeState({
|
|
541
546
|
minWidth: COLUMN_MIN_WIDTH,
|
|
542
547
|
maxSize: tableRenderWidth,
|
|
@@ -545,19 +550,29 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
|
|
|
545
550
|
start: start,
|
|
546
551
|
domAtPos: view.domAtPos.bind(view),
|
|
547
552
|
isTableScalingEnabled: true,
|
|
548
|
-
shouldUseIncreasedScalingPercent: shouldUseIncreasedScalingPercent
|
|
553
|
+
shouldUseIncreasedScalingPercent: shouldUseIncreasedScalingPercent,
|
|
554
|
+
isCommentEditor: !!((_this$props$options4 = this.props.options) !== null && _this$props$options4 !== void 0 && _this$props$options4.isCommentEditor)
|
|
549
555
|
});
|
|
550
556
|
var shouldScaleOnColgroupUpdate = false;
|
|
551
|
-
if ((_this$props$
|
|
557
|
+
if ((_this$props$options5 = this.props.options) !== null && _this$props$options5 !== void 0 && _this$props$options5.isTableScalingEnabled && !tableWithFixedColumnWidthsOption) {
|
|
552
558
|
shouldScaleOnColgroupUpdate = true;
|
|
553
559
|
}
|
|
554
560
|
if (isTableScalingWithFixedColumnWidthsOptionEnabled && tableNode.attrs.displayMode !== 'fixed') {
|
|
555
561
|
shouldScaleOnColgroupUpdate = true;
|
|
556
562
|
}
|
|
563
|
+
if ((_this$props$options6 = this.props.options) !== null && _this$props$options6 !== void 0 && _this$props$options6.isTableScalingEnabled && (_this$props$options7 = this.props.options) !== null && _this$props$options7 !== void 0 && _this$props$options7.isCommentEditor) {
|
|
564
|
+
shouldScaleOnColgroupUpdate = true;
|
|
565
|
+
}
|
|
566
|
+
var scalePercent = 1;
|
|
567
|
+
if (!((_this$props$options8 = this.props.options) !== null && _this$props$options8 !== void 0 && _this$props$options8.isCommentEditor) || (_this$props$options9 = this.props.options) !== null && _this$props$options9 !== void 0 && _this$props$options9.isCommentEditor && tableNode.attrs.width) {
|
|
568
|
+
scalePercent = getTableScalingPercent(tableNode, this.table, shouldUseIncreasedScalingPercent);
|
|
569
|
+
} else {
|
|
570
|
+
scalePercent = getScalingPercentForTableWithoutWidth(tableNode, this.table);
|
|
571
|
+
}
|
|
557
572
|
|
|
558
573
|
// Request animation frame required for Firefox
|
|
559
574
|
requestAnimationFrame(function () {
|
|
560
|
-
updateColgroup(resizeState, _this2.table, tableNode, shouldScaleOnColgroupUpdate,
|
|
575
|
+
updateColgroup(resizeState, _this2.table, tableNode, shouldScaleOnColgroupUpdate, scalePercent);
|
|
561
576
|
});
|
|
562
577
|
}
|
|
563
578
|
}
|
|
@@ -568,8 +583,8 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
|
|
|
568
583
|
}, {
|
|
569
584
|
key: "componentDidUpdate",
|
|
570
585
|
value: function componentDidUpdate(_, prevState) {
|
|
571
|
-
var _this$props$
|
|
572
|
-
_this$props$
|
|
586
|
+
var _this$props$options10,
|
|
587
|
+
_this$props$options11,
|
|
573
588
|
_this$wrapper,
|
|
574
589
|
_this3 = this;
|
|
575
590
|
var _this$props11 = this.props,
|
|
@@ -598,7 +613,7 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
|
|
|
598
613
|
shouldHandleColgroupUpdates = true;
|
|
599
614
|
}
|
|
600
615
|
var isTableScalingWithFixedColumnWidthsOptionEnabled = !!isTableScalingEnabled && tableWithFixedColumnWidthsOption;
|
|
601
|
-
var shouldUseIncreasedScalingPercent = isTableScalingWithFixedColumnWidthsOptionEnabled && fg('platform.editor.table.use-increased-scaling-percent') || !!isTableScalingEnabled && !!((_this$props$
|
|
616
|
+
var shouldUseIncreasedScalingPercent = isTableScalingWithFixedColumnWidthsOptionEnabled && fg('platform.editor.table.use-increased-scaling-percent') || !!isTableScalingEnabled && !!((_this$props$options10 = this.props.options) !== null && _this$props$options10 !== void 0 && _this$props$options10.isCommentEditor);
|
|
602
617
|
if (isTableScalingWithFixedColumnWidthsOptionEnabled && getNode().attrs.displayMode !== 'fixed') {
|
|
603
618
|
shouldScale = true;
|
|
604
619
|
shouldHandleColgroupUpdates = true;
|
|
@@ -609,7 +624,7 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
|
|
|
609
624
|
if (isInDanger && !table) {
|
|
610
625
|
clearHoverSelection()(view.state, view.dispatch);
|
|
611
626
|
}
|
|
612
|
-
if ((_this$props$
|
|
627
|
+
if ((_this$props$options11 = this.props.options) !== null && _this$props$options11 !== void 0 && _this$props$options11.isCommentEditor && options !== null && options !== void 0 && options.isTableResizingEnabled) {
|
|
613
628
|
this.removeInlineTableWidth();
|
|
614
629
|
}
|
|
615
630
|
if ((_this$wrapper = this.wrapper) !== null && _this$wrapper !== void 0 && _this$wrapper.parentElement && this.table && !this.overflowShadowsObserver) {
|
|
@@ -654,7 +669,7 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
|
|
|
654
669
|
var start = getPos() || 0;
|
|
655
670
|
var depth = _view.state.doc.resolve(start).depth;
|
|
656
671
|
shouldScale = depth === 0 && shouldScale;
|
|
657
|
-
insertColgroupFromNode(this.table, currentTable, shouldScale, undefined, shouldUseIncreasedScalingPercent);
|
|
672
|
+
insertColgroupFromNode(this.table, currentTable, shouldScale, undefined, shouldUseIncreasedScalingPercent, options === null || options === void 0 ? void 0 : options.isCommentEditor);
|
|
658
673
|
}
|
|
659
674
|
updateControls()(_view.state);
|
|
660
675
|
}
|
|
@@ -696,7 +711,7 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
|
|
|
696
711
|
key: "render",
|
|
697
712
|
value: function render() {
|
|
698
713
|
var _this4 = this,
|
|
699
|
-
_this$props$
|
|
714
|
+
_this$props$options12,
|
|
700
715
|
_classnames;
|
|
701
716
|
var _this$props12 = this.props,
|
|
702
717
|
view = _this$props12.view,
|
|
@@ -815,7 +830,7 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
|
|
|
815
830
|
stickyScrollbar = _getEditorFeatureFlag8.stickyScrollbar,
|
|
816
831
|
_getEditorFeatureFlag9 = _getEditorFeatureFlag8.tableWithFixedColumnWidthsOption,
|
|
817
832
|
tableWithFixedColumnWidthsOption = _getEditorFeatureFlag9 === void 0 ? false : _getEditorFeatureFlag9;
|
|
818
|
-
var shouldUseIncreasedScalingPercent = !!isTableScalingEnabled && (tableWithFixedColumnWidthsOption && fg('platform.editor.table.use-increased-scaling-percent') || !!((_this$props$
|
|
833
|
+
var shouldUseIncreasedScalingPercent = !!isTableScalingEnabled && (tableWithFixedColumnWidthsOption && fg('platform.editor.table.use-increased-scaling-percent') || !!((_this$props$options12 = this.props.options) !== null && _this$props$options12 !== void 0 && _this$props$options12.isCommentEditor));
|
|
819
834
|
return /*#__PURE__*/React.createElement(TableContainer
|
|
820
835
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
|
|
821
836
|
, {
|
|
@@ -12,7 +12,7 @@ import { TableCssClassName as ClassName } from '../types';
|
|
|
12
12
|
import { ALIGN_CENTER, ALIGN_START } from '../utils/alignment';
|
|
13
13
|
import { getAlignmentStyle } from './table-container-styles';
|
|
14
14
|
import { TableResizer } from './TableResizer';
|
|
15
|
-
|
|
15
|
+
var InnerContainer = /*#__PURE__*/forwardRef(function (_ref, ref) {
|
|
16
16
|
var className = _ref.className,
|
|
17
17
|
style = _ref.style,
|
|
18
18
|
node = _ref.node,
|
|
@@ -319,7 +319,7 @@ export var TableResizer = function TableResizer(_ref) {
|
|
|
319
319
|
prevNode: node,
|
|
320
320
|
start: pos + 1,
|
|
321
321
|
parentWidth: newWidth
|
|
322
|
-
}, editorView.domAtPos.bind(editorView), pluginInjectionApi, isTableScalingEnabled, shouldUseIncreasedScalingPercent || false)(tr);
|
|
322
|
+
}, editorView.domAtPos.bind(editorView), pluginInjectionApi, isTableScalingEnabled, shouldUseIncreasedScalingPercent || false, isCommentEditor)(tr);
|
|
323
323
|
var scaledNode = tr.doc.nodeAt(pos);
|
|
324
324
|
(_attachAnalyticsEvent2 = attachAnalyticsEvent(generateResizedPayload({
|
|
325
325
|
originalNode: node,
|
package/dist/esm/plugin.js
CHANGED
|
@@ -402,7 +402,8 @@ var tablesPlugin = function tablesPlugin(_ref) {
|
|
|
402
402
|
getEditorContainerWidth: defaultGetEditorContainerWidth,
|
|
403
403
|
getEditorFeatureFlags: (options === null || options === void 0 ? void 0 : options.getEditorFeatureFlags) || defaultGetEditorFeatureFlags,
|
|
404
404
|
isChromelessEditor: options === null || options === void 0 ? void 0 : options.isChromelessEditor,
|
|
405
|
-
api: api
|
|
405
|
+
api: api,
|
|
406
|
+
isCommentEditor: options === null || options === void 0 ? void 0 : options.isCommentEditor
|
|
406
407
|
}), (options === null || options === void 0 ? void 0 : options.allowContextualMenu) && /*#__PURE__*/React.createElement(FloatingContextualMenu, {
|
|
407
408
|
editorView: editorView,
|
|
408
409
|
mountPoint: popupsMountPoint,
|
|
@@ -433,7 +434,8 @@ var tablesPlugin = function tablesPlugin(_ref) {
|
|
|
433
434
|
isTableScalingEnabled: options === null || options === void 0 ? void 0 : options.isTableScalingEnabled,
|
|
434
435
|
getEditorFeatureFlags: (options === null || options === void 0 ? void 0 : options.getEditorFeatureFlags) || defaultGetEditorFeatureFlags,
|
|
435
436
|
ariaNotifyPlugin: ariaNotifyPlugin,
|
|
436
|
-
api: api
|
|
437
|
+
api: api,
|
|
438
|
+
isCommentEditor: options === null || options === void 0 ? void 0 : options.isCommentEditor
|
|
437
439
|
}), allowControls && !isDragAndDropEnabled && !isResizing && /*#__PURE__*/React.createElement(FloatingDeleteButton, {
|
|
438
440
|
editorView: editorView,
|
|
439
441
|
selection: editorView.state.selection,
|
|
@@ -1,3 +1,2 @@
|
|
|
1
1
|
export { buildColumnControlsDecorations, maybeUpdateColumnControlsSelectedDecoration } from './column-controls';
|
|
2
|
-
export { buildColumnResizingDecorations, clearColumnResizingDecorations } from './column-resizing';
|
|
3
|
-
export { composeDecorations } from './compose-decorations';
|
|
2
|
+
export { buildColumnResizingDecorations, clearColumnResizingDecorations } from './column-resizing';
|
|
@@ -7,11 +7,11 @@ import { DropTargetType } from './consts';
|
|
|
7
7
|
import { createCommand, getPluginState } from './plugin-factory';
|
|
8
8
|
import { pluginKey } from './plugin-key';
|
|
9
9
|
// TODO: This command is a placeholder example. Please replace this if required.
|
|
10
|
-
|
|
10
|
+
var getDecorations = function getDecorations(state) {
|
|
11
11
|
var _pluginKey$getState;
|
|
12
12
|
return ((_pluginKey$getState = pluginKey.getState(state)) === null || _pluginKey$getState === void 0 ? void 0 : _pluginKey$getState.decorationSet) || DecorationSet.empty;
|
|
13
13
|
};
|
|
14
|
-
|
|
14
|
+
var updatePluginStateDecorations = function updatePluginStateDecorations(state, decorations, key) {
|
|
15
15
|
return updateDecorations(state.doc, getDecorations(state), decorations, key);
|
|
16
16
|
};
|
|
17
17
|
export var setDropTarget = function setDropTarget(type, index, hasMergedCells, tr) {
|
|
@@ -159,10 +159,13 @@ var destroyFn = function destroyFn(editorView, editorAnalyticsAPI, isTableScalin
|
|
|
159
159
|
if (isTableScalingWithFixedColumnWidthsOptionEnabled) {
|
|
160
160
|
isTableScalingEnabledOnCurrentTable = tableNode.attrs.displayMode !== 'fixed';
|
|
161
161
|
}
|
|
162
|
+
if (isTableScalingEnabled && isCommentEditor) {
|
|
163
|
+
isTableScalingEnabledOnCurrentTable = true;
|
|
164
|
+
}
|
|
162
165
|
var shouldUseIncreasedScalingPercent = isTableScalingWithFixedColumnWidthsOptionEnabled && fg('platform.editor.table.use-increased-scaling-percent') ||
|
|
163
166
|
// When in comment editor, we need the scaling percent to be 40% while tableWithFixedColumnWidthsOption is not visible
|
|
164
167
|
isTableScalingEnabled && isCommentEditor;
|
|
165
|
-
insertColgroupFromNode(tableRef, tableNode, isTableScalingEnabledOnCurrentTable, undefined, shouldUseIncreasedScalingPercent);
|
|
168
|
+
insertColgroupFromNode(tableRef, tableNode, isTableScalingEnabledOnCurrentTable, undefined, shouldUseIncreasedScalingPercent, isCommentEditor);
|
|
166
169
|
}
|
|
167
170
|
}
|
|
168
171
|
editorView.focus();
|
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
|
|
7
7
|
import { PluginKey } from '@atlaskit/editor-prosemirror/state';
|
|
8
8
|
import { Decoration, DecorationSet } from '@atlaskit/editor-prosemirror/view';
|
|
9
|
-
|
|
9
|
+
var tableSafariDeleteCompositionTextIssueWorkaroundKey = new PluginKey('tableSafariDeleteCompositionTextIssueWorkaround');
|
|
10
10
|
export var createPlugin = function createPlugin() {
|
|
11
11
|
return new SafePlugin({
|
|
12
12
|
key: tableSafariDeleteCompositionTextIssueWorkaroundKey,
|
|
@@ -7,7 +7,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
|
|
|
7
7
|
import { ACTION_SUBJECT, EVENT_TYPE, TABLE_ACTION, TABLE_OVERFLOW_CHANGE_TRIGGER } from '@atlaskit/editor-common/analytics';
|
|
8
8
|
import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
|
|
9
9
|
import { PluginKey } from '@atlaskit/editor-prosemirror/state';
|
|
10
|
-
|
|
10
|
+
var pluginKey = new PluginKey('tableOverflowAnalyticsPlugin');
|
|
11
11
|
export var META_KEYS = {
|
|
12
12
|
OVERFLOW_TRIGGER: 'tableOverflowTrigger',
|
|
13
13
|
OVERFLOW_STATE_CHANGED: 'tableOverflowStateChanged'
|
|
@@ -72,7 +72,7 @@ export var setDragging = function setDragging(dragging, tr) {
|
|
|
72
72
|
return (tr || originalTr).setMeta('is-resizer-resizing', true);
|
|
73
73
|
});
|
|
74
74
|
};
|
|
75
|
-
|
|
75
|
+
var setLastClick = function setLastClick(lastClick, transform) {
|
|
76
76
|
return createCommand({
|
|
77
77
|
type: 'SET_LAST_CLICK',
|
|
78
78
|
data: {
|
|
@@ -16,8 +16,11 @@ import { META_KEYS } from '../table-analytics';
|
|
|
16
16
|
import { evenColumns, setDragging, stopResizing } from './commands';
|
|
17
17
|
import { getPluginState } from './plugin-factory';
|
|
18
18
|
import { currentColWidth, getResizeState, getTableMaxWidth, pointsAtCell, resizeColumn, resizeColumnAndTable, updateControls } from './utils';
|
|
19
|
+
import { TABLE_OFFSET_IN_COMMENT_EDITOR } from './utils/consts';
|
|
20
|
+
import { getScalingPercentForTableWithoutWidth, getTableScalingPercent } from './utils/misc';
|
|
19
21
|
import { scaleResizeState } from './utils/resize-column';
|
|
20
22
|
export var handleMouseDown = function handleMouseDown(view, event, localResizeHandlePos, getEditorContainerWidth, getEditorFeatureFlags, isTableScalingEnabled, api, editorAnalyticsAPI, isNewColumnResizingEnabled, isTableAlignmentEnabled, isCommentEditor) {
|
|
23
|
+
var _originalTable$attrs;
|
|
21
24
|
var state = view.state,
|
|
22
25
|
dispatch = view.dispatch;
|
|
23
26
|
var editorDisabled = !view.editable;
|
|
@@ -47,13 +50,18 @@ export var handleMouseDown = function handleMouseDown(view, event, localResizeHa
|
|
|
47
50
|
if (dom && dom.nodeName !== 'TABLE') {
|
|
48
51
|
dom = dom.closest('table');
|
|
49
52
|
}
|
|
50
|
-
var maxSize =
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
53
|
+
var maxSize = 0;
|
|
54
|
+
if (isTableScalingEnabled && isCommentEditor && !((_originalTable$attrs = originalTable.attrs) !== null && _originalTable$attrs !== void 0 && _originalTable$attrs.width)) {
|
|
55
|
+
maxSize = editorWidth - TABLE_OFFSET_IN_COMMENT_EDITOR;
|
|
56
|
+
} else {
|
|
57
|
+
maxSize = getTableMaxWidth({
|
|
58
|
+
table: originalTable,
|
|
59
|
+
tableStart: start,
|
|
60
|
+
state: state,
|
|
61
|
+
layout: originalTable.attrs.layout,
|
|
62
|
+
getEditorContainerWidth: getEditorContainerWidth
|
|
63
|
+
});
|
|
64
|
+
}
|
|
57
65
|
var shouldScale = tableDepth === 0 && isTableScalingEnabled;
|
|
58
66
|
var _getEditorFeatureFlag = getEditorFeatureFlags(),
|
|
59
67
|
_getEditorFeatureFlag2 = _getEditorFeatureFlag.tableWithFixedColumnWidthsOption,
|
|
@@ -62,6 +70,11 @@ export var handleMouseDown = function handleMouseDown(view, event, localResizeHa
|
|
|
62
70
|
if (isTableScalingWithFixedColumnWidthsOptionEnabled) {
|
|
63
71
|
shouldScale = shouldScale && originalTable.attrs.displayMode !== 'fixed';
|
|
64
72
|
}
|
|
73
|
+
var shouldUseIncreasedScalingPercent = isTableScalingWithFixedColumnWidthsOptionEnabled && fg('platform.editor.table.use-increased-scaling-percent');
|
|
74
|
+
if (isTableScalingEnabled && isCommentEditor) {
|
|
75
|
+
shouldScale = tableDepth === 0;
|
|
76
|
+
shouldUseIncreasedScalingPercent = true;
|
|
77
|
+
}
|
|
65
78
|
var resizeState = getResizeState({
|
|
66
79
|
minWidth: tableCellMinWidth,
|
|
67
80
|
maxSize: maxSize,
|
|
@@ -70,9 +83,8 @@ export var handleMouseDown = function handleMouseDown(view, event, localResizeHa
|
|
|
70
83
|
start: start,
|
|
71
84
|
domAtPos: domAtPos,
|
|
72
85
|
isTableScalingEnabled: shouldScale,
|
|
73
|
-
shouldUseIncreasedScalingPercent:
|
|
74
|
-
|
|
75
|
-
isTableScalingEnabled && !!isCommentEditor
|
|
86
|
+
shouldUseIncreasedScalingPercent: shouldUseIncreasedScalingPercent,
|
|
87
|
+
isCommentEditor: isCommentEditor || false
|
|
76
88
|
});
|
|
77
89
|
if (evenColumns({
|
|
78
90
|
resizeState: resizeState,
|
|
@@ -101,7 +113,8 @@ export var handleMouseDown = function handleMouseDown(view, event, localResizeHa
|
|
|
101
113
|
resizeState: resizeState,
|
|
102
114
|
tableRef: dom,
|
|
103
115
|
tableNode: originalTable,
|
|
104
|
-
editorWidth: editorWidth
|
|
116
|
+
editorWidth: editorWidth,
|
|
117
|
+
shouldUseIncreasedScalingPercent: shouldUseIncreasedScalingPercent
|
|
105
118
|
});
|
|
106
119
|
}
|
|
107
120
|
function finish(event) {
|
|
@@ -161,7 +174,7 @@ export var handleMouseDown = function handleMouseDown(view, event, localResizeHa
|
|
|
161
174
|
_shouldScale = _shouldScale && originalTable.attrs.displayMode !== 'fixed';
|
|
162
175
|
}
|
|
163
176
|
var resizedDelta = clientX - startX;
|
|
164
|
-
var
|
|
177
|
+
var _shouldUseIncreasedScalingPercent = isTableScalingWithFixedColumnWidthsOptionEnabled && fg('platform.editor.table.use-increased-scaling-percent') || isTableScalingEnabled && !!isCommentEditor;
|
|
165
178
|
if (isNewColumnResizingEnabled && !isTableNested(state, tablePos)) {
|
|
166
179
|
var newResizeState = resizeColumnAndTable({
|
|
167
180
|
resizeState: resizeState,
|
|
@@ -201,7 +214,9 @@ export var handleMouseDown = function handleMouseDown(view, event, localResizeHa
|
|
|
201
214
|
tr.setNodeAttribute(start - 1, 'width', newResizeState.maxSize);
|
|
202
215
|
}
|
|
203
216
|
} else {
|
|
204
|
-
var
|
|
217
|
+
var _table$attrs;
|
|
218
|
+
var scalePercent = isTableScalingEnabled && isCommentEditor && !((_table$attrs = table.attrs) !== null && _table$attrs !== void 0 && _table$attrs.width) ? getScalingPercentForTableWithoutWidth(originalTable, dom) : getTableScalingPercent(originalTable, dom, _shouldUseIncreasedScalingPercent);
|
|
219
|
+
var _newResizeState = resizeColumn(resizeState, colIndex, resizedDelta, dom, originalTable, resizingSelectedColumns ? selectedColumns : undefined, _shouldScale, scalePercent);
|
|
205
220
|
tr = updateColumnWidths(_newResizeState, table, start, api)(tr);
|
|
206
221
|
}
|
|
207
222
|
if (colIndex === map.width - 1) {
|
|
@@ -271,7 +286,7 @@ export var handleMouseDown = function handleMouseDown(view, event, localResizeHa
|
|
|
271
286
|
shouldScale = shouldScale && originalTable.attrs.displayMode !== 'fixed';
|
|
272
287
|
}
|
|
273
288
|
var resizedDelta = clientX - dragging.startX;
|
|
274
|
-
if (isNewColumnResizingEnabled && !isTableNested(state, tablePos)) {
|
|
289
|
+
if (isNewColumnResizingEnabled && !isTableNested(state, tablePos) && !isCommentEditor) {
|
|
275
290
|
resizeColumnAndTable({
|
|
276
291
|
resizeState: resizeState,
|
|
277
292
|
colIndex: colIndex,
|
|
@@ -283,7 +298,10 @@ export var handleMouseDown = function handleMouseDown(view, event, localResizeHa
|
|
|
283
298
|
isTableAlignmentEnabled: isTableAlignmentEnabled
|
|
284
299
|
});
|
|
285
300
|
} else {
|
|
286
|
-
|
|
301
|
+
var _table$attrs2;
|
|
302
|
+
var scalePercent = isTableScalingEnabled && isCommentEditor && !((_table$attrs2 = table.attrs) !== null && _table$attrs2 !== void 0 && _table$attrs2.width) ? getScalingPercentForTableWithoutWidth(table, dom) : getTableScalingPercent(originalTable, dom, shouldUseIncreasedScalingPercent);
|
|
303
|
+
// This function is called for Full-page/Fixed-page tables and table that have width attr value in Comment editor
|
|
304
|
+
resizeColumn(resizeState, colIndex, resizedDelta, dom, table, undefined, shouldScale, scalePercent);
|
|
287
305
|
}
|
|
288
306
|
updateControls()(state);
|
|
289
307
|
}
|
|
@@ -3,7 +3,7 @@ import { tableCellMinWidth } from '@atlaskit/editor-common/styles';
|
|
|
3
3
|
import { getFragmentBackingArray } from '@atlaskit/editor-common/utils';
|
|
4
4
|
import { DOMSerializer } from '@atlaskit/editor-prosemirror/model';
|
|
5
5
|
import { TableMap } from '@atlaskit/editor-tables/table-map';
|
|
6
|
-
import { getTableScalingPercent } from './misc';
|
|
6
|
+
import { getScalingPercentForTableWithoutWidth, getTableScalingPercent } from './misc';
|
|
7
7
|
/**
|
|
8
8
|
* This ensures the combined width of the columns (and tbody) of table is always smaller or equal
|
|
9
9
|
* than the table and table wrapper elements. This is necessary as there is no longer
|
|
@@ -13,7 +13,7 @@ import { getTableScalingPercent } from './misc';
|
|
|
13
13
|
export var getColWidthFix = function getColWidthFix(colwidth, tableColumnCount) {
|
|
14
14
|
return colwidth - 1 / tableColumnCount;
|
|
15
15
|
};
|
|
16
|
-
export var generateColgroup = function generateColgroup(table, tableRef, shouldUseIncreasedScalingPercent) {
|
|
16
|
+
export var generateColgroup = function generateColgroup(table, tableRef, shouldUseIncreasedScalingPercent, isCommentEditor) {
|
|
17
17
|
var cols = [];
|
|
18
18
|
var map = TableMap.get(table);
|
|
19
19
|
table.content.firstChild.content.forEach(function (cell) {
|
|
@@ -22,7 +22,14 @@ export var generateColgroup = function generateColgroup(table, tableRef, shouldU
|
|
|
22
22
|
// We slice here to guard against our colwidth array having more entries
|
|
23
23
|
// Than the we actually span. We'll patch the document at a later point.
|
|
24
24
|
if (tableRef) {
|
|
25
|
-
var
|
|
25
|
+
var _table$attrs;
|
|
26
|
+
// if we have tableRef here, isTableScalingEnabled is true
|
|
27
|
+
var scalePercent = 1;
|
|
28
|
+
if (isCommentEditor && !((_table$attrs = table.attrs) !== null && _table$attrs !== void 0 && _table$attrs.width)) {
|
|
29
|
+
scalePercent = getScalingPercentForTableWithoutWidth(table, tableRef);
|
|
30
|
+
} else {
|
|
31
|
+
scalePercent = getTableScalingPercent(table, tableRef, shouldUseIncreasedScalingPercent);
|
|
32
|
+
}
|
|
26
33
|
cell.attrs.colwidth.slice(0, colspan).forEach(function (width) {
|
|
27
34
|
var fixedColWidth = getColWidthFix(width, map.width);
|
|
28
35
|
var scaledWidth = fixedColWidth * scalePercent;
|
|
@@ -57,11 +64,12 @@ export var insertColgroupFromNode = function insertColgroupFromNode(tableRef, ta
|
|
|
57
64
|
var isTableScalingEnabled = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
|
|
58
65
|
var shouldRemove = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
|
|
59
66
|
var shouldUseIncreasedScalingPercent = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
|
|
67
|
+
var isCommentEditor = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : false;
|
|
60
68
|
var colgroup = tableRef === null || tableRef === void 0 ? void 0 : tableRef.querySelector('colgroup');
|
|
61
69
|
if (colgroup && shouldRemove) {
|
|
62
70
|
tableRef === null || tableRef === void 0 || tableRef.removeChild(colgroup);
|
|
63
71
|
}
|
|
64
|
-
colgroup = renderColgroupFromNode(table, isTableScalingEnabled ? tableRef !== null && tableRef !== void 0 ? tableRef : undefined : undefined, shouldUseIncreasedScalingPercent);
|
|
72
|
+
colgroup = renderColgroupFromNode(table, isTableScalingEnabled ? tableRef !== null && tableRef !== void 0 ? tableRef : undefined : undefined, shouldUseIncreasedScalingPercent, isCommentEditor);
|
|
65
73
|
if (shouldRemove) {
|
|
66
74
|
tableRef === null || tableRef === void 0 || tableRef.insertBefore(colgroup, tableRef === null || tableRef === void 0 ? void 0 : tableRef.firstChild);
|
|
67
75
|
}
|
|
@@ -72,6 +80,7 @@ export var hasTableBeenResized = function hasTableBeenResized(table) {
|
|
|
72
80
|
return cell.attrs.colwidth;
|
|
73
81
|
});
|
|
74
82
|
};
|
|
83
|
+
export var hasTableColumnBeenResized = hasTableBeenResized;
|
|
75
84
|
|
|
76
85
|
/**
|
|
77
86
|
* Check if a table has all the column width set to tableCellMinWidth(48px) or null
|
|
@@ -86,8 +95,8 @@ export var isMinCellWidthTable = function isMinCellWidthTable(table) {
|
|
|
86
95
|
});
|
|
87
96
|
return isTableMinCellWidth;
|
|
88
97
|
};
|
|
89
|
-
function renderColgroupFromNode(table, maybeTableRef, shouldUseIncreasedScalingPercent) {
|
|
90
|
-
var rendered = DOMSerializer.renderSpec(document, ['colgroup', {}].concat(_toConsumableArray(generateColgroup(table, maybeTableRef, shouldUseIncreasedScalingPercent))));
|
|
98
|
+
function renderColgroupFromNode(table, maybeTableRef, shouldUseIncreasedScalingPercent, isCommentEditor) {
|
|
99
|
+
var rendered = DOMSerializer.renderSpec(document, ['colgroup', {}].concat(_toConsumableArray(generateColgroup(table, maybeTableRef, shouldUseIncreasedScalingPercent, isCommentEditor))));
|
|
91
100
|
return rendered.dom;
|
|
92
101
|
}
|
|
93
102
|
export var getColgroupChildrenLength = function getColgroupChildrenLength(table) {
|
|
@@ -63,7 +63,7 @@ export var updateStickyMargins = function updateStickyMargins(table) {
|
|
|
63
63
|
var firstRowHeight = row.getBoundingClientRect().height - paddingTop - tableCellBorderWidth;
|
|
64
64
|
table.style.marginTop = "".concat(tableMarginTop + firstRowHeight, "px");
|
|
65
65
|
};
|
|
66
|
-
|
|
66
|
+
var applyColWidthsToStickyRow = function applyColWidthsToStickyRow(colGroup, headerRow) {
|
|
67
67
|
// sync column widths for the sticky row
|
|
68
68
|
var newCols = colWidthsForRow(headerRow);
|
|
69
69
|
if (newCols) {
|
|
@@ -81,7 +81,7 @@ export var syncStickyRowToTable = function syncStickyRowToTable(tableRef) {
|
|
|
81
81
|
applyColWidthsToStickyRow(tableRef.querySelector('colgroup'), headerRow);
|
|
82
82
|
applyTableWidthToStickyRow(tableRef, headerRow);
|
|
83
83
|
};
|
|
84
|
-
|
|
84
|
+
var applyTableWidthToStickyRow = function applyTableWidthToStickyRow(tableRef, headerRow) {
|
|
85
85
|
var tbody = tableRef.querySelector('tbody');
|
|
86
86
|
var wrapper = tableRef.parentElement;
|
|
87
87
|
if (tbody && wrapper) {
|
|
@@ -1,10 +1,9 @@
|
|
|
1
1
|
export { generateColgroup, insertColgroupFromNode, hasTableBeenResized, getColgroupChildrenLength } from './colgroup';
|
|
2
2
|
export { contentWidth } from './content-width';
|
|
3
|
-
export {
|
|
4
|
-
export {
|
|
5
|
-
export {
|
|
6
|
-
export { getLayoutSize, getDefaultLayoutMaxWidth, pointsAtCell, currentColWidth, domCellAround, getTableMaxWidth, getTableElementWidth, getTableContainerElementWidth } from './misc';
|
|
3
|
+
export { getCellsRefsInColumn, calculateColumnWidth } from './column-state';
|
|
4
|
+
export { getResizeState, updateColgroup, evenAllColumnsWidths } from './resize-state';
|
|
5
|
+
export { getLayoutSize, pointsAtCell, currentColWidth, getTableMaxWidth, getTableElementWidth, getTableContainerElementWidth } from './misc';
|
|
7
6
|
export { updateControls, isClickNear, getResizeCellPos } from './dom';
|
|
8
|
-
export {
|
|
7
|
+
export { scaleTable, previewScaleTable } from './scale-table';
|
|
9
8
|
export { resizeColumn, resizeColumnAndTable } from './resize-column';
|
|
10
|
-
export { COLUMN_MIN_WIDTH, TABLE_MAX_WIDTH,
|
|
9
|
+
export { COLUMN_MIN_WIDTH, TABLE_MAX_WIDTH, TABLE_OFFSET_IN_COMMENT_EDITOR } from './consts';
|
|
@@ -1,9 +1,8 @@
|
|
|
1
1
|
import { getParentNodeWidth, getTableContainerWidth, layoutToWidth } from '@atlaskit/editor-common/node-width';
|
|
2
2
|
import { calcTableWidth } from '@atlaskit/editor-common/styles';
|
|
3
|
-
import {
|
|
4
|
-
import { calcTableColumnWidths, containsClassName } from '@atlaskit/editor-common/utils';
|
|
3
|
+
import { calcTableColumnWidths } from '@atlaskit/editor-common/utils';
|
|
5
4
|
import { akEditorFullWidthLayoutWidth, akEditorGutterPaddingDynamic, akEditorTableNumberColumnWidth } from '@atlaskit/editor-shared-styles';
|
|
6
|
-
import { hasTableBeenResized } from './colgroup';
|
|
5
|
+
import { hasTableBeenResized, hasTableColumnBeenResized } from './colgroup';
|
|
7
6
|
import { MAX_SCALING_PERCENT, MAX_SCALING_PERCENT_TABLES_WITH_FIXED_COLUMN_WIDTHS_OPTION } from './consts';
|
|
8
7
|
|
|
9
8
|
// Translates named layouts in number values.
|
|
@@ -20,9 +19,6 @@ export function getLayoutSize(tableLayout) {
|
|
|
20
19
|
}
|
|
21
20
|
return layoutToWidth[tableLayout] || containerWidth;
|
|
22
21
|
}
|
|
23
|
-
export function getDefaultLayoutMaxWidth(containerWidth) {
|
|
24
|
-
return mapBreakpointToLayoutMaxWidth(getBreakpoint(containerWidth));
|
|
25
|
-
}
|
|
26
22
|
|
|
27
23
|
// Does the current position point at a cell.
|
|
28
24
|
export function pointsAtCell($pos) {
|
|
@@ -50,14 +46,6 @@ export function currentColWidth(view, cellPos, _ref) {
|
|
|
50
46
|
}
|
|
51
47
|
return domWidth / parts;
|
|
52
48
|
}
|
|
53
|
-
|
|
54
|
-
// Attempts to find a parent TD/TH depending on target element.
|
|
55
|
-
export function domCellAround(target) {
|
|
56
|
-
while (target && target.nodeName !== 'TD' && target.nodeName !== 'TH') {
|
|
57
|
-
target = containsClassName(target, 'ProseMirror') ? null : target.parentNode;
|
|
58
|
-
}
|
|
59
|
-
return target;
|
|
60
|
-
}
|
|
61
49
|
export var getTableMaxWidth = function getTableMaxWidth(_ref2) {
|
|
62
50
|
var table = _ref2.table,
|
|
63
51
|
tableStart = _ref2.tableStart,
|
|
@@ -100,6 +88,28 @@ export var getTableScalingPercent = function getTableScalingPercent(table, table
|
|
|
100
88
|
scalePercent = Math.max(scalePercent, 1 - maxScalingPercent);
|
|
101
89
|
return Math.min(scalePercent, 1);
|
|
102
90
|
};
|
|
91
|
+
|
|
92
|
+
// This function is used to default and full-width tables in Comment/Chromeless editors
|
|
93
|
+
// These tables don't have node.attrs.width set. Their pm-table-wrapper width depend on the editor container width.
|
|
94
|
+
// actual table node width can be calculated as sum of colwidth values if table's columns were resized.
|
|
95
|
+
// If colwidth are not set, table columns are not resized, they all are equal widths.
|
|
96
|
+
export var getScalingPercentForTableWithoutWidth = function getScalingPercentForTableWithoutWidth(table, tableRef) {
|
|
97
|
+
// are table columns resized
|
|
98
|
+
if (hasTableColumnBeenResized(table)) {
|
|
99
|
+
var _tableRef$parentEleme2;
|
|
100
|
+
var tableWidth = calcTableColumnWidths(table).reduce(function (sum, width) {
|
|
101
|
+
return sum + width;
|
|
102
|
+
}, 0);
|
|
103
|
+
var renderWidth = (tableRef === null || tableRef === void 0 || (_tableRef$parentEleme2 = tableRef.parentElement) === null || _tableRef$parentEleme2 === void 0 ? void 0 : _tableRef$parentEleme2.clientWidth) || tableWidth;
|
|
104
|
+
|
|
105
|
+
// minus 1 here to avoid any 1px scroll in Firefox
|
|
106
|
+
return (renderWidth - 1) / tableWidth;
|
|
107
|
+
}
|
|
108
|
+
|
|
109
|
+
// When table cols are not resized and table width is not set,
|
|
110
|
+
// tableWidth is equal to renderWidth
|
|
111
|
+
return 1;
|
|
112
|
+
};
|
|
103
113
|
export var getStaticTableScalingPercent = function getStaticTableScalingPercent(table, tableRenderWidth, shouldUseIncreasedScalingPercent) {
|
|
104
114
|
var maxScalingPercent = shouldUseIncreasedScalingPercent ? MAX_SCALING_PERCENT_TABLES_WITH_FIXED_COLUMN_WIDTHS_OPTION : MAX_SCALING_PERCENT;
|
|
105
115
|
var tableWidth = getTableContainerElementWidth(table);
|
|
@@ -11,15 +11,13 @@ import { growColumn, shrinkColumn, updateAffectedColumn } from './resize-logic';
|
|
|
11
11
|
import { updateColgroup } from './resize-state';
|
|
12
12
|
export var resizeColumn = function resizeColumn(resizeState, colIndex, amount, tableRef, tableNode, selectedColumns) {
|
|
13
13
|
var isTableScalingEnabled = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : false;
|
|
14
|
-
var
|
|
15
|
-
var scalePercent = 1;
|
|
14
|
+
var scalePercent = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : 1;
|
|
16
15
|
var resizeAmount = amount;
|
|
17
16
|
if (isTableScalingEnabled) {
|
|
18
|
-
scalePercent = getTableScalingPercent(tableNode, tableRef, shouldUseIncreasedScalingPercent);
|
|
19
17
|
resizeAmount = amount / scalePercent;
|
|
20
18
|
}
|
|
21
19
|
var newState = resizeAmount > 0 ? growColumn(resizeState, colIndex, resizeAmount, selectedColumns) : resizeAmount < 0 ? shrinkColumn(resizeState, colIndex, resizeAmount, selectedColumns) : resizeState;
|
|
22
|
-
updateColgroup(newState, tableRef, tableNode, isTableScalingEnabled,
|
|
20
|
+
updateColgroup(newState, tableRef, tableNode, isTableScalingEnabled, scalePercent);
|
|
23
21
|
return newState;
|
|
24
22
|
};
|
|
25
23
|
export var resizeColumnAndTable = function resizeColumnAndTable(_ref) {
|
|
@@ -70,7 +68,7 @@ export var resizeColumnAndTable = function resizeColumnAndTable(_ref) {
|
|
|
70
68
|
isNumberColumnEnabled ? resizeState.maxSize + akEditorTableNumberColumnWidth + delta : resizeState.maxSize + delta);
|
|
71
69
|
|
|
72
70
|
// do not apply scaling logic because resize state is already scaled
|
|
73
|
-
updateColgroup(newState, tableRef, tableNode, false,
|
|
71
|
+
updateColgroup(newState, tableRef, tableNode, false, 1);
|
|
74
72
|
updateTablePreview(tableRef, newState.maxSize, shouldChangeAlignmentToCenterResized(isTableAlignmentEnabled, tableNode, lineLength, newState.maxSize));
|
|
75
73
|
return newState;
|
|
76
74
|
};
|
|
@@ -98,7 +96,8 @@ export var scaleResizeState = function scaleResizeState(_ref2) {
|
|
|
98
96
|
var resizeState = _ref2.resizeState,
|
|
99
97
|
tableRef = _ref2.tableRef,
|
|
100
98
|
tableNode = _ref2.tableNode,
|
|
101
|
-
editorWidth = _ref2.editorWidth
|
|
99
|
+
editorWidth = _ref2.editorWidth,
|
|
100
|
+
shouldUseIncreasedScalingPercent = _ref2.shouldUseIncreasedScalingPercent;
|
|
102
101
|
var isNumberColumnEnabled = tableNode.attrs.isNumberColumnEnabled;
|
|
103
102
|
var isTableScaled = isNumberColumnEnabled || resizeState.maxSize > getEditorContainerWidth(editorWidth);
|
|
104
103
|
|
|
@@ -111,7 +110,7 @@ export var scaleResizeState = function scaleResizeState(_ref2) {
|
|
|
111
110
|
if (!isTableScaled || isNumberColumnEnabled && resizeState.maxSize > resizeState.tableWidth) {
|
|
112
111
|
return resizeState;
|
|
113
112
|
}
|
|
114
|
-
var scalePercent = getTableScalingPercent(tableNode, tableRef);
|
|
113
|
+
var scalePercent = getTableScalingPercent(tableNode, tableRef, shouldUseIncreasedScalingPercent);
|
|
115
114
|
var scaledTableWidth = Math.round(resizeState.tableWidth * scalePercent);
|
|
116
115
|
var cols = resizeState.cols.map(function (col) {
|
|
117
116
|
return _objectSpread(_objectSpread({}, col), {}, {
|