@atlaskit/editor-plugin-toolbar 5.1.0 → 5.1.1

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/editor-plugin-toolbar
 
+## 5.1.1
+
+### Patch Changes
+
+- [`11f2dadbd0b51`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/11f2dadbd0b51) -
+  Adjust z-index of selection toolbar, making it inline with menus and other high priority elements.
+- Updated dependencies
+
 ## 5.1.0
 
 ### Minor Changes

package/afm-cc/tsconfig.json

@@ -42,6 +42,9 @@
 		{
 			"path": "../../editor-prosemirror/afm-cc/tsconfig.json"
 		},
+		{
+			"path": "../../editor-shared-styles/afm-cc/tsconfig.json"
+		},
 		{
 			"path": "../../editor-toolbar/afm-cc/tsconfig.json"
 		},

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

@@ -17,8 +17,10 @@ var _ui = require("@atlaskit/editor-common/ui");
 var _utils = require("@atlaskit/editor-common/utils");
 var _editorPluginConnectivity = require("@atlaskit/editor-plugin-connectivity");
 var _state = require("@atlaskit/editor-prosemirror/state");
+var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 var _editorToolbar = require("@atlaskit/editor-toolbar");
 var _editorToolbarModel = require("@atlaskit/editor-toolbar-model");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _expValEqualsNoExposure = require("@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure");
 var _consts = require("../consts");
@@ -102,7 +104,8 @@ var SelectionToolbar = exports.SelectionToolbar = function SelectionToolbar(_ref
     offset: [0, 10],
     target: (0, _utils2.getDomRefFromSelection)(editorView),
     onPositionCalculated: onPositionCalculated,
-    mountTo: mountPoint
+    mountTo: mountPoint,
+    zIndex: (0, _platformFeatureFlags.fg)('platform_editor_sel_toolbar_stacking_fix') ? _editorSharedStyles.akEditorFloatingDialogZIndex : undefined
   }, /*#__PURE__*/_react.default.createElement(_toolbar.EditorToolbarProvider, {
     editorView: editorView,
     editorToolbarDockingPreference: editorToolbarDockingPreference,

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

@@ -10,8 +10,10 @@ import { Popup } from '@atlaskit/editor-common/ui';
 import { calculateToolbarPositionTrackHead, calculateToolbarPositionOnCellSelection } from '@atlaskit/editor-common/utils';
 import { isOfflineMode } from '@atlaskit/editor-plugin-connectivity';
 import { AllSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
+import { akEditorFloatingDialogZIndex } from '@atlaskit/editor-shared-styles';
 import { ToolbarSection, ToolbarButtonGroup, ToolbarDropdownItemSection, useToolbarUI } from '@atlaskit/editor-toolbar';
 import { ToolbarModelRenderer } from '@atlaskit/editor-toolbar-model';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { SELECTION_TOOLBAR_LABEL } from '../consts';
@@ -95,7 +97,8 @@ export const SelectionToolbar = ({
     offset: [0, 10],
     target: getDomRefFromSelection(editorView),
     onPositionCalculated: onPositionCalculated,
-    mountTo: mountPoint
+    mountTo: mountPoint,
+    zIndex: fg('platform_editor_sel_toolbar_stacking_fix') ? akEditorFloatingDialogZIndex : undefined
   }, /*#__PURE__*/React.createElement(EditorToolbarProvider, {
     editorView: editorView,
     editorToolbarDockingPreference: editorToolbarDockingPreference,

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

@@ -10,8 +10,10 @@ import { Popup } from '@atlaskit/editor-common/ui';
 import { calculateToolbarPositionTrackHead, calculateToolbarPositionOnCellSelection } from '@atlaskit/editor-common/utils';
 import { isOfflineMode } from '@atlaskit/editor-plugin-connectivity';
 import { AllSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
+import { akEditorFloatingDialogZIndex } from '@atlaskit/editor-shared-styles';
 import { ToolbarSection, ToolbarButtonGroup, ToolbarDropdownItemSection, useToolbarUI } from '@atlaskit/editor-toolbar';
 import { ToolbarModelRenderer } from '@atlaskit/editor-toolbar-model';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { SELECTION_TOOLBAR_LABEL } from '../consts';
@@ -94,7 +96,8 @@ export var SelectionToolbar = function SelectionToolbar(_ref) {
     offset: [0, 10],
     target: getDomRefFromSelection(editorView),
     onPositionCalculated: onPositionCalculated,
-    mountTo: mountPoint
+    mountTo: mountPoint,
+    zIndex: fg('platform_editor_sel_toolbar_stacking_fix') ? akEditorFloatingDialogZIndex : undefined
   }, /*#__PURE__*/React.createElement(EditorToolbarProvider, {
     editorView: editorView,
     editorToolbarDockingPreference: editorToolbarDockingPreference,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-toolbar",
-	"version": "5.1.0",
+	"version": "5.1.1",
 	"description": "Toolbar plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -36,10 +36,11 @@
 		"@atlaskit/editor-plugin-user-intent": "^6.0.0",
 		"@atlaskit/editor-plugin-user-preferences": "^6.0.0",
 		"@atlaskit/editor-prosemirror": "^7.3.0",
+		"@atlaskit/editor-shared-styles": "^3.10.0",
 		"@atlaskit/editor-toolbar": "^0.20.0",
 		"@atlaskit/editor-toolbar-model": "^0.4.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
-		"@atlaskit/tmp-editor-statsig": "^40.0.0",
+		"@atlaskit/tmp-editor-statsig": "^40.2.0",
 		"@babel/runtime": "^7.0.0",
 		"bind-event-listener": "^3.0.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"
@@ -54,6 +55,9 @@
 		},
 		"platform_editor_toolbar_open_experience_fix": {
 			"type": "boolean"
+		},
+		"platform_editor_sel_toolbar_stacking_fix": {
+			"type": "boolean"
 		}
 	},
 	"techstack": {