@atlaskit/editor-plugin-block-controls 1.5.8 → 1.5.9

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 1.5.9
+
+### Patch Changes
+
+- [#116092](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/116092)
+  [`2d7842663b057`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/2d7842663b057) -
+  ED-23905 Fix selection on click for nested lists and task lists
+
 ## 1.5.8
 
 ### Patch Changes

package/dist/cjs/utils/getSelection.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.selectNode = exports.getSelection = void 0;
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-tables/utils");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var getSelection = exports.getSelection = function getSelection(tr, start) {
   var node = tr.doc.nodeAt(start);
   var isNodeSelection = node && _state.NodeSelection.isSelectable(node);
@@ -24,19 +25,30 @@ var getSelection = exports.getSelection = function getSelection(tr, start) {
     // Find the first inline node in the node
     var inlineNodePos = start;
     var foundInlineNode = false;
+    var inlineNodeEndPos = 0;
     tr.doc.nodesBetween($startPos.pos, $startPos.pos + nodeSize, function (n, pos) {
-      if (foundInlineNode) {
-        return false;
-      }
-      if (n.isInline) {
-        inlineNodePos = pos;
-        foundInlineNode = true;
-        return false;
+      if ((0, _platformFeatureFlags.fg)('platform.editor.elements.drag-and-drop-ed-23905')) {
+        if (n.isInline) {
+          inlineNodeEndPos = pos + n.nodeSize;
+        }
+        if (n.isInline && !foundInlineNode) {
+          inlineNodePos = pos;
+          foundInlineNode = true;
+        }
+      } else {
+        if (foundInlineNode) {
+          return false;
+        }
+        if (n.isInline) {
+          inlineNodePos = pos;
+          foundInlineNode = true;
+          return false;
+        }
       }
       return true;
     });
     var inlineNodeDepth = inlineNodePos - start;
-    return new _state.TextSelection(tr.doc.resolve(start + nodeSize - inlineNodeDepth), tr.doc.resolve(inlineNodePos));
+    return new _state.TextSelection(tr.doc.resolve((0, _platformFeatureFlags.fg)('platform.editor.elements.drag-and-drop-ed-23905') ? inlineNodeEndPos : start + nodeSize - inlineNodeDepth), tr.doc.resolve(inlineNodePos));
   }
 };
 var selectNode = exports.selectNode = function selectNode(tr, start, nodeType) {

package/dist/es2019/utils/getSelection.js

@@ -1,5 +1,6 @@
 import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { selectTableClosestToPos } from '@atlaskit/editor-tables/utils';
+import { fg } from '@atlaskit/platform-feature-flags';
 export const getSelection = (tr, start) => {
   const node = tr.doc.nodeAt(start);
   const isNodeSelection = node && NodeSelection.isSelectable(node);
@@ -18,19 +19,30 @@ export const getSelection = (tr, start) => {
     // Find the first inline node in the node
     let inlineNodePos = start;
     let foundInlineNode = false;
+    let inlineNodeEndPos = 0;
     tr.doc.nodesBetween($startPos.pos, $startPos.pos + nodeSize, (n, pos) => {
-      if (foundInlineNode) {
-        return false;
-      }
-      if (n.isInline) {
-        inlineNodePos = pos;
-        foundInlineNode = true;
-        return false;
+      if (fg('platform.editor.elements.drag-and-drop-ed-23905')) {
+        if (n.isInline) {
+          inlineNodeEndPos = pos + n.nodeSize;
+        }
+        if (n.isInline && !foundInlineNode) {
+          inlineNodePos = pos;
+          foundInlineNode = true;
+        }
+      } else {
+        if (foundInlineNode) {
+          return false;
+        }
+        if (n.isInline) {
+          inlineNodePos = pos;
+          foundInlineNode = true;
+          return false;
+        }
       }
       return true;
     });
     const inlineNodeDepth = inlineNodePos - start;
-    return new TextSelection(tr.doc.resolve(start + nodeSize - inlineNodeDepth), tr.doc.resolve(inlineNodePos));
+    return new TextSelection(tr.doc.resolve(fg('platform.editor.elements.drag-and-drop-ed-23905') ? inlineNodeEndPos : start + nodeSize - inlineNodeDepth), tr.doc.resolve(inlineNodePos));
   }
 };
 export const selectNode = (tr, start, nodeType) => {

package/dist/esm/utils/getSelection.js

@@ -1,5 +1,6 @@
 import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { selectTableClosestToPos } from '@atlaskit/editor-tables/utils';
+import { fg } from '@atlaskit/platform-feature-flags';
 export var getSelection = function getSelection(tr, start) {
   var node = tr.doc.nodeAt(start);
   var isNodeSelection = node && NodeSelection.isSelectable(node);
@@ -18,19 +19,30 @@ export var getSelection = function getSelection(tr, start) {
     // Find the first inline node in the node
     var inlineNodePos = start;
     var foundInlineNode = false;
+    var inlineNodeEndPos = 0;
     tr.doc.nodesBetween($startPos.pos, $startPos.pos + nodeSize, function (n, pos) {
-      if (foundInlineNode) {
-        return false;
-      }
-      if (n.isInline) {
-        inlineNodePos = pos;
-        foundInlineNode = true;
-        return false;
+      if (fg('platform.editor.elements.drag-and-drop-ed-23905')) {
+        if (n.isInline) {
+          inlineNodeEndPos = pos + n.nodeSize;
+        }
+        if (n.isInline && !foundInlineNode) {
+          inlineNodePos = pos;
+          foundInlineNode = true;
+        }
+      } else {
+        if (foundInlineNode) {
+          return false;
+        }
+        if (n.isInline) {
+          inlineNodePos = pos;
+          foundInlineNode = true;
+          return false;
+        }
       }
       return true;
     });
     var inlineNodeDepth = inlineNodePos - start;
-    return new TextSelection(tr.doc.resolve(start + nodeSize - inlineNodeDepth), tr.doc.resolve(inlineNodePos));
+    return new TextSelection(tr.doc.resolve(fg('platform.editor.elements.drag-and-drop-ed-23905') ? inlineNodeEndPos : start + nodeSize - inlineNodeDepth), tr.doc.resolve(inlineNodePos));
   }
 };
 export var selectNode = function selectNode(tr, start, nodeType) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-controls",
-	"version": "1.5.8",
+	"version": "1.5.9",
 	"description": "Block controls plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -113,6 +113,9 @@
 		},
 		"platform.editor.elements.drag-and-drop-ed-23816": {
 			"type": "boolean"
+		},
+		"platform.editor.elements.drag-and-drop-ed-23905": {
+			"type": "boolean"
 		}
 	}
 }