@atlaskit/editor-plugin-selection-extension 3.2.1 → 3.3.1

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @atlaskit/editor-plugin-selection-extension
 
+## 3.3.1
+
+### Patch Changes
+
+- [#191736](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/191736)
+  [`5c91794777225`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/5c91794777225) -
+  Clear activeExtension when selection changed
+
+## 3.3.0
+
+### Minor Changes
+
+- [#191056](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/191056)
+  [`ecf381c9ee85c`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/ecf381c9ee85c) -
+  Update isDisabled prop as boolean type in dynamic configuration
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 3.2.1
 
 ### Patch Changes

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

@@ -9,6 +9,7 @@ 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; }
@@ -54,6 +55,12 @@ var createPlugin = exports.createPlugin = function createPlugin() {
             startTrackChanges: false // Reset the flag to stop tracking after the document has changed
           });
         }
+        // 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')) {
+          return _objectSpread(_objectSpread({}, pluginState), {}, {
+            activeExtension: undefined // Clear active extension on selection change
+          });
+        }
         return pluginState;
       }
     }

package/dist/cjs/selectionExtensionPlugin.js

@@ -181,14 +181,15 @@ var selectionExtensionPlugin = exports.selectionExtensionPlugin = function selec
         };
         var convertExtensionToDropdownMenuItem = function convertExtensionToDropdownMenuItem(extension, rank) {
           var _extension$isDisabled;
+          var disabled = (extension === null || extension === void 0 ? void 0 : extension.isDisabled) instanceof Function ? extension === null || extension === void 0 || (_extension$isDisabled = extension.isDisabled) === null || _extension$isDisabled === void 0 ? void 0 : _extension$isDisabled.call(extension, {
+            selection: editorViewRef.current ? getSelection(editorViewRef.current) : undefined
+          }) : extension === null || extension === void 0 ? void 0 : extension.isDisabled;
           return {
             title: extension.name,
             icon: extension.icon ? /*#__PURE__*/_react.default.createElement(extension.icon, {
               label: ''
             }) : undefined,
-            disabled: extension === null || extension === void 0 || (_extension$isDisabled = extension.isDisabled) === null || _extension$isDisabled === void 0 ? void 0 : _extension$isDisabled.call(extension, {
-              selection: editorViewRef.current ? getSelection(editorViewRef.current) : undefined
-            }),
+            disabled: disabled,
             rank: rank,
             onClick: function onClick() {
               editorViewRef.current && handleOnExtensionClick(editorViewRef.current)(extension);

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

@@ -1,6 +1,7 @@
 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 = () => {
@@ -47,6 +48,13 @@ export const createPlugin = () => {
             startTrackChanges: false // Reset the flag to stop tracking after the document has changed
           };
         }
+        // clear activeExtension if the selection has changed and not empty
+        if (tr.selectionSet && !tr.selection.empty && fg('platform_editor_clear_active_extension_fix')) {
+          return {
+            ...pluginState,
+            activeExtension: undefined // Clear active extension on selection change
+          };
+        }
         return pluginState;
       }
     }

package/dist/es2019/selectionExtensionPlugin.js

@@ -180,14 +180,15 @@ export const selectionExtensionPlugin = ({
         };
         const convertExtensionToDropdownMenuItem = (extension, rank) => {
           var _extension$isDisabled;
+          const disabled = (extension === null || extension === void 0 ? void 0 : extension.isDisabled) instanceof Function ? extension === null || extension === void 0 ? void 0 : (_extension$isDisabled = extension.isDisabled) === null || _extension$isDisabled === void 0 ? void 0 : _extension$isDisabled.call(extension, {
+            selection: editorViewRef.current ? getSelection(editorViewRef.current) : undefined
+          }) : extension === null || extension === void 0 ? void 0 : extension.isDisabled;
           return {
             title: extension.name,
             icon: extension.icon ? /*#__PURE__*/React.createElement(extension.icon, {
               label: ''
             }) : undefined,
-            disabled: extension === null || extension === void 0 ? void 0 : (_extension$isDisabled = extension.isDisabled) === null || _extension$isDisabled === void 0 ? void 0 : _extension$isDisabled.call(extension, {
-              selection: editorViewRef.current ? getSelection(editorViewRef.current) : undefined
-            }),
+            disabled,
             rank,
             onClick: () => {
               editorViewRef.current && handleOnExtensionClick(editorViewRef.current)(extension);

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

@@ -4,6 +4,7 @@ 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() {
@@ -47,6 +48,12 @@ export var createPlugin = function createPlugin() {
             startTrackChanges: false // Reset the flag to stop tracking after the document has changed
           });
         }
+        // clear activeExtension if the selection has changed and not empty
+        if (tr.selectionSet && !tr.selection.empty && fg('platform_editor_clear_active_extension_fix')) {
+          return _objectSpread(_objectSpread({}, pluginState), {}, {
+            activeExtension: undefined // Clear active extension on selection change
+          });
+        }
         return pluginState;
       }
     }

package/dist/esm/selectionExtensionPlugin.js

@@ -174,14 +174,15 @@ export var selectionExtensionPlugin = function selectionExtensionPlugin(_ref) {
         };
         var convertExtensionToDropdownMenuItem = function convertExtensionToDropdownMenuItem(extension, rank) {
           var _extension$isDisabled;
+          var disabled = (extension === null || extension === void 0 ? void 0 : extension.isDisabled) instanceof Function ? extension === null || extension === void 0 || (_extension$isDisabled = extension.isDisabled) === null || _extension$isDisabled === void 0 ? void 0 : _extension$isDisabled.call(extension, {
+            selection: editorViewRef.current ? getSelection(editorViewRef.current) : undefined
+          }) : extension === null || extension === void 0 ? void 0 : extension.isDisabled;
           return {
             title: extension.name,
             icon: extension.icon ? /*#__PURE__*/React.createElement(extension.icon, {
               label: ''
             }) : undefined,
-            disabled: extension === null || extension === void 0 || (_extension$isDisabled = extension.isDisabled) === null || _extension$isDisabled === void 0 ? void 0 : _extension$isDisabled.call(extension, {
-              selection: editorViewRef.current ? getSelection(editorViewRef.current) : undefined
-            }),
+            disabled: disabled,
             rank: rank,
             onClick: function onClick() {
               editorViewRef.current && handleOnExtensionClick(editorViewRef.current)(extension);

package/dist/types/index.d.ts

@@ -1,3 +1,3 @@
 export { selectionExtensionPlugin } from './selectionExtensionPlugin';
 export type { SelectionExtensionPlugin } from './selectionExtensionPluginType';
-export type { SelectionExtensionComponentProps, SelectionExtensionPluginOptions, SelectionExtension, LinkInsertionOption, SelectionExtensionPluginState, SelectionExtensionSelectionInfo, } from './types';
+export type { SelectionExtensionComponentProps, SelectionExtensionPluginOptions, SelectionExtension, LinkInsertionOption, SelectionExtensionPluginState, SelectionExtensionSelectionInfo, DynamicSelectionExtension, } from './types';

package/dist/types/selectionExtensionPluginType.d.ts

@@ -3,7 +3,7 @@ import type { EditorCommand, NextEditorPlugin, OptionalPlugin } from '@atlaskit/
 import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 import type { EditorViewModePlugin } from '@atlaskit/editor-plugin-editor-viewmode';
 import type { SelectionToolbarPlugin } from '@atlaskit/editor-plugin-selection-toolbar';
-import type { LinkInsertionOption, SelectionExtension, SelectionExtensionPluginOptions, SelectionExtensionPluginState, SelectionExtensionSelectionInfo } from './types';
+import type { DynamicSelectionExtension, LinkInsertionOption, SelectionExtension, SelectionExtensionPluginOptions, SelectionExtensionPluginState, SelectionExtensionSelectionInfo } from './types';
 export type SelectionExtensionPlugin = NextEditorPlugin<'selectionExtension', {
     pluginConfiguration: SelectionExtensionPluginOptions | undefined;
     dependencies: [
@@ -14,7 +14,7 @@ export type SelectionExtensionPlugin = NextEditorPlugin<'selectionExtension', {
     sharedState: SelectionExtensionPluginState | null;
     commands: {
         setActiveExtension: ({ extension, selection, }: {
-            extension: SelectionExtension;
+            extension: SelectionExtension | DynamicSelectionExtension;
             selection: SelectionExtensionSelectionInfo;
         }) => EditorCommand;
         clearActiveExtension: () => EditorCommand;

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

@@ -36,6 +36,9 @@ export type SelectionExtension = {
     onClick?: (params: SelectionExtensionCallbackOptions) => void;
     component?: React.ComponentType<SelectionExtensionComponentProps>;
 };
+export type DynamicSelectionExtension = Omit<SelectionExtension, 'isDisabled'> & {
+    isDisabled?: boolean;
+};
 export type SelectionPointer = {
     pointer: string;
     position?: number;
@@ -48,7 +51,7 @@ export type SelectionExtensionFnOptions = {
     selectedNodeAdf: ADFEntity;
     selectionRanges: SelectionRange[];
 };
-export type SelectionExtensionFn = ({ selectedNodeAdf, selectionRanges, }: SelectionExtensionFnOptions) => SelectionExtension;
+export type SelectionExtensionFn = ({ selectedNodeAdf, selectionRanges, }: SelectionExtensionFnOptions) => DynamicSelectionExtension;
 export type SelectionExtensionConfig = SelectionExtension | SelectionExtensionFn;
 export type SelectionExtensions = {
     firstParty?: SelectionExtensionConfig[];

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

@@ -1,3 +1,3 @@
 export { selectionExtensionPlugin } from './selectionExtensionPlugin';
 export type { SelectionExtensionPlugin } from './selectionExtensionPluginType';
-export type { SelectionExtensionComponentProps, SelectionExtensionPluginOptions, SelectionExtension, LinkInsertionOption, SelectionExtensionPluginState, SelectionExtensionSelectionInfo, } from './types';
+export type { SelectionExtensionComponentProps, SelectionExtensionPluginOptions, SelectionExtension, LinkInsertionOption, SelectionExtensionPluginState, SelectionExtensionSelectionInfo, DynamicSelectionExtension, } from './types';

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

@@ -3,7 +3,7 @@ import type { EditorCommand, NextEditorPlugin, OptionalPlugin } from '@atlaskit/
 import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 import type { EditorViewModePlugin } from '@atlaskit/editor-plugin-editor-viewmode';
 import type { SelectionToolbarPlugin } from '@atlaskit/editor-plugin-selection-toolbar';
-import type { LinkInsertionOption, SelectionExtension, SelectionExtensionPluginOptions, SelectionExtensionPluginState, SelectionExtensionSelectionInfo } from './types';
+import type { DynamicSelectionExtension, LinkInsertionOption, SelectionExtension, SelectionExtensionPluginOptions, SelectionExtensionPluginState, SelectionExtensionSelectionInfo } from './types';
 export type SelectionExtensionPlugin = NextEditorPlugin<'selectionExtension', {
     pluginConfiguration: SelectionExtensionPluginOptions | undefined;
     dependencies: [
@@ -14,7 +14,7 @@ export type SelectionExtensionPlugin = NextEditorPlugin<'selectionExtension', {
     sharedState: SelectionExtensionPluginState | null;
     commands: {
         setActiveExtension: ({ extension, selection, }: {
-            extension: SelectionExtension;
+            extension: SelectionExtension | DynamicSelectionExtension;
             selection: SelectionExtensionSelectionInfo;
         }) => EditorCommand;
         clearActiveExtension: () => EditorCommand;

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

@@ -36,6 +36,9 @@ export type SelectionExtension = {
     onClick?: (params: SelectionExtensionCallbackOptions) => void;
     component?: React.ComponentType<SelectionExtensionComponentProps>;
 };
+export type DynamicSelectionExtension = Omit<SelectionExtension, 'isDisabled'> & {
+    isDisabled?: boolean;
+};
 export type SelectionPointer = {
     pointer: string;
     position?: number;
@@ -48,7 +51,7 @@ export type SelectionExtensionFnOptions = {
     selectedNodeAdf: ADFEntity;
     selectionRanges: SelectionRange[];
 };
-export type SelectionExtensionFn = ({ selectedNodeAdf, selectionRanges, }: SelectionExtensionFnOptions) => SelectionExtension;
+export type SelectionExtensionFn = ({ selectedNodeAdf, selectionRanges, }: SelectionExtensionFnOptions) => DynamicSelectionExtension;
 export type SelectionExtensionConfig = SelectionExtension | SelectionExtensionFn;
 export type SelectionExtensions = {
     firstParty?: SelectionExtensionConfig[];

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-selection-extension",
-	"version": "3.2.1",
+	"version": "3.3.1",
 	"description": "editor-plugin-selection-extension plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -42,17 +42,17 @@
 		"@atlaskit/editor-plugin-selection-toolbar": "^4.2.0",
 		"@atlaskit/editor-prosemirror": "7.0.0",
 		"@atlaskit/editor-tables": "^2.9.0",
-		"@atlaskit/icon": "^27.5.0",
+		"@atlaskit/icon": "^27.7.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/primitives": "^14.10.0",
-		"@atlaskit/tmp-editor-statsig": "^9.9.0",
+		"@atlaskit/tmp-editor-statsig": "^9.16.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.9.0",
+		"@atlaskit/editor-common": "^107.12.0",
 		"react": "^18.2.0"
 	},
 	"devDependencies": {
@@ -104,6 +104,9 @@
 		}
 	},
 	"platform-feature-flags": {
+		"platform_editor_clear_active_extension_fix": {
+			"type": "boolean"
+		},
 		"platform_editor_selection_extension_api_v2": {
 			"type": "boolean"
 		}