@atlaskit/editor-plugin-selection-extension 7.1.2 → 7.2.0

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @atlaskit/editor-plugin-selection-extension
 
+## 7.2.0
+
+### Minor Changes
+
+- [`ed556ceff1790`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/ed556ceff1790) -
+  Update selectionExtension config to accept lozenge in menu button
+
+### Patch Changes
+
+- Updated dependencies
+
+## 7.1.3
+
+### Patch Changes
+
+- [`096e1ff839aa4`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/096e1ff839aa4) -
+  Clean up `platform_editor_clear_active_extension_fix` feature gate
+- Updated dependencies
+
 ## 7.1.2
 
 ### Patch Changes

package/dist/cjs/pm-plugins/actions/replaceWithAdf.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.replaceWithAdf = void 0;
 var _model = require("@atlaskit/editor-prosemirror/model");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _types = require("../../types");
 var _main = require("../main");
 var replaceWithAdf = exports.replaceWithAdf = function replaceWithAdf(nodeAdf, api) {
@@ -32,7 +33,7 @@ var replaceWithAdf = exports.replaceWithAdf = function replaceWithAdf(nodeAdf, a
       if (!selectedNode || nodePos === undefined) {
         throw new Error('No selected node or node position found');
       }
-      var endPos = selectedNode.nodeSize + nodePos;
+      var endPos = selectedNode.type.name === 'doc' && (0, _platformFeatureFlags.fg)('platform_editor_selection_extension_improvement') ? nodePos + selectedNode.content.size : nodePos + selectedNode.nodeSize;
       var modifiedNode = _model.Node.fromJSON(schema, nodeAdf);
       modifiedNode.check();
       var updatedTr = tr.replaceWith(nodePos, endPos, modifiedNode).scrollIntoView();
@@ -41,7 +42,7 @@ var replaceWithAdf = exports.replaceWithAdf = function replaceWithAdf(nodeAdf, a
       return {
         status: 'success'
       };
-    } catch (error) {
+    } catch (_unused) {
       dispatch(tr);
       return {
         status: 'failed-to-replace'

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

@@ -9,7 +9,6 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _transform = require("@atlaskit/editor-prosemirror/transform");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _types = require("../types");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -56,7 +55,7 @@ var createPlugin = exports.createPlugin = function createPlugin() {
           });
         }
         // clear activeExtension if the selection has changed and not empty
-        if (tr.selectionSet && !tr.selection.empty && (0, _platformFeatureFlags.fg)('platform_editor_clear_active_extension_fix')) {
+        if (tr.selectionSet && !tr.selection.empty) {
           return _objectSpread(_objectSpread({}, pluginState), {}, {
             activeExtension: undefined // Clear active extension on selection change
           });

package/dist/cjs/ui/toolbar-components/MenuItem.js

@@ -8,6 +8,9 @@ exports.MenuItem = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _toolbar = require("@atlaskit/editor-common/toolbar");
 var _editorToolbar = require("@atlaskit/editor-toolbar");
+var _lozenge = _interopRequireDefault(require("@atlaskit/lozenge"));
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _compiled = require("@atlaskit/primitives/compiled");
 var _main = require("../../pm-plugins/main");
 var _utils = require("../../pm-plugins/utils");
 var _types = require("../../types");
@@ -53,6 +56,11 @@ var MenuItem = exports.MenuItem = function MenuItem(_ref) {
       }),
       onClick: onClickHandle(extension),
       isDisabled: extension.isDisabled
-    }, extension.label);
+    }, extension.label, extension.lozenge && (0, _platformFeatureFlags.fg)('platform_editor_selection_extension_lozenge') && /*#__PURE__*/_react.default.createElement(_compiled.Box, {
+      as: "span",
+      paddingInline: "space.100"
+    }, /*#__PURE__*/_react.default.createElement(_lozenge.default, {
+      appearance: 'new'
+    }, extension.lozenge.label)));
   }));
 };

package/dist/es2019/pm-plugins/actions/replaceWithAdf.js

@@ -1,4 +1,5 @@
 import { Node } from '@atlaskit/editor-prosemirror/model';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { SelectionExtensionActionTypes } from '../../types';
 import { selectionExtensionPluginKey } from '../main';
 export const replaceWithAdf = (nodeAdf, api) => (state, dispatch) => {
@@ -27,7 +28,7 @@ export const replaceWithAdf = (nodeAdf, api) => (state, dispatch) => {
     if (!selectedNode || nodePos === undefined) {
       throw new Error('No selected node or node position found');
     }
-    const endPos = selectedNode.nodeSize + nodePos;
+    const endPos = selectedNode.type.name === 'doc' && fg('platform_editor_selection_extension_improvement') ? nodePos + selectedNode.content.size : nodePos + selectedNode.nodeSize;
     const modifiedNode = Node.fromJSON(schema, nodeAdf);
     modifiedNode.check();
     const updatedTr = tr.replaceWith(nodePos, endPos, modifiedNode).scrollIntoView();
@@ -36,7 +37,7 @@ export const replaceWithAdf = (nodeAdf, api) => (state, dispatch) => {
     return {
       status: 'success'
     };
-  } catch (error) {
+  } catch {
     dispatch(tr);
     return {
       status: 'failed-to-replace'

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

@@ -1,7 +1,6 @@
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { ReplaceAroundStep, ReplaceStep } from '@atlaskit/editor-prosemirror/transform';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { SelectionExtensionActionTypes } from '../types';
 export const selectionExtensionPluginKey = new PluginKey('selectionExtensionPlugin');
 export const createPlugin = () => {
@@ -49,7 +48,7 @@ export const createPlugin = () => {
           };
         }
         // clear activeExtension if the selection has changed and not empty
-        if (tr.selectionSet && !tr.selection.empty && fg('platform_editor_clear_active_extension_fix')) {
+        if (tr.selectionSet && !tr.selection.empty) {
           return {
             ...pluginState,
             activeExtension: undefined // Clear active extension on selection change

package/dist/es2019/ui/toolbar-components/MenuItem.js

@@ -1,6 +1,9 @@
 import React from 'react';
 import { useEditorToolbar } from '@atlaskit/editor-common/toolbar';
 import { ToolbarDropdownItem } from '@atlaskit/editor-toolbar';
+import Lozenge from '@atlaskit/lozenge';
+import { fg } from '@atlaskit/platform-feature-flags';
+import { Box } from '@atlaskit/primitives/compiled';
 import { selectionExtensionPluginKey } from '../../pm-plugins/main';
 import { getSelectionAdfInfoNew, getSelectionTextInfo } from '../../pm-plugins/utils';
 import { SelectionExtensionActionTypes } from '../../types';
@@ -48,6 +51,11 @@ export const MenuItem = ({
       }),
       onClick: onClickHandle(extension),
       isDisabled: extension.isDisabled
-    }, extension.label);
+    }, extension.label, extension.lozenge && fg('platform_editor_selection_extension_lozenge') && /*#__PURE__*/React.createElement(Box, {
+      as: "span",
+      paddingInline: "space.100"
+    }, /*#__PURE__*/React.createElement(Lozenge, {
+      appearance: 'new'
+    }, extension.lozenge.label)));
   }));
 };

package/dist/esm/pm-plugins/actions/replaceWithAdf.js

@@ -1,4 +1,5 @@
 import { Node } from '@atlaskit/editor-prosemirror/model';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { SelectionExtensionActionTypes } from '../../types';
 import { selectionExtensionPluginKey } from '../main';
 export var replaceWithAdf = function replaceWithAdf(nodeAdf, api) {
@@ -26,7 +27,7 @@ export var replaceWithAdf = function replaceWithAdf(nodeAdf, api) {
       if (!selectedNode || nodePos === undefined) {
         throw new Error('No selected node or node position found');
       }
-      var endPos = selectedNode.nodeSize + nodePos;
+      var endPos = selectedNode.type.name === 'doc' && fg('platform_editor_selection_extension_improvement') ? nodePos + selectedNode.content.size : nodePos + selectedNode.nodeSize;
       var modifiedNode = Node.fromJSON(schema, nodeAdf);
       modifiedNode.check();
       var updatedTr = tr.replaceWith(nodePos, endPos, modifiedNode).scrollIntoView();
@@ -35,7 +36,7 @@ export var replaceWithAdf = function replaceWithAdf(nodeAdf, api) {
       return {
         status: 'success'
       };
-    } catch (error) {
+    } catch (_unused) {
       dispatch(tr);
       return {
         status: 'failed-to-replace'

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

@@ -4,7 +4,6 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { ReplaceAroundStep, ReplaceStep } from '@atlaskit/editor-prosemirror/transform';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { SelectionExtensionActionTypes } from '../types';
 export var selectionExtensionPluginKey = new PluginKey('selectionExtensionPlugin');
 export var createPlugin = function createPlugin() {
@@ -49,7 +48,7 @@ export var createPlugin = function createPlugin() {
           });
         }
         // clear activeExtension if the selection has changed and not empty
-        if (tr.selectionSet && !tr.selection.empty && fg('platform_editor_clear_active_extension_fix')) {
+        if (tr.selectionSet && !tr.selection.empty) {
           return _objectSpread(_objectSpread({}, pluginState), {}, {
             activeExtension: undefined // Clear active extension on selection change
           });

package/dist/esm/ui/toolbar-components/MenuItem.js

@@ -1,6 +1,9 @@
 import React from 'react';
 import { useEditorToolbar } from '@atlaskit/editor-common/toolbar';
 import { ToolbarDropdownItem } from '@atlaskit/editor-toolbar';
+import Lozenge from '@atlaskit/lozenge';
+import { fg } from '@atlaskit/platform-feature-flags';
+import { Box } from '@atlaskit/primitives/compiled';
 import { selectionExtensionPluginKey } from '../../pm-plugins/main';
 import { getSelectionAdfInfoNew, getSelectionTextInfo } from '../../pm-plugins/utils';
 import { SelectionExtensionActionTypes } from '../../types';
@@ -46,6 +49,11 @@ export var MenuItem = function MenuItem(_ref) {
       }),
       onClick: onClickHandle(extension),
       isDisabled: extension.isDisabled
-    }, extension.label);
+    }, extension.label, extension.lozenge && fg('platform_editor_selection_extension_lozenge') && /*#__PURE__*/React.createElement(Box, {
+      as: "span",
+      paddingInline: "space.100"
+    }, /*#__PURE__*/React.createElement(Lozenge, {
+      appearance: 'new'
+    }, extension.lozenge.label)));
   }));
 };

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

@@ -155,6 +155,12 @@ export type ExtensionMenuItemConfiguration = {
     }>>;
     isDisabled?: boolean;
     label: string;
+    /**
+     * Optional lozenge to display next to the label in the menu
+     */
+    lozenge?: {
+        label: string;
+    };
     onClick?: () => void;
     /**
      * Optional menu-section to declare grouping - only used for menu items

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

@@ -155,6 +155,12 @@ export type ExtensionMenuItemConfiguration = {
     }>>;
     isDisabled?: boolean;
     label: string;
+    /**
+     * Optional lozenge to display next to the label in the menu
+     */
+    lozenge?: {
+        label: string;
+    };
     onClick?: () => void;
     /**
      * Optional menu-section to declare grouping - only used for menu items

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-selection-extension",
-	"version": "7.1.2",
+	"version": "7.2.0",
 	"description": "editor-plugin-selection-extension plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -47,16 +47,18 @@
 		"@atlaskit/editor-tables": "^2.9.0",
 		"@atlaskit/editor-toolbar": "^0.18.0",
 		"@atlaskit/icon": "^29.0.0",
+		"@atlaskit/lozenge": "^13.1.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/platform-feature-flags-react": "^0.4.0",
-		"@atlaskit/tmp-editor-statsig": "^14.4.0",
+		"@atlaskit/primitives": "^16.4.0",
+		"@atlaskit/tmp-editor-statsig": "^14.6.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": "^110.37.0",
+		"@atlaskit/editor-common": "^110.38.0",
 		"react": "^18.2.0"
 	},
 	"devDependencies": {
@@ -103,10 +105,10 @@
 		}
 	},
 	"platform-feature-flags": {
-		"platform_editor_clear_active_extension_fix": {
+		"platform_editor_use_preferences_plugin": {
 			"type": "boolean"
 		},
-		"platform_editor_use_preferences_plugin": {
+		"platform_editor_selection_extension_lozenge": {
 			"type": "boolean"
 		},
 		"platform_editor_selection_extension_improvement": {