@atlaskit/editor-plugin-layout 2.7.0 → 2.7.1
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 +9 -0
- package/dist/cjs/pm-plugins/actions.js +3 -2
- package/dist/cjs/ui/toolbar.js +4 -3
- package/dist/es2019/pm-plugins/actions.js +3 -2
- package/dist/es2019/ui/toolbar.js +4 -3
- package/dist/esm/pm-plugins/actions.js +3 -2
- package/dist/esm/ui/toolbar.js +4 -3
- package/dist/types/pm-plugins/actions.d.ts +2 -2
- package/dist/types-ts4.5/pm-plugins/actions.d.ts +2 -2
- package/package.json +7 -4
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,14 @@
|
|
|
1
1
|
# @atlaskit/editor-plugin-layout
|
|
2
2
|
|
|
3
|
+
## 2.7.1
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [#149482](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/149482)
|
|
8
|
+
[`1f1f73876c3c8`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/1f1f73876c3c8) -
|
|
9
|
+
ED-27860 Add analytics for copy and delete button in floating toolbars
|
|
10
|
+
- Updated dependencies
|
|
11
|
+
|
|
3
12
|
## 2.7.0
|
|
4
13
|
|
|
5
14
|
### Minor Changes
|
|
@@ -470,7 +470,7 @@ var fixColumnStructure = exports.fixColumnStructure = function fixColumnStructur
|
|
|
470
470
|
}
|
|
471
471
|
return;
|
|
472
472
|
};
|
|
473
|
-
var deleteActiveLayoutNode = exports.deleteActiveLayoutNode = function deleteActiveLayoutNode(editorAnalyticsAPI) {
|
|
473
|
+
var deleteActiveLayoutNode = exports.deleteActiveLayoutNode = function deleteActiveLayoutNode(editorAnalyticsAPI, inputMethod) {
|
|
474
474
|
return function (state, dispatch) {
|
|
475
475
|
var _ref3 = _pluginKey.pluginKey.getState(state),
|
|
476
476
|
pos = _ref3.pos,
|
|
@@ -483,7 +483,8 @@ var deleteActiveLayoutNode = exports.deleteActiveLayoutNode = function deleteAct
|
|
|
483
483
|
action: _analytics.ACTION.DELETED,
|
|
484
484
|
actionSubject: _analytics.ACTION_SUBJECT.LAYOUT,
|
|
485
485
|
attributes: {
|
|
486
|
-
layout: formatLayoutName(selectedLayout)
|
|
486
|
+
layout: formatLayoutName(selectedLayout),
|
|
487
|
+
inputMethod: (0, _platformFeatureFlags.fg)('platform_editor_controls_patch_analytics_2') ? inputMethod : undefined
|
|
487
488
|
},
|
|
488
489
|
eventType: _analytics.EVENT_TYPE.TRACK
|
|
489
490
|
})(tr);
|
package/dist/cjs/ui/toolbar.js
CHANGED
|
@@ -9,6 +9,7 @@ exports.layoutToolbarTitle = exports.buildToolbar = void 0;
|
|
|
9
9
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
10
10
|
var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
|
|
11
11
|
var _react = _interopRequireDefault(require("react"));
|
|
12
|
+
var _analytics = require("@atlaskit/editor-common/analytics");
|
|
12
13
|
var _messages = _interopRequireWildcard(require("@atlaskit/editor-common/messages"));
|
|
13
14
|
var _utils = require("@atlaskit/editor-prosemirror/utils");
|
|
14
15
|
var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
|
|
@@ -210,7 +211,7 @@ var buildToolbar = exports.buildToolbar = function buildToolbar(state, intl, pos
|
|
|
210
211
|
icon: _deleteEditorRemove.default,
|
|
211
212
|
testId: _messages.default.remove.id,
|
|
212
213
|
title: intl.formatMessage(_messages.default.remove),
|
|
213
|
-
onClick: (0, _actions.deleteActiveLayoutNode)(editorAnalyticsAPI),
|
|
214
|
+
onClick: (0, _actions.deleteActiveLayoutNode)(editorAnalyticsAPI, _analytics.INPUT_METHOD.FLOATING_TB),
|
|
214
215
|
onMouseEnter: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(nodeType, true),
|
|
215
216
|
onMouseLeave: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(nodeType, false),
|
|
216
217
|
onFocus: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(nodeType, true),
|
|
@@ -241,7 +242,7 @@ var buildToolbar = exports.buildToolbar = function buildToolbar(state, intl, pos
|
|
|
241
242
|
onClick: function onClick() {
|
|
242
243
|
var _api$core, _api$floatingToolbar;
|
|
243
244
|
api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 || _api$core.actions.execute( // @ts-ignore
|
|
244
|
-
api === null || api === void 0 || (_api$floatingToolbar = api.floatingToolbar) === null || _api$floatingToolbar === void 0 ? void 0 : _api$floatingToolbar.commands.copyNode(nodeType));
|
|
245
|
+
api === null || api === void 0 || (_api$floatingToolbar = api.floatingToolbar) === null || _api$floatingToolbar === void 0 ? void 0 : _api$floatingToolbar.commands.copyNode(nodeType, _analytics.INPUT_METHOD.FLOATING_TB));
|
|
245
246
|
return true;
|
|
246
247
|
},
|
|
247
248
|
icon: /*#__PURE__*/_react.default.createElement(_copy.default, {
|
|
@@ -249,7 +250,7 @@ var buildToolbar = exports.buildToolbar = function buildToolbar(state, intl, pos
|
|
|
249
250
|
})
|
|
250
251
|
}, hoverDecorationProps(nodeType, _editorSharedStyles.akEditorSelectedNodeClassName)), _objectSpread({
|
|
251
252
|
title: intl.formatMessage(_messages.default.delete),
|
|
252
|
-
onClick: (0, _actions.deleteActiveLayoutNode)(editorAnalyticsAPI),
|
|
253
|
+
onClick: (0, _actions.deleteActiveLayoutNode)(editorAnalyticsAPI, _analytics.INPUT_METHOD.FLOATING_TB),
|
|
253
254
|
icon: /*#__PURE__*/_react.default.createElement(_deleteEditorRemove.default, {
|
|
254
255
|
label: ""
|
|
255
256
|
})
|
|
@@ -448,7 +448,7 @@ export const fixColumnStructure = state => {
|
|
|
448
448
|
}
|
|
449
449
|
return;
|
|
450
450
|
};
|
|
451
|
-
export const deleteActiveLayoutNode = editorAnalyticsAPI => (state, dispatch) => {
|
|
451
|
+
export const deleteActiveLayoutNode = (editorAnalyticsAPI, inputMethod) => (state, dispatch) => {
|
|
452
452
|
const {
|
|
453
453
|
pos,
|
|
454
454
|
selectedLayout
|
|
@@ -461,7 +461,8 @@ export const deleteActiveLayoutNode = editorAnalyticsAPI => (state, dispatch) =>
|
|
|
461
461
|
action: ACTION.DELETED,
|
|
462
462
|
actionSubject: ACTION_SUBJECT.LAYOUT,
|
|
463
463
|
attributes: {
|
|
464
|
-
layout: formatLayoutName(selectedLayout)
|
|
464
|
+
layout: formatLayoutName(selectedLayout),
|
|
465
|
+
inputMethod: fg('platform_editor_controls_patch_analytics_2') ? inputMethod : undefined
|
|
465
466
|
},
|
|
466
467
|
eventType: EVENT_TYPE.TRACK
|
|
467
468
|
})(tr);
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
|
+
import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
|
|
2
3
|
import commonMessages, { layoutMessages, layoutMessages as toolbarMessages } from '@atlaskit/editor-common/messages';
|
|
3
4
|
import { findDomRefAtPos } from '@atlaskit/editor-prosemirror/utils';
|
|
4
5
|
import { akEditorSelectedNodeClassName } from '@atlaskit/editor-shared-styles';
|
|
@@ -194,7 +195,7 @@ export const buildToolbar = (state, intl, pos, _allowBreakout, addSidebarLayouts
|
|
|
194
195
|
icon: DeleteIcon,
|
|
195
196
|
testId: commonMessages.remove.id,
|
|
196
197
|
title: intl.formatMessage(commonMessages.remove),
|
|
197
|
-
onClick: deleteActiveLayoutNode(editorAnalyticsAPI),
|
|
198
|
+
onClick: deleteActiveLayoutNode(editorAnalyticsAPI, INPUT_METHOD.FLOATING_TB),
|
|
198
199
|
onMouseEnter: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(nodeType, true),
|
|
199
200
|
onMouseLeave: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(nodeType, false),
|
|
200
201
|
onFocus: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(nodeType, true),
|
|
@@ -223,7 +224,7 @@ export const buildToolbar = (state, intl, pos, _allowBreakout, addSidebarLayouts
|
|
|
223
224
|
onClick: () => {
|
|
224
225
|
var _api$core, _api$floatingToolbar;
|
|
225
226
|
api === null || api === void 0 ? void 0 : (_api$core = api.core) === null || _api$core === void 0 ? void 0 : _api$core.actions.execute( // @ts-ignore
|
|
226
|
-
api === null || api === void 0 ? void 0 : (_api$floatingToolbar = api.floatingToolbar) === null || _api$floatingToolbar === void 0 ? void 0 : _api$floatingToolbar.commands.copyNode(nodeType));
|
|
227
|
+
api === null || api === void 0 ? void 0 : (_api$floatingToolbar = api.floatingToolbar) === null || _api$floatingToolbar === void 0 ? void 0 : _api$floatingToolbar.commands.copyNode(nodeType, INPUT_METHOD.FLOATING_TB));
|
|
227
228
|
return true;
|
|
228
229
|
},
|
|
229
230
|
icon: /*#__PURE__*/React.createElement(CopyIcon, {
|
|
@@ -232,7 +233,7 @@ export const buildToolbar = (state, intl, pos, _allowBreakout, addSidebarLayouts
|
|
|
232
233
|
...hoverDecorationProps(nodeType, akEditorSelectedNodeClassName)
|
|
233
234
|
}, {
|
|
234
235
|
title: intl.formatMessage(commonMessages.delete),
|
|
235
|
-
onClick: deleteActiveLayoutNode(editorAnalyticsAPI),
|
|
236
|
+
onClick: deleteActiveLayoutNode(editorAnalyticsAPI, INPUT_METHOD.FLOATING_TB),
|
|
236
237
|
icon: /*#__PURE__*/React.createElement(DeleteIcon, {
|
|
237
238
|
label: ""
|
|
238
239
|
}),
|
|
@@ -461,7 +461,7 @@ export var fixColumnStructure = function fixColumnStructure(state) {
|
|
|
461
461
|
}
|
|
462
462
|
return;
|
|
463
463
|
};
|
|
464
|
-
export var deleteActiveLayoutNode = function deleteActiveLayoutNode(editorAnalyticsAPI) {
|
|
464
|
+
export var deleteActiveLayoutNode = function deleteActiveLayoutNode(editorAnalyticsAPI, inputMethod) {
|
|
465
465
|
return function (state, dispatch) {
|
|
466
466
|
var _ref3 = pluginKey.getState(state),
|
|
467
467
|
pos = _ref3.pos,
|
|
@@ -474,7 +474,8 @@ export var deleteActiveLayoutNode = function deleteActiveLayoutNode(editorAnalyt
|
|
|
474
474
|
action: ACTION.DELETED,
|
|
475
475
|
actionSubject: ACTION_SUBJECT.LAYOUT,
|
|
476
476
|
attributes: {
|
|
477
|
-
layout: formatLayoutName(selectedLayout)
|
|
477
|
+
layout: formatLayoutName(selectedLayout),
|
|
478
|
+
inputMethod: fg('platform_editor_controls_patch_analytics_2') ? inputMethod : undefined
|
|
478
479
|
},
|
|
479
480
|
eventType: EVENT_TYPE.TRACK
|
|
480
481
|
})(tr);
|
package/dist/esm/ui/toolbar.js
CHANGED
|
@@ -3,6 +3,7 @@ import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
|
|
|
3
3
|
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; }
|
|
4
4
|
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; }
|
|
5
5
|
import React from 'react';
|
|
6
|
+
import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
|
|
6
7
|
import commonMessages, { layoutMessages, layoutMessages as toolbarMessages } from '@atlaskit/editor-common/messages';
|
|
7
8
|
import { findDomRefAtPos } from '@atlaskit/editor-prosemirror/utils';
|
|
8
9
|
import { akEditorSelectedNodeClassName } from '@atlaskit/editor-shared-styles';
|
|
@@ -200,7 +201,7 @@ export var buildToolbar = function buildToolbar(state, intl, pos, _allowBreakout
|
|
|
200
201
|
icon: DeleteIcon,
|
|
201
202
|
testId: commonMessages.remove.id,
|
|
202
203
|
title: intl.formatMessage(commonMessages.remove),
|
|
203
|
-
onClick: deleteActiveLayoutNode(editorAnalyticsAPI),
|
|
204
|
+
onClick: deleteActiveLayoutNode(editorAnalyticsAPI, INPUT_METHOD.FLOATING_TB),
|
|
204
205
|
onMouseEnter: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(nodeType, true),
|
|
205
206
|
onMouseLeave: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(nodeType, false),
|
|
206
207
|
onFocus: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(nodeType, true),
|
|
@@ -231,7 +232,7 @@ export var buildToolbar = function buildToolbar(state, intl, pos, _allowBreakout
|
|
|
231
232
|
onClick: function onClick() {
|
|
232
233
|
var _api$core, _api$floatingToolbar;
|
|
233
234
|
api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 || _api$core.actions.execute( // @ts-ignore
|
|
234
|
-
api === null || api === void 0 || (_api$floatingToolbar = api.floatingToolbar) === null || _api$floatingToolbar === void 0 ? void 0 : _api$floatingToolbar.commands.copyNode(nodeType));
|
|
235
|
+
api === null || api === void 0 || (_api$floatingToolbar = api.floatingToolbar) === null || _api$floatingToolbar === void 0 ? void 0 : _api$floatingToolbar.commands.copyNode(nodeType, INPUT_METHOD.FLOATING_TB));
|
|
235
236
|
return true;
|
|
236
237
|
},
|
|
237
238
|
icon: /*#__PURE__*/React.createElement(CopyIcon, {
|
|
@@ -239,7 +240,7 @@ export var buildToolbar = function buildToolbar(state, intl, pos, _allowBreakout
|
|
|
239
240
|
})
|
|
240
241
|
}, hoverDecorationProps(nodeType, akEditorSelectedNodeClassName)), _objectSpread({
|
|
241
242
|
title: intl.formatMessage(commonMessages.delete),
|
|
242
|
-
onClick: deleteActiveLayoutNode(editorAnalyticsAPI),
|
|
243
|
+
onClick: deleteActiveLayoutNode(editorAnalyticsAPI, INPUT_METHOD.FLOATING_TB),
|
|
243
244
|
icon: /*#__PURE__*/React.createElement(DeleteIcon, {
|
|
244
245
|
label: ""
|
|
245
246
|
})
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
|
|
1
|
+
import type { EditorAnalyticsAPI, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
|
|
2
2
|
import type { Command, TOOLBAR_MENU_TYPE } from '@atlaskit/editor-common/types';
|
|
3
3
|
import type { Node } from '@atlaskit/editor-prosemirror/model';
|
|
4
4
|
import type { EditorState, Transaction } from '@atlaskit/editor-prosemirror/state';
|
|
@@ -20,4 +20,4 @@ export declare function forceSectionToPresetLayout(state: EditorState, node: Nod
|
|
|
20
20
|
export declare const setPresetLayout: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (layout: PresetLayout) => Command;
|
|
21
21
|
export declare const fixColumnSizes: (changedTr: Transaction, state: EditorState) => Change | undefined;
|
|
22
22
|
export declare const fixColumnStructure: (state: EditorState) => Transaction | undefined;
|
|
23
|
-
export declare const deleteActiveLayoutNode: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => Command;
|
|
23
|
+
export declare const deleteActiveLayoutNode: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined, inputMethod?: INPUT_METHOD.FLOATING_TB) => Command;
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
|
|
1
|
+
import type { EditorAnalyticsAPI, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
|
|
2
2
|
import type { Command, TOOLBAR_MENU_TYPE } from '@atlaskit/editor-common/types';
|
|
3
3
|
import type { Node } from '@atlaskit/editor-prosemirror/model';
|
|
4
4
|
import type { EditorState, Transaction } from '@atlaskit/editor-prosemirror/state';
|
|
@@ -20,4 +20,4 @@ export declare function forceSectionToPresetLayout(state: EditorState, node: Nod
|
|
|
20
20
|
export declare const setPresetLayout: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (layout: PresetLayout) => Command;
|
|
21
21
|
export declare const fixColumnSizes: (changedTr: Transaction, state: EditorState) => Change | undefined;
|
|
22
22
|
export declare const fixColumnStructure: (state: EditorState) => Transaction | undefined;
|
|
23
|
-
export declare const deleteActiveLayoutNode: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => Command;
|
|
23
|
+
export declare const deleteActiveLayoutNode: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined, inputMethod?: INPUT_METHOD.FLOATING_TB) => Command;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atlaskit/editor-plugin-layout",
|
|
3
|
-
"version": "2.7.
|
|
3
|
+
"version": "2.7.1",
|
|
4
4
|
"description": "Layout plugin for @atlaskit/editor-core",
|
|
5
5
|
"author": "Atlassian Pty Ltd",
|
|
6
6
|
"license": "Apache-2.0",
|
|
@@ -34,18 +34,18 @@
|
|
|
34
34
|
},
|
|
35
35
|
"dependencies": {
|
|
36
36
|
"@atlaskit/adf-schema": "^47.6.0",
|
|
37
|
-
"@atlaskit/editor-common": "^
|
|
37
|
+
"@atlaskit/editor-common": "^104.0.0",
|
|
38
38
|
"@atlaskit/editor-plugin-analytics": "^2.2.0",
|
|
39
39
|
"@atlaskit/editor-plugin-decorations": "^2.0.0",
|
|
40
40
|
"@atlaskit/editor-plugin-editor-disabled": "^2.0.0",
|
|
41
41
|
"@atlaskit/editor-plugin-guideline": "^2.0.0",
|
|
42
|
-
"@atlaskit/editor-plugin-selection": "^2.
|
|
42
|
+
"@atlaskit/editor-plugin-selection": "^2.2.0",
|
|
43
43
|
"@atlaskit/editor-plugin-width": "^3.0.0",
|
|
44
44
|
"@atlaskit/editor-prosemirror": "7.0.0",
|
|
45
45
|
"@atlaskit/editor-shared-styles": "^3.4.0",
|
|
46
46
|
"@atlaskit/icon": "^25.6.0",
|
|
47
47
|
"@atlaskit/platform-feature-flags": "^1.1.0",
|
|
48
|
-
"@atlaskit/tmp-editor-statsig": "^4.
|
|
48
|
+
"@atlaskit/tmp-editor-statsig": "^4.16.0",
|
|
49
49
|
"@atlaskit/tokens": "^4.8.0",
|
|
50
50
|
"@babel/runtime": "^7.0.0",
|
|
51
51
|
"@emotion/react": "^11.7.1"
|
|
@@ -107,6 +107,9 @@
|
|
|
107
107
|
},
|
|
108
108
|
"platform_editor_column_count_analytics": {
|
|
109
109
|
"type": "boolean"
|
|
110
|
+
},
|
|
111
|
+
"platform_editor_controls_patch_analytics_2": {
|
|
112
|
+
"type": "boolean"
|
|
110
113
|
}
|
|
111
114
|
}
|
|
112
115
|
}
|