@atlaskit/editor-plugin-expand 1.5.0 → 1.5.2

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @atlaskit/editor-plugin-expand
 
+## 1.5.2
+
+### Patch Changes
+
+- [#91461](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/91461) [`1b353cb06cc8`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/1b353cb06cc8) - [ED-23042] Disable editing in code blocks and expand nodes when editorDisabled state is true
+
+## 1.5.1
+
+### Patch Changes
+
+- [#92426](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/92426) [`32c76c7c225c`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/32c76c7c225c) - Bump adf-schema to 35.9.2 to support table alignment options
+- Updated dependencies
+
 ## 1.5.0
 
 ### Minor Changes

package/dist/cjs/legacyExpand/nodeviews/index.js

@@ -24,7 +24,7 @@ var _ExpandIconButton = require("../ui/ExpandIconButton");
 function buildExpandClassName(type, expanded) {
   return "".concat(_styles.expandClassNames.prefix, " ").concat(_styles.expandClassNames.type(type), " ").concat(expanded ? _styles.expandClassNames.expanded : '');
 }
-var toDOM = function toDOM(node, __livePage, intl) {
+var toDOM = function toDOM(node, __livePage, intl, titleReadOnly, contentEditable) {
   return ['div', {
     // prettier-ignore
     'class': buildExpandClassName(node.type.name, (0, _platformFeatureFlags.getBooleanFF)('platform.editor.live-pages-expand-divergence') && __livePage ? !node.attrs.__expanded : node.attrs.__expanded),
@@ -50,18 +50,21 @@ var toDOM = function toDOM(node, __livePage, intl) {
     'class': _styles.expandClassNames.titleInput,
     value: node.attrs.title,
     placeholder: intl && intl.formatMessage(_ui.expandMessages.expandPlaceholderText) || _ui.expandMessages.expandPlaceholderText.defaultMessage,
-    type: 'text'
-  }]]],
-  // prettier-ignore
-  ['div', {
-    'class': _styles.expandClassNames.content
+    type: 'text',
+    readonly: (0, _platformFeatureFlags.getBooleanFF)('platform.editor.live-view.disable-editing-in-view-mode_fi1rx') && titleReadOnly ? 'true' : undefined
+  }]]], ['div', {
+    // prettier-ignore
+    class: _styles.expandClassNames.content,
+    contenteditable: (0, _platformFeatureFlags.getBooleanFF)('platform.editor.live-view.disable-editing-in-view-mode_fi1rx') && contentEditable ? contentEditable ? 'true' : 'false' : undefined
   }, 0]];
 };
 var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
-  function ExpandNodeView(node, view, getPos, getIntl, isMobile, selectNearNode, api) {
-    var _this = this;
+  function ExpandNodeView(_node, view, getPos, getIntl, isMobile, selectNearNode, api) {
+    var _this = this,
+      _api$editorDisabled;
     var allowInteractiveExpand = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : true;
     var __livePage = arguments.length > 8 && arguments[8] !== undefined ? arguments[8] : false;
+    var cleanUpEditorDisabledOnChange = arguments.length > 9 ? arguments[9] : undefined;
     (0, _classCallCheck2.default)(this, ExpandNodeView);
     (0, _defineProperty2.default)(this, "allowInteractiveExpand", true);
     (0, _defineProperty2.default)(this, "isMobile", false);
@@ -366,16 +369,25 @@ var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
         }
       }
     });
+    (0, _defineProperty2.default)(this, "getContentEditable", function (node) {
+      var contentEditable = (0, _platformFeatureFlags.getBooleanFF)('platform.editor.live-pages-expand-divergence') && _this.__livePage ? !node.attrs.__expanded : node.attrs.__expanded;
+      if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.live-view.disable-editing-in-view-mode_fi1rx') && _this.api && _this.api.editorDisabled) {
+        var _this$api$editorDisab;
+        return !((_this$api$editorDisab = _this.api.editorDisabled.sharedState.currentState()) !== null && _this$api$editorDisab !== void 0 && _this$api$editorDisab.editorDisabled) && contentEditable;
+      }
+      return contentEditable;
+    });
     this.selectNearNode = selectNearNode;
     this.__livePage = __livePage;
+    this.cleanUpEditorDisabledOnChange = cleanUpEditorDisabledOnChange;
     this.intl = getIntl();
-    var _DOMSerializer$render = _model.DOMSerializer.renderSpec(document, toDOM(node, this.__livePage, this.intl)),
+    var _DOMSerializer$render = _model.DOMSerializer.renderSpec(document, toDOM(_node, this.__livePage, this.intl, api === null || api === void 0 || (_api$editorDisabled = api.editorDisabled) === null || _api$editorDisabled === void 0 || (_api$editorDisabled = _api$editorDisabled.sharedState.currentState()) === null || _api$editorDisabled === void 0 ? void 0 : _api$editorDisabled.editorDisabled)),
       dom = _DOMSerializer$render.dom,
       contentDOM = _DOMSerializer$render.contentDOM;
     this.allowInteractiveExpand = allowInteractiveExpand;
     this.getPos = getPos;
     this.view = view;
-    this.node = node;
+    this.node = _node;
     this.dom = dom;
     this.contentDOM = contentDOM;
     this.isMobile = isMobile;
@@ -390,6 +402,8 @@ var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
   (0, _createClass2.default)(ExpandNodeView, [{
     key: "initHandlers",
     value: function initHandlers() {
+      var _this$api6,
+        _this2 = this;
       if (this.dom) {
         // eslint-disable-next-line @repo/internal/dom-events/no-unsafe-event-listeners
         this.dom.addEventListener('click', this.handleClick);
@@ -414,6 +428,21 @@ var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
         // eslint-disable-next-line @repo/internal/dom-events/no-unsafe-event-listeners
         this.icon.addEventListener('keydown', this.handleIconKeyDown);
       }
+      if ((_this$api6 = this.api) !== null && _this$api6 !== void 0 && _this$api6.editorDisabled && (0, _platformFeatureFlags.getBooleanFF)('platform.editor.live-view.disable-editing-in-view-mode_fi1rx')) {
+        this.cleanUpEditorDisabledOnChange = this.api.editorDisabled.sharedState.onChange(function (sharedState) {
+          var editorDisabled = sharedState.nextSharedState.editorDisabled;
+          if (_this2.input) {
+            if (editorDisabled) {
+              _this2.input.setAttribute('readonly', 'true');
+            } else {
+              _this2.input.removeAttribute('readonly');
+            }
+          }
+          if (_this2.content) {
+            _this2.content.setAttribute('contenteditable', _this2.getContentEditable(_this2.node) ? 'true' : 'false');
+          }
+        });
+      }
     }
   }, {
     key: "renderIcon",
@@ -451,7 +480,7 @@ var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
   }, {
     key: "update",
     value: function update(node, _decorations) {
-      var _this2 = this;
+      var _this3 = this;
       if (this.node.type === node.type) {
         if (this.node.attrs.__expanded !== node.attrs.__expanded) {
           // Instead of re-rendering the view on an expand toggle
@@ -462,7 +491,7 @@ var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
           }
           if (this.content) {
             // Disallow interaction/selection inside when collapsed.
-            this.content.setAttribute('contenteditable', (0, _platformFeatureFlags.getBooleanFF)('platform.editor.live-pages-expand-divergence') && this.__livePage ? !node.attrs.__expanded : node.attrs.__expanded);
+            this.content.setAttribute('contenteditable', this.getContentEditable(node) ? 'true' : 'false');
           }
         }
 
@@ -470,8 +499,8 @@ var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
         // since we're intentionally being less aggressive about re-rendering.
         // We also apply a rAF to avoid abrupt continuous replacement of the title.
         window.requestAnimationFrame(function () {
-          if (_this2.input && _this2.node.attrs.title !== _this2.input.value) {
-            _this2.input.value = _this2.node.attrs.title;
+          if (_this3.input && _this3.node.attrs.title !== _this3.input.value) {
+            _this3.input.value = _this3.node.attrs.title;
           }
         });
         this.node = node;
@@ -507,6 +536,9 @@ var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
         _reactDom.default.unmountComponentAtNode(this.icon);
       }
       (_this$decorationClean2 = this.decorationCleanup) === null || _this$decorationClean2 === void 0 || _this$decorationClean2.call(this);
+      if (this.cleanUpEditorDisabledOnChange) {
+        this.cleanUpEditorDisabledOnChange();
+      }
 
       // @ts-ignore - [unblock prosemirror bump] reset non optional prop to undefined to clear reference
       this.dom = undefined;
@@ -515,6 +547,7 @@ var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
       this.input = undefined;
       this.titleContainer = undefined;
       this.content = undefined;
+      this.cleanUpEditorDisabledOnChange = undefined;
     }
   }]);
   return ExpandNodeView;

package/dist/es2019/legacyExpand/nodeviews/index.js

@@ -14,7 +14,7 @@ import { ExpandIconButton } from '../ui/ExpandIconButton';
 function buildExpandClassName(type, expanded) {
   return `${expandClassNames.prefix} ${expandClassNames.type(type)} ${expanded ? expandClassNames.expanded : ''}`;
 }
-const toDOM = (node, __livePage, intl) => ['div', {
+const toDOM = (node, __livePage, intl, titleReadOnly, contentEditable) => ['div', {
   // prettier-ignore
   'class': buildExpandClassName(node.type.name, getBooleanFF('platform.editor.live-pages-expand-divergence') && __livePage ? !node.attrs.__expanded : node.attrs.__expanded),
   'data-node-type': node.type.name,
@@ -39,14 +39,16 @@ const toDOM = (node, __livePage, intl) => ['div', {
   'class': expandClassNames.titleInput,
   value: node.attrs.title,
   placeholder: intl && intl.formatMessage(expandMessages.expandPlaceholderText) || expandMessages.expandPlaceholderText.defaultMessage,
-  type: 'text'
-}]]],
-// prettier-ignore
-['div', {
-  'class': expandClassNames.content
+  type: 'text',
+  readonly: getBooleanFF('platform.editor.live-view.disable-editing-in-view-mode_fi1rx') && titleReadOnly ? 'true' : undefined
+}]]], ['div', {
+  // prettier-ignore
+  class: expandClassNames.content,
+  contenteditable: getBooleanFF('platform.editor.live-view.disable-editing-in-view-mode_fi1rx') && contentEditable ? contentEditable ? 'true' : 'false' : undefined
 }, 0]];
 export class ExpandNodeView {
-  constructor(node, view, getPos, getIntl, isMobile, selectNearNode, api, allowInteractiveExpand = true, __livePage = false) {
+  constructor(_node, view, getPos, getIntl, isMobile, selectNearNode, api, allowInteractiveExpand = true, __livePage = false, cleanUpEditorDisabledOnChange) {
+    var _api$editorDisabled, _api$editorDisabled$s;
     _defineProperty(this, "allowInteractiveExpand", true);
     _defineProperty(this, "isMobile", false);
     _defineProperty(this, "focusTitle", () => {
@@ -366,17 +368,26 @@ export class ExpandNodeView {
         }
       }
     });
+    _defineProperty(this, "getContentEditable", node => {
+      const contentEditable = getBooleanFF('platform.editor.live-pages-expand-divergence') && this.__livePage ? !node.attrs.__expanded : node.attrs.__expanded;
+      if (getBooleanFF('platform.editor.live-view.disable-editing-in-view-mode_fi1rx') && this.api && this.api.editorDisabled) {
+        var _this$api$editorDisab;
+        return !((_this$api$editorDisab = this.api.editorDisabled.sharedState.currentState()) !== null && _this$api$editorDisab !== void 0 && _this$api$editorDisab.editorDisabled) && contentEditable;
+      }
+      return contentEditable;
+    });
     this.selectNearNode = selectNearNode;
     this.__livePage = __livePage;
+    this.cleanUpEditorDisabledOnChange = cleanUpEditorDisabledOnChange;
     this.intl = getIntl();
     const {
       dom,
       contentDOM
-    } = DOMSerializer.renderSpec(document, toDOM(node, this.__livePage, this.intl));
+    } = DOMSerializer.renderSpec(document, toDOM(_node, this.__livePage, this.intl, api === null || api === void 0 ? void 0 : (_api$editorDisabled = api.editorDisabled) === null || _api$editorDisabled === void 0 ? void 0 : (_api$editorDisabled$s = _api$editorDisabled.sharedState.currentState()) === null || _api$editorDisabled$s === void 0 ? void 0 : _api$editorDisabled$s.editorDisabled));
     this.allowInteractiveExpand = allowInteractiveExpand;
     this.getPos = getPos;
     this.view = view;
-    this.node = node;
+    this.node = _node;
     this.dom = dom;
     this.contentDOM = contentDOM;
     this.isMobile = isMobile;
@@ -389,6 +400,7 @@ export class ExpandNodeView {
     this.initHandlers();
   }
   initHandlers() {
+    var _this$api6;
     if (this.dom) {
       // eslint-disable-next-line @repo/internal/dom-events/no-unsafe-event-listeners
       this.dom.addEventListener('click', this.handleClick);
@@ -413,6 +425,21 @@ export class ExpandNodeView {
       // eslint-disable-next-line @repo/internal/dom-events/no-unsafe-event-listeners
       this.icon.addEventListener('keydown', this.handleIconKeyDown);
     }
+    if ((_this$api6 = this.api) !== null && _this$api6 !== void 0 && _this$api6.editorDisabled && getBooleanFF('platform.editor.live-view.disable-editing-in-view-mode_fi1rx')) {
+      this.cleanUpEditorDisabledOnChange = this.api.editorDisabled.sharedState.onChange(sharedState => {
+        const editorDisabled = sharedState.nextSharedState.editorDisabled;
+        if (this.input) {
+          if (editorDisabled) {
+            this.input.setAttribute('readonly', 'true');
+          } else {
+            this.input.removeAttribute('readonly');
+          }
+        }
+        if (this.content) {
+          this.content.setAttribute('contenteditable', this.getContentEditable(this.node) ? 'true' : 'false');
+        }
+      });
+    }
   }
   renderIcon(intl, node) {
     if (!this.icon) {
@@ -453,7 +480,7 @@ export class ExpandNodeView {
         }
         if (this.content) {
           // Disallow interaction/selection inside when collapsed.
-          this.content.setAttribute('contenteditable', getBooleanFF('platform.editor.live-pages-expand-divergence') && this.__livePage ? !node.attrs.__expanded : node.attrs.__expanded);
+          this.content.setAttribute('contenteditable', this.getContentEditable(node) ? 'true' : 'false');
         }
       }
 
@@ -496,6 +523,9 @@ export class ExpandNodeView {
       ReactDOM.unmountComponentAtNode(this.icon);
     }
     (_this$decorationClean2 = this.decorationCleanup) === null || _this$decorationClean2 === void 0 ? void 0 : _this$decorationClean2.call(this);
+    if (this.cleanUpEditorDisabledOnChange) {
+      this.cleanUpEditorDisabledOnChange();
+    }
 
     // @ts-ignore - [unblock prosemirror bump] reset non optional prop to undefined to clear reference
     this.dom = undefined;
@@ -504,6 +534,7 @@ export class ExpandNodeView {
     this.input = undefined;
     this.titleContainer = undefined;
     this.content = undefined;
+    this.cleanUpEditorDisabledOnChange = undefined;
   }
 }
 export default function ({

package/dist/esm/legacyExpand/nodeviews/index.js

@@ -16,7 +16,7 @@ import { ExpandIconButton } from '../ui/ExpandIconButton';
 function buildExpandClassName(type, expanded) {
   return "".concat(expandClassNames.prefix, " ").concat(expandClassNames.type(type), " ").concat(expanded ? expandClassNames.expanded : '');
 }
-var toDOM = function toDOM(node, __livePage, intl) {
+var toDOM = function toDOM(node, __livePage, intl, titleReadOnly, contentEditable) {
   return ['div', {
     // prettier-ignore
     'class': buildExpandClassName(node.type.name, getBooleanFF('platform.editor.live-pages-expand-divergence') && __livePage ? !node.attrs.__expanded : node.attrs.__expanded),
@@ -42,18 +42,21 @@ var toDOM = function toDOM(node, __livePage, intl) {
     'class': expandClassNames.titleInput,
     value: node.attrs.title,
     placeholder: intl && intl.formatMessage(expandMessages.expandPlaceholderText) || expandMessages.expandPlaceholderText.defaultMessage,
-    type: 'text'
-  }]]],
-  // prettier-ignore
-  ['div', {
-    'class': expandClassNames.content
+    type: 'text',
+    readonly: getBooleanFF('platform.editor.live-view.disable-editing-in-view-mode_fi1rx') && titleReadOnly ? 'true' : undefined
+  }]]], ['div', {
+    // prettier-ignore
+    class: expandClassNames.content,
+    contenteditable: getBooleanFF('platform.editor.live-view.disable-editing-in-view-mode_fi1rx') && contentEditable ? contentEditable ? 'true' : 'false' : undefined
   }, 0]];
 };
 export var ExpandNodeView = /*#__PURE__*/function () {
-  function ExpandNodeView(node, view, getPos, getIntl, isMobile, selectNearNode, api) {
-    var _this = this;
+  function ExpandNodeView(_node, view, getPos, getIntl, isMobile, selectNearNode, api) {
+    var _this = this,
+      _api$editorDisabled;
     var allowInteractiveExpand = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : true;
     var __livePage = arguments.length > 8 && arguments[8] !== undefined ? arguments[8] : false;
+    var cleanUpEditorDisabledOnChange = arguments.length > 9 ? arguments[9] : undefined;
     _classCallCheck(this, ExpandNodeView);
     _defineProperty(this, "allowInteractiveExpand", true);
     _defineProperty(this, "isMobile", false);
@@ -358,16 +361,25 @@ export var ExpandNodeView = /*#__PURE__*/function () {
         }
       }
     });
+    _defineProperty(this, "getContentEditable", function (node) {
+      var contentEditable = getBooleanFF('platform.editor.live-pages-expand-divergence') && _this.__livePage ? !node.attrs.__expanded : node.attrs.__expanded;
+      if (getBooleanFF('platform.editor.live-view.disable-editing-in-view-mode_fi1rx') && _this.api && _this.api.editorDisabled) {
+        var _this$api$editorDisab;
+        return !((_this$api$editorDisab = _this.api.editorDisabled.sharedState.currentState()) !== null && _this$api$editorDisab !== void 0 && _this$api$editorDisab.editorDisabled) && contentEditable;
+      }
+      return contentEditable;
+    });
     this.selectNearNode = selectNearNode;
     this.__livePage = __livePage;
+    this.cleanUpEditorDisabledOnChange = cleanUpEditorDisabledOnChange;
     this.intl = getIntl();
-    var _DOMSerializer$render = DOMSerializer.renderSpec(document, toDOM(node, this.__livePage, this.intl)),
+    var _DOMSerializer$render = DOMSerializer.renderSpec(document, toDOM(_node, this.__livePage, this.intl, api === null || api === void 0 || (_api$editorDisabled = api.editorDisabled) === null || _api$editorDisabled === void 0 || (_api$editorDisabled = _api$editorDisabled.sharedState.currentState()) === null || _api$editorDisabled === void 0 ? void 0 : _api$editorDisabled.editorDisabled)),
       dom = _DOMSerializer$render.dom,
       contentDOM = _DOMSerializer$render.contentDOM;
     this.allowInteractiveExpand = allowInteractiveExpand;
     this.getPos = getPos;
     this.view = view;
-    this.node = node;
+    this.node = _node;
     this.dom = dom;
     this.contentDOM = contentDOM;
     this.isMobile = isMobile;
@@ -382,6 +394,8 @@ export var ExpandNodeView = /*#__PURE__*/function () {
   _createClass(ExpandNodeView, [{
     key: "initHandlers",
     value: function initHandlers() {
+      var _this$api6,
+        _this2 = this;
       if (this.dom) {
         // eslint-disable-next-line @repo/internal/dom-events/no-unsafe-event-listeners
         this.dom.addEventListener('click', this.handleClick);
@@ -406,6 +420,21 @@ export var ExpandNodeView = /*#__PURE__*/function () {
         // eslint-disable-next-line @repo/internal/dom-events/no-unsafe-event-listeners
         this.icon.addEventListener('keydown', this.handleIconKeyDown);
       }
+      if ((_this$api6 = this.api) !== null && _this$api6 !== void 0 && _this$api6.editorDisabled && getBooleanFF('platform.editor.live-view.disable-editing-in-view-mode_fi1rx')) {
+        this.cleanUpEditorDisabledOnChange = this.api.editorDisabled.sharedState.onChange(function (sharedState) {
+          var editorDisabled = sharedState.nextSharedState.editorDisabled;
+          if (_this2.input) {
+            if (editorDisabled) {
+              _this2.input.setAttribute('readonly', 'true');
+            } else {
+              _this2.input.removeAttribute('readonly');
+            }
+          }
+          if (_this2.content) {
+            _this2.content.setAttribute('contenteditable', _this2.getContentEditable(_this2.node) ? 'true' : 'false');
+          }
+        });
+      }
     }
   }, {
     key: "renderIcon",
@@ -443,7 +472,7 @@ export var ExpandNodeView = /*#__PURE__*/function () {
   }, {
     key: "update",
     value: function update(node, _decorations) {
-      var _this2 = this;
+      var _this3 = this;
       if (this.node.type === node.type) {
         if (this.node.attrs.__expanded !== node.attrs.__expanded) {
           // Instead of re-rendering the view on an expand toggle
@@ -454,7 +483,7 @@ export var ExpandNodeView = /*#__PURE__*/function () {
           }
           if (this.content) {
             // Disallow interaction/selection inside when collapsed.
-            this.content.setAttribute('contenteditable', getBooleanFF('platform.editor.live-pages-expand-divergence') && this.__livePage ? !node.attrs.__expanded : node.attrs.__expanded);
+            this.content.setAttribute('contenteditable', this.getContentEditable(node) ? 'true' : 'false');
           }
         }
 
@@ -462,8 +491,8 @@ export var ExpandNodeView = /*#__PURE__*/function () {
         // since we're intentionally being less aggressive about re-rendering.
         // We also apply a rAF to avoid abrupt continuous replacement of the title.
         window.requestAnimationFrame(function () {
-          if (_this2.input && _this2.node.attrs.title !== _this2.input.value) {
-            _this2.input.value = _this2.node.attrs.title;
+          if (_this3.input && _this3.node.attrs.title !== _this3.input.value) {
+            _this3.input.value = _this3.node.attrs.title;
           }
         });
         this.node = node;
@@ -499,6 +528,9 @@ export var ExpandNodeView = /*#__PURE__*/function () {
         ReactDOM.unmountComponentAtNode(this.icon);
       }
       (_this$decorationClean2 = this.decorationCleanup) === null || _this$decorationClean2 === void 0 || _this$decorationClean2.call(this);
+      if (this.cleanUpEditorDisabledOnChange) {
+        this.cleanUpEditorDisabledOnChange();
+      }
 
       // @ts-ignore - [unblock prosemirror bump] reset non optional prop to undefined to clear reference
       this.dom = undefined;
@@ -507,6 +539,7 @@ export var ExpandNodeView = /*#__PURE__*/function () {
       this.input = undefined;
       this.titleContainer = undefined;
       this.content = undefined;
+      this.cleanUpEditorDisabledOnChange = undefined;
     }
   }]);
   return ExpandNodeView;

package/dist/types/legacyExpand/nodeviews/index.d.ts

@@ -7,6 +7,7 @@ import type { ExpandPlugin } from '../../types';
 export declare class ExpandNodeView implements NodeView {
     private selectNearNode;
     private __livePage;
+    private cleanUpEditorDisabledOnChange?;
     node: PmNode;
     view: EditorView;
     dom: HTMLElement;
@@ -21,7 +22,7 @@ export declare class ExpandNodeView implements NodeView {
     isMobile: boolean;
     api: ExtractInjectionAPI<ExpandPlugin> | undefined;
     decorationCleanup?: () => boolean | undefined;
-    constructor(node: PmNode, view: EditorView, getPos: getPosHandlerNode, getIntl: () => IntlShape, isMobile: boolean, selectNearNode: SetSelectionRelativeToNode | undefined, api: ExtractInjectionAPI<ExpandPlugin> | undefined, allowInteractiveExpand?: boolean, __livePage?: boolean);
+    constructor(node: PmNode, view: EditorView, getPos: getPosHandlerNode, getIntl: () => IntlShape, isMobile: boolean, selectNearNode: SetSelectionRelativeToNode | undefined, api: ExtractInjectionAPI<ExpandPlugin> | undefined, allowInteractiveExpand?: boolean, __livePage?: boolean, cleanUpEditorDisabledOnChange?: (() => void) | undefined);
     private initHandlers;
     private focusTitle;
     private handleIconKeyDown;
@@ -40,6 +41,7 @@ export declare class ExpandNodeView implements NodeView {
     private setLeftGapCursor;
     private handleArrowRightFromTitle;
     private handleArrowLeftFromTitle;
+    private getContentEditable;
     stopEvent(event: Event): boolean;
     ignoreMutation(mutationRecord: MutationRecord | {
         type: 'selection';

package/dist/types/types.d.ts

@@ -1,6 +1,7 @@
 import type { EditorAppearance, LongPressSelectionPluginOptions, NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
 import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 import type { DecorationsPlugin } from '@atlaskit/editor-plugin-decorations';
+import type { EditorDisabledPlugin } from '@atlaskit/editor-plugin-editor-disabled';
 import type { SelectionPlugin } from '@atlaskit/editor-plugin-selection';
 import type { SelectionMarkerPlugin } from '@atlaskit/editor-plugin-selection-marker';
 import type { insertExpand } from './legacyExpand/commands';
@@ -39,7 +40,8 @@ export type ExpandPlugin = NextEditorPlugin<'expand', {
         DecorationsPlugin,
         SelectionPlugin,
         OptionalPlugin<AnalyticsPlugin>,
-        OptionalPlugin<SelectionMarkerPlugin>
+        OptionalPlugin<SelectionMarkerPlugin>,
+        OptionalPlugin<EditorDisabledPlugin>
     ];
     actions: {
         insertExpand: ReturnType<typeof insertExpand>;

package/dist/types-ts4.5/legacyExpand/nodeviews/index.d.ts

@@ -7,6 +7,7 @@ import type { ExpandPlugin } from '../../types';
 export declare class ExpandNodeView implements NodeView {
     private selectNearNode;
     private __livePage;
+    private cleanUpEditorDisabledOnChange?;
     node: PmNode;
     view: EditorView;
     dom: HTMLElement;
@@ -21,7 +22,7 @@ export declare class ExpandNodeView implements NodeView {
     isMobile: boolean;
     api: ExtractInjectionAPI<ExpandPlugin> | undefined;
     decorationCleanup?: () => boolean | undefined;
-    constructor(node: PmNode, view: EditorView, getPos: getPosHandlerNode, getIntl: () => IntlShape, isMobile: boolean, selectNearNode: SetSelectionRelativeToNode | undefined, api: ExtractInjectionAPI<ExpandPlugin> | undefined, allowInteractiveExpand?: boolean, __livePage?: boolean);
+    constructor(node: PmNode, view: EditorView, getPos: getPosHandlerNode, getIntl: () => IntlShape, isMobile: boolean, selectNearNode: SetSelectionRelativeToNode | undefined, api: ExtractInjectionAPI<ExpandPlugin> | undefined, allowInteractiveExpand?: boolean, __livePage?: boolean, cleanUpEditorDisabledOnChange?: (() => void) | undefined);
     private initHandlers;
     private focusTitle;
     private handleIconKeyDown;
@@ -40,6 +41,7 @@ export declare class ExpandNodeView implements NodeView {
     private setLeftGapCursor;
     private handleArrowRightFromTitle;
     private handleArrowLeftFromTitle;
+    private getContentEditable;
     stopEvent(event: Event): boolean;
     ignoreMutation(mutationRecord: MutationRecord | {
         type: 'selection';

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

@@ -1,6 +1,7 @@
 import type { EditorAppearance, LongPressSelectionPluginOptions, NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
 import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 import type { DecorationsPlugin } from '@atlaskit/editor-plugin-decorations';
+import type { EditorDisabledPlugin } from '@atlaskit/editor-plugin-editor-disabled';
 import type { SelectionPlugin } from '@atlaskit/editor-plugin-selection';
 import type { SelectionMarkerPlugin } from '@atlaskit/editor-plugin-selection-marker';
 import type { insertExpand } from './legacyExpand/commands';
@@ -39,7 +40,8 @@ export type ExpandPlugin = NextEditorPlugin<'expand', {
         DecorationsPlugin,
         SelectionPlugin,
         OptionalPlugin<AnalyticsPlugin>,
-        OptionalPlugin<SelectionMarkerPlugin>
+        OptionalPlugin<SelectionMarkerPlugin>,
+        OptionalPlugin<EditorDisabledPlugin>
     ];
     actions: {
         insertExpand: ReturnType<typeof insertExpand>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-expand",
-  "version": "1.5.0",
+  "version": "1.5.2",
   "description": "Expand plugin for @atlaskit/editor-core",
   "author": "Atlassian Pty Ltd",
   "license": "Apache-2.0",
@@ -33,11 +33,12 @@
     ".": "./src/index.ts"
   },
   "dependencies": {
-    "@atlaskit/adf-schema": "^35.9.0",
-    "@atlaskit/button": "^17.12.0",
+    "@atlaskit/adf-schema": "^35.9.2",
+    "@atlaskit/button": "^17.13.0",
     "@atlaskit/editor-common": "^78.30.0",
     "@atlaskit/editor-plugin-analytics": "^1.0.0",
     "@atlaskit/editor-plugin-decorations": "^1.0.0",
+    "@atlaskit/editor-plugin-editor-disabled": "^1.0.0",
     "@atlaskit/editor-plugin-selection": "^1.1.0",
     "@atlaskit/editor-plugin-selection-marker": "^1.2.0",
     "@atlaskit/editor-prosemirror": "3.0.0",
@@ -111,6 +112,9 @@
     },
     "platform.editor.single-player-expand": {
       "type": "boolean"
+    },
+    "platform.editor.live-view.disable-editing-in-view-mode_fi1rx": {
+      "type": "boolean"
     }
   }
 }