@atlaskit/editor-plugin-layout 2.4.0 → 2.4.2

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 (5) hide show
  1. package/CHANGELOG.md +18 -0
  2. package/dist/cjs/ui/toolbar.js +20 -7
  3. package/dist/es2019/ui/toolbar.js +16 -6
  4. package/dist/esm/ui/toolbar.js +20 -7
  5. package/package.json +9 -5
package/CHANGELOG.md CHANGED
@@ -1,5 +1,23 @@
1
1
  # @atlaskit/editor-plugin-layout
2
2
 
3
+ ## 2.4.2
4
+
5
+ ### Patch Changes
6
+
7
+ - [#135586](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/135586)
8
+ [`3aeba66081612`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/3aeba66081612) -
9
+ ED-26593 Add missing i18n for editor control
10
+ - Updated dependencies
11
+
12
+ ## 2.4.1
13
+
14
+ ### Patch Changes
15
+
16
+ - [#134468](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/134468)
17
+ [`e312ec529d05a`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/e312ec529d05a) -
18
+ [ux] Apply hover decoration when hovering on copy/delete button on overflow menu
19
+ - Updated dependencies
20
+
3
21
  ## 2.4.0
4
22
 
5
23
  ### Minor Changes
package/dist/cjs/ui/toolbar.js CHANGED
@@ -6,10 +6,12 @@ Object.defineProperty(exports, "__esModule", {
6
6
  value: true
7
7
  });
8
8
  exports.layoutToolbarTitle = exports.buildToolbar = void 0;
9
+ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
9
10
  var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
10
11
  var _react = _interopRequireDefault(require("react"));
11
12
  var _messages = _interopRequireWildcard(require("@atlaskit/editor-common/messages"));
12
13
  var _utils = require("@atlaskit/editor-prosemirror/utils");
14
+ var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
13
15
  var _copy = _interopRequireDefault(require("@atlaskit/icon/core/copy"));
14
16
  var _deleteEditorRemove = _interopRequireDefault(require("@atlaskit/icon/core/migration/delete--editor-remove"));
15
17
  var _layoutOneColumnEditorLayoutSingle = _interopRequireDefault(require("@atlaskit/icon/core/migration/layout-one-column--editor-layout-single"));
@@ -18,12 +20,15 @@ var _layoutThreeColumnsSidebarsEditorLayoutThreeWithSidebars = _interopRequireDe
18
20
  var _layoutTwoColumnsEditorLayoutTwoEqual = _interopRequireDefault(require("@atlaskit/icon/core/migration/layout-two-columns--editor-layout-two-equal"));
19
21
  var _layoutTwoColumnsSidebarLeftEditorLayoutTwoLeftSidebar = _interopRequireDefault(require("@atlaskit/icon/core/migration/layout-two-columns-sidebar-left--editor-layout-two-left-sidebar"));
20
22
  var _layoutTwoColumnsSidebarRightEditorLayoutTwoRightSidebar = _interopRequireDefault(require("@atlaskit/icon/core/migration/layout-two-columns-sidebar-right--editor-layout-two-right-sidebar"));
23
+ var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
21
24
  var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
22
25
  var _actions = require("../pm-plugins/actions");
23
26
  var _LayoutThreeWithLeftSidebars = require("./icons/LayoutThreeWithLeftSidebars");
24
27
  var _LayoutThreeWithRightSidebars = require("./icons/LayoutThreeWithRightSidebars");
25
28
  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); }
26
29
  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; }
30
+ 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; }
31
+ 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; }
27
32
  var LAYOUT_TYPES = [{
28
33
  id: 'editor.layout.twoEquals',
29
34
  type: 'two_equal',
@@ -222,10 +227,18 @@ var buildToolbar = exports.buildToolbar = function buildToolbar(state, intl, pos
222
227
  }]
223
228
  };
224
229
  var layoutTypes = allowSingleColumnLayout ? LAYOUT_TYPES_WITH_SINGLE_COL : LAYOUT_TYPES;
230
+ var hoverDecorationProps = function hoverDecorationProps(nodeType, className) {
231
+ return (0, _platformFeatureFlags.fg)('platform_editor_controls_patch_1') ? {
232
+ onMouseEnter: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(nodeType, true, className),
233
+ onMouseLeave: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(nodeType, false, className),
234
+ onFocus: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(nodeType, true, className),
235
+ onBlur: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(nodeType, false, className)
236
+ } : undefined;
237
+ };
225
238
  var overflowMenu = {
226
239
  type: 'overflow-dropdown',
227
- options: [{
228
- title: 'Copy',
240
+ options: [_objectSpread({
241
+ title: intl.formatMessage(_messages.default.copyToClipboard),
229
242
  onClick: function onClick() {
230
243
  var _api$core, _api$floatingToolbar;
231
244
  api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 || _api$core.actions.execute( // @ts-ignore
@@ -233,15 +246,15 @@ var buildToolbar = exports.buildToolbar = function buildToolbar(state, intl, pos
233
246
  return true;
234
247
  },
235
248
  icon: /*#__PURE__*/_react.default.createElement(_copy.default, {
236
- label: "Copy"
249
+ label: ""
237
250
  })
238
- }, {
239
- title: 'Delete',
251
+ }, hoverDecorationProps(nodeType, _editorSharedStyles.akEditorSelectedNodeClassName)), _objectSpread({
252
+ title: intl.formatMessage(_messages.default.delete),
240
253
  onClick: (0, _actions.deleteActiveLayoutNode)(editorAnalyticsAPI),
241
254
  icon: /*#__PURE__*/_react.default.createElement(_deleteEditorRemove.default, {
242
- label: "Delete"
255
+ label: ""
243
256
  })
244
- }]
257
+ }, hoverDecorationProps(nodeType))]
245
258
  };
246
259
  return {
247
260
  title: layoutToolbarTitle,
package/dist/es2019/ui/toolbar.js CHANGED
@@ -1,6 +1,7 @@
1
1
  import React from 'react';
2
2
  import commonMessages, { layoutMessages, layoutMessages as toolbarMessages } from '@atlaskit/editor-common/messages';
3
3
  import { findDomRefAtPos } from '@atlaskit/editor-prosemirror/utils';
4
+ import { akEditorSelectedNodeClassName } from '@atlaskit/editor-shared-styles';
4
5
  import CopyIcon from '@atlaskit/icon/core/copy';
5
6
  import DeleteIcon from '@atlaskit/icon/core/migration/delete--editor-remove';
6
7
  import LayoutOneColumnIcon from '@atlaskit/icon/core/migration/layout-one-column--editor-layout-single';
@@ -9,6 +10,7 @@ import LayoutThreeColumnsSidebarsIcon from '@atlaskit/icon/core/migration/layout
9
10
  import LayoutTwoColumnsIcon from '@atlaskit/icon/core/migration/layout-two-columns--editor-layout-two-equal';
10
11
  import LayoutTwoColumnsSidebarLeftIcon from '@atlaskit/icon/core/migration/layout-two-columns-sidebar-left--editor-layout-two-left-sidebar';
11
12
  import LayoutTwoColumnsSidebarRightIcon from '@atlaskit/icon/core/migration/layout-two-columns-sidebar-right--editor-layout-two-right-sidebar';
13
+ import { fg } from '@atlaskit/platform-feature-flags';
12
14
  import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
13
15
  import { deleteActiveLayoutNode, getPresetLayout, setPresetLayout } from '../pm-plugins/actions';
14
16
  import { LayoutThreeWithLeftSidebarsIcon } from './icons/LayoutThreeWithLeftSidebars';
@@ -209,10 +211,16 @@ export const buildToolbar = (state, intl, pos, _allowBreakout, addSidebarLayouts
209
211
  }]
210
212
  };
211
213
  const layoutTypes = allowSingleColumnLayout ? LAYOUT_TYPES_WITH_SINGLE_COL : LAYOUT_TYPES;
214
+ const hoverDecorationProps = (nodeType, className) => fg('platform_editor_controls_patch_1') ? {
215
+ onMouseEnter: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(nodeType, true, className),
216
+ onMouseLeave: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(nodeType, false, className),
217
+ onFocus: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(nodeType, true, className),
218
+ onBlur: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(nodeType, false, className)
219
+ } : undefined;
212
220
  const overflowMenu = {
213
221
  type: 'overflow-dropdown',
214
222
  options: [{
215
- title: 'Copy',
223
+ title: intl.formatMessage(commonMessages.copyToClipboard),
216
224
  onClick: () => {
217
225
  var _api$core, _api$floatingToolbar;
218
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
@@ -220,14 +228,16 @@ export const buildToolbar = (state, intl, pos, _allowBreakout, addSidebarLayouts
220
228
  return true;
221
229
  },
222
230
  icon: /*#__PURE__*/React.createElement(CopyIcon, {
223
- label: "Copy"
224
- })
231
+ label: ""
232
+ }),
233
+ ...hoverDecorationProps(nodeType, akEditorSelectedNodeClassName)
225
234
  }, {
226
- title: 'Delete',
235
+ title: intl.formatMessage(commonMessages.delete),
227
236
  onClick: deleteActiveLayoutNode(editorAnalyticsAPI),
228
237
  icon: /*#__PURE__*/React.createElement(DeleteIcon, {
229
- label: "Delete"
230
- })
238
+ label: ""
239
+ }),
240
+ ...hoverDecorationProps(nodeType)
231
241
  }]
232
242
  };
233
243
  return {
package/dist/esm/ui/toolbar.js CHANGED
@@ -1,7 +1,11 @@
1
+ import _defineProperty from "@babel/runtime/helpers/defineProperty";
1
2
  import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
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
+ 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; }
2
5
  import React from 'react';
3
6
  import commonMessages, { layoutMessages, layoutMessages as toolbarMessages } from '@atlaskit/editor-common/messages';
4
7
  import { findDomRefAtPos } from '@atlaskit/editor-prosemirror/utils';
8
+ import { akEditorSelectedNodeClassName } from '@atlaskit/editor-shared-styles';
5
9
  import CopyIcon from '@atlaskit/icon/core/copy';
6
10
  import DeleteIcon from '@atlaskit/icon/core/migration/delete--editor-remove';
7
11
  import LayoutOneColumnIcon from '@atlaskit/icon/core/migration/layout-one-column--editor-layout-single';
@@ -10,6 +14,7 @@ import LayoutThreeColumnsSidebarsIcon from '@atlaskit/icon/core/migration/layout
10
14
  import LayoutTwoColumnsIcon from '@atlaskit/icon/core/migration/layout-two-columns--editor-layout-two-equal';
11
15
  import LayoutTwoColumnsSidebarLeftIcon from '@atlaskit/icon/core/migration/layout-two-columns-sidebar-left--editor-layout-two-left-sidebar';
12
16
  import LayoutTwoColumnsSidebarRightIcon from '@atlaskit/icon/core/migration/layout-two-columns-sidebar-right--editor-layout-two-right-sidebar';
17
+ import { fg } from '@atlaskit/platform-feature-flags';
13
18
  import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
14
19
  import { deleteActiveLayoutNode, getPresetLayout, setPresetLayout } from '../pm-plugins/actions';
15
20
  import { LayoutThreeWithLeftSidebarsIcon } from './icons/LayoutThreeWithLeftSidebars';
@@ -212,10 +217,18 @@ export var buildToolbar = function buildToolbar(state, intl, pos, _allowBreakout
212
217
  }]
213
218
  };
214
219
  var layoutTypes = allowSingleColumnLayout ? LAYOUT_TYPES_WITH_SINGLE_COL : LAYOUT_TYPES;
220
+ var hoverDecorationProps = function hoverDecorationProps(nodeType, className) {
221
+ return fg('platform_editor_controls_patch_1') ? {
222
+ onMouseEnter: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(nodeType, true, className),
223
+ onMouseLeave: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(nodeType, false, className),
224
+ onFocus: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(nodeType, true, className),
225
+ onBlur: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(nodeType, false, className)
226
+ } : undefined;
227
+ };
215
228
  var overflowMenu = {
216
229
  type: 'overflow-dropdown',
217
- options: [{
218
- title: 'Copy',
230
+ options: [_objectSpread({
231
+ title: intl.formatMessage(commonMessages.copyToClipboard),
219
232
  onClick: function onClick() {
220
233
  var _api$core, _api$floatingToolbar;
221
234
  api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 || _api$core.actions.execute( // @ts-ignore
@@ -223,15 +236,15 @@ export var buildToolbar = function buildToolbar(state, intl, pos, _allowBreakout
223
236
  return true;
224
237
  },
225
238
  icon: /*#__PURE__*/React.createElement(CopyIcon, {
226
- label: "Copy"
239
+ label: ""
227
240
  })
228
- }, {
229
- title: 'Delete',
241
+ }, hoverDecorationProps(nodeType, akEditorSelectedNodeClassName)), _objectSpread({
242
+ title: intl.formatMessage(commonMessages.delete),
230
243
  onClick: deleteActiveLayoutNode(editorAnalyticsAPI),
231
244
  icon: /*#__PURE__*/React.createElement(DeleteIcon, {
232
- label: "Delete"
245
+ label: ""
233
246
  })
234
- }]
247
+ }, hoverDecorationProps(nodeType))]
235
248
  };
236
249
  return {
237
250
  title: layoutToolbarTitle,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-plugin-layout",
3
- "version": "2.4.0",
3
+ "version": "2.4.2",
4
4
  "description": "Layout plugin for @atlaskit/editor-core",
5
5
  "author": "Atlassian Pty Ltd",
6
6
  "license": "Apache-2.0",
@@ -34,7 +34,7 @@
34
34
  },
35
35
  "dependencies": {
36
36
  "@atlaskit/adf-schema": "^47.6.0",
37
- "@atlaskit/editor-common": "^102.14.0",
37
+ "@atlaskit/editor-common": "^102.18.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",
@@ -42,10 +42,11 @@
42
42
  "@atlaskit/editor-plugin-selection": "^2.1.0",
43
43
  "@atlaskit/editor-plugin-width": "^3.0.0",
44
44
  "@atlaskit/editor-prosemirror": "7.0.0",
45
- "@atlaskit/icon": "^25.2.0",
45
+ "@atlaskit/editor-shared-styles": "^3.4.0",
46
+ "@atlaskit/icon": "^25.5.0",
46
47
  "@atlaskit/platform-feature-flags": "^1.1.0",
47
- "@atlaskit/tmp-editor-statsig": "^4.4.0",
48
- "@atlaskit/tokens": "^4.5.0",
48
+ "@atlaskit/tmp-editor-statsig": "^4.6.0",
49
+ "@atlaskit/tokens": "^4.6.0",
49
50
  "@babel/runtime": "^7.0.0",
50
51
  "@emotion/react": "^11.7.1"
51
52
  },
@@ -100,6 +101,9 @@
100
101
  "platform-feature-flags": {
101
102
  "platform-visual-refresh-icons": {
102
103
  "type": "boolean"
104
+ },
105
+ "platform_editor_controls_patch_1": {
106
+ "type": "boolean"
103
107
  }
104
108
  }
105
109
  }