@atlaskit/editor-plugin-breakout 1.9.3 → 1.9.5

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/editor-plugin-breakout
 
+## 1.9.5
+
+### Patch Changes
+
+- [#169284](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/169284)
+  [`6e121d2945aae`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/6e121d2945aae) -
+  ED-25760 draop hints are not triggered for unchanged layout
+
+## 1.9.4
+
+### Patch Changes
+
+- [#167313](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/167313)
+  [`40d491ee58258`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/40d491ee58258) -
+  ED-24230 Remove code wrapping for editor FG
+
 ## 1.9.3
 
 ### Patch Changes

package/dist/cjs/commands/remove-breakout.js

@@ -19,18 +19,14 @@ function removeBreakout(isLivePage) {
       return m.type.name !== 'breakout';
     });
     var tr = state.tr.setNodeMarkup(node.pos, node.node.type, node.node.attrs, marks);
-    if ((0, _platformFeatureFlags.fg)('editor_support_code_block_wrapping')) {
-      if (node.node.type === state.schema.nodes.expand) {
-        (0, _singlePlayerExpand.updateExpandedState)(tr, node, isLivePage);
-      } else if (!(0, _platformFeatureFlags.fg)('editor_code_block_wrapping_language_change_bug') && node.node.type === state.schema.nodes.codeBlock) {
-        var newNode = tr.doc.nodeAt(node.pos);
-        var oldNode = node.node;
-        if (newNode) {
-          (0, _codeBlock.transferCodeBlockWrappedValue)(oldNode, newNode);
-        }
-      }
-    } else {
+    if (node.node.type === state.schema.nodes.expand) {
       (0, _singlePlayerExpand.updateExpandedState)(tr, node, isLivePage);
+    } else if (!(0, _platformFeatureFlags.fg)('editor_code_block_wrapping_language_change_bug') && node.node.type === state.schema.nodes.codeBlock) {
+      var newNode = tr.doc.nodeAt(node.pos);
+      var oldNode = node.node;
+      if (newNode) {
+        (0, _codeBlock.transferCodeBlockWrappedValue)(oldNode, newNode);
+      }
     }
     tr.setMeta('scrollIntoView', false);
     if (state.selection instanceof _state.NodeSelection) {

package/dist/cjs/commands/set-breakout-mode.js

@@ -18,18 +18,14 @@ function setBreakoutMode(mode, isLivePage) {
     var tr = state.tr.setNodeMarkup(node.pos, node.node.type, node.node.attrs, [state.schema.marks.breakout.create({
       mode: mode
     })]);
-    if ((0, _platformFeatureFlags.fg)('editor_support_code_block_wrapping')) {
-      if (node.node.type === state.schema.nodes.expand) {
-        (0, _singlePlayerExpand.updateExpandedState)(tr, node, isLivePage);
-      } else if (!(0, _platformFeatureFlags.fg)('editor_code_block_wrapping_language_change_bug') && node.node.type === state.schema.nodes.codeBlock) {
-        var newNode = tr.doc.nodeAt(node.pos);
-        var oldNode = node.node;
-        if (newNode) {
-          (0, _codeBlock.transferCodeBlockWrappedValue)(oldNode, newNode);
-        }
-      }
-    } else {
+    if (node.node.type === state.schema.nodes.expand) {
       (0, _singlePlayerExpand.updateExpandedState)(tr, node, isLivePage);
+    } else if (!(0, _platformFeatureFlags.fg)('editor_code_block_wrapping_language_change_bug') && node.node.type === state.schema.nodes.codeBlock) {
+      var newNode = tr.doc.nodeAt(node.pos);
+      var oldNode = node.node;
+      if (newNode) {
+        (0, _codeBlock.transferCodeBlockWrappedValue)(oldNode, newNode);
+      }
     }
     tr.setMeta('scrollIntoView', false);
     if (state.selection instanceof _state.NodeSelection) {

package/dist/cjs/plugin.js

@@ -16,6 +16,7 @@ var _styles = require("@atlaskit/editor-common/styles");
 var _utils = require("@atlaskit/editor-common/utils");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _pluginKey = require("./plugin-key");
 var _LayoutButton = _interopRequireDefault(require("./ui/LayoutButton"));
 var _findBreakoutNode = require("./utils/find-breakout-node");
@@ -212,10 +213,16 @@ var LayoutButtonWrapper = function LayoutButtonWrapper(_ref3) {
     scrollableElement = _ref3.scrollableElement,
     mountPoint = _ref3.mountPoint;
   // Re-render with `width` (but don't use state) due to https://bitbucket.org/atlassian/%7Bc8e2f021-38d2-46d0-9b7a-b3f7b428f724%7D/pull-requests/24272
-  var _useSharedPluginState = (0, _hooks.useSharedPluginState)(api, ['width', 'breakout', 'editorViewMode', 'editorDisabled']),
+  var _useSharedPluginState = (0, _hooks.useSharedPluginState)(api, ['width', 'breakout', 'editorViewMode', 'editorDisabled', 'blockControls']),
     breakoutState = _useSharedPluginState.breakoutState,
     editorViewModeState = _useSharedPluginState.editorViewModeState,
-    editorDisabledState = _useSharedPluginState.editorDisabledState;
+    editorDisabledState = _useSharedPluginState.editorDisabledState,
+    blockControlsState = _useSharedPluginState.blockControlsState;
+  if (blockControlsState !== null && blockControlsState !== void 0 && blockControlsState.isDragging || blockControlsState !== null && blockControlsState !== void 0 && blockControlsState.isPMDragging) {
+    if ((0, _experiments.editorExperiment)('advanced_layouts', true)) {
+      return null;
+    }
+  }
   var isViewMode = (editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.mode) === 'view';
   var isEditMode = (editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.mode) === 'edit';
   if ((0, _platformFeatureFlags.fg)('platform_editor_react_editor_view_react_18')) {

package/dist/es2019/commands/remove-breakout.js

@@ -11,18 +11,14 @@ export function removeBreakout(isLivePage) {
     }
     const marks = node.node.marks.filter(m => m.type.name !== 'breakout');
     const tr = state.tr.setNodeMarkup(node.pos, node.node.type, node.node.attrs, marks);
-    if (fg('editor_support_code_block_wrapping')) {
-      if (node.node.type === state.schema.nodes.expand) {
-        updateExpandedState(tr, node, isLivePage);
-      } else if (!fg('editor_code_block_wrapping_language_change_bug') && node.node.type === state.schema.nodes.codeBlock) {
-        const newNode = tr.doc.nodeAt(node.pos);
-        const oldNode = node.node;
-        if (newNode) {
-          transferCodeBlockWrappedValue(oldNode, newNode);
-        }
-      }
-    } else {
+    if (node.node.type === state.schema.nodes.expand) {
       updateExpandedState(tr, node, isLivePage);
+    } else if (!fg('editor_code_block_wrapping_language_change_bug') && node.node.type === state.schema.nodes.codeBlock) {
+      const newNode = tr.doc.nodeAt(node.pos);
+      const oldNode = node.node;
+      if (newNode) {
+        transferCodeBlockWrappedValue(oldNode, newNode);
+      }
     }
     tr.setMeta('scrollIntoView', false);
     if (state.selection instanceof NodeSelection) {

package/dist/es2019/commands/set-breakout-mode.js

@@ -12,18 +12,14 @@ export function setBreakoutMode(mode, isLivePage) {
     const tr = state.tr.setNodeMarkup(node.pos, node.node.type, node.node.attrs, [state.schema.marks.breakout.create({
       mode
     })]);
-    if (fg('editor_support_code_block_wrapping')) {
-      if (node.node.type === state.schema.nodes.expand) {
-        updateExpandedState(tr, node, isLivePage);
-      } else if (!fg('editor_code_block_wrapping_language_change_bug') && node.node.type === state.schema.nodes.codeBlock) {
-        const newNode = tr.doc.nodeAt(node.pos);
-        const oldNode = node.node;
-        if (newNode) {
-          transferCodeBlockWrappedValue(oldNode, newNode);
-        }
-      }
-    } else {
+    if (node.node.type === state.schema.nodes.expand) {
       updateExpandedState(tr, node, isLivePage);
+    } else if (!fg('editor_code_block_wrapping_language_change_bug') && node.node.type === state.schema.nodes.codeBlock) {
+      const newNode = tr.doc.nodeAt(node.pos);
+      const oldNode = node.node;
+      if (newNode) {
+        transferCodeBlockWrappedValue(oldNode, newNode);
+      }
     }
     tr.setMeta('scrollIntoView', false);
     if (state.selection instanceof NodeSelection) {

package/dist/es2019/plugin.js

@@ -7,6 +7,7 @@ import { BreakoutCssClassName } from '@atlaskit/editor-common/styles';
 import { calcBreakoutWidthPx } from '@atlaskit/editor-common/utils';
 import { akEditorGutterPaddingDynamic, akEditorSwoopCubicBezier } from '@atlaskit/editor-shared-styles';
 import { fg } from '@atlaskit/platform-feature-flags';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { pluginKey } from './plugin-key';
 import LayoutButton from './ui/LayoutButton';
 import { findSupportedNodeForBreakout } from './utils/find-breakout-node';
@@ -206,8 +207,14 @@ const LayoutButtonWrapper = ({
   const {
     breakoutState,
     editorViewModeState,
-    editorDisabledState
-  } = useSharedPluginState(api, ['width', 'breakout', 'editorViewMode', 'editorDisabled']);
+    editorDisabledState,
+    blockControlsState
+  } = useSharedPluginState(api, ['width', 'breakout', 'editorViewMode', 'editorDisabled', 'blockControls']);
+  if (blockControlsState !== null && blockControlsState !== void 0 && blockControlsState.isDragging || blockControlsState !== null && blockControlsState !== void 0 && blockControlsState.isPMDragging) {
+    if (editorExperiment('advanced_layouts', true)) {
+      return null;
+    }
+  }
   const isViewMode = (editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.mode) === 'view';
   const isEditMode = (editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.mode) === 'edit';
   if (fg('platform_editor_react_editor_view_react_18')) {

package/dist/esm/commands/remove-breakout.js

@@ -13,18 +13,14 @@ export function removeBreakout(isLivePage) {
       return m.type.name !== 'breakout';
     });
     var tr = state.tr.setNodeMarkup(node.pos, node.node.type, node.node.attrs, marks);
-    if (fg('editor_support_code_block_wrapping')) {
-      if (node.node.type === state.schema.nodes.expand) {
-        updateExpandedState(tr, node, isLivePage);
-      } else if (!fg('editor_code_block_wrapping_language_change_bug') && node.node.type === state.schema.nodes.codeBlock) {
-        var newNode = tr.doc.nodeAt(node.pos);
-        var oldNode = node.node;
-        if (newNode) {
-          transferCodeBlockWrappedValue(oldNode, newNode);
-        }
-      }
-    } else {
+    if (node.node.type === state.schema.nodes.expand) {
       updateExpandedState(tr, node, isLivePage);
+    } else if (!fg('editor_code_block_wrapping_language_change_bug') && node.node.type === state.schema.nodes.codeBlock) {
+      var newNode = tr.doc.nodeAt(node.pos);
+      var oldNode = node.node;
+      if (newNode) {
+        transferCodeBlockWrappedValue(oldNode, newNode);
+      }
     }
     tr.setMeta('scrollIntoView', false);
     if (state.selection instanceof NodeSelection) {

package/dist/esm/commands/set-breakout-mode.js

@@ -12,18 +12,14 @@ export function setBreakoutMode(mode, isLivePage) {
     var tr = state.tr.setNodeMarkup(node.pos, node.node.type, node.node.attrs, [state.schema.marks.breakout.create({
       mode: mode
     })]);
-    if (fg('editor_support_code_block_wrapping')) {
-      if (node.node.type === state.schema.nodes.expand) {
-        updateExpandedState(tr, node, isLivePage);
-      } else if (!fg('editor_code_block_wrapping_language_change_bug') && node.node.type === state.schema.nodes.codeBlock) {
-        var newNode = tr.doc.nodeAt(node.pos);
-        var oldNode = node.node;
-        if (newNode) {
-          transferCodeBlockWrappedValue(oldNode, newNode);
-        }
-      }
-    } else {
+    if (node.node.type === state.schema.nodes.expand) {
       updateExpandedState(tr, node, isLivePage);
+    } else if (!fg('editor_code_block_wrapping_language_change_bug') && node.node.type === state.schema.nodes.codeBlock) {
+      var newNode = tr.doc.nodeAt(node.pos);
+      var oldNode = node.node;
+      if (newNode) {
+        transferCodeBlockWrappedValue(oldNode, newNode);
+      }
     }
     tr.setMeta('scrollIntoView', false);
     if (state.selection instanceof NodeSelection) {

package/dist/esm/plugin.js

@@ -11,6 +11,7 @@ import { BreakoutCssClassName } from '@atlaskit/editor-common/styles';
 import { calcBreakoutWidthPx } from '@atlaskit/editor-common/utils';
 import { akEditorGutterPaddingDynamic, akEditorSwoopCubicBezier } from '@atlaskit/editor-shared-styles';
 import { fg } from '@atlaskit/platform-feature-flags';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { pluginKey } from './plugin-key';
 import LayoutButton from './ui/LayoutButton';
 import { findSupportedNodeForBreakout } from './utils/find-breakout-node';
@@ -205,10 +206,16 @@ var LayoutButtonWrapper = function LayoutButtonWrapper(_ref3) {
     scrollableElement = _ref3.scrollableElement,
     mountPoint = _ref3.mountPoint;
   // Re-render with `width` (but don't use state) due to https://bitbucket.org/atlassian/%7Bc8e2f021-38d2-46d0-9b7a-b3f7b428f724%7D/pull-requests/24272
-  var _useSharedPluginState = useSharedPluginState(api, ['width', 'breakout', 'editorViewMode', 'editorDisabled']),
+  var _useSharedPluginState = useSharedPluginState(api, ['width', 'breakout', 'editorViewMode', 'editorDisabled', 'blockControls']),
     breakoutState = _useSharedPluginState.breakoutState,
     editorViewModeState = _useSharedPluginState.editorViewModeState,
-    editorDisabledState = _useSharedPluginState.editorDisabledState;
+    editorDisabledState = _useSharedPluginState.editorDisabledState,
+    blockControlsState = _useSharedPluginState.blockControlsState;
+  if (blockControlsState !== null && blockControlsState !== void 0 && blockControlsState.isDragging || blockControlsState !== null && blockControlsState !== void 0 && blockControlsState.isPMDragging) {
+    if (editorExperiment('advanced_layouts', true)) {
+      return null;
+    }
+  }
   var isViewMode = (editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.mode) === 'view';
   var isEditMode = (editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.mode) === 'edit';
   if (fg('platform_editor_react_editor_view_react_18')) {

package/dist/types/plugin.d.ts

@@ -1,4 +1,5 @@
 import type { NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
+import { type BlockControlsPlugin } from '@atlaskit/editor-plugin-block-controls';
 import { type EditorDisabledPlugin } from '@atlaskit/editor-plugin-editor-disabled';
 import type { EditorViewModePlugin } from '@atlaskit/editor-plugin-editor-viewmode';
 import type { WidthPlugin } from '@atlaskit/editor-plugin-width';
@@ -11,7 +12,8 @@ export type BreakoutPlugin = NextEditorPlugin<'breakout', {
     dependencies: [
         WidthPlugin,
         OptionalPlugin<EditorViewModePlugin>,
-        OptionalPlugin<EditorDisabledPlugin>
+        OptionalPlugin<EditorDisabledPlugin>,
+        OptionalPlugin<BlockControlsPlugin>
     ];
     sharedState: Partial<BreakoutPluginState>;
 }>;

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

@@ -1,4 +1,5 @@
 import type { NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
+import { type BlockControlsPlugin } from '@atlaskit/editor-plugin-block-controls';
 import { type EditorDisabledPlugin } from '@atlaskit/editor-plugin-editor-disabled';
 import type { EditorViewModePlugin } from '@atlaskit/editor-plugin-editor-viewmode';
 import type { WidthPlugin } from '@atlaskit/editor-plugin-width';
@@ -11,7 +12,8 @@ export type BreakoutPlugin = NextEditorPlugin<'breakout', {
     dependencies: [
         WidthPlugin,
         OptionalPlugin<EditorViewModePlugin>,
-        OptionalPlugin<EditorDisabledPlugin>
+        OptionalPlugin<EditorDisabledPlugin>,
+        OptionalPlugin<BlockControlsPlugin>
     ];
     sharedState: Partial<BreakoutPluginState>;
 }>;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-breakout",
-	"version": "1.9.3",
+	"version": "1.9.5",
 	"description": "Breakout plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -33,6 +33,7 @@
 	"dependencies": {
 		"@atlaskit/adf-schema": "^46.1.0",
 		"@atlaskit/editor-common": "^95.7.0",
+		"@atlaskit/editor-plugin-block-controls": "^2.13.0",
 		"@atlaskit/editor-plugin-editor-disabled": "^1.3.0",
 		"@atlaskit/editor-plugin-editor-viewmode": "^2.1.0",
 		"@atlaskit/editor-plugin-width": "^1.3.0",
@@ -41,6 +42,7 @@
 		"@atlaskit/icon": "^22.26.0",
 		"@atlaskit/platform-feature-flags": "^0.3.0",
 		"@atlaskit/theme": "^14.0.0",
+		"@atlaskit/tmp-editor-statsig": "^2.17.0",
 		"@atlaskit/tokens": "^2.3.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1"
@@ -105,9 +107,6 @@
 		"platform_editor_react_editor_view_react_18": {
 			"type": "boolean"
 		},
-		"editor_support_code_block_wrapping": {
-			"type": "boolean"
-		},
 		"editor_code_block_wrapping_language_change_bug": {
 			"type": "boolean"
 		},