@atlaskit/editor-plugin-block-controls 2.15.9 → 2.15.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.
Files changed (8) hide show
  1. package/CHANGELOG.md +17 -0
  2. package/dist/cjs/pm-plugins/handle-mouse-over.js +14 -6
  3. package/dist/cjs/ui/drag-preview.js +11 -5
  4. package/dist/es2019/pm-plugins/handle-mouse-over.js +14 -6
  5. package/dist/es2019/ui/drag-preview.js +11 -5
  6. package/dist/esm/pm-plugins/handle-mouse-over.js +14 -6
  7. package/dist/esm/ui/drag-preview.js +11 -5
  8. package/package.json +2 -2
package/CHANGELOG.md CHANGED
@@ -1,5 +1,22 @@
1
1
  # @atlaskit/editor-plugin-block-controls
2
2
 
3
+ ## 2.15.11
4
+
5
+ ### Patch Changes
6
+
7
+ - [#178643](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/178643)
8
+ [`598b1dc3753cc`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/598b1dc3753cc) -
9
+ Fix instances of module level FG evaluation
10
+ - Updated dependencies
11
+
12
+ ## 2.15.10
13
+
14
+ ### Patch Changes
15
+
16
+ - [#179607](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/179607)
17
+ [`9873ddf82bfe6`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/9873ddf82bfe6) -
18
+ Add check for tabel row, to stop nested elements in table cells from being draggable
19
+
3
20
  ## 2.15.9
4
21
 
5
22
  ### Patch Changes
package/dist/cjs/pm-plugins/handle-mouse-over.js CHANGED
@@ -43,12 +43,20 @@ var handleMouseOver = exports.handleMouseOver = function handleMouseOver(view, e
43
43
  }
44
44
  var parentElement = (_rootElement$parentEl = rootElement.parentElement) === null || _rootElement$parentEl === void 0 ? void 0 : _rootElement$parentEl.closest('[data-drag-handler-anchor-name]');
45
45
  var parentElementType = parentElement === null || parentElement === void 0 ? void 0 : parentElement.getAttribute('data-drag-handler-node-type');
46
-
47
- // We want to exlude handles from showing for direct decendant of table nodes (i.e. nodes in cells)
48
- if (parentElement && parentElementType === 'table' && (0, _experiments.editorExperiment)('nested-dnd', true) && (0, _experiments.editorExperiment)('table-nested-dnd', false, {
49
- exposure: true
50
- })) {
51
- rootElement = parentElement;
46
+ if ((0, _experiments.editorExperiment)('advanced_layouts', true) && (0, _platformFeatureFlags.fg)('platform_editor_advanced_layouts_post_fix_patch_1')) {
47
+ // We want to exclude handles from showing for direct descendant of table nodes (i.e. nodes in cells)
48
+ if (parentElement && (parentElementType === 'table' || parentElementType === 'tableRow') && (0, _experiments.editorExperiment)('nested-dnd', true) && (0, _experiments.editorExperiment)('table-nested-dnd', false, {
49
+ exposure: true
50
+ })) {
51
+ rootElement = parentElement;
52
+ }
53
+ } else {
54
+ // We want to exclude handles from showing for direct descendant of table nodes (i.e. nodes in cells)
55
+ if (parentElement && parentElementType === 'table' && (0, _experiments.editorExperiment)('nested-dnd', true) && (0, _experiments.editorExperiment)('table-nested-dnd', false, {
56
+ exposure: true
57
+ })) {
58
+ rootElement = parentElement;
59
+ }
52
60
  }
53
61
  var anchorName = rootElement.getAttribute('data-drag-handler-anchor-name');
54
62
  // No need to update handle position if its already there
package/dist/cjs/ui/drag-preview.js CHANGED
@@ -7,14 +7,19 @@ exports.dragPreview = void 0;
7
7
  var _browser = require("@atlaskit/editor-common/browser");
8
8
  var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
9
9
  var _colors = require("@atlaskit/theme/colors");
10
- var previewStyle = {
11
- // eslint-disable-next-line @atlaskit/platform/no-module-level-eval
12
- borderColor: (0, _platformFeatureFlags.fg)('platform_editor_elements_drag_and_drop_ed_23189') ? "var(--ds-border, ".concat(_colors.N30, ")") : "var(--ds-border-focused, ".concat(_colors.B200, ")"),
10
+ var previewStyleNew = {
11
+ borderColor: "var(--ds-border, ".concat(_colors.N30, ")"),
13
12
  borderStyle: 'solid',
14
13
  borderRadius: "var(--ds-border-radius-100, 3px)",
15
14
  borderWidth: "var(--ds-border-width-outline, 2px)",
16
- // eslint-disable-next-line @atlaskit/platform/no-module-level-eval
17
- backgroundColor: (0, _platformFeatureFlags.fg)('platform_editor_elements_drag_and_drop_ed_23189') ? "var(--ds-skeleton-subtle, ".concat(_colors.N20, ")") : "var(--ds-blanket-selected, #388BFF14)"
15
+ backgroundColor: "var(--ds-skeleton-subtle, ".concat(_colors.N20, ")")
16
+ };
17
+ var previewStyleOld = {
18
+ borderColor: "var(--ds-border-focused, ".concat(_colors.B200, ")"),
19
+ borderStyle: 'solid',
20
+ borderRadius: "var(--ds-border-radius-100, 3px)",
21
+ borderWidth: "var(--ds-border-width-outline, 2px)",
22
+ backgroundColor: "var(--ds-blanket-selected, #388BFF14)"
18
23
  };
19
24
  var dragPreview = exports.dragPreview = function dragPreview(container, dom, nodeType) {
20
25
  var nodeContainer = dom;
@@ -36,6 +41,7 @@ var dragPreview = exports.dragPreview = function dragPreview(container, dom, nod
36
41
  var nodeContainerRect = nodeContainer.getBoundingClientRect();
37
42
  container.style.width = "".concat(nodeContainerRect.width, "px");
38
43
  container.style.height = "".concat(nodeContainerRect.height, "px");
44
+ var previewStyle = (0, _platformFeatureFlags.fg)('platform_editor_elements_drag_and_drop_ed_23189') ? previewStyleNew : previewStyleOld;
39
45
  if (shouldBeGenericPreview) {
40
46
  parent.style.border = "".concat(previewStyle.borderWidth, " ").concat(previewStyle.borderStyle, " ").concat(previewStyle.borderColor);
41
47
  parent.style.borderRadius = previewStyle.borderRadius;
package/dist/es2019/pm-plugins/handle-mouse-over.js CHANGED
@@ -38,12 +38,20 @@ export const handleMouseOver = (view, event, api) => {
38
38
  }
39
39
  const parentElement = (_rootElement$parentEl = rootElement.parentElement) === null || _rootElement$parentEl === void 0 ? void 0 : _rootElement$parentEl.closest('[data-drag-handler-anchor-name]');
40
40
  const parentElementType = parentElement === null || parentElement === void 0 ? void 0 : parentElement.getAttribute('data-drag-handler-node-type');
41
-
42
- // We want to exlude handles from showing for direct decendant of table nodes (i.e. nodes in cells)
43
- if (parentElement && parentElementType === 'table' && editorExperiment('nested-dnd', true) && editorExperiment('table-nested-dnd', false, {
44
- exposure: true
45
- })) {
46
- rootElement = parentElement;
41
+ if (editorExperiment('advanced_layouts', true) && fg('platform_editor_advanced_layouts_post_fix_patch_1')) {
42
+ // We want to exclude handles from showing for direct descendant of table nodes (i.e. nodes in cells)
43
+ if (parentElement && (parentElementType === 'table' || parentElementType === 'tableRow') && editorExperiment('nested-dnd', true) && editorExperiment('table-nested-dnd', false, {
44
+ exposure: true
45
+ })) {
46
+ rootElement = parentElement;
47
+ }
48
+ } else {
49
+ // We want to exclude handles from showing for direct descendant of table nodes (i.e. nodes in cells)
50
+ if (parentElement && parentElementType === 'table' && editorExperiment('nested-dnd', true) && editorExperiment('table-nested-dnd', false, {
51
+ exposure: true
52
+ })) {
53
+ rootElement = parentElement;
54
+ }
47
55
  }
48
56
  const anchorName = rootElement.getAttribute('data-drag-handler-anchor-name');
49
57
  // No need to update handle position if its already there
package/dist/es2019/ui/drag-preview.js CHANGED
@@ -1,14 +1,19 @@
1
1
  import { browser } from '@atlaskit/editor-common/browser';
2
2
  import { fg } from '@atlaskit/platform-feature-flags';
3
3
  import { B200, N20, N30 } from '@atlaskit/theme/colors';
4
- const previewStyle = {
5
- // eslint-disable-next-line @atlaskit/platform/no-module-level-eval
6
- borderColor: fg('platform_editor_elements_drag_and_drop_ed_23189') ? `var(--ds-border, ${N30})` : `var(--ds-border-focused, ${B200})`,
4
+ const previewStyleNew = {
5
+ borderColor: `var(--ds-border, ${N30})`,
7
6
  borderStyle: 'solid',
8
7
  borderRadius: "var(--ds-border-radius-100, 3px)",
9
8
  borderWidth: "var(--ds-border-width-outline, 2px)",
10
- // eslint-disable-next-line @atlaskit/platform/no-module-level-eval
11
- backgroundColor: fg('platform_editor_elements_drag_and_drop_ed_23189') ? `var(--ds-skeleton-subtle, ${N20})` : "var(--ds-blanket-selected, #388BFF14)"
9
+ backgroundColor: `var(--ds-skeleton-subtle, ${N20})`
10
+ };
11
+ const previewStyleOld = {
12
+ borderColor: `var(--ds-border-focused, ${B200})`,
13
+ borderStyle: 'solid',
14
+ borderRadius: "var(--ds-border-radius-100, 3px)",
15
+ borderWidth: "var(--ds-border-width-outline, 2px)",
16
+ backgroundColor: "var(--ds-blanket-selected, #388BFF14)"
12
17
  };
13
18
  export const dragPreview = (container, dom, nodeType) => {
14
19
  let nodeContainer = dom;
@@ -30,6 +35,7 @@ export const dragPreview = (container, dom, nodeType) => {
30
35
  const nodeContainerRect = nodeContainer.getBoundingClientRect();
31
36
  container.style.width = `${nodeContainerRect.width}px`;
32
37
  container.style.height = `${nodeContainerRect.height}px`;
38
+ const previewStyle = fg('platform_editor_elements_drag_and_drop_ed_23189') ? previewStyleNew : previewStyleOld;
33
39
  if (shouldBeGenericPreview) {
34
40
  parent.style.border = `${previewStyle.borderWidth} ${previewStyle.borderStyle} ${previewStyle.borderColor}`;
35
41
  parent.style.borderRadius = previewStyle.borderRadius;
package/dist/esm/pm-plugins/handle-mouse-over.js CHANGED
@@ -37,12 +37,20 @@ export var handleMouseOver = function handleMouseOver(view, event, api) {
37
37
  }
38
38
  var parentElement = (_rootElement$parentEl = rootElement.parentElement) === null || _rootElement$parentEl === void 0 ? void 0 : _rootElement$parentEl.closest('[data-drag-handler-anchor-name]');
39
39
  var parentElementType = parentElement === null || parentElement === void 0 ? void 0 : parentElement.getAttribute('data-drag-handler-node-type');
40
-
41
- // We want to exlude handles from showing for direct decendant of table nodes (i.e. nodes in cells)
42
- if (parentElement && parentElementType === 'table' && editorExperiment('nested-dnd', true) && editorExperiment('table-nested-dnd', false, {
43
- exposure: true
44
- })) {
45
- rootElement = parentElement;
40
+ if (editorExperiment('advanced_layouts', true) && fg('platform_editor_advanced_layouts_post_fix_patch_1')) {
41
+ // We want to exclude handles from showing for direct descendant of table nodes (i.e. nodes in cells)
42
+ if (parentElement && (parentElementType === 'table' || parentElementType === 'tableRow') && editorExperiment('nested-dnd', true) && editorExperiment('table-nested-dnd', false, {
43
+ exposure: true
44
+ })) {
45
+ rootElement = parentElement;
46
+ }
47
+ } else {
48
+ // We want to exclude handles from showing for direct descendant of table nodes (i.e. nodes in cells)
49
+ if (parentElement && parentElementType === 'table' && editorExperiment('nested-dnd', true) && editorExperiment('table-nested-dnd', false, {
50
+ exposure: true
51
+ })) {
52
+ rootElement = parentElement;
53
+ }
46
54
  }
47
55
  var anchorName = rootElement.getAttribute('data-drag-handler-anchor-name');
48
56
  // No need to update handle position if its already there
package/dist/esm/ui/drag-preview.js CHANGED
@@ -1,14 +1,19 @@
1
1
  import { browser } from '@atlaskit/editor-common/browser';
2
2
  import { fg } from '@atlaskit/platform-feature-flags';
3
3
  import { B200, N20, N30 } from '@atlaskit/theme/colors';
4
- var previewStyle = {
5
- // eslint-disable-next-line @atlaskit/platform/no-module-level-eval
6
- borderColor: fg('platform_editor_elements_drag_and_drop_ed_23189') ? "var(--ds-border, ".concat(N30, ")") : "var(--ds-border-focused, ".concat(B200, ")"),
4
+ var previewStyleNew = {
5
+ borderColor: "var(--ds-border, ".concat(N30, ")"),
7
6
  borderStyle: 'solid',
8
7
  borderRadius: "var(--ds-border-radius-100, 3px)",
9
8
  borderWidth: "var(--ds-border-width-outline, 2px)",
10
- // eslint-disable-next-line @atlaskit/platform/no-module-level-eval
11
- backgroundColor: fg('platform_editor_elements_drag_and_drop_ed_23189') ? "var(--ds-skeleton-subtle, ".concat(N20, ")") : "var(--ds-blanket-selected, #388BFF14)"
9
+ backgroundColor: "var(--ds-skeleton-subtle, ".concat(N20, ")")
10
+ };
11
+ var previewStyleOld = {
12
+ borderColor: "var(--ds-border-focused, ".concat(B200, ")"),
13
+ borderStyle: 'solid',
14
+ borderRadius: "var(--ds-border-radius-100, 3px)",
15
+ borderWidth: "var(--ds-border-width-outline, 2px)",
16
+ backgroundColor: "var(--ds-blanket-selected, #388BFF14)"
12
17
  };
13
18
  export var dragPreview = function dragPreview(container, dom, nodeType) {
14
19
  var nodeContainer = dom;
@@ -30,6 +35,7 @@ export var dragPreview = function dragPreview(container, dom, nodeType) {
30
35
  var nodeContainerRect = nodeContainer.getBoundingClientRect();
31
36
  container.style.width = "".concat(nodeContainerRect.width, "px");
32
37
  container.style.height = "".concat(nodeContainerRect.height, "px");
38
+ var previewStyle = fg('platform_editor_elements_drag_and_drop_ed_23189') ? previewStyleNew : previewStyleOld;
33
39
  if (shouldBeGenericPreview) {
34
40
  parent.style.border = "".concat(previewStyle.borderWidth, " ").concat(previewStyle.borderStyle, " ").concat(previewStyle.borderColor);
35
41
  parent.style.borderRadius = previewStyle.borderRadius;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-plugin-block-controls",
3
- "version": "2.15.9",
3
+ "version": "2.15.11",
4
4
  "description": "Block controls plugin for @atlaskit/editor-core",
5
5
  "author": "Atlassian Pty Ltd",
6
6
  "license": "Apache-2.0",
@@ -49,7 +49,7 @@
49
49
  "@atlaskit/primitives": "^13.3.0",
50
50
  "@atlaskit/theme": "^14.0.0",
51
51
  "@atlaskit/tmp-editor-statsig": "^2.27.0",
52
- "@atlaskit/tokens": "^2.4.0",
52
+ "@atlaskit/tokens": "^2.5.0",
53
53
  "@atlaskit/tooltip": "^19.0.0",
54
54
  "@babel/runtime": "^7.0.0",
55
55
  "@emotion/react": "^11.7.1",