@atlaskit/editor-plugin-selection 3.0.2 → 3.0.3

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @atlaskit/editor-plugin-selection
 
+## 3.0.3
+
+### Patch Changes
+
+- [#184963](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/184963)
+  [`f6b81506eb05b`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/f6b81506eb05b) -
+  [ux][ED-25230] Bug fix: inability to navigate between layout columns using arrow keys
+- Updated dependencies
+
 ## 3.0.2
 
 ### Patch Changes

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isSelectionAtStartOfParentNode = exports.isSelectionAtEndOfParentNode = exports.isSelectableContainerNode = exports.isSelectableChildNode = exports.isListItemWithinContainerNotAtEnd = 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.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 _selection = require("@atlaskit/editor-common/selection");
 var _utils = require("@atlaskit/editor-common/utils");
@@ -265,6 +265,11 @@ var isSelectionAtEndOfParentNode = exports.isSelectionAtEndOfParentNode = functi
     return false;
   }
 
+  // Handle layout columns: if another node follows, not at end
+  if (isSelectionAtEndOfLayoutColumn($pos) && (0, _platformFeatureFlags.fg)('platform_editor_fix_right_arrow_nav_bug_in_layout')) {
+    return false;
+  }
+
   // Default: if at end of parent's parent
   var $after = $pos.doc.resolve($pos.after());
   return $after.parent.content.size === $after.parentOffset;
@@ -338,4 +343,33 @@ var findTopLevelList = exports.findTopLevelList = function findTopLevelList(pos)
     currentDepth--;
   }
   return topLevelList;
+};
+
+/**
+ * Determines whether the current selection position is at the end of a layout column node.
+ */
+var isSelectionAtEndOfLayoutColumn = exports.isSelectionAtEndOfLayoutColumn = function isSelectionAtEndOfLayoutColumn($pos) {
+  var layoutColumnParent = (0, _utils2.findParentNodeClosestToPos)($pos, isLayoutColumnNode);
+  if (!layoutColumnParent) {
+    return false;
+  }
+  var grandParentDepth = $pos.depth - 1;
+  if (grandParentDepth < 0) {
+    return false;
+  }
+  var layoutColumn = $pos.doc.type.schema.nodes.layoutColumn;
+  var grandParent = $pos.node(grandParentDepth);
+  var afterPos = layoutColumnParent.pos + layoutColumnParent.node.nodeSize;
+  var $after = $pos.doc.resolve(afterPos);
+  return Boolean($after.nodeAfter) && grandParent.type === layoutColumn;
+};
+
+/**
+ * Determines if the given node is a LayoutColumn node.
+ */
+var isLayoutColumnNode = exports.isLayoutColumnNode = function isLayoutColumnNode(node) {
+  var _node$type2;
+  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);
 };

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

@@ -254,6 +254,11 @@ export const isSelectionAtEndOfParentNode = ($pos, selection) => {
     return false;
   }
 
+  // Handle layout columns: if another node follows, not at end
+  if (isSelectionAtEndOfLayoutColumn($pos) && fg('platform_editor_fix_right_arrow_nav_bug_in_layout')) {
+    return false;
+  }
+
   // Default: if at end of parent's parent
   const $after = $pos.doc.resolve($pos.after());
   return $after.parent.content.size === $after.parentOffset;
@@ -329,4 +334,36 @@ export const findTopLevelList = pos => {
     currentDepth--;
   }
   return topLevelList;
+};
+
+/**
+ * Determines whether the current selection position is at the end of a layout column node.
+ */
+export const isSelectionAtEndOfLayoutColumn = $pos => {
+  const layoutColumnParent = findParentNodeClosestToPos($pos, isLayoutColumnNode);
+  if (!layoutColumnParent) {
+    return false;
+  }
+  const grandParentDepth = $pos.depth - 1;
+  if (grandParentDepth < 0) {
+    return false;
+  }
+  const {
+    layoutColumn
+  } = $pos.doc.type.schema.nodes;
+  const grandParent = $pos.node(grandParentDepth);
+  const afterPos = layoutColumnParent.pos + layoutColumnParent.node.nodeSize;
+  const $after = $pos.doc.resolve(afterPos);
+  return Boolean($after.nodeAfter) && grandParent.type === layoutColumn;
+};
+
+/**
+ * Determines if the given node is a LayoutColumn node.
+ */
+export const isLayoutColumnNode = node => {
+  var _node$type2, _node$type2$schema;
+  const {
+    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);
 };

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

@@ -258,6 +258,11 @@ export var isSelectionAtEndOfParentNode = function isSelectionAtEndOfParentNode(
     return false;
   }
 
+  // Handle layout columns: if another node follows, not at end
+  if (isSelectionAtEndOfLayoutColumn($pos) && fg('platform_editor_fix_right_arrow_nav_bug_in_layout')) {
+    return false;
+  }
+
   // Default: if at end of parent's parent
   var $after = $pos.doc.resolve($pos.after());
   return $after.parent.content.size === $after.parentOffset;
@@ -331,4 +336,33 @@ export var findTopLevelList = function findTopLevelList(pos) {
     currentDepth--;
   }
   return topLevelList;
+};
+
+/**
+ * Determines whether the current selection position is at the end of a layout column node.
+ */
+export var isSelectionAtEndOfLayoutColumn = function isSelectionAtEndOfLayoutColumn($pos) {
+  var layoutColumnParent = findParentNodeClosestToPos($pos, isLayoutColumnNode);
+  if (!layoutColumnParent) {
+    return false;
+  }
+  var grandParentDepth = $pos.depth - 1;
+  if (grandParentDepth < 0) {
+    return false;
+  }
+  var layoutColumn = $pos.doc.type.schema.nodes.layoutColumn;
+  var grandParent = $pos.node(grandParentDepth);
+  var afterPos = layoutColumnParent.pos + layoutColumnParent.node.nodeSize;
+  var $after = $pos.doc.resolve(afterPos);
+  return Boolean($after.nodeAfter) && grandParent.type === layoutColumn;
+};
+
+/**
+ * Determines if the given node is a LayoutColumn node.
+ */
+export var isLayoutColumnNode = function isLayoutColumnNode(node) {
+  var _node$type2;
+  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);
 };

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

@@ -76,3 +76,11 @@ export declare const findTopLevelList: (pos: ResolvedPos) => {
     node: PmNode;
     pos: number;
 } | undefined;
+/**
+ * Determines whether the current selection position is at the end of a layout column node.
+ */
+export declare const isSelectionAtEndOfLayoutColumn: ($pos: ResolvedPos) => boolean;
+/**
+ * Determines if the given node is a LayoutColumn node.
+ */
+export declare const isLayoutColumnNode: (node: PmNode | null | undefined) => boolean;

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

@@ -76,3 +76,11 @@ export declare const findTopLevelList: (pos: ResolvedPos) => {
     node: PmNode;
     pos: number;
 } | undefined;
+/**
+ * Determines whether the current selection position is at the end of a layout column node.
+ */
+export declare const isSelectionAtEndOfLayoutColumn: ($pos: ResolvedPos) => boolean;
+/**
+ * Determines if the given node is a LayoutColumn node.
+ */
+export declare const isLayoutColumnNode: (node: PmNode | null | undefined) => boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-selection",
-	"version": "3.0.2",
+	"version": "3.0.3",
 	"description": "Selection plugin for @atlaskit/editor-core",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -24,12 +24,12 @@
 		"@atlaskit/editor-shared-styles": "^3.4.0",
 		"@atlaskit/editor-tables": "^2.9.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
-		"@atlaskit/tmp-editor-statsig": "^9.5.0",
+		"@atlaskit/tmp-editor-statsig": "^9.7.0",
 		"@atlaskit/tokens": "^5.5.0",
 		"@babel/runtime": "^7.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^107.7.0",
+		"@atlaskit/editor-common": "^107.8.0",
 		"react": "^18.2.0"
 	},
 	"devDependencies": {
@@ -89,6 +89,9 @@
 		},
 		"platform_editor_fix_right_arrow_bug_list_in_layout": {
 			"type": "boolean"
+		},
+		"platform_editor_fix_right_arrow_nav_bug_in_layout": {
+			"type": "boolean"
 		}
 	}
 }