@atlaskit/editor-common 99.10.0 → 99.11.0

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # @atlaskit/editor-common
 
+## 99.11.0
+
+### Minor Changes
+
+- [#111465](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/111465)
+  [`c0cbae02ded12`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/c0cbae02ded12) -
+  Add utility for expanding selection boundaries
+
+### Patch Changes
+
+- [#112757](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/112757)
+  [`16ea3fd7c7417`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/16ea3fd7c7417) -
+  Added account and browser locale attributes to the editor started event
+- Updated dependencies
+
+## 99.10.1
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 99.10.0
 
 ### Minor Changes

package/dist/cjs/monitoring/error.js

@@ -17,7 +17,7 @@ function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 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 = "99.10.0";
+var packageVersion = "99.11.0";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // TODO: Sanitise the URL instead of just removing it

package/dist/cjs/selection/index.js

@@ -64,6 +64,12 @@ Object.defineProperty(exports, "endPositionOfParent", {
     return _utils2.endPositionOfParent;
   }
 });
+Object.defineProperty(exports, "expandSelectionBounds", {
+  enumerable: true,
+  get: function get() {
+    return _utils2.expandSelectionBounds;
+  }
+});
 Object.defineProperty(exports, "gapCursorStyles", {
   enumerable: true,
   get: function get() {

package/dist/cjs/selection/utils.js

@@ -8,7 +8,7 @@ exports.atTheBeginningOfDoc = atTheBeginningOfDoc;
 exports.atTheEndOfBlock = atTheEndOfBlock;
 exports.atTheEndOfDoc = atTheEndOfDoc;
 exports.endPositionOfParent = endPositionOfParent;
-exports.isSelectionAtStartOfNode = exports.isSelectionAtEndOfNode = void 0;
+exports.isSelectionAtStartOfNode = exports.isSelectionAtEndOfNode = exports.expandSelectionBounds = void 0;
 exports.startPositionOfParent = startPositionOfParent;
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _selection = require("./gap-cursor/selection");
@@ -78,4 +78,38 @@ function startPositionOfParent(resolvedPos) {
 }
 function endPositionOfParent(resolvedPos) {
   return resolvedPos.end(resolvedPos.depth) + 1;
-}
+}
+var expandSelectionBounds = exports.expandSelectionBounds = function expandSelectionBounds($anchor, $head) {
+  var $from = $anchor.min($head);
+  var $to = $anchor.max($head);
+  var fromDepth = $from.depth;
+  var toDepth = $to.depth;
+  var selectionStart = fromDepth ? $from.before() : $from.pos;
+  var selectionEnd = toDepth ? $to.after() : $to.pos;
+  var selectionHasGrandparent = toDepth > 1 && fromDepth > 1;
+  var selectionIsAcrossDiffParents = selectionHasGrandparent && !$to.parent.isTextblock && !$to.sameParent($from);
+  var selectionIsAcrossTextBlocksWithDiffParents = selectionHasGrandparent && $to.parent.isTextblock && $to.before(toDepth - 1) !== $from.before(fromDepth - 1);
+  if (toDepth > fromDepth) {
+    // expand end of selection to after the last node
+    selectionEnd = fromDepth ? $to.after(fromDepth) : $to.after(1);
+  } else if (toDepth < fromDepth) {
+    // expand start of selection to before the current node
+    selectionStart = toDepth ? $from.before(toDepth) : $from.before(1);
+  } else if (selectionIsAcrossDiffParents || selectionIsAcrossTextBlocksWithDiffParents) {
+    // when selection from/to share same depth with different parents, hoist up the selection to the parent of the highest depth in the selection
+    selectionStart = $from.before(fromDepth - 1);
+    selectionEnd = $to.after(toDepth - 1);
+  } else if (!$from.node().inlineContent) {
+    // when selection might be a Node selection, return what was passed in
+    return {
+      $anchor: $anchor,
+      $head: $head
+    };
+  }
+  var $expandedFrom = $anchor.doc.resolve(selectionStart);
+  var $expandedTo = $anchor.doc.resolve(selectionEnd);
+  return {
+    $anchor: $anchor === $from ? $expandedFrom : $expandedTo,
+    $head: $head === $to ? $expandedTo : $expandedFrom
+  };
+};

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

@@ -23,7 +23,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 = "99.10.0";
+var packageVersion = "99.11.0";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 // Ignored via go/ees005

package/dist/es2019/monitoring/error.js

@@ -1,7 +1,7 @@
 import { isFedRamp } from './environment';
 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 = "99.10.0";
+const packageVersion = "99.11.0";
 const sanitiseSentryEvents = (data, _hint) => {
   // Remove URL as it has UGC
   // TODO: Sanitise the URL instead of just removing it

package/dist/es2019/selection/index.js

@@ -12,7 +12,7 @@ export { isIgnored } from './gap-cursor/utils/is-ignored';
 export { isValidTargetNode } from './gap-cursor/utils/is-valid-target-node';
 export { setGapCursorSelection } from './gap-cursor/utils/setGapCursorSelection';
 export { hideCaretModifier, gapCursorStyles } from './gap-cursor/styles';
-export { atTheBeginningOfBlock, atTheBeginningOfDoc, atTheEndOfBlock, atTheEndOfDoc, endPositionOfParent, isSelectionAtEndOfNode, isSelectionAtStartOfNode, startPositionOfParent } from './utils';
+export { atTheBeginningOfBlock, atTheBeginningOfDoc, atTheEndOfBlock, atTheEndOfDoc, endPositionOfParent, expandSelectionBounds, isSelectionAtEndOfNode, isSelectionAtStartOfNode, startPositionOfParent } from './utils';
 export function getNodeSelectionAnalyticsPayload(selection) {
   if (selection instanceof NodeSelection) {
     return {

package/dist/es2019/selection/utils.js

@@ -78,4 +78,38 @@ export function startPositionOfParent(resolvedPos) {
 }
 export function endPositionOfParent(resolvedPos) {
   return resolvedPos.end(resolvedPos.depth) + 1;
-}
+}
+export const expandSelectionBounds = ($anchor, $head) => {
+  const $from = $anchor.min($head);
+  const $to = $anchor.max($head);
+  const fromDepth = $from.depth;
+  const toDepth = $to.depth;
+  let selectionStart = fromDepth ? $from.before() : $from.pos;
+  let selectionEnd = toDepth ? $to.after() : $to.pos;
+  const selectionHasGrandparent = toDepth > 1 && fromDepth > 1;
+  const selectionIsAcrossDiffParents = selectionHasGrandparent && !$to.parent.isTextblock && !$to.sameParent($from);
+  const selectionIsAcrossTextBlocksWithDiffParents = selectionHasGrandparent && $to.parent.isTextblock && $to.before(toDepth - 1) !== $from.before(fromDepth - 1);
+  if (toDepth > fromDepth) {
+    // expand end of selection to after the last node
+    selectionEnd = fromDepth ? $to.after(fromDepth) : $to.after(1);
+  } else if (toDepth < fromDepth) {
+    // expand start of selection to before the current node
+    selectionStart = toDepth ? $from.before(toDepth) : $from.before(1);
+  } else if (selectionIsAcrossDiffParents || selectionIsAcrossTextBlocksWithDiffParents) {
+    // when selection from/to share same depth with different parents, hoist up the selection to the parent of the highest depth in the selection
+    selectionStart = $from.before(fromDepth - 1);
+    selectionEnd = $to.after(toDepth - 1);
+  } else if (!$from.node().inlineContent) {
+    // when selection might be a Node selection, return what was passed in
+    return {
+      $anchor,
+      $head
+    };
+  }
+  const $expandedFrom = $anchor.doc.resolve(selectionStart);
+  const $expandedTo = $anchor.doc.resolve(selectionEnd);
+  return {
+    $anchor: $anchor === $from ? $expandedFrom : $expandedTo,
+    $head: $head === $to ? $expandedTo : $expandedFrom
+  };
+};

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

@@ -13,7 +13,7 @@ import withAnalyticsContext from '@atlaskit/analytics-next/withAnalyticsContext'
 import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
 import Layer from '../Layer';
 const packageName = "@atlaskit/editor-common";
-const packageVersion = "99.10.0";
+const packageVersion = "99.11.0";
 const halfFocusRing = 1;
 const dropOffset = '0, 8';
 // Ignored via go/ees005

package/dist/esm/monitoring/error.js

@@ -7,7 +7,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import { isFedRamp } from './environment';
 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 = "99.10.0";
+var packageVersion = "99.11.0";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // TODO: Sanitise the URL instead of just removing it

package/dist/esm/selection/index.js

@@ -12,7 +12,7 @@ export { isIgnored } from './gap-cursor/utils/is-ignored';
 export { isValidTargetNode } from './gap-cursor/utils/is-valid-target-node';
 export { setGapCursorSelection } from './gap-cursor/utils/setGapCursorSelection';
 export { hideCaretModifier, gapCursorStyles } from './gap-cursor/styles';
-export { atTheBeginningOfBlock, atTheBeginningOfDoc, atTheEndOfBlock, atTheEndOfDoc, endPositionOfParent, isSelectionAtEndOfNode, isSelectionAtStartOfNode, startPositionOfParent } from './utils';
+export { atTheBeginningOfBlock, atTheBeginningOfDoc, atTheEndOfBlock, atTheEndOfDoc, endPositionOfParent, expandSelectionBounds, isSelectionAtEndOfNode, isSelectionAtStartOfNode, startPositionOfParent } from './utils';
 export function getNodeSelectionAnalyticsPayload(selection) {
   if (selection instanceof NodeSelection) {
     return {

package/dist/esm/selection/utils.js

@@ -66,4 +66,38 @@ export function startPositionOfParent(resolvedPos) {
 }
 export function endPositionOfParent(resolvedPos) {
   return resolvedPos.end(resolvedPos.depth) + 1;
-}
+}
+export var expandSelectionBounds = function expandSelectionBounds($anchor, $head) {
+  var $from = $anchor.min($head);
+  var $to = $anchor.max($head);
+  var fromDepth = $from.depth;
+  var toDepth = $to.depth;
+  var selectionStart = fromDepth ? $from.before() : $from.pos;
+  var selectionEnd = toDepth ? $to.after() : $to.pos;
+  var selectionHasGrandparent = toDepth > 1 && fromDepth > 1;
+  var selectionIsAcrossDiffParents = selectionHasGrandparent && !$to.parent.isTextblock && !$to.sameParent($from);
+  var selectionIsAcrossTextBlocksWithDiffParents = selectionHasGrandparent && $to.parent.isTextblock && $to.before(toDepth - 1) !== $from.before(fromDepth - 1);
+  if (toDepth > fromDepth) {
+    // expand end of selection to after the last node
+    selectionEnd = fromDepth ? $to.after(fromDepth) : $to.after(1);
+  } else if (toDepth < fromDepth) {
+    // expand start of selection to before the current node
+    selectionStart = toDepth ? $from.before(toDepth) : $from.before(1);
+  } else if (selectionIsAcrossDiffParents || selectionIsAcrossTextBlocksWithDiffParents) {
+    // when selection from/to share same depth with different parents, hoist up the selection to the parent of the highest depth in the selection
+    selectionStart = $from.before(fromDepth - 1);
+    selectionEnd = $to.after(toDepth - 1);
+  } else if (!$from.node().inlineContent) {
+    // when selection might be a Node selection, return what was passed in
+    return {
+      $anchor: $anchor,
+      $head: $head
+    };
+  }
+  var $expandedFrom = $anchor.doc.resolve(selectionStart);
+  var $expandedTo = $anchor.doc.resolve(selectionEnd);
+  return {
+    $anchor: $anchor === $from ? $expandedFrom : $expandedTo,
+    $head: $head === $to ? $expandedTo : $expandedFrom
+  };
+};

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

@@ -20,7 +20,7 @@ import withAnalyticsContext from '@atlaskit/analytics-next/withAnalyticsContext'
 import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
 import Layer from '../Layer';
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "99.10.0";
+var packageVersion = "99.11.0";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 // Ignored via go/ees005

package/dist/types/analytics/types/general-events.d.ts

@@ -34,6 +34,8 @@ type FeedbackAEP = UIAEP<ACTION.OPENED, ACTION_SUBJECT.FEEDBACK_DIALOG, undefine
 type EditorStartAEP = UIAEP<ACTION.STARTED, ACTION_SUBJECT.EDITOR, undefined, {
     platform: PLATFORMS.NATIVE | PLATFORMS.HYBRID | PLATFORMS.WEB;
     featureFlags: FeatureFlagKey[];
+    accountLocale?: string;
+    browserLocale?: string;
 }, undefined>;
 type EditorPerfAEP = OperationalAEPWithObjectId<ACTION.EDITOR_MOUNTED | ACTION.PROSEMIRROR_RENDERED | ACTION.ON_EDITOR_READY_CALLBACK | ACTION.ON_CHANGE_CALLBACK, ACTION_SUBJECT.EDITOR, undefined, {
     duration: number;

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

@@ -11,7 +11,7 @@ export { isIgnored } from './gap-cursor/utils/is-ignored';
 export { isValidTargetNode } from './gap-cursor/utils/is-valid-target-node';
 export { setGapCursorSelection } from './gap-cursor/utils/setGapCursorSelection';
 export { hideCaretModifier, gapCursorStyles } from './gap-cursor/styles';
-export { atTheBeginningOfBlock, atTheBeginningOfDoc, atTheEndOfBlock, atTheEndOfDoc, endPositionOfParent, isSelectionAtEndOfNode, isSelectionAtStartOfNode, startPositionOfParent, } from './utils';
+export { atTheBeginningOfBlock, atTheBeginningOfDoc, atTheEndOfBlock, atTheEndOfDoc, endPositionOfParent, expandSelectionBounds, isSelectionAtEndOfNode, isSelectionAtStartOfNode, startPositionOfParent, } from './utils';
 export declare function getNodeSelectionAnalyticsPayload(selection: Selection): AnalyticsEventPayload | undefined;
 export declare function getAllSelectionAnalyticsPayload(selection: Selection): AnalyticsEventPayload | undefined;
 export declare function getCellSelectionAnalyticsPayload(state: EditorState): AnalyticsEventPayload | undefined;

package/dist/types/selection/utils.d.ts

@@ -9,3 +9,7 @@ export declare function atTheEndOfBlock(state: EditorState): boolean;
 export declare function atTheBeginningOfBlock(state: EditorState): boolean;
 export declare function startPositionOfParent(resolvedPos: ResolvedPos): number;
 export declare function endPositionOfParent(resolvedPos: ResolvedPos): number;
+export declare const expandSelectionBounds: ($anchor: ResolvedPos, $head: ResolvedPos) => {
+    $anchor: ResolvedPos;
+    $head: ResolvedPos;
+};

package/dist/types-ts4.5/analytics/types/general-events.d.ts

@@ -34,6 +34,8 @@ type FeedbackAEP = UIAEP<ACTION.OPENED, ACTION_SUBJECT.FEEDBACK_DIALOG, undefine
 type EditorStartAEP = UIAEP<ACTION.STARTED, ACTION_SUBJECT.EDITOR, undefined, {
     platform: PLATFORMS.NATIVE | PLATFORMS.HYBRID | PLATFORMS.WEB;
     featureFlags: FeatureFlagKey[];
+    accountLocale?: string;
+    browserLocale?: string;
 }, undefined>;
 type EditorPerfAEP = OperationalAEPWithObjectId<ACTION.EDITOR_MOUNTED | ACTION.PROSEMIRROR_RENDERED | ACTION.ON_EDITOR_READY_CALLBACK | ACTION.ON_CHANGE_CALLBACK, ACTION_SUBJECT.EDITOR, undefined, {
     duration: number;

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

@@ -11,7 +11,7 @@ export { isIgnored } from './gap-cursor/utils/is-ignored';
 export { isValidTargetNode } from './gap-cursor/utils/is-valid-target-node';
 export { setGapCursorSelection } from './gap-cursor/utils/setGapCursorSelection';
 export { hideCaretModifier, gapCursorStyles } from './gap-cursor/styles';
-export { atTheBeginningOfBlock, atTheBeginningOfDoc, atTheEndOfBlock, atTheEndOfDoc, endPositionOfParent, isSelectionAtEndOfNode, isSelectionAtStartOfNode, startPositionOfParent, } from './utils';
+export { atTheBeginningOfBlock, atTheBeginningOfDoc, atTheEndOfBlock, atTheEndOfDoc, endPositionOfParent, expandSelectionBounds, isSelectionAtEndOfNode, isSelectionAtStartOfNode, startPositionOfParent, } from './utils';
 export declare function getNodeSelectionAnalyticsPayload(selection: Selection): AnalyticsEventPayload | undefined;
 export declare function getAllSelectionAnalyticsPayload(selection: Selection): AnalyticsEventPayload | undefined;
 export declare function getCellSelectionAnalyticsPayload(state: EditorState): AnalyticsEventPayload | undefined;

package/dist/types-ts4.5/selection/utils.d.ts

@@ -9,3 +9,7 @@ export declare function atTheEndOfBlock(state: EditorState): boolean;
 export declare function atTheBeginningOfBlock(state: EditorState): boolean;
 export declare function startPositionOfParent(resolvedPos: ResolvedPos): number;
 export declare function endPositionOfParent(resolvedPos: ResolvedPos): number;
+export declare const expandSelectionBounds: ($anchor: ResolvedPos, $head: ResolvedPos) => {
+    $anchor: ResolvedPos;
+    $head: ResolvedPos;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-common",
-	"version": "99.10.0",
+	"version": "99.11.0",
 	"description": "A package that contains common classes and components for editor and renderer",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -141,7 +141,7 @@
 		"@atlaskit/media-file-preview": "^0.10.0",
 		"@atlaskit/media-picker": "^67.1.0",
 		"@atlaskit/media-ui": "^27.4.0",
-		"@atlaskit/media-viewer": "50.1.3",
+		"@atlaskit/media-viewer": "50.1.5",
 		"@atlaskit/mention": "^23.11.0",
 		"@atlaskit/menu": "^2.14.0",
 		"@atlaskit/onboarding": "^12.3.0",
@@ -155,7 +155,7 @@
 		"@atlaskit/spinner": "^17.1.0",
 		"@atlaskit/task-decision": "^17.12.0",
 		"@atlaskit/textfield": "^6.8.0",
-		"@atlaskit/tmp-editor-statsig": "^2.43.0",
+		"@atlaskit/tmp-editor-statsig": "^2.44.0",
 		"@atlaskit/tokens": "^3.3.0",
 		"@atlaskit/tooltip": "^19.1.0",
 		"@atlaskit/width-detector": "^4.4.0",