@atlaskit/editor-common 110.38.1 → 110.38.2

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @atlaskit/editor-common
 
+## 110.38.2
+
+### Patch Changes
+
+- [`f1f7fc05afab1`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/f1f7fc05afab1) -
+  [ux] EDITOR-2461 Set selection in expand title when using arrow key to navigate into expand
+
 ## 110.38.1
 
 ### Patch Changes

package/dist/cjs/expand/index.js

@@ -3,7 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isExpandCollapsed = exports.expandedState = void 0;
+exports.isExpandCollapsed = exports.getNextNodeExpandPos = exports.expandedState = void 0;
+var _utils = require("@atlaskit/editor-prosemirror/utils");
 // Used to store the state of the new single player expand node
 var expandedState = exports.expandedState = new WeakMap();
 
@@ -12,4 +13,28 @@ var isExpandCollapsed = exports.isExpandCollapsed = function isExpandCollapsed(n
   var _expandedState$get;
   // @ts-ignore - TS2869 TypeScript 5.9.2 upgrade
   return (_expandedState$get = !expandedState.get(node)) !== null && _expandedState$get !== void 0 ? _expandedState$get : false;
+};
+var getNextNodeExpandPos = exports.getNextNodeExpandPos = function getNextNodeExpandPos(editorView, selection) {
+  var parentNodePos = (0, _utils.findParentNodeOfType)([editorView.state.schema.nodes.listItem, editorView.state.schema.nodes.heading, editorView.state.schema.nodes.blockquote, editorView.state.schema.nodes.taskItem, editorView.state.schema.nodes.mediaSingle])(selection);
+  if (!parentNodePos) {
+    var paragraphNode = (0, _utils.findParentNodeOfType)([editorView.state.schema.nodes.paragraph])(selection);
+    if (!paragraphNode) {
+      return;
+    }
+    parentNodePos = paragraphNode;
+  }
+  var tableRowNodePos = (0, _utils.findParentNodeOfType)([editorView.state.schema.nodes.tableRow])(selection);
+  if (tableRowNodePos) {
+    parentNodePos = tableRowNodePos;
+  }
+  var endPosOffset = parentNodePos && ['taskItem', 'listItem', 'tableRow'].includes(parentNodePos.node.type.name) ? 1 : 0;
+  var endOfTextblockPos = parentNodePos.start + parentNodePos.node.content.size + endPosOffset + 1;
+  if (endOfTextblockPos > editorView.state.doc.content.size) {
+    return undefined;
+  }
+  var $endOfTextblockPos = editorView.state.doc.resolve(endOfTextblockPos);
+  if ($endOfTextblockPos !== null && $endOfTextblockPos !== void 0 && $endOfTextblockPos.nodeAfter && ['expand', 'nestedExpand'].includes($endOfTextblockPos.nodeAfter.type.name)) {
+    return endOfTextblockPos + 1;
+  }
+  return undefined;
 };

package/dist/cjs/monitoring/error.js

@@ -19,7 +19,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-var packageVersion = "110.38.0";
+var packageVersion = "110.38.1";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // Ignored via go/ees007

package/dist/cjs/ui/DropList/index.js

@@ -24,7 +24,7 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
  * @jsx jsx
  */ // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "110.38.0";
+var packageVersion = "110.38.1";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var fadeIn = (0, _react2.keyframes)({

package/dist/es2019/expand/index.js

@@ -1,3 +1,4 @@
+import { findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 // Used to store the state of the new single player expand node
 export const expandedState = new WeakMap();
 
@@ -6,4 +7,28 @@ export const isExpandCollapsed = node => {
   var _expandedState$get;
   // @ts-ignore - TS2869 TypeScript 5.9.2 upgrade
   return (_expandedState$get = !expandedState.get(node)) !== null && _expandedState$get !== void 0 ? _expandedState$get : false;
+};
+export const getNextNodeExpandPos = (editorView, selection) => {
+  let parentNodePos = findParentNodeOfType([editorView.state.schema.nodes.listItem, editorView.state.schema.nodes.heading, editorView.state.schema.nodes.blockquote, editorView.state.schema.nodes.taskItem, editorView.state.schema.nodes.mediaSingle])(selection);
+  if (!parentNodePos) {
+    const paragraphNode = findParentNodeOfType([editorView.state.schema.nodes.paragraph])(selection);
+    if (!paragraphNode) {
+      return;
+    }
+    parentNodePos = paragraphNode;
+  }
+  const tableRowNodePos = findParentNodeOfType([editorView.state.schema.nodes.tableRow])(selection);
+  if (tableRowNodePos) {
+    parentNodePos = tableRowNodePos;
+  }
+  const endPosOffset = parentNodePos && ['taskItem', 'listItem', 'tableRow'].includes(parentNodePos.node.type.name) ? 1 : 0;
+  const endOfTextblockPos = parentNodePos.start + parentNodePos.node.content.size + endPosOffset + 1;
+  if (endOfTextblockPos > editorView.state.doc.content.size) {
+    return undefined;
+  }
+  const $endOfTextblockPos = editorView.state.doc.resolve(endOfTextblockPos);
+  if ($endOfTextblockPos !== null && $endOfTextblockPos !== void 0 && $endOfTextblockPos.nodeAfter && ['expand', 'nestedExpand'].includes($endOfTextblockPos.nodeAfter.type.name)) {
+    return endOfTextblockPos + 1;
+  }
+  return undefined;
 };

package/dist/es2019/monitoring/error.js

@@ -4,7 +4,7 @@ import { isFedRamp } from './environment';
 import { normaliseSentryBreadcrumbs, SERIALIZABLE_ATTRIBUTES } from './normalise-sentry-breadcrumbs';
 const SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 const packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-const packageVersion = "110.38.0";
+const packageVersion = "110.38.1";
 const sanitiseSentryEvents = (data, _hint) => {
   // Remove URL as it has UGC
   // Ignored via go/ees007

package/dist/es2019/ui/DropList/index.js

@@ -14,7 +14,7 @@ import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
 import { fg } from '@atlaskit/platform-feature-flags';
 import Layer from '../Layer';
 const packageName = "@atlaskit/editor-common";
-const packageVersion = "110.38.0";
+const packageVersion = "110.38.1";
 const halfFocusRing = 1;
 const dropOffset = '0, 8';
 const fadeIn = keyframes({

package/dist/esm/expand/index.js

@@ -1,3 +1,4 @@
+import { findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 // Used to store the state of the new single player expand node
 export var expandedState = new WeakMap();
 
@@ -6,4 +7,28 @@ export var isExpandCollapsed = function isExpandCollapsed(node) {
   var _expandedState$get;
   // @ts-ignore - TS2869 TypeScript 5.9.2 upgrade
   return (_expandedState$get = !expandedState.get(node)) !== null && _expandedState$get !== void 0 ? _expandedState$get : false;
+};
+export var getNextNodeExpandPos = function getNextNodeExpandPos(editorView, selection) {
+  var parentNodePos = findParentNodeOfType([editorView.state.schema.nodes.listItem, editorView.state.schema.nodes.heading, editorView.state.schema.nodes.blockquote, editorView.state.schema.nodes.taskItem, editorView.state.schema.nodes.mediaSingle])(selection);
+  if (!parentNodePos) {
+    var paragraphNode = findParentNodeOfType([editorView.state.schema.nodes.paragraph])(selection);
+    if (!paragraphNode) {
+      return;
+    }
+    parentNodePos = paragraphNode;
+  }
+  var tableRowNodePos = findParentNodeOfType([editorView.state.schema.nodes.tableRow])(selection);
+  if (tableRowNodePos) {
+    parentNodePos = tableRowNodePos;
+  }
+  var endPosOffset = parentNodePos && ['taskItem', 'listItem', 'tableRow'].includes(parentNodePos.node.type.name) ? 1 : 0;
+  var endOfTextblockPos = parentNodePos.start + parentNodePos.node.content.size + endPosOffset + 1;
+  if (endOfTextblockPos > editorView.state.doc.content.size) {
+    return undefined;
+  }
+  var $endOfTextblockPos = editorView.state.doc.resolve(endOfTextblockPos);
+  if ($endOfTextblockPos !== null && $endOfTextblockPos !== void 0 && $endOfTextblockPos.nodeAfter && ['expand', 'nestedExpand'].includes($endOfTextblockPos.nodeAfter.type.name)) {
+    return endOfTextblockPos + 1;
+  }
+  return undefined;
 };

package/dist/esm/monitoring/error.js

@@ -10,7 +10,7 @@ import { isFedRamp } from './environment';
 import { normaliseSentryBreadcrumbs, SERIALIZABLE_ATTRIBUTES } from './normalise-sentry-breadcrumbs';
 var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-var packageVersion = "110.38.0";
+var packageVersion = "110.38.1";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // Ignored via go/ees007

package/dist/esm/ui/DropList/index.js

@@ -21,7 +21,7 @@ import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
 import { fg } from '@atlaskit/platform-feature-flags';
 import Layer from '../Layer';
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "110.38.0";
+var packageVersion = "110.38.1";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var fadeIn = keyframes({

package/dist/types/expand/index.d.ts

@@ -1,3 +1,6 @@
 import type { Node as PmNode } from '@atlaskit/editor-prosemirror/model';
+import type { Selection } from '@atlaskit/editor-prosemirror/state';
+import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 export declare const expandedState: WeakMap<PmNode, boolean>;
 export declare const isExpandCollapsed: (node: PmNode) => boolean;
+export declare const getNextNodeExpandPos: (editorView: EditorView, selection: Selection) => number | undefined;

package/dist/types-ts4.5/expand/index.d.ts

@@ -1,3 +1,6 @@
 import type { Node as PmNode } from '@atlaskit/editor-prosemirror/model';
+import type { Selection } from '@atlaskit/editor-prosemirror/state';
+import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 export declare const expandedState: WeakMap<PmNode, boolean>;
 export declare const isExpandCollapsed: (node: PmNode) => boolean;
+export declare const getNextNodeExpandPos: (editorView: EditorView, selection: Selection) => number | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-common",
-	"version": "110.38.1",
+	"version": "110.38.2",
 	"description": "A package that contains common classes and components for editor and renderer",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -74,14 +74,14 @@
 		"@atlaskit/prosemirror-history": "^0.2.0",
 		"@atlaskit/react-ufo": "^4.15.0",
 		"@atlaskit/section-message": "^8.9.0",
-		"@atlaskit/smart-card": "^43.12.0",
+		"@atlaskit/smart-card": "^43.13.0",
 		"@atlaskit/smart-user-picker": "^8.4.0",
 		"@atlaskit/spinner": "^19.0.0",
 		"@atlaskit/status": "^3.0.0",
 		"@atlaskit/task-decision": "^19.2.0",
 		"@atlaskit/textfield": "^8.1.0",
 		"@atlaskit/theme": "^21.0.0",
-		"@atlaskit/tmp-editor-statsig": "^14.6.0",
+		"@atlaskit/tmp-editor-statsig": "^14.7.0",
 		"@atlaskit/tokens": "^8.4.0",
 		"@atlaskit/tooltip": "^20.10.0",
 		"@atlaskit/width-detector": "^5.0.0",