@atlaskit/editor-plugin-loom 8.0.16 → 8.0.17

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 (8) hide show
  1. package/CHANGELOG.md +9 -0
  2. package/dist/cjs/ui/LoomMenuItem.js +11 -3
  3. package/dist/cjs/ui/toolbar-components.js +10 -4
  4. package/dist/es2019/ui/LoomMenuItem.js +10 -1
  5. package/dist/es2019/ui/toolbar-components.js +9 -4
  6. package/dist/esm/ui/LoomMenuItem.js +11 -3
  7. package/dist/esm/ui/toolbar-components.js +11 -5
  8. package/package.json +8 -4
package/CHANGELOG.md CHANGED
@@ -1,5 +1,14 @@
1
1
  # @atlaskit/editor-plugin-loom
2
2
 
3
+ ## 8.0.17
4
+
5
+ ### Patch Changes
6
+
7
+ - [`5baa955ebe237`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/5baa955ebe237) -
8
+ Add new menu section for all extensions (inc. loom and 1p, 3p extensions), add logic to hide menu
9
+ button completely when there are no menu-sections with no menu-items associated with it
10
+ - Updated dependencies
11
+
3
12
  ## 8.0.16
4
13
 
5
14
  ### Patch Changes
package/dist/cjs/ui/LoomMenuItem.js CHANGED
@@ -11,6 +11,7 @@ var _hooks = require("@atlaskit/editor-common/hooks");
11
11
  var _messages = require("@atlaskit/editor-common/messages");
12
12
  var _toolbar = require("@atlaskit/editor-common/toolbar");
13
13
  var _editorToolbar = require("@atlaskit/editor-toolbar");
14
+ var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
14
15
  var _commands = require("../pm-plugins/commands");
15
16
  function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
16
17
  var useLoomEnabled = function useLoomEnabled(api) {
@@ -27,6 +28,11 @@ var LoomMenuItem = exports.LoomMenuItem = function LoomMenuItem(_ref) {
27
28
  var api = _ref.api,
28
29
  renderButton = _ref.renderButton;
29
30
  var loomEnabled = useLoomEnabled(api);
31
+ var _useEditorToolbar = (0, _toolbar.useEditorToolbar)(),
32
+ editorViewMode = _useEditorToolbar.editorViewMode;
33
+ if (editorViewMode !== 'edit' && (0, _platformFeatureFlags.fg)('platform_editor_toolbar_aifc_overflow_menu_update')) {
34
+ return null;
35
+ }
30
36
  if (renderButton) {
31
37
  return renderButton(CustomisableLoomMenuItem(api));
32
38
  } else if (loomEnabled !== undefined) {
@@ -74,14 +80,16 @@ var DefaultLoomMenuItem = function DefaultLoomMenuItem(_ref3) {
74
80
  onClick: handleOnClick
75
81
  });
76
82
  };
77
- var MenuItemComponent = /*#__PURE__*/_react.default.forwardRef(function (_ref4, ref) {
83
+ var MenuItemComponent = /*#__PURE__*/_react.default.forwardRef(
84
+ // eslint-disable-next-line no-unused-vars
85
+ function (_ref4, ref) {
78
86
  var disabled = _ref4.disabled,
79
87
  _onClick = _ref4.onClick,
80
88
  href = _ref4.href,
81
89
  target = _ref4.target,
82
90
  rel = _ref4.rel;
83
- var _useEditorToolbar = (0, _toolbar.useEditorToolbar)(),
84
- editorAppearance = _useEditorToolbar.editorAppearance;
91
+ var _useEditorToolbar2 = (0, _toolbar.useEditorToolbar)(),
92
+ editorAppearance = _useEditorToolbar2.editorAppearance;
85
93
  var _useIntl = (0, _reactIntlNext.useIntl)(),
86
94
  formatMessage = _useIntl.formatMessage;
87
95
  return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownItem, {
package/dist/cjs/ui/toolbar-components.js CHANGED
@@ -5,9 +5,11 @@ Object.defineProperty(exports, "__esModule", {
5
5
  value: true
6
6
  });
7
7
  exports.getToolbarComponents = void 0;
8
+ var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
8
9
  var _react = _interopRequireDefault(require("react"));
9
10
  var _toolbar = require("@atlaskit/editor-common/toolbar");
10
11
  var _editorToolbar = require("@atlaskit/editor-toolbar");
12
+ var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
11
13
  var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
12
14
  var _LoomMenuItem = require("./LoomMenuItem");
13
15
  var _MenuSection = require("./MenuSection");
@@ -15,15 +17,15 @@ var getToolbarComponents = exports.getToolbarComponents = function getToolbarCom
15
17
  return [{
16
18
  type: _toolbar.LOOM_MENU_SECTION.type,
17
19
  key: _toolbar.LOOM_MENU_SECTION.key,
18
- parents: [{
20
+ parents: [].concat((0, _toConsumableArray2.default)((0, _platformFeatureFlags.fg)('platform_editor_toolbar_aifc_overflow_menu_update') ? [] : [{
19
21
  type: _toolbar.OVERFLOW_MENU.type,
20
22
  key: _toolbar.OVERFLOW_MENU.key,
21
23
  rank: _toolbar.OVERFLOW_MENU_RANK[_toolbar.LOOM_MENU_SECTION.key]
22
- }, {
24
+ }]), [{
23
25
  type: _toolbar.OVERFLOW_MENU_PRIMARY_TOOLBAR.type,
24
26
  key: _toolbar.OVERFLOW_MENU_PRIMARY_TOOLBAR.key,
25
27
  rank: _toolbar.OVERFLOW_MENU_PRIMARY_TOOLBAR_RANK[_toolbar.LOOM_MENU_SECTION.key]
26
- }],
28
+ }]),
27
29
  component: function component(_ref) {
28
30
  var children = _ref.children;
29
31
  if ((0, _expValEquals.expValEquals)('platform_editor_toolbar_aifc_patch_3', 'isEnabled', true)) {
@@ -42,7 +44,11 @@ var getToolbarComponents = exports.getToolbarComponents = function getToolbarCom
42
44
  type: _toolbar.LOOM_MENU_SECTION.type,
43
45
  key: _toolbar.LOOM_MENU_SECTION.key,
44
46
  rank: _toolbar.LOOM_MENU_SECTION_RANK[_toolbar.LOOM_MENU_ITEM.key]
45
- }],
47
+ }].concat((0, _toConsumableArray2.default)((0, _platformFeatureFlags.fg)('platform_editor_toolbar_aifc_overflow_menu_update') ? [{
48
+ type: _toolbar.OVERFLOW_EXTENSIONS_MENU_SECTION.type,
49
+ key: _toolbar.OVERFLOW_EXTENSIONS_MENU_SECTION.key,
50
+ rank: _toolbar.OVERFLOW_EXTENSIONS_MENU_SECTION_RANK[_toolbar.LOOM_MENU_ITEM.key]
51
+ }] : [])),
46
52
  component: function component() {
47
53
  return /*#__PURE__*/_react.default.createElement(_LoomMenuItem.LoomMenuItem, {
48
54
  api: api,
package/dist/es2019/ui/LoomMenuItem.js CHANGED
@@ -4,6 +4,7 @@ import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks'
4
4
  import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages';
5
5
  import { useEditorToolbar } from '@atlaskit/editor-common/toolbar';
6
6
  import { LoomIcon, ToolbarDropdownItem } from '@atlaskit/editor-toolbar';
7
+ import { fg } from '@atlaskit/platform-feature-flags';
7
8
  import { executeRecordVideo } from '../pm-plugins/commands';
8
9
  const useLoomEnabled = api => {
9
10
  const {
@@ -21,6 +22,12 @@ export const LoomMenuItem = ({
21
22
  renderButton
22
23
  }) => {
23
24
  const loomEnabled = useLoomEnabled(api);
25
+ const {
26
+ editorViewMode
27
+ } = useEditorToolbar();
28
+ if (editorViewMode !== 'edit' && fg('platform_editor_toolbar_aifc_overflow_menu_update')) {
29
+ return null;
30
+ }
24
31
  if (renderButton) {
25
32
  return renderButton(CustomisableLoomMenuItem(api));
26
33
  } else if (loomEnabled !== undefined) {
@@ -65,7 +72,9 @@ const DefaultLoomMenuItem = ({
65
72
  onClick: handleOnClick
66
73
  });
67
74
  };
68
- const MenuItemComponent = /*#__PURE__*/React.forwardRef(({
75
+ const MenuItemComponent = /*#__PURE__*/React.forwardRef(
76
+ // eslint-disable-next-line no-unused-vars
77
+ ({
69
78
  disabled,
70
79
  onClick,
71
80
  href,
package/dist/es2019/ui/toolbar-components.js CHANGED
@@ -1,6 +1,7 @@
1
1
  import React from 'react';
2
- import { LOOM_MENU_SECTION, OVERFLOW_MENU_RANK, OVERFLOW_MENU, LOOM_MENU_ITEM, LOOM_MENU_SECTION_RANK, OVERFLOW_MENU_PRIMARY_TOOLBAR_RANK, OVERFLOW_MENU_PRIMARY_TOOLBAR } from '@atlaskit/editor-common/toolbar';
2
+ import { LOOM_MENU_SECTION, OVERFLOW_MENU_RANK, OVERFLOW_MENU, LOOM_MENU_ITEM, LOOM_MENU_SECTION_RANK, OVERFLOW_MENU_PRIMARY_TOOLBAR_RANK, OVERFLOW_MENU_PRIMARY_TOOLBAR, OVERFLOW_EXTENSIONS_MENU_SECTION, OVERFLOW_EXTENSIONS_MENU_SECTION_RANK } from '@atlaskit/editor-common/toolbar';
3
3
  import { ToolbarDropdownItemSection } from '@atlaskit/editor-toolbar';
4
+ import { fg } from '@atlaskit/platform-feature-flags';
4
5
  import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
5
6
  import { LoomMenuItem } from './LoomMenuItem';
6
7
  import { MenuSection } from './MenuSection';
@@ -8,11 +9,11 @@ export const getToolbarComponents = (config, api) => {
8
9
  return [{
9
10
  type: LOOM_MENU_SECTION.type,
10
11
  key: LOOM_MENU_SECTION.key,
11
- parents: [{
12
+ parents: [...(fg('platform_editor_toolbar_aifc_overflow_menu_update') ? [] : [{
12
13
  type: OVERFLOW_MENU.type,
13
14
  key: OVERFLOW_MENU.key,
14
15
  rank: OVERFLOW_MENU_RANK[LOOM_MENU_SECTION.key]
15
- }, {
16
+ }]), {
16
17
  type: OVERFLOW_MENU_PRIMARY_TOOLBAR.type,
17
18
  key: OVERFLOW_MENU_PRIMARY_TOOLBAR.key,
18
19
  rank: OVERFLOW_MENU_PRIMARY_TOOLBAR_RANK[LOOM_MENU_SECTION.key]
@@ -36,7 +37,11 @@ export const getToolbarComponents = (config, api) => {
36
37
  type: LOOM_MENU_SECTION.type,
37
38
  key: LOOM_MENU_SECTION.key,
38
39
  rank: LOOM_MENU_SECTION_RANK[LOOM_MENU_ITEM.key]
39
- }],
40
+ }, ...(fg('platform_editor_toolbar_aifc_overflow_menu_update') ? [{
41
+ type: OVERFLOW_EXTENSIONS_MENU_SECTION.type,
42
+ key: OVERFLOW_EXTENSIONS_MENU_SECTION.key,
43
+ rank: OVERFLOW_EXTENSIONS_MENU_SECTION_RANK[LOOM_MENU_ITEM.key]
44
+ }] : [])],
40
45
  component: () => {
41
46
  return /*#__PURE__*/React.createElement(LoomMenuItem, {
42
47
  api: api,
package/dist/esm/ui/LoomMenuItem.js CHANGED
@@ -4,6 +4,7 @@ import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks'
4
4
  import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages';
5
5
  import { useEditorToolbar } from '@atlaskit/editor-common/toolbar';
6
6
  import { LoomIcon, ToolbarDropdownItem } from '@atlaskit/editor-toolbar';
7
+ import { fg } from '@atlaskit/platform-feature-flags';
7
8
  import { executeRecordVideo } from '../pm-plugins/commands';
8
9
  var useLoomEnabled = function useLoomEnabled(api) {
9
10
  var _useSharedPluginState = useSharedPluginStateWithSelector(api, ['loom'], function (states) {
@@ -19,6 +20,11 @@ export var LoomMenuItem = function LoomMenuItem(_ref) {
19
20
  var api = _ref.api,
20
21
  renderButton = _ref.renderButton;
21
22
  var loomEnabled = useLoomEnabled(api);
23
+ var _useEditorToolbar = useEditorToolbar(),
24
+ editorViewMode = _useEditorToolbar.editorViewMode;
25
+ if (editorViewMode !== 'edit' && fg('platform_editor_toolbar_aifc_overflow_menu_update')) {
26
+ return null;
27
+ }
22
28
  if (renderButton) {
23
29
  return renderButton(CustomisableLoomMenuItem(api));
24
30
  } else if (loomEnabled !== undefined) {
@@ -66,14 +72,16 @@ var DefaultLoomMenuItem = function DefaultLoomMenuItem(_ref3) {
66
72
  onClick: handleOnClick
67
73
  });
68
74
  };
69
- var MenuItemComponent = /*#__PURE__*/React.forwardRef(function (_ref4, ref) {
75
+ var MenuItemComponent = /*#__PURE__*/React.forwardRef(
76
+ // eslint-disable-next-line no-unused-vars
77
+ function (_ref4, ref) {
70
78
  var disabled = _ref4.disabled,
71
79
  _onClick = _ref4.onClick,
72
80
  href = _ref4.href,
73
81
  target = _ref4.target,
74
82
  rel = _ref4.rel;
75
- var _useEditorToolbar = useEditorToolbar(),
76
- editorAppearance = _useEditorToolbar.editorAppearance;
83
+ var _useEditorToolbar2 = useEditorToolbar(),
84
+ editorAppearance = _useEditorToolbar2.editorAppearance;
77
85
  var _useIntl = useIntl(),
78
86
  formatMessage = _useIntl.formatMessage;
79
87
  return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
package/dist/esm/ui/toolbar-components.js CHANGED
@@ -1,6 +1,8 @@
1
+ import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
1
2
  import React from 'react';
2
- import { LOOM_MENU_SECTION, OVERFLOW_MENU_RANK, OVERFLOW_MENU, LOOM_MENU_ITEM, LOOM_MENU_SECTION_RANK, OVERFLOW_MENU_PRIMARY_TOOLBAR_RANK, OVERFLOW_MENU_PRIMARY_TOOLBAR } from '@atlaskit/editor-common/toolbar';
3
+ import { LOOM_MENU_SECTION, OVERFLOW_MENU_RANK, OVERFLOW_MENU, LOOM_MENU_ITEM, LOOM_MENU_SECTION_RANK, OVERFLOW_MENU_PRIMARY_TOOLBAR_RANK, OVERFLOW_MENU_PRIMARY_TOOLBAR, OVERFLOW_EXTENSIONS_MENU_SECTION, OVERFLOW_EXTENSIONS_MENU_SECTION_RANK } from '@atlaskit/editor-common/toolbar';
3
4
  import { ToolbarDropdownItemSection } from '@atlaskit/editor-toolbar';
5
+ import { fg } from '@atlaskit/platform-feature-flags';
4
6
  import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
5
7
  import { LoomMenuItem } from './LoomMenuItem';
6
8
  import { MenuSection } from './MenuSection';
@@ -8,15 +10,15 @@ export var getToolbarComponents = function getToolbarComponents(config, api) {
8
10
  return [{
9
11
  type: LOOM_MENU_SECTION.type,
10
12
  key: LOOM_MENU_SECTION.key,
11
- parents: [{
13
+ parents: [].concat(_toConsumableArray(fg('platform_editor_toolbar_aifc_overflow_menu_update') ? [] : [{
12
14
  type: OVERFLOW_MENU.type,
13
15
  key: OVERFLOW_MENU.key,
14
16
  rank: OVERFLOW_MENU_RANK[LOOM_MENU_SECTION.key]
15
- }, {
17
+ }]), [{
16
18
  type: OVERFLOW_MENU_PRIMARY_TOOLBAR.type,
17
19
  key: OVERFLOW_MENU_PRIMARY_TOOLBAR.key,
18
20
  rank: OVERFLOW_MENU_PRIMARY_TOOLBAR_RANK[LOOM_MENU_SECTION.key]
19
- }],
21
+ }]),
20
22
  component: function component(_ref) {
21
23
  var children = _ref.children;
22
24
  if (expValEquals('platform_editor_toolbar_aifc_patch_3', 'isEnabled', true)) {
@@ -35,7 +37,11 @@ export var getToolbarComponents = function getToolbarComponents(config, api) {
35
37
  type: LOOM_MENU_SECTION.type,
36
38
  key: LOOM_MENU_SECTION.key,
37
39
  rank: LOOM_MENU_SECTION_RANK[LOOM_MENU_ITEM.key]
38
- }],
40
+ }].concat(_toConsumableArray(fg('platform_editor_toolbar_aifc_overflow_menu_update') ? [{
41
+ type: OVERFLOW_EXTENSIONS_MENU_SECTION.type,
42
+ key: OVERFLOW_EXTENSIONS_MENU_SECTION.key,
43
+ rank: OVERFLOW_EXTENSIONS_MENU_SECTION_RANK[LOOM_MENU_ITEM.key]
44
+ }] : [])),
39
45
  component: function component() {
40
46
  return /*#__PURE__*/React.createElement(LoomMenuItem, {
41
47
  api: api,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-plugin-loom",
3
- "version": "8.0.16",
3
+ "version": "8.0.17",
4
4
  "description": "Loom plugin for @atlaskit/editor-core",
5
5
  "author": "Atlassian Pty Ltd",
6
6
  "license": "Apache-2.0",
@@ -37,21 +37,22 @@
37
37
  "@atlaskit/editor-plugin-editor-viewmode": "^8.0.0",
38
38
  "@atlaskit/editor-plugin-hyperlink": "^8.1.0",
39
39
  "@atlaskit/editor-plugin-primary-toolbar": "^7.0.0",
40
- "@atlaskit/editor-plugin-quick-insert": "^6.0.0",
40
+ "@atlaskit/editor-plugin-quick-insert": "^6.1.0",
41
41
  "@atlaskit/editor-plugin-toolbar": "^3.4.0",
42
42
  "@atlaskit/editor-plugin-width": "^7.0.0",
43
43
  "@atlaskit/editor-prosemirror": "7.0.0",
44
44
  "@atlaskit/editor-toolbar": "^0.18.0",
45
45
  "@atlaskit/icon": "^29.0.0",
46
+ "@atlaskit/platform-feature-flags": "^1.1.0",
46
47
  "@atlaskit/platform-feature-flags-react": "^0.4.0",
47
- "@atlaskit/tmp-editor-statsig": "^14.1.0",
48
+ "@atlaskit/tmp-editor-statsig": "^14.8.0",
48
49
  "@atlaskit/tokens": "^8.4.0",
49
50
  "@babel/runtime": "^7.0.0",
50
51
  "@emotion/react": "^11.7.1",
51
52
  "@loomhq/record-sdk": "^4.4.0"
52
53
  },
53
54
  "peerDependencies": {
54
- "@atlaskit/editor-common": "^110.36.0",
55
+ "@atlaskit/editor-common": "^110.40.0",
55
56
  "react": "^18.2.0",
56
57
  "react-dom": "^18.2.0",
57
58
  "react-intl-next": "npm:react-intl@^5.18.1"
@@ -100,6 +101,9 @@
100
101
  "platform-feature-flags": {
101
102
  "should-render-to-parent-should-be-true-editor-lego": {
102
103
  "type": "boolean"
104
+ },
105
+ "platform_editor_toolbar_aifc_overflow_menu_update": {
106
+ "type": "boolean"
103
107
  }
104
108
  }
105
109
  }