@atlaskit/editor-plugin-toolbar 4.1.5 → 4.1.7

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/editor-plugin-toolbar
 
+## 4.1.7
+
+### Patch Changes
+
+- [`38dee2c85c456`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/38dee2c85c456) -
+  [ux] [EDITOR-4486] render tooltips for ToolbarDropdownMenu using new TooltipComponent prop behind
+  platform_editor_hide_toolbar_tooltips_fix
+- Updated dependencies
+
+## 4.1.6
+
+### Patch Changes
+
+- [`e504eea6e1d3f`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/e504eea6e1d3f) -
+  EDITOR-4665: Clean up platform_editor_toolbar_aifc_responsive_improve feature flag
+- Updated dependencies
+
 ## 4.1.5
 
 ### Patch Changes

package/dist/cjs/pm-plugins/experiences/selection-toolbar-open-experience.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getSelectionToolbarOpenExperiencePlugin = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+var _analytics = require("@atlaskit/editor-common/analytics");
 var _experiences = require("@atlaskit/editor-common/experiences");
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _state = require("@atlaskit/editor-prosemirror/state");
@@ -44,7 +45,7 @@ var getSelectionToolbarOpenExperiencePlugin = exports.getSelectionToolbarOpenExp
     return targetEl;
   };
   var experience = new _experiences.Experience(_experiences.EXPERIENCE_ID.TOOLBAR_OPEN, {
-    actionSubjectId: 'selectionToolbar',
+    actionSubjectId: _analytics.ACTION_SUBJECT_ID.SELECTION_TOOLBAR,
     dispatchAnalyticsEvent: dispatchAnalyticsEvent,
     checks: [new _experiences.ExperienceCheckTimeout({
       durationMs: 1000,

package/dist/cjs/toolbarPlugin.js

@@ -14,7 +14,6 @@ var _utils = require("@atlaskit/editor-common/utils");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils2 = require("@atlaskit/editor-prosemirror/utils");
 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 _selectionToolbarOpenExperience = require("./pm-plugins/experiences/selection-toolbar-open-experience");
 var _pluginKey = require("./pm-plugins/plugin-key");
@@ -103,7 +102,7 @@ var toolbarPlugin = exports.toolbarPlugin = function toolbarPlugin(_ref) {
         return contextualFormattingEnabled !== null && contextualFormattingEnabled !== void 0 ? contextualFormattingEnabled : 'always-pinned';
       },
       getBreakpointPreset: function getBreakpointPreset() {
-        return (0, _platformFeatureFlags.fg)('platform_editor_toolbar_aifc_responsive_improve') ? breakpointPreset : undefined;
+        return breakpointPreset;
       }
     },
     getSharedState: function getSharedState(editorState) {

package/dist/cjs/ui/OverflowMenu.js

@@ -9,10 +9,23 @@ var _react = _interopRequireDefault(require("react"));
 var _reactIntlNext = require("react-intl-next");
 var _messages = require("@atlaskit/editor-common/messages");
 var _editorToolbar = require("@atlaskit/editor-toolbar");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var OverflowMenu = exports.OverflowMenu = function OverflowMenu(_ref) {
   var children = _ref.children;
   var intl = (0, _reactIntlNext.useIntl)();
   var tooltipContent = intl.formatMessage(_messages.toolbarMessages.selectionToolbarOverflowMenuTooltip);
+  if ((0, _expValEquals.expValEquals)('platform_editor_hide_toolbar_tooltips_fix', 'isEnabled', true)) {
+    return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownMenu, {
+      label: tooltipContent,
+      iconBefore: /*#__PURE__*/_react.default.createElement(_editorToolbar.ShowMoreHorizontalIcon, {
+        label: ""
+      }),
+      tooltipComponent: /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarTooltip, {
+        content: tooltipContent,
+        position: "top"
+      })
+    }, children);
+  }
   return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarTooltip, {
     content: tooltipContent,
     position: "top"

package/dist/cjs/ui/PrimaryToolbar.js

@@ -24,7 +24,6 @@ var PrimaryToolbar = exports.PrimaryToolbar = function PrimaryToolbar(_ref) {
     editorAppearance = _useEditorToolbar.editorAppearance;
   return /*#__PURE__*/_react.default.createElement(_editorToolbar.PrimaryToolbar, {
     label: "Primary Toolbar",
-    reducedBreakpoints: editorAppearance !== 'full-page',
     breakpointPreset: getBreakpointPreset(breakpointPreset, editorAppearance)
   }, children);
 };

package/dist/cjs/ui/TextCollapsedMenu.js

@@ -9,6 +9,7 @@ var _react = _interopRequireDefault(require("react"));
 var _reactIntlNext = require("react-intl-next");
 var _messages = require("@atlaskit/editor-common/messages");
 var _editorToolbar = require("@atlaskit/editor-toolbar");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 /**
  * Basic version of existing 'Text Styles' Menu - which doesn't dynamically change icon
  * and is also placeholder to render all other menus in the collapsed state.
@@ -17,6 +18,18 @@ var TextCollapsedMenu = exports.TextCollapsedMenu = function TextCollapsedMenu(_
   var children = _ref.children;
   var _useIntl = (0, _reactIntlNext.useIntl)(),
     formatMessage = _useIntl.formatMessage;
+  if ((0, _expValEquals.expValEquals)('platform_editor_hide_toolbar_tooltips_fix', 'isEnabled', true)) {
+    return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownMenu, {
+      iconBefore: /*#__PURE__*/_react.default.createElement(_editorToolbar.TextIcon, {
+        label: formatMessage(_messages.toolbarMessages.textStylesTooltip),
+        size: "small"
+      }),
+      enableMaxHeight: true,
+      tooltipComponent: /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarTooltip, {
+        content: formatMessage(_messages.toolbarMessages.textStylesTooltip)
+      })
+    }, children);
+  }
   return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarTooltip, {
     content: formatMessage(_messages.toolbarMessages.textStylesTooltip)
   }, /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownMenu, {

package/dist/es2019/pm-plugins/experiences/selection-toolbar-open-experience.js

@@ -1,4 +1,5 @@
-import { Experience, EXPERIENCE_ID, ExperienceCheckDomMutation, ExperienceCheckTimeout, containsPopupWithNestedElement, getPopupContainerFromEditorView } from '@atlaskit/editor-common/experiences';
+import { ACTION_SUBJECT_ID } from '@atlaskit/editor-common/analytics';
+import { containsPopupWithNestedElement, Experience, EXPERIENCE_ID, ExperienceCheckDomMutation, ExperienceCheckTimeout, getPopupContainerFromEditorView } from '@atlaskit/editor-common/experiences';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 const pluginKey = new PluginKey('selectionToolbarOpenExperience');
@@ -37,7 +38,7 @@ export const getSelectionToolbarOpenExperiencePlugin = ({
     return targetEl;
   };
   const experience = new Experience(EXPERIENCE_ID.TOOLBAR_OPEN, {
-    actionSubjectId: 'selectionToolbar',
+    actionSubjectId: ACTION_SUBJECT_ID.SELECTION_TOOLBAR,
     dispatchAnalyticsEvent,
     checks: [new ExperienceCheckTimeout({
       durationMs: 1000,

package/dist/es2019/toolbarPlugin.js

@@ -5,7 +5,6 @@ import { calculateToolbarPositionTrackHead } from '@atlaskit/editor-common/utils
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { findParentNodeOfType, findSelectedNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { createComponentRegistry } from '@atlaskit/editor-toolbar-model';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { getSelectionToolbarOpenExperiencePlugin } from './pm-plugins/experiences/selection-toolbar-open-experience';
 import { editorToolbarPluginKey } from './pm-plugins/plugin-key';
@@ -88,7 +87,7 @@ export const toolbarPlugin = ({
         return contextualFormattingEnabled !== null && contextualFormattingEnabled !== void 0 ? contextualFormattingEnabled : 'always-pinned';
       },
       getBreakpointPreset: () => {
-        return fg('platform_editor_toolbar_aifc_responsive_improve') ? breakpointPreset : undefined;
+        return breakpointPreset;
       }
     },
     getSharedState(editorState) {

package/dist/es2019/ui/OverflowMenu.js

@@ -2,11 +2,24 @@ import React from 'react';
 import { useIntl } from 'react-intl-next';
 import { toolbarMessages } from '@atlaskit/editor-common/messages';
 import { ShowMoreHorizontalIcon, ToolbarDropdownMenu, ToolbarTooltip } from '@atlaskit/editor-toolbar';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 export const OverflowMenu = ({
   children
 }) => {
   const intl = useIntl();
   const tooltipContent = intl.formatMessage(toolbarMessages.selectionToolbarOverflowMenuTooltip);
+  if (expValEquals('platform_editor_hide_toolbar_tooltips_fix', 'isEnabled', true)) {
+    return /*#__PURE__*/React.createElement(ToolbarDropdownMenu, {
+      label: tooltipContent,
+      iconBefore: /*#__PURE__*/React.createElement(ShowMoreHorizontalIcon, {
+        label: ""
+      }),
+      tooltipComponent: /*#__PURE__*/React.createElement(ToolbarTooltip, {
+        content: tooltipContent,
+        position: "top"
+      })
+    }, children);
+  }
   return /*#__PURE__*/React.createElement(ToolbarTooltip, {
     content: tooltipContent,
     position: "top"

package/dist/es2019/ui/PrimaryToolbar.js

@@ -19,7 +19,6 @@ export const PrimaryToolbar = ({
   } = useEditorToolbar();
   return /*#__PURE__*/React.createElement(PrimaryToolbarBase, {
     label: "Primary Toolbar",
-    reducedBreakpoints: editorAppearance !== 'full-page',
     breakpointPreset: getBreakpointPreset(breakpointPreset, editorAppearance)
   }, children);
 };

package/dist/es2019/ui/TextCollapsedMenu.js

@@ -2,6 +2,7 @@ import React from 'react';
 import { useIntl } from 'react-intl-next';
 import { toolbarMessages } from '@atlaskit/editor-common/messages';
 import { ToolbarDropdownMenu, ToolbarTooltip, TextIcon } from '@atlaskit/editor-toolbar';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 /**
  * Basic version of existing 'Text Styles' Menu - which doesn't dynamically change icon
  * and is also placeholder to render all other menus in the collapsed state.
@@ -12,6 +13,18 @@ export const TextCollapsedMenu = ({
   const {
     formatMessage
   } = useIntl();
+  if (expValEquals('platform_editor_hide_toolbar_tooltips_fix', 'isEnabled', true)) {
+    return /*#__PURE__*/React.createElement(ToolbarDropdownMenu, {
+      iconBefore: /*#__PURE__*/React.createElement(TextIcon, {
+        label: formatMessage(toolbarMessages.textStylesTooltip),
+        size: "small"
+      }),
+      enableMaxHeight: true,
+      tooltipComponent: /*#__PURE__*/React.createElement(ToolbarTooltip, {
+        content: formatMessage(toolbarMessages.textStylesTooltip)
+      })
+    }, children);
+  }
   return /*#__PURE__*/React.createElement(ToolbarTooltip, {
     content: formatMessage(toolbarMessages.textStylesTooltip)
   }, /*#__PURE__*/React.createElement(ToolbarDropdownMenu, {

package/dist/esm/pm-plugins/experiences/selection-toolbar-open-experience.js

@@ -1,5 +1,6 @@
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
-import { Experience, EXPERIENCE_ID, ExperienceCheckDomMutation, ExperienceCheckTimeout, containsPopupWithNestedElement, getPopupContainerFromEditorView } from '@atlaskit/editor-common/experiences';
+import { ACTION_SUBJECT_ID } from '@atlaskit/editor-common/analytics';
+import { containsPopupWithNestedElement, Experience, EXPERIENCE_ID, ExperienceCheckDomMutation, ExperienceCheckTimeout, getPopupContainerFromEditorView } from '@atlaskit/editor-common/experiences';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 var pluginKey = new PluginKey('selectionToolbarOpenExperience');
@@ -37,7 +38,7 @@ export var getSelectionToolbarOpenExperiencePlugin = function getSelectionToolba
     return targetEl;
   };
   var experience = new Experience(EXPERIENCE_ID.TOOLBAR_OPEN, {
-    actionSubjectId: 'selectionToolbar',
+    actionSubjectId: ACTION_SUBJECT_ID.SELECTION_TOOLBAR,
     dispatchAnalyticsEvent: dispatchAnalyticsEvent,
     checks: [new ExperienceCheckTimeout({
       durationMs: 1000,

package/dist/esm/toolbarPlugin.js

@@ -9,7 +9,6 @@ import { calculateToolbarPositionTrackHead } from '@atlaskit/editor-common/utils
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { findParentNodeOfType, findSelectedNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { createComponentRegistry } from '@atlaskit/editor-toolbar-model';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { getSelectionToolbarOpenExperiencePlugin } from './pm-plugins/experiences/selection-toolbar-open-experience';
 import { editorToolbarPluginKey } from './pm-plugins/plugin-key';
@@ -96,7 +95,7 @@ export var toolbarPlugin = function toolbarPlugin(_ref) {
         return contextualFormattingEnabled !== null && contextualFormattingEnabled !== void 0 ? contextualFormattingEnabled : 'always-pinned';
       },
       getBreakpointPreset: function getBreakpointPreset() {
-        return fg('platform_editor_toolbar_aifc_responsive_improve') ? breakpointPreset : undefined;
+        return breakpointPreset;
       }
     },
     getSharedState: function getSharedState(editorState) {

package/dist/esm/ui/OverflowMenu.js

@@ -2,10 +2,23 @@ import React from 'react';
 import { useIntl } from 'react-intl-next';
 import { toolbarMessages } from '@atlaskit/editor-common/messages';
 import { ShowMoreHorizontalIcon, ToolbarDropdownMenu, ToolbarTooltip } from '@atlaskit/editor-toolbar';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 export var OverflowMenu = function OverflowMenu(_ref) {
   var children = _ref.children;
   var intl = useIntl();
   var tooltipContent = intl.formatMessage(toolbarMessages.selectionToolbarOverflowMenuTooltip);
+  if (expValEquals('platform_editor_hide_toolbar_tooltips_fix', 'isEnabled', true)) {
+    return /*#__PURE__*/React.createElement(ToolbarDropdownMenu, {
+      label: tooltipContent,
+      iconBefore: /*#__PURE__*/React.createElement(ShowMoreHorizontalIcon, {
+        label: ""
+      }),
+      tooltipComponent: /*#__PURE__*/React.createElement(ToolbarTooltip, {
+        content: tooltipContent,
+        position: "top"
+      })
+    }, children);
+  }
   return /*#__PURE__*/React.createElement(ToolbarTooltip, {
     content: tooltipContent,
     position: "top"

package/dist/esm/ui/PrimaryToolbar.js

@@ -17,7 +17,6 @@ export var PrimaryToolbar = function PrimaryToolbar(_ref) {
     editorAppearance = _useEditorToolbar.editorAppearance;
   return /*#__PURE__*/React.createElement(PrimaryToolbarBase, {
     label: "Primary Toolbar",
-    reducedBreakpoints: editorAppearance !== 'full-page',
     breakpointPreset: getBreakpointPreset(breakpointPreset, editorAppearance)
   }, children);
 };

package/dist/esm/ui/TextCollapsedMenu.js

@@ -2,6 +2,7 @@ import React from 'react';
 import { useIntl } from 'react-intl-next';
 import { toolbarMessages } from '@atlaskit/editor-common/messages';
 import { ToolbarDropdownMenu, ToolbarTooltip, TextIcon } from '@atlaskit/editor-toolbar';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 /**
  * Basic version of existing 'Text Styles' Menu - which doesn't dynamically change icon
  * and is also placeholder to render all other menus in the collapsed state.
@@ -10,6 +11,18 @@ export var TextCollapsedMenu = function TextCollapsedMenu(_ref) {
   var children = _ref.children;
   var _useIntl = useIntl(),
     formatMessage = _useIntl.formatMessage;
+  if (expValEquals('platform_editor_hide_toolbar_tooltips_fix', 'isEnabled', true)) {
+    return /*#__PURE__*/React.createElement(ToolbarDropdownMenu, {
+      iconBefore: /*#__PURE__*/React.createElement(TextIcon, {
+        label: formatMessage(toolbarMessages.textStylesTooltip),
+        size: "small"
+      }),
+      enableMaxHeight: true,
+      tooltipComponent: /*#__PURE__*/React.createElement(ToolbarTooltip, {
+        content: formatMessage(toolbarMessages.textStylesTooltip)
+      })
+    }, children);
+  }
   return /*#__PURE__*/React.createElement(ToolbarTooltip, {
     content: formatMessage(toolbarMessages.textStylesTooltip)
   }, /*#__PURE__*/React.createElement(ToolbarDropdownMenu, {

package/dist/types/pm-plugins/experiences/selection-toolbar-open-experience.d.ts

@@ -1,4 +1,4 @@
-import type { DispatchAnalyticsEvent } from '@atlaskit/editor-common/analytics';
+import { type DispatchAnalyticsEvent } from '@atlaskit/editor-common/analytics';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 type SelectionToolbarOpenExperienceOptions = {
     dispatchAnalyticsEvent: DispatchAnalyticsEvent;

package/dist/types-ts4.5/pm-plugins/experiences/selection-toolbar-open-experience.d.ts

@@ -1,4 +1,4 @@
-import type { DispatchAnalyticsEvent } from '@atlaskit/editor-common/analytics';
+import { type DispatchAnalyticsEvent } from '@atlaskit/editor-common/analytics';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 type SelectionToolbarOpenExperienceOptions = {
     dispatchAnalyticsEvent: DispatchAnalyticsEvent;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-toolbar",
-	"version": "4.1.5",
+	"version": "4.1.7",
 	"description": "Toolbar plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -35,26 +35,23 @@
 		"@atlaskit/editor-plugin-selection": "^7.0.0",
 		"@atlaskit/editor-plugin-user-intent": "^5.0.0",
 		"@atlaskit/editor-plugin-user-preferences": "^5.0.0",
-		"@atlaskit/editor-prosemirror": "^7.2.0",
+		"@atlaskit/editor-prosemirror": "^7.3.0",
 		"@atlaskit/editor-toolbar": "^0.19.0",
 		"@atlaskit/editor-toolbar-model": "^0.3.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
-		"@atlaskit/tmp-editor-statsig": "^17.1.0",
+		"@atlaskit/tmp-editor-statsig": "^17.13.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": "^111.9.0",
+		"@atlaskit/editor-common": "^111.11.0",
 		"react": "^18.2.0"
 	},
 	"platform-feature-flags": {
 		"platform_editor_toolbar_aifc_placement_overridden": {
 			"type": "boolean"
 		},
-		"platform_editor_toolbar_aifc_responsive_improve": {
-			"type": "boolean"
-		},
 		"platform_editor_toolbar_aifc_undo_redo_confluence": {
 			"type": "boolean"
 		}