@atlaskit/editor-plugin-layout 1.12.17 → 1.12.19

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/editor-plugin-layout
 
+## 1.12.19
+
+### Patch Changes
+
+- [#98381](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/98381)
+  [`3e23b2a14109d`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/3e23b2a14109d) -
+  ED-26121 fix single column layout change layout
+
+## 1.12.18
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 1.12.17
 
 ### Patch Changes

package/dist/cjs/nodeviews/index.js

@@ -96,6 +96,9 @@ var LayoutSectionView = exports.LayoutSectionView = /*#__PURE__*/function (_Reac
       var _ref2 = _model.DOMSerializer.renderSpec(document, toDOM()),
         container = _ref2.dom,
         contentDOM = _ref2.contentDOM;
+
+      // Ignored via go/ees005
+      // eslint-disable-next-line @atlaskit/editor/no-as-casting
       this.layoutDOM = container.querySelector('[data-layout-section]');
       this.layoutDOM.setAttribute('data-column-rule-style', this.node.attrs.columnRuleStyle);
       if ((0, _platformFeatureFlags.fg)('platform_editor_advanced_layouts_post_fix_patch_1')) {

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

@@ -260,6 +260,8 @@ var decreaseColumns = function decreaseColumns(node, insideRightEdgePos) {
  * Switching from 3 -> 2 moves all the content of the third col inside the second before
  * removing it
  */
+// Ignored via go/ees005
+// eslint-disable-next-line @typescript-eslint/max-params
 function forceColumnStructure(state, node, pos, presetLayout) {
   var tr = state.tr;
   var insideRightEdgeOfLayoutSection = pos + node.nodeSize - 1;
@@ -294,6 +296,9 @@ function forceColumnStructure(state, node, pos, presetLayout) {
   }
   return tr;
 }
+
+// Ignored via go/ees005
+// eslint-disable-next-line @typescript-eslint/max-params
 function forceColumnStructureNew(state, node, pos, presetLayout) {
   var tr = state.tr;
   var insideRightEdgeOfLayoutSection = pos + node.nodeSize - 1;
@@ -321,6 +326,9 @@ function columnWidth(node, schema, widths) {
     }
   });
 }
+
+// Ignored via go/ees005
+// eslint-disable-next-line @typescript-eslint/max-params
 function forceColumnWidths(state, tr, pos, presetLayout) {
   var node = tr.doc.nodeAt(pos);
   if (!node) {
@@ -328,6 +336,9 @@ function forceColumnWidths(state, tr, pos, presetLayout) {
   }
   return tr.replaceWith(pos + 1, pos + node.nodeSize - 1, columnWidth(node, state.schema, getWidthsForPreset(presetLayout)));
 }
+
+// Ignored via go/ees005
+// eslint-disable-next-line @typescript-eslint/max-params
 function forceSectionToPresetLayout(state, node, pos, presetLayout) {
   var forceColumnStructureFn = (0, _experiments.editorExperiment)('advanced_layouts', true) ? forceColumnStructureNew : forceColumnStructure;
   var tr = forceColumnStructureFn(state, node, pos, presetLayout);
@@ -346,13 +357,22 @@ var setPresetLayout = exports.setPresetLayout = function setPresetLayout(editorA
       var _ref = _pluginKey.pluginKey.getState(state),
         pos = _ref.pos,
         selectedLayout = _ref.selectedLayout;
-      if (selectedLayout === layout || pos === null) {
+      if ((0, _platformFeatureFlags.fg)('platform_editor_advanced_layouts_post_fix_patch_3')) {
+        if (pos === null) {
+          return false;
+        }
+      } else if (selectedLayout === layout || pos === null) {
         return false;
       }
       var node = state.doc.nodeAt(pos);
       if (!node) {
         return false;
       }
+      if ((0, _platformFeatureFlags.fg)('platform_editor_advanced_layouts_post_fix_patch_3')) {
+        if (selectedLayout === layout && node.childCount > 1) {
+          return false;
+        }
+      }
       var tr = forceSectionToPresetLayout(state, node, pos, layout);
       if (tr) {
         editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent({
@@ -385,6 +405,7 @@ var getDefaultPresetLayout = function getDefaultPresetLayout(layoutNode) {
   if (layoutColumnCount <= 1) {
     // This prevents the creation of a single column layout
     // once we support single column layout, we can return 'single'
+
     return (0, _platformFeatureFlags.fg)('platform_editor_advanced_layouts_post_fix_patch_1') ? 'two_equal' : 'single';
   }
   switch (layoutColumnCount) {

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

@@ -34,7 +34,11 @@ var moveCursorToNextColumn = function moveCursorToNextColumn(state, dispatch) {
   var _state$schema$nodes = state.schema.nodes,
     layoutColumn = _state$schema$nodes.layoutColumn,
     layoutSection = _state$schema$nodes.layoutSection;
+  // Ignored via go/ees005
+  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
   var section = (0, _utils2.findParentNodeOfType)(layoutSection)(selection);
+  // Ignored via go/ees005
+  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
   var column = (0, _utils2.findParentNodeOfType)(layoutColumn)(selection);
   if (column.node !== section.node.lastChild) {
     var $nextColumn = state.doc.resolve(column.pos + column.node.nodeSize);
@@ -88,12 +92,17 @@ var _default = exports.default = function _default(options) {
       init: function init(_, state) {
         return getInitialPluginState(options, state);
       },
+      // Ignored via go/ees005
+      // eslint-disable-next-line @typescript-eslint/max-params
       apply: function apply(tr, pluginState, _oldState, newState) {
         if (tr.docChanged || tr.selectionSet) {
           var maybeLayoutSection = (0, _utils3.getMaybeLayoutSection)(newState);
           var newPluginState = _objectSpread(_objectSpread({}, pluginState), {}, {
             pos: maybeLayoutSection ? maybeLayoutSection.pos : null,
-            selectedLayout: (0, _actions.getSelectedLayout)(maybeLayoutSection && maybeLayoutSection.node, pluginState.selectedLayout)
+            selectedLayout: (0, _actions.getSelectedLayout)(maybeLayoutSection && maybeLayoutSection.node,
+            // Ignored via go/ees005
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+            pluginState.selectedLayout)
           });
           return newPluginState;
         }

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

@@ -8,7 +8,10 @@ var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _nodeviews = require("../nodeviews");
 var pluginKey = exports.pluginKey = new _state.PluginKey('layoutResizingPlugin');
-var _default = exports.default = function _default(options, pluginInjectionApi, portalProviderAPI, eventDispatcher) {
+var _default = exports.default = function _default(options, pluginInjectionApi, portalProviderAPI, eventDispatcher
+// Ignored via go/ees005
+// eslint-disable-next-line @typescript-eslint/max-params
+) {
   return new _safePlugin.SafePlugin({
     key: pluginKey,
     props: {

package/dist/cjs/ui/icons/LayoutThreeWithLeftSidebars.js

@@ -23,6 +23,8 @@ var LayoutThreeWithLeftSidebarsGlyph = function LayoutThreeWithLeftSidebarsGlyph
       viewBox: "0 0 16 14",
       fill: "none",
       xmlns: "http://www.w3.org/2000/svg"
+      // Ignored via go/ees005
+      // eslint-disable-next-line react/jsx-props-no-spreading
     }, props), (0, _react.jsx)("path", {
       fillRule: "evenodd",
       clipRule: "evenodd",
@@ -36,6 +38,8 @@ var LayoutThreeWithLeftSidebarsGlyph = function LayoutThreeWithLeftSidebarsGlyph
     viewBox: "0 0 16 14",
     fill: "none",
     xmlns: "http://www.w3.org/2000/svg"
+    // Ignored via go/ees005
+    // eslint-disable-next-line react/jsx-props-no-spreading
   }, props), (0, _react.jsx)("path", {
     fillRule: "evenodd",
     clipRule: "evenodd",
@@ -52,5 +56,7 @@ var LayoutThreeWithLeftSidebarsIcon = exports.LayoutThreeWithLeftSidebarsIcon =
     css: floatingToolbarPadding
   }, (0, _react.jsx)(_icon.default, (0, _extends2.default)({
     glyph: LayoutThreeWithLeftSidebarsGlyph
+    // Ignored via go/ees005
+    // eslint-disable-next-line react/jsx-props-no-spreading
   }, props)));
 };

package/dist/cjs/ui/icons/LayoutThreeWithRightSidebars.js

@@ -23,6 +23,8 @@ var LayoutThreeWithRightSidebarsGlyph = function LayoutThreeWithRightSidebarsGly
       viewBox: "0 0 16 14",
       fill: "none",
       xmlns: "http://www.w3.org/2000/svg"
+      // Ignored via go/ees005
+      // eslint-disable-next-line react/jsx-props-no-spreading
     }, props), (0, _react.jsx)("path", {
       fillRule: "evenodd",
       clipRule: "evenodd",
@@ -36,6 +38,8 @@ var LayoutThreeWithRightSidebarsGlyph = function LayoutThreeWithRightSidebarsGly
     viewBox: "0 0 16 14",
     fill: "none",
     xmlns: "http://www.w3.org/2000/svg"
+    // Ignored via go/ees005
+    // eslint-disable-next-line react/jsx-props-no-spreading
   }, props), (0, _react.jsx)("path", {
     fillRule: "evenodd",
     clipRule: "evenodd",
@@ -52,5 +56,7 @@ var LayoutThreeWithRightSidebarsIcon = exports.LayoutThreeWithRightSidebarsIcon
     css: floatingToolbarPadding
   }, (0, _react.jsx)(_icon.default, (0, _extends2.default)({
     glyph: LayoutThreeWithRightSidebarsGlyph
+    // Ignored via go/ees005
+    // eslint-disable-next-line react/jsx-props-no-spreading
   }, props)));
 };

package/dist/cjs/ui/toolbar.js

@@ -115,7 +115,10 @@ var LAYOUT_WITH_THREE_COL_DISTRIBUTION = [{
   icon: _LayoutThreeWithLeftSidebars.LayoutThreeWithLeftSidebarsIcon,
   iconFallback: _LayoutThreeWithLeftSidebars.LayoutThreeWithLeftSidebarsIcon
 }];
-var buildLayoutButton = function buildLayoutButton(intl, item, currentLayout, editorAnalyticsAPI) {
+var buildLayoutButton = function buildLayoutButton(intl, item, currentLayout, editorAnalyticsAPI
+// Ignored via go/ees005
+// eslint-disable-next-line @typescript-eslint/max-params
+) {
   return {
     id: item.id,
     type: 'button',
@@ -197,7 +200,10 @@ var getAdvancedLayoutItems = function getAdvancedLayoutItems(_ref) {
     }]
   }, separator, deleteButton]);
 };
-var buildToolbar = exports.buildToolbar = function buildToolbar(state, intl, pos, _allowBreakout, addSidebarLayouts, allowSingleColumnLayout, api) {
+var buildToolbar = exports.buildToolbar = function buildToolbar(state, intl, pos, _allowBreakout, addSidebarLayouts, allowSingleColumnLayout, api
+// Ignored via go/ees005
+// eslint-disable-next-line @typescript-eslint/max-params
+) {
   var _api$decorations$acti, _api$decorations, _api$analytics;
   var _ref2 = (_api$decorations$acti = api === null || api === 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 : {},
     hoverDecoration = _ref2.hoverDecoration;
@@ -228,6 +234,8 @@ var buildToolbar = exports.buildToolbar = function buildToolbar(state, intl, pos
     var layoutTypes = allowSingleColumnLayout ? LAYOUT_TYPES_WITH_SINGLE_COL : LAYOUT_TYPES;
     return {
       title: layoutToolbarTitle,
+      // Ignored via go/ees005
+      // eslint-disable-next-line @atlaskit/editor/no-as-casting
       getDomRef: function getDomRef(view) {
         return (0, _utils.findDomRefAtPos)(pos, view.domAtPos.bind(view));
       },

package/dist/es2019/nodeviews/index.js

@@ -74,6 +74,9 @@ export class LayoutSectionView extends ReactNodeView {
       dom: container,
       contentDOM
     } = DOMSerializer.renderSpec(document, toDOM());
+
+    // Ignored via go/ees005
+    // eslint-disable-next-line @atlaskit/editor/no-as-casting
     this.layoutDOM = container.querySelector('[data-layout-section]');
     this.layoutDOM.setAttribute('data-column-rule-style', this.node.attrs.columnRuleStyle);
     if (fg('platform_editor_advanced_layouts_post_fix_patch_1')) {

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

@@ -237,6 +237,8 @@ const decreaseColumns = (node, insideRightEdgePos, columnsNumberToRemove = 1) =>
  * Switching from 3 -> 2 moves all the content of the third col inside the second before
  * removing it
  */
+// Ignored via go/ees005
+// eslint-disable-next-line @typescript-eslint/max-params
 function forceColumnStructure(state, node, pos, presetLayout) {
   const tr = state.tr;
   const insideRightEdgeOfLayoutSection = pos + node.nodeSize - 1;
@@ -271,6 +273,9 @@ function forceColumnStructure(state, node, pos, presetLayout) {
   }
   return tr;
 }
+
+// Ignored via go/ees005
+// eslint-disable-next-line @typescript-eslint/max-params
 function forceColumnStructureNew(state, node, pos, presetLayout) {
   const tr = state.tr;
   const insideRightEdgeOfLayoutSection = pos + node.nodeSize - 1;
@@ -299,6 +304,9 @@ function columnWidth(node, schema, widths) {
     }
   });
 }
+
+// Ignored via go/ees005
+// eslint-disable-next-line @typescript-eslint/max-params
 function forceColumnWidths(state, tr, pos, presetLayout) {
   const node = tr.doc.nodeAt(pos);
   if (!node) {
@@ -306,6 +314,9 @@ function forceColumnWidths(state, tr, pos, presetLayout) {
   }
   return tr.replaceWith(pos + 1, pos + node.nodeSize - 1, columnWidth(node, state.schema, getWidthsForPreset(presetLayout)));
 }
+
+// Ignored via go/ees005
+// eslint-disable-next-line @typescript-eslint/max-params
 export function forceSectionToPresetLayout(state, node, pos, presetLayout) {
   const forceColumnStructureFn = editorExperiment('advanced_layouts', true) ? forceColumnStructureNew : forceColumnStructure;
   let tr = forceColumnStructureFn(state, node, pos, presetLayout);
@@ -323,14 +334,23 @@ export const setPresetLayout = editorAnalyticsAPI => layout => (state, dispatch)
     pos,
     selectedLayout
   } = pluginKey.getState(state);
-  if (selectedLayout === layout || pos === null) {
+  if (fg('platform_editor_advanced_layouts_post_fix_patch_3')) {
+    if (pos === null) {
+      return false;
+    }
+  } else if (selectedLayout === layout || pos === null) {
     return false;
   }
   const node = state.doc.nodeAt(pos);
   if (!node) {
     return false;
   }
-  let tr = forceSectionToPresetLayout(state, node, pos, layout);
+  if (fg('platform_editor_advanced_layouts_post_fix_patch_3')) {
+    if (selectedLayout === layout && node.childCount > 1) {
+      return false;
+    }
+  }
+  const tr = forceSectionToPresetLayout(state, node, pos, layout);
   if (tr) {
     editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.attachAnalyticsEvent({
       action: ACTION.CHANGED_LAYOUT,
@@ -360,6 +380,7 @@ const getDefaultPresetLayout = layoutNode => {
   if (layoutColumnCount <= 1) {
     // This prevents the creation of a single column layout
     // once we support single column layout, we can return 'single'
+
     return fg('platform_editor_advanced_layouts_post_fix_patch_1') ? 'two_equal' : 'single';
   }
   switch (layoutColumnCount) {
@@ -451,7 +472,7 @@ export const deleteActiveLayoutNode = editorAnalyticsAPI => (state, dispatch) =>
   if (pos !== null) {
     const node = state.doc.nodeAt(pos);
     if (dispatch) {
-      let tr = state.tr.delete(pos, pos + node.nodeSize);
+      const tr = state.tr.delete(pos, pos + node.nodeSize);
       editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.attachAnalyticsEvent({
         action: ACTION.DELETED,
         actionSubject: ACTION_SUBJECT.LAYOUT,

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

@@ -31,7 +31,11 @@ const moveCursorToNextColumn = (state, dispatch) => {
       }
     }
   } = state;
+  // Ignored via go/ees005
+  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
   const section = findParentNodeOfType(layoutSection)(selection);
+  // Ignored via go/ees005
+  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
   const column = findParentNodeOfType(layoutColumn)(selection);
   if (column.node !== section.node.lastChild) {
     const $nextColumn = state.doc.resolve(column.pos + column.node.nodeSize);
@@ -80,13 +84,18 @@ export default (options => new SafePlugin({
   key: pluginKey,
   state: {
     init: (_, state) => getInitialPluginState(options, state),
+    // Ignored via go/ees005
+    // eslint-disable-next-line @typescript-eslint/max-params
     apply: (tr, pluginState, _oldState, newState) => {
       if (tr.docChanged || tr.selectionSet) {
         const maybeLayoutSection = getMaybeLayoutSection(newState);
         const newPluginState = {
           ...pluginState,
           pos: maybeLayoutSection ? maybeLayoutSection.pos : null,
-          selectedLayout: getSelectedLayout(maybeLayoutSection && maybeLayoutSection.node, pluginState.selectedLayout)
+          selectedLayout: getSelectedLayout(maybeLayoutSection && maybeLayoutSection.node,
+          // Ignored via go/ees005
+          // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+          pluginState.selectedLayout)
         };
         return newPluginState;
       }

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

@@ -2,7 +2,10 @@ import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { LayoutSectionView } from '../nodeviews';
 export const pluginKey = new PluginKey('layoutResizingPlugin');
-export default ((options, pluginInjectionApi, portalProviderAPI, eventDispatcher) => new SafePlugin({
+export default ((options, pluginInjectionApi, portalProviderAPI, eventDispatcher
+// Ignored via go/ees005
+// eslint-disable-next-line @typescript-eslint/max-params
+) => new SafePlugin({
   key: pluginKey,
   props: {
     nodeViews: {

package/dist/es2019/ui/icons/LayoutThreeWithLeftSidebars.js

@@ -15,6 +15,8 @@ const LayoutThreeWithLeftSidebarsGlyph = props => {
       viewBox: "0 0 16 14",
       fill: "none",
       xmlns: "http://www.w3.org/2000/svg"
+      // Ignored via go/ees005
+      // eslint-disable-next-line react/jsx-props-no-spreading
     }, props), jsx("path", {
       fillRule: "evenodd",
       clipRule: "evenodd",
@@ -28,6 +30,8 @@ const LayoutThreeWithLeftSidebarsGlyph = props => {
     viewBox: "0 0 16 14",
     fill: "none",
     xmlns: "http://www.w3.org/2000/svg"
+    // Ignored via go/ees005
+    // eslint-disable-next-line react/jsx-props-no-spreading
   }, props), jsx("path", {
     fillRule: "evenodd",
     clipRule: "evenodd",
@@ -43,4 +47,6 @@ export const LayoutThreeWithLeftSidebarsIcon = props => jsx("span", {
   css: floatingToolbarPadding
 }, jsx(Icon, _extends({
   glyph: LayoutThreeWithLeftSidebarsGlyph
+  // Ignored via go/ees005
+  // eslint-disable-next-line react/jsx-props-no-spreading
 }, props)));

package/dist/es2019/ui/icons/LayoutThreeWithRightSidebars.js

@@ -15,6 +15,8 @@ const LayoutThreeWithRightSidebarsGlyph = props => {
       viewBox: "0 0 16 14",
       fill: "none",
       xmlns: "http://www.w3.org/2000/svg"
+      // Ignored via go/ees005
+      // eslint-disable-next-line react/jsx-props-no-spreading
     }, props), jsx("path", {
       fillRule: "evenodd",
       clipRule: "evenodd",
@@ -28,6 +30,8 @@ const LayoutThreeWithRightSidebarsGlyph = props => {
     viewBox: "0 0 16 14",
     fill: "none",
     xmlns: "http://www.w3.org/2000/svg"
+    // Ignored via go/ees005
+    // eslint-disable-next-line react/jsx-props-no-spreading
   }, props), jsx("path", {
     fillRule: "evenodd",
     clipRule: "evenodd",
@@ -43,4 +47,6 @@ export const LayoutThreeWithRightSidebarsIcon = props => jsx("span", {
   css: floatingToolbarPadding
 }, jsx(Icon, _extends({
   glyph: LayoutThreeWithRightSidebarsGlyph
+  // Ignored via go/ees005
+  // eslint-disable-next-line react/jsx-props-no-spreading
 }, props)));

package/dist/es2019/ui/toolbar.js

@@ -104,7 +104,10 @@ const LAYOUT_WITH_THREE_COL_DISTRIBUTION = [{
   icon: LayoutThreeWithLeftSidebarsIcon,
   iconFallback: LayoutThreeWithLeftSidebarsIcon
 }];
-const buildLayoutButton = (intl, item, currentLayout, editorAnalyticsAPI) => ({
+const buildLayoutButton = (intl, item, currentLayout, editorAnalyticsAPI
+// Ignored via go/ees005
+// eslint-disable-next-line @typescript-eslint/max-params
+) => ({
   id: item.id,
   type: 'button',
   icon: item.icon,
@@ -183,7 +186,10 @@ const getAdvancedLayoutItems = ({
     }]
   }, separator, deleteButton];
 };
-export const buildToolbar = (state, intl, pos, _allowBreakout, addSidebarLayouts, allowSingleColumnLayout, api) => {
+export const buildToolbar = (state, intl, pos, _allowBreakout, addSidebarLayouts, allowSingleColumnLayout, api
+// Ignored via go/ees005
+// eslint-disable-next-line @typescript-eslint/max-params
+) => {
   var _api$decorations$acti, _api$decorations, _api$analytics;
   const {
     hoverDecoration
@@ -215,6 +221,8 @@ export const buildToolbar = (state, intl, pos, _allowBreakout, addSidebarLayouts
     const layoutTypes = allowSingleColumnLayout ? LAYOUT_TYPES_WITH_SINGLE_COL : LAYOUT_TYPES;
     return {
       title: layoutToolbarTitle,
+      // Ignored via go/ees005
+      // eslint-disable-next-line @atlaskit/editor/no-as-casting
       getDomRef: view => findDomRefAtPos(pos, view.domAtPos.bind(view)),
       nodeType,
       groupLabel: intl.formatMessage(toolbarMessages.floatingToolbarRadioGroupAriaLabel),

package/dist/esm/nodeviews/index.js

@@ -86,6 +86,9 @@ export var LayoutSectionView = /*#__PURE__*/function (_ReactNodeView) {
       var _ref2 = DOMSerializer.renderSpec(document, toDOM()),
         container = _ref2.dom,
         contentDOM = _ref2.contentDOM;
+
+      // Ignored via go/ees005
+      // eslint-disable-next-line @atlaskit/editor/no-as-casting
       this.layoutDOM = container.querySelector('[data-layout-section]');
       this.layoutDOM.setAttribute('data-column-rule-style', this.node.attrs.columnRuleStyle);
       if (fg('platform_editor_advanced_layouts_post_fix_patch_1')) {

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

@@ -251,6 +251,8 @@ var decreaseColumns = function decreaseColumns(node, insideRightEdgePos) {
  * Switching from 3 -> 2 moves all the content of the third col inside the second before
  * removing it
  */
+// Ignored via go/ees005
+// eslint-disable-next-line @typescript-eslint/max-params
 function forceColumnStructure(state, node, pos, presetLayout) {
   var tr = state.tr;
   var insideRightEdgeOfLayoutSection = pos + node.nodeSize - 1;
@@ -285,6 +287,9 @@ function forceColumnStructure(state, node, pos, presetLayout) {
   }
   return tr;
 }
+
+// Ignored via go/ees005
+// eslint-disable-next-line @typescript-eslint/max-params
 function forceColumnStructureNew(state, node, pos, presetLayout) {
   var tr = state.tr;
   var insideRightEdgeOfLayoutSection = pos + node.nodeSize - 1;
@@ -312,6 +317,9 @@ function columnWidth(node, schema, widths) {
     }
   });
 }
+
+// Ignored via go/ees005
+// eslint-disable-next-line @typescript-eslint/max-params
 function forceColumnWidths(state, tr, pos, presetLayout) {
   var node = tr.doc.nodeAt(pos);
   if (!node) {
@@ -319,6 +327,9 @@ function forceColumnWidths(state, tr, pos, presetLayout) {
   }
   return tr.replaceWith(pos + 1, pos + node.nodeSize - 1, columnWidth(node, state.schema, getWidthsForPreset(presetLayout)));
 }
+
+// Ignored via go/ees005
+// eslint-disable-next-line @typescript-eslint/max-params
 export function forceSectionToPresetLayout(state, node, pos, presetLayout) {
   var forceColumnStructureFn = editorExperiment('advanced_layouts', true) ? forceColumnStructureNew : forceColumnStructure;
   var tr = forceColumnStructureFn(state, node, pos, presetLayout);
@@ -337,13 +348,22 @@ export var setPresetLayout = function setPresetLayout(editorAnalyticsAPI) {
       var _ref = pluginKey.getState(state),
         pos = _ref.pos,
         selectedLayout = _ref.selectedLayout;
-      if (selectedLayout === layout || pos === null) {
+      if (fg('platform_editor_advanced_layouts_post_fix_patch_3')) {
+        if (pos === null) {
+          return false;
+        }
+      } else if (selectedLayout === layout || pos === null) {
         return false;
       }
       var node = state.doc.nodeAt(pos);
       if (!node) {
         return false;
       }
+      if (fg('platform_editor_advanced_layouts_post_fix_patch_3')) {
+        if (selectedLayout === layout && node.childCount > 1) {
+          return false;
+        }
+      }
       var tr = forceSectionToPresetLayout(state, node, pos, layout);
       if (tr) {
         editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent({
@@ -376,6 +396,7 @@ var getDefaultPresetLayout = function getDefaultPresetLayout(layoutNode) {
   if (layoutColumnCount <= 1) {
     // This prevents the creation of a single column layout
     // once we support single column layout, we can return 'single'
+
     return fg('platform_editor_advanced_layouts_post_fix_patch_1') ? 'two_equal' : 'single';
   }
   switch (layoutColumnCount) {

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

@@ -27,7 +27,11 @@ var moveCursorToNextColumn = function moveCursorToNextColumn(state, dispatch) {
   var _state$schema$nodes = state.schema.nodes,
     layoutColumn = _state$schema$nodes.layoutColumn,
     layoutSection = _state$schema$nodes.layoutSection;
+  // Ignored via go/ees005
+  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
   var section = findParentNodeOfType(layoutSection)(selection);
+  // Ignored via go/ees005
+  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
   var column = findParentNodeOfType(layoutColumn)(selection);
   if (column.node !== section.node.lastChild) {
     var $nextColumn = state.doc.resolve(column.pos + column.node.nodeSize);
@@ -81,12 +85,17 @@ export default (function (options) {
       init: function init(_, state) {
         return getInitialPluginState(options, state);
       },
+      // Ignored via go/ees005
+      // eslint-disable-next-line @typescript-eslint/max-params
       apply: function apply(tr, pluginState, _oldState, newState) {
         if (tr.docChanged || tr.selectionSet) {
           var maybeLayoutSection = getMaybeLayoutSection(newState);
           var newPluginState = _objectSpread(_objectSpread({}, pluginState), {}, {
             pos: maybeLayoutSection ? maybeLayoutSection.pos : null,
-            selectedLayout: getSelectedLayout(maybeLayoutSection && maybeLayoutSection.node, pluginState.selectedLayout)
+            selectedLayout: getSelectedLayout(maybeLayoutSection && maybeLayoutSection.node,
+            // Ignored via go/ees005
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+            pluginState.selectedLayout)
           });
           return newPluginState;
         }

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

@@ -2,7 +2,10 @@ import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { LayoutSectionView } from '../nodeviews';
 export var pluginKey = new PluginKey('layoutResizingPlugin');
-export default (function (options, pluginInjectionApi, portalProviderAPI, eventDispatcher) {
+export default (function (options, pluginInjectionApi, portalProviderAPI, eventDispatcher
+// Ignored via go/ees005
+// eslint-disable-next-line @typescript-eslint/max-params
+) {
   return new SafePlugin({
     key: pluginKey,
     props: {

package/dist/esm/ui/icons/LayoutThreeWithLeftSidebars.js

@@ -15,6 +15,8 @@ var LayoutThreeWithLeftSidebarsGlyph = function LayoutThreeWithLeftSidebarsGlyph
       viewBox: "0 0 16 14",
       fill: "none",
       xmlns: "http://www.w3.org/2000/svg"
+      // Ignored via go/ees005
+      // eslint-disable-next-line react/jsx-props-no-spreading
     }, props), jsx("path", {
       fillRule: "evenodd",
       clipRule: "evenodd",
@@ -28,6 +30,8 @@ var LayoutThreeWithLeftSidebarsGlyph = function LayoutThreeWithLeftSidebarsGlyph
     viewBox: "0 0 16 14",
     fill: "none",
     xmlns: "http://www.w3.org/2000/svg"
+    // Ignored via go/ees005
+    // eslint-disable-next-line react/jsx-props-no-spreading
   }, props), jsx("path", {
     fillRule: "evenodd",
     clipRule: "evenodd",
@@ -44,5 +48,7 @@ export var LayoutThreeWithLeftSidebarsIcon = function LayoutThreeWithLeftSidebar
     css: floatingToolbarPadding
   }, jsx(Icon, _extends({
     glyph: LayoutThreeWithLeftSidebarsGlyph
+    // Ignored via go/ees005
+    // eslint-disable-next-line react/jsx-props-no-spreading
   }, props)));
 };

package/dist/esm/ui/icons/LayoutThreeWithRightSidebars.js

@@ -15,6 +15,8 @@ var LayoutThreeWithRightSidebarsGlyph = function LayoutThreeWithRightSidebarsGly
       viewBox: "0 0 16 14",
       fill: "none",
       xmlns: "http://www.w3.org/2000/svg"
+      // Ignored via go/ees005
+      // eslint-disable-next-line react/jsx-props-no-spreading
     }, props), jsx("path", {
       fillRule: "evenodd",
       clipRule: "evenodd",
@@ -28,6 +30,8 @@ var LayoutThreeWithRightSidebarsGlyph = function LayoutThreeWithRightSidebarsGly
     viewBox: "0 0 16 14",
     fill: "none",
     xmlns: "http://www.w3.org/2000/svg"
+    // Ignored via go/ees005
+    // eslint-disable-next-line react/jsx-props-no-spreading
   }, props), jsx("path", {
     fillRule: "evenodd",
     clipRule: "evenodd",
@@ -44,5 +48,7 @@ export var LayoutThreeWithRightSidebarsIcon = function LayoutThreeWithRightSideb
     css: floatingToolbarPadding
   }, jsx(Icon, _extends({
     glyph: LayoutThreeWithRightSidebarsGlyph
+    // Ignored via go/ees005
+    // eslint-disable-next-line react/jsx-props-no-spreading
   }, props)));
 };

package/dist/esm/ui/toolbar.js

@@ -105,7 +105,10 @@ var LAYOUT_WITH_THREE_COL_DISTRIBUTION = [{
   icon: LayoutThreeWithLeftSidebarsIcon,
   iconFallback: LayoutThreeWithLeftSidebarsIcon
 }];
-var buildLayoutButton = function buildLayoutButton(intl, item, currentLayout, editorAnalyticsAPI) {
+var buildLayoutButton = function buildLayoutButton(intl, item, currentLayout, editorAnalyticsAPI
+// Ignored via go/ees005
+// eslint-disable-next-line @typescript-eslint/max-params
+) {
   return {
     id: item.id,
     type: 'button',
@@ -187,7 +190,10 @@ var getAdvancedLayoutItems = function getAdvancedLayoutItems(_ref) {
     }]
   }, separator, deleteButton]);
 };
-export var buildToolbar = function buildToolbar(state, intl, pos, _allowBreakout, addSidebarLayouts, allowSingleColumnLayout, api) {
+export var buildToolbar = function buildToolbar(state, intl, pos, _allowBreakout, addSidebarLayouts, allowSingleColumnLayout, api
+// Ignored via go/ees005
+// eslint-disable-next-line @typescript-eslint/max-params
+) {
   var _api$decorations$acti, _api$decorations, _api$analytics;
   var _ref2 = (_api$decorations$acti = api === null || api === 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 : {},
     hoverDecoration = _ref2.hoverDecoration;
@@ -218,6 +224,8 @@ export var buildToolbar = function buildToolbar(state, intl, pos, _allowBreakout
     var layoutTypes = allowSingleColumnLayout ? LAYOUT_TYPES_WITH_SINGLE_COL : LAYOUT_TYPES;
     return {
       title: layoutToolbarTitle,
+      // Ignored via go/ees005
+      // eslint-disable-next-line @atlaskit/editor/no-as-casting
       getDomRef: function getDomRef(view) {
         return findDomRefAtPos(pos, view.domAtPos.bind(view));
       },

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-layout",
-	"version": "1.12.17",
+	"version": "1.12.19",
 	"description": "Layout plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -32,16 +32,16 @@
 	},
 	"dependencies": {
 		"@atlaskit/adf-schema": "^46.1.0",
-		"@atlaskit/editor-common": "^97.0.0",
+		"@atlaskit/editor-common": "^97.2.0",
 		"@atlaskit/editor-plugin-analytics": "^1.10.0",
 		"@atlaskit/editor-plugin-decorations": "^1.3.0",
 		"@atlaskit/editor-plugin-editor-disabled": "^1.3.0",
 		"@atlaskit/editor-plugin-selection": "^1.6.0",
-		"@atlaskit/editor-plugin-width": "^1.3.0",
+		"@atlaskit/editor-plugin-width": "^2.0.0",
 		"@atlaskit/editor-prosemirror": "6.2.1",
 		"@atlaskit/icon": "^23.1.0",
 		"@atlaskit/platform-feature-flags": "^0.3.0",
-		"@atlaskit/tmp-editor-statsig": "^2.29.0",
+		"@atlaskit/tmp-editor-statsig": "^2.30.0",
 		"@atlaskit/tokens": "^2.5.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1"
@@ -103,6 +103,9 @@
 		},
 		"platform_editor_advanced_layouts_post_fix_patch_1": {
 			"type": "boolean"
+		},
+		"platform_editor_advanced_layouts_post_fix_patch_3": {
+			"type": "boolean"
 		}
 	}
 }