@atlaskit/editor-plugin-layout 25.0.0 → 25.0.2

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @atlaskit/editor-plugin-layout
 
+## 25.0.2
+
+### Patch Changes
+
+- Updated dependencies
+
+## 25.0.1
+
+### Patch Changes
+
+- [`6e187a17c0713`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/6e187a17c0713) -
+  Fix inner layout resize handles appearing when editor is in view mode despite not being able to
+  resize anything. Behind experiment `platform_editor_disable_view_layout_resize`
+- Updated dependencies
+
 ## 25.0.0
 
 ### Patch Changes

package/dist/cjs/layoutPlugin.js

@@ -102,11 +102,15 @@ var layoutPlugin = exports.layoutPlugin = function layoutPlugin(_ref) {
       }];
     },
     pmPlugins: function pmPlugins() {
+      var isViewMode = function isViewMode() {
+        var _api$editorViewMode;
+        return (api === null || api === void 0 || (_api$editorViewMode = api.editorViewMode) === null || _api$editorViewMode === void 0 || (_api$editorViewMode = _api$editorViewMode.sharedState.currentState()) === null || _api$editorViewMode === void 0 ? void 0 : _api$editorViewMode.mode) === 'view';
+      };
       var plugins = [{
         name: 'layout',
         plugin: function plugin() {
           var _api$analytics;
-          return (0, _main.default)(options, api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions);
+          return (0, _main.default)(options, api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions, isViewMode);
         }
       }];
       plugins.push({

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

@@ -16,6 +16,7 @@ var _model = require("@atlaskit/editor-prosemirror/model");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils2 = require("@atlaskit/editor-prosemirror/utils");
 var _view2 = require("@atlaskit/editor-prosemirror/view");
+var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
 var _editorExperiment = require("@atlaskit/tmp-editor-statsig/editor-experiment");
 var _actions = require("./actions");
 var _columnResizeDivider = require("./column-resize-divider");
@@ -212,6 +213,9 @@ var handleDeleteLayoutColumn = function handleDeleteLayoutColumn(state, dispatch
   return false;
 };
 var _default = exports.default = function _default(options, editorAnalyticsAPI) {
+  var isViewMode = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : function () {
+    return false;
+  };
   // Store a reference to the EditorView so widget decorations can dispatch transactions
   var editorViewRef;
   return new _safePlugin.SafePlugin({
@@ -275,7 +279,7 @@ var _default = exports.default = function _default(options, editorAnalyticsAPI)
       decorations: function decorations(state) {
         var layoutState = _pluginKey.pluginKey.getState(state);
         var isLayoutResizingPluginAvailable = _resizing.pluginKey.get(state) !== undefined;
-        if ((0, _editorExperiment.editorExperiment)('advanced_layouts', true) && isLayoutResizingPluginAvailable) {
+        if ((0, _editorExperiment.editorExperiment)('advanced_layouts', true) && isLayoutResizingPluginAvailable && !(isViewMode() && (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_disable_view_layout_resize'))) {
           var dividerDecorations = (0, _columnResizeDivider.getColumnDividerDecorations)(state, editorViewRef, editorAnalyticsAPI);
           var selectedDecorations = layoutState.pos !== null ? getNodeDecoration(layoutState.pos, state.doc.nodeAt(layoutState.pos)) : [];
           var _dangerPreviewDecorations = getDangerPreviewDecorations(state, layoutState.dangerPreviewLayoutColumnPositions);

package/dist/es2019/layoutPlugin.js

@@ -94,11 +94,15 @@ export const layoutPlugin = ({
       }];
     },
     pmPlugins() {
+      const isViewMode = () => {
+        var _api$editorViewMode, _api$editorViewMode$s;
+        return (api === null || api === void 0 ? void 0 : (_api$editorViewMode = api.editorViewMode) === null || _api$editorViewMode === void 0 ? void 0 : (_api$editorViewMode$s = _api$editorViewMode.sharedState.currentState()) === null || _api$editorViewMode$s === void 0 ? void 0 : _api$editorViewMode$s.mode) === 'view';
+      };
       const plugins = [{
         name: 'layout',
         plugin: () => {
           var _api$analytics;
-          return createLayoutPlugin(options, api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions);
+          return createLayoutPlugin(options, api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions, isViewMode);
         }
       }];
       plugins.push({

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

@@ -7,6 +7,7 @@ import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection, Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findParentNodeClosestToPos, findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { Decoration, DecorationSet } from '@atlaskit/editor-prosemirror/view';
+import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';
 import { fixColumnSizes, fixColumnStructure, getSelectedLayout, LAYOUT_COLUMN_INSERT_META } from './actions';
 import { getColumnDividerDecorations } from './column-resize-divider';
@@ -213,7 +214,7 @@ const handleDeleteLayoutColumn = (state, dispatch) => {
   }
   return false;
 };
-export default ((options, editorAnalyticsAPI) => {
+export default ((options, editorAnalyticsAPI, isViewMode = () => false) => {
   // Store a reference to the EditorView so widget decorations can dispatch transactions
   let editorViewRef;
   return new SafePlugin({
@@ -275,7 +276,7 @@ export default ((options, editorAnalyticsAPI) => {
       decorations(state) {
         const layoutState = pluginKey.getState(state);
         const isLayoutResizingPluginAvailable = layoutResizingPluginKey.get(state) !== undefined;
-        if (editorExperiment('advanced_layouts', true) && isLayoutResizingPluginAvailable) {
+        if (editorExperiment('advanced_layouts', true) && isLayoutResizingPluginAvailable && !(isViewMode() && isExperimentEnabled('platform_editor_disable_view_layout_resize'))) {
           const dividerDecorations = getColumnDividerDecorations(state, editorViewRef, editorAnalyticsAPI);
           const selectedDecorations = layoutState.pos !== null ? getNodeDecoration(layoutState.pos, state.doc.nodeAt(layoutState.pos)) : [];
           const dangerPreviewDecorations = getDangerPreviewDecorations(state, layoutState.dangerPreviewLayoutColumnPositions);

package/dist/esm/layoutPlugin.js

@@ -95,11 +95,15 @@ export var layoutPlugin = function layoutPlugin(_ref) {
       }];
     },
     pmPlugins: function pmPlugins() {
+      var isViewMode = function isViewMode() {
+        var _api$editorViewMode;
+        return (api === null || api === void 0 || (_api$editorViewMode = api.editorViewMode) === null || _api$editorViewMode === void 0 || (_api$editorViewMode = _api$editorViewMode.sharedState.currentState()) === null || _api$editorViewMode === void 0 ? void 0 : _api$editorViewMode.mode) === 'view';
+      };
       var plugins = [{
         name: 'layout',
         plugin: function plugin() {
           var _api$analytics;
-          return createLayoutPlugin(options, api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions);
+          return createLayoutPlugin(options, api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions, isViewMode);
         }
       }];
       plugins.push({

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

@@ -11,6 +11,7 @@ import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection, Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findParentNodeClosestToPos, findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { Decoration, DecorationSet } from '@atlaskit/editor-prosemirror/view';
+import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';
 import { fixColumnSizes, fixColumnStructure, getSelectedLayout, LAYOUT_COLUMN_INSERT_META } from './actions';
 import { getColumnDividerDecorations } from './column-resize-divider';
@@ -205,6 +206,9 @@ var handleDeleteLayoutColumn = function handleDeleteLayoutColumn(state, dispatch
   return false;
 };
 export default (function (options, editorAnalyticsAPI) {
+  var isViewMode = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : function () {
+    return false;
+  };
   // Store a reference to the EditorView so widget decorations can dispatch transactions
   var editorViewRef;
   return new SafePlugin({
@@ -268,7 +272,7 @@ export default (function (options, editorAnalyticsAPI) {
       decorations: function decorations(state) {
         var layoutState = pluginKey.getState(state);
         var isLayoutResizingPluginAvailable = layoutResizingPluginKey.get(state) !== undefined;
-        if (editorExperiment('advanced_layouts', true) && isLayoutResizingPluginAvailable) {
+        if (editorExperiment('advanced_layouts', true) && isLayoutResizingPluginAvailable && !(isViewMode() && isExperimentEnabled('platform_editor_disable_view_layout_resize'))) {
           var dividerDecorations = getColumnDividerDecorations(state, editorViewRef, editorAnalyticsAPI);
           var selectedDecorations = layoutState.pos !== null ? getNodeDecoration(layoutState.pos, state.doc.nodeAt(layoutState.pos)) : [];
           var _dangerPreviewDecorations = getDangerPreviewDecorations(state, layoutState.dangerPreviewLayoutColumnPositions);

package/dist/types/layoutPluginType.d.ts

@@ -4,6 +4,7 @@ import type { BlockControlsPlugin } from '@atlaskit/editor-plugin-block-controls
 import type { BlockMenuPlugin } from '@atlaskit/editor-plugin-block-menu';
 import type { DecorationsPlugin } from '@atlaskit/editor-plugin-decorations';
 import type { EditorDisabledPlugin } from '@atlaskit/editor-plugin-editor-disabled';
+import type { EditorViewModePlugin } from '@atlaskit/editor-plugin-editor-viewmode/editorViewmodePluginType';
 import type { GuidelinePlugin } from '@atlaskit/editor-plugin-guideline';
 import type { InteractionPlugin } from '@atlaskit/editor-plugin-interaction';
 import type { SelectionPlugin } from '@atlaskit/editor-plugin-selection';
@@ -20,6 +21,7 @@ export type LayoutPluginDependencies = [
     OptionalPlugin<AnalyticsPlugin>,
     OptionalPlugin<WidthPlugin>,
     OptionalPlugin<EditorDisabledPlugin>,
+    OptionalPlugin<EditorViewModePlugin>,
     OptionalPlugin<GuidelinePlugin>,
     OptionalPlugin<InteractionPlugin>,
     OptionalPlugin<BlockControlsPlugin>,

package/dist/types/pm-plugins/main.d.ts

@@ -4,4 +4,4 @@ import type { LayoutPluginOptions } from '../types';
 import type { LayoutState } from './types';
 export declare const DEFAULT_LAYOUT = "two_equal";
 export default _default;
-declare function _default(options: LayoutPluginOptions, editorAnalyticsAPI?: EditorAnalyticsAPI): SafePlugin<LayoutState>;
+declare function _default(options: LayoutPluginOptions, editorAnalyticsAPI?: EditorAnalyticsAPI, isViewMode?: () => boolean): SafePlugin<LayoutState>;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-layout",
-	"version": "25.0.0",
+	"version": "25.0.2",
 	"description": "Layout plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -43,14 +43,14 @@
 		"@atlaskit/icon-lab": "^7.11.0",
 		"@atlaskit/platform-feature-experiments": "^0.3.0",
 		"@atlaskit/platform-feature-flags": "^2.2.0",
-		"@atlaskit/tmp-editor-statsig": "^220.0.0",
-		"@atlaskit/tokens": "^20.1.0",
+		"@atlaskit/tmp-editor-statsig": "^222.0.0",
+		"@atlaskit/tokens": "^20.3.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",
 		"bind-event-listener": "^3.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^128.0.0",
+		"@atlaskit/editor-common": "^128.3.0",
 		"react": "^18.2.0 || ^19.2.0",
 		"react-intl": "^5.25.1 || ^6.0.0 || ^7.0.0"
 	},