@atlaskit/editor-plugin-block-controls 1.13.7 → 1.13.9
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
CHANGED
|
@@ -1,5 +1,22 @@
|
|
|
1
1
|
# @atlaskit/editor-plugin-block-controls
|
|
2
2
|
|
|
3
|
+
## 1.13.9
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [#139334](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/139334)
|
|
8
|
+
[`30793649657c0`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/30793649657c0) -
|
|
9
|
+
[HOT-111629] We had an incident where the last character disappears when hitting the enter key on
|
|
10
|
+
windows OS for Korean characters. Bumping to prosemirror-view@1.34.2 for the fix.
|
|
11
|
+
|
|
12
|
+
## 1.13.8
|
|
13
|
+
|
|
14
|
+
### Patch Changes
|
|
15
|
+
|
|
16
|
+
- [#139292](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/139292)
|
|
17
|
+
[`9e05a4e4221a3`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/9e05a4e4221a3) -
|
|
18
|
+
[ux] ED-24414 Hide drag handle for first nested node in panel
|
|
19
|
+
|
|
3
20
|
## 1.13.7
|
|
4
21
|
|
|
5
22
|
### Patch Changes
|
|
@@ -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
|
-
|
|
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
|
|
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 ?
|
|
72
|
-
rootPos =
|
|
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
|
}
|
|
@@ -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
|
-
|
|
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;
|
|
@@ -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
|
-
|
|
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
|
|
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 ?
|
|
66
|
-
rootPos =
|
|
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.
|
|
3
|
+
"version": "1.13.9",
|
|
4
4
|
"description": "Block controls plugin for @atlaskit/editor-core",
|
|
5
5
|
"author": "Atlassian Pty Ltd",
|
|
6
6
|
"license": "Apache-2.0",
|
|
@@ -37,7 +37,7 @@
|
|
|
37
37
|
"@atlaskit/editor-plugin-feature-flags": "^1.2.0",
|
|
38
38
|
"@atlaskit/editor-plugin-quick-insert": "^1.3.0",
|
|
39
39
|
"@atlaskit/editor-plugin-width": "^1.3.0",
|
|
40
|
-
"@atlaskit/editor-prosemirror": "
|
|
40
|
+
"@atlaskit/editor-prosemirror": "6.0.0",
|
|
41
41
|
"@atlaskit/editor-shared-styles": "^2.13.0",
|
|
42
42
|
"@atlaskit/editor-tables": "^2.8.0",
|
|
43
43
|
"@atlaskit/icon": "^22.16.0",
|