@atlaskit/editor-plugin-toolbar 0.4.1 → 0.4.3

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/editor-plugin-toolbar
 
+## 0.4.3
+
+### Patch Changes
+
+- [`463f3da1f7822`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/463f3da1f7822) -
+  [ux] ED-29040 add new option to disable selection toolbar when the toolbar is pinned
+- Updated dependencies
+
+## 0.4.2
+
+### Patch Changes
+
+- [`265c1bf0cefa4`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/265c1bf0cefa4) -
+  Sorted type and interface props to improve Atlaskit docs
+- Updated dependencies
+
 ## 0.4.1
 
 ### Patch Changes

package/afm-cc/tsconfig.json

@@ -2,9 +2,9 @@
 	"extends": "../../../../tsconfig.entry-points.confluence.json",
 	"compilerOptions": {
 		"target": "es5",
-		"composite": true,
 		"outDir": "../../../../../confluence/tsDist/@atlaskit__editor-plugin-toolbar",
-		"rootDir": "../"
+		"rootDir": "../",
+		"composite": true
 	},
 	"include": [
 		"../src/**/*.ts",
@@ -45,4 +45,4 @@
 			"path": "../../editor-common/afm-cc/tsconfig.json"
 		}
 	]
-}
+}

package/dist/cjs/toolbarPlugin.js

@@ -21,9 +21,11 @@ var toolbarPlugin = exports.toolbarPlugin = function toolbarPlugin(_ref) {
   var api = _ref.api,
     _ref$config = _ref.config,
     config = _ref$config === void 0 ? {
-      disableSelectionToolbar: false
+      disableSelectionToolbar: false,
+      disableSelectionToolbarWhenPinned: false
     } : _ref$config;
-  var disableSelectionToolbar = config.disableSelectionToolbar;
+  var disableSelectionToolbar = config.disableSelectionToolbar,
+    disableSelectionToolbarWhenPinned = config.disableSelectionToolbarWhenPinned;
   var registry = (0, _editorToolbarModel.createComponentRegistry)();
   registry.register((0, _toolbarComponents.getToolbarComponents)(api, disableSelectionToolbar));
   return {
@@ -117,7 +119,8 @@ var toolbarPlugin = exports.toolbarPlugin = function toolbarPlugin(_ref) {
       return /*#__PURE__*/_react.default.createElement(_SelectionToolbar.SelectionToolbar, {
         api: api,
         editorView: editorView,
-        mountPoint: popupsMountPoint
+        mountPoint: popupsMountPoint,
+        disableSelectionToolbarWhenPinned: disableSelectionToolbarWhenPinned !== null && disableSelectionToolbarWhenPinned !== void 0 ? disableSelectionToolbarWhenPinned : false
       });
     } : undefined
   };

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

@@ -27,7 +27,8 @@ var SelectionToolbar = exports.SelectionToolbar = function SelectionToolbar(_ref
   var _api$toolbar, _api$toolbar$getCompo;
   var api = _ref.api,
     editorView = _ref.editorView,
-    mountPoint = _ref.mountPoint;
+    mountPoint = _ref.mountPoint,
+    disableSelectionToolbarWhenPinned = _ref.disableSelectionToolbarWhenPinned;
   var _useSharedPluginState = (0, _hooks.useSharedPluginStateWithSelector)(api, ['toolbar'], function (state) {
       var _state$toolbarState;
       return {
@@ -47,6 +48,7 @@ var SelectionToolbar = exports.SelectionToolbar = function SelectionToolbar(_ref
   var selection = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'selection.selection');
   var isTextSelection = !editorView.state.selection.empty && editorView.state.selection instanceof _state.TextSelection;
   var isCellSelection = !editorView.state.selection.empty && '$anchorCell' in editorView.state.selection;
+  var toolbarDocking = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'userPreferences.preferences.toolbarDockingPosition');
   var onPositionCalculated = (0, _react.useCallback)(function (position) {
     var toolbarTitle = _consts.SELECTION_TOOLBAR_LABEL;
 
@@ -59,7 +61,7 @@ var SelectionToolbar = exports.SelectionToolbar = function SelectionToolbar(_ref
     var calc = _utils.calculateToolbarPositionTrackHead;
     return calc(toolbarTitle)(editorView, position);
   }, [editorView]);
-  if (!components || !toolbar) {
+  if ((0, _expValEquals.expValEquals)('platform_editor_toolbar_aifc_template_editor', 'isEnabled', true) && toolbarDocking === 'top' && disableSelectionToolbarWhenPinned || !components || !toolbar) {
     return null;
   }
   if (!(isTextSelection || isCellSelection) || currentUserIntent === 'dragging' || !shouldShowToolbar || currentUserIntent === 'blockMenuOpen' && (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu', 'isEnabled', true) || (0, _coreUtils.isSSR)()) {

package/dist/es2019/toolbarPlugin.js

@@ -10,11 +10,13 @@ import { isEventInContainer } from './ui/utils/toolbar';
 export const toolbarPlugin = ({
   api,
   config = {
-    disableSelectionToolbar: false
+    disableSelectionToolbar: false,
+    disableSelectionToolbarWhenPinned: false
   }
 }) => {
   const {
-    disableSelectionToolbar
+    disableSelectionToolbar,
+    disableSelectionToolbarWhenPinned
   } = config;
   const registry = createComponentRegistry();
   registry.register(getToolbarComponents(api, disableSelectionToolbar));
@@ -113,7 +115,8 @@ export const toolbarPlugin = ({
       return /*#__PURE__*/React.createElement(SelectionToolbar, {
         api: api,
         editorView: editorView,
-        mountPoint: popupsMountPoint
+        mountPoint: popupsMountPoint,
+        disableSelectionToolbarWhenPinned: disableSelectionToolbarWhenPinned !== null && disableSelectionToolbarWhenPinned !== void 0 ? disableSelectionToolbarWhenPinned : false
       });
     } : undefined
   };

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

@@ -18,7 +18,8 @@ const isToolbarComponent = component => {
 export const SelectionToolbar = ({
   api,
   editorView,
-  mountPoint
+  mountPoint,
+  disableSelectionToolbarWhenPinned
 }) => {
   var _api$toolbar, _api$toolbar$actions, _api$toolbar$actions$;
   const {
@@ -39,6 +40,7 @@ export const SelectionToolbar = ({
   const selection = useSharedPluginStateSelector(api, 'selection.selection');
   const isTextSelection = !editorView.state.selection.empty && editorView.state.selection instanceof TextSelection;
   const isCellSelection = !editorView.state.selection.empty && '$anchorCell' in editorView.state.selection;
+  const toolbarDocking = useSharedPluginStateSelector(api, 'userPreferences.preferences.toolbarDockingPosition');
   const onPositionCalculated = useCallback(position => {
     const toolbarTitle = SELECTION_TOOLBAR_LABEL;
 
@@ -51,7 +53,7 @@ export const SelectionToolbar = ({
     const calc = calculateToolbarPositionTrackHead;
     return calc(toolbarTitle)(editorView, position);
   }, [editorView]);
-  if (!components || !toolbar) {
+  if (expValEquals('platform_editor_toolbar_aifc_template_editor', 'isEnabled', true) && toolbarDocking === 'top' && disableSelectionToolbarWhenPinned || !components || !toolbar) {
     return null;
   }
   if (!(isTextSelection || isCellSelection) || currentUserIntent === 'dragging' || !shouldShowToolbar || currentUserIntent === 'blockMenuOpen' && expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true) || isSSR()) {

package/dist/esm/toolbarPlugin.js

@@ -14,9 +14,11 @@ export var toolbarPlugin = function toolbarPlugin(_ref) {
   var api = _ref.api,
     _ref$config = _ref.config,
     config = _ref$config === void 0 ? {
-      disableSelectionToolbar: false
+      disableSelectionToolbar: false,
+      disableSelectionToolbarWhenPinned: false
     } : _ref$config;
-  var disableSelectionToolbar = config.disableSelectionToolbar;
+  var disableSelectionToolbar = config.disableSelectionToolbar,
+    disableSelectionToolbarWhenPinned = config.disableSelectionToolbarWhenPinned;
   var registry = createComponentRegistry();
   registry.register(getToolbarComponents(api, disableSelectionToolbar));
   return {
@@ -110,7 +112,8 @@ export var toolbarPlugin = function toolbarPlugin(_ref) {
       return /*#__PURE__*/React.createElement(SelectionToolbar, {
         api: api,
         editorView: editorView,
-        mountPoint: popupsMountPoint
+        mountPoint: popupsMountPoint,
+        disableSelectionToolbarWhenPinned: disableSelectionToolbarWhenPinned !== null && disableSelectionToolbarWhenPinned !== void 0 ? disableSelectionToolbarWhenPinned : false
       });
     } : undefined
   };

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

@@ -19,7 +19,8 @@ export var SelectionToolbar = function SelectionToolbar(_ref) {
   var _api$toolbar, _api$toolbar$getCompo;
   var api = _ref.api,
     editorView = _ref.editorView,
-    mountPoint = _ref.mountPoint;
+    mountPoint = _ref.mountPoint,
+    disableSelectionToolbarWhenPinned = _ref.disableSelectionToolbarWhenPinned;
   var _useSharedPluginState = useSharedPluginStateWithSelector(api, ['toolbar'], function (state) {
       var _state$toolbarState;
       return {
@@ -39,6 +40,7 @@ export var SelectionToolbar = function SelectionToolbar(_ref) {
   var selection = useSharedPluginStateSelector(api, 'selection.selection');
   var isTextSelection = !editorView.state.selection.empty && editorView.state.selection instanceof TextSelection;
   var isCellSelection = !editorView.state.selection.empty && '$anchorCell' in editorView.state.selection;
+  var toolbarDocking = useSharedPluginStateSelector(api, 'userPreferences.preferences.toolbarDockingPosition');
   var onPositionCalculated = useCallback(function (position) {
     var toolbarTitle = SELECTION_TOOLBAR_LABEL;
 
@@ -51,7 +53,7 @@ export var SelectionToolbar = function SelectionToolbar(_ref) {
     var calc = calculateToolbarPositionTrackHead;
     return calc(toolbarTitle)(editorView, position);
   }, [editorView]);
-  if (!components || !toolbar) {
+  if (expValEquals('platform_editor_toolbar_aifc_template_editor', 'isEnabled', true) && toolbarDocking === 'top' && disableSelectionToolbarWhenPinned || !components || !toolbar) {
     return null;
   }
   if (!(isTextSelection || isCellSelection) || currentUserIntent === 'dragging' || !shouldShowToolbar || currentUserIntent === 'blockMenuOpen' && expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true) || isSSR()) {

package/dist/types/toolbarPluginType.d.ts

@@ -7,9 +7,9 @@ import type { UserPreferencesPlugin } from '@atlaskit/editor-plugin-user-prefere
 import type { RegisterComponent } from '@atlaskit/editor-toolbar-model';
 import type { ToolbarPluginOptions } from './types';
 export type ToolbarPlugin = NextEditorPlugin<'toolbar', {
-    pluginConfiguration?: ToolbarPluginOptions;
-    sharedState: {
-        shouldShowToolbar: boolean;
+    actions: {
+        getComponents: () => Array<RegisterComponent>;
+        registerComponents: (toolbarComponents: Array<RegisterComponent>) => void;
     };
     dependencies: [
         OptionalPlugin<UserIntentPlugin>,
@@ -18,8 +18,8 @@ export type ToolbarPlugin = NextEditorPlugin<'toolbar', {
         OptionalPlugin<EditorViewModePlugin>,
         OptionalPlugin<ConnectivityPlugin>
     ];
-    actions: {
-        registerComponents: (toolbarComponents: Array<RegisterComponent>) => void;
-        getComponents: () => Array<RegisterComponent>;
+    pluginConfiguration?: ToolbarPluginOptions;
+    sharedState: {
+        shouldShowToolbar: boolean;
     };
 }>;

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

@@ -1,3 +1,4 @@
 export type ToolbarPluginOptions = {
     disableSelectionToolbar?: boolean;
+    disableSelectionToolbarWhenPinned?: boolean;
 };

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

@@ -3,13 +3,13 @@ import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { ToolbarComponentTypes } from '@atlaskit/editor-toolbar-model';
 import type { ToolbarPlugin } from '../toolbarPluginType';
 type SectionProps = {
+    api?: ExtractInjectionAPI<ToolbarPlugin>;
     children: React.ReactNode;
+    disableSelectionToolbar?: boolean;
+    isSharedSection?: boolean;
     parents: ToolbarComponentTypes;
-    api?: ExtractInjectionAPI<ToolbarPlugin>;
-    testId?: string;
     showSeparatorInFullPagePrimaryToolbar?: boolean;
-    isSharedSection?: boolean;
-    disableSelectionToolbar?: boolean;
+    testId?: string;
 };
 export declare const Section: ({ children, parents, api, testId, showSeparatorInFullPagePrimaryToolbar, isSharedSection, disableSelectionToolbar, }: SectionProps) => React.JSX.Element | null;
 export {};

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

@@ -3,9 +3,10 @@ import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import type { ToolbarPlugin } from '../../toolbarPluginType';
 type SelectionToolbarProps = {
-    editorView: EditorView;
     api?: ExtractInjectionAPI<ToolbarPlugin>;
+    editorView: EditorView;
     mountPoint: HTMLElement | undefined;
+    disableSelectionToolbarWhenPinned: boolean;
 };
-export declare const SelectionToolbar: ({ api, editorView, mountPoint }: SelectionToolbarProps) => React.JSX.Element | null;
+export declare const SelectionToolbar: ({ api, editorView, mountPoint, disableSelectionToolbarWhenPinned }: SelectionToolbarProps) => React.JSX.Element | null;
 export {};

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

@@ -7,9 +7,9 @@ import type { UserPreferencesPlugin } from '@atlaskit/editor-plugin-user-prefere
 import type { RegisterComponent } from '@atlaskit/editor-toolbar-model';
 import type { ToolbarPluginOptions } from './types';
 export type ToolbarPlugin = NextEditorPlugin<'toolbar', {
-    pluginConfiguration?: ToolbarPluginOptions;
-    sharedState: {
-        shouldShowToolbar: boolean;
+    actions: {
+        getComponents: () => Array<RegisterComponent>;
+        registerComponents: (toolbarComponents: Array<RegisterComponent>) => void;
     };
     dependencies: [
         OptionalPlugin<UserIntentPlugin>,
@@ -18,8 +18,8 @@ export type ToolbarPlugin = NextEditorPlugin<'toolbar', {
         OptionalPlugin<EditorViewModePlugin>,
         OptionalPlugin<ConnectivityPlugin>
     ];
-    actions: {
-        registerComponents: (toolbarComponents: Array<RegisterComponent>) => void;
-        getComponents: () => Array<RegisterComponent>;
+    pluginConfiguration?: ToolbarPluginOptions;
+    sharedState: {
+        shouldShowToolbar: boolean;
     };
 }>;

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

@@ -1,3 +1,4 @@
 export type ToolbarPluginOptions = {
     disableSelectionToolbar?: boolean;
+    disableSelectionToolbarWhenPinned?: boolean;
 };

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

@@ -3,13 +3,13 @@ import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { ToolbarComponentTypes } from '@atlaskit/editor-toolbar-model';
 import type { ToolbarPlugin } from '../toolbarPluginType';
 type SectionProps = {
+    api?: ExtractInjectionAPI<ToolbarPlugin>;
     children: React.ReactNode;
+    disableSelectionToolbar?: boolean;
+    isSharedSection?: boolean;
     parents: ToolbarComponentTypes;
-    api?: ExtractInjectionAPI<ToolbarPlugin>;
-    testId?: string;
     showSeparatorInFullPagePrimaryToolbar?: boolean;
-    isSharedSection?: boolean;
-    disableSelectionToolbar?: boolean;
+    testId?: string;
 };
 export declare const Section: ({ children, parents, api, testId, showSeparatorInFullPagePrimaryToolbar, isSharedSection, disableSelectionToolbar, }: SectionProps) => React.JSX.Element | null;
 export {};

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

@@ -3,9 +3,10 @@ import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import type { ToolbarPlugin } from '../../toolbarPluginType';
 type SelectionToolbarProps = {
-    editorView: EditorView;
     api?: ExtractInjectionAPI<ToolbarPlugin>;
+    editorView: EditorView;
     mountPoint: HTMLElement | undefined;
+    disableSelectionToolbarWhenPinned: boolean;
 };
-export declare const SelectionToolbar: ({ api, editorView, mountPoint }: SelectionToolbarProps) => React.JSX.Element | null;
+export declare const SelectionToolbar: ({ api, editorView, mountPoint, disableSelectionToolbarWhenPinned }: SelectionToolbarProps) => React.JSX.Element | null;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-toolbar",
-	"version": "0.4.1",
+	"version": "0.4.3",
 	"description": "Toolbar plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -39,13 +39,13 @@
 		"@atlaskit/editor-prosemirror": "7.0.0",
 		"@atlaskit/editor-toolbar": "^0.3.0",
 		"@atlaskit/editor-toolbar-model": "^0.1.0",
-		"@atlaskit/tmp-editor-statsig": "^11.5.0",
+		"@atlaskit/tmp-editor-statsig": "^11.8.0",
 		"@babel/runtime": "^7.0.0",
 		"bind-event-listener": "^3.0.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^107.28.0",
+		"@atlaskit/editor-common": "^107.31.0",
 		"react": "^18.2.0"
 	},
 	"techstack": {