@atlaskit/editor-plugin-layout 8.1.10 → 8.1.12

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @atlaskit/editor-plugin-layout
 
+## 8.1.12
+
+### Patch Changes
+
+- [`1bd298ad0a152`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/1bd298ad0a152) -
+  [ux] EDITOR-6280 Clean up platform_editor_block_menu_v2_patch_3 to fix icon and copy in jira block
+  menu
+- Updated dependencies
+
+## 8.1.11
+
+### Patch Changes
+
+- [`8ad443c7b22d0`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/8ad443c7b22d0) -
+  Support 'max' editor appearance for layout column resize handle when
+  platform_editor_layout_column_resize_handle experiment is enabled; guard column divider
+  decorations behind layout resizing plugin availability check
+- Updated dependencies
+
 ## 8.1.10
 
 ### Patch Changes

package/dist/cjs/layoutPlugin.js

@@ -94,7 +94,7 @@ var layoutPlugin = exports.layoutPlugin = function layoutPlugin(_ref) {
           return (0, _main.default)(options);
         }
       }];
-      if ((options.editorAppearance === 'full-page' || options.editorAppearance === 'full-width') && api && (0, _experiments.editorExperiment)('advanced_layouts', true)) {
+      if ((options.editorAppearance === 'full-page' || options.editorAppearance === 'full-width' || options.editorAppearance === 'max' && (0, _experiments.editorExperiment)('platform_editor_layout_column_resize_handle', true)) && api && (0, _experiments.editorExperiment)('advanced_layouts', true)) {
         plugins.push({
           name: 'layoutResizing',
           plugin: function plugin(_ref2) {

package/dist/cjs/pm-plugins/main.js

@@ -20,6 +20,7 @@ var _actions = require("./actions");
 var _columnResizeDivider = require("./column-resize-divider");
 var _consts = require("./consts");
 var _pluginKey = require("./plugin-key");
+var _resizing = require("./resizing");
 var _utils3 = require("./utils");
 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; }
 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; }
@@ -142,7 +143,8 @@ var _default = exports.default = function _default(options) {
     props: {
       decorations: function decorations(state) {
         var layoutState = _pluginKey.pluginKey.getState(state);
-        if ((0, _experiments.editorExperiment)('advanced_layouts', true) && (0, _experiments.editorExperiment)('platform_editor_layout_column_resize_handle', true)) {
+        var isLayoutResizingPluginAvailable = _resizing.pluginKey.get(state) !== undefined;
+        if ((0, _experiments.editorExperiment)('advanced_layouts', true) && (0, _experiments.editorExperiment)('platform_editor_layout_column_resize_handle', true) && isLayoutResizingPluginAvailable) {
           var dividerDecorations = (0, _columnResizeDivider.getColumnDividerDecorations)(state, editorViewRef);
           var selectedDecorations = layoutState.pos !== null ? getNodeDecoration(layoutState.pos, state.doc.nodeAt(layoutState.pos)) : [];
           var allDecorations = [].concat((0, _toConsumableArray2.default)(selectedDecorations), (0, _toConsumableArray2.default)(dividerDecorations));

package/dist/cjs/ui/LayoutBlockMenuItem.js

@@ -14,7 +14,6 @@ var _analytics = require("@atlaskit/editor-common/analytics");
 var _messages = require("@atlaskit/editor-common/messages");
 var _editorToolbar = require("@atlaskit/editor-toolbar");
 var _layoutTwoColumns = _interopRequireDefault(require("@atlaskit/icon/core/layout-two-columns"));
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var styles = {
   svgOverflow: "_1wrmewfl _172sewfl"
 };
@@ -39,21 +38,14 @@ var LayoutBlockMenuItem = function LayoutBlockMenuItem(_ref) {
       }) : null;
     });
   };
-
-  // [FEATURE FLAG: platform_editor_block_menu_v2_patch_3]
-  // Adds size="small" to icons for better visual consistency in block menu.
-  // Adds overflow: visible to SVGs to fix when view port is in different zoom level, sometimes the right edge of the icon is cut off.
-  // To clean up: remove conditionals, keep only size="small" version and always apply svgOverflowStyles wrapper.
-  var iconSize = (0, _platformFeatureFlags.fg)('platform_editor_block_menu_v2_patch_3') ? 'small' : undefined;
-  var icon = /*#__PURE__*/_react.default.createElement(_layoutTwoColumns.default, {
-    label: "",
-    size: iconSize
-  });
   return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownItem, {
     onClick: handleClick,
-    elemBefore: (0, _platformFeatureFlags.fg)('platform_editor_block_menu_v2_patch_3') ? /*#__PURE__*/_react.default.createElement("span", {
+    elemBefore: /*#__PURE__*/_react.default.createElement("span", {
       className: (0, _runtime.ax)([styles.svgOverflow])
-    }, icon) : icon
+    }, /*#__PURE__*/_react.default.createElement(_layoutTwoColumns.default, {
+      label: "",
+      size: "small"
+    }))
   }, formatMessage(_messages.blockMenuMessages.layout));
 };
 var createLayoutBlockMenuItem = exports.createLayoutBlockMenuItem = function createLayoutBlockMenuItem(api) {

package/dist/es2019/layoutPlugin.js

@@ -85,7 +85,7 @@ export const layoutPlugin = ({
         name: 'layout',
         plugin: () => createLayoutPlugin(options)
       }];
-      if ((options.editorAppearance === 'full-page' || options.editorAppearance === 'full-width') && api && editorExperiment('advanced_layouts', true)) {
+      if ((options.editorAppearance === 'full-page' || options.editorAppearance === 'full-width' || options.editorAppearance === 'max' && editorExperiment('platform_editor_layout_column_resize_handle', true)) && api && editorExperiment('advanced_layouts', true)) {
         plugins.push({
           name: 'layoutResizing',
           plugin: ({

package/dist/es2019/pm-plugins/main.js

@@ -11,6 +11,7 @@ import { fixColumnSizes, fixColumnStructure, getSelectedLayout } from './actions
 import { getColumnDividerDecorations } from './column-resize-divider';
 import { EVEN_DISTRIBUTED_COL_WIDTHS } from './consts';
 import { pluginKey } from './plugin-key';
+import { pluginKey as layoutResizingPluginKey } from './resizing';
 import { getMaybeLayoutSection } from './utils';
 export const DEFAULT_LAYOUT = 'two_equal';
 const isWholeSelectionInsideLayoutColumn = state => {
@@ -136,7 +137,8 @@ export default (options => {
     props: {
       decorations(state) {
         const layoutState = pluginKey.getState(state);
-        if (editorExperiment('advanced_layouts', true) && editorExperiment('platform_editor_layout_column_resize_handle', true)) {
+        const isLayoutResizingPluginAvailable = layoutResizingPluginKey.get(state) !== undefined;
+        if (editorExperiment('advanced_layouts', true) && editorExperiment('platform_editor_layout_column_resize_handle', true) && isLayoutResizingPluginAvailable) {
           const dividerDecorations = getColumnDividerDecorations(state, editorViewRef);
           const selectedDecorations = layoutState.pos !== null ? getNodeDecoration(layoutState.pos, state.doc.nodeAt(layoutState.pos)) : [];
           const allDecorations = [...selectedDecorations, ...dividerDecorations];

package/dist/es2019/ui/LayoutBlockMenuItem.js

@@ -7,7 +7,6 @@ import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { blockMenuMessages } from '@atlaskit/editor-common/messages';
 import { ToolbarDropdownItem } from '@atlaskit/editor-toolbar';
 import LayoutTwoColumnsIcon from '@atlaskit/icon/core/layout-two-columns';
-import { fg } from '@atlaskit/platform-feature-flags';
 const styles = {
   svgOverflow: "_1wrmewfl _172sewfl"
 };
@@ -35,21 +34,14 @@ const LayoutBlockMenuItem = ({
       }) : null;
     });
   };
-
-  // [FEATURE FLAG: platform_editor_block_menu_v2_patch_3]
-  // Adds size="small" to icons for better visual consistency in block menu.
-  // Adds overflow: visible to SVGs to fix when view port is in different zoom level, sometimes the right edge of the icon is cut off.
-  // To clean up: remove conditionals, keep only size="small" version and always apply svgOverflowStyles wrapper.
-  const iconSize = fg('platform_editor_block_menu_v2_patch_3') ? 'small' : undefined;
-  const icon = /*#__PURE__*/React.createElement(LayoutTwoColumnsIcon, {
-    label: "",
-    size: iconSize
-  });
   return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
     onClick: handleClick,
-    elemBefore: fg('platform_editor_block_menu_v2_patch_3') ? /*#__PURE__*/React.createElement("span", {
+    elemBefore: /*#__PURE__*/React.createElement("span", {
       className: ax([styles.svgOverflow])
-    }, icon) : icon
+    }, /*#__PURE__*/React.createElement(LayoutTwoColumnsIcon, {
+      label: "",
+      size: "small"
+    }))
   }, formatMessage(blockMenuMessages.layout));
 };
 export const createLayoutBlockMenuItem = api => {

package/dist/esm/layoutPlugin.js

@@ -88,7 +88,7 @@ export var layoutPlugin = function layoutPlugin(_ref) {
           return createLayoutPlugin(options);
         }
       }];
-      if ((options.editorAppearance === 'full-page' || options.editorAppearance === 'full-width') && api && editorExperiment('advanced_layouts', true)) {
+      if ((options.editorAppearance === 'full-page' || options.editorAppearance === 'full-width' || options.editorAppearance === 'max' && editorExperiment('platform_editor_layout_column_resize_handle', true)) && api && editorExperiment('advanced_layouts', true)) {
         plugins.push({
           name: 'layoutResizing',
           plugin: function plugin(_ref2) {

package/dist/esm/pm-plugins/main.js

@@ -15,6 +15,7 @@ import { fixColumnSizes, fixColumnStructure, getSelectedLayout } from './actions
 import { getColumnDividerDecorations } from './column-resize-divider';
 import { EVEN_DISTRIBUTED_COL_WIDTHS } from './consts';
 import { pluginKey } from './plugin-key';
+import { pluginKey as layoutResizingPluginKey } from './resizing';
 import { getMaybeLayoutSection } from './utils';
 export var DEFAULT_LAYOUT = 'two_equal';
 var isWholeSelectionInsideLayoutColumn = function isWholeSelectionInsideLayoutColumn(state) {
@@ -135,7 +136,8 @@ export default (function (options) {
     props: {
       decorations: function decorations(state) {
         var layoutState = pluginKey.getState(state);
-        if (editorExperiment('advanced_layouts', true) && editorExperiment('platform_editor_layout_column_resize_handle', true)) {
+        var isLayoutResizingPluginAvailable = layoutResizingPluginKey.get(state) !== undefined;
+        if (editorExperiment('advanced_layouts', true) && editorExperiment('platform_editor_layout_column_resize_handle', true) && isLayoutResizingPluginAvailable) {
           var dividerDecorations = getColumnDividerDecorations(state, editorViewRef);
           var selectedDecorations = layoutState.pos !== null ? getNodeDecoration(layoutState.pos, state.doc.nodeAt(layoutState.pos)) : [];
           var allDecorations = [].concat(_toConsumableArray(selectedDecorations), _toConsumableArray(dividerDecorations));

package/dist/esm/ui/LayoutBlockMenuItem.js

@@ -7,7 +7,6 @@ import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { blockMenuMessages } from '@atlaskit/editor-common/messages';
 import { ToolbarDropdownItem } from '@atlaskit/editor-toolbar';
 import LayoutTwoColumnsIcon from '@atlaskit/icon/core/layout-two-columns';
-import { fg } from '@atlaskit/platform-feature-flags';
 var styles = {
   svgOverflow: "_1wrmewfl _172sewfl"
 };
@@ -32,21 +31,14 @@ var LayoutBlockMenuItem = function LayoutBlockMenuItem(_ref) {
       }) : null;
     });
   };
-
-  // [FEATURE FLAG: platform_editor_block_menu_v2_patch_3]
-  // Adds size="small" to icons for better visual consistency in block menu.
-  // Adds overflow: visible to SVGs to fix when view port is in different zoom level, sometimes the right edge of the icon is cut off.
-  // To clean up: remove conditionals, keep only size="small" version and always apply svgOverflowStyles wrapper.
-  var iconSize = fg('platform_editor_block_menu_v2_patch_3') ? 'small' : undefined;
-  var icon = /*#__PURE__*/React.createElement(LayoutTwoColumnsIcon, {
-    label: "",
-    size: iconSize
-  });
   return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
     onClick: handleClick,
-    elemBefore: fg('platform_editor_block_menu_v2_patch_3') ? /*#__PURE__*/React.createElement("span", {
+    elemBefore: /*#__PURE__*/React.createElement("span", {
       className: ax([styles.svgOverflow])
-    }, icon) : icon
+    }, /*#__PURE__*/React.createElement(LayoutTwoColumnsIcon, {
+      label: "",
+      size: "small"
+    }))
   }, formatMessage(blockMenuMessages.layout));
 };
 export var createLayoutBlockMenuItem = function createLayoutBlockMenuItem(api) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-layout",
-	"version": "8.1.10",
+	"version": "8.1.12",
 	"description": "Layout plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -46,7 +46,7 @@
 		"@atlaskit/icon": "^34.1.0",
 		"@atlaskit/icon-lab": "^6.5.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
-		"@atlaskit/tmp-editor-statsig": "^62.0.0",
+		"@atlaskit/tmp-editor-statsig": "^62.2.0",
 		"@atlaskit/tokens": "^13.0.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",