@atlaskit/editor-plugin-selection-extension 3.4.1 → 3.4.2

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/editor-plugin-selection-extension
 
+## 3.4.2
+
+### Patch Changes
+
+- [`373e833d95d52`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/373e833d95d52) -
+  [ux] COMMIT-19456:Fix forge app coords bug
+- Updated dependencies
+
 ## 3.4.1
 
 ### Patch Changes

package/dist/cjs/selectionExtensionPlugin.js

@@ -9,6 +9,7 @@ var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers
 var _react = _interopRequireDefault(require("react"));
 var _messages = require("@atlaskit/editor-common/messages");
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
+var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _actions = require("./pm-plugins/actions");
 var _insertAdfAtEndOfDoc2 = require("./pm-plugins/actions/insertAdfAtEndOfDoc");
@@ -169,12 +170,19 @@ var selectionExtensionPlugin = exports.selectionExtensionPlugin = function selec
           return;
         }
         var getSelection = function getSelection(view) {
+          var _api$userPreferences, _api$selectionToolbar, _api$editorViewMode2;
           // ensure the same document state is applied to editor view to avoid mismatches
           var currentSelection = view.state.selection;
+          var toolbarDocking = (0, _platformFeatureFlags.fg)('platform_editor_use_preferences_plugin') ? api === null || api === void 0 || (_api$userPreferences = api.userPreferences) === null || _api$userPreferences === void 0 || (_api$userPreferences = _api$userPreferences.sharedState.currentState()) === null || _api$userPreferences === void 0 || (_api$userPreferences = _api$userPreferences.preferences) === null || _api$userPreferences === void 0 ? void 0 : _api$userPreferences.toolbarDockingPosition : api === null || api === void 0 || (_api$selectionToolbar = api.selectionToolbar) === null || _api$selectionToolbar === void 0 || (_api$selectionToolbar = _api$selectionToolbar.sharedState) === null || _api$selectionToolbar === void 0 || (_api$selectionToolbar = _api$selectionToolbar.currentState()) === null || _api$selectionToolbar === void 0 ? void 0 : _api$selectionToolbar.toolbarDocking;
+          var isEditMode = Boolean((api === null || api === void 0 || (_api$editorViewMode2 = api.editorViewMode) === null || _api$editorViewMode2 === void 0 || (_api$editorViewMode2 = _api$editorViewMode2.sharedState.currentState()) === null || _api$editorViewMode2 === void 0 ? void 0 : _api$editorViewMode2.mode) === 'edit');
+          var shouldOffsetToolbarHeight = toolbarDocking === 'top' && isEditMode && (0, _platformFeatureFlags.fg)('platform_editor_selection_extension_api_v2');
           var from = currentSelection.from,
             to = currentSelection.to;
           var text = view.state.doc.textBetween(from, to, '\n');
-          var coords = (0, _getBoundingBoxFromSelection.getBoundingBoxFromSelection)(view, from, to);
+          var coords = (0, _getBoundingBoxFromSelection.getBoundingBoxFromSelection)(view, from, to, {
+            top: shouldOffsetToolbarHeight ? _editorSharedStyles.akEditorFullPageToolbarHeight : 0,
+            bottom: shouldOffsetToolbarHeight ? _editorSharedStyles.akEditorFullPageToolbarHeight : 0
+          });
           return {
             text: text,
             from: from,

package/dist/cjs/ui/getBoundingBoxFromSelection.js

@@ -10,9 +10,14 @@ exports.getBoundingBoxFromSelection = void 0;
  * @param view - The editor view instance.
  * @param from - The starting position of the selection.
  * @param to - The ending position of the selection.
+ * @param offset - Optional offset to adjust the top and bottom coordinates of the bounding box.`
  * @returns An object containing the top, left, bottom, and right coordinates of the bounding box.
  */
 var getBoundingBoxFromSelection = exports.getBoundingBoxFromSelection = function getBoundingBoxFromSelection(view, from, to) {
+  var offset = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {
+    top: 0,
+    bottom: 0
+  };
   var top = Infinity,
     left = Infinity,
     bottom = -Infinity,
@@ -26,6 +31,8 @@ var getBoundingBoxFromSelection = exports.getBoundingBoxFromSelection = function
     bottom = Math.max(bottom, coords.bottom);
     right = Math.max(right, coords.right);
   }
+  top = top - offset.top;
+  bottom = bottom - offset.bottom;
   return {
     top: top,
     left: left,

package/dist/es2019/selectionExtensionPlugin.js

@@ -1,6 +1,7 @@
 import React from 'react';
 import { selectionExtensionMessages } from '@atlaskit/editor-common/messages';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
+import { akEditorFullPageToolbarHeight } from '@atlaskit/editor-shared-styles';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { insertSmartLinks } from './pm-plugins/actions';
 import { insertAdfAtEndOfDoc } from './pm-plugins/actions/insertAdfAtEndOfDoc';
@@ -162,16 +163,23 @@ export const selectionExtensionPlugin = ({
           return;
         }
         const getSelection = view => {
+          var _api$userPreferences, _api$userPreferences$, _api$userPreferences$2, _api$selectionToolbar, _api$selectionToolbar2, _api$selectionToolbar3, _api$editorViewMode2, _api$editorViewMode2$;
           // ensure the same document state is applied to editor view to avoid mismatches
           const {
             selection: currentSelection
           } = view.state;
+          const toolbarDocking = fg('platform_editor_use_preferences_plugin') ? api === null || api === void 0 ? void 0 : (_api$userPreferences = api.userPreferences) === null || _api$userPreferences === void 0 ? void 0 : (_api$userPreferences$ = _api$userPreferences.sharedState.currentState()) === null || _api$userPreferences$ === void 0 ? void 0 : (_api$userPreferences$2 = _api$userPreferences$.preferences) === null || _api$userPreferences$2 === void 0 ? void 0 : _api$userPreferences$2.toolbarDockingPosition : api === null || api === void 0 ? void 0 : (_api$selectionToolbar = api.selectionToolbar) === null || _api$selectionToolbar === void 0 ? void 0 : (_api$selectionToolbar2 = _api$selectionToolbar.sharedState) === null || _api$selectionToolbar2 === void 0 ? void 0 : (_api$selectionToolbar3 = _api$selectionToolbar2.currentState()) === null || _api$selectionToolbar3 === void 0 ? void 0 : _api$selectionToolbar3.toolbarDocking;
+          const isEditMode = Boolean((api === null || api === void 0 ? void 0 : (_api$editorViewMode2 = api.editorViewMode) === null || _api$editorViewMode2 === void 0 ? void 0 : (_api$editorViewMode2$ = _api$editorViewMode2.sharedState.currentState()) === null || _api$editorViewMode2$ === void 0 ? void 0 : _api$editorViewMode2$.mode) === 'edit');
+          const shouldOffsetToolbarHeight = toolbarDocking === 'top' && isEditMode && fg('platform_editor_selection_extension_api_v2');
           const {
             from,
             to
           } = currentSelection;
           const text = view.state.doc.textBetween(from, to, '\n');
-          const coords = getBoundingBoxFromSelection(view, from, to);
+          const coords = getBoundingBoxFromSelection(view, from, to, {
+            top: shouldOffsetToolbarHeight ? akEditorFullPageToolbarHeight : 0,
+            bottom: shouldOffsetToolbarHeight ? akEditorFullPageToolbarHeight : 0
+          });
           return {
             text,
             from,

package/dist/es2019/ui/getBoundingBoxFromSelection.js

@@ -4,9 +4,13 @@
  * @param view - The editor view instance.
  * @param from - The starting position of the selection.
  * @param to - The ending position of the selection.
+ * @param offset - Optional offset to adjust the top and bottom coordinates of the bounding box.`
  * @returns An object containing the top, left, bottom, and right coordinates of the bounding box.
  */
-export const getBoundingBoxFromSelection = (view, from, to) => {
+export const getBoundingBoxFromSelection = (view, from, to, offset = {
+  top: 0,
+  bottom: 0
+}) => {
   let top = Infinity,
     left = Infinity,
     bottom = -Infinity,
@@ -20,6 +24,8 @@ export const getBoundingBoxFromSelection = (view, from, to) => {
     bottom = Math.max(bottom, coords.bottom);
     right = Math.max(right, coords.right);
   }
+  top = top - offset.top;
+  bottom = bottom - offset.bottom;
   return {
     top,
     left,

package/dist/esm/selectionExtensionPlugin.js

@@ -2,6 +2,7 @@ import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import React from 'react';
 import { selectionExtensionMessages } from '@atlaskit/editor-common/messages';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
+import { akEditorFullPageToolbarHeight } from '@atlaskit/editor-shared-styles';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { insertSmartLinks as _insertSmartLinks } from './pm-plugins/actions';
 import { insertAdfAtEndOfDoc as _insertAdfAtEndOfDoc } from './pm-plugins/actions/insertAdfAtEndOfDoc';
@@ -162,12 +163,19 @@ export var selectionExtensionPlugin = function selectionExtensionPlugin(_ref) {
           return;
         }
         var getSelection = function getSelection(view) {
+          var _api$userPreferences, _api$selectionToolbar, _api$editorViewMode2;
           // ensure the same document state is applied to editor view to avoid mismatches
           var currentSelection = view.state.selection;
+          var toolbarDocking = fg('platform_editor_use_preferences_plugin') ? api === null || api === void 0 || (_api$userPreferences = api.userPreferences) === null || _api$userPreferences === void 0 || (_api$userPreferences = _api$userPreferences.sharedState.currentState()) === null || _api$userPreferences === void 0 || (_api$userPreferences = _api$userPreferences.preferences) === null || _api$userPreferences === void 0 ? void 0 : _api$userPreferences.toolbarDockingPosition : api === null || api === void 0 || (_api$selectionToolbar = api.selectionToolbar) === null || _api$selectionToolbar === void 0 || (_api$selectionToolbar = _api$selectionToolbar.sharedState) === null || _api$selectionToolbar === void 0 || (_api$selectionToolbar = _api$selectionToolbar.currentState()) === null || _api$selectionToolbar === void 0 ? void 0 : _api$selectionToolbar.toolbarDocking;
+          var isEditMode = Boolean((api === null || api === void 0 || (_api$editorViewMode2 = api.editorViewMode) === null || _api$editorViewMode2 === void 0 || (_api$editorViewMode2 = _api$editorViewMode2.sharedState.currentState()) === null || _api$editorViewMode2 === void 0 ? void 0 : _api$editorViewMode2.mode) === 'edit');
+          var shouldOffsetToolbarHeight = toolbarDocking === 'top' && isEditMode && fg('platform_editor_selection_extension_api_v2');
           var from = currentSelection.from,
             to = currentSelection.to;
           var text = view.state.doc.textBetween(from, to, '\n');
-          var coords = getBoundingBoxFromSelection(view, from, to);
+          var coords = getBoundingBoxFromSelection(view, from, to, {
+            top: shouldOffsetToolbarHeight ? akEditorFullPageToolbarHeight : 0,
+            bottom: shouldOffsetToolbarHeight ? akEditorFullPageToolbarHeight : 0
+          });
           return {
             text: text,
             from: from,

package/dist/esm/ui/getBoundingBoxFromSelection.js

@@ -4,9 +4,14 @@
  * @param view - The editor view instance.
  * @param from - The starting position of the selection.
  * @param to - The ending position of the selection.
+ * @param offset - Optional offset to adjust the top and bottom coordinates of the bounding box.`
  * @returns An object containing the top, left, bottom, and right coordinates of the bounding box.
  */
 export var getBoundingBoxFromSelection = function getBoundingBoxFromSelection(view, from, to) {
+  var offset = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {
+    top: 0,
+    bottom: 0
+  };
   var top = Infinity,
     left = Infinity,
     bottom = -Infinity,
@@ -20,6 +25,8 @@ export var getBoundingBoxFromSelection = function getBoundingBoxFromSelection(vi
     bottom = Math.max(bottom, coords.bottom);
     right = Math.max(right, coords.right);
   }
+  top = top - offset.top;
+  bottom = bottom - offset.bottom;
   return {
     top: top,
     left: left,

package/dist/types/selectionExtensionPluginType.d.ts

@@ -4,6 +4,7 @@ import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 import type { EditorViewModePlugin } from '@atlaskit/editor-plugin-editor-viewmode';
 import type { PrimaryToolbarPlugin } from '@atlaskit/editor-plugin-primary-toolbar';
 import type { SelectionToolbarPlugin } from '@atlaskit/editor-plugin-selection-toolbar';
+import type { UserPreferencesPlugin } from '@atlaskit/editor-plugin-user-preferences';
 import type { DynamicSelectionExtension, InsertAdfAtEndOfDocResult, LinkInsertionOption, ReplaceWithAdfResult, SelectionExtension, SelectionExtensionPluginOptions, SelectionExtensionPluginState, SelectionExtensionSelectionInfo } from './types';
 export type SelectionExtensionPlugin = NextEditorPlugin<'selectionExtension', {
     pluginConfiguration: SelectionExtensionPluginOptions | undefined;
@@ -11,6 +12,7 @@ export type SelectionExtensionPlugin = NextEditorPlugin<'selectionExtension', {
         OptionalPlugin<AnalyticsPlugin>,
         OptionalPlugin<EditorViewModePlugin>,
         OptionalPlugin<PrimaryToolbarPlugin>,
+        OptionalPlugin<UserPreferencesPlugin>,
         SelectionToolbarPlugin
     ];
     sharedState: SelectionExtensionPluginState | null;

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

@@ -75,6 +75,10 @@ export type SelectionExtensionCoords = {
     top: number;
     bottom: number;
 };
+export type BoundingBoxOffset = {
+    top: number;
+    bottom: number;
+};
 export type InsertPosition = {
     pointer: string;
     from?: number;

package/dist/types/ui/getBoundingBoxFromSelection.d.ts

@@ -1,11 +1,12 @@
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
-import type { SelectionExtensionCoords } from '../types';
+import type { SelectionExtensionCoords, BoundingBoxOffset } from '../types';
 /**
  * Calculates the bounding box coordinates of a text selection within an editor view.
  *
  * @param view - The editor view instance.
  * @param from - The starting position of the selection.
  * @param to - The ending position of the selection.
+ * @param offset - Optional offset to adjust the top and bottom coordinates of the bounding box.`
  * @returns An object containing the top, left, bottom, and right coordinates of the bounding box.
  */
-export declare const getBoundingBoxFromSelection: (view: EditorView, from: number, to: number) => SelectionExtensionCoords;
+export declare const getBoundingBoxFromSelection: (view: EditorView, from: number, to: number, offset?: BoundingBoxOffset) => SelectionExtensionCoords;

package/dist/types-ts4.5/selectionExtensionPluginType.d.ts

@@ -4,6 +4,7 @@ import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 import type { EditorViewModePlugin } from '@atlaskit/editor-plugin-editor-viewmode';
 import type { PrimaryToolbarPlugin } from '@atlaskit/editor-plugin-primary-toolbar';
 import type { SelectionToolbarPlugin } from '@atlaskit/editor-plugin-selection-toolbar';
+import type { UserPreferencesPlugin } from '@atlaskit/editor-plugin-user-preferences';
 import type { DynamicSelectionExtension, InsertAdfAtEndOfDocResult, LinkInsertionOption, ReplaceWithAdfResult, SelectionExtension, SelectionExtensionPluginOptions, SelectionExtensionPluginState, SelectionExtensionSelectionInfo } from './types';
 export type SelectionExtensionPlugin = NextEditorPlugin<'selectionExtension', {
     pluginConfiguration: SelectionExtensionPluginOptions | undefined;
@@ -11,6 +12,7 @@ export type SelectionExtensionPlugin = NextEditorPlugin<'selectionExtension', {
         OptionalPlugin<AnalyticsPlugin>,
         OptionalPlugin<EditorViewModePlugin>,
         OptionalPlugin<PrimaryToolbarPlugin>,
+        OptionalPlugin<UserPreferencesPlugin>,
         SelectionToolbarPlugin
     ];
     sharedState: SelectionExtensionPluginState | null;

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

@@ -75,6 +75,10 @@ export type SelectionExtensionCoords = {
     top: number;
     bottom: number;
 };
+export type BoundingBoxOffset = {
+    top: number;
+    bottom: number;
+};
 export type InsertPosition = {
     pointer: string;
     from?: number;

package/dist/types-ts4.5/ui/getBoundingBoxFromSelection.d.ts

@@ -1,11 +1,12 @@
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
-import type { SelectionExtensionCoords } from '../types';
+import type { SelectionExtensionCoords, BoundingBoxOffset } from '../types';
 /**
  * Calculates the bounding box coordinates of a text selection within an editor view.
  *
  * @param view - The editor view instance.
  * @param from - The starting position of the selection.
  * @param to - The ending position of the selection.
+ * @param offset - Optional offset to adjust the top and bottom coordinates of the bounding box.`
  * @returns An object containing the top, left, bottom, and right coordinates of the bounding box.
  */
-export declare const getBoundingBoxFromSelection: (view: EditorView, from: number, to: number) => SelectionExtensionCoords;
+export declare const getBoundingBoxFromSelection: (view: EditorView, from: number, to: number, offset?: BoundingBoxOffset) => SelectionExtensionCoords;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-selection-extension",
-	"version": "3.4.1",
+	"version": "3.4.2",
 	"description": "editor-plugin-selection-extension plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -41,19 +41,21 @@
 		"@atlaskit/editor-plugin-editor-viewmode": "^5.0.0",
 		"@atlaskit/editor-plugin-primary-toolbar": "^4.1.0",
 		"@atlaskit/editor-plugin-selection-toolbar": "^4.2.0",
+		"@atlaskit/editor-plugin-user-preferences": "^1.2.0",
 		"@atlaskit/editor-prosemirror": "7.0.0",
+		"@atlaskit/editor-shared-styles": "^3.5.0",
 		"@atlaskit/editor-tables": "^2.9.0",
 		"@atlaskit/icon": "^27.8.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/primitives": "^14.11.0",
-		"@atlaskit/tmp-editor-statsig": "^9.17.0",
+		"@atlaskit/tmp-editor-statsig": "^9.20.0",
 		"@babel/runtime": "^7.0.0",
 		"lodash": "^4.17.21",
 		"react-intl-next": "npm:react-intl@^5.18.1",
 		"uuid": "^3.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^107.13.0",
+		"@atlaskit/editor-common": "^107.16.0",
 		"react": "^18.2.0"
 	},
 	"devDependencies": {
@@ -110,6 +112,9 @@
 		},
 		"platform_editor_selection_extension_api_v2": {
 			"type": "boolean"
+		},
+		"platform_editor_use_preferences_plugin": {
+			"type": "boolean"
 		}
 	}
 }