@atlaskit/editor-plugin-expand 8.3.4 → 8.3.5

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @atlaskit/editor-plugin-expand
 
+## 8.3.5
+
+### Patch Changes
+
+- [`fb11822025800`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/fb11822025800) -
+  EDITOR-4473 Fix the selection changes on mouse move after multi turn into expand
+
 ## 8.3.4
 
 ### Patch Changes

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

@@ -18,6 +18,7 @@ var _styles = require("@atlaskit/editor-common/styles");
 var _utils = require("@atlaskit/editor-common/utils");
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _state = require("@atlaskit/editor-prosemirror/state");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _prosemirrorHistory = require("@atlaskit/prosemirror-history");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _renderExpandButton = require("../../ui/renderExpandButton");
@@ -34,7 +35,9 @@ var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
     var allowInteractiveExpand = arguments.length > 8 && arguments[8] !== undefined ? arguments[8] : true;
     var __livePage = arguments.length > 9 && arguments[9] !== undefined ? arguments[9] : false;
     var cleanUpEditorDisabledOnChange = arguments.length > 10 ? arguments[10] : undefined;
-    var isExpanded = arguments.length > 11 && arguments[11] !== undefined ? arguments[11] : false;
+    var isExpanded = arguments.length > 11 && arguments[11] !== undefined ? arguments[11] : {
+      expanded: false
+    };
     (0, _classCallCheck2.default)(this, ExpandNodeView);
     (0, _defineProperty2.default)(this, "allowInteractiveExpand", true);
     (0, _defineProperty2.default)(this, "isMobile", false);
@@ -443,6 +446,11 @@ var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
     this.getPos = getPos;
     this.view = view;
     this.node = _node;
+    if ((0, _expValEquals.expValEquals)('platform_editor_block_menu', 'isEnabled', true) && (0, _platformFeatureFlags.fg)('platform_editor_block_menu_v2_patch_3')) {
+      var _expandedState$get;
+      this.isExpanded.expanded = (_expandedState$get = _expand.expandedState.get(_node)) !== null && _expandedState$get !== void 0 ? _expandedState$get : false;
+      this.isExpanded.localId = _node.attrs.localId;
+    }
     var _DOMSerializer$render = _model.DOMSerializer.renderSpec(document, (0, _NodeView.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;
@@ -545,8 +553,10 @@ var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
           }
         }
         if ((0, _expValEquals.expValEquals)('platform_editor_toggle_expand_on_match_found', 'isEnabled', true)) {
+          var _expandedState$get2;
           this.node = node;
-          var hasChanged = this.isExpanded !== _expand.expandedState.get(node);
+          var currentExpanded = (_expandedState$get2 = _expand.expandedState.get(node)) !== null && _expandedState$get2 !== void 0 ? _expandedState$get2 : false;
+          var hasChanged = (0, _expValEquals.expValEquals)('platform_editor_block_menu', 'isEnabled', true) && (0, _platformFeatureFlags.fg)('platform_editor_block_menu_v2_patch_3') ? this.isExpanded.expanded !== currentExpanded && this.isExpanded.localId === node.attrs.localId : this.isExpanded.expanded !== currentExpanded;
           if (hasChanged) {
             this.updateExpandToggleIcon(node);
             if ((0, _expValEquals.expValEquals)('platform_editor_display_none_to_expand', 'isEnabled', true)) {
@@ -579,13 +589,18 @@ var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
         if ((0, _expValEquals.expValEquals)('platform_editor_vc90_transition_fixes_batch_1', 'isEnabled', true)) {
           this.renderNativeIcon(node);
         } else {
-          var _expandedState$get;
-          this.renderIcon(this.icon ? this.icon : null, (_expandedState$get = _expand.expandedState.get(node)) !== null && _expandedState$get !== void 0 ? _expandedState$get : false);
+          var _expandedState$get3;
+          this.renderIcon(this.icon ? this.icon : null, (_expandedState$get3 = _expand.expandedState.get(node)) !== null && _expandedState$get3 !== void 0 ? _expandedState$get3 : false);
         }
       }
       this.updateExpandBodyContentEditable();
       if ((0, _expValEquals.expValEquals)('platform_editor_toggle_expand_on_match_found', 'isEnabled', true)) {
-        this.isExpanded = expanded;
+        this.isExpanded = (0, _expValEquals.expValEquals)('platform_editor_block_menu', 'isEnabled', true) && (0, _platformFeatureFlags.fg)('platform_editor_block_menu_v2_patch_3') ? {
+          expanded: expanded !== null && expanded !== void 0 ? expanded : false,
+          localId: node.attrs.localId
+        } : {
+          expanded: expanded !== null && expanded !== void 0 ? expanded : false
+        };
       }
     }
   }, {

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

@@ -9,6 +9,7 @@ import { expandClassNames } from '@atlaskit/editor-common/styles';
 import { closestElement, isEmptyNode } from '@atlaskit/editor-common/utils';
 import { DOMSerializer } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection, Selection } from '@atlaskit/editor-prosemirror/state';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { redo, undo } from '@atlaskit/prosemirror-history';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { renderExpandButton } from '../../ui/renderExpandButton';
@@ -17,7 +18,9 @@ import { ExpandButton } from '../ui/ExpandButton';
 import { buildExpandClassName, toDOM } from '../ui/NodeView';
 import { findReplaceExpandDecorations } from '../utils';
 export class ExpandNodeView {
-  constructor(_node, view, getPos, getIntl, isMobile, selectNearNode, api, nodeViewPortalProviderAPI, allowInteractiveExpand = true, __livePage = false, cleanUpEditorDisabledOnChange, isExpanded = false) {
+  constructor(_node, view, getPos, getIntl, isMobile, selectNearNode, api, nodeViewPortalProviderAPI, allowInteractiveExpand = true, __livePage = false, cleanUpEditorDisabledOnChange, isExpanded = {
+    expanded: false
+  }) {
     var _api$editorDisabled, _api$editorDisabled$s, _this$api6;
     _defineProperty(this, "allowInteractiveExpand", true);
     _defineProperty(this, "isMobile", false);
@@ -443,6 +446,11 @@ export class ExpandNodeView {
     this.getPos = getPos;
     this.view = view;
     this.node = _node;
+    if (expValEquals('platform_editor_block_menu', 'isEnabled', true) && fg('platform_editor_block_menu_v2_patch_3')) {
+      var _expandedState$get;
+      this.isExpanded.expanded = (_expandedState$get = expandedState.get(_node)) !== null && _expandedState$get !== void 0 ? _expandedState$get : false;
+      this.isExpanded.localId = _node.attrs.localId;
+    }
     const {
       dom,
       contentDOM
@@ -539,8 +547,10 @@ export class ExpandNodeView {
         }
       }
       if (expValEquals('platform_editor_toggle_expand_on_match_found', 'isEnabled', true)) {
+        var _expandedState$get2;
         this.node = node;
-        const hasChanged = this.isExpanded !== expandedState.get(node);
+        const currentExpanded = (_expandedState$get2 = expandedState.get(node)) !== null && _expandedState$get2 !== void 0 ? _expandedState$get2 : false;
+        const hasChanged = expValEquals('platform_editor_block_menu', 'isEnabled', true) && fg('platform_editor_block_menu_v2_patch_3') ? this.isExpanded.expanded !== currentExpanded && this.isExpanded.localId === node.attrs.localId : this.isExpanded.expanded !== currentExpanded;
         if (hasChanged) {
           this.updateExpandToggleIcon(node);
           if (expValEquals('platform_editor_display_none_to_expand', 'isEnabled', true)) {
@@ -569,13 +579,18 @@ export class ExpandNodeView {
       if (expValEquals('platform_editor_vc90_transition_fixes_batch_1', 'isEnabled', true)) {
         this.renderNativeIcon(node);
       } else {
-        var _expandedState$get;
-        this.renderIcon(this.icon ? this.icon : null, (_expandedState$get = expandedState.get(node)) !== null && _expandedState$get !== void 0 ? _expandedState$get : false);
+        var _expandedState$get3;
+        this.renderIcon(this.icon ? this.icon : null, (_expandedState$get3 = expandedState.get(node)) !== null && _expandedState$get3 !== void 0 ? _expandedState$get3 : false);
       }
     }
     this.updateExpandBodyContentEditable();
     if (expValEquals('platform_editor_toggle_expand_on_match_found', 'isEnabled', true)) {
-      this.isExpanded = expanded;
+      this.isExpanded = expValEquals('platform_editor_block_menu', 'isEnabled', true) && fg('platform_editor_block_menu_v2_patch_3') ? {
+        expanded: expanded !== null && expanded !== void 0 ? expanded : false,
+        localId: node.attrs.localId
+      } : {
+        expanded: expanded !== null && expanded !== void 0 ? expanded : false
+      };
     }
   }
   updateDisplayStyle(node) {

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

@@ -11,6 +11,7 @@ import { expandClassNames } from '@atlaskit/editor-common/styles';
 import { closestElement, isEmptyNode } from '@atlaskit/editor-common/utils';
 import { DOMSerializer } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection, Selection } from '@atlaskit/editor-prosemirror/state';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { redo, undo } from '@atlaskit/prosemirror-history';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { renderExpandButton } from '../../ui/renderExpandButton';
@@ -26,7 +27,9 @@ export var ExpandNodeView = /*#__PURE__*/function () {
     var allowInteractiveExpand = arguments.length > 8 && arguments[8] !== undefined ? arguments[8] : true;
     var __livePage = arguments.length > 9 && arguments[9] !== undefined ? arguments[9] : false;
     var cleanUpEditorDisabledOnChange = arguments.length > 10 ? arguments[10] : undefined;
-    var isExpanded = arguments.length > 11 && arguments[11] !== undefined ? arguments[11] : false;
+    var isExpanded = arguments.length > 11 && arguments[11] !== undefined ? arguments[11] : {
+      expanded: false
+    };
     _classCallCheck(this, ExpandNodeView);
     _defineProperty(this, "allowInteractiveExpand", true);
     _defineProperty(this, "isMobile", false);
@@ -435,6 +438,11 @@ export var ExpandNodeView = /*#__PURE__*/function () {
     this.getPos = getPos;
     this.view = view;
     this.node = _node;
+    if (expValEquals('platform_editor_block_menu', 'isEnabled', true) && fg('platform_editor_block_menu_v2_patch_3')) {
+      var _expandedState$get;
+      this.isExpanded.expanded = (_expandedState$get = expandedState.get(_node)) !== null && _expandedState$get !== void 0 ? _expandedState$get : false;
+      this.isExpanded.localId = _node.attrs.localId;
+    }
     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;
@@ -537,8 +545,10 @@ export var ExpandNodeView = /*#__PURE__*/function () {
           }
         }
         if (expValEquals('platform_editor_toggle_expand_on_match_found', 'isEnabled', true)) {
+          var _expandedState$get2;
           this.node = node;
-          var hasChanged = this.isExpanded !== expandedState.get(node);
+          var currentExpanded = (_expandedState$get2 = expandedState.get(node)) !== null && _expandedState$get2 !== void 0 ? _expandedState$get2 : false;
+          var hasChanged = expValEquals('platform_editor_block_menu', 'isEnabled', true) && fg('platform_editor_block_menu_v2_patch_3') ? this.isExpanded.expanded !== currentExpanded && this.isExpanded.localId === node.attrs.localId : this.isExpanded.expanded !== currentExpanded;
           if (hasChanged) {
             this.updateExpandToggleIcon(node);
             if (expValEquals('platform_editor_display_none_to_expand', 'isEnabled', true)) {
@@ -571,13 +581,18 @@ export var ExpandNodeView = /*#__PURE__*/function () {
         if (expValEquals('platform_editor_vc90_transition_fixes_batch_1', 'isEnabled', true)) {
           this.renderNativeIcon(node);
         } else {
-          var _expandedState$get;
-          this.renderIcon(this.icon ? this.icon : null, (_expandedState$get = expandedState.get(node)) !== null && _expandedState$get !== void 0 ? _expandedState$get : false);
+          var _expandedState$get3;
+          this.renderIcon(this.icon ? this.icon : null, (_expandedState$get3 = expandedState.get(node)) !== null && _expandedState$get3 !== void 0 ? _expandedState$get3 : false);
         }
       }
       this.updateExpandBodyContentEditable();
       if (expValEquals('platform_editor_toggle_expand_on_match_found', 'isEnabled', true)) {
-        this.isExpanded = expanded;
+        this.isExpanded = expValEquals('platform_editor_block_menu', 'isEnabled', true) && fg('platform_editor_block_menu_v2_patch_3') ? {
+          expanded: expanded !== null && expanded !== void 0 ? expanded : false,
+          localId: node.attrs.localId
+        } : {
+          expanded: expanded !== null && expanded !== void 0 ? expanded : false
+        };
       }
     }
   }, {

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

@@ -26,7 +26,10 @@ export declare class ExpandNodeView implements NodeView {
     nodeViewPortalProviderAPI: PortalProviderAPI;
     decorationCleanup?: () => boolean | undefined;
     renderKey: string;
-    constructor(node: PmNode, view: EditorView, getPos: getPosHandlerNode, getIntl: () => IntlShape, isMobile: boolean, selectNearNode: SetSelectionRelativeToNode | undefined, api: ExtractInjectionAPI<ExpandPlugin> | undefined, nodeViewPortalProviderAPI: PortalProviderAPI, allowInteractiveExpand?: boolean, __livePage?: boolean, cleanUpEditorDisabledOnChange?: (() => void) | undefined, isExpanded?: boolean | undefined);
+    constructor(node: PmNode, view: EditorView, getPos: getPosHandlerNode, getIntl: () => IntlShape, isMobile: boolean, selectNearNode: SetSelectionRelativeToNode | undefined, api: ExtractInjectionAPI<ExpandPlugin> | undefined, nodeViewPortalProviderAPI: PortalProviderAPI, allowInteractiveExpand?: boolean, __livePage?: boolean, cleanUpEditorDisabledOnChange?: (() => void) | undefined, isExpanded?: {
+        expanded: boolean;
+        localId?: string;
+    });
     private focusTitle;
     private handleIconKeyDown;
     private handleClick;

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

@@ -26,7 +26,10 @@ export declare class ExpandNodeView implements NodeView {
     nodeViewPortalProviderAPI: PortalProviderAPI;
     decorationCleanup?: () => boolean | undefined;
     renderKey: string;
-    constructor(node: PmNode, view: EditorView, getPos: getPosHandlerNode, getIntl: () => IntlShape, isMobile: boolean, selectNearNode: SetSelectionRelativeToNode | undefined, api: ExtractInjectionAPI<ExpandPlugin> | undefined, nodeViewPortalProviderAPI: PortalProviderAPI, allowInteractiveExpand?: boolean, __livePage?: boolean, cleanUpEditorDisabledOnChange?: (() => void) | undefined, isExpanded?: boolean | undefined);
+    constructor(node: PmNode, view: EditorView, getPos: getPosHandlerNode, getIntl: () => IntlShape, isMobile: boolean, selectNearNode: SetSelectionRelativeToNode | undefined, api: ExtractInjectionAPI<ExpandPlugin> | undefined, nodeViewPortalProviderAPI: PortalProviderAPI, allowInteractiveExpand?: boolean, __livePage?: boolean, cleanUpEditorDisabledOnChange?: (() => void) | undefined, isExpanded?: {
+        expanded: boolean;
+        localId?: string;
+    });
     private focusTitle;
     private handleIconKeyDown;
     private handleClick;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-expand",
-	"version": "8.3.4",
+	"version": "8.3.5",
 	"description": "Expand plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",