@atlaskit/editor-plugin-layout 2.1.3 → 2.1.5

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/editor-plugin-layout
 
+## 2.1.5
+
+### Patch Changes
+
+- Updated dependencies
+
+## 2.1.4
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 2.1.3
 
 ### Patch Changes

package/dist/cjs/layoutPlugin.js

@@ -11,7 +11,6 @@ var _schema = require("@atlaskit/adf-schema/schema");
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _messages = require("@atlaskit/editor-common/messages");
 var _quickInsert = require("@atlaskit/editor-common/quick-insert");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _actions = require("./pm-plugins/actions");
 var _main = _interopRequireDefault(require("./pm-plugins/main"));
@@ -72,18 +71,16 @@ var layoutPlugin = exports.layoutPlugin = function layoutPlugin(_ref) {
       quickInsert: function quickInsert(_ref4) {
         var formatMessage = _ref4.formatMessage;
         var withInsertLayoutAnalytics = function withInsertLayoutAnalytics(tr) {
-          if ((0, _platformFeatureFlags.fg)('platform_editor_advanced_layouts_post_fix_patch_1')) {
-            var _api$analytics2;
-            api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 || (_api$analytics2 = _api$analytics2.actions) === null || _api$analytics2 === void 0 || _api$analytics2.attachAnalyticsEvent({
-              action: _analytics.ACTION.INSERTED,
-              actionSubject: _analytics.ACTION_SUBJECT.DOCUMENT,
-              actionSubjectId: _analytics.ACTION_SUBJECT_ID.LAYOUT,
-              attributes: {
-                inputMethod: _analytics.INPUT_METHOD.QUICK_INSERT
-              },
-              eventType: _analytics.EVENT_TYPE.TRACK
-            })(tr);
-          }
+          var _api$analytics2;
+          api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 || (_api$analytics2 = _api$analytics2.actions) === null || _api$analytics2 === void 0 || _api$analytics2.attachAnalyticsEvent({
+            action: _analytics.ACTION.INSERTED,
+            actionSubject: _analytics.ACTION_SUBJECT.DOCUMENT,
+            actionSubjectId: _analytics.ACTION_SUBJECT_ID.LAYOUT,
+            attributes: {
+              inputMethod: _analytics.INPUT_METHOD.QUICK_INSERT
+            },
+            eventType: _analytics.EVENT_TYPE.TRACK
+          })(tr);
           return tr;
         };
         if ((0, _experiments.editorExperiment)('advanced_layouts', true)) {

package/dist/cjs/nodeviews/index.js

@@ -16,7 +16,6 @@ var _hooks = require("@atlaskit/editor-common/hooks");
 var _reactNodeView = _interopRequireDefault(require("@atlaskit/editor-common/react-node-view"));
 var _resizer = require("@atlaskit/editor-common/resizer");
 var _model = require("@atlaskit/editor-prosemirror/model");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2.default)(o), (0, _possibleConstructorReturn2.default)(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2.default)(t).constructor) : o.apply(t, e)); }
@@ -86,9 +85,7 @@ var LayoutSectionView = exports.LayoutSectionView = /*#__PURE__*/function (_Reac
     var _this;
     (0, _classCallCheck2.default)(this, LayoutSectionView);
     _this = _callSuper(this, LayoutSectionView, [props.node, props.view, props.getPos, props.portalProviderAPI, props.eventDispatcher, props]);
-    if ((0, _platformFeatureFlags.fg)('platform_editor_advanced_layouts_post_fix_patch_1')) {
-      _this.isEmpty = isEmptyLayout(_this.node);
-    }
+    _this.isEmpty = isEmptyLayout(_this.node);
     _this.options = props.options;
     return _this;
   }
@@ -104,9 +101,7 @@ var LayoutSectionView = exports.LayoutSectionView = /*#__PURE__*/function (_Reac
       // 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')) {
-        this.layoutDOM.setAttribute('data-empty-layout', Boolean(this.isEmpty).toString());
-      }
+      this.layoutDOM.setAttribute('data-empty-layout', Boolean(this.isEmpty).toString());
       return {
         dom: container,
         contentDOM: contentDOM
@@ -122,11 +117,9 @@ var LayoutSectionView = exports.LayoutSectionView = /*#__PURE__*/function (_Reac
   }, {
     key: "render",
     value: function render(props, forwardRef) {
-      if ((0, _platformFeatureFlags.fg)('platform_editor_advanced_layouts_post_fix_patch_1')) {
-        this.isEmpty = isEmptyLayout(this.node);
-        if (this.layoutDOM) {
-          this.layoutDOM.setAttribute('data-empty-layout', Boolean(this.isEmpty).toString());
-        }
+      this.isEmpty = isEmptyLayout(this.node);
+      if (this.layoutDOM) {
+        this.layoutDOM.setAttribute('data-empty-layout', Boolean(this.isEmpty).toString());
       }
       return /*#__PURE__*/_react.default.createElement(LayoutBreakoutResizer, {
         pluginInjectionApi: props.pluginInjectionApi,

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

@@ -398,7 +398,7 @@ var getDefaultPresetLayout = function getDefaultPresetLayout(layoutNode) {
 
     // 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';
+    return 'two_equal';
   }
   switch (layoutColumnCount) {
     case 2:

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

@@ -52,8 +52,6 @@ var moveCursorToNextColumn = function moveCursorToNextColumn(state, dispatch) {
   }
   return true;
 };
-
-// TODO: Look at memoize-one-ing this fn
 var getNodeDecoration = function getNodeDecoration(pos, node) {
   return [_view.Decoration.node(pos, pos + node.nodeSize, {
     class: 'selected'

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

@@ -8,7 +8,6 @@ var _react = require("react");
 var _react2 = require("@emotion/react");
 var _reactIntlNext = require("react-intl-next");
 var _messages = require("@atlaskit/editor-common/messages");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 /**
  * @jsxRuntime classic
@@ -34,28 +33,10 @@ var getPlaceholderStyle = function getPlaceholderStyle(message) {
       }
     });
   }
-  if ((0, _platformFeatureFlags.fg)('platform_editor_advanced_layouts_post_fix_patch_1')) {
-    return (0, _react2.css)({
-      // when paragraph is the only child, and it only has a trailingBreak.
-      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors -- Ignored via go/DSP-18766
-      '.ProseMirror .layoutSectionView-content-wrap.selected [data-layout-column] > [data-layout-content] > p:only-child:has(.ProseMirror-trailingBreak:only-child)': {
-        // eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles -- Ignored via go/DSP-18766
-        '&::before': {
-          // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values
-          content: "\"".concat(message, "\""),
-          position: 'absolute',
-          color: "var(--ds-text-disabled, #A5ADBA)",
-          font: "var(--ds-font-body, normal 400 14px/20px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, \"Helvetica Neue\", sans-serif)",
-          marginTop: "var(--ds-space-050, 4px)",
-          pointerEvents: 'none'
-        }
-      }
-    });
-  }
   return (0, _react2.css)({
     // when paragraph is the only child, and it only has a trailingBreak.
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors -- Ignored via go/DSP-18766
-    '.ProseMirror [data-layout-column] > [data-layout-content] > p:only-child:has(.ProseMirror-trailingBreak:only-child)': {
+    '.ProseMirror .layoutSectionView-content-wrap.selected [data-layout-column] > [data-layout-content] > p:only-child:has(.ProseMirror-trailingBreak:only-child)': {
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles -- Ignored via go/DSP-18766
       '&::before': {
         // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values

package/dist/cjs/ui/toolbar.js

@@ -130,7 +130,7 @@ var buildLayoutButton = function buildLayoutButton(intl, item, currentLayout, ed
   };
 };
 var layoutToolbarTitle = exports.layoutToolbarTitle = 'Layout floating controls';
-var iconPlaceholder = _layoutTwoColumns.default; // TODO: Replace with proper icon ED-25466
+var iconPlaceholder = _layoutTwoColumns.default; // TODO: ED-25466 - Replace with proper icon
 
 var getAdvancedLayoutItems = function getAdvancedLayoutItems(_ref) {
   var addSidebarLayouts = _ref.addSidebarLayouts,

package/dist/es2019/layoutPlugin.js

@@ -4,7 +4,6 @@ import { layoutSectionWithSingleColumn } from '@atlaskit/adf-schema/schema';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { layoutMessages, toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages';
 import { IconFiveColumnLayout, IconFourColumnLayout, IconLayout, IconThreeColumnLayout, IconTwoColumnLayout } from '@atlaskit/editor-common/quick-insert';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { createDefaultLayoutSection, createMultiColumnLayoutSection, insertLayoutColumnsWithAnalytics } from './pm-plugins/actions';
 import { default as createLayoutPlugin } from './pm-plugins/main';
@@ -64,18 +63,16 @@ export const layoutPlugin = ({
         formatMessage
       }) => {
         const withInsertLayoutAnalytics = tr => {
-          if (fg('platform_editor_advanced_layouts_post_fix_patch_1')) {
-            var _api$analytics2, _api$analytics2$actio;
-            api === null || api === void 0 ? void 0 : (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : (_api$analytics2$actio = _api$analytics2.actions) === null || _api$analytics2$actio === void 0 ? void 0 : _api$analytics2$actio.attachAnalyticsEvent({
-              action: ACTION.INSERTED,
-              actionSubject: ACTION_SUBJECT.DOCUMENT,
-              actionSubjectId: ACTION_SUBJECT_ID.LAYOUT,
-              attributes: {
-                inputMethod: INPUT_METHOD.QUICK_INSERT
-              },
-              eventType: EVENT_TYPE.TRACK
-            })(tr);
-          }
+          var _api$analytics2, _api$analytics2$actio;
+          api === null || api === void 0 ? void 0 : (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : (_api$analytics2$actio = _api$analytics2.actions) === null || _api$analytics2$actio === void 0 ? void 0 : _api$analytics2$actio.attachAnalyticsEvent({
+            action: ACTION.INSERTED,
+            actionSubject: ACTION_SUBJECT.DOCUMENT,
+            actionSubjectId: ACTION_SUBJECT_ID.LAYOUT,
+            attributes: {
+              inputMethod: INPUT_METHOD.QUICK_INSERT
+            },
+            eventType: EVENT_TYPE.TRACK
+          })(tr);
           return tr;
         };
         if (editorExperiment('advanced_layouts', true)) {

package/dist/es2019/nodeviews/index.js

@@ -3,7 +3,6 @@ import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
 import ReactNodeView from '@atlaskit/editor-common/react-node-view';
 import { BreakoutResizer, ignoreResizerMutations } from '@atlaskit/editor-common/resizer';
 import { DOMSerializer } from '@atlaskit/editor-prosemirror/model';
-import { fg } from '@atlaskit/platform-feature-flags';
 const isEmptyParagraph = node => {
   return !!node && node.type.name === 'paragraph' && !node.childCount;
 };
@@ -67,9 +66,7 @@ const toDOM = () => ['div', {
 export class LayoutSectionView extends ReactNodeView {
   constructor(props) {
     super(props.node, props.view, props.getPos, props.portalProviderAPI, props.eventDispatcher, props);
-    if (fg('platform_editor_advanced_layouts_post_fix_patch_1')) {
-      this.isEmpty = isEmptyLayout(this.node);
-    }
+    this.isEmpty = isEmptyLayout(this.node);
     this.options = props.options;
   }
   getContentDOM() {
@@ -82,9 +79,7 @@ export class LayoutSectionView extends ReactNodeView {
     // 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')) {
-      this.layoutDOM.setAttribute('data-empty-layout', Boolean(this.isEmpty).toString());
-    }
+    this.layoutDOM.setAttribute('data-empty-layout', Boolean(this.isEmpty).toString());
     return {
       dom: container,
       contentDOM
@@ -96,11 +91,9 @@ export class LayoutSectionView extends ReactNodeView {
     }
   }
   render(props, forwardRef) {
-    if (fg('platform_editor_advanced_layouts_post_fix_patch_1')) {
-      this.isEmpty = isEmptyLayout(this.node);
-      if (this.layoutDOM) {
-        this.layoutDOM.setAttribute('data-empty-layout', Boolean(this.isEmpty).toString());
-      }
+    this.isEmpty = isEmptyLayout(this.node);
+    if (this.layoutDOM) {
+      this.layoutDOM.setAttribute('data-empty-layout', Boolean(this.isEmpty).toString());
     }
     return /*#__PURE__*/React.createElement(LayoutBreakoutResizer, {
       pluginInjectionApi: props.pluginInjectionApi,

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

@@ -373,7 +373,7 @@ const getDefaultPresetLayout = layoutNode => {
 
     // 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';
+    return 'two_equal';
   }
   switch (layoutColumnCount) {
     case 2:

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

@@ -49,8 +49,6 @@ const moveCursorToNextColumn = (state, dispatch) => {
   }
   return true;
 };
-
-// TODO: Look at memoize-one-ing this fn
 const getNodeDecoration = (pos, node) => [Decoration.node(pos, pos + node.nodeSize, {
   class: 'selected'
 })];

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

@@ -8,7 +8,6 @@ import { useMemo } from 'react';
 import { css, Global, jsx } from '@emotion/react';
 import { useIntl } from 'react-intl-next';
 import { layoutMessages as messages } from '@atlaskit/editor-common/messages';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 const getPlaceholderStyle = message => {
   if (editorExperiment('platform_editor_controls', 'variant1')) {
@@ -27,28 +26,10 @@ const getPlaceholderStyle = message => {
       }
     });
   }
-  if (fg('platform_editor_advanced_layouts_post_fix_patch_1')) {
-    return css({
-      // when paragraph is the only child, and it only has a trailingBreak.
-      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors -- Ignored via go/DSP-18766
-      '.ProseMirror .layoutSectionView-content-wrap.selected [data-layout-column] > [data-layout-content] > p:only-child:has(.ProseMirror-trailingBreak:only-child)': {
-        // eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles -- Ignored via go/DSP-18766
-        '&::before': {
-          // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values
-          content: `"${message}"`,
-          position: 'absolute',
-          color: "var(--ds-text-disabled, #A5ADBA)",
-          font: "var(--ds-font-body, normal 400 14px/20px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, \"Helvetica Neue\", sans-serif)",
-          marginTop: "var(--ds-space-050, 4px)",
-          pointerEvents: 'none'
-        }
-      }
-    });
-  }
   return css({
     // when paragraph is the only child, and it only has a trailingBreak.
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors -- Ignored via go/DSP-18766
-    '.ProseMirror [data-layout-column] > [data-layout-content] > p:only-child:has(.ProseMirror-trailingBreak:only-child)': {
+    '.ProseMirror .layoutSectionView-content-wrap.selected [data-layout-column] > [data-layout-content] > p:only-child:has(.ProseMirror-trailingBreak:only-child)': {
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles -- Ignored via go/DSP-18766
       '&::before': {
         // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values

package/dist/es2019/ui/toolbar.js

@@ -117,7 +117,7 @@ const buildLayoutButton = (intl, item, currentLayout, editorAnalyticsAPI) => ({
   tabIndex: null
 });
 export const layoutToolbarTitle = 'Layout floating controls';
-const iconPlaceholder = LayoutTwoColumnsIcon; // TODO: Replace with proper icon ED-25466
+const iconPlaceholder = LayoutTwoColumnsIcon; // TODO: ED-25466 - Replace with proper icon
 
 const getAdvancedLayoutItems = ({
   addSidebarLayouts,

package/dist/esm/layoutPlugin.js

@@ -4,7 +4,6 @@ import { layoutSectionWithSingleColumn } from '@atlaskit/adf-schema/schema';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { layoutMessages, toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages';
 import { IconFiveColumnLayout, IconFourColumnLayout, IconLayout, IconThreeColumnLayout, IconTwoColumnLayout } from '@atlaskit/editor-common/quick-insert';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { createDefaultLayoutSection, createMultiColumnLayoutSection, insertLayoutColumnsWithAnalytics } from './pm-plugins/actions';
 import { default as createLayoutPlugin } from './pm-plugins/main';
@@ -65,18 +64,16 @@ export var layoutPlugin = function layoutPlugin(_ref) {
       quickInsert: function quickInsert(_ref4) {
         var formatMessage = _ref4.formatMessage;
         var withInsertLayoutAnalytics = function withInsertLayoutAnalytics(tr) {
-          if (fg('platform_editor_advanced_layouts_post_fix_patch_1')) {
-            var _api$analytics2;
-            api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 || (_api$analytics2 = _api$analytics2.actions) === null || _api$analytics2 === void 0 || _api$analytics2.attachAnalyticsEvent({
-              action: ACTION.INSERTED,
-              actionSubject: ACTION_SUBJECT.DOCUMENT,
-              actionSubjectId: ACTION_SUBJECT_ID.LAYOUT,
-              attributes: {
-                inputMethod: INPUT_METHOD.QUICK_INSERT
-              },
-              eventType: EVENT_TYPE.TRACK
-            })(tr);
-          }
+          var _api$analytics2;
+          api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 || (_api$analytics2 = _api$analytics2.actions) === null || _api$analytics2 === void 0 || _api$analytics2.attachAnalyticsEvent({
+            action: ACTION.INSERTED,
+            actionSubject: ACTION_SUBJECT.DOCUMENT,
+            actionSubjectId: ACTION_SUBJECT_ID.LAYOUT,
+            attributes: {
+              inputMethod: INPUT_METHOD.QUICK_INSERT
+            },
+            eventType: EVENT_TYPE.TRACK
+          })(tr);
           return tr;
         };
         if (editorExperiment('advanced_layouts', true)) {

package/dist/esm/nodeviews/index.js

@@ -10,7 +10,6 @@ import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
 import ReactNodeView from '@atlaskit/editor-common/react-node-view';
 import { BreakoutResizer, ignoreResizerMutations } from '@atlaskit/editor-common/resizer';
 import { DOMSerializer } from '@atlaskit/editor-prosemirror/model';
-import { fg } from '@atlaskit/platform-feature-flags';
 var isEmptyParagraph = function isEmptyParagraph(node) {
   return !!node && node.type.name === 'paragraph' && !node.childCount;
 };
@@ -76,9 +75,7 @@ export var LayoutSectionView = /*#__PURE__*/function (_ReactNodeView) {
     var _this;
     _classCallCheck(this, LayoutSectionView);
     _this = _callSuper(this, LayoutSectionView, [props.node, props.view, props.getPos, props.portalProviderAPI, props.eventDispatcher, props]);
-    if (fg('platform_editor_advanced_layouts_post_fix_patch_1')) {
-      _this.isEmpty = isEmptyLayout(_this.node);
-    }
+    _this.isEmpty = isEmptyLayout(_this.node);
     _this.options = props.options;
     return _this;
   }
@@ -94,9 +91,7 @@ export var LayoutSectionView = /*#__PURE__*/function (_ReactNodeView) {
       // 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')) {
-        this.layoutDOM.setAttribute('data-empty-layout', Boolean(this.isEmpty).toString());
-      }
+      this.layoutDOM.setAttribute('data-empty-layout', Boolean(this.isEmpty).toString());
       return {
         dom: container,
         contentDOM: contentDOM
@@ -112,11 +107,9 @@ export var LayoutSectionView = /*#__PURE__*/function (_ReactNodeView) {
   }, {
     key: "render",
     value: function render(props, forwardRef) {
-      if (fg('platform_editor_advanced_layouts_post_fix_patch_1')) {
-        this.isEmpty = isEmptyLayout(this.node);
-        if (this.layoutDOM) {
-          this.layoutDOM.setAttribute('data-empty-layout', Boolean(this.isEmpty).toString());
-        }
+      this.isEmpty = isEmptyLayout(this.node);
+      if (this.layoutDOM) {
+        this.layoutDOM.setAttribute('data-empty-layout', Boolean(this.isEmpty).toString());
       }
       return /*#__PURE__*/React.createElement(LayoutBreakoutResizer, {
         pluginInjectionApi: props.pluginInjectionApi,

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

@@ -389,7 +389,7 @@ var getDefaultPresetLayout = function getDefaultPresetLayout(layoutNode) {
 
     // 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';
+    return 'two_equal';
   }
   switch (layoutColumnCount) {
     case 2:

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

@@ -45,8 +45,6 @@ var moveCursorToNextColumn = function moveCursorToNextColumn(state, dispatch) {
   }
   return true;
 };
-
-// TODO: Look at memoize-one-ing this fn
 var getNodeDecoration = function getNodeDecoration(pos, node) {
   return [Decoration.node(pos, pos + node.nodeSize, {
     class: 'selected'

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

@@ -8,7 +8,6 @@ import { useMemo } from 'react';
 import { css, Global, jsx } from '@emotion/react';
 import { useIntl } from 'react-intl-next';
 import { layoutMessages as messages } from '@atlaskit/editor-common/messages';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 var getPlaceholderStyle = function getPlaceholderStyle(message) {
   if (editorExperiment('platform_editor_controls', 'variant1')) {
@@ -27,28 +26,10 @@ var getPlaceholderStyle = function getPlaceholderStyle(message) {
       }
     });
   }
-  if (fg('platform_editor_advanced_layouts_post_fix_patch_1')) {
-    return css({
-      // when paragraph is the only child, and it only has a trailingBreak.
-      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors -- Ignored via go/DSP-18766
-      '.ProseMirror .layoutSectionView-content-wrap.selected [data-layout-column] > [data-layout-content] > p:only-child:has(.ProseMirror-trailingBreak:only-child)': {
-        // eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles -- Ignored via go/DSP-18766
-        '&::before': {
-          // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values
-          content: "\"".concat(message, "\""),
-          position: 'absolute',
-          color: "var(--ds-text-disabled, #A5ADBA)",
-          font: "var(--ds-font-body, normal 400 14px/20px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, \"Helvetica Neue\", sans-serif)",
-          marginTop: "var(--ds-space-050, 4px)",
-          pointerEvents: 'none'
-        }
-      }
-    });
-  }
   return css({
     // when paragraph is the only child, and it only has a trailingBreak.
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors -- Ignored via go/DSP-18766
-    '.ProseMirror [data-layout-column] > [data-layout-content] > p:only-child:has(.ProseMirror-trailingBreak:only-child)': {
+    '.ProseMirror .layoutSectionView-content-wrap.selected [data-layout-column] > [data-layout-content] > p:only-child:has(.ProseMirror-trailingBreak:only-child)': {
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles -- Ignored via go/DSP-18766
       '&::before': {
         // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values

package/dist/esm/ui/toolbar.js

@@ -120,7 +120,7 @@ var buildLayoutButton = function buildLayoutButton(intl, item, currentLayout, ed
   };
 };
 export var layoutToolbarTitle = 'Layout floating controls';
-var iconPlaceholder = LayoutTwoColumnsIcon; // TODO: Replace with proper icon ED-25466
+var iconPlaceholder = LayoutTwoColumnsIcon; // TODO: ED-25466 - Replace with proper icon
 
 var getAdvancedLayoutItems = function getAdvancedLayoutItems(_ref) {
   var addSidebarLayouts = _ref.addSidebarLayouts,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-layout",
-	"version": "2.1.3",
+	"version": "2.1.5",
 	"description": "Layout plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -34,17 +34,17 @@
 	},
 	"dependencies": {
 		"@atlaskit/adf-schema": "^47.6.0",
-		"@atlaskit/editor-common": "^102.0.0",
-		"@atlaskit/editor-plugin-analytics": "^2.1.0",
+		"@atlaskit/editor-common": "^102.8.0",
+		"@atlaskit/editor-plugin-analytics": "^2.2.0",
 		"@atlaskit/editor-plugin-decorations": "^2.0.0",
 		"@atlaskit/editor-plugin-editor-disabled": "^2.0.0",
-		"@atlaskit/editor-plugin-selection": "^2.0.0",
+		"@atlaskit/editor-plugin-selection": "^2.1.0",
 		"@atlaskit/editor-plugin-width": "^3.0.0",
 		"@atlaskit/editor-prosemirror": "7.0.0",
-		"@atlaskit/icon": "^24.1.0",
+		"@atlaskit/icon": "^25.0.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
-		"@atlaskit/tmp-editor-statsig": "^3.4.0",
-		"@atlaskit/tokens": "^4.3.0",
+		"@atlaskit/tmp-editor-statsig": "^4.0.0",
+		"@atlaskit/tokens": "^4.5.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1"
 	},
@@ -100,9 +100,6 @@
 		"platform-visual-refresh-icons": {
 			"type": "boolean"
 		},
-		"platform_editor_advanced_layouts_post_fix_patch_1": {
-			"type": "boolean"
-		},
 		"platform_editor_advanced_layouts_post_fix_patch_3": {
 			"type": "boolean"
 		},