@atlaskit/editor-plugin-layout 1.12.21 → 1.13.1

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/editor-plugin-layout
 
+## 1.13.1
+
+### Patch Changes
+
+- Updated dependencies
+
+## 1.13.0
+
+### Minor Changes
+
+- [#102136](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/102136)
+  [`0d56e554b5633`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/0d56e554b5633) -
+  ED-26000 add support for layout without breakout
+
 ## 1.12.21
 
 ### Patch Changes

package/dist/cjs/nodeviews/index.js

@@ -24,6 +24,9 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
 var isEmptyParagraph = function isEmptyParagraph(node) {
   return !!node && node.type.name === 'paragraph' && !node.childCount;
 };
+var isBreakoutAvailable = function isBreakoutAvailable(schema) {
+  return Boolean(schema.marks.breakout);
+};
 var isEmptyLayout = function isEmptyLayout(node) {
   if (!node) {
     return false;
@@ -65,7 +68,7 @@ var LayoutBreakoutResizer = function LayoutBreakoutResizer(_ref) {
     editorView: view,
     nodeType: "layoutSection",
     getEditorWidth: getEditorWidth,
-    disabled: (editorDisabledState === null || editorDisabledState === void 0 ? void 0 : editorDisabledState.editorDisabled) === true,
+    disabled: (editorDisabledState === null || editorDisabledState === void 0 ? void 0 : editorDisabledState.editorDisabled) === true || !isBreakoutAvailable(view.state.schema),
     parentRef: parentRef,
     editorAnalyticsApi: pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a === void 0 ? void 0 : _pluginInjectionApi$a.actions,
     displayGapCursor: displayGapCursor

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

@@ -260,8 +260,6 @@ var decreaseColumns = function decreaseColumns(node, insideRightEdgePos) {
  * Switching from 3 -> 2 moves all the content of the third col inside the second before
  * removing it
  */
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/max-params
 function forceColumnStructure(state, node, pos, presetLayout) {
   var tr = state.tr;
   var insideRightEdgeOfLayoutSection = pos + node.nodeSize - 1;
@@ -296,9 +294,6 @@ function forceColumnStructure(state, node, pos, presetLayout) {
   }
   return tr;
 }
-
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/max-params
 function forceColumnStructureNew(state, node, pos, presetLayout) {
   var tr = state.tr;
   var insideRightEdgeOfLayoutSection = pos + node.nodeSize - 1;
@@ -326,9 +321,6 @@ function columnWidth(node, schema, widths) {
     }
   });
 }
-
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/max-params
 function forceColumnWidths(state, tr, pos, presetLayout) {
   var node = tr.doc.nodeAt(pos);
   if (!node) {
@@ -336,9 +328,6 @@ function forceColumnWidths(state, tr, pos, presetLayout) {
   }
   return tr.replaceWith(pos + 1, pos + node.nodeSize - 1, columnWidth(node, state.schema, getWidthsForPreset(presetLayout)));
 }
-
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/max-params
 function forceSectionToPresetLayout(state, node, pos, presetLayout) {
   var forceColumnStructureFn = (0, _experiments.editorExperiment)('advanced_layouts', true) ? forceColumnStructureNew : forceColumnStructure;
   var tr = forceColumnStructureFn(state, node, pos, presetLayout);

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

@@ -92,8 +92,6 @@ var _default = exports.default = function _default(options) {
       init: function init(_, state) {
         return getInitialPluginState(options, state);
       },
-      // Ignored via go/ees005
-      // eslint-disable-next-line @typescript-eslint/max-params
       apply: function apply(tr, pluginState, _oldState, newState) {
         if (tr.docChanged || tr.selectionSet) {
           var maybeLayoutSection = (0, _utils3.getMaybeLayoutSection)(newState);

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

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

package/dist/cjs/ui/toolbar.js

@@ -115,10 +115,7 @@ var LAYOUT_WITH_THREE_COL_DISTRIBUTION = [{
   icon: _LayoutThreeWithLeftSidebars.LayoutThreeWithLeftSidebarsIcon,
   iconFallback: _LayoutThreeWithLeftSidebars.LayoutThreeWithLeftSidebarsIcon
 }];
-var buildLayoutButton = function buildLayoutButton(intl, item, currentLayout, editorAnalyticsAPI
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/max-params
-) {
+var buildLayoutButton = function buildLayoutButton(intl, item, currentLayout, editorAnalyticsAPI) {
   return {
     id: item.id,
     type: 'button',
@@ -200,10 +197,7 @@ var getAdvancedLayoutItems = function getAdvancedLayoutItems(_ref) {
     }]
   }, separator, deleteButton]);
 };
-var buildToolbar = exports.buildToolbar = function buildToolbar(state, intl, pos, _allowBreakout, addSidebarLayouts, allowSingleColumnLayout, api
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/max-params
-) {
+var buildToolbar = exports.buildToolbar = function buildToolbar(state, intl, pos, _allowBreakout, addSidebarLayouts, allowSingleColumnLayout, api) {
   var _api$decorations$acti, _api$decorations, _api$analytics;
   var _ref2 = (_api$decorations$acti = api === null || api === void 0 || (_api$decorations = api.decorations) === null || _api$decorations === void 0 ? void 0 : _api$decorations.actions) !== null && _api$decorations$acti !== void 0 ? _api$decorations$acti : {},
     hoverDecoration = _ref2.hoverDecoration;

package/dist/es2019/nodeviews/index.js

@@ -7,6 +7,9 @@ import { fg } from '@atlaskit/platform-feature-flags';
 const isEmptyParagraph = node => {
   return !!node && node.type.name === 'paragraph' && !node.childCount;
 };
+const isBreakoutAvailable = schema => {
+  return Boolean(schema.marks.breakout);
+};
 const isEmptyLayout = node => {
   if (!node) {
     return false;
@@ -50,7 +53,7 @@ const LayoutBreakoutResizer = ({
     editorView: view,
     nodeType: "layoutSection",
     getEditorWidth: getEditorWidth,
-    disabled: (editorDisabledState === null || editorDisabledState === void 0 ? void 0 : editorDisabledState.editorDisabled) === true,
+    disabled: (editorDisabledState === null || editorDisabledState === void 0 ? void 0 : editorDisabledState.editorDisabled) === true || !isBreakoutAvailable(view.state.schema),
     parentRef: parentRef,
     editorAnalyticsApi: pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$a = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a === void 0 ? void 0 : _pluginInjectionApi$a.actions,
     displayGapCursor: displayGapCursor

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

@@ -237,8 +237,6 @@ const decreaseColumns = (node, insideRightEdgePos, columnsNumberToRemove = 1) =>
  * Switching from 3 -> 2 moves all the content of the third col inside the second before
  * removing it
  */
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/max-params
 function forceColumnStructure(state, node, pos, presetLayout) {
   const tr = state.tr;
   const insideRightEdgeOfLayoutSection = pos + node.nodeSize - 1;
@@ -273,9 +271,6 @@ function forceColumnStructure(state, node, pos, presetLayout) {
   }
   return tr;
 }
-
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/max-params
 function forceColumnStructureNew(state, node, pos, presetLayout) {
   const tr = state.tr;
   const insideRightEdgeOfLayoutSection = pos + node.nodeSize - 1;
@@ -304,9 +299,6 @@ function columnWidth(node, schema, widths) {
     }
   });
 }
-
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/max-params
 function forceColumnWidths(state, tr, pos, presetLayout) {
   const node = tr.doc.nodeAt(pos);
   if (!node) {
@@ -314,9 +306,6 @@ function forceColumnWidths(state, tr, pos, presetLayout) {
   }
   return tr.replaceWith(pos + 1, pos + node.nodeSize - 1, columnWidth(node, state.schema, getWidthsForPreset(presetLayout)));
 }
-
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/max-params
 export function forceSectionToPresetLayout(state, node, pos, presetLayout) {
   const forceColumnStructureFn = editorExperiment('advanced_layouts', true) ? forceColumnStructureNew : forceColumnStructure;
   let tr = forceColumnStructureFn(state, node, pos, presetLayout);

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

@@ -84,8 +84,6 @@ export default (options => new SafePlugin({
   key: pluginKey,
   state: {
     init: (_, state) => getInitialPluginState(options, state),
-    // Ignored via go/ees005
-    // eslint-disable-next-line @typescript-eslint/max-params
     apply: (tr, pluginState, _oldState, newState) => {
       if (tr.docChanged || tr.selectionSet) {
         const maybeLayoutSection = getMaybeLayoutSection(newState);

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

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

package/dist/es2019/ui/toolbar.js

@@ -104,10 +104,7 @@ const LAYOUT_WITH_THREE_COL_DISTRIBUTION = [{
   icon: LayoutThreeWithLeftSidebarsIcon,
   iconFallback: LayoutThreeWithLeftSidebarsIcon
 }];
-const buildLayoutButton = (intl, item, currentLayout, editorAnalyticsAPI
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/max-params
-) => ({
+const buildLayoutButton = (intl, item, currentLayout, editorAnalyticsAPI) => ({
   id: item.id,
   type: 'button',
   icon: item.icon,
@@ -186,10 +183,7 @@ const getAdvancedLayoutItems = ({
     }]
   }, separator, deleteButton];
 };
-export const buildToolbar = (state, intl, pos, _allowBreakout, addSidebarLayouts, allowSingleColumnLayout, api
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/max-params
-) => {
+export const buildToolbar = (state, intl, pos, _allowBreakout, addSidebarLayouts, allowSingleColumnLayout, api) => {
   var _api$decorations$acti, _api$decorations, _api$analytics;
   const {
     hoverDecoration

package/dist/esm/nodeviews/index.js

@@ -14,6 +14,9 @@ import { fg } from '@atlaskit/platform-feature-flags';
 var isEmptyParagraph = function isEmptyParagraph(node) {
   return !!node && node.type.name === 'paragraph' && !node.childCount;
 };
+var isBreakoutAvailable = function isBreakoutAvailable(schema) {
+  return Boolean(schema.marks.breakout);
+};
 var isEmptyLayout = function isEmptyLayout(node) {
   if (!node) {
     return false;
@@ -55,7 +58,7 @@ var LayoutBreakoutResizer = function LayoutBreakoutResizer(_ref) {
     editorView: view,
     nodeType: "layoutSection",
     getEditorWidth: getEditorWidth,
-    disabled: (editorDisabledState === null || editorDisabledState === void 0 ? void 0 : editorDisabledState.editorDisabled) === true,
+    disabled: (editorDisabledState === null || editorDisabledState === void 0 ? void 0 : editorDisabledState.editorDisabled) === true || !isBreakoutAvailable(view.state.schema),
     parentRef: parentRef,
     editorAnalyticsApi: pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a === void 0 ? void 0 : _pluginInjectionApi$a.actions,
     displayGapCursor: displayGapCursor

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

@@ -251,8 +251,6 @@ var decreaseColumns = function decreaseColumns(node, insideRightEdgePos) {
  * Switching from 3 -> 2 moves all the content of the third col inside the second before
  * removing it
  */
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/max-params
 function forceColumnStructure(state, node, pos, presetLayout) {
   var tr = state.tr;
   var insideRightEdgeOfLayoutSection = pos + node.nodeSize - 1;
@@ -287,9 +285,6 @@ function forceColumnStructure(state, node, pos, presetLayout) {
   }
   return tr;
 }
-
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/max-params
 function forceColumnStructureNew(state, node, pos, presetLayout) {
   var tr = state.tr;
   var insideRightEdgeOfLayoutSection = pos + node.nodeSize - 1;
@@ -317,9 +312,6 @@ function columnWidth(node, schema, widths) {
     }
   });
 }
-
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/max-params
 function forceColumnWidths(state, tr, pos, presetLayout) {
   var node = tr.doc.nodeAt(pos);
   if (!node) {
@@ -327,9 +319,6 @@ function forceColumnWidths(state, tr, pos, presetLayout) {
   }
   return tr.replaceWith(pos + 1, pos + node.nodeSize - 1, columnWidth(node, state.schema, getWidthsForPreset(presetLayout)));
 }
-
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/max-params
 export function forceSectionToPresetLayout(state, node, pos, presetLayout) {
   var forceColumnStructureFn = editorExperiment('advanced_layouts', true) ? forceColumnStructureNew : forceColumnStructure;
   var tr = forceColumnStructureFn(state, node, pos, presetLayout);

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

@@ -85,8 +85,6 @@ export default (function (options) {
       init: function init(_, state) {
         return getInitialPluginState(options, state);
       },
-      // Ignored via go/ees005
-      // eslint-disable-next-line @typescript-eslint/max-params
       apply: function apply(tr, pluginState, _oldState, newState) {
         if (tr.docChanged || tr.selectionSet) {
           var maybeLayoutSection = getMaybeLayoutSection(newState);

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

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

package/dist/esm/ui/toolbar.js

@@ -105,10 +105,7 @@ var LAYOUT_WITH_THREE_COL_DISTRIBUTION = [{
   icon: LayoutThreeWithLeftSidebarsIcon,
   iconFallback: LayoutThreeWithLeftSidebarsIcon
 }];
-var buildLayoutButton = function buildLayoutButton(intl, item, currentLayout, editorAnalyticsAPI
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/max-params
-) {
+var buildLayoutButton = function buildLayoutButton(intl, item, currentLayout, editorAnalyticsAPI) {
   return {
     id: item.id,
     type: 'button',
@@ -190,10 +187,7 @@ var getAdvancedLayoutItems = function getAdvancedLayoutItems(_ref) {
     }]
   }, separator, deleteButton]);
 };
-export var buildToolbar = function buildToolbar(state, intl, pos, _allowBreakout, addSidebarLayouts, allowSingleColumnLayout, api
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/max-params
-) {
+export var buildToolbar = function buildToolbar(state, intl, pos, _allowBreakout, addSidebarLayouts, allowSingleColumnLayout, api) {
   var _api$decorations$acti, _api$decorations, _api$analytics;
   var _ref2 = (_api$decorations$acti = api === null || api === void 0 || (_api$decorations = api.decorations) === null || _api$decorations === void 0 ? void 0 : _api$decorations.actions) !== null && _api$decorations$acti !== void 0 ? _api$decorations$acti : {},
     hoverDecoration = _ref2.hoverDecoration;

package/dist/types/layoutPluginType.d.ts

@@ -6,15 +6,16 @@ import type { SelectionPlugin } from '@atlaskit/editor-plugin-selection';
 import type { WidthPlugin } from '@atlaskit/editor-plugin-width';
 import type { insertLayoutColumnsWithAnalytics } from './pm-plugins/actions';
 import type { LayoutPluginOptions } from './types';
+export type LayoutPluginDependencies = [
+    DecorationsPlugin,
+    SelectionPlugin,
+    OptionalPlugin<AnalyticsPlugin>,
+    OptionalPlugin<WidthPlugin>,
+    OptionalPlugin<EditorDisabledPlugin>
+];
 export type LayoutPlugin = NextEditorPlugin<'layout', {
     pluginConfiguration: LayoutPluginOptions | undefined;
-    dependencies: [
-        DecorationsPlugin,
-        SelectionPlugin,
-        OptionalPlugin<AnalyticsPlugin>,
-        OptionalPlugin<WidthPlugin>,
-        OptionalPlugin<EditorDisabledPlugin>
-    ];
+    dependencies: LayoutPluginDependencies;
     actions: {
         insertLayoutColumns: ReturnType<typeof insertLayoutColumnsWithAnalytics>;
     };

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

@@ -6,15 +6,16 @@ import type { SelectionPlugin } from '@atlaskit/editor-plugin-selection';
 import type { WidthPlugin } from '@atlaskit/editor-plugin-width';
 import type { insertLayoutColumnsWithAnalytics } from './pm-plugins/actions';
 import type { LayoutPluginOptions } from './types';
+export type LayoutPluginDependencies = [
+    DecorationsPlugin,
+    SelectionPlugin,
+    OptionalPlugin<AnalyticsPlugin>,
+    OptionalPlugin<WidthPlugin>,
+    OptionalPlugin<EditorDisabledPlugin>
+];
 export type LayoutPlugin = NextEditorPlugin<'layout', {
     pluginConfiguration: LayoutPluginOptions | undefined;
-    dependencies: [
-        DecorationsPlugin,
-        SelectionPlugin,
-        OptionalPlugin<AnalyticsPlugin>,
-        OptionalPlugin<WidthPlugin>,
-        OptionalPlugin<EditorDisabledPlugin>
-    ];
+    dependencies: LayoutPluginDependencies;
     actions: {
         insertLayoutColumns: ReturnType<typeof insertLayoutColumnsWithAnalytics>;
     };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-layout",
-	"version": "1.12.21",
+	"version": "1.13.1",
 	"description": "Layout plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -32,17 +32,17 @@
 	},
 	"dependencies": {
 		"@atlaskit/adf-schema": "^46.1.0",
-		"@atlaskit/editor-common": "^99.0.0",
-		"@atlaskit/editor-plugin-analytics": "^1.10.0",
-		"@atlaskit/editor-plugin-decorations": "^1.3.0",
-		"@atlaskit/editor-plugin-editor-disabled": "^1.3.0",
+		"@atlaskit/editor-common": "^99.7.0",
+		"@atlaskit/editor-plugin-analytics": "^1.11.0",
+		"@atlaskit/editor-plugin-decorations": "^1.4.0",
+		"@atlaskit/editor-plugin-editor-disabled": "^1.4.0",
 		"@atlaskit/editor-plugin-selection": "^1.6.0",
 		"@atlaskit/editor-plugin-width": "^2.0.0",
 		"@atlaskit/editor-prosemirror": "6.2.1",
-		"@atlaskit/icon": "^23.3.0",
-		"@atlaskit/platform-feature-flags": "^0.3.0",
-		"@atlaskit/tmp-editor-statsig": "^2.33.0",
-		"@atlaskit/tokens": "^3.0.0",
+		"@atlaskit/icon": "^23.6.0",
+		"@atlaskit/platform-feature-flags": "^1.0.0",
+		"@atlaskit/tmp-editor-statsig": "^2.41.0",
+		"@atlaskit/tokens": "^3.3.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1"
 	},