@atlaskit/editor-plugin-selection-toolbar 3.4.0 → 3.4.1

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @atlaskit/editor-plugin-selection-toolbar
 
+## 3.4.1
+
+### Patch Changes
+
+- [#139189](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/139189)
+  [`33e0a9b6291ae`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/33e0a9b6291ae) -
+  [ux] When table is selected via drag handle, we show Table floating controls toolbar. If the table
+  selected via other means, we show the Text Formatting toolbar.
+- Updated dependencies
+
 ## 3.4.0
 
 ### Minor Changes

package/dist/cjs/selectionToolbarPlugin.js

@@ -217,6 +217,14 @@ var selectionToolbarPlugin = exports.selectionToolbarPlugin = function selection
           // do not show the toolbar.
           return;
         }
+        if (isCellSelection && isEditorControlsEnabled && (0, _platformFeatureFlags.fg)('platform_editor_controls_patch_5')) {
+          var _api$blockControls;
+          var isSelectedViaDragHandle = api === null || api === void 0 || (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 || (_api$blockControls = _api$blockControls.sharedState.currentState()) === null || _api$blockControls === void 0 ? void 0 : _api$blockControls.isSelectedViaDragHandle;
+          if (isSelectedViaDragHandle) {
+            return;
+          }
+        }
+
         // Resolve the selectionToolbarHandlers to a list of SelectionToolbarGroups
         // and filter out any handlers which returned undefined
         var resolved = __selectionToolbarHandlers.map(function (selectionToolbarHandler) {

package/dist/cjs/ui/PrimaryToolbarComponent.js

@@ -13,10 +13,12 @@ var React = _react;
 var _runtime = require("@compiled/react/runtime");
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _reactIntlNext = require("react-intl-next");
+var _analytics = require("@atlaskit/editor-common/analytics");
 var _keymaps = require("@atlaskit/editor-common/keymaps");
 var _messages = _interopRequireDefault(require("@atlaskit/editor-common/messages"));
 var _uiMenu = require("@atlaskit/editor-common/ui-menu");
 var _showMoreHorizontal = _interopRequireDefault(require("@atlaskit/icon/core/show-more-horizontal"));
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _overflowToolbarConfig = require("./overflow-toolbar-config");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
@@ -47,6 +49,18 @@ function PrimaryToolbarComponent(_ref) {
     var item = _ref2.item;
     item === null || item === void 0 || (_item$onClick = item.onClick) === null || _item$onClick === void 0 || _item$onClick.call(item);
   }, []);
+  (0, _react.useEffect)(function () {
+    if ((0, _platformFeatureFlags.fg)('platform_editor_controls_patch_4')) {
+      var _api$analytics;
+      api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 || _api$analytics.actions.fireAnalyticsEvent({
+        action: _analytics.ACTION.RENDERED,
+        actionSubject: _analytics.ACTION_SUBJECT.TOOLBAR,
+        actionSubjectId: _analytics.ACTION_SUBJECT_ID.DOCKED_PRIMARY_TOOLBAR,
+        eventType: _analytics.EVENT_TYPE.UI
+      });
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
   return /*#__PURE__*/React.createElement(_uiMenu.DropdownMenu, {
     isOpen: isOpen,
     onOpenChange: function onOpenChange(attrs) {

package/dist/es2019/selectionToolbarPlugin.js

@@ -213,6 +213,14 @@ export const selectionToolbarPlugin = ({
           // do not show the toolbar.
           return;
         }
+        if (isCellSelection && isEditorControlsEnabled && fg('platform_editor_controls_patch_5')) {
+          var _api$blockControls, _api$blockControls$sh;
+          const isSelectedViaDragHandle = api === null || api === void 0 ? void 0 : (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 ? void 0 : (_api$blockControls$sh = _api$blockControls.sharedState.currentState()) === null || _api$blockControls$sh === void 0 ? void 0 : _api$blockControls$sh.isSelectedViaDragHandle;
+          if (isSelectedViaDragHandle) {
+            return;
+          }
+        }
+
         // Resolve the selectionToolbarHandlers to a list of SelectionToolbarGroups
         // and filter out any handlers which returned undefined
         const resolved = __selectionToolbarHandlers.map(selectionToolbarHandler => selectionToolbarHandler(state, intl, providerFactory)).filter(resolved => resolved !== undefined);

package/dist/es2019/ui/PrimaryToolbarComponent.js

@@ -2,12 +2,14 @@
 import "./PrimaryToolbarComponent.compiled.css";
 import * as React from 'react';
 import { ax, ix } from "@compiled/react/runtime";
-import { useCallback, useMemo, useState } from 'react';
+import { useCallback, useEffect, useMemo, useState } from 'react';
 import { useIntl } from 'react-intl-next';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { addLink, getAriaKeyshortcuts } from '@atlaskit/editor-common/keymaps';
 import messages from '@atlaskit/editor-common/messages';
 import { ArrowKeyNavigationType, DropdownMenu, ToolbarButton } from '@atlaskit/editor-common/ui-menu';
 import ShowMoreHorizontalIcon from '@atlaskit/icon/core/show-more-horizontal';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { getOverflowPrimaryToolbarConfig } from './overflow-toolbar-config';
 const DROPDOWN_WIDTH = 240;
 const buttonStyles = null;
@@ -33,6 +35,18 @@ export function PrimaryToolbarComponent({
     var _item$onClick;
     item === null || item === void 0 ? void 0 : (_item$onClick = item.onClick) === null || _item$onClick === void 0 ? void 0 : _item$onClick.call(item);
   }, []);
+  useEffect(() => {
+    if (fg('platform_editor_controls_patch_4')) {
+      var _api$analytics;
+      api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions.fireAnalyticsEvent({
+        action: ACTION.RENDERED,
+        actionSubject: ACTION_SUBJECT.TOOLBAR,
+        actionSubjectId: ACTION_SUBJECT_ID.DOCKED_PRIMARY_TOOLBAR,
+        eventType: EVENT_TYPE.UI
+      });
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
   return /*#__PURE__*/React.createElement(DropdownMenu, {
     isOpen: isOpen,
     onOpenChange: attrs => setIsOpen(attrs.isOpen),

package/dist/esm/selectionToolbarPlugin.js

@@ -210,6 +210,14 @@ export var selectionToolbarPlugin = function selectionToolbarPlugin(_ref) {
           // do not show the toolbar.
           return;
         }
+        if (isCellSelection && isEditorControlsEnabled && fg('platform_editor_controls_patch_5')) {
+          var _api$blockControls;
+          var isSelectedViaDragHandle = api === null || api === void 0 || (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 || (_api$blockControls = _api$blockControls.sharedState.currentState()) === null || _api$blockControls === void 0 ? void 0 : _api$blockControls.isSelectedViaDragHandle;
+          if (isSelectedViaDragHandle) {
+            return;
+          }
+        }
+
         // Resolve the selectionToolbarHandlers to a list of SelectionToolbarGroups
         // and filter out any handlers which returned undefined
         var resolved = __selectionToolbarHandlers.map(function (selectionToolbarHandler) {

package/dist/esm/ui/PrimaryToolbarComponent.js

@@ -3,12 +3,14 @@ import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import "./PrimaryToolbarComponent.compiled.css";
 import * as React from 'react';
 import { ax, ix } from "@compiled/react/runtime";
-import { useCallback, useMemo, useState } from 'react';
+import { useCallback, useEffect, useMemo, useState } from 'react';
 import { useIntl } from 'react-intl-next';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { addLink, getAriaKeyshortcuts } from '@atlaskit/editor-common/keymaps';
 import messages from '@atlaskit/editor-common/messages';
 import { ArrowKeyNavigationType, DropdownMenu, ToolbarButton } from '@atlaskit/editor-common/ui-menu';
 import ShowMoreHorizontalIcon from '@atlaskit/icon/core/show-more-horizontal';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { getOverflowPrimaryToolbarConfig } from './overflow-toolbar-config';
 var DROPDOWN_WIDTH = 240;
 var buttonStyles = null;
@@ -37,6 +39,18 @@ export function PrimaryToolbarComponent(_ref) {
     var item = _ref2.item;
     item === null || item === void 0 || (_item$onClick = item.onClick) === null || _item$onClick === void 0 || _item$onClick.call(item);
   }, []);
+  useEffect(function () {
+    if (fg('platform_editor_controls_patch_4')) {
+      var _api$analytics;
+      api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 || _api$analytics.actions.fireAnalyticsEvent({
+        action: ACTION.RENDERED,
+        actionSubject: ACTION_SUBJECT.TOOLBAR,
+        actionSubjectId: ACTION_SUBJECT_ID.DOCKED_PRIMARY_TOOLBAR,
+        eventType: EVENT_TYPE.UI
+      });
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
   return /*#__PURE__*/React.createElement(DropdownMenu, {
     isOpen: isOpen,
     onOpenChange: function onOpenChange(attrs) {

package/dist/types/selectionToolbarPluginType.d.ts

@@ -1,5 +1,6 @@
 import type { NextEditorPlugin, OptionalPlugin, UserPreferencesProvider } from '@atlaskit/editor-common/types';
 import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
+import type { BlockControlsPlugin } from '@atlaskit/editor-plugin-block-controls';
 import type { EditorViewModePlugin } from '@atlaskit/editor-plugin-editor-viewmode';
 import type { PrimaryToolbarPlugin } from '@atlaskit/editor-plugin-primary-toolbar';
 import type { ToolbarDocking } from './types';
@@ -17,7 +18,8 @@ export type SelectionToolbarPlugin = NextEditorPlugin<'selectionToolbar', {
     dependencies: [
         OptionalPlugin<EditorViewModePlugin>,
         OptionalPlugin<PrimaryToolbarPlugin>,
-        OptionalPlugin<AnalyticsPlugin>
+        OptionalPlugin<AnalyticsPlugin>,
+        OptionalPlugin<BlockControlsPlugin>
     ];
     actions?: {
         suppressToolbar?: () => boolean;

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

@@ -1,5 +1,6 @@
 import type { NextEditorPlugin, OptionalPlugin, UserPreferencesProvider } from '@atlaskit/editor-common/types';
 import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
+import type { BlockControlsPlugin } from '@atlaskit/editor-plugin-block-controls';
 import type { EditorViewModePlugin } from '@atlaskit/editor-plugin-editor-viewmode';
 import type { PrimaryToolbarPlugin } from '@atlaskit/editor-plugin-primary-toolbar';
 import type { ToolbarDocking } from './types';
@@ -17,7 +18,8 @@ export type SelectionToolbarPlugin = NextEditorPlugin<'selectionToolbar', {
     dependencies: [
         OptionalPlugin<EditorViewModePlugin>,
         OptionalPlugin<PrimaryToolbarPlugin>,
-        OptionalPlugin<AnalyticsPlugin>
+        OptionalPlugin<AnalyticsPlugin>,
+        OptionalPlugin<BlockControlsPlugin>
     ];
     actions?: {
         suppressToolbar?: () => boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-selection-toolbar",
-	"version": "3.4.0",
+	"version": "3.4.1",
 	"description": "@atlaskit/editor-plugin-selection-toolbar for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -34,16 +34,17 @@
 	},
 	"dependencies": {
 		"@atlaskit/css": "^0.10.0",
-		"@atlaskit/editor-common": "^103.4.0",
+		"@atlaskit/editor-common": "^103.7.0",
 		"@atlaskit/editor-plugin-analytics": "^2.2.0",
+		"@atlaskit/editor-plugin-block-controls": "^3.10.0",
 		"@atlaskit/editor-plugin-editor-viewmode": "^3.1.0",
 		"@atlaskit/editor-plugin-primary-toolbar": "^3.2.0",
 		"@atlaskit/editor-prosemirror": "7.0.0",
-		"@atlaskit/icon": "^25.5.0",
-		"@atlaskit/icon-lab": "^4.6.0",
+		"@atlaskit/icon": "^25.6.0",
+		"@atlaskit/icon-lab": "^4.8.0",
 		"@atlaskit/menu": "^3.2.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
-		"@atlaskit/tmp-editor-statsig": "^4.6.0",
+		"@atlaskit/tmp-editor-statsig": "^4.8.0",
 		"@atlaskit/tokens": "^4.7.0",
 		"@babel/runtime": "^7.0.0",
 		"bind-event-listener": "^3.0.0"
@@ -99,6 +100,9 @@
 		},
 		"platform_editor_controls_patch_4": {
 			"type": "boolean"
+		},
+		"platform_editor_controls_patch_5": {
+			"type": "boolean"
 		}
 	}
 }