@atlaskit/editor-plugin-expand 1.6.8 → 1.6.9

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @atlaskit/editor-plugin-expand
 
+## 1.6.9
+
+### Patch Changes
+
+-   [#97592](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/97592)
+    [`97342ab324ba`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/97342ab324ba) -
+    [ux] [ED-23114] Add functionality for undo and redo behaviour using ProseMirror while inside the
+    title of an expand. Previously, this was being handled by the browser default behaviour.
+
 ## 1.6.8
 
 ### Patch Changes

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

@@ -16,6 +16,7 @@ var _selection = require("@atlaskit/editor-common/selection");
 var _styles = require("@atlaskit/editor-common/styles");
 var _ui = require("@atlaskit/editor-common/ui");
 var _utils = require("@atlaskit/editor-common/utils");
+var _history = require("@atlaskit/editor-prosemirror/history");
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
@@ -187,6 +188,16 @@ var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
           _this.deleteExpand(event);
           break;
       }
+      // 'Ctrl-y', 'Mod-Shift-z');
+      if (event.ctrlKey && event.key === 'y' || (event.ctrlKey || event.metaKey) && event.shiftKey && event.key === 'z') {
+        _this.handleRedoFromTitle(event);
+        return;
+      }
+      // 'Mod-z'
+      if ((event.ctrlKey || event.metaKey) && event.key === 'z') {
+        _this.handleUndoFromTitle(event);
+        return;
+      }
     });
     (0, _defineProperty2.default)(this, "deleteExpand", function (event) {
       if (!_this.input) {
@@ -369,6 +380,22 @@ var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
         }
       }
     });
+    (0, _defineProperty2.default)(this, "handleUndoFromTitle", function (event) {
+      var _this$view10 = _this.view,
+        state = _this$view10.state,
+        dispatch = _this$view10.dispatch;
+      (0, _history.undo)(state, dispatch);
+      event.preventDefault();
+      return;
+    });
+    (0, _defineProperty2.default)(this, "handleRedoFromTitle", function (event) {
+      var _this$view11 = _this.view,
+        state = _this$view11.state,
+        dispatch = _this$view11.dispatch;
+      (0, _history.redo)(state, dispatch);
+      event.preventDefault();
+      return;
+    });
     (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) {

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

@@ -15,6 +15,7 @@ var _expand = require("@atlaskit/editor-common/expand");
 var _selection = require("@atlaskit/editor-common/selection");
 var _styles = require("@atlaskit/editor-common/styles");
 var _utils = require("@atlaskit/editor-common/utils");
+var _history = require("@atlaskit/editor-prosemirror/history");
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
@@ -146,6 +147,16 @@ var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
           _this.deleteEmptyExpand();
           break;
       }
+      // 'Ctrl-y', 'Mod-Shift-z');
+      if (event.ctrlKey && event.key === 'y' || (event.ctrlKey || event.metaKey) && event.shiftKey && event.key === 'z') {
+        _this.handleRedoFromTitle(event);
+        return;
+      }
+      // 'Mod-z'
+      if ((event.ctrlKey || event.metaKey) && event.key === 'z') {
+        _this.handleUndoFromTitle(event);
+        return;
+      }
     });
     (0, _defineProperty2.default)(this, "deleteEmptyExpand", function () {
       var state = _this.view.state;
@@ -325,6 +336,22 @@ var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
         }
       }
     });
+    (0, _defineProperty2.default)(this, "handleUndoFromTitle", function (event) {
+      var _this$view9 = _this.view,
+        state = _this$view9.state,
+        dispatch = _this$view9.dispatch;
+      (0, _history.undo)(state, dispatch);
+      event.preventDefault();
+      return;
+    });
+    (0, _defineProperty2.default)(this, "handleRedoFromTitle", function (event) {
+      var _this$view10 = _this.view,
+        state = _this$view10.state,
+        dispatch = _this$view10.dispatch;
+      (0, _history.redo)(state, dispatch);
+      event.preventDefault();
+      return;
+    });
     (0, _defineProperty2.default)(this, "getContentEditable", function (node) {
       var contentEditable = !(0, _expand.isExpandCollapsed)(node);
       if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.live-view.disable-editing-in-view-mode_fi1rx') && _this.api && _this.api.editorDisabled) {

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

@@ -6,6 +6,7 @@ import { GapCursorSelection, RelativeSelectionPos, Side } from '@atlaskit/editor
 import { expandClassNames } from '@atlaskit/editor-common/styles';
 import { expandMessages } from '@atlaskit/editor-common/ui';
 import { closestElement, isEmptyNode } from '@atlaskit/editor-common/utils';
+import { redo, undo } from '@atlaskit/editor-prosemirror/history';
 import { DOMSerializer } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection, Selection } from '@atlaskit/editor-prosemirror/state';
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';
@@ -173,6 +174,16 @@ export class ExpandNodeView {
           this.deleteExpand(event);
           break;
       }
+      // 'Ctrl-y', 'Mod-Shift-z');
+      if (event.ctrlKey && event.key === 'y' || (event.ctrlKey || event.metaKey) && event.shiftKey && event.key === 'z') {
+        this.handleRedoFromTitle(event);
+        return;
+      }
+      // 'Mod-z'
+      if ((event.ctrlKey || event.metaKey) && event.key === 'z') {
+        this.handleUndoFromTitle(event);
+        return;
+      }
     });
     _defineProperty(this, "deleteExpand", event => {
       if (!this.input) {
@@ -368,6 +379,24 @@ export class ExpandNodeView {
         }
       }
     });
+    _defineProperty(this, "handleUndoFromTitle", event => {
+      const {
+        state,
+        dispatch
+      } = this.view;
+      undo(state, dispatch);
+      event.preventDefault();
+      return;
+    });
+    _defineProperty(this, "handleRedoFromTitle", event => {
+      const {
+        state,
+        dispatch
+      } = this.view;
+      redo(state, dispatch);
+      event.preventDefault();
+      return;
+    });
     _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) {

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

@@ -5,6 +5,7 @@ import { expandedState, isExpandCollapsed } from '@atlaskit/editor-common/expand
 import { GapCursorSelection, RelativeSelectionPos, Side } from '@atlaskit/editor-common/selection';
 import { expandClassNames } from '@atlaskit/editor-common/styles';
 import { closestElement, isEmptyNode } from '@atlaskit/editor-common/utils';
+import { redo, undo } from '@atlaskit/editor-prosemirror/history';
 import { DOMSerializer } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection, Selection } from '@atlaskit/editor-prosemirror/state';
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';
@@ -132,6 +133,16 @@ export class ExpandNodeView {
           this.deleteEmptyExpand();
           break;
       }
+      // 'Ctrl-y', 'Mod-Shift-z');
+      if (event.ctrlKey && event.key === 'y' || (event.ctrlKey || event.metaKey) && event.shiftKey && event.key === 'z') {
+        this.handleRedoFromTitle(event);
+        return;
+      }
+      // 'Mod-z'
+      if ((event.ctrlKey || event.metaKey) && event.key === 'z') {
+        this.handleUndoFromTitle(event);
+        return;
+      }
     });
     _defineProperty(this, "deleteEmptyExpand", () => {
       const {
@@ -324,6 +335,24 @@ export class ExpandNodeView {
         }
       }
     });
+    _defineProperty(this, "handleUndoFromTitle", event => {
+      const {
+        state,
+        dispatch
+      } = this.view;
+      undo(state, dispatch);
+      event.preventDefault();
+      return;
+    });
+    _defineProperty(this, "handleRedoFromTitle", event => {
+      const {
+        state,
+        dispatch
+      } = this.view;
+      redo(state, dispatch);
+      event.preventDefault();
+      return;
+    });
     _defineProperty(this, "getContentEditable", node => {
       const contentEditable = !isExpandCollapsed(node);
       if (getBooleanFF('platform.editor.live-view.disable-editing-in-view-mode_fi1rx') && this.api && this.api.editorDisabled) {

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

@@ -8,6 +8,7 @@ import { GapCursorSelection, RelativeSelectionPos, Side } from '@atlaskit/editor
 import { expandClassNames } from '@atlaskit/editor-common/styles';
 import { expandMessages } from '@atlaskit/editor-common/ui';
 import { closestElement, isEmptyNode } from '@atlaskit/editor-common/utils';
+import { redo, undo } from '@atlaskit/editor-prosemirror/history';
 import { DOMSerializer } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection, Selection } from '@atlaskit/editor-prosemirror/state';
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';
@@ -179,6 +180,16 @@ export var ExpandNodeView = /*#__PURE__*/function () {
           _this.deleteExpand(event);
           break;
       }
+      // 'Ctrl-y', 'Mod-Shift-z');
+      if (event.ctrlKey && event.key === 'y' || (event.ctrlKey || event.metaKey) && event.shiftKey && event.key === 'z') {
+        _this.handleRedoFromTitle(event);
+        return;
+      }
+      // 'Mod-z'
+      if ((event.ctrlKey || event.metaKey) && event.key === 'z') {
+        _this.handleUndoFromTitle(event);
+        return;
+      }
     });
     _defineProperty(this, "deleteExpand", function (event) {
       if (!_this.input) {
@@ -361,6 +372,22 @@ export var ExpandNodeView = /*#__PURE__*/function () {
         }
       }
     });
+    _defineProperty(this, "handleUndoFromTitle", function (event) {
+      var _this$view10 = _this.view,
+        state = _this$view10.state,
+        dispatch = _this$view10.dispatch;
+      undo(state, dispatch);
+      event.preventDefault();
+      return;
+    });
+    _defineProperty(this, "handleRedoFromTitle", function (event) {
+      var _this$view11 = _this.view,
+        state = _this$view11.state,
+        dispatch = _this$view11.dispatch;
+      redo(state, dispatch);
+      event.preventDefault();
+      return;
+    });
     _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) {

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

@@ -7,6 +7,7 @@ import { expandedState, isExpandCollapsed } from '@atlaskit/editor-common/expand
 import { GapCursorSelection, RelativeSelectionPos, Side } from '@atlaskit/editor-common/selection';
 import { expandClassNames } from '@atlaskit/editor-common/styles';
 import { closestElement, isEmptyNode } from '@atlaskit/editor-common/utils';
+import { redo, undo } from '@atlaskit/editor-prosemirror/history';
 import { DOMSerializer } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection, Selection } from '@atlaskit/editor-prosemirror/state';
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';
@@ -138,6 +139,16 @@ export var ExpandNodeView = /*#__PURE__*/function () {
           _this.deleteEmptyExpand();
           break;
       }
+      // 'Ctrl-y', 'Mod-Shift-z');
+      if (event.ctrlKey && event.key === 'y' || (event.ctrlKey || event.metaKey) && event.shiftKey && event.key === 'z') {
+        _this.handleRedoFromTitle(event);
+        return;
+      }
+      // 'Mod-z'
+      if ((event.ctrlKey || event.metaKey) && event.key === 'z') {
+        _this.handleUndoFromTitle(event);
+        return;
+      }
     });
     _defineProperty(this, "deleteEmptyExpand", function () {
       var state = _this.view.state;
@@ -317,6 +328,22 @@ export var ExpandNodeView = /*#__PURE__*/function () {
         }
       }
     });
+    _defineProperty(this, "handleUndoFromTitle", function (event) {
+      var _this$view9 = _this.view,
+        state = _this$view9.state,
+        dispatch = _this$view9.dispatch;
+      undo(state, dispatch);
+      event.preventDefault();
+      return;
+    });
+    _defineProperty(this, "handleRedoFromTitle", function (event) {
+      var _this$view10 = _this.view,
+        state = _this$view10.state,
+        dispatch = _this$view10.dispatch;
+      redo(state, dispatch);
+      event.preventDefault();
+      return;
+    });
     _defineProperty(this, "getContentEditable", function (node) {
       var contentEditable = !isExpandCollapsed(node);
       if (getBooleanFF('platform.editor.live-view.disable-editing-in-view-mode_fi1rx') && _this.api && _this.api.editorDisabled) {

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

@@ -41,6 +41,8 @@ export declare class ExpandNodeView implements NodeView {
     private setLeftGapCursor;
     private handleArrowRightFromTitle;
     private handleArrowLeftFromTitle;
+    private handleUndoFromTitle;
+    private handleRedoFromTitle;
     private getContentEditable;
     stopEvent(event: Event): boolean;
     ignoreMutation(mutationRecord: MutationRecord | {

package/dist/types/singlePlayerExpand/node-views/index.d.ts

@@ -39,6 +39,8 @@ export declare class ExpandNodeView implements NodeView {
     private setLeftGapCursor;
     private handleArrowRightFromTitle;
     private handleArrowLeftFromTitle;
+    private handleUndoFromTitle;
+    private handleRedoFromTitle;
     private getContentEditable;
     stopEvent(event: Event): boolean;
     ignoreMutation(mutationRecord: MutationRecord | {

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

@@ -41,6 +41,8 @@ export declare class ExpandNodeView implements NodeView {
     private setLeftGapCursor;
     private handleArrowRightFromTitle;
     private handleArrowLeftFromTitle;
+    private handleUndoFromTitle;
+    private handleRedoFromTitle;
     private getContentEditable;
     stopEvent(event: Event): boolean;
     ignoreMutation(mutationRecord: MutationRecord | {

package/dist/types-ts4.5/singlePlayerExpand/node-views/index.d.ts

@@ -39,6 +39,8 @@ export declare class ExpandNodeView implements NodeView {
     private setLeftGapCursor;
     private handleArrowRightFromTitle;
     private handleArrowLeftFromTitle;
+    private handleUndoFromTitle;
+    private handleRedoFromTitle;
     private getContentEditable;
     stopEvent(event: Event): boolean;
     ignoreMutation(mutationRecord: MutationRecord | {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-expand",
-  "version": "1.6.8",
+  "version": "1.6.9",
   "description": "Expand plugin for @atlaskit/editor-core",
   "author": "Atlassian Pty Ltd",
   "license": "Apache-2.0",
@@ -35,7 +35,7 @@
   "dependencies": {
     "@atlaskit/adf-schema": "^35.12.2",
     "@atlaskit/button": "^17.14.0",
-    "@atlaskit/editor-common": "^79.1.0",
+    "@atlaskit/editor-common": "^79.2.0",
     "@atlaskit/editor-plugin-analytics": "^1.1.0",
     "@atlaskit/editor-plugin-decorations": "^1.1.0",
     "@atlaskit/editor-plugin-editor-disabled": "^1.1.0",