@atlaskit/editor-common 110.18.5 → 110.18.6

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/editor-common
 
+## 110.18.6
+
+### Patch Changes
+
+- [`bbd03bed5ca41`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/bbd03bed5ca41) -
+  [ux] ED-29587 Keyboard shortcuts break when navigating to and from dropdown menus
+- Updated dependencies
+
 ## 110.18.5
 
 ### Patch Changes

package/dist/cjs/monitoring/error.js

@@ -16,7 +16,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-var packageVersion = "110.18.4";
+var packageVersion = "110.18.5";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // Ignored via go/ees007

package/dist/cjs/toolbar/EditorToolbarUIProvider.js

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.EditorToolbarUIProvider = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _editorToolbar = require("@atlaskit/editor-toolbar");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 var EditorToolbarUIProvider = exports.EditorToolbarUIProvider = function EditorToolbarUIProvider(_ref) {
   var children = _ref.children,
@@ -18,17 +19,36 @@ var EditorToolbarUIProvider = exports.EditorToolbarUIProvider = function EditorT
     fireAnalyticsEvent = _ref.fireAnalyticsEvent,
     keyboardNavigation = _ref.keyboardNavigation;
   var onDropdownOpenChanged = (0, _react.useCallback)(function (_ref2) {
-    var isOpen = _ref2.isOpen;
+    var isOpen = _ref2.isOpen,
+      event = _ref2.event;
     if (!isOpen) {
-      // On Dropdown closed, focus is returned to trigger button by default in requestAnimationFrame
-      // Hence, `.focus()` should also be called in requestAnimationFrame
-      setTimeout(function () {
-        return requestAnimationFrame(function () {
-          api === null || api === void 0 || api.core.actions.focus({
-            scrollIntoView: false
+      if ((0, _platformFeatureFlags.fg)('platform_editor_toolbar_aifc_patch_7')) {
+        // Only refocus the editor when the dropdown closes via mouse or programmatic close.
+        // When closed via keyboard Escape, keep focus on the trigger for better keyboard UX.
+        var isKeyboardEscape = event instanceof KeyboardEvent && event.key === 'Escape';
+        var shouldFocusEditor = !isKeyboardEscape;
+        if (shouldFocusEditor) {
+          // On Dropdown closed, focus is returned to trigger button by default in requestAnimationFrame
+          // Hence, `.focus()` should also be called in requestAnimationFrame
+          setTimeout(function () {
+            return requestAnimationFrame(function () {
+              api === null || api === void 0 || api.core.actions.focus({
+                scrollIntoView: false
+              });
+            });
+          }, 1);
+        }
+      } else {
+        // On Dropdown closed, focus is returned to trigger button by default in requestAnimationFrame
+        // Hence, `.focus()` should also be called in requestAnimationFrame
+        setTimeout(function () {
+          return requestAnimationFrame(function () {
+            api === null || api === void 0 || api.core.actions.focus({
+              scrollIntoView: false
+            });
           });
-        });
-      }, 1);
+        }, 1);
+      }
     }
   }, [api]);
   return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarUIProvider, {

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

@@ -24,7 +24,7 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
  * @jsx jsx
  */ // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "110.18.4";
+var packageVersion = "110.18.5";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var fadeIn = (0, _react2.keyframes)({

package/dist/es2019/monitoring/error.js

@@ -1,7 +1,7 @@
 import { isFedRamp } from './environment';
 const SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 const packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-const packageVersion = "110.18.4";
+const packageVersion = "110.18.5";
 const sanitiseSentryEvents = (data, _hint) => {
   // Remove URL as it has UGC
   // Ignored via go/ees007

package/dist/es2019/toolbar/EditorToolbarUIProvider.js

@@ -1,5 +1,6 @@
 import React, { useCallback } from 'react';
 import { ToolbarUIProvider } from '@atlaskit/editor-toolbar';
+import { fg } from '@atlaskit/platform-feature-flags';
 export const EditorToolbarUIProvider = ({
   children,
   api,
@@ -11,16 +12,33 @@ export const EditorToolbarUIProvider = ({
   keyboardNavigation
 }) => {
   const onDropdownOpenChanged = useCallback(({
-    isOpen
+    isOpen,
+    event
   }) => {
     if (!isOpen) {
-      // On Dropdown closed, focus is returned to trigger button by default in requestAnimationFrame
-      // Hence, `.focus()` should also be called in requestAnimationFrame
-      setTimeout(() => requestAnimationFrame(() => {
-        api === null || api === void 0 ? void 0 : api.core.actions.focus({
-          scrollIntoView: false
-        });
-      }), 1);
+      if (fg('platform_editor_toolbar_aifc_patch_7')) {
+        // Only refocus the editor when the dropdown closes via mouse or programmatic close.
+        // When closed via keyboard Escape, keep focus on the trigger for better keyboard UX.
+        const isKeyboardEscape = event instanceof KeyboardEvent && event.key === 'Escape';
+        const shouldFocusEditor = !isKeyboardEscape;
+        if (shouldFocusEditor) {
+          // On Dropdown closed, focus is returned to trigger button by default in requestAnimationFrame
+          // Hence, `.focus()` should also be called in requestAnimationFrame
+          setTimeout(() => requestAnimationFrame(() => {
+            api === null || api === void 0 ? void 0 : api.core.actions.focus({
+              scrollIntoView: false
+            });
+          }), 1);
+        }
+      } else {
+        // On Dropdown closed, focus is returned to trigger button by default in requestAnimationFrame
+        // Hence, `.focus()` should also be called in requestAnimationFrame
+        setTimeout(() => requestAnimationFrame(() => {
+          api === null || api === void 0 ? void 0 : api.core.actions.focus({
+            scrollIntoView: false
+          });
+        }), 1);
+      }
     }
   }, [api]);
   return /*#__PURE__*/React.createElement(ToolbarUIProvider, {

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

@@ -14,7 +14,7 @@ import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
 import { fg } from '@atlaskit/platform-feature-flags';
 import Layer from '../Layer';
 const packageName = "@atlaskit/editor-common";
-const packageVersion = "110.18.4";
+const packageVersion = "110.18.5";
 const halfFocusRing = 1;
 const dropOffset = '0, 8';
 const fadeIn = keyframes({

package/dist/esm/monitoring/error.js

@@ -7,7 +7,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import { isFedRamp } from './environment';
 var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-var packageVersion = "110.18.4";
+var packageVersion = "110.18.5";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // Ignored via go/ees007

package/dist/esm/toolbar/EditorToolbarUIProvider.js

@@ -1,5 +1,6 @@
 import React, { useCallback } from 'react';
 import { ToolbarUIProvider } from '@atlaskit/editor-toolbar';
+import { fg } from '@atlaskit/platform-feature-flags';
 export var EditorToolbarUIProvider = function EditorToolbarUIProvider(_ref) {
   var children = _ref.children,
     api = _ref.api,
@@ -10,17 +11,36 @@ export var EditorToolbarUIProvider = function EditorToolbarUIProvider(_ref) {
     fireAnalyticsEvent = _ref.fireAnalyticsEvent,
     keyboardNavigation = _ref.keyboardNavigation;
   var onDropdownOpenChanged = useCallback(function (_ref2) {
-    var isOpen = _ref2.isOpen;
+    var isOpen = _ref2.isOpen,
+      event = _ref2.event;
     if (!isOpen) {
-      // On Dropdown closed, focus is returned to trigger button by default in requestAnimationFrame
-      // Hence, `.focus()` should also be called in requestAnimationFrame
-      setTimeout(function () {
-        return requestAnimationFrame(function () {
-          api === null || api === void 0 || api.core.actions.focus({
-            scrollIntoView: false
+      if (fg('platform_editor_toolbar_aifc_patch_7')) {
+        // Only refocus the editor when the dropdown closes via mouse or programmatic close.
+        // When closed via keyboard Escape, keep focus on the trigger for better keyboard UX.
+        var isKeyboardEscape = event instanceof KeyboardEvent && event.key === 'Escape';
+        var shouldFocusEditor = !isKeyboardEscape;
+        if (shouldFocusEditor) {
+          // On Dropdown closed, focus is returned to trigger button by default in requestAnimationFrame
+          // Hence, `.focus()` should also be called in requestAnimationFrame
+          setTimeout(function () {
+            return requestAnimationFrame(function () {
+              api === null || api === void 0 || api.core.actions.focus({
+                scrollIntoView: false
+              });
+            });
+          }, 1);
+        }
+      } else {
+        // On Dropdown closed, focus is returned to trigger button by default in requestAnimationFrame
+        // Hence, `.focus()` should also be called in requestAnimationFrame
+        setTimeout(function () {
+          return requestAnimationFrame(function () {
+            api === null || api === void 0 || api.core.actions.focus({
+              scrollIntoView: false
+            });
           });
-        });
-      }, 1);
+        }, 1);
+      }
     }
   }, [api]);
   return /*#__PURE__*/React.createElement(ToolbarUIProvider, {

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

@@ -21,7 +21,7 @@ import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
 import { fg } from '@atlaskit/platform-feature-flags';
 import Layer from '../Layer';
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "110.18.4";
+var packageVersion = "110.18.5";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var fadeIn = keyframes({

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-common",
-	"version": "110.18.5",
+	"version": "110.18.6",
 	"description": "A package that contains common classes and components for editor and renderer",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -74,7 +74,7 @@
 		"@atlaskit/profilecard": "^24.20.0",
 		"@atlaskit/prosemirror-history": "^0.2.0",
 		"@atlaskit/react-ufo": "^4.12.0",
-		"@atlaskit/section-message": "^8.7.0",
+		"@atlaskit/section-message": "^8.8.0",
 		"@atlaskit/smart-card": "^43.4.0",
 		"@atlaskit/smart-user-picker": "^8.4.0",
 		"@atlaskit/spinner": "^19.0.0",