@atlaskit/editor-plugin-selection-extension 10.0.2 → 10.0.4

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @atlaskit/editor-plugin-selection-extension
 
+## 10.0.4
+
+### Patch Changes
+
+- [`01e7a0b3e1d7a`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/01e7a0b3e1d7a) -
+  Fix range error when select multiple paragraphs
+
+## 10.0.3
+
+### Patch Changes
+
+- [`9e3a102746991`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/9e3a102746991) -
+  EDITOR-4273 Block menu extension lozenge rendering
+- Updated dependencies
+
 ## 10.0.2
 
 ### Patch Changes

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

@@ -185,12 +185,17 @@ function getSelectionAdfInfoNew(selection) {
     } else {
       var $from = selection.$from,
         $to = selection.$to;
-      if ($from.parent === $to.parent) {
+      if ($from.parent === $to.parent && $from.depth > 0) {
         selectionInfo = (0, _selectionHelpers.getSelectionInfoFromSameNode)(selection);
       }
     }
   } else if (selection instanceof _editorTables.CellSelection) {
     selectionInfo = getSelectionInfoFromCellSelection(selection);
+  } else if (selection instanceof _state.NodeSelection) {
+    selectionInfo = {
+      selectedNode: selection.node,
+      nodePos: selection.from
+    };
   }
   var serializer = new _editorJsonTransformer.JSONTransformer();
   var selectedNodeAdf = serializer.encodeNode(selectionInfo.selectedNode);

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

@@ -208,8 +208,8 @@ var getSelectionInfo = exports.getSelectionInfo = function getSelectionInfo(sele
   var $from = selection.$from,
     $to = selection.$to;
 
-  // For same parent selections, check for parent container
-  if ($from.parent === $to.parent) {
+  // For same parent selections but not the r, check for parent container
+  if ($from.parent === $to.parent && $from.depth > 0) {
     var _getCommonParentConta = getCommonParentContainer($from, $to),
       parentNode = _getCommonParentConta.node,
       parentNodePos = _getCommonParentConta.pos;

package/dist/cjs/ui/menu/SelectionExtensionDropdownItem.compiled.css

@@ -0,0 +1 @@
+._18u01b66{margin-left:var(--ds-space-050,4px)}

package/dist/cjs/ui/menu/SelectionExtensionDropdownItem.js

@@ -1,3 +1,4 @@
+/* SelectionExtensionDropdownItem.tsx generated by @compiled/babel-plugin v0.38.1 */
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
@@ -5,13 +6,20 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.SelectionExtensionDropdownItem = void 0;
+require("./SelectionExtensionDropdownItem.compiled.css");
+var _runtime = require("@compiled/react/runtime");
 var _react = _interopRequireDefault(require("react"));
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _editorToolbar = require("@atlaskit/editor-toolbar");
+var _lozenge = _interopRequireDefault(require("@atlaskit/lozenge"));
+var _compiled = require("@atlaskit/primitives/compiled");
 var _main = require("../../pm-plugins/main");
 var _utils = require("../../pm-plugins/utils");
 var _types = require("../../types");
 var _SelectionExtensionComponentContext = require("../SelectionExtensionComponentContext");
+var styles = {
+  lozenge: "_18u01b66"
+};
 var SelectionExtensionDropdownItem = exports.SelectionExtensionDropdownItem = function SelectionExtensionDropdownItem(_ref) {
   var dropdownItem = _ref.dropdownItem;
   var IconComponent = dropdownItem.icon;
@@ -65,5 +73,10 @@ var SelectionExtensionDropdownItem = exports.SelectionExtensionDropdownItem = fu
     }) : undefined,
     onClick: handleClick,
     isDisabled: dropdownItem.isDisabled
-  }, dropdownItem.label);
+  }, dropdownItem.label, dropdownItem.lozenge ? /*#__PURE__*/_react.default.createElement(_compiled.Box, {
+    as: "span",
+    xcss: styles.lozenge
+  }, /*#__PURE__*/_react.default.createElement(_lozenge.default, {
+    appearance: "new"
+  }, dropdownItem.lozenge.label)) : undefined);
 };

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

@@ -1,7 +1,7 @@
 import { logException } from '@atlaskit/editor-common/monitoring';
 import { JSONTransformer } from '@atlaskit/editor-json-transformer';
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
-import { TextSelection } from '@atlaskit/editor-prosemirror/state';
+import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { Transform } from '@atlaskit/editor-prosemirror/transform';
 import { akEditorFullPageToolbarHeight } from '@atlaskit/editor-shared-styles';
 import { CellSelection, TableMap } from '@atlaskit/editor-tables';
@@ -191,12 +191,17 @@ export function getSelectionAdfInfoNew(selection) {
         $from,
         $to
       } = selection;
-      if ($from.parent === $to.parent) {
+      if ($from.parent === $to.parent && $from.depth > 0) {
         selectionInfo = getSelectionInfoFromSameNode(selection);
       }
     }
   } else if (selection instanceof CellSelection) {
     selectionInfo = getSelectionInfoFromCellSelection(selection);
+  } else if (selection instanceof NodeSelection) {
+    selectionInfo = {
+      selectedNode: selection.node,
+      nodePos: selection.from
+    };
   }
   const serializer = new JSONTransformer();
   const selectedNodeAdf = serializer.encodeNode(selectionInfo.selectedNode);

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

@@ -200,8 +200,8 @@ export const getSelectionInfo = (selection, schema) => {
     $to
   } = selection;
 
-  // For same parent selections, check for parent container
-  if ($from.parent === $to.parent) {
+  // For same parent selections but not the r, check for parent container
+  if ($from.parent === $to.parent && $from.depth > 0) {
     const {
       node: parentNode,
       pos: parentNodePos

package/dist/es2019/ui/menu/SelectionExtensionDropdownItem.compiled.css

@@ -0,0 +1 @@
+._18u01b66{margin-left:var(--ds-space-050,4px)}

package/dist/es2019/ui/menu/SelectionExtensionDropdownItem.js

@@ -1,10 +1,18 @@
+/* SelectionExtensionDropdownItem.tsx generated by @compiled/babel-plugin v0.38.1 */
+import "./SelectionExtensionDropdownItem.compiled.css";
+import { ax, ix } from "@compiled/react/runtime";
 import React from 'react';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { ToolbarDropdownItem } from '@atlaskit/editor-toolbar';
+import Lozenge from '@atlaskit/lozenge';
+import { Box } from '@atlaskit/primitives/compiled';
 import { selectionExtensionPluginKey } from '../../pm-plugins/main';
 import { getSelectionAdfInfoNew, getSelectionTextInfoNew } from '../../pm-plugins/utils';
 import { SelectionExtensionActionTypes } from '../../types';
 import { useSelectionExtensionComponentContext } from '../SelectionExtensionComponentContext';
+const styles = {
+  lozenge: "_18u01b66"
+};
 export const SelectionExtensionDropdownItem = ({
   dropdownItem
 }) => {
@@ -62,5 +70,10 @@ export const SelectionExtensionDropdownItem = ({
     }) : undefined,
     onClick: handleClick,
     isDisabled: dropdownItem.isDisabled
-  }, dropdownItem.label);
+  }, dropdownItem.label, dropdownItem.lozenge ? /*#__PURE__*/React.createElement(Box, {
+    as: "span",
+    xcss: styles.lozenge
+  }, /*#__PURE__*/React.createElement(Lozenge, {
+    appearance: "new"
+  }, dropdownItem.lozenge.label)) : undefined);
 };

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

@@ -4,7 +4,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import { logException } from '@atlaskit/editor-common/monitoring';
 import { JSONTransformer } from '@atlaskit/editor-json-transformer';
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
-import { TextSelection } from '@atlaskit/editor-prosemirror/state';
+import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { Transform } from '@atlaskit/editor-prosemirror/transform';
 import { akEditorFullPageToolbarHeight } from '@atlaskit/editor-shared-styles';
 import { CellSelection, TableMap } from '@atlaskit/editor-tables';
@@ -175,12 +175,17 @@ export function getSelectionAdfInfoNew(selection) {
     } else {
       var $from = selection.$from,
         $to = selection.$to;
-      if ($from.parent === $to.parent) {
+      if ($from.parent === $to.parent && $from.depth > 0) {
         selectionInfo = getSelectionInfoFromSameNode(selection);
       }
     }
   } else if (selection instanceof CellSelection) {
     selectionInfo = getSelectionInfoFromCellSelection(selection);
+  } else if (selection instanceof NodeSelection) {
+    selectionInfo = {
+      selectedNode: selection.node,
+      nodePos: selection.from
+    };
   }
   var serializer = new JSONTransformer();
   var selectedNodeAdf = serializer.encodeNode(selectionInfo.selectedNode);

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

@@ -201,8 +201,8 @@ export var getSelectionInfo = function getSelectionInfo(selection, schema) {
   var $from = selection.$from,
     $to = selection.$to;
 
-  // For same parent selections, check for parent container
-  if ($from.parent === $to.parent) {
+  // For same parent selections but not the r, check for parent container
+  if ($from.parent === $to.parent && $from.depth > 0) {
     var _getCommonParentConta = getCommonParentContainer($from, $to),
       parentNode = _getCommonParentConta.node,
       parentNodePos = _getCommonParentConta.pos;

package/dist/esm/ui/menu/SelectionExtensionDropdownItem.compiled.css

@@ -0,0 +1 @@
+._18u01b66{margin-left:var(--ds-space-050,4px)}

package/dist/esm/ui/menu/SelectionExtensionDropdownItem.js

@@ -1,10 +1,18 @@
+/* SelectionExtensionDropdownItem.tsx generated by @compiled/babel-plugin v0.38.1 */
+import "./SelectionExtensionDropdownItem.compiled.css";
+import { ax, ix } from "@compiled/react/runtime";
 import React from 'react';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { ToolbarDropdownItem } from '@atlaskit/editor-toolbar';
+import Lozenge from '@atlaskit/lozenge';
+import { Box } from '@atlaskit/primitives/compiled';
 import { selectionExtensionPluginKey } from '../../pm-plugins/main';
 import { getSelectionAdfInfoNew, getSelectionTextInfoNew } from '../../pm-plugins/utils';
 import { SelectionExtensionActionTypes } from '../../types';
 import { useSelectionExtensionComponentContext } from '../SelectionExtensionComponentContext';
+var styles = {
+  lozenge: "_18u01b66"
+};
 export var SelectionExtensionDropdownItem = function SelectionExtensionDropdownItem(_ref) {
   var dropdownItem = _ref.dropdownItem;
   var IconComponent = dropdownItem.icon;
@@ -58,5 +66,10 @@ export var SelectionExtensionDropdownItem = function SelectionExtensionDropdownI
     }) : undefined,
     onClick: handleClick,
     isDisabled: dropdownItem.isDisabled
-  }, dropdownItem.label);
+  }, dropdownItem.label, dropdownItem.lozenge ? /*#__PURE__*/React.createElement(Box, {
+    as: "span",
+    xcss: styles.lozenge
+  }, /*#__PURE__*/React.createElement(Lozenge, {
+    appearance: "new"
+  }, dropdownItem.lozenge.label)) : undefined);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-selection-extension",
-	"version": "10.0.2",
+	"version": "10.0.4",
 	"description": "editor-plugin-selection-extension plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -33,6 +33,7 @@
 	"atlaskit:src": "src/index.ts",
 	"dependencies": {
 		"@atlaskit/adf-utils": "^19.26.0",
+		"@atlaskit/css": "^0.19.0",
 		"@atlaskit/editor-json-transformer": "^8.31.0",
 		"@atlaskit/editor-plugin-analytics": "^7.0.0",
 		"@atlaskit/editor-plugin-block-controls": "^8.0.0",
@@ -47,19 +48,20 @@
 		"@atlaskit/editor-shared-styles": "^3.10.0",
 		"@atlaskit/editor-tables": "^2.9.0",
 		"@atlaskit/editor-toolbar": "^0.18.0",
-		"@atlaskit/icon": "^29.3.0",
+		"@atlaskit/icon": "^29.4.0",
 		"@atlaskit/lozenge": "^13.3.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/platform-feature-flags-react": "^0.4.0",
 		"@atlaskit/primitives": "^17.0.0",
-		"@atlaskit/tmp-editor-statsig": "^16.5.0",
+		"@atlaskit/tmp-editor-statsig": "^16.8.0",
+		"@atlaskit/tokens": "^9.1.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": "^111.2.0",
+		"@atlaskit/editor-common": "^111.6.0",
 		"react": "^18.2.0"
 	},
 	"devDependencies": {