@atlaskit/editor-plugin-expand 1.0.1 → 1.2.0

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

@@ -5,13 +5,14 @@ import { isPositionNearTableRow } from '@atlaskit/editor-common/utils';
 import { isEmptyNode } from '@atlaskit/editor-common/utils';
 import { keymap } from '@atlaskit/editor-prosemirror/keymap';
 import { NodeSelection, Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { deleteExpand, focusTitle } from '../commands';
 import { findExpand } from '../utils';
 const isExpandNode = node => {
   return (node === null || node === void 0 ? void 0 : node.type.name) === 'expand' || (node === null || node === void 0 ? void 0 : node.type.name) === 'nestedExpand';
 };
 const isExpandSelected = selection => selection instanceof NodeSelection && isExpandNode(selection.node);
-export function expandKeymap(api) {
+export function expandKeymap(api, options) {
   const list = {};
   bindKeymapWithCommand(moveRight.common, (state, dispatch, editorView) => {
     var _api$selection;
@@ -84,7 +85,7 @@ export function expandKeymap(api) {
     const {
       nodeBefore
     } = selection.$from;
-    if (selection instanceof GapCursorSelection && selection.side === Side.RIGHT && nodeBefore && (nodeBefore.type === schema.nodes.expand || nodeBefore.type === schema.nodes.nestedExpand) && !nodeBefore.attrs.__expanded) {
+    if (selection instanceof GapCursorSelection && selection.side === Side.RIGHT && nodeBefore && (nodeBefore.type === schema.nodes.expand || nodeBefore.type === schema.nodes.nestedExpand) && (getBooleanFF('platform.editor.live-pages-expand-divergence') && options.__livePage ? nodeBefore.attrs.__expanded : !nodeBefore.attrs.__expanded)) {
       const {
         $from
       } = selection;
@@ -112,7 +113,7 @@ export function expandKeymap(api) {
       const expandBefore = findExpand(state, sel);
       if (sel && expandBefore) {
         // moving cursor from outside of an expand to the title when it is collapsed
-        if (!expandBefore.node.attrs.__expanded) {
+        if (getBooleanFF('platform.editor.live-pages-expand-divergence') && options.__livePage ? expandBefore.node.attrs.__expanded : !expandBefore.node.attrs.__expanded) {
           return focusTitle(expandBefore.start)(state, dispatch, editorView);
         }
         // moving cursor from outside of an expand to the content when it is expanded
@@ -138,7 +139,7 @@ export function expandKeymap(api) {
     const {
       nodeAfter
     } = selection.$from;
-    if (selection instanceof GapCursorSelection && selection.side === Side.LEFT && nodeAfter && (nodeAfter.type === expand || nodeAfter.type === nestedExpand) && !nodeAfter.attrs.__expanded) {
+    if (selection instanceof GapCursorSelection && selection.side === Side.LEFT && nodeAfter && (nodeAfter.type === expand || nodeAfter.type === nestedExpand) && (getBooleanFF('platform.editor.live-pages-expand-divergence') && options.__livePage ? nodeAfter.attrs.__expanded : !nodeAfter.attrs.__expanded)) {
       const {
         $from
       } = selection;
@@ -177,7 +178,7 @@ export function expandKeymap(api) {
       // @see ED-7977
       const sel = Selection.findFrom(state.doc.resolve(Math.max(selection.$from.pos - 1, 0)), -1);
       const expandBefore = findExpand(state, sel);
-      if (expandBefore && (expandBefore.node.type === expand || expandBefore.node.type === nestedExpand) && !expandBefore.node.attrs.__expanded) {
+      if (expandBefore && (expandBefore.node.type === expand || expandBefore.node.type === nestedExpand) && (getBooleanFF('platform.editor.live-pages-expand-divergence') && options.__livePage ? expandBefore.node.attrs.__expanded : !expandBefore.node.attrs.__expanded)) {
         return focusTitle(expandBefore.start)(state, dispatch, editorView);
       }
       return false;

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

@@ -10,7 +10,7 @@ export function containsClass(element, className) {
   var _element$classList;
   return Boolean(element === null || element === void 0 ? void 0 : (_element$classList = element.classList) === null || _element$classList === void 0 ? void 0 : _element$classList.contains(className));
 }
-export const createPlugin = (dispatch, getIntl, appearance = 'full-page', useLongPressSelection = false, api, allowInteractiveExpand = true) => {
+export const createPlugin = (dispatch, getIntl, appearance = 'full-page', useLongPressSelection = false, api, allowInteractiveExpand = true, __livePage = false) => {
   const state = createPluginState(dispatch, {});
   const isMobile = appearance === 'mobile';
   return new SafePlugin({
@@ -22,13 +22,15 @@ export const createPlugin = (dispatch, getIntl, appearance = 'full-page', useLon
           getIntl,
           isMobile,
           api,
-          allowInteractiveExpand
+          allowInteractiveExpand,
+          __livePage
         }),
         nestedExpand: ExpandNodeView({
           getIntl,
           isMobile,
           api,
-          allowInteractiveExpand
+          allowInteractiveExpand,
+          __livePage
         })
       },
       handleKeyDown(_view, event) {

package/dist/es2019/utils.js

@@ -1 +1 @@
-export { findExpand, transformSliceToRemoveOpenExpand, transformSliceNestedExpandToExpand } from '@atlaskit/editor-common/transforms';
+export { findExpand, transformSliceToRemoveOpenExpand, transformSliceToRemoveOpenNestedExpand, transformSliceNestedExpandToExpand } from '@atlaskit/editor-common/transforms';

package/dist/esm/commands.js

@@ -1,12 +1,14 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+import { SetAttrsStep } from '@atlaskit/adf-schema/steps';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD, MODE, PLATFORMS } from '@atlaskit/editor-common/analytics';
 import { GapCursorSelection, Side } from '@atlaskit/editor-common/selection';
 import { createWrapSelectionTransaction } from '@atlaskit/editor-common/utils';
 import { Selection } from '@atlaskit/editor-prosemirror/state';
 import { safeInsert } from '@atlaskit/editor-prosemirror/utils';
 import { findTable } from '@atlaskit/editor-tables/utils';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { createCommand } from './pm-plugins/plugin-factory';
 import { findExpand } from './utils';
 export var setExpandRef = function setExpandRef(ref) {
@@ -52,58 +54,76 @@ export var deleteExpand = function deleteExpand(editorAnalyticsAPI) {
     return deleteExpandAtPos(editorAnalyticsAPI)(expandNode.pos, expandNode.node)(state, dispatch);
   };
 };
-export var updateExpandTitle = function updateExpandTitle(title, pos, nodeType) {
+export var updateExpandTitle = function updateExpandTitle(_ref) {
+  var title = _ref.title,
+    nodeType = _ref.nodeType,
+    pos = _ref.pos,
+    __livePage = _ref.__livePage;
   return function (state, dispatch) {
     var node = state.doc.nodeAt(pos);
     if (node && node.type === nodeType && dispatch) {
       var tr = state.tr;
-      tr.setNodeMarkup(pos, node.type, _objectSpread(_objectSpread({}, node.attrs), {}, {
-        title: title
-      }), node.marks);
+      if (getBooleanFF('platform.editor.live-pages-expand-divergence') && __livePage) {
+        tr.step(new SetAttrsStep(pos, _objectSpread(_objectSpread({}, node.attrs), {}, {
+          title: title
+        })));
+      } else {
+        tr.setNodeMarkup(pos, node.type, _objectSpread(_objectSpread({}, node.attrs), {}, {
+          title: title
+        }), node.marks);
+      }
       dispatch(tr);
     }
     return true;
   };
 };
-export var toggleExpandExpanded = function toggleExpandExpanded(editorAnalyticsAPI) {
-  return function (pos, nodeType) {
-    return function (state, dispatch) {
-      var node = state.doc.nodeAt(pos);
-      if (node && node.type === nodeType && dispatch) {
-        var tr = state.tr;
-        var isExpandedNext = !node.attrs.__expanded;
+export var toggleExpandExpanded = function toggleExpandExpanded(_ref2) {
+  var editorAnalyticsAPI = _ref2.editorAnalyticsAPI,
+    pos = _ref2.pos,
+    nodeType = _ref2.nodeType,
+    __livePage = _ref2.__livePage;
+  return function (state, dispatch) {
+    var node = state.doc.nodeAt(pos);
+    if (node && node.type === nodeType && dispatch) {
+      var tr = state.tr;
+      var isExpandedNext = !node.attrs.__expanded;
+      if (getBooleanFF('platform.editor.live-pages-expand-divergence') && __livePage) {
+        tr.step(new SetAttrsStep(pos, _objectSpread(_objectSpread({}, node.attrs), {}, {
+          __expanded: isExpandedNext
+        })));
+      } else {
         tr.setNodeMarkup(pos, node.type, _objectSpread(_objectSpread({}, node.attrs), {}, {
           __expanded: isExpandedNext
         }), node.marks);
+      }
 
-        // If we're going to collapse the expand and our cursor is currently inside
-        // Move to a right gap cursor, if the toolbar is interacted (or an API),
-        // it will insert below rather than inside (which will be invisible).
-        if (isExpandedNext === false && findExpand(state)) {
-          tr.setSelection(new GapCursorSelection(tr.doc.resolve(pos + node.nodeSize), Side.RIGHT));
-        }
+      // If we're going to collapse the expand and our cursor is currently inside
+      // Move to a right gap cursor, if the toolbar is interacted (or an API),
+      // it will insert below rather than inside (which will be invisible).
+      if (getBooleanFF('platform.editor.live-pages-expand-divergence') && __livePage ? isExpandedNext === true : isExpandedNext === false && findExpand(state)) {
+        tr.setSelection(new GapCursorSelection(tr.doc.resolve(pos + node.nodeSize), Side.RIGHT));
+      }
 
-        // log when people open/close expands
-        // TODO: ED-8523 make platform/mode global attributes?
-        var payload = {
-          action: ACTION.TOGGLE_EXPAND,
-          actionSubject: nodeType === state.schema.nodes.expand ? ACTION_SUBJECT.EXPAND : ACTION_SUBJECT.NESTED_EXPAND,
-          attributes: {
-            platform: PLATFORMS.WEB,
-            mode: MODE.EDITOR,
-            expanded: isExpandedNext
-          },
-          eventType: EVENT_TYPE.TRACK
-        };
+      // log when people open/close expands
+      // TODO: ED-8523 make platform/mode global attributes?
+      var payload = {
+        action: ACTION.TOGGLE_EXPAND,
+        actionSubject: nodeType === state.schema.nodes.expand ? ACTION_SUBJECT.EXPAND : ACTION_SUBJECT.NESTED_EXPAND,
+        attributes: {
+          platform: PLATFORMS.WEB,
+          mode: MODE.EDITOR,
+          expanded: getBooleanFF('platform.editor.live-pages-expand-divergence') && __livePage ? !isExpandedNext : isExpandedNext
+        },
+        eventType: EVENT_TYPE.TRACK
+      };
 
-        // `isRemote` meta prevents this step from being
-        // sync'd between sessions in collab edit
-        tr.setMeta('isRemote', true);
-        editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent(payload)(tr);
-        dispatch(tr);
-      }
-      return true;
-    };
+      // `isRemote` meta prevents this step from being
+      // sync'd between sessions in synchrony collab edit
+      tr.setMeta('isRemote', true);
+      editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent(payload)(tr);
+      dispatch(tr);
+    }
+    return true;
   };
 };
 

package/dist/esm/nodeviews/index.js

@@ -10,15 +10,16 @@ import { expandMessages } from '@atlaskit/editor-common/ui';
 import { closestElement, isEmptyNode } from '@atlaskit/editor-common/utils';
 import { DOMSerializer } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection, Selection } from '@atlaskit/editor-prosemirror/state';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { deleteExpandAtPos, setSelectionInsideExpand, toggleExpandExpanded, updateExpandTitle } from '../commands';
 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, intl) {
+var toDOM = function toDOM(node, __livePage, intl) {
   return ['div', {
     // prettier-ignore
-    'class': buildExpandClassName(node.type.name, node.attrs.__expanded),
+    '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,
     'data-title': node.attrs.title
   }, ['div', {
@@ -52,6 +53,7 @@ export var ExpandNodeView = /*#__PURE__*/function () {
   function ExpandNodeView(node, view, getPos, getIntl, isMobile, selectNearNode, api) {
     var _this = this;
     var allowInteractiveExpand = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : true;
+    var __livePage = arguments.length > 8 && arguments[8] !== undefined ? arguments[8] : false;
     _classCallCheck(this, ExpandNodeView);
     _defineProperty(this, "allowInteractiveExpand", true);
     _defineProperty(this, "isMobile", false);
@@ -108,7 +110,12 @@ export var ExpandNodeView = /*#__PURE__*/function () {
         if (_this.view.dom instanceof HTMLElement) {
           _this.view.dom.blur();
         }
-        toggleExpandExpanded((_this$api = _this.api) === null || _this$api === void 0 || (_this$api = _this$api.analytics) === null || _this$api === void 0 ? void 0 : _this$api.actions)(pos, _this.node.type)(state, dispatch);
+        toggleExpandExpanded({
+          editorAnalyticsAPI: (_this$api = _this.api) === null || _this$api === void 0 || (_this$api = _this$api.analytics) === null || _this$api === void 0 ? void 0 : _this$api.actions,
+          pos: pos,
+          nodeType: _this.node.type,
+          __livePage: _this.__livePage
+        })(state, dispatch);
         return;
       }
       if (target === _this.input) {
@@ -128,7 +135,12 @@ export var ExpandNodeView = /*#__PURE__*/function () {
         var _this$view3 = _this.view,
           state = _this$view3.state,
           dispatch = _this$view3.dispatch;
-        updateExpandTitle(target.value, pos, _this.node.type)(state, dispatch);
+        updateExpandTitle({
+          title: target.value,
+          pos: pos,
+          nodeType: _this.node.type,
+          __livePage: _this.__livePage
+        })(state, dispatch);
       }
     });
     _defineProperty(this, "handleFocus", function (event) {
@@ -188,7 +200,12 @@ export var ExpandNodeView = /*#__PURE__*/function () {
         var _this$view4 = _this.view,
           state = _this$view4.state,
           dispatch = _this$view4.dispatch;
-        toggleExpandExpanded((_this$api3 = _this.api) === null || _this$api3 === void 0 || (_this$api3 = _this$api3.analytics) === null || _this$api3 === void 0 ? void 0 : _this$api3.actions)(pos, _this.node.type)(state, dispatch);
+        toggleExpandExpanded({
+          editorAnalyticsAPI: (_this$api3 = _this.api) === null || _this$api3 === void 0 || (_this$api3 = _this$api3.analytics) === null || _this$api3 === void 0 ? void 0 : _this$api3.actions,
+          pos: pos,
+          nodeType: _this.node.type,
+          __livePage: _this.__livePage
+        })(state, dispatch);
       }
     });
     _defineProperty(this, "moveToOutsideOfTitle", function (event) {
@@ -220,6 +237,9 @@ export var ExpandNodeView = /*#__PURE__*/function () {
       }
     });
     _defineProperty(this, "isCollapsed", function () {
+      if (getBooleanFF('platform.editor.live-pages-expand-divergence') && _this.__livePage) {
+        return _this.node.attrs.__expanded;
+      }
       return !_this.node.attrs.__expanded;
     });
     _defineProperty(this, "setRightGapCursor", function (event) {
@@ -331,8 +351,9 @@ export var ExpandNodeView = /*#__PURE__*/function () {
       }
     });
     this.selectNearNode = selectNearNode;
+    this.__livePage = __livePage;
     this.intl = getIntl();
-    var _DOMSerializer$render = DOMSerializer.renderSpec(document, toDOM(node, this.intl)),
+    var _DOMSerializer$render = DOMSerializer.renderSpec(document, toDOM(node, this.__livePage, this.intl)),
       dom = _DOMSerializer$render.dom,
       contentDOM = _DOMSerializer$render.contentDOM;
     this.allowInteractiveExpand = allowInteractiveExpand;
@@ -385,7 +406,7 @@ export var ExpandNodeView = /*#__PURE__*/function () {
       ReactDOM.render( /*#__PURE__*/React.createElement(ExpandIconButton, {
         intl: intl,
         allowInteractiveExpand: this.allowInteractiveExpand,
-        expanded: __expanded
+        expanded: getBooleanFF('platform.editor.live-pages-expand-divergence') && this.__livePage ? !__expanded : __expanded
       }), this.icon);
     }
   }, {
@@ -421,7 +442,7 @@ export var ExpandNodeView = /*#__PURE__*/function () {
           }
           if (this.content) {
             // Disallow interaction/selection inside when collapsed.
-            this.content.setAttribute('contenteditable', node.attrs.__expanded);
+            this.content.setAttribute('contenteditable', getBooleanFF('platform.editor.live-pages-expand-divergence') && this.__livePage ? !node.attrs.__expanded : node.attrs.__expanded);
           }
         }
 
@@ -477,9 +498,10 @@ export default function (_ref2) {
     isMobile = _ref2.isMobile,
     api = _ref2.api,
     _ref2$allowInteractiv = _ref2.allowInteractiveExpand,
-    allowInteractiveExpand = _ref2$allowInteractiv === void 0 ? true : _ref2$allowInteractiv;
+    allowInteractiveExpand = _ref2$allowInteractiv === void 0 ? true : _ref2$allowInteractiv,
+    __livePage = _ref2.__livePage;
   return function (node, view, getPos) {
     var _api$selection;
-    return new ExpandNodeView(node, view, getPos, getIntl, isMobile, api === null || api === void 0 || (_api$selection = api.selection) === null || _api$selection === void 0 || (_api$selection = _api$selection.actions) === null || _api$selection === void 0 ? void 0 : _api$selection.selectNearNode, api, allowInteractiveExpand);
+    return new ExpandNodeView(node, view, getPos, getIntl, isMobile, api === null || api === void 0 || (_api$selection = api.selection) === null || _api$selection === void 0 || (_api$selection = _api$selection.actions) === null || _api$selection === void 0 ? void 0 : _api$selection.selectNearNode, api, allowInteractiveExpand, __livePage);
   };
 }

package/dist/esm/plugin.js

@@ -36,12 +36,14 @@ export var expandPlugin = function expandPlugin(_ref) {
           var _options$allowInterac;
           var dispatch = _ref2.dispatch,
             getIntl = _ref2.getIntl;
-          return createPlugin(dispatch, getIntl, options.appearance, options.useLongPressSelection, api, (_options$allowInterac = options.allowInteractiveExpand) !== null && _options$allowInterac !== void 0 ? _options$allowInterac : true);
+          return createPlugin(dispatch, getIntl, options.appearance, options.useLongPressSelection, api, (_options$allowInterac = options.allowInteractiveExpand) !== null && _options$allowInterac !== void 0 ? _options$allowInterac : true, options.__livePage);
         }
       }, {
         name: 'expandKeymap',
         plugin: function plugin() {
-          return expandKeymap(api);
+          return expandKeymap(api, {
+            __livePage: options.__livePage
+          });
         }
       }];
     },

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

@@ -5,6 +5,7 @@ import { isPositionNearTableRow } from '@atlaskit/editor-common/utils';
 import { isEmptyNode } from '@atlaskit/editor-common/utils';
 import { keymap } from '@atlaskit/editor-prosemirror/keymap';
 import { NodeSelection, Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { deleteExpand, focusTitle } from '../commands';
 import { findExpand } from '../utils';
 var isExpandNode = function isExpandNode(node) {
@@ -13,7 +14,7 @@ var isExpandNode = function isExpandNode(node) {
 var isExpandSelected = function isExpandSelected(selection) {
   return selection instanceof NodeSelection && isExpandNode(selection.node);
 };
-export function expandKeymap(api) {
+export function expandKeymap(api, options) {
   var list = {};
   bindKeymapWithCommand(moveRight.common, function (state, dispatch, editorView) {
     var _api$selection;
@@ -70,7 +71,7 @@ export function expandKeymap(api) {
     var selection = state.selection,
       schema = state.schema;
     var nodeBefore = selection.$from.nodeBefore;
-    if (selection instanceof GapCursorSelection && selection.side === Side.RIGHT && nodeBefore && (nodeBefore.type === schema.nodes.expand || nodeBefore.type === schema.nodes.nestedExpand) && !nodeBefore.attrs.__expanded) {
+    if (selection instanceof GapCursorSelection && selection.side === Side.RIGHT && nodeBefore && (nodeBefore.type === schema.nodes.expand || nodeBefore.type === schema.nodes.nestedExpand) && (getBooleanFF('platform.editor.live-pages-expand-divergence') && options.__livePage ? nodeBefore.attrs.__expanded : !nodeBefore.attrs.__expanded)) {
       var _$from = selection.$from;
       return focusTitle(Math.max(_$from.pos - 1, 0))(state, dispatch, editorView);
     }
@@ -94,7 +95,7 @@ export function expandKeymap(api) {
       var expandBefore = findExpand(state, sel);
       if (sel && expandBefore) {
         // moving cursor from outside of an expand to the title when it is collapsed
-        if (!expandBefore.node.attrs.__expanded) {
+        if (getBooleanFF('platform.editor.live-pages-expand-divergence') && options.__livePage ? expandBefore.node.attrs.__expanded : !expandBefore.node.attrs.__expanded) {
           return focusTitle(expandBefore.start)(state, dispatch, editorView);
         }
         // moving cursor from outside of an expand to the content when it is expanded
@@ -115,7 +116,7 @@ export function expandKeymap(api) {
       nestedExpand = _state$schema$nodes.nestedExpand;
     var selection = state.selection;
     var nodeAfter = selection.$from.nodeAfter;
-    if (selection instanceof GapCursorSelection && selection.side === Side.LEFT && nodeAfter && (nodeAfter.type === expand || nodeAfter.type === nestedExpand) && !nodeAfter.attrs.__expanded) {
+    if (selection instanceof GapCursorSelection && selection.side === Side.LEFT && nodeAfter && (nodeAfter.type === expand || nodeAfter.type === nestedExpand) && (getBooleanFF('platform.editor.live-pages-expand-divergence') && options.__livePage ? nodeAfter.attrs.__expanded : !nodeAfter.attrs.__expanded)) {
       var $from = selection.$from;
       return focusTitle($from.pos + 1)(state, dispatch, editorView);
     }
@@ -145,7 +146,7 @@ export function expandKeymap(api) {
       // @see ED-7977
       var sel = Selection.findFrom(state.doc.resolve(Math.max(selection.$from.pos - 1, 0)), -1);
       var expandBefore = findExpand(state, sel);
-      if (expandBefore && (expandBefore.node.type === expand || expandBefore.node.type === nestedExpand) && !expandBefore.node.attrs.__expanded) {
+      if (expandBefore && (expandBefore.node.type === expand || expandBefore.node.type === nestedExpand) && (getBooleanFF('platform.editor.live-pages-expand-divergence') && options.__livePage ? expandBefore.node.attrs.__expanded : !expandBefore.node.attrs.__expanded)) {
         return focusTitle(expandBefore.start)(state, dispatch, editorView);
       }
       return false;

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

@@ -15,6 +15,7 @@ export var createPlugin = function createPlugin(dispatch, getIntl) {
   var useLongPressSelection = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
   var api = arguments.length > 4 ? arguments[4] : undefined;
   var allowInteractiveExpand = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : true;
+  var __livePage = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : false;
   var state = createPluginState(dispatch, {});
   var isMobile = appearance === 'mobile';
   return new SafePlugin({
@@ -26,13 +27,15 @@ export var createPlugin = function createPlugin(dispatch, getIntl) {
           getIntl: getIntl,
           isMobile: isMobile,
           api: api,
-          allowInteractiveExpand: allowInteractiveExpand
+          allowInteractiveExpand: allowInteractiveExpand,
+          __livePage: __livePage
         }),
         nestedExpand: ExpandNodeView({
           getIntl: getIntl,
           isMobile: isMobile,
           api: api,
-          allowInteractiveExpand: allowInteractiveExpand
+          allowInteractiveExpand: allowInteractiveExpand,
+          __livePage: __livePage
         })
       },
       handleKeyDown: function handleKeyDown(_view, event) {

package/dist/esm/utils.js

@@ -1 +1 @@
-export { findExpand, transformSliceToRemoveOpenExpand, transformSliceNestedExpandToExpand } from '@atlaskit/editor-common/transforms';
+export { findExpand, transformSliceToRemoveOpenExpand, transformSliceToRemoveOpenNestedExpand, transformSliceNestedExpandToExpand } from '@atlaskit/editor-common/transforms';

package/dist/types/commands.d.ts

@@ -5,8 +5,18 @@ import type { EditorState } from '@atlaskit/editor-prosemirror/state';
 export declare const setExpandRef: (ref?: HTMLDivElement | null) => Command;
 export declare const deleteExpandAtPos: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (expandNodePos: number, expandNode: PMNode) => Command;
 export declare const deleteExpand: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => Command;
-export declare const updateExpandTitle: (title: string, pos: number, nodeType: NodeType) => Command;
-export declare const toggleExpandExpanded: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (pos: number, nodeType: NodeType) => Command;
+export declare const updateExpandTitle: ({ title, nodeType, pos, __livePage, }: {
+    title: string;
+    pos: number;
+    nodeType: NodeType;
+    __livePage: boolean;
+}) => Command;
+export declare const toggleExpandExpanded: ({ editorAnalyticsAPI, pos, nodeType, __livePage, }: {
+    editorAnalyticsAPI: EditorAnalyticsAPI | undefined;
+    pos: number;
+    nodeType: NodeType;
+    __livePage: boolean;
+}) => Command;
 export declare const createExpandNode: (state: EditorState) => PMNode | null;
 export declare const insertExpand: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => Command;
 export declare const focusTitle: (pos: number) => Command;

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

@@ -7,6 +7,7 @@ import type { Decoration, EditorView, NodeView } from '@atlaskit/editor-prosemir
 import type { ExpandPlugin } from '../types';
 export declare class ExpandNodeView implements NodeView {
     private selectNearNode;
+    private __livePage;
     node: PmNode;
     view: EditorView;
     dom: HTMLElement;
@@ -20,7 +21,7 @@ export declare class ExpandNodeView implements NodeView {
     allowInteractiveExpand: boolean;
     isMobile: boolean;
     api: ExtractInjectionAPI<ExpandPlugin> | undefined;
-    constructor(node: PmNode, view: EditorView, getPos: getPosHandlerNode, getIntl: () => IntlShape, isMobile: boolean, selectNearNode: SetSelectionRelativeToNode | undefined, api: ExtractInjectionAPI<ExpandPlugin> | undefined, allowInteractiveExpand?: boolean);
+    constructor(node: PmNode, view: EditorView, getPos: getPosHandlerNode, getIntl: () => IntlShape, isMobile: boolean, selectNearNode: SetSelectionRelativeToNode | undefined, api: ExtractInjectionAPI<ExpandPlugin> | undefined, allowInteractiveExpand?: boolean, __livePage?: boolean);
     private initHandlers;
     private focusTitle;
     private handleIconKeyDown;
@@ -45,9 +46,10 @@ export declare class ExpandNodeView implements NodeView {
     update(node: PmNode, _decorations: readonly Decoration[]): boolean;
     destroy(): void;
 }
-export default function ({ getIntl, isMobile, api, allowInteractiveExpand, }: {
+export default function ({ getIntl, isMobile, api, allowInteractiveExpand, __livePage, }: {
     getIntl: () => IntlShape;
     isMobile: boolean;
     api: ExtractInjectionAPI<ExpandPlugin> | undefined;
     allowInteractiveExpand: boolean;
+    __livePage: boolean;
 }): (node: PmNode, view: EditorView, getPos: getPosHandler) => NodeView;

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

@@ -1,4 +1,6 @@
 import type { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { ExpandPlugin } from '../types';
-export declare function expandKeymap(api: ExtractInjectionAPI<ExpandPlugin> | undefined): SafePlugin;
+export declare function expandKeymap(api: ExtractInjectionAPI<ExpandPlugin> | undefined, options: {
+    __livePage?: boolean;
+}): SafePlugin;

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

@@ -4,4 +4,4 @@ import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import type { EditorAppearance, ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { ExpandPlugin } from '../types';
 export declare function containsClass(element: Element | null, className: string): boolean;
-export declare const createPlugin: (dispatch: Dispatch, getIntl: () => IntlShape, appearance: EditorAppearance | undefined, useLongPressSelection: boolean | undefined, api: ExtractInjectionAPI<ExpandPlugin> | undefined, allowInteractiveExpand?: boolean) => SafePlugin<import("../types").ExpandPluginState>;
+export declare const createPlugin: (dispatch: Dispatch, getIntl: () => IntlShape, appearance: EditorAppearance | undefined, useLongPressSelection: boolean | undefined, api: ExtractInjectionAPI<ExpandPlugin> | undefined, allowInteractiveExpand?: boolean, __livePage?: boolean) => SafePlugin<import("../types").ExpandPluginState>;

package/dist/types/types.d.ts

@@ -21,6 +21,16 @@ export interface ExpandPluginOptions extends LongPressSelectionPluginOptions {
      */
     allowInteractiveExpand?: boolean;
     appearance?: EditorAppearance;
+    /**
+     * There is expected to be temporary divergence between Live Page editor expand behaviour and the standard expand behaviour.
+     *
+     * This is expected to be removed in Q4 as Editor and Live Page teams align on a singular behaviour.
+     *
+     * It is only supported for use by Confluence.
+     *
+     * @default false
+     */
+    __livePage?: boolean;
 }
 export type ExpandPlugin = NextEditorPlugin<'expand', {
     pluginConfiguration: ExpandPluginOptions | undefined;

package/dist/types/utils.d.ts

@@ -1 +1 @@
-export { findExpand, transformSliceToRemoveOpenExpand, transformSliceNestedExpandToExpand, } from '@atlaskit/editor-common/transforms';
+export { findExpand, transformSliceToRemoveOpenExpand, transformSliceToRemoveOpenNestedExpand, transformSliceNestedExpandToExpand, } from '@atlaskit/editor-common/transforms';

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

@@ -5,8 +5,18 @@ import type { EditorState } from '@atlaskit/editor-prosemirror/state';
 export declare const setExpandRef: (ref?: HTMLDivElement | null) => Command;
 export declare const deleteExpandAtPos: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (expandNodePos: number, expandNode: PMNode) => Command;
 export declare const deleteExpand: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => Command;
-export declare const updateExpandTitle: (title: string, pos: number, nodeType: NodeType) => Command;
-export declare const toggleExpandExpanded: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (pos: number, nodeType: NodeType) => Command;
+export declare const updateExpandTitle: ({ title, nodeType, pos, __livePage, }: {
+    title: string;
+    pos: number;
+    nodeType: NodeType;
+    __livePage: boolean;
+}) => Command;
+export declare const toggleExpandExpanded: ({ editorAnalyticsAPI, pos, nodeType, __livePage, }: {
+    editorAnalyticsAPI: EditorAnalyticsAPI | undefined;
+    pos: number;
+    nodeType: NodeType;
+    __livePage: boolean;
+}) => Command;
 export declare const createExpandNode: (state: EditorState) => PMNode | null;
 export declare const insertExpand: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => Command;
 export declare const focusTitle: (pos: number) => Command;

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

@@ -7,6 +7,7 @@ import type { Decoration, EditorView, NodeView } from '@atlaskit/editor-prosemir
 import type { ExpandPlugin } from '../types';
 export declare class ExpandNodeView implements NodeView {
     private selectNearNode;
+    private __livePage;
     node: PmNode;
     view: EditorView;
     dom: HTMLElement;
@@ -20,7 +21,7 @@ export declare class ExpandNodeView implements NodeView {
     allowInteractiveExpand: boolean;
     isMobile: boolean;
     api: ExtractInjectionAPI<ExpandPlugin> | undefined;
-    constructor(node: PmNode, view: EditorView, getPos: getPosHandlerNode, getIntl: () => IntlShape, isMobile: boolean, selectNearNode: SetSelectionRelativeToNode | undefined, api: ExtractInjectionAPI<ExpandPlugin> | undefined, allowInteractiveExpand?: boolean);
+    constructor(node: PmNode, view: EditorView, getPos: getPosHandlerNode, getIntl: () => IntlShape, isMobile: boolean, selectNearNode: SetSelectionRelativeToNode | undefined, api: ExtractInjectionAPI<ExpandPlugin> | undefined, allowInteractiveExpand?: boolean, __livePage?: boolean);
     private initHandlers;
     private focusTitle;
     private handleIconKeyDown;
@@ -45,9 +46,10 @@ export declare class ExpandNodeView implements NodeView {
     update(node: PmNode, _decorations: readonly Decoration[]): boolean;
     destroy(): void;
 }
-export default function ({ getIntl, isMobile, api, allowInteractiveExpand, }: {
+export default function ({ getIntl, isMobile, api, allowInteractiveExpand, __livePage, }: {
     getIntl: () => IntlShape;
     isMobile: boolean;
     api: ExtractInjectionAPI<ExpandPlugin> | undefined;
     allowInteractiveExpand: boolean;
+    __livePage: boolean;
 }): (node: PmNode, view: EditorView, getPos: getPosHandler) => NodeView;

package/dist/types-ts4.5/pm-plugins/keymap.d.ts

@@ -1,4 +1,6 @@
 import type { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { ExpandPlugin } from '../types';
-export declare function expandKeymap(api: ExtractInjectionAPI<ExpandPlugin> | undefined): SafePlugin;
+export declare function expandKeymap(api: ExtractInjectionAPI<ExpandPlugin> | undefined, options: {
+    __livePage?: boolean;
+}): SafePlugin;

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

@@ -4,4 +4,4 @@ import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import type { EditorAppearance, ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { ExpandPlugin } from '../types';
 export declare function containsClass(element: Element | null, className: string): boolean;
-export declare const createPlugin: (dispatch: Dispatch, getIntl: () => IntlShape, appearance: EditorAppearance | undefined, useLongPressSelection: boolean | undefined, api: ExtractInjectionAPI<ExpandPlugin> | undefined, allowInteractiveExpand?: boolean) => SafePlugin<import("../types").ExpandPluginState>;
+export declare const createPlugin: (dispatch: Dispatch, getIntl: () => IntlShape, appearance: EditorAppearance | undefined, useLongPressSelection: boolean | undefined, api: ExtractInjectionAPI<ExpandPlugin> | undefined, allowInteractiveExpand?: boolean, __livePage?: boolean) => SafePlugin<import("../types").ExpandPluginState>;

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

@@ -21,6 +21,16 @@ export interface ExpandPluginOptions extends LongPressSelectionPluginOptions {
      */
     allowInteractiveExpand?: boolean;
     appearance?: EditorAppearance;
+    /**
+     * There is expected to be temporary divergence between Live Page editor expand behaviour and the standard expand behaviour.
+     *
+     * This is expected to be removed in Q4 as Editor and Live Page teams align on a singular behaviour.
+     *
+     * It is only supported for use by Confluence.
+     *
+     * @default false
+     */
+    __livePage?: boolean;
 }
 export type ExpandPlugin = NextEditorPlugin<'expand', {
     pluginConfiguration: ExpandPluginOptions | undefined;

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

@@ -1 +1 @@
-export { findExpand, transformSliceToRemoveOpenExpand, transformSliceNestedExpandToExpand, } from '@atlaskit/editor-common/transforms';
+export { findExpand, transformSliceToRemoveOpenExpand, transformSliceToRemoveOpenNestedExpand, transformSliceNestedExpandToExpand, } from '@atlaskit/editor-common/transforms';