@atlaskit/editor-plugin-layout 1.12.18 → 1.12.19

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @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

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

@@ -357,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({
@@ -396,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/es2019/pm-plugins/actions.js

@@ -334,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,
@@ -371,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) {
@@ -462,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/esm/pm-plugins/actions.js

@@ -348,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({
@@ -387,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/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-layout",
-	"version": "1.12.18",
+	"version": "1.12.19",
 	"description": "Layout plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -41,7 +41,7 @@
 		"@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"
 		}
 	}
 }