@atlaskit/editor-plugin-expand 1.3.2 → 1.3.4

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @atlaskit/editor-plugin-expand
 
+## 1.3.4
+
+### Patch Changes
+
+- [#91146](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/91146) [`c982f92adfee`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/c982f92adfee) - [ux] Revert changes from ED-22666 as expand is not editable when not selected initially
+- Updated dependencies
+
+## 1.3.3
+
+### Patch Changes
+
+- [#90914](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/90914) [`a4a9d317e5b8`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/a4a9d317e5b8) - [ux] [ED-23013] Fix bug in single player expand where backspace in the title would delete entire expand even if the title had content.
+
 ## 1.3.2
 
 ### Patch 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, editable) {
+var toDOM = function toDOM(node, __livePage, intl) {
   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,13 +50,11 @@ var toDOM = function toDOM(node, __livePage, intl, editable) {
     'class': _styles.expandClassNames.titleInput,
     value: node.attrs.title,
     placeholder: intl && intl.formatMessage(_ui.expandMessages.expandPlaceholderText) || _ui.expandMessages.expandPlaceholderText.defaultMessage,
-    type: 'text',
-    readonly: !editable ? 'true' : undefined
+    type: 'text'
   }]]],
   // prettier-ignore
   ['div', {
-    'class': _styles.expandClassNames.content,
-    contenteditable: editable
+    'class': _styles.expandClassNames.content
   }, 0]];
 };
 var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
@@ -363,7 +361,7 @@ var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
     this.selectNearNode = selectNearNode;
     this.__livePage = __livePage;
     this.intl = getIntl();
-    var _DOMSerializer$render = _model.DOMSerializer.renderSpec(document, toDOM(node, this.__livePage, this.intl, view.editable)),
+    var _DOMSerializer$render = _model.DOMSerializer.renderSpec(document, toDOM(node, this.__livePage, this.intl)),
       dom = _DOMSerializer$render.dom,
       contentDOM = _DOMSerializer$render.contentDOM;
     this.allowInteractiveExpand = allowInteractiveExpand;
@@ -452,18 +450,7 @@ var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
           }
           if (this.content) {
             // Disallow interaction/selection inside when collapsed.
-            this.content.setAttribute('contenteditable', this.view.editable && ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.live-pages-expand-divergence') && this.__livePage ? !node.attrs.__expanded : node.attrs.__expanded));
-          }
-        } else {
-          if (this.content) {
-            this.content.setAttribute('contenteditable', this.view.editable ? 'true' : 'false');
-          }
-        }
-        if (this.input) {
-          if (!this.view.editable) {
-            this.input.setAttribute('readonly', 'true');
-          } else {
-            this.input.removeAttribute('readonly');
+            this.content.setAttribute('contenteditable', (0, _platformFeatureFlags.getBooleanFF)('platform.editor.live-pages-expand-divergence') && this.__livePage ? !node.attrs.__expanded : node.attrs.__expanded);
           }
         }
 

package/dist/cjs/singlePlayerExpand/node-views/index.js

@@ -134,6 +134,15 @@ var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
     (0, _defineProperty2.default)(this, "deleteEmptyExpand", function () {
       var state = _this.view.state;
       var expandNode = _this.node;
+      if (!_this.input) {
+        return;
+      }
+      var _this$input = _this.input,
+        selectionStart = _this$input.selectionStart,
+        selectionEnd = _this$input.selectionEnd;
+      if (selectionStart !== selectionEnd || selectionStart !== 0) {
+        return;
+      }
       if (expandNode && (0, _utils.isEmptyNode)(state.schema)(expandNode)) {
         var _this$api;
         (0, _commands.deleteExpand)((_this$api = _this.api) === null || _this$api === void 0 || (_this$api = _this$api.analytics) === null || _this$api === void 0 ? void 0 : _this$api.actions)(state, _this.view.dispatch);
@@ -179,10 +188,10 @@ var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
       if (typeof pos !== 'number') {
         return;
       }
-      var _this$input = _this.input,
-        value = _this$input.value,
-        selectionStart = _this$input.selectionStart,
-        selectionEnd = _this$input.selectionEnd;
+      var _this$input2 = _this.input,
+        value = _this$input2.value,
+        selectionStart = _this$input2.selectionStart,
+        selectionEnd = _this$input2.selectionEnd;
       if (selectionStart === selectionEnd && selectionStart === value.length) {
         var _this$view4 = _this.view,
           state = _this$view4.state,
@@ -200,9 +209,9 @@ var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
       if (typeof pos !== 'number') {
         return;
       }
-      var _this$input2 = _this.input,
-        selectionStart = _this$input2.selectionStart,
-        selectionEnd = _this$input2.selectionEnd;
+      var _this$input3 = _this.input,
+        selectionStart = _this$input3.selectionStart,
+        selectionEnd = _this$input3.selectionEnd;
       if (selectionStart === selectionEnd && selectionStart === 0) {
         event.preventDefault();
         var _this$view5 = _this.view,
@@ -220,10 +229,10 @@ var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
       if (typeof pos !== 'number') {
         return;
       }
-      var _this$input3 = _this.input,
-        value = _this$input3.value,
-        selectionStart = _this$input3.selectionStart,
-        selectionEnd = _this$input3.selectionEnd;
+      var _this$input4 = _this.input,
+        value = _this$input4.value,
+        selectionStart = _this$input4.selectionStart,
+        selectionEnd = _this$input4.selectionEnd;
       if (selectionStart === selectionEnd && selectionStart === value.length) {
         event.preventDefault();
         var _this$view6 = _this.view,
@@ -247,9 +256,9 @@ var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
       if (typeof pos !== 'number') {
         return;
       }
-      var _this$input4 = _this.input,
-        selectionStart = _this$input4.selectionStart,
-        selectionEnd = _this$input4.selectionEnd;
+      var _this$input5 = _this.input,
+        selectionStart = _this$input5.selectionStart,
+        selectionEnd = _this$input5.selectionEnd;
       if (selectionStart === selectionEnd && selectionStart === 0) {
         var _this$api2;
         event.preventDefault();

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, editable) => ['div', {
+const toDOM = (node, __livePage, intl) => ['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,13 +39,11 @@ const toDOM = (node, __livePage, intl, editable) => ['div', {
   'class': expandClassNames.titleInput,
   value: node.attrs.title,
   placeholder: intl && intl.formatMessage(expandMessages.expandPlaceholderText) || expandMessages.expandPlaceholderText.defaultMessage,
-  type: 'text',
-  readonly: !editable ? 'true' : undefined
+  type: 'text'
 }]]],
 // prettier-ignore
 ['div', {
-  'class': expandClassNames.content,
-  contenteditable: editable
+  'class': expandClassNames.content
 }, 0]];
 export class ExpandNodeView {
   constructor(node, view, getPos, getIntl, isMobile, selectNearNode, api, allowInteractiveExpand = true, __livePage = false) {
@@ -366,7 +364,7 @@ export class ExpandNodeView {
     const {
       dom,
       contentDOM
-    } = DOMSerializer.renderSpec(document, toDOM(node, this.__livePage, this.intl, view.editable));
+    } = DOMSerializer.renderSpec(document, toDOM(node, this.__livePage, this.intl));
     this.allowInteractiveExpand = allowInteractiveExpand;
     this.getPos = getPos;
     this.view = view;
@@ -443,18 +441,7 @@ export class ExpandNodeView {
         }
         if (this.content) {
           // Disallow interaction/selection inside when collapsed.
-          this.content.setAttribute('contenteditable', this.view.editable && (getBooleanFF('platform.editor.live-pages-expand-divergence') && this.__livePage ? !node.attrs.__expanded : node.attrs.__expanded));
-        }
-      } else {
-        if (this.content) {
-          this.content.setAttribute('contenteditable', this.view.editable ? 'true' : 'false');
-        }
-      }
-      if (this.input) {
-        if (!this.view.editable) {
-          this.input.setAttribute('readonly', 'true');
-        } else {
-          this.input.removeAttribute('readonly');
+          this.content.setAttribute('contenteditable', getBooleanFF('platform.editor.live-pages-expand-divergence') && this.__livePage ? !node.attrs.__expanded : node.attrs.__expanded);
         }
       }
 

package/dist/es2019/singlePlayerExpand/node-views/index.js

@@ -124,6 +124,16 @@ export class ExpandNodeView {
         state
       } = this.view;
       const expandNode = this.node;
+      if (!this.input) {
+        return;
+      }
+      const {
+        selectionStart,
+        selectionEnd
+      } = this.input;
+      if (selectionStart !== selectionEnd || selectionStart !== 0) {
+        return;
+      }
       if (expandNode && isEmptyNode(state.schema)(expandNode)) {
         var _this$api, _this$api$analytics;
         deleteExpand((_this$api = this.api) === null || _this$api === void 0 ? void 0 : (_this$api$analytics = _this$api.analytics) === null || _this$api$analytics === void 0 ? void 0 : _this$api$analytics.actions)(state, this.view.dispatch);

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, editable) {
+var toDOM = function toDOM(node, __livePage, intl) {
   return ['div', {
     // prettier-ignore
     'class': buildExpandClassName(node.type.name, getBooleanFF('platform.editor.live-pages-expand-divergence') && __livePage ? !node.attrs.__expanded : node.attrs.__expanded),
@@ -42,13 +42,11 @@ var toDOM = function toDOM(node, __livePage, intl, editable) {
     'class': expandClassNames.titleInput,
     value: node.attrs.title,
     placeholder: intl && intl.formatMessage(expandMessages.expandPlaceholderText) || expandMessages.expandPlaceholderText.defaultMessage,
-    type: 'text',
-    readonly: !editable ? 'true' : undefined
+    type: 'text'
   }]]],
   // prettier-ignore
   ['div', {
-    'class': expandClassNames.content,
-    contenteditable: editable
+    'class': expandClassNames.content
   }, 0]];
 };
 export var ExpandNodeView = /*#__PURE__*/function () {
@@ -355,7 +353,7 @@ export var ExpandNodeView = /*#__PURE__*/function () {
     this.selectNearNode = selectNearNode;
     this.__livePage = __livePage;
     this.intl = getIntl();
-    var _DOMSerializer$render = DOMSerializer.renderSpec(document, toDOM(node, this.__livePage, this.intl, view.editable)),
+    var _DOMSerializer$render = DOMSerializer.renderSpec(document, toDOM(node, this.__livePage, this.intl)),
       dom = _DOMSerializer$render.dom,
       contentDOM = _DOMSerializer$render.contentDOM;
     this.allowInteractiveExpand = allowInteractiveExpand;
@@ -444,18 +442,7 @@ export var ExpandNodeView = /*#__PURE__*/function () {
           }
           if (this.content) {
             // Disallow interaction/selection inside when collapsed.
-            this.content.setAttribute('contenteditable', this.view.editable && (getBooleanFF('platform.editor.live-pages-expand-divergence') && this.__livePage ? !node.attrs.__expanded : node.attrs.__expanded));
-          }
-        } else {
-          if (this.content) {
-            this.content.setAttribute('contenteditable', this.view.editable ? 'true' : 'false');
-          }
-        }
-        if (this.input) {
-          if (!this.view.editable) {
-            this.input.setAttribute('readonly', 'true');
-          } else {
-            this.input.removeAttribute('readonly');
+            this.content.setAttribute('contenteditable', getBooleanFF('platform.editor.live-pages-expand-divergence') && this.__livePage ? !node.attrs.__expanded : node.attrs.__expanded);
           }
         }
 

package/dist/esm/singlePlayerExpand/node-views/index.js

@@ -126,6 +126,15 @@ export var ExpandNodeView = /*#__PURE__*/function () {
     _defineProperty(this, "deleteEmptyExpand", function () {
       var state = _this.view.state;
       var expandNode = _this.node;
+      if (!_this.input) {
+        return;
+      }
+      var _this$input = _this.input,
+        selectionStart = _this$input.selectionStart,
+        selectionEnd = _this$input.selectionEnd;
+      if (selectionStart !== selectionEnd || selectionStart !== 0) {
+        return;
+      }
       if (expandNode && isEmptyNode(state.schema)(expandNode)) {
         var _this$api;
         deleteExpand((_this$api = _this.api) === null || _this$api === void 0 || (_this$api = _this$api.analytics) === null || _this$api === void 0 ? void 0 : _this$api.actions)(state, _this.view.dispatch);
@@ -171,10 +180,10 @@ export var ExpandNodeView = /*#__PURE__*/function () {
       if (typeof pos !== 'number') {
         return;
       }
-      var _this$input = _this.input,
-        value = _this$input.value,
-        selectionStart = _this$input.selectionStart,
-        selectionEnd = _this$input.selectionEnd;
+      var _this$input2 = _this.input,
+        value = _this$input2.value,
+        selectionStart = _this$input2.selectionStart,
+        selectionEnd = _this$input2.selectionEnd;
       if (selectionStart === selectionEnd && selectionStart === value.length) {
         var _this$view4 = _this.view,
           state = _this$view4.state,
@@ -192,9 +201,9 @@ export var ExpandNodeView = /*#__PURE__*/function () {
       if (typeof pos !== 'number') {
         return;
       }
-      var _this$input2 = _this.input,
-        selectionStart = _this$input2.selectionStart,
-        selectionEnd = _this$input2.selectionEnd;
+      var _this$input3 = _this.input,
+        selectionStart = _this$input3.selectionStart,
+        selectionEnd = _this$input3.selectionEnd;
       if (selectionStart === selectionEnd && selectionStart === 0) {
         event.preventDefault();
         var _this$view5 = _this.view,
@@ -212,10 +221,10 @@ export var ExpandNodeView = /*#__PURE__*/function () {
       if (typeof pos !== 'number') {
         return;
       }
-      var _this$input3 = _this.input,
-        value = _this$input3.value,
-        selectionStart = _this$input3.selectionStart,
-        selectionEnd = _this$input3.selectionEnd;
+      var _this$input4 = _this.input,
+        value = _this$input4.value,
+        selectionStart = _this$input4.selectionStart,
+        selectionEnd = _this$input4.selectionEnd;
       if (selectionStart === selectionEnd && selectionStart === value.length) {
         event.preventDefault();
         var _this$view6 = _this.view,
@@ -239,9 +248,9 @@ export var ExpandNodeView = /*#__PURE__*/function () {
       if (typeof pos !== 'number') {
         return;
       }
-      var _this$input4 = _this.input,
-        selectionStart = _this$input4.selectionStart,
-        selectionEnd = _this$input4.selectionEnd;
+      var _this$input5 = _this.input,
+        selectionStart = _this$input5.selectionStart,
+        selectionEnd = _this$input5.selectionEnd;
       if (selectionStart === selectionEnd && selectionStart === 0) {
         var _this$api2;
         event.preventDefault();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-expand",
-  "version": "1.3.2",
+  "version": "1.3.4",
   "description": "Expand plugin for @atlaskit/editor-core",
   "author": "Atlassian Pty Ltd",
   "license": "Apache-2.0",
@@ -35,7 +35,7 @@
   "dependencies": {
     "@atlaskit/adf-schema": "^35.8.0",
     "@atlaskit/button": "^17.12.0",
-    "@atlaskit/editor-common": "^78.26.0",
+    "@atlaskit/editor-common": "^78.27.0",
     "@atlaskit/editor-plugin-analytics": "^1.0.0",
     "@atlaskit/editor-plugin-decorations": "^1.0.0",
     "@atlaskit/editor-plugin-selection": "^1.1.0",