@atlaskit/editor-plugin-block-controls 3.3.12 → 3.3.13

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 3.3.13
+
+### Patch Changes
+
+- [#126772](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/126772)
+  [`c64847bdf13d4`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/c64847bdf13d4) -
+  [ED-27001] This change is cleaning up the feature gate for a drag and drop bugfix to update the
+  drag preview for extensions with iFrames.
+- Updated dependencies
+
 ## 3.3.12
 
 ### Patch Changes

package/dist/cjs/editor-commands/move-to-layout.js

@@ -15,7 +15,6 @@ var _checkFragment = require("../pm-plugins/utils/check-fragment");
 var _consts = require("../pm-plugins/utils/consts");
 var _removeFromSource = require("../pm-plugins/utils/remove-from-source");
 var _selection = require("../pm-plugins/utils/selection");
-var _updateColumnWidths = require("../pm-plugins/utils/update-column-widths");
 var _validation = require("../pm-plugins/utils/validation");
 var _consts2 = require("../ui/consts");
 var createNewLayout = function createNewLayout(schema, layoutContents) {
@@ -70,20 +69,14 @@ var moveToExistingLayout = function moveToExistingLayout(toLayout, toLayoutPos,
     tr.delete(from, sourceContentEndPos);
     var mappedTo = tr.mapping.map(to);
     tr.insert(mappedTo, sourceContent);
-    if (!(0, _platformFeatureFlags.fg)('platform_editor_advanced_layouts_post_fix_patch_1') || selectMovedNode) {
+    if (selectMovedNode) {
       tr.setSelection(new _state.NodeSelection(tr.doc.resolve(mappedTo))).scrollIntoView();
     }
     (0, _analytics2.attachMoveNodeAnalytics)(tr, _analytics.INPUT_METHOD.DRAG_AND_DROP, $originalFrom.depth, ((_$originalFrom$nodeAf = $originalFrom.nodeAfter) === null || _$originalFrom$nodeAf === void 0 ? void 0 : _$originalFrom$nodeAf.type.name) || '', 1, 'layoutSection', true, api, sourceNodeTypes, hasSelectedMultipleNodes);
   } else if (toLayout.childCount < (0, _consts.maxLayoutColumnSupported)()) {
     var _$originalFrom$nodeAf2;
-    if ((0, _platformFeatureFlags.fg)('platform_editor_advanced_layouts_post_fix_patch_1')) {
-      (0, _removeFromSource.removeFromSource)(tr, tr.doc.resolve(from), sourceContentEndPos);
-      insertToDestinationNoWidthUpdate(tr, tr.mapping.map(to), sourceContent);
-    } else {
-      insertToDestination(tr, to, sourceContent, toLayout, toLayoutPos);
-      var mappedFrom = tr.mapping.map(from);
-      (0, _removeFromSource.removeFromSource)(tr, tr.doc.resolve(mappedFrom), tr.mapping.map(sourceContentEndPos));
-    }
+    (0, _removeFromSource.removeFromSource)(tr, tr.doc.resolve(from), sourceContentEndPos);
+    insertToDestinationNoWidthUpdate(tr, tr.mapping.map(to), sourceContent);
     (0, _analytics2.attachMoveNodeAnalytics)(tr, _analytics.INPUT_METHOD.DRAG_AND_DROP, $originalFrom.depth, ((_$originalFrom$nodeAf2 = $originalFrom.nodeAfter) === null || _$originalFrom$nodeAf2 === void 0 ? void 0 : _$originalFrom$nodeAf2.type.name) || '', 1, 'layoutSection', false, api, sourceNodeTypes, hasSelectedMultipleNodes);
   }
   return tr;
@@ -128,40 +121,6 @@ var insertToDestinationNoWidthUpdate = function insertToDestinationNoWidthUpdate
   }
   return tr;
 };
-var insertToDestination = function insertToDestination(tr, to, sourceContent, toLayout, toLayoutPos) {
-  var _ref3 = (0, _updateColumnWidths.updateColumnWidths)(tr, toLayout, toLayoutPos, toLayout.childCount + 1) || {},
-    newColumnWidth = _ref3.newColumnWidth;
-  var _ref4 = tr.doc.type.schema.nodes || {},
-    layoutColumn = _ref4.layoutColumn;
-  var content = null;
-  try {
-    if ((0, _experiments.editorExperiment)('platform_editor_element_drag_and_drop_multiselect', true)) {
-      if (sourceContent instanceof _model.Fragment) {
-        var _sourceContent$firstC;
-        content = layoutColumn.createChecked({
-          width: newColumnWidth
-        }, (0, _checkFragment.isFragmentOfType)(sourceContent, 'layoutColumn') ? (_sourceContent$firstC = sourceContent.firstChild) === null || _sourceContent$firstC === void 0 ? void 0 : _sourceContent$firstC.content : sourceContent);
-      }
-    } else {
-      if (sourceContent instanceof _model.Node) {
-        content = layoutColumn.createChecked({
-          width: newColumnWidth
-        }, sourceContent.type.name === 'layoutColumn' ? sourceContent.content : sourceContent);
-      }
-    }
-  } catch (error) {
-    (0, _monitoring.logException)(error, {
-      location: 'editor-plugin-block-controls/move-to-layout'
-    });
-  }
-  if (content) {
-    tr.insert(to, content);
-  }
-  if (!(0, _platformFeatureFlags.fg)('platform_editor_advanced_layouts_post_fix_patch_1')) {
-    tr.setSelection(new _state.NodeSelection(tr.doc.resolve(to))).scrollIntoView();
-  }
-  return tr;
-};
 
 /**
  * Check if the node at `from` can be moved to node at `to` to create/expand a layout.
@@ -171,10 +130,10 @@ var canMoveToLayout = function canMoveToLayout(api, from, to, tr, moveNodeAtCurs
   if (from === to) {
     return;
   }
-  var _ref5 = tr.doc.type.schema.nodes || {},
-    layoutSection = _ref5.layoutSection,
-    layoutColumn = _ref5.layoutColumn,
-    doc = _ref5.doc;
+  var _ref3 = tr.doc.type.schema.nodes || {},
+    layoutSection = _ref3.layoutSection,
+    layoutColumn = _ref3.layoutColumn,
+    doc = _ref3.doc;
 
   // layout plugin does not exist
   if (!layoutSection || !layoutColumn) {
@@ -224,8 +183,8 @@ var canMoveToLayout = function canMoveToLayout(api, from, to, tr, moveNodeAtCurs
 };
 var removeBreakoutMarks = function removeBreakoutMarks(tr, $from, to) {
   var fromContentWithoutBreakout = $from.nodeAfter;
-  var _ref6 = tr.doc.type.schema.marks || {},
-    breakout = _ref6.breakout;
+  var _ref4 = tr.doc.type.schema.marks || {},
+    breakout = _ref4.breakout;
   if ((0, _experiments.editorExperiment)('platform_editor_element_drag_and_drop_multiselect', true)) {
     tr.doc.nodesBetween($from.pos, to, function (node, pos, parent) {
       // breakout doesn't exist on nested nodes
@@ -288,8 +247,8 @@ var getBreakoutMode = function getBreakoutMode(content, breakout) {
 // source content variable that has type of `PMNode | Fragment` should be updated to `Fragment` only
 var moveToLayout = exports.moveToLayout = function moveToLayout(api) {
   return function (from, to, options) {
-    return function (_ref7) {
-      var tr = _ref7.tr;
+    return function (_ref5) {
+      var tr = _ref5.tr;
       if (!api) {
         return tr;
       }
@@ -302,11 +261,11 @@ var moveToLayout = exports.moveToLayout = function moveToLayout(api) {
         sourceContent = canMove.sourceContent,
         $sourceFrom = canMove.$sourceFrom,
         sourceTo = canMove.sourceTo;
-      var _ref8 = tr.doc.type.schema.nodes || {},
-        layoutSection = _ref8.layoutSection,
-        layoutColumn = _ref8.layoutColumn;
-      var _ref9 = tr.doc.type.schema.marks || {},
-        breakout = _ref9.breakout;
+      var _ref6 = tr.doc.type.schema.nodes || {},
+        layoutSection = _ref6.layoutSection,
+        layoutColumn = _ref6.layoutColumn;
+      var _ref7 = tr.doc.type.schema.marks || {},
+        breakout = _ref7.breakout;
 
       // get breakout mode from destination node,
       // if not found, get from source node,
@@ -364,9 +323,6 @@ var moveToLayout = exports.moveToLayout = function moveToLayout(api) {
           tr = (0, _removeFromSource.removeFromSource)(tr, $sourceFrom, sourceTo);
           var mappedTo = tr.mapping.map(to);
           tr.delete(mappedTo, mappedTo + toNodeWithoutBreakout.nodeSize).insert(mappedTo, newLayout);
-          if (!(0, _platformFeatureFlags.fg)('platform_editor_advanced_layouts_post_fix_patch_1')) {
-            tr.setSelection(new _state.NodeSelection(tr.doc.resolve(mappedTo))).scrollIntoView();
-          }
           breakoutMode && tr.setNodeMarkup(mappedTo, newLayout.type, newLayout.attrs, [breakout.create({
             mode: breakoutMode
           })]);

package/dist/cjs/pm-plugins/handle-mouse-over.js

@@ -46,7 +46,7 @@ var handleMouseOver = exports.handleMouseOver = function handleMouseOver(view, e
     }
     var parentElement = (_rootElement$parentEl = rootElement.parentElement) === null || _rootElement$parentEl === void 0 ? void 0 : _rootElement$parentEl.closest('[data-drag-handler-anchor-name]');
     var parentElementType = parentElement === null || parentElement === void 0 ? void 0 : parentElement.getAttribute('data-drag-handler-node-type');
-    if ((0, _experiments.editorExperiment)('advanced_layouts', true) && (0, _platformFeatureFlags.fg)('platform_editor_advanced_layouts_post_fix_patch_1')) {
+    if ((0, _experiments.editorExperiment)('advanced_layouts', true)) {
       // We want to exclude handles from showing for direct descendant of table nodes (i.e. nodes in cells)
       if (parentElement && (parentElementType === 'table' || parentElementType === 'tableRow') && (0, _experiments.editorExperiment)('nested-dnd', true)) {
         rootElement = parentElement;

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

@@ -642,7 +642,7 @@ var createPlugin = exports.createPlugin = function createPlugin(api, getIntl, no
           // Currently we can only drag one node at a time
           // so we only need to check first child
           var draggable = dragging === null || dragging === void 0 ? void 0 : dragging.slice.content.firstChild;
-          if (dndDragCancelled && isMultiSelectEnabled || (draggable === null || draggable === void 0 ? void 0 : draggable.type.name) === 'layoutColumn' && (0, _platformFeatureFlags.fg)('platform_editor_advanced_layouts_post_fix_patch_1')) {
+          if (dndDragCancelled && isMultiSelectEnabled || (draggable === null || draggable === void 0 ? void 0 : draggable.type.name) === 'layoutColumn') {
             // we prevent native DnD for layoutColumn to prevent single column layout.
             event.preventDefault();
             return false;

package/dist/cjs/pm-plugins/utils/drag-handle-positions.js

@@ -4,24 +4,19 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getTopPosition = exports.getLeftPosition = void 0;
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _consts = require("../../ui/consts");
 var getTopPosition = exports.getTopPosition = function getTopPosition(dom, type) {
   if (!dom) {
     return 'auto';
   }
   var table = dom.querySelector('table');
-  var isTable = (0, _platformFeatureFlags.fg)('platform_editor_advanced_layouts_post_fix_patch_1') ? table && (!type || type === 'table') : table;
+  var isTable = table && (!type || type === 'table');
   if (isTable) {
     return "".concat(dom.offsetTop + ((table === null || table === void 0 ? void 0 : table.offsetTop) || 0), "px");
   } else if (type === 'rule') {
     return "".concat(dom.offsetTop - _consts.DRAG_HANDLE_DIVIDER_TOP_ADJUSTMENT, "px");
   } else if (type === 'layoutColumn') {
-    if ((0, _platformFeatureFlags.fg)('platform_editor_advanced_layouts_post_fix_patch_1')) {
-      return "".concat(-dom.offsetTop / 2, "px");
-    } else {
-      return "".concat(-_consts.DRAG_HANDLE_WIDTH, "px");
-    }
+    return "".concat(-dom.offsetTop / 2, "px");
   } else if (type === 'heading-1') {
     return "".concat(dom.offsetTop + _consts.DRAG_HANDLE_H1_TOP_ADJUSTMENT, "px");
   } else if (type === 'heading-2') {

package/dist/cjs/ui/drag-handle.js

@@ -239,11 +239,9 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
   // but ensures the preview is generated correctly.
   var handleMouseDown = (0, _react.useCallback)(function () {
     if ((0, _experiments.editorExperiment)('advanced_layouts', true)) {
+      var _buttonRef$current;
       // prevent native drag and drop.
-      if ((0, _platformFeatureFlags.fg)('platform_editor_advanced_layouts_post_fix_patch_1')) {
-        var _buttonRef$current;
-        (_buttonRef$current = buttonRef.current) === null || _buttonRef$current === void 0 || _buttonRef$current.focus();
-      }
+      (_buttonRef$current = buttonRef.current) === null || _buttonRef$current === void 0 || _buttonRef$current.focus();
       if (!isLayoutColumn) {
         return undefined;
       }

package/dist/cjs/ui/drag-preview.js

@@ -7,31 +7,21 @@ Object.defineProperty(exports, "__esModule", {
 exports.dragPreview = void 0;
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _browser = require("@atlaskit/editor-common/browser");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _colors = require("@atlaskit/theme/colors");
-var previewStyleNew = {
+var previewStyle = {
   borderColor: "var(--ds-border, ".concat(_colors.N30, ")"),
   borderStyle: 'solid',
   borderRadius: "var(--ds-border-radius-100, 3px)",
   borderWidth: "var(--ds-border-width-outline, 2px)",
   backgroundColor: "var(--ds-skeleton-subtle, ".concat(_colors.N20, ")")
 };
-var previewStyleOld = {
-  borderColor: "var(--ds-border-focused, ".concat(_colors.B200, ")"),
-  borderStyle: 'solid',
-  borderRadius: "var(--ds-border-radius-100, 3px)",
-  borderWidth: "var(--ds-border-width-outline, 2px)",
-  backgroundColor: "var(--ds-blanket-selected, #388BFF14)"
-};
 var getPreviewContainerDimensionsForSingle = function getPreviewContainerDimensionsForSingle(dom, nodeType) {
   var nodeContainer = dom;
-  if ((0, _platformFeatureFlags.fg)('platform_editor_elements_drag_and_drop_ed_23189')) {
-    var iframeContainer = dom.querySelector('iframe');
-    if (nodeType === 'embedCard') {
-      nodeContainer = dom.querySelector('.rich-media-item') || dom;
-    } else if (nodeType === 'extension' && iframeContainer) {
-      nodeContainer = iframeContainer;
-    }
+  var iframeContainer = dom.querySelector('iframe');
+  if (nodeType === 'embedCard') {
+    nodeContainer = dom.querySelector('.rich-media-item') || dom;
+  } else if (nodeType === 'extension' && iframeContainer) {
+    nodeContainer = iframeContainer;
   }
   var nodeContainerRect = nodeContainer.getBoundingClientRect();
   return {
@@ -61,7 +51,6 @@ var createGenericPreview = function createGenericPreview() {
   var generalPreview = document.createElement('div');
   // ProseMirror class is required to make sure the cloned dom is styled correctly
   generalPreview.classList.add('ProseMirror', 'block-ctrl-drag-preview');
-  var previewStyle = (0, _platformFeatureFlags.fg)('platform_editor_elements_drag_and_drop_ed_23189') ? previewStyleNew : previewStyleOld;
   generalPreview.style.border = "".concat(previewStyle.borderWidth, " ").concat(previewStyle.borderStyle, " ").concat(previewStyle.borderColor);
   generalPreview.style.borderRadius = previewStyle.borderRadius;
   generalPreview.style.backgroundColor = previewStyle.backgroundColor;
@@ -85,13 +74,13 @@ var createContentPreviewElement = function createContentPreviewElement(dom, node
   clonedDom.style.marginRight = '0';
   clonedDom.style.marginBottom = nodeSpacing ? "".concat(nodeSpacing.bottom) : '0';
   clonedDom.style.boxShadow = 'none';
-  clonedDom.style.opacity = _browser.browser.windows ? '1' : (0, _platformFeatureFlags.fg)('platform_editor_elements_drag_and_drop_ed_23189') ? '0.31' : '0.4';
+  clonedDom.style.opacity = _browser.browser.windows ? '1' : '0.31';
   contentPreviewOneElement.appendChild(clonedDom);
   return contentPreviewOneElement;
 };
 var isGenericPreview = function isGenericPreview(dom, nodeType) {
   var embedCard = dom.querySelector('.embedCardView-content-wrap');
-  return (0, _platformFeatureFlags.fg)('platform_editor_elements_drag_and_drop_ed_23189') ? nodeType === 'embedCard' || !!embedCard || nodeType === 'extension' && !!dom.querySelector('iframe') : nodeType === 'embedCard' || !!embedCard || nodeType === 'extension';
+  return nodeType === 'embedCard' || !!embedCard || nodeType === 'extension' && !!dom.querySelector('iframe');
 };
 var createPreviewForElement = function createPreviewForElement(dom, nodeType, nodeSpacing) {
   var shouldBeGenericPreview = isGenericPreview(dom, nodeType);

package/dist/cjs/ui/drop-target-layout.js

@@ -10,7 +10,6 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _react = require("react");
 var _react2 = require("@emotion/react");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _box = require("@atlaskit/pragmatic-drag-and-drop-react-drop-indicator/box");
 var _adapter = require("@atlaskit/pragmatic-drag-and-drop/element/adapter");
 var _colors = require("@atlaskit/theme/colors");
@@ -81,7 +80,7 @@ var DropTargetLayout = exports.DropTargetLayout = function DropTargetLayout(prop
     var to = getPos();
     var mappedTo;
     if (to !== undefined) {
-      var _api$core;
+      var _api$core, _api$core2;
       var from = activeNode.pos;
       api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 || _api$core.actions.execute(function (_ref2) {
         var _api$blockControls2;
@@ -89,22 +88,17 @@ var DropTargetLayout = exports.DropTargetLayout = function DropTargetLayout(prop
         api === null || api === void 0 || (_api$blockControls2 = api.blockControls) === null || _api$blockControls2 === void 0 || (_api$blockControls2 = _api$blockControls2.commands) === null || _api$blockControls2 === void 0 || _api$blockControls2.moveToLayout(from, to)({
           tr: tr
         });
-        if ((0, _platformFeatureFlags.fg)('platform_editor_advanced_layouts_post_fix_patch_1')) {
-          var insertColumnStep = (0, _updateSelection.getInsertLayoutStep)(tr);
-          mappedTo = insertColumnStep === null || insertColumnStep === void 0 ? void 0 : insertColumnStep.from;
+        var insertColumnStep = (0, _updateSelection.getInsertLayoutStep)(tr);
+        mappedTo = insertColumnStep === null || insertColumnStep === void 0 ? void 0 : insertColumnStep.from;
+        return tr;
+      });
+      api === null || api === void 0 || (_api$core2 = api.core) === null || _api$core2 === void 0 || _api$core2.actions.execute(function (_ref3) {
+        var tr = _ref3.tr;
+        if (mappedTo !== undefined) {
+          (0, _updateSelection.updateSelection)(tr, mappedTo);
         }
         return tr;
       });
-      if ((0, _platformFeatureFlags.fg)('platform_editor_advanced_layouts_post_fix_patch_1')) {
-        var _api$core2;
-        api === null || api === void 0 || (_api$core2 = api.core) === null || _api$core2 === void 0 || _api$core2.actions.execute(function (_ref3) {
-          var tr = _ref3.tr;
-          if (mappedTo !== undefined) {
-            (0, _updateSelection.updateSelection)(tr, mappedTo);
-          }
-          return tr;
-        });
-      }
     }
   }, [api, getPos, activeNode]);
   (0, _react.useEffect)(function () {

package/dist/cjs/ui/global-styles.js

@@ -8,7 +8,6 @@ exports.GlobalStylesWrapper = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = require("@emotion/react");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _consts = require("./consts");
 /**
@@ -216,6 +215,6 @@ var blockCardWithoutLayout = (0, _react.css)({
 });
 var GlobalStylesWrapper = exports.GlobalStylesWrapper = function GlobalStylesWrapper() {
   return (0, _react.jsx)(_react.Global, {
-    styles: [globalStyles(), (0, _platformFeatureFlags.fg)('platform_editor_advanced_layouts_post_fix_patch_1') && globalDnDStyle, (0, _experiments.editorExperiment)('nested-dnd', true) ? extendedHoverZoneNested() : extendedHoverZone(), withInlineNodeStyle, withDeleteLinesStyleFix, withMediaSingleStyleFix, legacyBreakoutWideLayoutStyle, headingWithIndentationInLayoutStyleFix, (0, _experiments.editorExperiment)('advanced_layouts', true) ? blockCardWithoutLayout : undefined, withDividerInPanelStyleFix, withFormatInLayoutStyleFix, withRelativePosStyle, topLevelNodeMarginStyles, (0, _experiments.editorExperiment)('nested-dnd', true) ? withAnchorNameZindexNestedStyle : withAnchorNameZindexStyle,,]
+    styles: [globalStyles(), globalDnDStyle, (0, _experiments.editorExperiment)('nested-dnd', true) ? extendedHoverZoneNested() : extendedHoverZone(), withInlineNodeStyle, withDeleteLinesStyleFix, withMediaSingleStyleFix, legacyBreakoutWideLayoutStyle, headingWithIndentationInLayoutStyleFix, (0, _experiments.editorExperiment)('advanced_layouts', true) ? blockCardWithoutLayout : undefined, withDividerInPanelStyleFix, withFormatInLayoutStyleFix, withRelativePosStyle, topLevelNodeMarginStyles, (0, _experiments.editorExperiment)('nested-dnd', true) ? withAnchorNameZindexNestedStyle : withAnchorNameZindexStyle,,]
   });
 };

package/dist/cjs/ui/inline-drop-target.js

@@ -10,7 +10,6 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _react = require("react");
 var _react2 = require("@emotion/react");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _box = require("@atlaskit/pragmatic-drag-and-drop-react-drop-indicator/box");
 var _adapter = require("@atlaskit/pragmatic-drag-and-drop/element/adapter");
 var _colors = require("@atlaskit/theme/colors");
@@ -191,7 +190,7 @@ var InlineDropTarget = exports.InlineDropTarget = function InlineDropTarget(_ref
     var toPos = getPos();
     var mappedTo;
     if (activeNode && toPos !== undefined) {
-      var _api$core;
+      var _api$core, _api$core2;
       var start = activeNode.pos;
       var moveToEnd = position === 'right';
       api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 || _api$core.actions.execute(function (_ref3) {
@@ -202,22 +201,17 @@ var InlineDropTarget = exports.InlineDropTarget = function InlineDropTarget(_ref
         })({
           tr: tr
         });
-        if ((0, _platformFeatureFlags.fg)('platform_editor_advanced_layouts_post_fix_patch_1')) {
-          var insertLayoutStep = (0, _updateSelection.getInsertLayoutStep)(tr);
-          mappedTo = insertLayoutStep === null || insertLayoutStep === void 0 ? void 0 : insertLayoutStep.from;
+        var insertLayoutStep = (0, _updateSelection.getInsertLayoutStep)(tr);
+        mappedTo = insertLayoutStep === null || insertLayoutStep === void 0 ? void 0 : insertLayoutStep.from;
+        return tr;
+      });
+      api === null || api === void 0 || (_api$core2 = api.core) === null || _api$core2 === void 0 || _api$core2.actions.execute(function (_ref4) {
+        var tr = _ref4.tr;
+        if (mappedTo !== undefined) {
+          (0, _updateSelection.updateSelection)(tr, mappedTo, moveToEnd);
         }
         return tr;
       });
-      if ((0, _platformFeatureFlags.fg)('platform_editor_advanced_layouts_post_fix_patch_1')) {
-        var _api$core2;
-        api === null || api === void 0 || (_api$core2 = api.core) === null || _api$core2 === void 0 || _api$core2.actions.execute(function (_ref4) {
-          var tr = _ref4.tr;
-          if (mappedTo !== undefined) {
-            (0, _updateSelection.updateSelection)(tr, mappedTo, moveToEnd);
-          }
-          return tr;
-        });
-      }
     }
   }, [api, getPos, position]);
   var hoverZoneRectStyle = (0, _react.useMemo)(function () {

package/dist/es2019/editor-commands/move-to-layout.js

@@ -4,12 +4,11 @@ import { Fragment, Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
-import { fireInsertLayoutAnalytics, attachMoveNodeAnalytics, getMultiSelectAnalyticsAttributes } from '../pm-plugins/utils/analytics';
-import { isFragmentOfType, containsNodeOfType } from '../pm-plugins/utils/check-fragment';
+import { attachMoveNodeAnalytics, fireInsertLayoutAnalytics, getMultiSelectAnalyticsAttributes } from '../pm-plugins/utils/analytics';
+import { containsNodeOfType, isFragmentOfType } from '../pm-plugins/utils/check-fragment';
 import { maxLayoutColumnSupported } from '../pm-plugins/utils/consts';
 import { removeFromSource } from '../pm-plugins/utils/remove-from-source';
 import { getMultiSelectionIfPosInside } from '../pm-plugins/utils/selection';
-import { updateColumnWidths } from '../pm-plugins/utils/update-column-widths';
 import { isInSameLayout } from '../pm-plugins/utils/validation';
 import { DEFAULT_COLUMN_DISTRIBUTIONS } from '../ui/consts';
 const createNewLayout = (schema, layoutContents) => {
@@ -65,20 +64,14 @@ const moveToExistingLayout = (toLayout, toLayoutPos, sourceContent, from, to, tr
     tr.delete(from, sourceContentEndPos);
     const mappedTo = tr.mapping.map(to);
     tr.insert(mappedTo, sourceContent);
-    if (!fg('platform_editor_advanced_layouts_post_fix_patch_1') || selectMovedNode) {
+    if (selectMovedNode) {
       tr.setSelection(new NodeSelection(tr.doc.resolve(mappedTo))).scrollIntoView();
     }
     attachMoveNodeAnalytics(tr, INPUT_METHOD.DRAG_AND_DROP, $originalFrom.depth, ((_$originalFrom$nodeAf = $originalFrom.nodeAfter) === null || _$originalFrom$nodeAf === void 0 ? void 0 : _$originalFrom$nodeAf.type.name) || '', 1, 'layoutSection', true, api, sourceNodeTypes, hasSelectedMultipleNodes);
   } else if (toLayout.childCount < maxLayoutColumnSupported()) {
     var _$originalFrom$nodeAf2;
-    if (fg('platform_editor_advanced_layouts_post_fix_patch_1')) {
-      removeFromSource(tr, tr.doc.resolve(from), sourceContentEndPos);
-      insertToDestinationNoWidthUpdate(tr, tr.mapping.map(to), sourceContent);
-    } else {
-      insertToDestination(tr, to, sourceContent, toLayout, toLayoutPos);
-      const mappedFrom = tr.mapping.map(from);
-      removeFromSource(tr, tr.doc.resolve(mappedFrom), tr.mapping.map(sourceContentEndPos));
-    }
+    removeFromSource(tr, tr.doc.resolve(from), sourceContentEndPos);
+    insertToDestinationNoWidthUpdate(tr, tr.mapping.map(to), sourceContent);
     attachMoveNodeAnalytics(tr, INPUT_METHOD.DRAG_AND_DROP, $originalFrom.depth, ((_$originalFrom$nodeAf2 = $originalFrom.nodeAfter) === null || _$originalFrom$nodeAf2 === void 0 ? void 0 : _$originalFrom$nodeAf2.type.name) || '', 1, 'layoutSection', false, api, sourceNodeTypes, hasSelectedMultipleNodes);
   }
   return tr;
@@ -124,42 +117,6 @@ const insertToDestinationNoWidthUpdate = (tr, to, sourceContent) => {
   }
   return tr;
 };
-const insertToDestination = (tr, to, sourceContent, toLayout, toLayoutPos) => {
-  const {
-    newColumnWidth
-  } = updateColumnWidths(tr, toLayout, toLayoutPos, toLayout.childCount + 1) || {};
-  const {
-    layoutColumn
-  } = tr.doc.type.schema.nodes || {};
-  let content = null;
-  try {
-    if (editorExperiment('platform_editor_element_drag_and_drop_multiselect', true)) {
-      if (sourceContent instanceof Fragment) {
-        var _sourceContent$firstC;
-        content = layoutColumn.createChecked({
-          width: newColumnWidth
-        }, isFragmentOfType(sourceContent, 'layoutColumn') ? (_sourceContent$firstC = sourceContent.firstChild) === null || _sourceContent$firstC === void 0 ? void 0 : _sourceContent$firstC.content : sourceContent);
-      }
-    } else {
-      if (sourceContent instanceof PMNode) {
-        content = layoutColumn.createChecked({
-          width: newColumnWidth
-        }, sourceContent.type.name === 'layoutColumn' ? sourceContent.content : sourceContent);
-      }
-    }
-  } catch (error) {
-    logException(error, {
-      location: 'editor-plugin-block-controls/move-to-layout'
-    });
-  }
-  if (content) {
-    tr.insert(to, content);
-  }
-  if (!fg('platform_editor_advanced_layouts_post_fix_patch_1')) {
-    tr.setSelection(new NodeSelection(tr.doc.resolve(to))).scrollIntoView();
-  }
-  return tr;
-};
 
 /**
  * Check if the node at `from` can be moved to node at `to` to create/expand a layout.
@@ -356,9 +313,6 @@ export const moveToLayout = api => (from, to, options) => ({
       tr = removeFromSource(tr, $sourceFrom, sourceTo);
       const mappedTo = tr.mapping.map(to);
       tr.delete(mappedTo, mappedTo + toNodeWithoutBreakout.nodeSize).insert(mappedTo, newLayout);
-      if (!fg('platform_editor_advanced_layouts_post_fix_patch_1')) {
-        tr.setSelection(new NodeSelection(tr.doc.resolve(mappedTo))).scrollIntoView();
-      }
       breakoutMode && tr.setNodeMarkup(mappedTo, newLayout.type, newLayout.attrs, [breakout.create({
         mode: breakoutMode
       })]);

package/dist/es2019/pm-plugins/handle-mouse-over.js

@@ -41,7 +41,7 @@ export const handleMouseOver = (view, event, api) => {
     }
     const parentElement = (_rootElement$parentEl = rootElement.parentElement) === null || _rootElement$parentEl === void 0 ? void 0 : _rootElement$parentEl.closest('[data-drag-handler-anchor-name]');
     const parentElementType = parentElement === null || parentElement === void 0 ? void 0 : parentElement.getAttribute('data-drag-handler-node-type');
-    if (editorExperiment('advanced_layouts', true) && fg('platform_editor_advanced_layouts_post_fix_patch_1')) {
+    if (editorExperiment('advanced_layouts', true)) {
       // We want to exclude handles from showing for direct descendant of table nodes (i.e. nodes in cells)
       if (parentElement && (parentElementType === 'table' || parentElementType === 'tableRow') && editorExperiment('nested-dnd', true)) {
         rootElement = parentElement;

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

@@ -624,7 +624,7 @@ export const createPlugin = (api, getIntl, nodeViewPortalProviderAPI) => {
           // Currently we can only drag one node at a time
           // so we only need to check first child
           const draggable = dragging === null || dragging === void 0 ? void 0 : dragging.slice.content.firstChild;
-          if (dndDragCancelled && isMultiSelectEnabled || (draggable === null || draggable === void 0 ? void 0 : draggable.type.name) === 'layoutColumn' && fg('platform_editor_advanced_layouts_post_fix_patch_1')) {
+          if (dndDragCancelled && isMultiSelectEnabled || (draggable === null || draggable === void 0 ? void 0 : draggable.type.name) === 'layoutColumn') {
             // we prevent native DnD for layoutColumn to prevent single column layout.
             event.preventDefault();
             return false;

package/dist/es2019/pm-plugins/utils/drag-handle-positions.js

@@ -1,21 +1,16 @@
-import { fg } from '@atlaskit/platform-feature-flags';
 import { DRAG_HANDLE_DIVIDER_TOP_ADJUSTMENT, DRAG_HANDLE_H1_TOP_ADJUSTMENT, DRAG_HANDLE_H2_TOP_ADJUSTMENT, DRAG_HANDLE_H4_TOP_ADJUSTMENT, DRAG_HANDLE_H5_TOP_ADJUSTMENT, DRAG_HANDLE_H6_TOP_ADJUSTMENT, DRAG_HANDLE_HEIGHT, DRAG_HANDLE_PARAGRAPH_TOP_ADJUSTMENT, DRAG_HANDLE_WIDTH, dragHandleGap } from '../../ui/consts';
 export const getTopPosition = (dom, type) => {
   if (!dom) {
     return 'auto';
   }
   const table = dom.querySelector('table');
-  const isTable = fg('platform_editor_advanced_layouts_post_fix_patch_1') ? table && (!type || type === 'table') : table;
+  const isTable = table && (!type || type === 'table');
   if (isTable) {
     return `${dom.offsetTop + ((table === null || table === void 0 ? void 0 : table.offsetTop) || 0)}px`;
   } else if (type === 'rule') {
     return `${dom.offsetTop - DRAG_HANDLE_DIVIDER_TOP_ADJUSTMENT}px`;
   } else if (type === 'layoutColumn') {
-    if (fg('platform_editor_advanced_layouts_post_fix_patch_1')) {
-      return `${-dom.offsetTop / 2}px`;
-    } else {
-      return `${-DRAG_HANDLE_WIDTH}px`;
-    }
+    return `${-dom.offsetTop / 2}px`;
   } else if (type === 'heading-1') {
     return `${dom.offsetTop + DRAG_HANDLE_H1_TOP_ADJUSTMENT}px`;
   } else if (type === 'heading-2') {

package/dist/es2019/ui/drag-handle.js

@@ -222,11 +222,9 @@ export const DragHandle = ({
   // but ensures the preview is generated correctly.
   const handleMouseDown = useCallback(() => {
     if (editorExperiment('advanced_layouts', true)) {
+      var _buttonRef$current;
       // prevent native drag and drop.
-      if (fg('platform_editor_advanced_layouts_post_fix_patch_1')) {
-        var _buttonRef$current;
-        (_buttonRef$current = buttonRef.current) === null || _buttonRef$current === void 0 ? void 0 : _buttonRef$current.focus();
-      }
+      (_buttonRef$current = buttonRef.current) === null || _buttonRef$current === void 0 ? void 0 : _buttonRef$current.focus();
       if (!isLayoutColumn) {
         return undefined;
       }

package/dist/es2019/ui/drag-preview.js

@@ -1,29 +1,19 @@
 import { browser } from '@atlaskit/editor-common/browser';
-import { fg } from '@atlaskit/platform-feature-flags';
-import { B200, N20, N30 } from '@atlaskit/theme/colors';
-const previewStyleNew = {
+import { N20, N30 } from '@atlaskit/theme/colors';
+const previewStyle = {
   borderColor: `var(--ds-border, ${N30})`,
   borderStyle: 'solid',
   borderRadius: "var(--ds-border-radius-100, 3px)",
   borderWidth: "var(--ds-border-width-outline, 2px)",
   backgroundColor: `var(--ds-skeleton-subtle, ${N20})`
 };
-const previewStyleOld = {
-  borderColor: `var(--ds-border-focused, ${B200})`,
-  borderStyle: 'solid',
-  borderRadius: "var(--ds-border-radius-100, 3px)",
-  borderWidth: "var(--ds-border-width-outline, 2px)",
-  backgroundColor: "var(--ds-blanket-selected, #388BFF14)"
-};
 const getPreviewContainerDimensionsForSingle = (dom, nodeType) => {
   let nodeContainer = dom;
-  if (fg('platform_editor_elements_drag_and_drop_ed_23189')) {
-    const iframeContainer = dom.querySelector('iframe');
-    if (nodeType === 'embedCard') {
-      nodeContainer = dom.querySelector('.rich-media-item') || dom;
-    } else if (nodeType === 'extension' && iframeContainer) {
-      nodeContainer = iframeContainer;
-    }
+  const iframeContainer = dom.querySelector('iframe');
+  if (nodeType === 'embedCard') {
+    nodeContainer = dom.querySelector('.rich-media-item') || dom;
+  } else if (nodeType === 'extension' && iframeContainer) {
+    nodeContainer = iframeContainer;
   }
   const nodeContainerRect = nodeContainer.getBoundingClientRect();
   return {
@@ -54,7 +44,6 @@ const createGenericPreview = () => {
   const generalPreview = document.createElement('div');
   // ProseMirror class is required to make sure the cloned dom is styled correctly
   generalPreview.classList.add('ProseMirror', 'block-ctrl-drag-preview');
-  const previewStyle = fg('platform_editor_elements_drag_and_drop_ed_23189') ? previewStyleNew : previewStyleOld;
   generalPreview.style.border = `${previewStyle.borderWidth} ${previewStyle.borderStyle} ${previewStyle.borderColor}`;
   generalPreview.style.borderRadius = previewStyle.borderRadius;
   generalPreview.style.backgroundColor = previewStyle.backgroundColor;
@@ -78,13 +67,13 @@ const createContentPreviewElement = (dom, nodeType, nodeSpacing) => {
   clonedDom.style.marginRight = '0';
   clonedDom.style.marginBottom = nodeSpacing ? `${nodeSpacing.bottom}` : '0';
   clonedDom.style.boxShadow = 'none';
-  clonedDom.style.opacity = browser.windows ? '1' : fg('platform_editor_elements_drag_and_drop_ed_23189') ? '0.31' : '0.4';
+  clonedDom.style.opacity = browser.windows ? '1' : '0.31';
   contentPreviewOneElement.appendChild(clonedDom);
   return contentPreviewOneElement;
 };
 const isGenericPreview = (dom, nodeType) => {
   const embedCard = dom.querySelector('.embedCardView-content-wrap');
-  return fg('platform_editor_elements_drag_and_drop_ed_23189') ? nodeType === 'embedCard' || !!embedCard || nodeType === 'extension' && !!dom.querySelector('iframe') : nodeType === 'embedCard' || !!embedCard || nodeType === 'extension';
+  return nodeType === 'embedCard' || !!embedCard || nodeType === 'extension' && !!dom.querySelector('iframe');
 };
 const createPreviewForElement = (dom, nodeType, nodeSpacing) => {
   const shouldBeGenericPreview = isGenericPreview(dom, nodeType);

package/dist/es2019/ui/drop-target-layout.js

@@ -7,7 +7,6 @@ import { useCallback, useEffect, useRef, useState } from 'react';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled
 import { css, jsx } from '@emotion/react';
 import { layoutBreakpointWidth } from '@atlaskit/editor-shared-styles';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { DropIndicator } from '@atlaskit/pragmatic-drag-and-drop-react-drop-indicator/box';
 import { dropTargetForElements } from '@atlaskit/pragmatic-drag-and-drop/element/adapter';
 import { B200 } from '@atlaskit/theme/colors';
@@ -73,7 +72,7 @@ export const DropTargetLayout = props => {
     const to = getPos();
     let mappedTo;
     if (to !== undefined) {
-      var _api$core;
+      var _api$core, _api$core2;
       const {
         pos: from
       } = activeNode;
@@ -84,23 +83,18 @@ export const DropTargetLayout = props => {
         api === null || api === void 0 ? void 0 : (_api$blockControls2 = api.blockControls) === null || _api$blockControls2 === void 0 ? void 0 : (_api$blockControls2$c = _api$blockControls2.commands) === null || _api$blockControls2$c === void 0 ? void 0 : _api$blockControls2$c.moveToLayout(from, to)({
           tr
         });
-        if (fg('platform_editor_advanced_layouts_post_fix_patch_1')) {
-          const insertColumnStep = getInsertLayoutStep(tr);
-          mappedTo = insertColumnStep === null || insertColumnStep === void 0 ? void 0 : insertColumnStep.from;
+        const insertColumnStep = getInsertLayoutStep(tr);
+        mappedTo = insertColumnStep === null || insertColumnStep === void 0 ? void 0 : insertColumnStep.from;
+        return tr;
+      });
+      api === null || api === void 0 ? void 0 : (_api$core2 = api.core) === null || _api$core2 === void 0 ? void 0 : _api$core2.actions.execute(({
+        tr
+      }) => {
+        if (mappedTo !== undefined) {
+          updateSelection(tr, mappedTo);
         }
         return tr;
       });
-      if (fg('platform_editor_advanced_layouts_post_fix_patch_1')) {
-        var _api$core2;
-        api === null || api === void 0 ? void 0 : (_api$core2 = api.core) === null || _api$core2 === void 0 ? void 0 : _api$core2.actions.execute(({
-          tr
-        }) => {
-          if (mappedTo !== undefined) {
-            updateSelection(tr, mappedTo);
-          }
-          return tr;
-        });
-      }
     }
   }, [api, getPos, activeNode]);
   useEffect(() => {

package/dist/es2019/ui/global-styles.js

@@ -5,7 +5,6 @@
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-global-styles, @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css, Global, jsx } from '@emotion/react';
 import { akEditorBreakoutPadding, akEditorCalculatedWideLayoutWidth, akEditorCalculatedWideLayoutWidthSmallViewport } from '@atlaskit/editor-shared-styles';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { DRAG_HANDLE_MAX_WIDTH_PLUS_GAP, DRAG_HANDLE_WIDTH } from './consts';
 
@@ -260,6 +259,6 @@ const blockCardWithoutLayout = css({
 });
 export const GlobalStylesWrapper = () => {
   return jsx(Global, {
-    styles: [globalStyles(), fg('platform_editor_advanced_layouts_post_fix_patch_1') && globalDnDStyle, editorExperiment('nested-dnd', true) ? extendedHoverZoneNested() : extendedHoverZone(), withInlineNodeStyle, withDeleteLinesStyleFix, withMediaSingleStyleFix, legacyBreakoutWideLayoutStyle, headingWithIndentationInLayoutStyleFix, editorExperiment('advanced_layouts', true) ? blockCardWithoutLayout : undefined, withDividerInPanelStyleFix, withFormatInLayoutStyleFix, withRelativePosStyle, topLevelNodeMarginStyles, editorExperiment('nested-dnd', true) ? withAnchorNameZindexNestedStyle : withAnchorNameZindexStyle,,]
+    styles: [globalStyles(), globalDnDStyle, editorExperiment('nested-dnd', true) ? extendedHoverZoneNested() : extendedHoverZone(), withInlineNodeStyle, withDeleteLinesStyleFix, withMediaSingleStyleFix, legacyBreakoutWideLayoutStyle, headingWithIndentationInLayoutStyleFix, editorExperiment('advanced_layouts', true) ? blockCardWithoutLayout : undefined, withDividerInPanelStyleFix, withFormatInLayoutStyleFix, withRelativePosStyle, topLevelNodeMarginStyles, editorExperiment('nested-dnd', true) ? withAnchorNameZindexNestedStyle : withAnchorNameZindexStyle,,]
   });
 };

package/dist/es2019/ui/inline-drop-target.js

@@ -9,7 +9,6 @@ import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled
 import { css, jsx } from '@emotion/react';
 import { akEditorBreakoutPadding } from '@atlaskit/editor-shared-styles';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { DropIndicator } from '@atlaskit/pragmatic-drag-and-drop-react-drop-indicator/box';
 import { dropTargetForElements } from '@atlaskit/pragmatic-drag-and-drop/element/adapter';
 import { B200 } from '@atlaskit/theme/colors';
@@ -178,7 +177,7 @@ export const InlineDropTarget = ({
     const toPos = getPos();
     let mappedTo;
     if (activeNode && toPos !== undefined) {
-      var _api$core;
+      var _api$core, _api$core2;
       const {
         pos: start
       } = activeNode;
@@ -192,23 +191,18 @@ export const InlineDropTarget = ({
         })({
           tr
         });
-        if (fg('platform_editor_advanced_layouts_post_fix_patch_1')) {
-          const insertLayoutStep = getInsertLayoutStep(tr);
-          mappedTo = insertLayoutStep === null || insertLayoutStep === void 0 ? void 0 : insertLayoutStep.from;
+        const insertLayoutStep = getInsertLayoutStep(tr);
+        mappedTo = insertLayoutStep === null || insertLayoutStep === void 0 ? void 0 : insertLayoutStep.from;
+        return tr;
+      });
+      api === null || api === void 0 ? void 0 : (_api$core2 = api.core) === null || _api$core2 === void 0 ? void 0 : _api$core2.actions.execute(({
+        tr
+      }) => {
+        if (mappedTo !== undefined) {
+          updateSelection(tr, mappedTo, moveToEnd);
         }
         return tr;
       });
-      if (fg('platform_editor_advanced_layouts_post_fix_patch_1')) {
-        var _api$core2;
-        api === null || api === void 0 ? void 0 : (_api$core2 = api.core) === null || _api$core2 === void 0 ? void 0 : _api$core2.actions.execute(({
-          tr
-        }) => {
-          if (mappedTo !== undefined) {
-            updateSelection(tr, mappedTo, moveToEnd);
-          }
-          return tr;
-        });
-      }
     }
   }, [api, getPos, position]);
   const hoverZoneRectStyle = useMemo(() => {

package/dist/esm/editor-commands/move-to-layout.js

@@ -4,12 +4,11 @@ import { Fragment, Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
-import { fireInsertLayoutAnalytics, attachMoveNodeAnalytics, getMultiSelectAnalyticsAttributes } from '../pm-plugins/utils/analytics';
-import { isFragmentOfType, containsNodeOfType } from '../pm-plugins/utils/check-fragment';
+import { attachMoveNodeAnalytics, fireInsertLayoutAnalytics, getMultiSelectAnalyticsAttributes } from '../pm-plugins/utils/analytics';
+import { containsNodeOfType, isFragmentOfType } from '../pm-plugins/utils/check-fragment';
 import { maxLayoutColumnSupported } from '../pm-plugins/utils/consts';
 import { removeFromSource } from '../pm-plugins/utils/remove-from-source';
 import { getMultiSelectionIfPosInside } from '../pm-plugins/utils/selection';
-import { updateColumnWidths } from '../pm-plugins/utils/update-column-widths';
 import { isInSameLayout } from '../pm-plugins/utils/validation';
 import { DEFAULT_COLUMN_DISTRIBUTIONS } from '../ui/consts';
 var createNewLayout = function createNewLayout(schema, layoutContents) {
@@ -64,20 +63,14 @@ var moveToExistingLayout = function moveToExistingLayout(toLayout, toLayoutPos,
     tr.delete(from, sourceContentEndPos);
     var mappedTo = tr.mapping.map(to);
     tr.insert(mappedTo, sourceContent);
-    if (!fg('platform_editor_advanced_layouts_post_fix_patch_1') || selectMovedNode) {
+    if (selectMovedNode) {
       tr.setSelection(new NodeSelection(tr.doc.resolve(mappedTo))).scrollIntoView();
     }
     attachMoveNodeAnalytics(tr, INPUT_METHOD.DRAG_AND_DROP, $originalFrom.depth, ((_$originalFrom$nodeAf = $originalFrom.nodeAfter) === null || _$originalFrom$nodeAf === void 0 ? void 0 : _$originalFrom$nodeAf.type.name) || '', 1, 'layoutSection', true, api, sourceNodeTypes, hasSelectedMultipleNodes);
   } else if (toLayout.childCount < maxLayoutColumnSupported()) {
     var _$originalFrom$nodeAf2;
-    if (fg('platform_editor_advanced_layouts_post_fix_patch_1')) {
-      removeFromSource(tr, tr.doc.resolve(from), sourceContentEndPos);
-      insertToDestinationNoWidthUpdate(tr, tr.mapping.map(to), sourceContent);
-    } else {
-      insertToDestination(tr, to, sourceContent, toLayout, toLayoutPos);
-      var mappedFrom = tr.mapping.map(from);
-      removeFromSource(tr, tr.doc.resolve(mappedFrom), tr.mapping.map(sourceContentEndPos));
-    }
+    removeFromSource(tr, tr.doc.resolve(from), sourceContentEndPos);
+    insertToDestinationNoWidthUpdate(tr, tr.mapping.map(to), sourceContent);
     attachMoveNodeAnalytics(tr, INPUT_METHOD.DRAG_AND_DROP, $originalFrom.depth, ((_$originalFrom$nodeAf2 = $originalFrom.nodeAfter) === null || _$originalFrom$nodeAf2 === void 0 ? void 0 : _$originalFrom$nodeAf2.type.name) || '', 1, 'layoutSection', false, api, sourceNodeTypes, hasSelectedMultipleNodes);
   }
   return tr;
@@ -122,40 +115,6 @@ var insertToDestinationNoWidthUpdate = function insertToDestinationNoWidthUpdate
   }
   return tr;
 };
-var insertToDestination = function insertToDestination(tr, to, sourceContent, toLayout, toLayoutPos) {
-  var _ref3 = updateColumnWidths(tr, toLayout, toLayoutPos, toLayout.childCount + 1) || {},
-    newColumnWidth = _ref3.newColumnWidth;
-  var _ref4 = tr.doc.type.schema.nodes || {},
-    layoutColumn = _ref4.layoutColumn;
-  var content = null;
-  try {
-    if (editorExperiment('platform_editor_element_drag_and_drop_multiselect', true)) {
-      if (sourceContent instanceof Fragment) {
-        var _sourceContent$firstC;
-        content = layoutColumn.createChecked({
-          width: newColumnWidth
-        }, isFragmentOfType(sourceContent, 'layoutColumn') ? (_sourceContent$firstC = sourceContent.firstChild) === null || _sourceContent$firstC === void 0 ? void 0 : _sourceContent$firstC.content : sourceContent);
-      }
-    } else {
-      if (sourceContent instanceof PMNode) {
-        content = layoutColumn.createChecked({
-          width: newColumnWidth
-        }, sourceContent.type.name === 'layoutColumn' ? sourceContent.content : sourceContent);
-      }
-    }
-  } catch (error) {
-    logException(error, {
-      location: 'editor-plugin-block-controls/move-to-layout'
-    });
-  }
-  if (content) {
-    tr.insert(to, content);
-  }
-  if (!fg('platform_editor_advanced_layouts_post_fix_patch_1')) {
-    tr.setSelection(new NodeSelection(tr.doc.resolve(to))).scrollIntoView();
-  }
-  return tr;
-};
 
 /**
  * Check if the node at `from` can be moved to node at `to` to create/expand a layout.
@@ -165,10 +124,10 @@ var canMoveToLayout = function canMoveToLayout(api, from, to, tr, moveNodeAtCurs
   if (from === to) {
     return;
   }
-  var _ref5 = tr.doc.type.schema.nodes || {},
-    layoutSection = _ref5.layoutSection,
-    layoutColumn = _ref5.layoutColumn,
-    doc = _ref5.doc;
+  var _ref3 = tr.doc.type.schema.nodes || {},
+    layoutSection = _ref3.layoutSection,
+    layoutColumn = _ref3.layoutColumn,
+    doc = _ref3.doc;
 
   // layout plugin does not exist
   if (!layoutSection || !layoutColumn) {
@@ -218,8 +177,8 @@ var canMoveToLayout = function canMoveToLayout(api, from, to, tr, moveNodeAtCurs
 };
 var removeBreakoutMarks = function removeBreakoutMarks(tr, $from, to) {
   var fromContentWithoutBreakout = $from.nodeAfter;
-  var _ref6 = tr.doc.type.schema.marks || {},
-    breakout = _ref6.breakout;
+  var _ref4 = tr.doc.type.schema.marks || {},
+    breakout = _ref4.breakout;
   if (editorExperiment('platform_editor_element_drag_and_drop_multiselect', true)) {
     tr.doc.nodesBetween($from.pos, to, function (node, pos, parent) {
       // breakout doesn't exist on nested nodes
@@ -282,8 +241,8 @@ var getBreakoutMode = function getBreakoutMode(content, breakout) {
 // source content variable that has type of `PMNode | Fragment` should be updated to `Fragment` only
 export var moveToLayout = function moveToLayout(api) {
   return function (from, to, options) {
-    return function (_ref7) {
-      var tr = _ref7.tr;
+    return function (_ref5) {
+      var tr = _ref5.tr;
       if (!api) {
         return tr;
       }
@@ -296,11 +255,11 @@ export var moveToLayout = function moveToLayout(api) {
         sourceContent = canMove.sourceContent,
         $sourceFrom = canMove.$sourceFrom,
         sourceTo = canMove.sourceTo;
-      var _ref8 = tr.doc.type.schema.nodes || {},
-        layoutSection = _ref8.layoutSection,
-        layoutColumn = _ref8.layoutColumn;
-      var _ref9 = tr.doc.type.schema.marks || {},
-        breakout = _ref9.breakout;
+      var _ref6 = tr.doc.type.schema.nodes || {},
+        layoutSection = _ref6.layoutSection,
+        layoutColumn = _ref6.layoutColumn;
+      var _ref7 = tr.doc.type.schema.marks || {},
+        breakout = _ref7.breakout;
 
       // get breakout mode from destination node,
       // if not found, get from source node,
@@ -358,9 +317,6 @@ export var moveToLayout = function moveToLayout(api) {
           tr = removeFromSource(tr, $sourceFrom, sourceTo);
           var mappedTo = tr.mapping.map(to);
           tr.delete(mappedTo, mappedTo + toNodeWithoutBreakout.nodeSize).insert(mappedTo, newLayout);
-          if (!fg('platform_editor_advanced_layouts_post_fix_patch_1')) {
-            tr.setSelection(new NodeSelection(tr.doc.resolve(mappedTo))).scrollIntoView();
-          }
           breakoutMode && tr.setNodeMarkup(mappedTo, newLayout.type, newLayout.attrs, [breakout.create({
             mode: breakoutMode
           })]);

package/dist/esm/pm-plugins/handle-mouse-over.js

@@ -40,7 +40,7 @@ export var handleMouseOver = function handleMouseOver(view, event, api) {
     }
     var parentElement = (_rootElement$parentEl = rootElement.parentElement) === null || _rootElement$parentEl === void 0 ? void 0 : _rootElement$parentEl.closest('[data-drag-handler-anchor-name]');
     var parentElementType = parentElement === null || parentElement === void 0 ? void 0 : parentElement.getAttribute('data-drag-handler-node-type');
-    if (editorExperiment('advanced_layouts', true) && fg('platform_editor_advanced_layouts_post_fix_patch_1')) {
+    if (editorExperiment('advanced_layouts', true)) {
       // We want to exclude handles from showing for direct descendant of table nodes (i.e. nodes in cells)
       if (parentElement && (parentElementType === 'table' || parentElementType === 'tableRow') && editorExperiment('nested-dnd', true)) {
         rootElement = parentElement;

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

@@ -635,7 +635,7 @@ export var createPlugin = function createPlugin(api, getIntl, nodeViewPortalProv
           // Currently we can only drag one node at a time
           // so we only need to check first child
           var draggable = dragging === null || dragging === void 0 ? void 0 : dragging.slice.content.firstChild;
-          if (dndDragCancelled && isMultiSelectEnabled || (draggable === null || draggable === void 0 ? void 0 : draggable.type.name) === 'layoutColumn' && fg('platform_editor_advanced_layouts_post_fix_patch_1')) {
+          if (dndDragCancelled && isMultiSelectEnabled || (draggable === null || draggable === void 0 ? void 0 : draggable.type.name) === 'layoutColumn') {
             // we prevent native DnD for layoutColumn to prevent single column layout.
             event.preventDefault();
             return false;

package/dist/esm/pm-plugins/utils/drag-handle-positions.js

@@ -1,21 +1,16 @@
-import { fg } from '@atlaskit/platform-feature-flags';
 import { DRAG_HANDLE_DIVIDER_TOP_ADJUSTMENT, DRAG_HANDLE_H1_TOP_ADJUSTMENT, DRAG_HANDLE_H2_TOP_ADJUSTMENT, DRAG_HANDLE_H4_TOP_ADJUSTMENT, DRAG_HANDLE_H5_TOP_ADJUSTMENT, DRAG_HANDLE_H6_TOP_ADJUSTMENT, DRAG_HANDLE_HEIGHT, DRAG_HANDLE_PARAGRAPH_TOP_ADJUSTMENT, DRAG_HANDLE_WIDTH, dragHandleGap } from '../../ui/consts';
 export var getTopPosition = function getTopPosition(dom, type) {
   if (!dom) {
     return 'auto';
   }
   var table = dom.querySelector('table');
-  var isTable = fg('platform_editor_advanced_layouts_post_fix_patch_1') ? table && (!type || type === 'table') : table;
+  var isTable = table && (!type || type === 'table');
   if (isTable) {
     return "".concat(dom.offsetTop + ((table === null || table === void 0 ? void 0 : table.offsetTop) || 0), "px");
   } else if (type === 'rule') {
     return "".concat(dom.offsetTop - DRAG_HANDLE_DIVIDER_TOP_ADJUSTMENT, "px");
   } else if (type === 'layoutColumn') {
-    if (fg('platform_editor_advanced_layouts_post_fix_patch_1')) {
-      return "".concat(-dom.offsetTop / 2, "px");
-    } else {
-      return "".concat(-DRAG_HANDLE_WIDTH, "px");
-    }
+    return "".concat(-dom.offsetTop / 2, "px");
   } else if (type === 'heading-1') {
     return "".concat(dom.offsetTop + DRAG_HANDLE_H1_TOP_ADJUSTMENT, "px");
   } else if (type === 'heading-2') {

package/dist/esm/ui/drag-handle.js

@@ -236,11 +236,9 @@ export var DragHandle = function DragHandle(_ref) {
   // but ensures the preview is generated correctly.
   var handleMouseDown = useCallback(function () {
     if (editorExperiment('advanced_layouts', true)) {
+      var _buttonRef$current;
       // prevent native drag and drop.
-      if (fg('platform_editor_advanced_layouts_post_fix_patch_1')) {
-        var _buttonRef$current;
-        (_buttonRef$current = buttonRef.current) === null || _buttonRef$current === void 0 || _buttonRef$current.focus();
-      }
+      (_buttonRef$current = buttonRef.current) === null || _buttonRef$current === void 0 || _buttonRef$current.focus();
       if (!isLayoutColumn) {
         return undefined;
       }

package/dist/esm/ui/drag-preview.js

@@ -1,30 +1,20 @@
 import _typeof from "@babel/runtime/helpers/typeof";
 import { browser } from '@atlaskit/editor-common/browser';
-import { fg } from '@atlaskit/platform-feature-flags';
-import { B200, N20, N30 } from '@atlaskit/theme/colors';
-var previewStyleNew = {
+import { N20, N30 } from '@atlaskit/theme/colors';
+var previewStyle = {
   borderColor: "var(--ds-border, ".concat(N30, ")"),
   borderStyle: 'solid',
   borderRadius: "var(--ds-border-radius-100, 3px)",
   borderWidth: "var(--ds-border-width-outline, 2px)",
   backgroundColor: "var(--ds-skeleton-subtle, ".concat(N20, ")")
 };
-var previewStyleOld = {
-  borderColor: "var(--ds-border-focused, ".concat(B200, ")"),
-  borderStyle: 'solid',
-  borderRadius: "var(--ds-border-radius-100, 3px)",
-  borderWidth: "var(--ds-border-width-outline, 2px)",
-  backgroundColor: "var(--ds-blanket-selected, #388BFF14)"
-};
 var getPreviewContainerDimensionsForSingle = function getPreviewContainerDimensionsForSingle(dom, nodeType) {
   var nodeContainer = dom;
-  if (fg('platform_editor_elements_drag_and_drop_ed_23189')) {
-    var iframeContainer = dom.querySelector('iframe');
-    if (nodeType === 'embedCard') {
-      nodeContainer = dom.querySelector('.rich-media-item') || dom;
-    } else if (nodeType === 'extension' && iframeContainer) {
-      nodeContainer = iframeContainer;
-    }
+  var iframeContainer = dom.querySelector('iframe');
+  if (nodeType === 'embedCard') {
+    nodeContainer = dom.querySelector('.rich-media-item') || dom;
+  } else if (nodeType === 'extension' && iframeContainer) {
+    nodeContainer = iframeContainer;
   }
   var nodeContainerRect = nodeContainer.getBoundingClientRect();
   return {
@@ -54,7 +44,6 @@ var createGenericPreview = function createGenericPreview() {
   var generalPreview = document.createElement('div');
   // ProseMirror class is required to make sure the cloned dom is styled correctly
   generalPreview.classList.add('ProseMirror', 'block-ctrl-drag-preview');
-  var previewStyle = fg('platform_editor_elements_drag_and_drop_ed_23189') ? previewStyleNew : previewStyleOld;
   generalPreview.style.border = "".concat(previewStyle.borderWidth, " ").concat(previewStyle.borderStyle, " ").concat(previewStyle.borderColor);
   generalPreview.style.borderRadius = previewStyle.borderRadius;
   generalPreview.style.backgroundColor = previewStyle.backgroundColor;
@@ -78,13 +67,13 @@ var createContentPreviewElement = function createContentPreviewElement(dom, node
   clonedDom.style.marginRight = '0';
   clonedDom.style.marginBottom = nodeSpacing ? "".concat(nodeSpacing.bottom) : '0';
   clonedDom.style.boxShadow = 'none';
-  clonedDom.style.opacity = browser.windows ? '1' : fg('platform_editor_elements_drag_and_drop_ed_23189') ? '0.31' : '0.4';
+  clonedDom.style.opacity = browser.windows ? '1' : '0.31';
   contentPreviewOneElement.appendChild(clonedDom);
   return contentPreviewOneElement;
 };
 var isGenericPreview = function isGenericPreview(dom, nodeType) {
   var embedCard = dom.querySelector('.embedCardView-content-wrap');
-  return fg('platform_editor_elements_drag_and_drop_ed_23189') ? nodeType === 'embedCard' || !!embedCard || nodeType === 'extension' && !!dom.querySelector('iframe') : nodeType === 'embedCard' || !!embedCard || nodeType === 'extension';
+  return nodeType === 'embedCard' || !!embedCard || nodeType === 'extension' && !!dom.querySelector('iframe');
 };
 var createPreviewForElement = function createPreviewForElement(dom, nodeType, nodeSpacing) {
   var shouldBeGenericPreview = isGenericPreview(dom, nodeType);

package/dist/esm/ui/drop-target-layout.js

@@ -9,7 +9,6 @@ import { useCallback, useEffect, useRef, useState } from 'react';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled
 import { css, jsx } from '@emotion/react';
 import { layoutBreakpointWidth } from '@atlaskit/editor-shared-styles';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { DropIndicator } from '@atlaskit/pragmatic-drag-and-drop-react-drop-indicator/box';
 import { dropTargetForElements } from '@atlaskit/pragmatic-drag-and-drop/element/adapter';
 import { B200 } from '@atlaskit/theme/colors';
@@ -74,7 +73,7 @@ export var DropTargetLayout = function DropTargetLayout(props) {
     var to = getPos();
     var mappedTo;
     if (to !== undefined) {
-      var _api$core;
+      var _api$core, _api$core2;
       var from = activeNode.pos;
       api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 || _api$core.actions.execute(function (_ref2) {
         var _api$blockControls2;
@@ -82,22 +81,17 @@ export var DropTargetLayout = function DropTargetLayout(props) {
         api === null || api === void 0 || (_api$blockControls2 = api.blockControls) === null || _api$blockControls2 === void 0 || (_api$blockControls2 = _api$blockControls2.commands) === null || _api$blockControls2 === void 0 || _api$blockControls2.moveToLayout(from, to)({
           tr: tr
         });
-        if (fg('platform_editor_advanced_layouts_post_fix_patch_1')) {
-          var insertColumnStep = getInsertLayoutStep(tr);
-          mappedTo = insertColumnStep === null || insertColumnStep === void 0 ? void 0 : insertColumnStep.from;
+        var insertColumnStep = getInsertLayoutStep(tr);
+        mappedTo = insertColumnStep === null || insertColumnStep === void 0 ? void 0 : insertColumnStep.from;
+        return tr;
+      });
+      api === null || api === void 0 || (_api$core2 = api.core) === null || _api$core2 === void 0 || _api$core2.actions.execute(function (_ref3) {
+        var tr = _ref3.tr;
+        if (mappedTo !== undefined) {
+          updateSelection(tr, mappedTo);
         }
         return tr;
       });
-      if (fg('platform_editor_advanced_layouts_post_fix_patch_1')) {
-        var _api$core2;
-        api === null || api === void 0 || (_api$core2 = api.core) === null || _api$core2 === void 0 || _api$core2.actions.execute(function (_ref3) {
-          var tr = _ref3.tr;
-          if (mappedTo !== undefined) {
-            updateSelection(tr, mappedTo);
-          }
-          return tr;
-        });
-      }
     }
   }, [api, getPos, activeNode]);
   useEffect(function () {

package/dist/esm/ui/global-styles.js

@@ -6,7 +6,6 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-global-styles, @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css, Global, jsx } from '@emotion/react';
 import { akEditorBreakoutPadding, akEditorCalculatedWideLayoutWidth, akEditorCalculatedWideLayoutWidthSmallViewport } from '@atlaskit/editor-shared-styles';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { DRAG_HANDLE_MAX_WIDTH_PLUS_GAP, DRAG_HANDLE_WIDTH } from './consts';
 
@@ -209,6 +208,6 @@ var blockCardWithoutLayout = css({
 });
 export var GlobalStylesWrapper = function GlobalStylesWrapper() {
   return jsx(Global, {
-    styles: [globalStyles(), fg('platform_editor_advanced_layouts_post_fix_patch_1') && globalDnDStyle, editorExperiment('nested-dnd', true) ? extendedHoverZoneNested() : extendedHoverZone(), withInlineNodeStyle, withDeleteLinesStyleFix, withMediaSingleStyleFix, legacyBreakoutWideLayoutStyle, headingWithIndentationInLayoutStyleFix, editorExperiment('advanced_layouts', true) ? blockCardWithoutLayout : undefined, withDividerInPanelStyleFix, withFormatInLayoutStyleFix, withRelativePosStyle, topLevelNodeMarginStyles, editorExperiment('nested-dnd', true) ? withAnchorNameZindexNestedStyle : withAnchorNameZindexStyle,,]
+    styles: [globalStyles(), globalDnDStyle, editorExperiment('nested-dnd', true) ? extendedHoverZoneNested() : extendedHoverZone(), withInlineNodeStyle, withDeleteLinesStyleFix, withMediaSingleStyleFix, legacyBreakoutWideLayoutStyle, headingWithIndentationInLayoutStyleFix, editorExperiment('advanced_layouts', true) ? blockCardWithoutLayout : undefined, withDividerInPanelStyleFix, withFormatInLayoutStyleFix, withRelativePosStyle, topLevelNodeMarginStyles, editorExperiment('nested-dnd', true) ? withAnchorNameZindexNestedStyle : withAnchorNameZindexStyle,,]
   });
 };

package/dist/esm/ui/inline-drop-target.js

@@ -11,7 +11,6 @@ import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled
 import { css, jsx } from '@emotion/react';
 import { akEditorBreakoutPadding } from '@atlaskit/editor-shared-styles';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { DropIndicator } from '@atlaskit/pragmatic-drag-and-drop-react-drop-indicator/box';
 import { dropTargetForElements } from '@atlaskit/pragmatic-drag-and-drop/element/adapter';
 import { B200 } from '@atlaskit/theme/colors';
@@ -183,7 +182,7 @@ export var InlineDropTarget = function InlineDropTarget(_ref) {
     var toPos = getPos();
     var mappedTo;
     if (activeNode && toPos !== undefined) {
-      var _api$core;
+      var _api$core, _api$core2;
       var start = activeNode.pos;
       var moveToEnd = position === 'right';
       api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 || _api$core.actions.execute(function (_ref3) {
@@ -194,22 +193,17 @@ export var InlineDropTarget = function InlineDropTarget(_ref) {
         })({
           tr: tr
         });
-        if (fg('platform_editor_advanced_layouts_post_fix_patch_1')) {
-          var insertLayoutStep = getInsertLayoutStep(tr);
-          mappedTo = insertLayoutStep === null || insertLayoutStep === void 0 ? void 0 : insertLayoutStep.from;
+        var insertLayoutStep = getInsertLayoutStep(tr);
+        mappedTo = insertLayoutStep === null || insertLayoutStep === void 0 ? void 0 : insertLayoutStep.from;
+        return tr;
+      });
+      api === null || api === void 0 || (_api$core2 = api.core) === null || _api$core2 === void 0 || _api$core2.actions.execute(function (_ref4) {
+        var tr = _ref4.tr;
+        if (mappedTo !== undefined) {
+          updateSelection(tr, mappedTo, moveToEnd);
         }
         return tr;
       });
-      if (fg('platform_editor_advanced_layouts_post_fix_patch_1')) {
-        var _api$core2;
-        api === null || api === void 0 || (_api$core2 = api.core) === null || _api$core2 === void 0 || _api$core2.actions.execute(function (_ref4) {
-          var tr = _ref4.tr;
-          if (mappedTo !== undefined) {
-            updateSelection(tr, mappedTo, moveToEnd);
-          }
-          return tr;
-        });
-      }
     }
   }, [api, getPos, position]);
   var hoverZoneRectStyle = useMemo(function () {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-controls",
-	"version": "3.3.12",
+	"version": "3.3.13",
 	"description": "Block controls plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -33,9 +33,9 @@
 	},
 	"dependencies": {
 		"@atlaskit/adf-schema": "^47.6.0",
-		"@atlaskit/editor-common": "^102.5.0",
+		"@atlaskit/editor-common": "^102.7.0",
 		"@atlaskit/editor-plugin-accessibility-utils": "^2.0.0",
-		"@atlaskit/editor-plugin-analytics": "^2.1.0",
+		"@atlaskit/editor-plugin-analytics": "^2.2.0",
 		"@atlaskit/editor-plugin-editor-disabled": "^2.0.0",
 		"@atlaskit/editor-plugin-feature-flags": "^1.3.0",
 		"@atlaskit/editor-plugin-metrics": "^3.4.0",
@@ -110,9 +110,6 @@
 			"type": "boolean",
 			"referenceOnly": true
 		},
-		"platform_editor_elements_drag_and_drop_ed_23189": {
-			"type": "boolean"
-		},
 		"platform_editor_element_drag_and_drop_ed_23873": {
 			"type": "boolean"
 		},
@@ -125,9 +122,6 @@
 		"platform_editor_use_nested_table_pm_nodes": {
 			"type": "boolean"
 		},
-		"platform_editor_advanced_layouts_post_fix_patch_1": {
-			"type": "boolean"
-		},
 		"platform_editor_advanced_layouts_post_fix_patch_2": {
 			"type": "boolean"
 		},