@atlaskit/editor-plugin-layout 6.1.4 → 6.2.0

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @atlaskit/editor-plugin-layout
 
+## 6.2.0
+
+### Minor Changes
+
+- [`50292b8ecd09e`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/50292b8ecd09e) -
+  Add @atlaskit/editor-toolbar-plugin as an optional dependency and enable overflow menu
+
 ## 6.1.4
 
 ### Patch Changes

package/dist/cjs/ui/toolbar.js

@@ -11,6 +11,7 @@ var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers
 var _react = _interopRequireDefault(require("react"));
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _messages = _interopRequireWildcard(require("@atlaskit/editor-common/messages"));
+var _toolbarFlagCheck = require("@atlaskit/editor-common/toolbar-flag-check");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 var _copy = _interopRequireDefault(require("@atlaskit/icon/core/copy"));
@@ -222,6 +223,7 @@ var buildToolbar = exports.buildToolbar = function buildToolbar(state, intl, pos
     hoverDecoration = _ref2.hoverDecoration;
   var editorAnalyticsAPI = api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions;
   var node = state.doc.nodeAt(pos);
+  var toolbarFlagsEnabled = (0, _toolbarFlagCheck.areToolbarFlagsEnabled)(Boolean(api === null || api === void 0 ? void 0 : api.toolbar));
   if (node) {
     var currentLayout = (0, _actions.getPresetLayout)(node);
     var separator = {
@@ -309,7 +311,7 @@ var buildToolbar = exports.buildToolbar = function buildToolbar(state, intl, pos
         return buildLayoutButton(intl, i, currentLayout, editorAnalyticsAPI);
       })), (0, _toConsumableArray2.default)(addSidebarLayouts ? SIDEBAR_LAYOUT_TYPES.map(function (i) {
         return buildLayoutButton(intl, i, currentLayout, editorAnalyticsAPI);
-      }) : []))), (0, _toConsumableArray2.default)((0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') ? [fullHeightSeparator, overflowMenu] : [separator, copyButton, separator, deleteButton])),
+      }) : []))), (0, _toConsumableArray2.default)(toolbarFlagsEnabled ? [fullHeightSeparator, overflowMenu] : [separator, copyButton, separator, deleteButton])),
       scrollable: true
     };
   }

package/dist/es2019/ui/toolbar.js

@@ -1,6 +1,7 @@
 import React from 'react';
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import commonMessages, { layoutMessages, layoutMessages as toolbarMessages } from '@atlaskit/editor-common/messages';
+import { areToolbarFlagsEnabled } from '@atlaskit/editor-common/toolbar-flag-check';
 import { findDomRefAtPos } from '@atlaskit/editor-prosemirror/utils';
 import { akEditorSelectedNodeClassName } from '@atlaskit/editor-shared-styles';
 import CopyIcon from '@atlaskit/icon/core/copy';
@@ -207,6 +208,7 @@ export const buildToolbar = (state, intl, pos, _allowBreakout, addSidebarLayouts
   } = (_api$decorations$acti = api === null || api === void 0 ? void 0 : (_api$decorations = api.decorations) === null || _api$decorations === void 0 ? void 0 : _api$decorations.actions) !== null && _api$decorations$acti !== void 0 ? _api$decorations$acti : {};
   const editorAnalyticsAPI = api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions;
   const node = state.doc.nodeAt(pos);
+  const toolbarFlagsEnabled = areToolbarFlagsEnabled(Boolean(api === null || api === void 0 ? void 0 : api.toolbar));
   if (node) {
     const currentLayout = getPresetLayout(node);
     const separator = {
@@ -288,7 +290,7 @@ export const buildToolbar = (state, intl, pos, _allowBreakout, addSidebarLayouts
         deleteButton,
         currentLayout,
         allowAdvancedSingleColumnLayout
-      }) : [...layoutTypes.map(i => buildLayoutButton(intl, i, currentLayout, editorAnalyticsAPI)), ...(addSidebarLayouts ? SIDEBAR_LAYOUT_TYPES.map(i => buildLayoutButton(intl, i, currentLayout, editorAnalyticsAPI)) : [])]), ...(editorExperiment('platform_editor_controls', 'variant1') ? [fullHeightSeparator, overflowMenu] : [separator, copyButton, separator, deleteButton])],
+      }) : [...layoutTypes.map(i => buildLayoutButton(intl, i, currentLayout, editorAnalyticsAPI)), ...(addSidebarLayouts ? SIDEBAR_LAYOUT_TYPES.map(i => buildLayoutButton(intl, i, currentLayout, editorAnalyticsAPI)) : [])]), ...(toolbarFlagsEnabled ? [fullHeightSeparator, overflowMenu] : [separator, copyButton, separator, deleteButton])],
       scrollable: true
     };
   }

package/dist/esm/ui/toolbar.js

@@ -5,6 +5,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import React from 'react';
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import commonMessages, { layoutMessages, layoutMessages as toolbarMessages } from '@atlaskit/editor-common/messages';
+import { areToolbarFlagsEnabled } from '@atlaskit/editor-common/toolbar-flag-check';
 import { findDomRefAtPos } from '@atlaskit/editor-prosemirror/utils';
 import { akEditorSelectedNodeClassName } from '@atlaskit/editor-shared-styles';
 import CopyIcon from '@atlaskit/icon/core/copy';
@@ -213,6 +214,7 @@ export var buildToolbar = function buildToolbar(state, intl, pos, _allowBreakout
     hoverDecoration = _ref2.hoverDecoration;
   var editorAnalyticsAPI = api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions;
   var node = state.doc.nodeAt(pos);
+  var toolbarFlagsEnabled = areToolbarFlagsEnabled(Boolean(api === null || api === void 0 ? void 0 : api.toolbar));
   if (node) {
     var currentLayout = getPresetLayout(node);
     var separator = {
@@ -300,7 +302,7 @@ export var buildToolbar = function buildToolbar(state, intl, pos, _allowBreakout
         return buildLayoutButton(intl, i, currentLayout, editorAnalyticsAPI);
       })), _toConsumableArray(addSidebarLayouts ? SIDEBAR_LAYOUT_TYPES.map(function (i) {
         return buildLayoutButton(intl, i, currentLayout, editorAnalyticsAPI);
-      }) : []))), _toConsumableArray(editorExperiment('platform_editor_controls', 'variant1') ? [fullHeightSeparator, overflowMenu] : [separator, copyButton, separator, deleteButton])),
+      }) : []))), _toConsumableArray(toolbarFlagsEnabled ? [fullHeightSeparator, overflowMenu] : [separator, copyButton, separator, deleteButton])),
       scrollable: true
     };
   }

package/dist/types/layoutPluginType.d.ts

@@ -6,6 +6,7 @@ import type { EditorDisabledPlugin } from '@atlaskit/editor-plugin-editor-disabl
 import type { GuidelinePlugin } from '@atlaskit/editor-plugin-guideline';
 import type { InteractionPlugin } from '@atlaskit/editor-plugin-interaction';
 import type { SelectionPlugin } from '@atlaskit/editor-plugin-selection';
+import type { ToolbarPlugin } from '@atlaskit/editor-plugin-toolbar';
 import type { WidthPlugin } from '@atlaskit/editor-plugin-width';
 import type { insertLayoutColumnsWithAnalytics } from './pm-plugins/actions';
 import type { LayoutPluginOptions } from './types';
@@ -17,7 +18,8 @@ export type LayoutPluginDependencies = [
     OptionalPlugin<EditorDisabledPlugin>,
     OptionalPlugin<GuidelinePlugin>,
     OptionalPlugin<InteractionPlugin>,
-    OptionalPlugin<BlockMenuPlugin>
+    OptionalPlugin<BlockMenuPlugin>,
+    OptionalPlugin<ToolbarPlugin>
 ];
 export type LayoutPlugin = NextEditorPlugin<'layout', {
     actions: {

package/dist/types-ts4.5/layoutPluginType.d.ts

@@ -6,6 +6,7 @@ import type { EditorDisabledPlugin } from '@atlaskit/editor-plugin-editor-disabl
 import type { GuidelinePlugin } from '@atlaskit/editor-plugin-guideline';
 import type { InteractionPlugin } from '@atlaskit/editor-plugin-interaction';
 import type { SelectionPlugin } from '@atlaskit/editor-plugin-selection';
+import type { ToolbarPlugin } from '@atlaskit/editor-plugin-toolbar';
 import type { WidthPlugin } from '@atlaskit/editor-plugin-width';
 import type { insertLayoutColumnsWithAnalytics } from './pm-plugins/actions';
 import type { LayoutPluginOptions } from './types';
@@ -17,7 +18,8 @@ export type LayoutPluginDependencies = [
     OptionalPlugin<EditorDisabledPlugin>,
     OptionalPlugin<GuidelinePlugin>,
     OptionalPlugin<InteractionPlugin>,
-    OptionalPlugin<BlockMenuPlugin>
+    OptionalPlugin<BlockMenuPlugin>,
+    OptionalPlugin<ToolbarPlugin>
 ];
 export type LayoutPlugin = NextEditorPlugin<'layout', {
     actions: {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-layout",
-	"version": "6.1.4",
+	"version": "6.2.0",
 	"description": "Layout plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -37,6 +37,7 @@
 		"@atlaskit/editor-plugin-guideline": "^6.0.0",
 		"@atlaskit/editor-plugin-interaction": "^9.0.0",
 		"@atlaskit/editor-plugin-selection": "^6.1.0",
+		"@atlaskit/editor-plugin-toolbar": "^3.4.0",
 		"@atlaskit/editor-plugin-width": "^7.0.0",
 		"@atlaskit/editor-prosemirror": "7.0.0",
 		"@atlaskit/editor-shared-styles": "^3.8.0",