@atlaskit/editor-plugin-block-controls 1.13.6 → 1.13.8

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 (6) hide show
  1. package/CHANGELOG.md +14 -0
  2. package/dist/cjs/pm-plugins/handle-mouse-over.js +13 -4
  3. package/dist/cjs/ui/empty-block-experiment/widget.js +1 -1
  4. package/dist/es2019/pm-plugins/handle-mouse-over.js +10 -1
  5. package/dist/esm/pm-plugins/handle-mouse-over.js +13 -4
  6. package/package.json +2 -2
package/CHANGELOG.md CHANGED
@@ -1,5 +1,19 @@
1
1
  # @atlaskit/editor-plugin-block-controls
2
2
 
3
+ ## 1.13.8
4
+
5
+ ### Patch Changes
6
+
7
+ - [#139292](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/139292)
8
+ [`9e05a4e4221a3`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/9e05a4e4221a3) -
9
+ [ux] ED-24414 Hide drag handle for first nested node in panel
10
+
11
+ ## 1.13.7
12
+
13
+ ### Patch Changes
14
+
15
+ - Updated dependencies
16
+
3
17
  ## 1.13.6
4
18
 
5
19
  ### Patch Changes
package/dist/cjs/pm-plugins/handle-mouse-over.js CHANGED
@@ -37,7 +37,16 @@ var handleMouseOver = exports.handleMouseOver = function handleMouseOver(view, e
37
37
  return false;
38
38
  }
39
39
  var parentElement = (_rootElement$parentEl = rootElement.parentElement) === null || _rootElement$parentEl === void 0 ? void 0 : _rootElement$parentEl.closest('[data-drag-handler-anchor-name]');
40
- if (parentElement && parentElement.getAttribute('data-drag-handler-node-type') === 'table' && (0, _experiments.editorExperiment)('nested-dnd', true) && (0, _experiments.editorExperiment)('table-nested-dnd', false, {
40
+ var parentElementType = parentElement === null || parentElement === void 0 ? void 0 : parentElement.getAttribute('data-drag-handler-node-type');
41
+ if (parentElement && parentElementType === 'panel' && (0, _experiments.editorExperiment)('nested-dnd', true)) {
42
+ var eventTargetPos = view.posAtDOM(rootElement, 0, -1);
43
+ var $eventTargetPos = view.state.doc.resolve(eventTargetPos);
44
+ var depth = $eventTargetPos.depth > 1 ? $eventTargetPos.depth - 1 : $eventTargetPos.depth;
45
+ if ($eventTargetPos.node(depth).firstChild === $eventTargetPos.node()) {
46
+ return false;
47
+ }
48
+ }
49
+ if (parentElement && parentElementType === 'table' && (0, _experiments.editorExperiment)('nested-dnd', true) && (0, _experiments.editorExperiment)('table-nested-dnd', false, {
41
50
  exposure: true
42
51
  })) {
43
52
  rootElement = parentElement;
@@ -57,7 +66,7 @@ var handleMouseOver = exports.handleMouseOver = function handleMouseOver(view, e
57
66
  })) {
58
67
  var _$rootPos$parent, _$rootPos$parent2, _$rootPos$nodeAfter;
59
68
  var $rootPos = view.state.doc.resolve(pos);
60
- var depth = $rootPos.depth;
69
+ var _depth = $rootPos.depth;
61
70
  var isParentAnIsolatingNode = ((_$rootPos$parent = $rootPos.parent) === null || _$rootPos$parent === void 0 ? void 0 : _$rootPos$parent.type.name) !== 'doc' && ((_$rootPos$parent2 = $rootPos.parent) === null || _$rootPos$parent2 === void 0 ? void 0 : _$rootPos$parent2.type.spec.isolating);
62
71
  var isCurrentNodeAtom = (_$rootPos$nodeAfter = $rootPos.nodeAfter) === null || _$rootPos$nodeAfter === void 0 ? void 0 : _$rootPos$nodeAfter.isAtom;
63
72
 
@@ -68,8 +77,8 @@ var handleMouseOver = exports.handleMouseOver = function handleMouseOver(view, e
68
77
  * We maintain the original position by adding 1 to the depth.
69
78
  * This prevents the decoration from being inserted in the wrong position, like between table cells.
70
79
  */
71
- var posDepth = isParentAnIsolatingNode && isCurrentNodeAtom ? depth + 1 : depth;
72
- rootPos = depth ? $rootPos.before(posDepth) : $rootPos.pos;
80
+ var posDepth = isParentAnIsolatingNode && isCurrentNodeAtom ? _depth + 1 : _depth;
81
+ rootPos = _depth ? $rootPos.before(posDepth) : $rootPos.pos;
73
82
  } else {
74
83
  rootPos = view.state.doc.resolve(pos).start(1) - 1;
75
84
  }
package/dist/cjs/ui/empty-block-experiment/widget.js CHANGED
@@ -18,7 +18,7 @@ var _add = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/add"));
18
18
  var _primitives = require("@atlaskit/primitives");
19
19
  var _tooltip = _interopRequireDefault(require("@atlaskit/tooltip"));
20
20
  function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
21
- function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
21
+ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
22
22
  var wrapperStyles = (0, _primitives.xcss)({
23
23
  position: 'absolute',
24
24
  top: "calc('50%' - ".concat("var(--ds-space-150, 12px)", ")"),
package/dist/es2019/pm-plugins/handle-mouse-over.js CHANGED
@@ -32,7 +32,16 @@ export const handleMouseOver = (view, event, api) => {
32
32
  return false;
33
33
  }
34
34
  const parentElement = (_rootElement$parentEl = rootElement.parentElement) === null || _rootElement$parentEl === void 0 ? void 0 : _rootElement$parentEl.closest('[data-drag-handler-anchor-name]');
35
- if (parentElement && parentElement.getAttribute('data-drag-handler-node-type') === 'table' && editorExperiment('nested-dnd', true) && editorExperiment('table-nested-dnd', false, {
35
+ const parentElementType = parentElement === null || parentElement === void 0 ? void 0 : parentElement.getAttribute('data-drag-handler-node-type');
36
+ if (parentElement && parentElementType === 'panel' && editorExperiment('nested-dnd', true)) {
37
+ const eventTargetPos = view.posAtDOM(rootElement, 0, -1);
38
+ const $eventTargetPos = view.state.doc.resolve(eventTargetPos);
39
+ const depth = $eventTargetPos.depth > 1 ? $eventTargetPos.depth - 1 : $eventTargetPos.depth;
40
+ if ($eventTargetPos.node(depth).firstChild === $eventTargetPos.node()) {
41
+ return false;
42
+ }
43
+ }
44
+ if (parentElement && parentElementType === 'table' && editorExperiment('nested-dnd', true) && editorExperiment('table-nested-dnd', false, {
36
45
  exposure: true
37
46
  })) {
38
47
  rootElement = parentElement;
package/dist/esm/pm-plugins/handle-mouse-over.js CHANGED
@@ -31,7 +31,16 @@ export var handleMouseOver = function handleMouseOver(view, event, api) {
31
31
  return false;
32
32
  }
33
33
  var parentElement = (_rootElement$parentEl = rootElement.parentElement) === null || _rootElement$parentEl === void 0 ? void 0 : _rootElement$parentEl.closest('[data-drag-handler-anchor-name]');
34
- if (parentElement && parentElement.getAttribute('data-drag-handler-node-type') === 'table' && editorExperiment('nested-dnd', true) && editorExperiment('table-nested-dnd', false, {
34
+ var parentElementType = parentElement === null || parentElement === void 0 ? void 0 : parentElement.getAttribute('data-drag-handler-node-type');
35
+ if (parentElement && parentElementType === 'panel' && editorExperiment('nested-dnd', true)) {
36
+ var eventTargetPos = view.posAtDOM(rootElement, 0, -1);
37
+ var $eventTargetPos = view.state.doc.resolve(eventTargetPos);
38
+ var depth = $eventTargetPos.depth > 1 ? $eventTargetPos.depth - 1 : $eventTargetPos.depth;
39
+ if ($eventTargetPos.node(depth).firstChild === $eventTargetPos.node()) {
40
+ return false;
41
+ }
42
+ }
43
+ if (parentElement && parentElementType === 'table' && editorExperiment('nested-dnd', true) && editorExperiment('table-nested-dnd', false, {
35
44
  exposure: true
36
45
  })) {
37
46
  rootElement = parentElement;
@@ -51,7 +60,7 @@ export var handleMouseOver = function handleMouseOver(view, event, api) {
51
60
  })) {
52
61
  var _$rootPos$parent, _$rootPos$parent2, _$rootPos$nodeAfter;
53
62
  var $rootPos = view.state.doc.resolve(pos);
54
- var depth = $rootPos.depth;
63
+ var _depth = $rootPos.depth;
55
64
  var isParentAnIsolatingNode = ((_$rootPos$parent = $rootPos.parent) === null || _$rootPos$parent === void 0 ? void 0 : _$rootPos$parent.type.name) !== 'doc' && ((_$rootPos$parent2 = $rootPos.parent) === null || _$rootPos$parent2 === void 0 ? void 0 : _$rootPos$parent2.type.spec.isolating);
56
65
  var isCurrentNodeAtom = (_$rootPos$nodeAfter = $rootPos.nodeAfter) === null || _$rootPos$nodeAfter === void 0 ? void 0 : _$rootPos$nodeAfter.isAtom;
57
66
 
@@ -62,8 +71,8 @@ export var handleMouseOver = function handleMouseOver(view, event, api) {
62
71
  * We maintain the original position by adding 1 to the depth.
63
72
  * This prevents the decoration from being inserted in the wrong position, like between table cells.
64
73
  */
65
- var posDepth = isParentAnIsolatingNode && isCurrentNodeAtom ? depth + 1 : depth;
66
- rootPos = depth ? $rootPos.before(posDepth) : $rootPos.pos;
74
+ var posDepth = isParentAnIsolatingNode && isCurrentNodeAtom ? _depth + 1 : _depth;
75
+ rootPos = _depth ? $rootPos.before(posDepth) : $rootPos.pos;
67
76
  } else {
68
77
  rootPos = view.state.doc.resolve(pos).start(1) - 1;
69
78
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-plugin-block-controls",
3
- "version": "1.13.6",
3
+ "version": "1.13.8",
4
4
  "description": "Block controls plugin for @atlaskit/editor-core",
5
5
  "author": "Atlassian Pty Ltd",
6
6
  "license": "Apache-2.0",
@@ -30,7 +30,7 @@
30
30
  ".": "./src/index.ts"
31
31
  },
32
32
  "dependencies": {
33
- "@atlaskit/editor-common": "^88.13.0",
33
+ "@atlaskit/editor-common": "^89.0.0",
34
34
  "@atlaskit/editor-plugin-accessibility-utils": "^1.2.0",
35
35
  "@atlaskit/editor-plugin-analytics": "^1.8.0",
36
36
  "@atlaskit/editor-plugin-editor-disabled": "^1.3.0",