@atlaskit/editor-core 204.4.7 → 204.5.0
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 +26 -0
- package/dist/cjs/actions/index.js +49 -44
- package/dist/cjs/utils/extensions.js +13 -6
- package/dist/cjs/version-wrapper.js +1 -1
- package/dist/es2019/actions/index.js +2 -2
- package/dist/es2019/utils/extensions.js +10 -5
- package/dist/es2019/version-wrapper.js +1 -1
- package/dist/esm/actions/index.js +49 -44
- package/dist/esm/utils/extensions.js +13 -6
- package/dist/esm/version-wrapper.js +1 -1
- package/dist/types/actions/index.d.ts +2 -2
- package/dist/types-ts4.5/actions/index.d.ts +2 -2
- package/package.json +16 -5
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,31 @@
|
|
|
1
1
|
# @atlaskit/editor-core
|
|
2
2
|
|
|
3
|
+
## 204.5.0
|
|
4
|
+
|
|
5
|
+
### Minor Changes
|
|
6
|
+
|
|
7
|
+
- [#126044](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/126044)
|
|
8
|
+
[`c397a5e304fa9`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/c397a5e304fa9) -
|
|
9
|
+
ED-26926 Moved findInsertLocation to editor-common and used it to add insertLocation to extension
|
|
10
|
+
insertion analytics
|
|
11
|
+
|
|
12
|
+
### Patch Changes
|
|
13
|
+
|
|
14
|
+
- Updated dependencies
|
|
15
|
+
|
|
16
|
+
## 204.4.8
|
|
17
|
+
|
|
18
|
+
### Patch Changes
|
|
19
|
+
|
|
20
|
+
- [#124114](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/124114)
|
|
21
|
+
[`a0b9383dc1bf3`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/a0b9383dc1bf3) -
|
|
22
|
+
CEPS-362: add reason to getResolvedEditorState call chain, to allow collab provider/NCS to
|
|
23
|
+
differentiate between draft sync and publish use cases
|
|
24
|
+
- [#125450](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/125450)
|
|
25
|
+
[`e3e99633b852e`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/e3e99633b852e) -
|
|
26
|
+
[ux] ED-26944 fix indentation in list for non macro bodied extension
|
|
27
|
+
- Updated dependencies
|
|
28
|
+
|
|
3
29
|
## 204.4.7
|
|
4
30
|
|
|
5
31
|
### Patch Changes
|
|
@@ -55,50 +55,55 @@ var EditorActions = exports.default = /*#__PURE__*/function () {
|
|
|
55
55
|
* refers to the latest state of editor with confirmed
|
|
56
56
|
* steps.
|
|
57
57
|
*/
|
|
58
|
-
(0, _defineProperty2.default)(this, "getResolvedEditorState", /*#__PURE__*/
|
|
59
|
-
var
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
58
|
+
(0, _defineProperty2.default)(this, "getResolvedEditorState", /*#__PURE__*/function () {
|
|
59
|
+
var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(reason) {
|
|
60
|
+
var _this$getFeatureFlags, useNativeCollabPlugin, editorValue, editorView, collabEditState;
|
|
61
|
+
return _regenerator.default.wrap(function _callee$(_context) {
|
|
62
|
+
while (1) switch (_context.prev = _context.next) {
|
|
63
|
+
case 0:
|
|
64
|
+
_this$getFeatureFlags = _this.getFeatureFlags(), useNativeCollabPlugin = _this$getFeatureFlags.useNativeCollabPlugin;
|
|
65
|
+
if (_this.editorView) {
|
|
66
|
+
_context.next = 3;
|
|
67
|
+
break;
|
|
68
|
+
}
|
|
69
|
+
throw new Error('Called getResolvedEditorState before editorView is ready');
|
|
70
|
+
case 3:
|
|
71
|
+
if (useNativeCollabPlugin) {
|
|
72
|
+
_context.next = 10;
|
|
73
|
+
break;
|
|
74
|
+
}
|
|
75
|
+
_context.next = 6;
|
|
76
|
+
return _this.getValue();
|
|
77
|
+
case 6:
|
|
78
|
+
editorValue = _context.sent;
|
|
79
|
+
if (editorValue) {
|
|
80
|
+
_context.next = 9;
|
|
81
|
+
break;
|
|
82
|
+
}
|
|
83
|
+
throw new Error('editorValue is undefined');
|
|
84
|
+
case 9:
|
|
85
|
+
return _context.abrupt("return", {
|
|
86
|
+
content: editorValue,
|
|
87
|
+
title: null,
|
|
88
|
+
stepVersion: -1
|
|
89
|
+
});
|
|
90
|
+
case 10:
|
|
91
|
+
editorView = _this.editorView;
|
|
92
|
+
_context.next = 13;
|
|
93
|
+
return (0, _action.getEditorValueWithMedia)(editorView);
|
|
94
|
+
case 13:
|
|
95
|
+
collabEditState = fakePluginKey.getState(editorView.state);
|
|
96
|
+
return _context.abrupt("return", collabEditState === null || collabEditState === void 0 ? void 0 : collabEditState.getFinalAcknowledgedState(reason));
|
|
97
|
+
case 15:
|
|
98
|
+
case "end":
|
|
99
|
+
return _context.stop();
|
|
100
|
+
}
|
|
101
|
+
}, _callee);
|
|
102
|
+
}));
|
|
103
|
+
return function (_x) {
|
|
104
|
+
return _ref.apply(this, arguments);
|
|
105
|
+
};
|
|
106
|
+
}());
|
|
102
107
|
}
|
|
103
108
|
return (0, _createClass2.default)(EditorActions, [{
|
|
104
109
|
key: "_privateGetEditorView",
|
|
@@ -8,28 +8,35 @@ exports.combineQuickInsertProviders = combineQuickInsertProviders;
|
|
|
8
8
|
exports.extensionProviderToQuickInsertProvider = extensionProviderToQuickInsertProvider;
|
|
9
9
|
var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
|
|
10
10
|
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
|
|
11
|
+
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
11
12
|
var _react = _interopRequireDefault(require("react"));
|
|
12
13
|
var _reactLoadable = _interopRequireDefault(require("react-loadable"));
|
|
13
14
|
var _analytics = require("@atlaskit/editor-common/analytics");
|
|
14
15
|
var _extensions = require("@atlaskit/editor-common/extensions");
|
|
15
16
|
var _providerHelpers = require("@atlaskit/editor-common/provider-helpers");
|
|
17
|
+
var _analytics2 = require("@atlaskit/editor-common/utils/analytics");
|
|
16
18
|
var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
|
|
19
|
+
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; }
|
|
20
|
+
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; }
|
|
17
21
|
/**
|
|
18
22
|
* Utils to send analytics event when a extension is inserted using quickInsert
|
|
19
23
|
*/
|
|
20
|
-
function sendExtensionQuickInsertAnalytics(item, createAnalyticsEvent, source) {
|
|
24
|
+
function sendExtensionQuickInsertAnalytics(item, selection, createAnalyticsEvent, source) {
|
|
21
25
|
if (createAnalyticsEvent) {
|
|
26
|
+
var insertLocation = (0, _platformFeatureFlags.fg)('platform_nested_nbm_analytics_location') ? (0, _analytics2.findInsertLocation)(selection) : undefined;
|
|
22
27
|
(0, _analytics.fireAnalyticsEvent)(createAnalyticsEvent)({
|
|
23
28
|
payload: {
|
|
24
29
|
action: _analytics.ACTION.INSERTED,
|
|
25
30
|
actionSubject: _analytics.ACTION_SUBJECT.DOCUMENT,
|
|
26
31
|
actionSubjectId: _analytics.ACTION_SUBJECT_ID.EXTENSION,
|
|
27
|
-
attributes: {
|
|
32
|
+
attributes: _objectSpread({
|
|
28
33
|
extensionType: item.extensionType,
|
|
29
34
|
extensionKey: item.extensionKey,
|
|
30
35
|
key: item.key,
|
|
31
36
|
inputMethod: source || _analytics.INPUT_METHOD.QUICK_INSERT
|
|
32
|
-
},
|
|
37
|
+
}, insertLocation ? {
|
|
38
|
+
insertLocation: insertLocation
|
|
39
|
+
} : {}),
|
|
33
40
|
eventType: _analytics.EVENT_TYPE.TRACK
|
|
34
41
|
}
|
|
35
42
|
});
|
|
@@ -81,7 +88,7 @@ function _extensionProviderToQuickInsertProvider() {
|
|
|
81
88
|
// Therefore this should always be run unless there is something very wrong.
|
|
82
89
|
if (extensionAPI) {
|
|
83
90
|
(0, _extensions.resolveImport)(item.node(extensionAPI)).then(function (node) {
|
|
84
|
-
sendExtensionQuickInsertAnalytics(item, createAnalyticsEvent, source);
|
|
91
|
+
sendExtensionQuickInsertAnalytics(item, state.selection, createAnalyticsEvent, source);
|
|
85
92
|
if (node) {
|
|
86
93
|
editorActions.replaceSelection(node);
|
|
87
94
|
}
|
|
@@ -90,7 +97,7 @@ function _extensionProviderToQuickInsertProvider() {
|
|
|
90
97
|
} else {
|
|
91
98
|
// @ts-expect-error No longer supported without extension API - this will be removed once we cleanup the FG.
|
|
92
99
|
(0, _extensions.resolveImport)(item.node()).then(function (node) {
|
|
93
|
-
sendExtensionQuickInsertAnalytics(item, createAnalyticsEvent, source);
|
|
100
|
+
sendExtensionQuickInsertAnalytics(item, state.selection, createAnalyticsEvent, source);
|
|
94
101
|
if (node) {
|
|
95
102
|
editorActions.replaceSelection(node);
|
|
96
103
|
}
|
|
@@ -98,7 +105,7 @@ function _extensionProviderToQuickInsertProvider() {
|
|
|
98
105
|
}
|
|
99
106
|
return insert('');
|
|
100
107
|
} else {
|
|
101
|
-
sendExtensionQuickInsertAnalytics(item, createAnalyticsEvent, source);
|
|
108
|
+
sendExtensionQuickInsertAnalytics(item, state.selection, createAnalyticsEvent, source);
|
|
102
109
|
return insert(item.node);
|
|
103
110
|
}
|
|
104
111
|
}
|
|
@@ -43,7 +43,7 @@ export default class EditorActions {
|
|
|
43
43
|
* refers to the latest state of editor with confirmed
|
|
44
44
|
* steps.
|
|
45
45
|
*/
|
|
46
|
-
_defineProperty(this, "getResolvedEditorState", async
|
|
46
|
+
_defineProperty(this, "getResolvedEditorState", async reason => {
|
|
47
47
|
const {
|
|
48
48
|
useNativeCollabPlugin
|
|
49
49
|
} = this.getFeatureFlags();
|
|
@@ -64,7 +64,7 @@ export default class EditorActions {
|
|
|
64
64
|
const editorView = this.editorView;
|
|
65
65
|
await getEditorValueWithMedia(editorView);
|
|
66
66
|
const collabEditState = fakePluginKey.getState(editorView.state);
|
|
67
|
-
return collabEditState === null || collabEditState === void 0 ? void 0 : collabEditState.getFinalAcknowledgedState();
|
|
67
|
+
return collabEditState === null || collabEditState === void 0 ? void 0 : collabEditState.getFinalAcknowledgedState(reason);
|
|
68
68
|
});
|
|
69
69
|
}
|
|
70
70
|
static from(view, eventDispatcher, transformer) {
|
|
@@ -3,12 +3,14 @@ import Loadable from 'react-loadable';
|
|
|
3
3
|
import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, fireAnalyticsEvent, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
|
|
4
4
|
import { getQuickInsertItemsFromModule, resolveImport } from '@atlaskit/editor-common/extensions';
|
|
5
5
|
import { combineProviders } from '@atlaskit/editor-common/provider-helpers';
|
|
6
|
+
import { findInsertLocation } from '@atlaskit/editor-common/utils/analytics';
|
|
6
7
|
import { fg } from '@atlaskit/platform-feature-flags';
|
|
7
8
|
/**
|
|
8
9
|
* Utils to send analytics event when a extension is inserted using quickInsert
|
|
9
10
|
*/
|
|
10
|
-
function sendExtensionQuickInsertAnalytics(item, createAnalyticsEvent, source) {
|
|
11
|
+
function sendExtensionQuickInsertAnalytics(item, selection, createAnalyticsEvent, source) {
|
|
11
12
|
if (createAnalyticsEvent) {
|
|
13
|
+
const insertLocation = fg('platform_nested_nbm_analytics_location') ? findInsertLocation(selection) : undefined;
|
|
12
14
|
fireAnalyticsEvent(createAnalyticsEvent)({
|
|
13
15
|
payload: {
|
|
14
16
|
action: ACTION.INSERTED,
|
|
@@ -18,7 +20,10 @@ function sendExtensionQuickInsertAnalytics(item, createAnalyticsEvent, source) {
|
|
|
18
20
|
extensionType: item.extensionType,
|
|
19
21
|
extensionKey: item.extensionKey,
|
|
20
22
|
key: item.key,
|
|
21
|
-
inputMethod: source || INPUT_METHOD.QUICK_INSERT
|
|
23
|
+
inputMethod: source || INPUT_METHOD.QUICK_INSERT,
|
|
24
|
+
...(insertLocation ? {
|
|
25
|
+
insertLocation
|
|
26
|
+
} : {})
|
|
22
27
|
},
|
|
23
28
|
eventType: EVENT_TYPE.TRACK
|
|
24
29
|
}
|
|
@@ -55,7 +60,7 @@ export async function extensionProviderToQuickInsertProvider(extensionProvider,
|
|
|
55
60
|
// Therefore this should always be run unless there is something very wrong.
|
|
56
61
|
if (extensionAPI) {
|
|
57
62
|
resolveImport(item.node(extensionAPI)).then(node => {
|
|
58
|
-
sendExtensionQuickInsertAnalytics(item, createAnalyticsEvent, source);
|
|
63
|
+
sendExtensionQuickInsertAnalytics(item, state.selection, createAnalyticsEvent, source);
|
|
59
64
|
if (node) {
|
|
60
65
|
editorActions.replaceSelection(node);
|
|
61
66
|
}
|
|
@@ -64,7 +69,7 @@ export async function extensionProviderToQuickInsertProvider(extensionProvider,
|
|
|
64
69
|
} else {
|
|
65
70
|
// @ts-expect-error No longer supported without extension API - this will be removed once we cleanup the FG.
|
|
66
71
|
resolveImport(item.node()).then(node => {
|
|
67
|
-
sendExtensionQuickInsertAnalytics(item, createAnalyticsEvent, source);
|
|
72
|
+
sendExtensionQuickInsertAnalytics(item, state.selection, createAnalyticsEvent, source);
|
|
68
73
|
if (node) {
|
|
69
74
|
editorActions.replaceSelection(node);
|
|
70
75
|
}
|
|
@@ -72,7 +77,7 @@ export async function extensionProviderToQuickInsertProvider(extensionProvider,
|
|
|
72
77
|
}
|
|
73
78
|
return insert('');
|
|
74
79
|
} else {
|
|
75
|
-
sendExtensionQuickInsertAnalytics(item, createAnalyticsEvent, source);
|
|
80
|
+
sendExtensionQuickInsertAnalytics(item, state.selection, createAnalyticsEvent, source);
|
|
76
81
|
return insert(item.node);
|
|
77
82
|
}
|
|
78
83
|
}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
export const name = "@atlaskit/editor-core";
|
|
2
|
-
export const version = "204.
|
|
2
|
+
export const version = "204.5.0";
|
|
@@ -49,50 +49,55 @@ var EditorActions = /*#__PURE__*/function () {
|
|
|
49
49
|
* refers to the latest state of editor with confirmed
|
|
50
50
|
* steps.
|
|
51
51
|
*/
|
|
52
|
-
_defineProperty(this, "getResolvedEditorState", /*#__PURE__*/
|
|
53
|
-
var
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
52
|
+
_defineProperty(this, "getResolvedEditorState", /*#__PURE__*/function () {
|
|
53
|
+
var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(reason) {
|
|
54
|
+
var _this$getFeatureFlags, useNativeCollabPlugin, editorValue, editorView, collabEditState;
|
|
55
|
+
return _regeneratorRuntime.wrap(function _callee$(_context) {
|
|
56
|
+
while (1) switch (_context.prev = _context.next) {
|
|
57
|
+
case 0:
|
|
58
|
+
_this$getFeatureFlags = _this.getFeatureFlags(), useNativeCollabPlugin = _this$getFeatureFlags.useNativeCollabPlugin;
|
|
59
|
+
if (_this.editorView) {
|
|
60
|
+
_context.next = 3;
|
|
61
|
+
break;
|
|
62
|
+
}
|
|
63
|
+
throw new Error('Called getResolvedEditorState before editorView is ready');
|
|
64
|
+
case 3:
|
|
65
|
+
if (useNativeCollabPlugin) {
|
|
66
|
+
_context.next = 10;
|
|
67
|
+
break;
|
|
68
|
+
}
|
|
69
|
+
_context.next = 6;
|
|
70
|
+
return _this.getValue();
|
|
71
|
+
case 6:
|
|
72
|
+
editorValue = _context.sent;
|
|
73
|
+
if (editorValue) {
|
|
74
|
+
_context.next = 9;
|
|
75
|
+
break;
|
|
76
|
+
}
|
|
77
|
+
throw new Error('editorValue is undefined');
|
|
78
|
+
case 9:
|
|
79
|
+
return _context.abrupt("return", {
|
|
80
|
+
content: editorValue,
|
|
81
|
+
title: null,
|
|
82
|
+
stepVersion: -1
|
|
83
|
+
});
|
|
84
|
+
case 10:
|
|
85
|
+
editorView = _this.editorView;
|
|
86
|
+
_context.next = 13;
|
|
87
|
+
return getEditorValueWithMedia(editorView);
|
|
88
|
+
case 13:
|
|
89
|
+
collabEditState = fakePluginKey.getState(editorView.state);
|
|
90
|
+
return _context.abrupt("return", collabEditState === null || collabEditState === void 0 ? void 0 : collabEditState.getFinalAcknowledgedState(reason));
|
|
91
|
+
case 15:
|
|
92
|
+
case "end":
|
|
93
|
+
return _context.stop();
|
|
94
|
+
}
|
|
95
|
+
}, _callee);
|
|
96
|
+
}));
|
|
97
|
+
return function (_x) {
|
|
98
|
+
return _ref.apply(this, arguments);
|
|
99
|
+
};
|
|
100
|
+
}());
|
|
96
101
|
}
|
|
97
102
|
return _createClass(EditorActions, [{
|
|
98
103
|
key: "_privateGetEditorView",
|
|
@@ -1,27 +1,34 @@
|
|
|
1
1
|
import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
|
|
2
|
+
import _defineProperty from "@babel/runtime/helpers/defineProperty";
|
|
2
3
|
import _regeneratorRuntime from "@babel/runtime/regenerator";
|
|
4
|
+
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; }
|
|
5
|
+
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) { _defineProperty(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; }
|
|
3
6
|
import React from 'react';
|
|
4
7
|
import Loadable from 'react-loadable';
|
|
5
8
|
import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, fireAnalyticsEvent, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
|
|
6
9
|
import { getQuickInsertItemsFromModule, resolveImport } from '@atlaskit/editor-common/extensions';
|
|
7
10
|
import { combineProviders } from '@atlaskit/editor-common/provider-helpers';
|
|
11
|
+
import { findInsertLocation } from '@atlaskit/editor-common/utils/analytics';
|
|
8
12
|
import { fg } from '@atlaskit/platform-feature-flags';
|
|
9
13
|
/**
|
|
10
14
|
* Utils to send analytics event when a extension is inserted using quickInsert
|
|
11
15
|
*/
|
|
12
|
-
function sendExtensionQuickInsertAnalytics(item, createAnalyticsEvent, source) {
|
|
16
|
+
function sendExtensionQuickInsertAnalytics(item, selection, createAnalyticsEvent, source) {
|
|
13
17
|
if (createAnalyticsEvent) {
|
|
18
|
+
var insertLocation = fg('platform_nested_nbm_analytics_location') ? findInsertLocation(selection) : undefined;
|
|
14
19
|
fireAnalyticsEvent(createAnalyticsEvent)({
|
|
15
20
|
payload: {
|
|
16
21
|
action: ACTION.INSERTED,
|
|
17
22
|
actionSubject: ACTION_SUBJECT.DOCUMENT,
|
|
18
23
|
actionSubjectId: ACTION_SUBJECT_ID.EXTENSION,
|
|
19
|
-
attributes: {
|
|
24
|
+
attributes: _objectSpread({
|
|
20
25
|
extensionType: item.extensionType,
|
|
21
26
|
extensionKey: item.extensionKey,
|
|
22
27
|
key: item.key,
|
|
23
28
|
inputMethod: source || INPUT_METHOD.QUICK_INSERT
|
|
24
|
-
},
|
|
29
|
+
}, insertLocation ? {
|
|
30
|
+
insertLocation: insertLocation
|
|
31
|
+
} : {}),
|
|
25
32
|
eventType: EVENT_TYPE.TRACK
|
|
26
33
|
}
|
|
27
34
|
});
|
|
@@ -75,7 +82,7 @@ function _extensionProviderToQuickInsertProvider() {
|
|
|
75
82
|
// Therefore this should always be run unless there is something very wrong.
|
|
76
83
|
if (extensionAPI) {
|
|
77
84
|
resolveImport(item.node(extensionAPI)).then(function (node) {
|
|
78
|
-
sendExtensionQuickInsertAnalytics(item, createAnalyticsEvent, source);
|
|
85
|
+
sendExtensionQuickInsertAnalytics(item, state.selection, createAnalyticsEvent, source);
|
|
79
86
|
if (node) {
|
|
80
87
|
editorActions.replaceSelection(node);
|
|
81
88
|
}
|
|
@@ -84,7 +91,7 @@ function _extensionProviderToQuickInsertProvider() {
|
|
|
84
91
|
} else {
|
|
85
92
|
// @ts-expect-error No longer supported without extension API - this will be removed once we cleanup the FG.
|
|
86
93
|
resolveImport(item.node()).then(function (node) {
|
|
87
|
-
sendExtensionQuickInsertAnalytics(item, createAnalyticsEvent, source);
|
|
94
|
+
sendExtensionQuickInsertAnalytics(item, state.selection, createAnalyticsEvent, source);
|
|
88
95
|
if (node) {
|
|
89
96
|
editorActions.replaceSelection(node);
|
|
90
97
|
}
|
|
@@ -92,7 +99,7 @@ function _extensionProviderToQuickInsertProvider() {
|
|
|
92
99
|
}
|
|
93
100
|
return insert('');
|
|
94
101
|
} else {
|
|
95
|
-
sendExtensionQuickInsertAnalytics(item, createAnalyticsEvent, source);
|
|
102
|
+
sendExtensionQuickInsertAnalytics(item, state.selection, createAnalyticsEvent, source);
|
|
96
103
|
return insert(item.node);
|
|
97
104
|
}
|
|
98
105
|
}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
export var name = "@atlaskit/editor-core";
|
|
2
|
-
export var version = "204.
|
|
2
|
+
export var version = "204.5.0";
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { AnalyticsEventPayload } from '@atlaskit/analytics-next/AnalyticsEvent';
|
|
2
2
|
import type { ResolvedEditorState } from '@atlaskit/editor-common/collab';
|
|
3
3
|
import type { EventDispatcher } from '@atlaskit/editor-common/event-dispatcher';
|
|
4
|
-
import type { ContextUpdateHandler, EditorActionsOptions, FeatureFlags, ReplaceRawValue, Transformer } from '@atlaskit/editor-common/types';
|
|
4
|
+
import type { ContextUpdateHandler, EditorActionsOptions, FeatureFlags, ReplaceRawValue, GetResolvedEditorStateReason, Transformer } from '@atlaskit/editor-common/types';
|
|
5
5
|
import { Node } from '@atlaskit/editor-prosemirror/model';
|
|
6
6
|
import type { EditorView } from '@atlaskit/editor-prosemirror/view';
|
|
7
7
|
export default class EditorActions<T = any> implements EditorActionsOptions<T> {
|
|
@@ -64,5 +64,5 @@ export default class EditorActions<T = any> implements EditorActionsOptions<T> {
|
|
|
64
64
|
* refers to the latest state of editor with confirmed
|
|
65
65
|
* steps.
|
|
66
66
|
*/
|
|
67
|
-
getResolvedEditorState: () => Promise<ResolvedEditorState | undefined>;
|
|
67
|
+
getResolvedEditorState: (reason: GetResolvedEditorStateReason) => Promise<ResolvedEditorState | undefined>;
|
|
68
68
|
}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { AnalyticsEventPayload } from '@atlaskit/analytics-next/AnalyticsEvent';
|
|
2
2
|
import type { ResolvedEditorState } from '@atlaskit/editor-common/collab';
|
|
3
3
|
import type { EventDispatcher } from '@atlaskit/editor-common/event-dispatcher';
|
|
4
|
-
import type { ContextUpdateHandler, EditorActionsOptions, FeatureFlags, ReplaceRawValue, Transformer } from '@atlaskit/editor-common/types';
|
|
4
|
+
import type { ContextUpdateHandler, EditorActionsOptions, FeatureFlags, ReplaceRawValue, GetResolvedEditorStateReason, Transformer } from '@atlaskit/editor-common/types';
|
|
5
5
|
import { Node } from '@atlaskit/editor-prosemirror/model';
|
|
6
6
|
import type { EditorView } from '@atlaskit/editor-prosemirror/view';
|
|
7
7
|
export default class EditorActions<T = any> implements EditorActionsOptions<T> {
|
|
@@ -64,5 +64,5 @@ export default class EditorActions<T = any> implements EditorActionsOptions<T> {
|
|
|
64
64
|
* refers to the latest state of editor with confirmed
|
|
65
65
|
* steps.
|
|
66
66
|
*/
|
|
67
|
-
getResolvedEditorState: () => Promise<ResolvedEditorState | undefined>;
|
|
67
|
+
getResolvedEditorState: (reason: GetResolvedEditorStateReason) => Promise<ResolvedEditorState | undefined>;
|
|
68
68
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atlaskit/editor-core",
|
|
3
|
-
"version": "204.
|
|
3
|
+
"version": "204.5.0",
|
|
4
4
|
"description": "A package contains Atlassian editor core functionality",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"registry": "https://registry.npmjs.org/"
|
|
@@ -46,7 +46,7 @@
|
|
|
46
46
|
"@atlaskit/analytics-next-stable-react-context": "1.0.1",
|
|
47
47
|
"@atlaskit/button": "^21.1.0",
|
|
48
48
|
"@atlaskit/css": "^0.10.0",
|
|
49
|
-
"@atlaskit/editor-common": "^102.
|
|
49
|
+
"@atlaskit/editor-common": "^102.6.0",
|
|
50
50
|
"@atlaskit/editor-json-transformer": "^8.24.0",
|
|
51
51
|
"@atlaskit/editor-performance-metrics": "^2.0.0",
|
|
52
52
|
"@atlaskit/editor-plugin-quick-insert": "^2.1.0",
|
|
@@ -59,9 +59,9 @@
|
|
|
59
59
|
"@atlaskit/mention": "^24.1.0",
|
|
60
60
|
"@atlaskit/platform-feature-flags": "^1.1.0",
|
|
61
61
|
"@atlaskit/react-ufo": "^3.4.0",
|
|
62
|
-
"@atlaskit/task-decision": "^19.
|
|
62
|
+
"@atlaskit/task-decision": "^19.1.0",
|
|
63
63
|
"@atlaskit/tmp-editor-statsig": "^3.6.0",
|
|
64
|
-
"@atlaskit/tokens": "^4.
|
|
64
|
+
"@atlaskit/tokens": "^4.5.0",
|
|
65
65
|
"@atlaskit/tooltip": "^20.0.0",
|
|
66
66
|
"@atlaskit/width-detector": "^5.0.0",
|
|
67
67
|
"@babel/runtime": "^7.0.0",
|
|
@@ -98,7 +98,7 @@
|
|
|
98
98
|
"@atlaskit/media-core": "^35.0.0",
|
|
99
99
|
"@atlaskit/media-integration-test-helpers": "^4.0.0",
|
|
100
100
|
"@atlaskit/media-test-helpers": "^35.0.0",
|
|
101
|
-
"@atlaskit/modal-dialog": "^13.
|
|
101
|
+
"@atlaskit/modal-dialog": "^13.1.0",
|
|
102
102
|
"@atlaskit/primitives": "^14.1.0",
|
|
103
103
|
"@atlaskit/renderer": "^114.2.0",
|
|
104
104
|
"@atlaskit/smart-card": "^35.2.0",
|
|
@@ -149,6 +149,10 @@
|
|
|
149
149
|
"type": "boolean",
|
|
150
150
|
"referenceOnly": "true"
|
|
151
151
|
},
|
|
152
|
+
"platform_editor_scroll_into_view_tr_steps": {
|
|
153
|
+
"type": "boolean",
|
|
154
|
+
"referenceOnly": true
|
|
155
|
+
},
|
|
152
156
|
"platform_editor_fe--performance_metrics": {
|
|
153
157
|
"type": "boolean"
|
|
154
158
|
},
|
|
@@ -539,12 +543,19 @@
|
|
|
539
543
|
"type": "boolean",
|
|
540
544
|
"referenceOnly": true
|
|
541
545
|
},
|
|
546
|
+
"platform_editor_non_macros_list_indent_fix": {
|
|
547
|
+
"type": "boolean",
|
|
548
|
+
"referenceOnly": true
|
|
549
|
+
},
|
|
542
550
|
"platform_editor_remove_drag_handle_fix": {
|
|
543
551
|
"type": "boolean",
|
|
544
552
|
"referenceOnly": true
|
|
545
553
|
},
|
|
546
554
|
"platform-linking-visual-refresh-v1": {
|
|
547
555
|
"type": "boolean"
|
|
556
|
+
},
|
|
557
|
+
"platform_nested_nbm_analytics_location": {
|
|
558
|
+
"type": "boolean"
|
|
548
559
|
}
|
|
549
560
|
},
|
|
550
561
|
"stricter": {
|