@atlaskit/editor-plugin-synced-block 4.2.6 → 4.2.7
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 +7 -0
- package/dist/cjs/syncedBlockPluginType.js +1 -2
- package/dist/cjs/ui/CreateSyncedBlockDropdownItem.js +8 -8
- package/dist/es2019/pm-plugins/utils/selection-decorations.js +1 -1
- package/dist/es2019/syncedBlockPluginType.js +0 -1
- package/dist/es2019/ui/CreateSyncedBlockDropdownItem.js +8 -8
- package/dist/esm/pm-plugins/utils/selection-decorations.js +1 -1
- package/dist/esm/syncedBlockPluginType.js +0 -1
- package/dist/esm/ui/CreateSyncedBlockDropdownItem.js +8 -8
- package/dist/types/pm-plugins/utils/selection-decorations.d.ts +1 -1
- package/dist/types-ts4.5/pm-plugins/utils/selection-decorations.d.ts +1 -1
- package/package.json +3 -3
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,12 @@
|
|
|
1
1
|
# @atlaskit/editor-plugin-synced-block
|
|
2
2
|
|
|
3
|
+
## 4.2.7
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [`42b421f5241a4`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/42b421f5241a4) -
|
|
8
|
+
EDITOR-2865 Add menuTriggerByNode to block plugin state and use for sync block options
|
|
9
|
+
|
|
3
10
|
## 4.2.6
|
|
4
11
|
|
|
5
12
|
### Patch Changes
|
|
@@ -20,15 +20,15 @@ var CreateSyncedBlockDropdownItem = function CreateSyncedBlockDropdownItem(_ref)
|
|
|
20
20
|
var _useIntl = (0, _reactIntlNext.useIntl)(),
|
|
21
21
|
formatMessage = _useIntl.formatMessage;
|
|
22
22
|
var _useSharedPluginState = (0, _hooks.useSharedPluginStateWithSelector)(api, ['selection', 'blockControls'], function (states) {
|
|
23
|
-
var _states$selectionStat, _states$blockControls;
|
|
23
|
+
var _states$selectionStat, _states$blockControls, _states$blockControls2;
|
|
24
24
|
return {
|
|
25
25
|
selection: (_states$selectionStat = states.selectionState) === null || _states$selectionStat === void 0 ? void 0 : _states$selectionStat.selection,
|
|
26
|
-
|
|
26
|
+
menuTriggerByNode: (_states$blockControls = (_states$blockControls2 = states.blockControlsState) === null || _states$blockControls2 === void 0 ? void 0 : _states$blockControls2.menuTriggerByNode) !== null && _states$blockControls !== void 0 ? _states$blockControls : undefined
|
|
27
27
|
};
|
|
28
28
|
}),
|
|
29
29
|
selection = _useSharedPluginState.selection,
|
|
30
|
-
|
|
31
|
-
var isNested =
|
|
30
|
+
menuTriggerByNode = _useSharedPluginState.menuTriggerByNode;
|
|
31
|
+
var isNested = menuTriggerByNode && menuTriggerByNode.rootPos !== menuTriggerByNode.pos;
|
|
32
32
|
var canBeConverted = (0, _react.useMemo)(function () {
|
|
33
33
|
return selection && (0, _utils.canBeConvertedToSyncBlock)(selection);
|
|
34
34
|
}, [selection]);
|
|
@@ -80,13 +80,13 @@ var CopySyncedBlockDropdownItem = function CopySyncedBlockDropdownItem(_ref2) {
|
|
|
80
80
|
var CreateOrCopySyncedBlockDropdownItem = exports.CreateOrCopySyncedBlockDropdownItem = function CreateOrCopySyncedBlockDropdownItem(_ref3) {
|
|
81
81
|
var api = _ref3.api;
|
|
82
82
|
var _useSharedPluginState2 = (0, _hooks.useSharedPluginStateWithSelector)(api, ['blockControls'], function (states) {
|
|
83
|
-
var _states$
|
|
83
|
+
var _states$blockControls3, _states$blockControls4;
|
|
84
84
|
return {
|
|
85
|
-
|
|
85
|
+
menuTriggerByNode: (_states$blockControls3 = (_states$blockControls4 = states.blockControlsState) === null || _states$blockControls4 === void 0 ? void 0 : _states$blockControls4.menuTriggerByNode) !== null && _states$blockControls3 !== void 0 ? _states$blockControls3 : undefined
|
|
86
86
|
};
|
|
87
87
|
}),
|
|
88
|
-
|
|
89
|
-
if (
|
|
88
|
+
menuTriggerByNode = _useSharedPluginState2.menuTriggerByNode;
|
|
89
|
+
if ((menuTriggerByNode === null || menuTriggerByNode === void 0 ? void 0 : menuTriggerByNode.nodeType) === 'syncBlock' || (menuTriggerByNode === null || menuTriggerByNode === void 0 ? void 0 : menuTriggerByNode.nodeType) === 'bodiedSyncBlock') {
|
|
90
90
|
return /*#__PURE__*/_react.default.createElement(CopySyncedBlockDropdownItem, {
|
|
91
91
|
api: api
|
|
92
92
|
});
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { BodiedSyncBlockSharedCssClassName } from '@atlaskit/editor-common/sync-block';
|
|
2
2
|
import { findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
|
|
3
|
-
import { Decoration, DecorationSet } from
|
|
3
|
+
import { Decoration, DecorationSet } from '@atlaskit/editor-prosemirror/view';
|
|
4
4
|
export const calculateDecorations = (doc, selection, schema) => {
|
|
5
5
|
const {
|
|
6
6
|
bodiedSyncBlock
|
|
@@ -14,15 +14,15 @@ const CreateSyncedBlockDropdownItem = ({
|
|
|
14
14
|
} = useIntl();
|
|
15
15
|
const {
|
|
16
16
|
selection,
|
|
17
|
-
|
|
17
|
+
menuTriggerByNode
|
|
18
18
|
} = useSharedPluginStateWithSelector(api, ['selection', 'blockControls'], states => {
|
|
19
|
-
var _states$selectionStat, _states$blockControls;
|
|
19
|
+
var _states$selectionStat, _states$blockControls, _states$blockControls2;
|
|
20
20
|
return {
|
|
21
21
|
selection: (_states$selectionStat = states.selectionState) === null || _states$selectionStat === void 0 ? void 0 : _states$selectionStat.selection,
|
|
22
|
-
|
|
22
|
+
menuTriggerByNode: (_states$blockControls = (_states$blockControls2 = states.blockControlsState) === null || _states$blockControls2 === void 0 ? void 0 : _states$blockControls2.menuTriggerByNode) !== null && _states$blockControls !== void 0 ? _states$blockControls : undefined
|
|
23
23
|
};
|
|
24
24
|
});
|
|
25
|
-
const isNested =
|
|
25
|
+
const isNested = menuTriggerByNode && menuTriggerByNode.rootPos !== menuTriggerByNode.pos;
|
|
26
26
|
const canBeConverted = useMemo(() => selection && canBeConvertedToSyncBlock(selection), [selection]);
|
|
27
27
|
if (isNested || !canBeConverted) {
|
|
28
28
|
return null;
|
|
@@ -75,14 +75,14 @@ export const CreateOrCopySyncedBlockDropdownItem = ({
|
|
|
75
75
|
api
|
|
76
76
|
}) => {
|
|
77
77
|
const {
|
|
78
|
-
|
|
78
|
+
menuTriggerByNode
|
|
79
79
|
} = useSharedPluginStateWithSelector(api, ['blockControls'], states => {
|
|
80
|
-
var _states$
|
|
80
|
+
var _states$blockControls3, _states$blockControls4;
|
|
81
81
|
return {
|
|
82
|
-
|
|
82
|
+
menuTriggerByNode: (_states$blockControls3 = (_states$blockControls4 = states.blockControlsState) === null || _states$blockControls4 === void 0 ? void 0 : _states$blockControls4.menuTriggerByNode) !== null && _states$blockControls3 !== void 0 ? _states$blockControls3 : undefined
|
|
83
83
|
};
|
|
84
84
|
});
|
|
85
|
-
if (
|
|
85
|
+
if ((menuTriggerByNode === null || menuTriggerByNode === void 0 ? void 0 : menuTriggerByNode.nodeType) === 'syncBlock' || (menuTriggerByNode === null || menuTriggerByNode === void 0 ? void 0 : menuTriggerByNode.nodeType) === 'bodiedSyncBlock') {
|
|
86
86
|
return /*#__PURE__*/React.createElement(CopySyncedBlockDropdownItem, {
|
|
87
87
|
api: api
|
|
88
88
|
});
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { BodiedSyncBlockSharedCssClassName } from '@atlaskit/editor-common/sync-block';
|
|
2
2
|
import { findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
|
|
3
|
-
import { Decoration, DecorationSet } from
|
|
3
|
+
import { Decoration, DecorationSet } from '@atlaskit/editor-prosemirror/view';
|
|
4
4
|
export var calculateDecorations = function calculateDecorations(doc, selection, schema) {
|
|
5
5
|
var bodiedSyncBlock = schema.nodes.bodiedSyncBlock;
|
|
6
6
|
var syncBlockParent = findParentNodeOfType(bodiedSyncBlock)(selection);
|
|
@@ -11,15 +11,15 @@ var CreateSyncedBlockDropdownItem = function CreateSyncedBlockDropdownItem(_ref)
|
|
|
11
11
|
var _useIntl = useIntl(),
|
|
12
12
|
formatMessage = _useIntl.formatMessage;
|
|
13
13
|
var _useSharedPluginState = useSharedPluginStateWithSelector(api, ['selection', 'blockControls'], function (states) {
|
|
14
|
-
var _states$selectionStat, _states$blockControls;
|
|
14
|
+
var _states$selectionStat, _states$blockControls, _states$blockControls2;
|
|
15
15
|
return {
|
|
16
16
|
selection: (_states$selectionStat = states.selectionState) === null || _states$selectionStat === void 0 ? void 0 : _states$selectionStat.selection,
|
|
17
|
-
|
|
17
|
+
menuTriggerByNode: (_states$blockControls = (_states$blockControls2 = states.blockControlsState) === null || _states$blockControls2 === void 0 ? void 0 : _states$blockControls2.menuTriggerByNode) !== null && _states$blockControls !== void 0 ? _states$blockControls : undefined
|
|
18
18
|
};
|
|
19
19
|
}),
|
|
20
20
|
selection = _useSharedPluginState.selection,
|
|
21
|
-
|
|
22
|
-
var isNested =
|
|
21
|
+
menuTriggerByNode = _useSharedPluginState.menuTriggerByNode;
|
|
22
|
+
var isNested = menuTriggerByNode && menuTriggerByNode.rootPos !== menuTriggerByNode.pos;
|
|
23
23
|
var canBeConverted = useMemo(function () {
|
|
24
24
|
return selection && canBeConvertedToSyncBlock(selection);
|
|
25
25
|
}, [selection]);
|
|
@@ -71,13 +71,13 @@ var CopySyncedBlockDropdownItem = function CopySyncedBlockDropdownItem(_ref2) {
|
|
|
71
71
|
export var CreateOrCopySyncedBlockDropdownItem = function CreateOrCopySyncedBlockDropdownItem(_ref3) {
|
|
72
72
|
var api = _ref3.api;
|
|
73
73
|
var _useSharedPluginState2 = useSharedPluginStateWithSelector(api, ['blockControls'], function (states) {
|
|
74
|
-
var _states$
|
|
74
|
+
var _states$blockControls3, _states$blockControls4;
|
|
75
75
|
return {
|
|
76
|
-
|
|
76
|
+
menuTriggerByNode: (_states$blockControls3 = (_states$blockControls4 = states.blockControlsState) === null || _states$blockControls4 === void 0 ? void 0 : _states$blockControls4.menuTriggerByNode) !== null && _states$blockControls3 !== void 0 ? _states$blockControls3 : undefined
|
|
77
77
|
};
|
|
78
78
|
}),
|
|
79
|
-
|
|
80
|
-
if (
|
|
79
|
+
menuTriggerByNode = _useSharedPluginState2.menuTriggerByNode;
|
|
80
|
+
if ((menuTriggerByNode === null || menuTriggerByNode === void 0 ? void 0 : menuTriggerByNode.nodeType) === 'syncBlock' || (menuTriggerByNode === null || menuTriggerByNode === void 0 ? void 0 : menuTriggerByNode.nodeType) === 'bodiedSyncBlock') {
|
|
81
81
|
return /*#__PURE__*/React.createElement(CopySyncedBlockDropdownItem, {
|
|
82
82
|
api: api
|
|
83
83
|
});
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import type { Node as PMNode, Schema } from '@atlaskit/editor-prosemirror/model';
|
|
2
2
|
import type { Selection } from '@atlaskit/editor-prosemirror/state';
|
|
3
|
-
import { DecorationSet } from
|
|
3
|
+
import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
|
|
4
4
|
export declare const calculateDecorations: (doc: PMNode, selection: Selection, schema: Schema) => DecorationSet;
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import type { Node as PMNode, Schema } from '@atlaskit/editor-prosemirror/model';
|
|
2
2
|
import type { Selection } from '@atlaskit/editor-prosemirror/state';
|
|
3
|
-
import { DecorationSet } from
|
|
3
|
+
import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
|
|
4
4
|
export declare const calculateDecorations: (doc: PMNode, selection: Selection, schema: Schema) => DecorationSet;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atlaskit/editor-plugin-synced-block",
|
|
3
|
-
"version": "4.2.
|
|
3
|
+
"version": "4.2.7",
|
|
4
4
|
"description": "SyncedBlock plugin for @atlaskit/editor-core",
|
|
5
5
|
"author": "Atlassian Pty Ltd",
|
|
6
6
|
"license": "Apache-2.0",
|
|
@@ -45,7 +45,7 @@
|
|
|
45
45
|
"@atlaskit/icon-lab": "^5.12.0",
|
|
46
46
|
"@atlaskit/logo": "^19.9.0",
|
|
47
47
|
"@atlaskit/lozenge": "^13.1.0",
|
|
48
|
-
"@atlaskit/modal-dialog": "^14.
|
|
48
|
+
"@atlaskit/modal-dialog": "^14.7.0",
|
|
49
49
|
"@atlaskit/primitives": "^16.1.0",
|
|
50
50
|
"@atlaskit/tooltip": "^20.8.0",
|
|
51
51
|
"@atlaskit/visually-hidden": "^3.0.0",
|
|
@@ -53,7 +53,7 @@
|
|
|
53
53
|
"react-intl-next": "npm:react-intl@^5.18.1"
|
|
54
54
|
},
|
|
55
55
|
"peerDependencies": {
|
|
56
|
-
"@atlaskit/editor-common": "^110.
|
|
56
|
+
"@atlaskit/editor-common": "^110.29.0",
|
|
57
57
|
"react": "^18.2.0"
|
|
58
58
|
},
|
|
59
59
|
"devDependencies": {
|