@atlaskit/editor-plugin-block-controls 2.13.28 → 2.13.30
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 +20 -0
- package/dist/cjs/{plugin.js → blockControlsPlugin.js} +3 -3
- package/dist/cjs/{commands → editor-commands}/move-node.js +5 -5
- package/dist/cjs/{commands → editor-commands}/move-to-layout.js +4 -4
- package/dist/cjs/{commands → editor-commands}/show-drag-handle.js +1 -1
- package/dist/cjs/index.js +2 -2
- package/dist/cjs/pm-plugins/decorations-anchor.js +3 -4
- package/dist/cjs/pm-plugins/decorations-drop-target.js +9 -10
- package/dist/cjs/pm-plugins/handle-mouse-over.js +2 -3
- package/dist/cjs/pm-plugins/keymap.js +3 -3
- package/dist/cjs/pm-plugins/main.js +6 -7
- package/dist/cjs/{utils → pm-plugins/utils}/active-anchor-tracker.js +2 -2
- package/dist/cjs/{consts.js → pm-plugins/utils/consts.js} +2 -2
- package/dist/cjs/{utils → pm-plugins/utils}/drag-handle-positions.js +1 -1
- package/dist/cjs/{utils → pm-plugins/utils}/inline-drop-target.js +5 -5
- package/dist/cjs/{utils → pm-plugins/utils}/remove-from-source.js +1 -1
- package/dist/cjs/{utils → pm-plugins/utils}/update-column-widths.js +1 -1
- package/dist/cjs/{utils → pm-plugins/utils}/validation.js +1 -2
- package/dist/cjs/ui/consts.js +3 -3
- package/dist/cjs/ui/drag-handle.js +7 -8
- package/dist/cjs/ui/drop-target-layout.js +3 -3
- package/dist/cjs/ui/drop-target-v2.js +5 -6
- package/dist/cjs/ui/drop-target.js +2 -2
- package/dist/cjs/ui/inline-drop-target.js +10 -11
- package/dist/es2019/{plugin.js → blockControlsPlugin.js} +3 -3
- package/dist/es2019/{commands → editor-commands}/move-node.js +5 -5
- package/dist/es2019/{commands → editor-commands}/move-to-layout.js +4 -4
- package/dist/es2019/{commands → editor-commands}/show-drag-handle.js +1 -1
- package/dist/es2019/index.js +1 -1
- package/dist/es2019/pm-plugins/decorations-anchor.js +3 -4
- package/dist/es2019/pm-plugins/decorations-drop-target.js +4 -5
- package/dist/es2019/pm-plugins/handle-mouse-over.js +2 -3
- package/dist/es2019/pm-plugins/keymap.js +3 -3
- package/dist/es2019/pm-plugins/main.js +6 -7
- package/dist/es2019/{utils → pm-plugins/utils}/active-anchor-tracker.js +2 -2
- package/dist/es2019/{consts.js → pm-plugins/utils/consts.js} +2 -2
- package/dist/es2019/{utils → pm-plugins/utils}/drag-handle-positions.js +1 -1
- package/dist/es2019/{utils → pm-plugins/utils}/inline-drop-target.js +5 -5
- package/dist/es2019/{utils → pm-plugins/utils}/remove-from-source.js +1 -1
- package/dist/es2019/{utils → pm-plugins/utils}/update-column-widths.js +1 -1
- package/dist/es2019/{utils → pm-plugins/utils}/validation.js +1 -2
- package/dist/es2019/ui/consts.js +3 -3
- package/dist/es2019/ui/drag-handle.js +7 -8
- package/dist/es2019/ui/drop-target-layout.js +3 -3
- package/dist/es2019/ui/drop-target-v2.js +5 -6
- package/dist/es2019/ui/drop-target.js +2 -2
- package/dist/es2019/ui/inline-drop-target.js +10 -11
- package/dist/esm/{plugin.js → blockControlsPlugin.js} +3 -3
- package/dist/esm/{commands → editor-commands}/move-node.js +5 -5
- package/dist/esm/{commands → editor-commands}/move-to-layout.js +4 -4
- package/dist/esm/{commands → editor-commands}/show-drag-handle.js +1 -1
- package/dist/esm/index.js +1 -1
- package/dist/esm/pm-plugins/decorations-anchor.js +3 -4
- package/dist/esm/pm-plugins/decorations-drop-target.js +4 -5
- package/dist/esm/pm-plugins/handle-mouse-over.js +2 -3
- package/dist/esm/pm-plugins/keymap.js +3 -3
- package/dist/esm/pm-plugins/main.js +6 -7
- package/dist/esm/{utils → pm-plugins/utils}/active-anchor-tracker.js +2 -2
- package/dist/esm/{consts.js → pm-plugins/utils/consts.js} +2 -2
- package/dist/esm/{utils → pm-plugins/utils}/drag-handle-positions.js +1 -1
- package/dist/esm/{utils → pm-plugins/utils}/inline-drop-target.js +5 -5
- package/dist/esm/{utils → pm-plugins/utils}/remove-from-source.js +1 -1
- package/dist/esm/{utils → pm-plugins/utils}/update-column-widths.js +1 -1
- package/dist/esm/{utils → pm-plugins/utils}/validation.js +1 -2
- package/dist/esm/ui/consts.js +3 -3
- package/dist/esm/ui/drag-handle.js +7 -8
- package/dist/esm/ui/drop-target-layout.js +3 -3
- package/dist/esm/ui/drop-target-v2.js +5 -6
- package/dist/esm/ui/drop-target.js +2 -2
- package/dist/esm/ui/inline-drop-target.js +10 -11
- package/dist/types/blockControlsPlugin.d.ts +2 -0
- package/dist/types/{commands → editor-commands}/move-node.d.ts +2 -2
- package/dist/types/{commands → editor-commands}/move-to-layout.d.ts +1 -1
- package/dist/types/{commands → editor-commands}/show-drag-handle.d.ts +1 -1
- package/dist/types/index.d.ts +2 -2
- package/dist/types/pm-plugins/decorations-drag-handle.d.ts +1 -1
- package/dist/types/pm-plugins/decorations-drop-target.d.ts +2 -2
- package/dist/types/pm-plugins/handle-mouse-over.d.ts +1 -1
- package/dist/types/pm-plugins/keymap.d.ts +1 -1
- package/dist/types/pm-plugins/main.d.ts +2 -2
- package/dist/types/{utils → pm-plugins/utils}/active-anchor-tracker.d.ts +1 -1
- package/dist/types/{consts.d.ts → pm-plugins/utils/consts.d.ts} +1 -1
- package/dist/{types-ts4.5 → types/pm-plugins}/utils/inline-drop-target.d.ts +1 -1
- package/dist/types/ui/drag-handle-menu.d.ts +1 -1
- package/dist/types/ui/drag-handle.d.ts +1 -1
- package/dist/types/ui/drop-target-layout.d.ts +2 -2
- package/dist/types/ui/drop-target-v2.d.ts +1 -1
- package/dist/types/ui/drop-target.d.ts +1 -1
- package/dist/types/ui/inline-drop-target.d.ts +1 -1
- package/dist/types-ts4.5/blockControlsPlugin.d.ts +2 -0
- package/dist/types-ts4.5/{commands → editor-commands}/move-node.d.ts +2 -2
- package/dist/types-ts4.5/{commands → editor-commands}/move-to-layout.d.ts +1 -1
- package/dist/types-ts4.5/{commands → editor-commands}/show-drag-handle.d.ts +1 -1
- package/dist/types-ts4.5/index.d.ts +2 -2
- package/dist/types-ts4.5/pm-plugins/decorations-drag-handle.d.ts +1 -1
- package/dist/types-ts4.5/pm-plugins/decorations-drop-target.d.ts +2 -2
- package/dist/types-ts4.5/pm-plugins/handle-mouse-over.d.ts +1 -1
- package/dist/types-ts4.5/pm-plugins/keymap.d.ts +1 -1
- package/dist/types-ts4.5/pm-plugins/main.d.ts +2 -2
- package/dist/types-ts4.5/{utils → pm-plugins/utils}/active-anchor-tracker.d.ts +1 -1
- package/dist/types-ts4.5/{consts.d.ts → pm-plugins/utils/consts.d.ts} +1 -1
- package/dist/{types → types-ts4.5/pm-plugins}/utils/inline-drop-target.d.ts +1 -1
- package/dist/types-ts4.5/ui/drag-handle-menu.d.ts +1 -1
- package/dist/types-ts4.5/ui/drag-handle.d.ts +1 -1
- package/dist/types-ts4.5/ui/drop-target-layout.d.ts +2 -2
- package/dist/types-ts4.5/ui/drop-target-v2.d.ts +1 -1
- package/dist/types-ts4.5/ui/drop-target.d.ts +1 -1
- package/dist/types-ts4.5/ui/inline-drop-target.d.ts +1 -1
- package/package.json +7 -13
- package/dist/cjs/utils/advanced-layouts-flags.js +0 -19
- package/dist/es2019/utils/advanced-layouts-flags.js +0 -14
- package/dist/esm/utils/advanced-layouts-flags.js +0 -14
- package/dist/types/plugin.d.ts +0 -2
- package/dist/types/utils/advanced-layouts-flags.d.ts +0 -3
- package/dist/types-ts4.5/plugin.d.ts +0 -2
- package/dist/types-ts4.5/utils/advanced-layouts-flags.d.ts +0 -3
- /package/dist/cjs/{types.js → blockControlsPluginType.js} +0 -0
- /package/dist/cjs/{utils → pm-plugins/utils}/anchor-utils.js +0 -0
- /package/dist/cjs/{utils → pm-plugins/utils}/check-media-layout.js +0 -0
- /package/dist/cjs/{utils → pm-plugins/utils}/drag-target-debug.js +0 -0
- /package/dist/cjs/{utils → pm-plugins/utils}/getNestedNodePosition.js +0 -0
- /package/dist/cjs/{utils → pm-plugins/utils}/getSelection.js +0 -0
- /package/dist/cjs/{utils → pm-plugins/utils}/index.js +0 -0
- /package/dist/cjs/{utils → pm-plugins/utils}/transactions.js +0 -0
- /package/dist/es2019/{types.js → blockControlsPluginType.js} +0 -0
- /package/dist/es2019/{utils → pm-plugins/utils}/anchor-utils.js +0 -0
- /package/dist/es2019/{utils → pm-plugins/utils}/check-media-layout.js +0 -0
- /package/dist/es2019/{utils → pm-plugins/utils}/drag-target-debug.js +0 -0
- /package/dist/es2019/{utils → pm-plugins/utils}/getNestedNodePosition.js +0 -0
- /package/dist/es2019/{utils → pm-plugins/utils}/getSelection.js +0 -0
- /package/dist/es2019/{utils → pm-plugins/utils}/index.js +0 -0
- /package/dist/es2019/{utils → pm-plugins/utils}/transactions.js +0 -0
- /package/dist/esm/{types.js → blockControlsPluginType.js} +0 -0
- /package/dist/esm/{utils → pm-plugins/utils}/anchor-utils.js +0 -0
- /package/dist/esm/{utils → pm-plugins/utils}/check-media-layout.js +0 -0
- /package/dist/esm/{utils → pm-plugins/utils}/drag-target-debug.js +0 -0
- /package/dist/esm/{utils → pm-plugins/utils}/getNestedNodePosition.js +0 -0
- /package/dist/esm/{utils → pm-plugins/utils}/getSelection.js +0 -0
- /package/dist/esm/{utils → pm-plugins/utils}/index.js +0 -0
- /package/dist/esm/{utils → pm-plugins/utils}/transactions.js +0 -0
- /package/dist/types/{types.d.ts → blockControlsPluginType.d.ts} +0 -0
- /package/dist/types/{utils → pm-plugins/utils}/anchor-utils.d.ts +0 -0
- /package/dist/types/{utils → pm-plugins/utils}/check-media-layout.d.ts +0 -0
- /package/dist/types/{utils → pm-plugins/utils}/drag-handle-positions.d.ts +0 -0
- /package/dist/types/{utils → pm-plugins/utils}/drag-target-debug.d.ts +0 -0
- /package/dist/types/{utils → pm-plugins/utils}/getNestedNodePosition.d.ts +0 -0
- /package/dist/types/{utils → pm-plugins/utils}/getSelection.d.ts +0 -0
- /package/dist/types/{utils → pm-plugins/utils}/index.d.ts +0 -0
- /package/dist/types/{utils → pm-plugins/utils}/remove-from-source.d.ts +0 -0
- /package/dist/types/{utils → pm-plugins/utils}/transactions.d.ts +0 -0
- /package/dist/types/{utils → pm-plugins/utils}/update-column-widths.d.ts +0 -0
- /package/dist/types/{utils → pm-plugins/utils}/validation.d.ts +0 -0
- /package/dist/types-ts4.5/{types.d.ts → blockControlsPluginType.d.ts} +0 -0
- /package/dist/types-ts4.5/{utils → pm-plugins/utils}/anchor-utils.d.ts +0 -0
- /package/dist/types-ts4.5/{utils → pm-plugins/utils}/check-media-layout.d.ts +0 -0
- /package/dist/types-ts4.5/{utils → pm-plugins/utils}/drag-handle-positions.d.ts +0 -0
- /package/dist/types-ts4.5/{utils → pm-plugins/utils}/drag-target-debug.d.ts +0 -0
- /package/dist/types-ts4.5/{utils → pm-plugins/utils}/getNestedNodePosition.d.ts +0 -0
- /package/dist/types-ts4.5/{utils → pm-plugins/utils}/getSelection.d.ts +0 -0
- /package/dist/types-ts4.5/{utils → pm-plugins/utils}/index.d.ts +0 -0
- /package/dist/types-ts4.5/{utils → pm-plugins/utils}/remove-from-source.d.ts +0 -0
- /package/dist/types-ts4.5/{utils → pm-plugins/utils}/transactions.d.ts +0 -0
- /package/dist/types-ts4.5/{utils → pm-plugins/utils}/update-column-widths.d.ts +0 -0
- /package/dist/types-ts4.5/{utils → pm-plugins/utils}/validation.d.ts +0 -0
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,25 @@
|
|
|
1
1
|
# @atlaskit/editor-plugin-block-controls
|
|
2
2
|
|
|
3
|
+
## 2.13.30
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [#171014](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/171014)
|
|
8
|
+
[`6163248356c63`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/6163248356c63) -
|
|
9
|
+
[ED-25833] Replace the following FGs with experiment `platform_editor_advanced_layouts`
|
|
10
|
+
|
|
11
|
+
- platform_editor_advanced_layouts_breakout_resizing
|
|
12
|
+
- platform_editor_advanced_layouts_pre_release_1
|
|
13
|
+
- platform_editor_advanced_layouts_pre_release_2
|
|
14
|
+
|
|
15
|
+
## 2.13.29
|
|
16
|
+
|
|
17
|
+
### Patch Changes
|
|
18
|
+
|
|
19
|
+
- [#169341](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/169341)
|
|
20
|
+
[`b8cceed0c0786`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/b8cceed0c0786) -
|
|
21
|
+
ED-25806: migrates file structure to editor engineering standards
|
|
22
|
+
|
|
3
23
|
## 2.13.28
|
|
4
24
|
|
|
5
25
|
### Patch Changes
|
|
@@ -7,12 +7,12 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
7
7
|
exports.blockControlsPlugin = void 0;
|
|
8
8
|
var _react = _interopRequireDefault(require("react"));
|
|
9
9
|
var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
|
|
10
|
-
var _moveNode = require("./commands/move-node");
|
|
11
|
-
var _moveToLayout = require("./commands/move-to-layout");
|
|
10
|
+
var _moveNode = require("./editor-commands/move-node");
|
|
11
|
+
var _moveToLayout = require("./editor-commands/move-to-layout");
|
|
12
12
|
var _main = require("./pm-plugins/main");
|
|
13
|
+
var _utils = require("./pm-plugins/utils");
|
|
13
14
|
var _dragHandleMenu = require("./ui/drag-handle-menu");
|
|
14
15
|
var _globalStyles = require("./ui/global-styles");
|
|
15
|
-
var _utils = require("./utils");
|
|
16
16
|
var blockControlsPlugin = exports.blockControlsPlugin = function blockControlsPlugin(_ref) {
|
|
17
17
|
var api = _ref.api;
|
|
18
18
|
return {
|
|
@@ -17,12 +17,12 @@ var _utils2 = require("@atlaskit/editor-prosemirror/utils");
|
|
|
17
17
|
var _utils3 = require("@atlaskit/editor-tables/utils");
|
|
18
18
|
var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
|
|
19
19
|
var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
|
|
20
|
-
var _consts = require("../consts");
|
|
21
20
|
var _main = require("../pm-plugins/main");
|
|
22
|
-
var _utils4 = require("../utils");
|
|
23
|
-
var
|
|
24
|
-
var
|
|
25
|
-
var
|
|
21
|
+
var _utils4 = require("../pm-plugins/utils");
|
|
22
|
+
var _consts = require("../pm-plugins/utils/consts");
|
|
23
|
+
var _getSelection = require("../pm-plugins/utils/getSelection");
|
|
24
|
+
var _removeFromSource = require("../pm-plugins/utils/remove-from-source");
|
|
25
|
+
var _validation = require("../pm-plugins/utils/validation");
|
|
26
26
|
function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
27
27
|
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
28
28
|
/**
|
|
@@ -6,11 +6,11 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
exports.moveToLayout = void 0;
|
|
7
7
|
var _model = require("@atlaskit/editor-prosemirror/model");
|
|
8
8
|
var _state = require("@atlaskit/editor-prosemirror/state");
|
|
9
|
-
var _consts = require("../consts");
|
|
9
|
+
var _consts = require("../pm-plugins/utils/consts");
|
|
10
|
+
var _removeFromSource = require("../pm-plugins/utils/remove-from-source");
|
|
11
|
+
var _updateColumnWidths = require("../pm-plugins/utils/update-column-widths");
|
|
12
|
+
var _validation = require("../pm-plugins/utils/validation");
|
|
10
13
|
var _consts2 = require("../ui/consts");
|
|
11
|
-
var _removeFromSource = require("../utils/remove-from-source");
|
|
12
|
-
var _updateColumnWidths = require("../utils/update-column-widths");
|
|
13
|
-
var _validation = require("../utils/validation");
|
|
14
14
|
var createNewLayout = function createNewLayout(schema, layoutContents) {
|
|
15
15
|
if (layoutContents.length === 0 || layoutContents.length > (0, _consts.maxLayoutColumnSupported)()) {
|
|
16
16
|
return null;
|
|
@@ -8,7 +8,7 @@ var _utils = require("@atlaskit/editor-tables/utils");
|
|
|
8
8
|
var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
|
|
9
9
|
var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
|
|
10
10
|
var _main = require("../pm-plugins/main");
|
|
11
|
-
var _utils2 = require("../utils");
|
|
11
|
+
var _utils2 = require("../pm-plugins/utils");
|
|
12
12
|
var showDragHandleAtSelection = exports.showDragHandleAtSelection = function showDragHandleAtSelection(api, shouldFocusParentNode) {
|
|
13
13
|
return function (state, _, view) {
|
|
14
14
|
var $from = state.selection.$from;
|
package/dist/cjs/index.js
CHANGED
|
@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
Object.defineProperty(exports, "blockControlsPlugin", {
|
|
7
7
|
enumerable: true,
|
|
8
8
|
get: function get() {
|
|
9
|
-
return
|
|
9
|
+
return _blockControlsPlugin.blockControlsPlugin;
|
|
10
10
|
}
|
|
11
11
|
});
|
|
12
|
-
var
|
|
12
|
+
var _blockControlsPlugin = require("./blockControlsPlugin");
|
|
@@ -9,7 +9,6 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
|
|
|
9
9
|
var _view = require("@atlaskit/editor-prosemirror/view");
|
|
10
10
|
var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
|
|
11
11
|
var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
|
|
12
|
-
var _advancedLayoutsFlags = require("../utils/advanced-layouts-flags");
|
|
13
12
|
var _decorationsCommon = require("./decorations-common");
|
|
14
13
|
var IGNORE_NODES = ['tableCell', 'tableHeader', 'tableRow', 'listItem', 'caption', 'layoutColumn'];
|
|
15
14
|
var IGNORE_NODES_NEXT = ['tableCell', 'tableHeader', 'tableRow', 'listItem', 'caption'];
|
|
@@ -23,7 +22,7 @@ var shouldDescendIntoNode = exports.shouldDescendIntoNode = function shouldDesce
|
|
|
23
22
|
return false;
|
|
24
23
|
}
|
|
25
24
|
}
|
|
26
|
-
if ((0,
|
|
25
|
+
if ((0, _experiments.editorExperiment)('advanced_layouts', true)) {
|
|
27
26
|
return !IGNORE_NODE_DESCENDANTS_ADVANCED_LAYOUT.includes(node.type.name);
|
|
28
27
|
}
|
|
29
28
|
return !IGNORE_NODE_DESCENDANTS.includes(node.type.name);
|
|
@@ -33,7 +32,7 @@ var shouldIgnoreNode = function shouldIgnoreNode(node, ignore_nodes, depth, pare
|
|
|
33
32
|
|
|
34
33
|
// TODO use isWrappedMedia when clean up the feature flag
|
|
35
34
|
var isMediaSingle = 'mediaSingle' === node.type.name && (0, _platformFeatureFlags.fg)('platform_editor_element_dnd_nested_fix_patch_1');
|
|
36
|
-
var isFirstTableRow = (parent === null || parent === void 0 ? void 0 : parent.type.name) === 'table' && depth === 1 && node === parent.firstChild && 'tableRow' === node.type.name && (0,
|
|
35
|
+
var isFirstTableRow = (parent === null || parent === void 0 ? void 0 : parent.type.name) === 'table' && depth === 1 && node === parent.firstChild && 'tableRow' === node.type.name && (0, _experiments.editorExperiment)('advanced_layouts', true);
|
|
37
36
|
if (isFirstTableRow) {
|
|
38
37
|
return false;
|
|
39
38
|
}
|
|
@@ -73,7 +72,7 @@ var nodeDecorations = exports.nodeDecorations = function nodeDecorations(newStat
|
|
|
73
72
|
var decs = [];
|
|
74
73
|
var docFrom = from === undefined || from < 0 ? 0 : from;
|
|
75
74
|
var docTo = to === undefined || to > newState.doc.nodeSize - 2 ? newState.doc.nodeSize - 2 : to;
|
|
76
|
-
var ignore_nodes = (0,
|
|
75
|
+
var ignore_nodes = (0, _experiments.editorExperiment)('advanced_layouts', true) ? IGNORE_NODES_NEXT : IGNORE_NODES;
|
|
77
76
|
newState.doc.nodesBetween(docFrom, docTo, function (node, pos, parent, index) {
|
|
78
77
|
var _Decoration$node;
|
|
79
78
|
var depth = 0;
|
|
@@ -13,15 +13,14 @@ var _utils = require("@atlaskit/editor-common/utils");
|
|
|
13
13
|
var _view = require("@atlaskit/editor-prosemirror/view");
|
|
14
14
|
var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
|
|
15
15
|
var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
|
|
16
|
-
var _consts = require("../consts");
|
|
17
|
-
var _consts2 = require("../ui/consts");
|
|
16
|
+
var _consts = require("../ui/consts");
|
|
18
17
|
var _dropTarget = require("../ui/drop-target");
|
|
19
18
|
var _dropTargetLayout = require("../ui/drop-target-layout");
|
|
20
19
|
var _dropTargetV = require("../ui/drop-target-v2");
|
|
21
|
-
var _advancedLayoutsFlags = require("../utils/advanced-layouts-flags");
|
|
22
|
-
var _dragTargetDebug = require("../utils/drag-target-debug");
|
|
23
|
-
var _validation = require("../utils/validation");
|
|
24
20
|
var _decorationsCommon = require("./decorations-common");
|
|
21
|
+
var _consts2 = require("./utils/consts");
|
|
22
|
+
var _dragTargetDebug = require("./utils/drag-target-debug");
|
|
23
|
+
var _validation = require("./utils/validation");
|
|
25
24
|
function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
26
25
|
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
27
26
|
var IGNORE_NODES = ['tableCell', 'tableHeader', 'tableRow', 'layoutColumn', 'listItem', 'caption'];
|
|
@@ -35,13 +34,13 @@ var shouldDescend = function shouldDescend(node) {
|
|
|
35
34
|
};
|
|
36
35
|
var getNodeMargins = function getNodeMargins(node) {
|
|
37
36
|
if (!node) {
|
|
38
|
-
return
|
|
37
|
+
return _consts.nodeMargins['default'];
|
|
39
38
|
}
|
|
40
39
|
var nodeTypeName = node.type.name;
|
|
41
40
|
if (nodeTypeName === 'heading') {
|
|
42
|
-
return
|
|
41
|
+
return _consts.nodeMargins["heading".concat(node.attrs.level)] || _consts.nodeMargins['default'];
|
|
43
42
|
}
|
|
44
|
-
return
|
|
43
|
+
return _consts.nodeMargins[nodeTypeName] || _consts.nodeMargins['default'];
|
|
45
44
|
};
|
|
46
45
|
var shouldCollapseMargin = function shouldCollapseMargin(prevNode, nextNode) {
|
|
47
46
|
if (((prevNode === null || prevNode === void 0 ? void 0 : prevNode.type.name) === 'mediaSingle' || (nextNode === null || nextNode === void 0 ? void 0 : nextNode.type.name) === 'mediaSingle') && (prevNode === null || prevNode === void 0 ? void 0 : prevNode.type.name) !== (nextNode === null || nextNode === void 0 ? void 0 : nextNode.type.name)) {
|
|
@@ -186,7 +185,7 @@ var dropTargetDecorations = exports.dropTargetDecorations = function dropTargetD
|
|
|
186
185
|
popNodeStack(depth);
|
|
187
186
|
prevNodeStack.push(node);
|
|
188
187
|
};
|
|
189
|
-
var isAdvancedLayoutsPreRelease2 = (0,
|
|
188
|
+
var isAdvancedLayoutsPreRelease2 = (0, _experiments.editorExperiment)('advanced_layouts', true);
|
|
190
189
|
newState.doc.nodesBetween(docFrom, docTo, function (node, pos, parent, index) {
|
|
191
190
|
var depth = 0;
|
|
192
191
|
// drop target deco at the end position
|
|
@@ -201,7 +200,7 @@ var dropTargetDecorations = exports.dropTargetDecorations = function dropTargetD
|
|
|
201
200
|
}
|
|
202
201
|
if (node.type.name === 'layoutColumn' && (parent === null || parent === void 0 ? void 0 : parent.type.name) === 'layoutSection' && index !== 0 && (
|
|
203
202
|
// Not the first node
|
|
204
|
-
(parent === null || parent === void 0 ? void 0 : parent.childCount) < (0,
|
|
203
|
+
(parent === null || parent === void 0 ? void 0 : parent.childCount) < (0, _consts2.maxLayoutColumnSupported)() || isSameLayout)) {
|
|
205
204
|
// Add drop target for layout columns
|
|
206
205
|
decs.push(createLayoutDropTargetDecoration(pos, {
|
|
207
206
|
api: api,
|
|
@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
exports.handleMouseOver = void 0;
|
|
7
7
|
var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
|
|
8
8
|
var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
|
|
9
|
-
var _advancedLayoutsFlags = require("../utils/advanced-layouts-flags");
|
|
10
9
|
var isEmptyNestedParagraphOrHeading = function isEmptyNestedParagraphOrHeading(target) {
|
|
11
10
|
if (target instanceof HTMLHeadingElement || target instanceof HTMLParagraphElement) {
|
|
12
11
|
var _target$parentElement;
|
|
@@ -56,7 +55,7 @@ var handleMouseOver = exports.handleMouseOver = function handleMouseOver(view, e
|
|
|
56
55
|
if ((0, _experiments.editorExperiment)('nested-dnd', true) && isEmptyNestedParagraphOrHeading(rootElement)) {
|
|
57
56
|
return false;
|
|
58
57
|
}
|
|
59
|
-
if (rootElement.getAttribute('data-drag-handler-node-type') === 'media' && (0,
|
|
58
|
+
if (rootElement.getAttribute('data-drag-handler-node-type') === 'media' && (0, _experiments.editorExperiment)('advanced_layouts', true)) {
|
|
60
59
|
rootElement = rootElement.closest('[data-drag-handler-anchor-name][data-drag-handler-node-type="mediaSingle"]');
|
|
61
60
|
if (!rootElement) {
|
|
62
61
|
return false;
|
|
@@ -100,7 +99,7 @@ var handleMouseOver = exports.handleMouseOver = function handleMouseOver(view, e
|
|
|
100
99
|
pos = view.posAtDOM(rootElement, 0);
|
|
101
100
|
}
|
|
102
101
|
var node = view.state.doc.nodeAt(pos);
|
|
103
|
-
if ((0,
|
|
102
|
+
if ((0, _experiments.editorExperiment)('advanced_layouts', true) && node && isLayoutColumnWithoutContent(node)) {
|
|
104
103
|
// Don't show drag handle when there is no content/only placeholder in layout column
|
|
105
104
|
return false;
|
|
106
105
|
}
|
|
@@ -8,9 +8,9 @@ var _keymaps = require("@atlaskit/editor-common/keymaps");
|
|
|
8
8
|
var _keymap = require("@atlaskit/editor-prosemirror/keymap");
|
|
9
9
|
var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
|
|
10
10
|
var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
|
|
11
|
-
var _moveNode = require("../commands/move-node");
|
|
12
|
-
var _showDragHandle = require("../commands/show-drag-handle");
|
|
13
|
-
var _consts = require("
|
|
11
|
+
var _moveNode = require("../editor-commands/move-node");
|
|
12
|
+
var _showDragHandle = require("../editor-commands/show-drag-handle");
|
|
13
|
+
var _consts = require("./utils/consts");
|
|
14
14
|
function keymapList(api, formatMessage) {
|
|
15
15
|
var keymapList = {};
|
|
16
16
|
if (api && (0, _platformFeatureFlags.fg)('platform_editor_element_drag_and_drop_ed_23873')) {
|
|
@@ -19,16 +19,15 @@ var _element = require("@atlaskit/pragmatic-drag-and-drop-auto-scroll/element");
|
|
|
19
19
|
var _combine = require("@atlaskit/pragmatic-drag-and-drop/combine");
|
|
20
20
|
var _adapter = require("@atlaskit/pragmatic-drag-and-drop/element/adapter");
|
|
21
21
|
var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
|
|
22
|
-
var _activeAnchorTracker = require("../utils/active-anchor-tracker");
|
|
23
|
-
var _advancedLayoutsFlags = require("../utils/advanced-layouts-flags");
|
|
24
|
-
var _anchorUtils = require("../utils/anchor-utils");
|
|
25
|
-
var _dragTargetDebug = require("../utils/drag-target-debug");
|
|
26
|
-
var _transactions = require("../utils/transactions");
|
|
27
22
|
var _decorationsAnchor = require("./decorations-anchor");
|
|
28
23
|
var _decorationsDragHandle = require("./decorations-drag-handle");
|
|
29
24
|
var _decorationsDropTarget = require("./decorations-drop-target");
|
|
30
25
|
var _handleMouseOver = require("./handle-mouse-over");
|
|
31
26
|
var _keymap = require("./keymap");
|
|
27
|
+
var _activeAnchorTracker = require("./utils/active-anchor-tracker");
|
|
28
|
+
var _anchorUtils = require("./utils/anchor-utils");
|
|
29
|
+
var _dragTargetDebug = require("./utils/drag-target-debug");
|
|
30
|
+
var _transactions = require("./utils/transactions");
|
|
32
31
|
var key = exports.key = new _state.PluginKey('blockControls');
|
|
33
32
|
var isHTMLElement = function isHTMLElement(element) {
|
|
34
33
|
return element instanceof HTMLElement;
|
|
@@ -502,7 +501,7 @@ var createPlugin = exports.createPlugin = function createPlugin(api, getIntl, no
|
|
|
502
501
|
return false;
|
|
503
502
|
},
|
|
504
503
|
dragenter: function dragenter(_view, event) {
|
|
505
|
-
if ((0,
|
|
504
|
+
if ((0, _experiments.editorExperiment)('advanced_layouts', true)) {
|
|
506
505
|
if (isHTMLElement(event.target)) {
|
|
507
506
|
var closestParentElement = event.target.closest('[data-drag-handler-anchor-depth="0"]');
|
|
508
507
|
if (closestParentElement) {
|
|
@@ -516,7 +515,7 @@ var createPlugin = exports.createPlugin = function createPlugin(api, getIntl, no
|
|
|
516
515
|
},
|
|
517
516
|
dragstart: function dragstart(view) {
|
|
518
517
|
var _anchorRectCache;
|
|
519
|
-
if ((0,
|
|
518
|
+
if ((0, _experiments.editorExperiment)('advanced_layouts', true)) {
|
|
520
519
|
_activeAnchorTracker.defaultActiveAnchorTracker.reset();
|
|
521
520
|
}
|
|
522
521
|
(_anchorRectCache = anchorRectCache) === null || _anchorRectCache === void 0 || _anchorRectCache.setEditorView(view);
|
|
@@ -11,7 +11,7 @@ var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/creat
|
|
|
11
11
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
12
12
|
var _events = require("events");
|
|
13
13
|
var _react = require("react");
|
|
14
|
-
var
|
|
14
|
+
var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
|
|
15
15
|
var ActiveAnchorTracker = exports.ActiveAnchorTracker = /*#__PURE__*/function () {
|
|
16
16
|
function ActiveAnchorTracker() {
|
|
17
17
|
(0, _classCallCheck2.default)(this, ActiveAnchorTracker);
|
|
@@ -67,7 +67,7 @@ var useActiveAnchorTracker = exports.useActiveAnchorTracker = function useActive
|
|
|
67
67
|
setIsActive(eventIsActive);
|
|
68
68
|
};
|
|
69
69
|
(0, _react.useEffect)(function () {
|
|
70
|
-
if (activeAnchorTracker && anchorName && (0,
|
|
70
|
+
if (activeAnchorTracker && anchorName && (0, _experiments.editorExperiment)('advanced_layouts', true)) {
|
|
71
71
|
activeAnchorTracker.subscribe(anchorName, onActive);
|
|
72
72
|
var unsubscribe = function unsubscribe() {
|
|
73
73
|
activeAnchorTracker.unsubscribe(anchorName, onActive);
|
|
@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.maxLayoutColumnSupported = exports.MIN_LAYOUT_COLUMN = exports.DIRECTION = void 0;
|
|
7
|
-
var
|
|
7
|
+
var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
|
|
8
8
|
var DIRECTION = exports.DIRECTION = /*#__PURE__*/function (DIRECTION) {
|
|
9
9
|
DIRECTION["UP"] = "up";
|
|
10
10
|
DIRECTION["DOWN"] = "down";
|
|
@@ -13,6 +13,6 @@ var DIRECTION = exports.DIRECTION = /*#__PURE__*/function (DIRECTION) {
|
|
|
13
13
|
return DIRECTION;
|
|
14
14
|
}({});
|
|
15
15
|
var maxLayoutColumnSupported = exports.maxLayoutColumnSupported = function maxLayoutColumnSupported() {
|
|
16
|
-
return (0,
|
|
16
|
+
return (0, _experiments.editorExperiment)('advanced_layouts', true) ? 5 : 3;
|
|
17
17
|
};
|
|
18
18
|
var MIN_LAYOUT_COLUMN = exports.MIN_LAYOUT_COLUMN = 2;
|
|
@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.getTopPosition = exports.getLeftPosition = void 0;
|
|
7
|
-
var _consts = require("
|
|
7
|
+
var _consts = require("../../ui/consts");
|
|
8
8
|
var getTopPosition = exports.getTopPosition = function getTopPosition(dom, type) {
|
|
9
9
|
if (!dom) {
|
|
10
10
|
return 'auto';
|
|
@@ -5,23 +5,23 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
5
5
|
});
|
|
6
6
|
exports.shouldAllowInlineDropTarget = void 0;
|
|
7
7
|
var _utils = require("@atlaskit/editor-common/utils");
|
|
8
|
-
var
|
|
9
|
-
var _advancedLayoutsFlags = require("./advanced-layouts-flags");
|
|
8
|
+
var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
|
|
10
9
|
var _checkMediaLayout = require("./check-media-layout");
|
|
10
|
+
var _consts = require("./consts");
|
|
11
11
|
var shouldAllowInlineDropTarget = exports.shouldAllowInlineDropTarget = function shouldAllowInlineDropTarget(isNested, node) {
|
|
12
12
|
var isSameLayout = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
|
|
13
13
|
var activeNode = arguments.length > 3 ? arguments[3] : undefined;
|
|
14
|
-
if (
|
|
14
|
+
if ((0, _experiments.editorExperiment)('advanced_layouts', false) || isNested) {
|
|
15
15
|
return false;
|
|
16
16
|
}
|
|
17
17
|
if ((0, _checkMediaLayout.isWrappedMedia)(node)) {
|
|
18
18
|
return false;
|
|
19
19
|
}
|
|
20
|
-
if ((
|
|
20
|
+
if ((activeNode === null || activeNode === void 0 ? void 0 : activeNode.nodeType) === 'layoutSection') {
|
|
21
21
|
return false;
|
|
22
22
|
}
|
|
23
23
|
if ((node === null || node === void 0 ? void 0 : node.type.name) === 'layoutSection') {
|
|
24
|
-
return node.childCount < (0, _consts.maxLayoutColumnSupported)() ||
|
|
24
|
+
return node.childCount < (0, _consts.maxLayoutColumnSupported)() || isSameLayout;
|
|
25
25
|
}
|
|
26
26
|
return !(0, _utils.isEmptyParagraph)(node);
|
|
27
27
|
};
|
|
@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.removeFromSource = void 0;
|
|
7
|
-
var _consts = require("
|
|
7
|
+
var _consts = require("./consts");
|
|
8
8
|
var _updateColumnWidths = require("./update-column-widths");
|
|
9
9
|
var removeFromSource = exports.removeFromSource = function removeFromSource(tr, $from) {
|
|
10
10
|
var sourceNode = $from.nodeAfter;
|
|
@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.updateColumnWidths = void 0;
|
|
7
|
-
var _consts = require("
|
|
7
|
+
var _consts = require("../../ui/consts");
|
|
8
8
|
var updateColumnWidths = exports.updateColumnWidths = function updateColumnWidths(tr, layoutNode, layoutNodePos, childCount) {
|
|
9
9
|
var newColumnWidth = _consts.DEFAULT_COLUMN_DISTRIBUTIONS[childCount];
|
|
10
10
|
if (newColumnWidth) {
|
|
@@ -9,7 +9,6 @@ exports.transformSliceExpandToNestedExpand = exports.transformExpandToNestedExpa
|
|
|
9
9
|
var _memoizeOne = _interopRequireDefault(require("memoize-one"));
|
|
10
10
|
var _model = require("@atlaskit/editor-prosemirror/model");
|
|
11
11
|
var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
|
|
12
|
-
var _advancedLayoutsFlags = require("../utils/advanced-layouts-flags");
|
|
13
12
|
var isInsideTable = exports.isInsideTable = function isInsideTable(nodeType) {
|
|
14
13
|
var _nodeType$schema$node = nodeType.schema.nodes,
|
|
15
14
|
tableCell = _nodeType$schema$node.tableCell,
|
|
@@ -81,7 +80,7 @@ function canMoveNodeToIndex(destParent, indexIntoParent, srcNode, destNode) {
|
|
|
81
80
|
var srcNodeType = srcNode.type;
|
|
82
81
|
var parentNodeType = destParent === null || destParent === void 0 ? void 0 : destParent.type.name;
|
|
83
82
|
var activeNodeType = srcNode === null || srcNode === void 0 ? void 0 : srcNode.type.name;
|
|
84
|
-
if ((0,
|
|
83
|
+
if (activeNodeType === 'layoutColumn' && (0, _experiments.editorExperiment)('advanced_layouts', true)) {
|
|
85
84
|
// Allow drag layout column and drop into layout section
|
|
86
85
|
if ((destNode === null || destNode === void 0 ? void 0 : destNode.type.name) === 'layoutSection' || parentNodeType === 'doc') {
|
|
87
86
|
return true;
|
package/dist/cjs/ui/consts.js
CHANGED
|
@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
7
7
|
exports.topPositionAdjustment = exports.spaceLookupMap = exports.nodeMargins = exports.getNestedNodeLeftPaddingMargin = exports.dropTargetMarginMap = exports.dragHandleGap = exports.DRAG_HANDLE_ZINDEX = exports.DRAG_HANDLE_WIDTH = exports.DRAG_HANDLE_NARROW_GAP = exports.DRAG_HANDLE_MAX_WIDTH_PLUS_GAP = exports.DRAG_HANDLE_MAX_GAP = exports.DRAG_HANDLE_HEIGHT = exports.DRAG_HANDLE_H6_TOP_ADJUSTMENT = exports.DRAG_HANDLE_H5_TOP_ADJUSTMENT = exports.DRAG_HANDLE_H4_TOP_ADJUSTMENT = exports.DRAG_HANDLE_H3_TOP_ADJUSTMENT = exports.DRAG_HANDLE_DIVIDER_TOP_ADJUSTMENT = exports.DRAG_HANDLE_DEFAULT_GAP = exports.DRAG_HANDLE_BORDER_RADIUS = exports.DEFAULT_COLUMN_DISTRIBUTIONS = void 0;
|
|
8
8
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
9
9
|
var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
|
|
10
|
-
var
|
|
10
|
+
var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
|
|
11
11
|
var _dropTargetMarginMap;
|
|
12
12
|
var DRAG_HANDLE_HEIGHT = exports.DRAG_HANDLE_HEIGHT = 24;
|
|
13
13
|
var DRAG_HANDLE_WIDTH = exports.DRAG_HANDLE_WIDTH = 12;
|
|
@@ -27,7 +27,7 @@ var dragHandleGap = exports.dragHandleGap = function dragHandleGap(nodeType, par
|
|
|
27
27
|
if (parentNodeType && parentNodeType !== 'doc') {
|
|
28
28
|
return DRAG_HANDLE_NARROW_GAP;
|
|
29
29
|
}
|
|
30
|
-
if (nodeType === 'layoutSection' && (0,
|
|
30
|
+
if (nodeType === 'layoutSection' && (0, _experiments.editorExperiment)('advanced_layouts', true)) {
|
|
31
31
|
return DRAG_HANDLE_MAX_GAP + 12;
|
|
32
32
|
}
|
|
33
33
|
if (nodeTypeExcludeList.includes(nodeType)) {
|
|
@@ -55,7 +55,7 @@ var getNestedNodeLeftPaddingMargin = exports.getNestedNodeLeftPaddingMargin = fu
|
|
|
55
55
|
}
|
|
56
56
|
};
|
|
57
57
|
var topPositionAdjustment = exports.topPositionAdjustment = function topPositionAdjustment(nodeType) {
|
|
58
|
-
if ((0,
|
|
58
|
+
if ((0, _experiments.editorExperiment)('advanced_layouts', true)) {
|
|
59
59
|
switch (nodeType) {
|
|
60
60
|
case 'rule':
|
|
61
61
|
return -DRAG_HANDLE_DIVIDER_TOP_ADJUSTMENT;
|
|
@@ -22,9 +22,8 @@ var _setCustomNativeDragPreview = require("@atlaskit/pragmatic-drag-and-drop/ele
|
|
|
22
22
|
var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
|
|
23
23
|
var _tooltip = _interopRequireDefault(require("@atlaskit/tooltip"));
|
|
24
24
|
var _main = require("../pm-plugins/main");
|
|
25
|
-
var _utils = require("../utils");
|
|
26
|
-
var
|
|
27
|
-
var _dragHandlePositions = require("../utils/drag-handle-positions");
|
|
25
|
+
var _utils = require("../pm-plugins/utils");
|
|
26
|
+
var _dragHandlePositions = require("../pm-plugins/utils/drag-handle-positions");
|
|
28
27
|
var _consts = require("./consts");
|
|
29
28
|
var _dragPreview = require("./drag-preview");
|
|
30
29
|
/**
|
|
@@ -147,7 +146,7 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
|
|
|
147
146
|
// but ensures the preview is generated correctly.
|
|
148
147
|
var handleMouseDown = (0, _react.useCallback)(function () {
|
|
149
148
|
var _api$core3;
|
|
150
|
-
if (!(isLayoutColumn && (0,
|
|
149
|
+
if (!(isLayoutColumn && (0, _experiments.editorExperiment)('advanced_layouts', true)) && (0, _platformFeatureFlags.fg)('platform_editor_element_drag_and_drop_ed_24885')) {
|
|
151
150
|
return undefined;
|
|
152
151
|
}
|
|
153
152
|
api === null || api === void 0 || (_api$core3 = api.core) === null || _api$core3 === void 0 || _api$core3.actions.execute(function (_ref3) {
|
|
@@ -161,7 +160,7 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
|
|
|
161
160
|
return tr;
|
|
162
161
|
}
|
|
163
162
|
var selection;
|
|
164
|
-
if (isLayoutColumn && (0,
|
|
163
|
+
if (isLayoutColumn && (0, _experiments.editorExperiment)('advanced_layouts', true)) {
|
|
165
164
|
selection = new _state.NodeSelection(tr.doc.resolve(startPos));
|
|
166
165
|
} else {
|
|
167
166
|
var $startPos = tr.doc.resolve(startPos + node.nodeSize);
|
|
@@ -294,8 +293,8 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
|
|
|
294
293
|
var isEdgeCase = (hasResizer || isExtension || isEmbedCard || isBlockCard) && innerContainer;
|
|
295
294
|
if (supportsAnchor) {
|
|
296
295
|
return {
|
|
297
|
-
left: isEdgeCase ? "calc(anchor(".concat(anchorName, " start) + ").concat((0, _dragHandlePositions.getLeftPosition)(dom, nodeType, innerContainer, isMacroInteractionUpdates, parentNodeType), ")") : (0,
|
|
298
|
-
top: (0,
|
|
296
|
+
left: isEdgeCase ? "calc(anchor(".concat(anchorName, " start) + ").concat((0, _dragHandlePositions.getLeftPosition)(dom, nodeType, innerContainer, isMacroInteractionUpdates, parentNodeType), ")") : (0, _experiments.editorExperiment)('advanced_layouts', true) && isLayoutColumn ? "calc((anchor(".concat(anchorName, " right) + anchor(").concat(anchorName, " left))/2 - ").concat(_consts.DRAG_HANDLE_HEIGHT / 2, "px)") : "calc(anchor(".concat(anchorName, " start) - ").concat(_consts.DRAG_HANDLE_WIDTH, "px - ").concat((0, _consts.dragHandleGap)(nodeType, parentNodeType), "px)"),
|
|
297
|
+
top: (0, _experiments.editorExperiment)('advanced_layouts', true) && isLayoutColumn ? "calc(anchor(".concat(anchorName, " top) - ").concat(_consts.DRAG_HANDLE_WIDTH, "px)") : (0, _platformFeatureFlags.fg)('platform_editor_elements_dnd_ed_23674') ? "calc(anchor(".concat(anchorName, " start) + ").concat((0, _consts.topPositionAdjustment)(nodeType), "px)") : anchorName.includes('table') ? "calc(anchor(".concat(anchorName, " start) + ").concat(_consts.DRAG_HANDLE_HEIGHT, "px)") : "anchor(".concat(anchorName, " start)")
|
|
299
298
|
};
|
|
300
299
|
}
|
|
301
300
|
return {
|
|
@@ -418,7 +417,7 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
|
|
|
418
417
|
// eslint-disable-next-line @atlaskit/design-system/no-html-button
|
|
419
418
|
(0, _react2.jsx)("button", {
|
|
420
419
|
type: "button",
|
|
421
|
-
css: [dragHandleButtonStyles, (0,
|
|
420
|
+
css: [dragHandleButtonStyles, (0, _experiments.editorExperiment)('advanced_layouts', true) && isLayoutColumn && layoutColumnDragHandleStyles, dragHandleSelected && selectedStyles],
|
|
422
421
|
ref: buttonRef
|
|
423
422
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
|
|
424
423
|
,
|
|
@@ -14,9 +14,9 @@ var _box = require("@atlaskit/pragmatic-drag-and-drop-react-drop-indicator/box")
|
|
|
14
14
|
var _adapter = require("@atlaskit/pragmatic-drag-and-drop/element/adapter");
|
|
15
15
|
var _colors = require("@atlaskit/theme/colors");
|
|
16
16
|
var _decorationsCommon = require("../pm-plugins/decorations-common");
|
|
17
|
-
var _activeAnchorTracker = require("../utils/active-anchor-tracker");
|
|
18
|
-
var _anchorUtils = require("../utils/anchor-utils");
|
|
19
|
-
var _dragTargetDebug = require("../utils/drag-target-debug");
|
|
17
|
+
var _activeAnchorTracker = require("../pm-plugins/utils/active-anchor-tracker");
|
|
18
|
+
var _anchorUtils = require("../pm-plugins/utils/anchor-utils");
|
|
19
|
+
var _dragTargetDebug = require("../pm-plugins/utils/drag-target-debug");
|
|
20
20
|
/**
|
|
21
21
|
* @jsxRuntime classic
|
|
22
22
|
* @jsx jsx
|
|
@@ -16,11 +16,10 @@ var _adapter = require("@atlaskit/pragmatic-drag-and-drop/element/adapter");
|
|
|
16
16
|
var _constants = require("@atlaskit/theme/constants");
|
|
17
17
|
var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
|
|
18
18
|
var _decorationsCommon = require("../pm-plugins/decorations-common");
|
|
19
|
-
var _activeAnchorTracker = require("../utils/active-anchor-tracker");
|
|
20
|
-
var
|
|
21
|
-
var
|
|
22
|
-
var
|
|
23
|
-
var _inlineDropTarget = require("../utils/inline-drop-target");
|
|
19
|
+
var _activeAnchorTracker = require("../pm-plugins/utils/active-anchor-tracker");
|
|
20
|
+
var _anchorUtils = require("../pm-plugins/utils/anchor-utils");
|
|
21
|
+
var _dragTargetDebug = require("../pm-plugins/utils/drag-target-debug");
|
|
22
|
+
var _inlineDropTarget = require("../pm-plugins/utils/inline-drop-target");
|
|
24
23
|
var _consts = require("./consts");
|
|
25
24
|
var _inlineDropTarget2 = require("./inline-drop-target");
|
|
26
25
|
/**
|
|
@@ -97,7 +96,7 @@ var HoverZone = function HoverZone(_ref) {
|
|
|
97
96
|
return (0, _adapter.dropTargetForElements)({
|
|
98
97
|
element: ref.current,
|
|
99
98
|
onDragEnter: function onDragEnter() {
|
|
100
|
-
if (!isNestedDropTarget && (0,
|
|
99
|
+
if (!isNestedDropTarget && (0, _experiments.editorExperiment)('advanced_layouts', true)) {
|
|
101
100
|
setActiveAnchor();
|
|
102
101
|
}
|
|
103
102
|
_onDragEnter();
|
|
@@ -15,7 +15,7 @@ var _box = require("@atlaskit/pragmatic-drag-and-drop-react-drop-indicator/box")
|
|
|
15
15
|
var _adapter = require("@atlaskit/pragmatic-drag-and-drop/element/adapter");
|
|
16
16
|
var _constants = require("@atlaskit/theme/constants");
|
|
17
17
|
var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
|
|
18
|
-
var _dragTargetDebug = require("../utils/drag-target-debug");
|
|
18
|
+
var _dragTargetDebug = require("../pm-plugins/utils/drag-target-debug");
|
|
19
19
|
var _consts = require("./consts");
|
|
20
20
|
/**
|
|
21
21
|
* @jsxRuntime classic
|
|
@@ -120,7 +120,7 @@ var DropTarget = exports.DropTarget = function DropTarget(_ref3) {
|
|
|
120
120
|
return;
|
|
121
121
|
}
|
|
122
122
|
|
|
123
|
-
// This should be moved to platform/packages/editor/editor-plugin-block-controls/src/utils/validation.ts
|
|
123
|
+
// This should be moved to platform/packages/editor/editor-plugin-block-controls/src/pm-plugins/utils/validation.ts
|
|
124
124
|
// Since we are moved to drop-target-v2
|
|
125
125
|
// Place experiments here instead of just inside move-node.ts as it stops the drag marker from appearing.
|
|
126
126
|
if ((0, _experiments.editorExperiment)('nest-media-and-codeblock-in-quote', false)) {
|
|
@@ -12,11 +12,11 @@ var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
|
|
|
12
12
|
var _box = require("@atlaskit/pragmatic-drag-and-drop-react-drop-indicator/box");
|
|
13
13
|
var _adapter = require("@atlaskit/pragmatic-drag-and-drop/element/adapter");
|
|
14
14
|
var _colors = require("@atlaskit/theme/colors");
|
|
15
|
+
var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
|
|
15
16
|
var _decorationsCommon = require("../pm-plugins/decorations-common");
|
|
16
|
-
var _activeAnchorTracker = require("../utils/active-anchor-tracker");
|
|
17
|
-
var
|
|
18
|
-
var
|
|
19
|
-
var _dragTargetDebug = require("../utils/drag-target-debug");
|
|
17
|
+
var _activeAnchorTracker = require("../pm-plugins/utils/active-anchor-tracker");
|
|
18
|
+
var _anchorUtils = require("../pm-plugins/utils/anchor-utils");
|
|
19
|
+
var _dragTargetDebug = require("../pm-plugins/utils/drag-target-debug");
|
|
20
20
|
/* eslint-disable @atlaskit/design-system/consistent-css-prop-usage */
|
|
21
21
|
/* eslint-disable @atlaskit/ui-styling-standard/no-unsafe-values */
|
|
22
22
|
/**
|
|
@@ -85,7 +85,6 @@ var InlineDropTarget = exports.InlineDropTarget = function InlineDropTarget(_ref
|
|
|
85
85
|
_useActiveAnchorTrack2 = (0, _slicedToArray2.default)(_useActiveAnchorTrack, 1),
|
|
86
86
|
isActiveAnchor = _useActiveAnchorTrack2[0];
|
|
87
87
|
var isLeftPosition = position === 'left';
|
|
88
|
-
var shouldShowResponsiveLayout = (0, _advancedLayoutsFlags.showResponsiveLayout)();
|
|
89
88
|
var nodeDimension = (0, _react.useMemo)(function () {
|
|
90
89
|
if (!nextNode) {
|
|
91
90
|
return defaultNodeDimension;
|
|
@@ -126,7 +125,7 @@ var InlineDropTarget = exports.InlineDropTarget = function InlineDropTarget(_ref
|
|
|
126
125
|
|
|
127
126
|
// Set the height target anchor name to the first or last column of the layout section so that it also works for stacked layout
|
|
128
127
|
var heightTargetAnchorName = targetAnchorName;
|
|
129
|
-
if (
|
|
128
|
+
if ((0, _experiments.editorExperiment)('advanced_layouts', true) && nextNode.type.name === 'layoutSection' && nextNode.firstChild && nextNode.lastChild) {
|
|
130
129
|
heightTargetAnchorName = isLeftPosition ? (0, _decorationsCommon.getNodeAnchor)(nextNode.firstChild) : (0, _decorationsCommon.getNodeAnchor)(nextNode.lastChild);
|
|
131
130
|
}
|
|
132
131
|
if ((0, _anchorUtils.isAnchorSupported)()) {
|
|
@@ -159,7 +158,7 @@ var InlineDropTarget = exports.InlineDropTarget = function InlineDropTarget(_ref
|
|
|
159
158
|
};
|
|
160
159
|
}
|
|
161
160
|
return defaultNodeDimension;
|
|
162
|
-
}, [anchorName, anchorRectCache, nextNode, position, isLeftPosition
|
|
161
|
+
}, [anchorName, anchorRectCache, nextNode, position, isLeftPosition]);
|
|
163
162
|
var onDrop = (0, _react.useCallback)(function () {
|
|
164
163
|
var _api$blockControls;
|
|
165
164
|
var _ref2 = (api === null || api === void 0 || (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 ? void 0 : _api$blockControls.sharedState.currentState()) || {},
|
|
@@ -177,8 +176,8 @@ var InlineDropTarget = exports.InlineDropTarget = function InlineDropTarget(_ref
|
|
|
177
176
|
}
|
|
178
177
|
}, [api, getPos, position]);
|
|
179
178
|
var inlineHoverZoneRectStyle = (0, _react.useMemo)(function () {
|
|
180
|
-
var isLayoutNode = (nextNode === null || nextNode === void 0 ? void 0 : nextNode.type.name) === 'layoutSection';
|
|
181
|
-
var layoutAdjustment = isLayoutNode
|
|
179
|
+
var isLayoutNode = (0, _experiments.editorExperiment)('advanced_layouts', true) && (nextNode === null || nextNode === void 0 ? void 0 : nextNode.type.name) === 'layoutSection';
|
|
180
|
+
var layoutAdjustment = isLayoutNode ? {
|
|
182
181
|
width: 11,
|
|
183
182
|
height: 4,
|
|
184
183
|
top: 6,
|
|
@@ -192,11 +191,11 @@ var InlineDropTarget = exports.InlineDropTarget = function InlineDropTarget(_ref
|
|
|
192
191
|
top: "calc(anchor(top))",
|
|
193
192
|
width: nodeDimension.widthOffset ? "calc((100% - ".concat(nodeDimension.width, ")/2 - ").concat(GAP, "px + ").concat(nodeDimension.widthOffset, " - ").concat((layoutAdjustment === null || layoutAdjustment === void 0 ? void 0 : layoutAdjustment.width) || 0, "px)") : "calc((100% - ".concat(nodeDimension.width, ")/2 - ").concat(GAP, "px - ").concat((layoutAdjustment === null || layoutAdjustment === void 0 ? void 0 : layoutAdjustment.width) || 0, "px)"),
|
|
194
193
|
height: "calc(".concat(nodeDimension.height, " + ").concat((layoutAdjustment === null || layoutAdjustment === void 0 ? void 0 : layoutAdjustment.height) || 0, "px)")
|
|
195
|
-
}, isLayoutNode &&
|
|
194
|
+
}, isLayoutNode && {
|
|
196
195
|
top: isLeftPosition ? "calc(".concat(nodeDimension.top, " + ").concat((layoutAdjustment === null || layoutAdjustment === void 0 ? void 0 : layoutAdjustment.top) || 0, "px)") : 'unset',
|
|
197
196
|
bottom: isLeftPosition ? 'unset' : "calc(".concat(nodeDimension.bottom, " - ").concat((layoutAdjustment === null || layoutAdjustment === void 0 ? void 0 : layoutAdjustment.bottom) || 0, "px)")
|
|
198
197
|
});
|
|
199
|
-
}, [anchorName, isLeftPosition, nodeDimension
|
|
198
|
+
}, [nextNode === null || nextNode === void 0 ? void 0 : nextNode.type.name, anchorName, isLeftPosition, nodeDimension]);
|
|
200
199
|
var dropIndicatorPos = (0, _react.useMemo)(function () {
|
|
201
200
|
return isLeftPosition ? 'right' : 'left';
|
|
202
201
|
}, [isLeftPosition]);
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
2
|
import { fg } from '@atlaskit/platform-feature-flags';
|
|
3
|
-
import { moveNode } from './commands/move-node';
|
|
4
|
-
import { moveToLayout } from './commands/move-to-layout';
|
|
3
|
+
import { moveNode } from './editor-commands/move-node';
|
|
4
|
+
import { moveToLayout } from './editor-commands/move-to-layout';
|
|
5
5
|
import { createPlugin, key } from './pm-plugins/main';
|
|
6
|
+
import { selectNode } from './pm-plugins/utils';
|
|
6
7
|
import { DragHandleMenu } from './ui/drag-handle-menu';
|
|
7
8
|
import { GlobalStylesWrapper } from './ui/global-styles';
|
|
8
|
-
import { selectNode } from './utils';
|
|
9
9
|
export const blockControlsPlugin = ({
|
|
10
10
|
api
|
|
11
11
|
}) => ({
|