@atlaskit/editor-plugin-selection 1.1.2 → 1.1.3

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/editor-plugin-selection
 
+## 1.1.3
+
+### Patch Changes
+
+- [#90897](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/90897) [`f7d77187a439`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/f7d77187a439) - [ux] [ED-22841] Adjust isCollpasedExpand function to allow for the new singlePlayerExpand plugin which replaces the standard expand when livePage and the `platform.editor.single-player-expand` feature flag is enabled.
+
 ## 1.1.2
 
 ### Patch Changes

package/dist/cjs/pm-plugins/events/keydown.js

@@ -4,21 +4,31 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createOnKeydown = createOnKeydown;
+var _expand = require("@atlaskit/editor-common/expand");
 var _state = require("@atlaskit/editor-prosemirror/state");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 /*
- * The way expand was built, no browser reconize selection on it.
+ * The way expand was built, no browser recognize selection on it.
  * For instance, when a selection going to a "collapsed" expand
  * the browser will try to send the cursor to inside the expand content (wrong),
  * this behavior is caused because the expand content is never true hidden
  * we just set the height to 1px.
  *
  * So, we need to capture a possible selection event
- * when a collapsed exxpand is the next node in the common depth.
+ * when a collapsed expand is the next node in the common depth.
  * If that is true, we create a new TextSelection and stop the event bubble
  */
-var isCollpasedExpand = function isCollpasedExpand(node, _ref) {
+var isCollapsedExpand = function isCollapsedExpand(node, _ref) {
   var __livePage = _ref.__livePage;
-  return Boolean(node && ['expand', 'nestedExpand'].includes(node.type.name) && (__livePage ? node.attrs.__expanded : !node.attrs.__expanded));
+  var currentExpandedState;
+  if (__livePage && (0, _platformFeatureFlags.getBooleanFF)('platform.editor.single-player-expand')) {
+    currentExpandedState = node ? !_expand.expandedState.get(node) : undefined;
+  } else if (__livePage) {
+    currentExpandedState = node === null || node === void 0 ? void 0 : node.attrs.__expanded;
+  } else {
+    currentExpandedState = !(node !== null && node !== void 0 && node.attrs.__expanded);
+  }
+  return Boolean(node && ['expand', 'nestedExpand'].includes(node.type.name) && currentExpandedState);
 };
 
 /**
@@ -41,7 +51,7 @@ var isTable = function isTable(node) {
 };
 var isProblematicNode = function isProblematicNode(node, _ref2) {
   var __livePage = _ref2.__livePage;
-  return isCollpasedExpand(node, {
+  return isCollapsedExpand(node, {
     __livePage: __livePage
   }) || isBodiedExtension(node) || isTable(node);
 };

package/dist/es2019/pm-plugins/events/keydown.js

@@ -1,19 +1,30 @@
+import { expandedState } from '@atlaskit/editor-common/expand';
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+
 /*
- * The way expand was built, no browser reconize selection on it.
+ * The way expand was built, no browser recognize selection on it.
  * For instance, when a selection going to a "collapsed" expand
  * the browser will try to send the cursor to inside the expand content (wrong),
  * this behavior is caused because the expand content is never true hidden
  * we just set the height to 1px.
  *
  * So, we need to capture a possible selection event
- * when a collapsed exxpand is the next node in the common depth.
+ * when a collapsed expand is the next node in the common depth.
  * If that is true, we create a new TextSelection and stop the event bubble
  */
-const isCollpasedExpand = (node, {
+const isCollapsedExpand = (node, {
   __livePage
 }) => {
-  return Boolean(node && ['expand', 'nestedExpand'].includes(node.type.name) && (__livePage ? node.attrs.__expanded : !node.attrs.__expanded));
+  let currentExpandedState;
+  if (__livePage && getBooleanFF('platform.editor.single-player-expand')) {
+    currentExpandedState = node ? !expandedState.get(node) : undefined;
+  } else if (__livePage) {
+    currentExpandedState = node === null || node === void 0 ? void 0 : node.attrs.__expanded;
+  } else {
+    currentExpandedState = !(node !== null && node !== void 0 && node.attrs.__expanded);
+  }
+  return Boolean(node && ['expand', 'nestedExpand'].includes(node.type.name) && currentExpandedState);
 };
 
 /**
@@ -37,7 +48,7 @@ const isTable = node => {
 const isProblematicNode = (node, {
   __livePage
 }) => {
-  return isCollpasedExpand(node, {
+  return isCollapsedExpand(node, {
     __livePage
   }) || isBodiedExtension(node) || isTable(node);
 };

package/dist/esm/pm-plugins/events/keydown.js

@@ -1,18 +1,29 @@
+import { expandedState } from '@atlaskit/editor-common/expand';
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+
 /*
- * The way expand was built, no browser reconize selection on it.
+ * The way expand was built, no browser recognize selection on it.
  * For instance, when a selection going to a "collapsed" expand
  * the browser will try to send the cursor to inside the expand content (wrong),
  * this behavior is caused because the expand content is never true hidden
  * we just set the height to 1px.
  *
  * So, we need to capture a possible selection event
- * when a collapsed exxpand is the next node in the common depth.
+ * when a collapsed expand is the next node in the common depth.
  * If that is true, we create a new TextSelection and stop the event bubble
  */
-var isCollpasedExpand = function isCollpasedExpand(node, _ref) {
+var isCollapsedExpand = function isCollapsedExpand(node, _ref) {
   var __livePage = _ref.__livePage;
-  return Boolean(node && ['expand', 'nestedExpand'].includes(node.type.name) && (__livePage ? node.attrs.__expanded : !node.attrs.__expanded));
+  var currentExpandedState;
+  if (__livePage && getBooleanFF('platform.editor.single-player-expand')) {
+    currentExpandedState = node ? !expandedState.get(node) : undefined;
+  } else if (__livePage) {
+    currentExpandedState = node === null || node === void 0 ? void 0 : node.attrs.__expanded;
+  } else {
+    currentExpandedState = !(node !== null && node !== void 0 && node.attrs.__expanded);
+  }
+  return Boolean(node && ['expand', 'nestedExpand'].includes(node.type.name) && currentExpandedState);
 };
 
 /**
@@ -35,7 +46,7 @@ var isTable = function isTable(node) {
 };
 var isProblematicNode = function isProblematicNode(node, _ref2) {
   var __livePage = _ref2.__livePage;
-  return isCollpasedExpand(node, {
+  return isCollapsedExpand(node, {
     __livePage: __livePage
   }) || isBodiedExtension(node) || isTable(node);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-selection",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "description": "Selection plugin for @atlaskit/editor-core",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -21,10 +21,11 @@
     "runReact18": false
   },
   "dependencies": {
-    "@atlaskit/editor-common": "^78.23.0",
+    "@atlaskit/editor-common": "^78.29.0",
     "@atlaskit/editor-prosemirror": "3.0.0",
     "@atlaskit/editor-shared-styles": "^2.9.0",
     "@atlaskit/editor-tables": "^2.6.0",
+    "@atlaskit/platform-feature-flags": "^0.2.4",
     "@babel/runtime": "^7.0.0"
   },
   "peerDependencies": {
@@ -80,6 +81,9 @@
   "platform-feature-flags": {
     "platform.editor.change-navigation-for-atom-nodes": {
       "type": "boolean"
+    },
+    "platform.editor.single-player-expand": {
+      "type": "boolean"
     }
   }
 }