@atlaskit/editor-plugin-selection 6.1.9 → 6.1.10

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @atlaskit/editor-plugin-selection
 
+## 6.1.10
+
+### Patch Changes
+
+- [`b2d4f27035ac9`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/b2d4f27035ac9) -
+  [ux] [EDITOR-3095] Follow up bug fix to cleanup platform_editor_fix_list_item_nav_bug_in_layout fg
+
 ## 6.1.9
 
 ### Patch Changes

package/dist/cjs/pm-plugins/utils.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isSelectionAtStartOfParentNode = exports.isSelectionAtEndOfParentNode = exports.isSelectionAtEndOfLayoutColumn = exports.isSelectableContainerNode = exports.isSelectableChildNode = exports.isListItemWithinContainerNotAtEnd = exports.isLayoutColumnNode = exports.isContainerNode = exports.getNodesToDecorateFromSelection = exports.getDecorations = exports.findTopLevelList = exports.findSelectableContainerParent = exports.findSelectableContainerBefore = exports.findSelectableContainerAfter = exports.findLastChildNodeToSelect = exports.findFirstChildNodeToSelect = void 0;
+exports.isSelectionAtStartOfParentNode = exports.isSelectionAtEndOfParentNode = exports.isSelectionAtEndOfLayoutColumn = exports.isSelectableContainerNode = exports.isSelectableChildNode = exports.isPanelOrExpandNode = exports.isListItemWithinContainerNotAtEnd = exports.isLayoutColumnNode = exports.isContainerNode = exports.getNodesToDecorateFromSelection = exports.getDecorations = exports.findTopLevelList = exports.findSelectableContainerParent = exports.findSelectableContainerBefore = exports.findSelectableContainerAfter = exports.findLastChildNodeToSelect = exports.findFirstChildNodeToSelect = void 0;
 exports.shouldRecalcDecorations = shouldRecalcDecorations;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _selection = require("@atlaskit/editor-common/selection");
@@ -362,6 +362,10 @@ var isSelectionAtEndOfLayoutColumn = exports.isSelectionAtEndOfLayoutColumn = fu
   if (!layoutColumnParent) {
     return false;
   }
+  var panelOrExpandParent = (0, _utils2.findParentNodeClosestToPos)($pos, isPanelOrExpandNode);
+  if (panelOrExpandParent && panelOrExpandParent.pos > layoutColumnParent.pos && (0, _platformFeatureFlags.fg)('platform_editor_fix_list_item_nav_bug_in_layout')) {
+    return false;
+  }
   var grandParentDepth = $pos.depth - 1;
   if (grandParentDepth < 0) {
     return false;
@@ -384,4 +388,11 @@ var isLayoutColumnNode = exports.isLayoutColumnNode = function isLayoutColumnNod
   var _ref4 = (node === null || node === void 0 || (_node$type2 = node.type) === null || _node$type2 === void 0 || (_node$type2 = _node$type2.schema) === null || _node$type2 === void 0 ? void 0 : _node$type2.nodes) || {},
     layoutColumn = _ref4.layoutColumn;
   return Boolean(node && node.type && node.type === layoutColumn);
+};
+var isPanelOrExpandNode = exports.isPanelOrExpandNode = function isPanelOrExpandNode(node) {
+  var _node$type3;
+  var _ref5 = (node === null || node === void 0 || (_node$type3 = node.type) === null || _node$type3 === void 0 || (_node$type3 = _node$type3.schema) === null || _node$type3 === void 0 ? void 0 : _node$type3.nodes) || {},
+    panel = _ref5.panel,
+    expand = _ref5.expand;
+  return Boolean(node && node.type && (node.type === panel || node.type === expand));
 };

package/dist/es2019/pm-plugins/utils.js

@@ -351,6 +351,10 @@ export const isSelectionAtEndOfLayoutColumn = $pos => {
   if (!layoutColumnParent) {
     return false;
   }
+  const panelOrExpandParent = findParentNodeClosestToPos($pos, isPanelOrExpandNode);
+  if (panelOrExpandParent && panelOrExpandParent.pos > layoutColumnParent.pos && fg('platform_editor_fix_list_item_nav_bug_in_layout')) {
+    return false;
+  }
   const grandParentDepth = $pos.depth - 1;
   if (grandParentDepth < 0) {
     return false;
@@ -376,4 +380,12 @@ export const isLayoutColumnNode = node => {
     layoutColumn
   } = (node === null || node === void 0 ? void 0 : (_node$type2 = node.type) === null || _node$type2 === void 0 ? void 0 : (_node$type2$schema = _node$type2.schema) === null || _node$type2$schema === void 0 ? void 0 : _node$type2$schema.nodes) || {};
   return Boolean(node && node.type && node.type === layoutColumn);
+};
+export const isPanelOrExpandNode = node => {
+  var _node$type3, _node$type3$schema;
+  const {
+    panel,
+    expand
+  } = (node === null || node === void 0 ? void 0 : (_node$type3 = node.type) === null || _node$type3 === void 0 ? void 0 : (_node$type3$schema = _node$type3.schema) === null || _node$type3$schema === void 0 ? void 0 : _node$type3$schema.nodes) || {};
+  return Boolean(node && node.type && (node.type === panel || node.type === expand));
 };

package/dist/esm/pm-plugins/utils.js

@@ -354,6 +354,10 @@ export var isSelectionAtEndOfLayoutColumn = function isSelectionAtEndOfLayoutCol
   if (!layoutColumnParent) {
     return false;
   }
+  var panelOrExpandParent = findParentNodeClosestToPos($pos, isPanelOrExpandNode);
+  if (panelOrExpandParent && panelOrExpandParent.pos > layoutColumnParent.pos && fg('platform_editor_fix_list_item_nav_bug_in_layout')) {
+    return false;
+  }
   var grandParentDepth = $pos.depth - 1;
   if (grandParentDepth < 0) {
     return false;
@@ -376,4 +380,11 @@ export var isLayoutColumnNode = function isLayoutColumnNode(node) {
   var _ref4 = (node === null || node === void 0 || (_node$type2 = node.type) === null || _node$type2 === void 0 || (_node$type2 = _node$type2.schema) === null || _node$type2 === void 0 ? void 0 : _node$type2.nodes) || {},
     layoutColumn = _ref4.layoutColumn;
   return Boolean(node && node.type && node.type === layoutColumn);
+};
+export var isPanelOrExpandNode = function isPanelOrExpandNode(node) {
+  var _node$type3;
+  var _ref5 = (node === null || node === void 0 || (_node$type3 = node.type) === null || _node$type3 === void 0 || (_node$type3 = _node$type3.schema) === null || _node$type3 === void 0 ? void 0 : _node$type3.nodes) || {},
+    panel = _ref5.panel,
+    expand = _ref5.expand;
+  return Boolean(node && node.type && (node.type === panel || node.type === expand));
 };

package/dist/types/pm-plugins/utils.d.ts

@@ -84,3 +84,4 @@ export declare const isSelectionAtEndOfLayoutColumn: ($pos: ResolvedPos) => bool
  * Determines if the given node is a LayoutColumn node.
  */
 export declare const isLayoutColumnNode: (node: PmNode | null | undefined) => boolean;
+export declare const isPanelOrExpandNode: (node: PmNode | null | undefined) => boolean;

package/dist/types-ts4.5/pm-plugins/utils.d.ts

@@ -84,3 +84,4 @@ export declare const isSelectionAtEndOfLayoutColumn: ($pos: ResolvedPos) => bool
  * Determines if the given node is a LayoutColumn node.
  */
 export declare const isLayoutColumnNode: (node: PmNode | null | undefined) => boolean;
+export declare const isPanelOrExpandNode: (node: PmNode | null | undefined) => boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-selection",
-	"version": "6.1.9",
+	"version": "6.1.10",
 	"description": "Selection plugin for @atlaskit/editor-core",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -30,7 +30,7 @@
 		"@babel/runtime": "^7.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^110.38.0",
+		"@atlaskit/editor-common": "^110.39.0",
 		"react": "^18.2.0"
 	},
 	"techstack": {