@atlaskit/help 9.2.2 → 9.3.0

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @atlaskit/help
 
+## 9.3.0
+
+### Minor Changes
+
+- [`00e69e0b7c839`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/00e69e0b7c839) -
+  Clean up and removal of the `platform-visual-refresh-icons` feature flag.
+
+### Patch Changes
+
+- Updated dependencies
+
+## 9.2.3
+
+### Patch Changes
+
+- [`b429c01ce6af9`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/b429c01ce6af9) -
+  icon migration entry point update
+- Updated dependencies
+
 ## 9.2.2
 
 ### Patch Changes

package/dist/cjs/assets/IconWrapper.js

@@ -8,20 +8,13 @@ exports.IconWrapper = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _compiled = require("@atlaskit/primitives/compiled");
 var _icon = require("@atlaskit/icon");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var IconWrapper = exports.IconWrapper = function IconWrapper(_ref) {
   var Icon = _ref.Icon,
     appearance = _ref.appearance;
   return /*#__PURE__*/_react.default.createElement(_compiled.Flex, {
     alignItems: "center",
     justifyContent: "center"
-  }, !(0, _platformFeatureFlags.fg)('platform-visual-refresh-icons') ? /*#__PURE__*/_react.default.createElement(Icon, {
-    label: "",
-    color: "var(--ds-icon-inverse, #FFFFFF)"
-  }) :
-  /*#__PURE__*/
-  // @ts-ignore
-  _react.default.createElement(_icon.IconTile, {
+  }, /*#__PURE__*/_react.default.createElement(_icon.IconTile, {
     icon: Icon,
     size: "16",
     label: "",

package/dist/cjs/components/BackButton/index.js

@@ -9,7 +9,7 @@ var _react = _interopRequireDefault(require("react"));
 var _reactIntlNext = require("react-intl-next");
 var _analyticsNext = require("@atlaskit/analytics-next");
 var _reactTransitionGroup = require("react-transition-group");
-var _arrowLeft = _interopRequireDefault(require("@atlaskit/icon/core/migration/arrow-left"));
+var _arrowLeft = _interopRequireDefault(require("@atlaskit/icon/core/arrow-left"));
 var _standardButton = _interopRequireDefault(require("@atlaskit/button/standard-button"));
 var _messages = require("../../messages");
 var _styled = require("../styled");

package/dist/cjs/components/NeedMoreHelp/index.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.NeedMoreHelp = void 0;
 var _react = _interopRequireDefault(require("react"));
-var _lightbulb = _interopRequireDefault(require("@atlaskit/icon/core/migration/lightbulb"));
+var _lightbulb = _interopRequireDefault(require("@atlaskit/icon/core/lightbulb"));
 var _compiled = require("@atlaskit/primitives/compiled");
 var _reactIntlNext = require("react-intl-next");
 var _styled = require("./styled");

package/dist/cjs/components/WhatsNew/WhatsNewButton/index.js

@@ -9,7 +9,7 @@ exports.default = exports.WhatsNewButton = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _analyticsNext = require("@atlaskit/analytics-next");
 var colors = _interopRequireWildcard(require("@atlaskit/theme/colors"));
-var _lightbulb = _interopRequireDefault(require("@atlaskit/icon/core/migration/lightbulb"));
+var _lightbulb = _interopRequireDefault(require("@atlaskit/icon/core/lightbulb"));
 var _reactIntlNext = require("react-intl-next");
 var _whatsNewArticleContext = require("../../contexts/whatsNewArticleContext");
 var _navigationContext = require("../../contexts/navigationContext");

package/dist/cjs/components/contexts/navigationContext.js

@@ -101,14 +101,14 @@ var getCurrentArticleItemSlim = function getCurrentArticleItemSlim(history) {
   if (article) {
     if (type === _Help.ARTICLE_TYPE.HELP_ARTICLE) {
       var _ref = article,
-        body = _ref.body,
-        relatedArticles = _ref.relatedArticles,
+        _body = _ref.body,
+        _relatedArticles = _ref.relatedArticles,
         articleItemData = (0, _objectWithoutProperties2.default)(_ref, _excluded);
       var currentArticleSlimData = articleItemData;
       return currentArticleSlimData;
     } else if (type === _Help.ARTICLE_TYPE.WHATS_NEW) {
       var _ref2 = article,
-        description = _ref2.description,
+        _description = _ref2.description,
         whatsNewArticleItemData = (0, _objectWithoutProperties2.default)(_ref2, _excluded2);
       var currentWhatsNewArticleSlimData = whatsNewArticleItemData;
       return currentWhatsNewArticleSlimData;
@@ -274,6 +274,9 @@ var NavigationContextProvider = exports.NavigationContextProvider = function Nav
   var onGetHelpArticleRef = (0, _react.useRef)(onGetHelpArticle);
   var onGetWhatsNewArticleRef = (0, _react.useRef)(onGetWhatsNewArticle);
 
+  // Ref to store triggering elements for focus restoration on navigate back
+  var triggerElementsRef = (0, _react.useRef)([]);
+
   // Update refs when functions change
   onGetHelpArticleRef.current = onGetHelpArticle;
   onGetWhatsNewArticleRef.current = onGetWhatsNewArticle;
@@ -376,7 +379,7 @@ var NavigationContextProvider = exports.NavigationContextProvider = function Nav
     };
   }(), []);
   var navigateBack = (0, _react.useCallback)( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
-    var _searchResult$length;
+    var triggerElement, _searchResult$length, timeoutId;
     return _regenerator.default.wrap(function _callee3$(_context3) {
       while (1) switch (_context3.prev = _context3.next) {
         case 0:
@@ -397,31 +400,48 @@ var NavigationContextProvider = exports.NavigationContextProvider = function Nav
           });
           return _context3.abrupt("return");
         case 8:
-          //  if the history is not empty and ...
-          if (currentHistory.length > 0) {
-            // the history has more than one article, navigate back through the history
-            if (currentHistory.length > 1) {
-              // Remove last element
+          if (!(currentHistory.length > 0)) {
+            _context3.next = 14;
+            break;
+          }
+          // Pop the trigger element before navigating back
+          triggerElement = triggerElementsRef.current.pop(); // the history has more than one article, navigate back through the history
+          if (currentHistory.length > 1) {
+            // Remove last element
+            dispatchNavigationAction({
+              type: 'removeLastHistoryItem'
+            });
+          } else if (currentHistory.length === 1) {
+            // If the search value is not empty and search result is not empty, show the search results
+            if (searchValue !== '' && ((_searchResult$length = searchResult === null || searchResult === void 0 ? void 0 : searchResult.length) !== null && _searchResult$length !== void 0 ? _searchResult$length : 0) > 0 && onSearch !== undefined) {
+              dispatchNavigationAction({
+                type: 'updateView',
+                payload: _constants.VIEW.SEARCH
+              });
+            }
+            // If the search value is empty, show the default content
+            else {
               dispatchNavigationAction({
-                type: 'removeLastHistoryItem'
+                type: 'removeAllHistoryItems'
               });
-            } else if (currentHistory.length === 1) {
-              // If the search value is not empty and search result is not empty, show the search results
-              if (searchValue !== '' && ((_searchResult$length = searchResult === null || searchResult === void 0 ? void 0 : searchResult.length) !== null && _searchResult$length !== void 0 ? _searchResult$length : 0) > 0 && onSearch !== undefined) {
-                dispatchNavigationAction({
-                  type: 'updateView',
-                  payload: _constants.VIEW.SEARCH
-                });
-              }
-              // If the search value is empty, show the default content
-              else {
-                dispatchNavigationAction({
-                  type: 'removeAllHistoryItems'
-                });
-              }
             }
           }
-        case 9:
+
+          // Restore focus to the element that triggered the navigation
+          if (!triggerElement) {
+            _context3.next = 14;
+            break;
+          }
+          // Wait for slide-out animation to complete (300ms) plus a buffer
+          timeoutId = setTimeout(function () {
+            if (document.body.contains(triggerElement)) {
+              triggerElement.focus();
+            }
+          }, 400); // Increased from 350ms to 400ms
+          return _context3.abrupt("return", function () {
+            return clearTimeout(timeoutId);
+          });
+        case 14:
         case "end":
           return _context3.stop();
       }
@@ -429,6 +449,8 @@ var NavigationContextProvider = exports.NavigationContextProvider = function Nav
   })), [currentView, searchValue, currentArticleId, currentHistory, onSearch, searchResult === null || searchResult === void 0 ? void 0 : searchResult.length]);
   var onClose = (0, _react.useCallback)(function (event, analyticsEvent) {
     if (onCloseButtonClick) {
+      // Clear trigger elements stack when closing
+      triggerElementsRef.current = [];
       dispatchNavigationAction({
         type: 'removeAllHistoryItems'
       });
@@ -436,6 +458,11 @@ var NavigationContextProvider = exports.NavigationContextProvider = function Nav
     }
   }, [onCloseButtonClick]);
   var onOpenArticle = (0, _react.useCallback)(function (newArticleId) {
+    // Capture the currently focused element before opening article
+    var triggerElement = document.activeElement;
+    if (triggerElement && triggerElement !== document.body) {
+      triggerElementsRef.current.push(triggerElement);
+    }
     dispatchNavigationAction({
       type: 'addNewHistoryItem',
       payload: newArticleId
@@ -475,7 +502,12 @@ var NavigationContextProvider = exports.NavigationContextProvider = function Nav
       } else {
         /**
          * Otherwise we need to add a new article
+         * Capture the focused element for focus restoration when navigating back
          */
+        var triggerElement = document.activeElement;
+        if (triggerElement && triggerElement !== document.body && propsArticleId.id !== '') {
+          triggerElementsRef.current.push(triggerElement);
+        }
         dispatchNavigationAction({
           type: 'newArticle',
           payload: propsArticleId

package/dist/es2019/assets/IconWrapper.js

@@ -1,7 +1,6 @@
 import React from 'react';
 import { Flex } from '@atlaskit/primitives/compiled';
 import { IconTile } from '@atlaskit/icon';
-import { fg } from '@atlaskit/platform-feature-flags';
 export const IconWrapper = ({
   Icon,
   appearance
@@ -9,13 +8,7 @@ export const IconWrapper = ({
   return /*#__PURE__*/React.createElement(Flex, {
     alignItems: "center",
     justifyContent: "center"
-  }, !fg('platform-visual-refresh-icons') ? /*#__PURE__*/React.createElement(Icon, {
-    label: "",
-    color: "var(--ds-icon-inverse, #FFFFFF)"
-  }) :
-  /*#__PURE__*/
-  // @ts-ignore
-  React.createElement(IconTile, {
+  }, /*#__PURE__*/React.createElement(IconTile, {
     icon: Icon,
     size: "16",
     label: "",

package/dist/es2019/components/BackButton/index.js

@@ -2,7 +2,7 @@ import React from 'react';
 import { injectIntl } from 'react-intl-next';
 import { useAnalyticsEvents, AnalyticsContext } from '@atlaskit/analytics-next';
 import { Transition } from 'react-transition-group';
-import ArrowleftIcon from '@atlaskit/icon/core/migration/arrow-left';
+import ArrowleftIcon from '@atlaskit/icon/core/arrow-left';
 import Button from '@atlaskit/button/standard-button';
 import { messages } from '../../messages';
 import { BackButtonContainer, BACK_BUTTON_CONTAINER_TRANSITION_DURATION_MS } from '../styled';

package/dist/es2019/components/NeedMoreHelp/index.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import LightbulbIcon from '@atlaskit/icon/core/migration/lightbulb';
+import LightbulbIcon from '@atlaskit/icon/core/lightbulb';
 import { Inline } from '@atlaskit/primitives/compiled';
 import { useIntl } from 'react-intl-next';
 import { NeedMoreHelpContainer, NeedMoreHelpContent, HelpAskAI } from './styled';

package/dist/es2019/components/WhatsNew/WhatsNewButton/index.js

@@ -1,7 +1,7 @@
 import React, { useCallback } from 'react';
 import { AnalyticsContext } from '@atlaskit/analytics-next';
 import * as colors from '@atlaskit/theme/colors';
-import LightbulbIcon from '@atlaskit/icon/core/migration/lightbulb';
+import LightbulbIcon from '@atlaskit/icon/core/lightbulb';
 import { injectIntl } from 'react-intl-next';
 import { useWhatsNewArticleContext } from '../../contexts/whatsNewArticleContext';
 import { useNavigationContext } from '../../contexts/navigationContext';

package/dist/es2019/components/contexts/navigationContext.js

@@ -81,15 +81,15 @@ const getCurrentArticleItemSlim = history => {
   if (article) {
     if (type === ARTICLE_TYPE.HELP_ARTICLE) {
       const {
-        body,
-        relatedArticles,
+        body: _body,
+        relatedArticles: _relatedArticles,
         ...articleItemData
       } = article;
       const currentArticleSlimData = articleItemData;
       return currentArticleSlimData;
     } else if (type === ARTICLE_TYPE.WHATS_NEW) {
       const {
-        description,
+        description: _description,
         ...whatsNewArticleItemData
       } = article;
       const currentWhatsNewArticleSlimData = whatsNewArticleItemData;
@@ -273,6 +273,9 @@ export const NavigationContextProvider = ({
   const onGetHelpArticleRef = useRef(onGetHelpArticle);
   const onGetWhatsNewArticleRef = useRef(onGetWhatsNewArticle);
 
+  // Ref to store triggering elements for focus restoration on navigate back
+  const triggerElementsRef = useRef([]);
+
   // Update refs when functions change
   onGetHelpArticleRef.current = onGetHelpArticle;
   onGetWhatsNewArticleRef.current = onGetWhatsNewArticle;
@@ -312,7 +315,7 @@ export const NavigationContextProvider = ({
         }),
         state: REQUEST_STATE.done
       };
-    } catch (error) {
+    } catch {
       return {
         ...historyItem,
         state: REQUEST_STATE.error
@@ -354,6 +357,9 @@ export const NavigationContextProvider = ({
 
     //  if the history is not empty and ...
     if (currentHistory.length > 0) {
+      // Pop the trigger element before navigating back
+      const triggerElement = triggerElementsRef.current.pop();
+
       // the history has more than one article, navigate back through the history
       if (currentHistory.length > 1) {
         // Remove last element
@@ -376,10 +382,23 @@ export const NavigationContextProvider = ({
           });
         }
       }
+
+      // Restore focus to the element that triggered the navigation
+      if (triggerElement) {
+        // Wait for slide-out animation to complete (300ms) plus a buffer
+        const timeoutId = setTimeout(() => {
+          if (document.body.contains(triggerElement)) {
+            triggerElement.focus();
+          }
+        }, 400); // Increased from 350ms to 400ms
+        return () => clearTimeout(timeoutId);
+      }
     }
   }, [currentView, searchValue, currentArticleId, currentHistory, onSearch, searchResult === null || searchResult === void 0 ? void 0 : searchResult.length]);
   const onClose = useCallback((event, analyticsEvent) => {
     if (onCloseButtonClick) {
+      // Clear trigger elements stack when closing
+      triggerElementsRef.current = [];
       dispatchNavigationAction({
         type: 'removeAllHistoryItems'
       });
@@ -387,6 +406,11 @@ export const NavigationContextProvider = ({
     }
   }, [onCloseButtonClick]);
   const onOpenArticle = useCallback(newArticleId => {
+    // Capture the currently focused element before opening article
+    const triggerElement = document.activeElement;
+    if (triggerElement && triggerElement !== document.body) {
+      triggerElementsRef.current.push(triggerElement);
+    }
     dispatchNavigationAction({
       type: 'addNewHistoryItem',
       payload: newArticleId
@@ -426,7 +450,12 @@ export const NavigationContextProvider = ({
       } else {
         /**
          * Otherwise we need to add a new article
+         * Capture the focused element for focus restoration when navigating back
          */
+        const triggerElement = document.activeElement;
+        if (triggerElement && triggerElement !== document.body && propsArticleId.id !== '') {
+          triggerElementsRef.current.push(triggerElement);
+        }
         dispatchNavigationAction({
           type: 'newArticle',
           payload: propsArticleId

package/dist/esm/assets/IconWrapper.js

@@ -1,20 +1,13 @@
 import React from 'react';
 import { Flex } from '@atlaskit/primitives/compiled';
 import { IconTile } from '@atlaskit/icon';
-import { fg } from '@atlaskit/platform-feature-flags';
 export var IconWrapper = function IconWrapper(_ref) {
   var Icon = _ref.Icon,
     appearance = _ref.appearance;
   return /*#__PURE__*/React.createElement(Flex, {
     alignItems: "center",
     justifyContent: "center"
-  }, !fg('platform-visual-refresh-icons') ? /*#__PURE__*/React.createElement(Icon, {
-    label: "",
-    color: "var(--ds-icon-inverse, #FFFFFF)"
-  }) :
-  /*#__PURE__*/
-  // @ts-ignore
-  React.createElement(IconTile, {
+  }, /*#__PURE__*/React.createElement(IconTile, {
     icon: Icon,
     size: "16",
     label: "",

package/dist/esm/components/BackButton/index.js

@@ -2,7 +2,7 @@ import React from 'react';
 import { injectIntl } from 'react-intl-next';
 import { useAnalyticsEvents, AnalyticsContext } from '@atlaskit/analytics-next';
 import { Transition } from 'react-transition-group';
-import ArrowleftIcon from '@atlaskit/icon/core/migration/arrow-left';
+import ArrowleftIcon from '@atlaskit/icon/core/arrow-left';
 import Button from '@atlaskit/button/standard-button';
 import { messages } from '../../messages';
 import { BackButtonContainer, BACK_BUTTON_CONTAINER_TRANSITION_DURATION_MS } from '../styled';

package/dist/esm/components/NeedMoreHelp/index.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import LightbulbIcon from '@atlaskit/icon/core/migration/lightbulb';
+import LightbulbIcon from '@atlaskit/icon/core/lightbulb';
 import { Inline } from '@atlaskit/primitives/compiled';
 import { useIntl } from 'react-intl-next';
 import { NeedMoreHelpContainer, NeedMoreHelpContent, HelpAskAI } from './styled';

package/dist/esm/components/WhatsNew/WhatsNewButton/index.js

@@ -1,7 +1,7 @@
 import React, { useCallback } from 'react';
 import { AnalyticsContext } from '@atlaskit/analytics-next';
 import * as colors from '@atlaskit/theme/colors';
-import LightbulbIcon from '@atlaskit/icon/core/migration/lightbulb';
+import LightbulbIcon from '@atlaskit/icon/core/lightbulb';
 import { injectIntl } from 'react-intl-next';
 import { useWhatsNewArticleContext } from '../../contexts/whatsNewArticleContext';
 import { useNavigationContext } from '../../contexts/navigationContext';

package/dist/esm/components/contexts/navigationContext.js

@@ -92,14 +92,14 @@ var getCurrentArticleItemSlim = function getCurrentArticleItemSlim(history) {
   if (article) {
     if (type === ARTICLE_TYPE.HELP_ARTICLE) {
       var _ref = article,
-        body = _ref.body,
-        relatedArticles = _ref.relatedArticles,
+        _body = _ref.body,
+        _relatedArticles = _ref.relatedArticles,
         articleItemData = _objectWithoutProperties(_ref, _excluded);
       var currentArticleSlimData = articleItemData;
       return currentArticleSlimData;
     } else if (type === ARTICLE_TYPE.WHATS_NEW) {
       var _ref2 = article,
-        description = _ref2.description,
+        _description = _ref2.description,
         whatsNewArticleItemData = _objectWithoutProperties(_ref2, _excluded2);
       var currentWhatsNewArticleSlimData = whatsNewArticleItemData;
       return currentWhatsNewArticleSlimData;
@@ -265,6 +265,9 @@ export var NavigationContextProvider = function NavigationContextProvider(_ref4)
   var onGetHelpArticleRef = useRef(onGetHelpArticle);
   var onGetWhatsNewArticleRef = useRef(onGetWhatsNewArticle);
 
+  // Ref to store triggering elements for focus restoration on navigate back
+  var triggerElementsRef = useRef([]);
+
   // Update refs when functions change
   onGetHelpArticleRef.current = onGetHelpArticle;
   onGetWhatsNewArticleRef.current = onGetWhatsNewArticle;
@@ -367,7 +370,7 @@ export var NavigationContextProvider = function NavigationContextProvider(_ref4)
     };
   }(), []);
   var navigateBack = useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
-    var _searchResult$length;
+    var triggerElement, _searchResult$length, timeoutId;
     return _regeneratorRuntime.wrap(function _callee3$(_context3) {
       while (1) switch (_context3.prev = _context3.next) {
         case 0:
@@ -388,31 +391,48 @@ export var NavigationContextProvider = function NavigationContextProvider(_ref4)
           });
           return _context3.abrupt("return");
         case 8:
-          //  if the history is not empty and ...
-          if (currentHistory.length > 0) {
-            // the history has more than one article, navigate back through the history
-            if (currentHistory.length > 1) {
-              // Remove last element
+          if (!(currentHistory.length > 0)) {
+            _context3.next = 14;
+            break;
+          }
+          // Pop the trigger element before navigating back
+          triggerElement = triggerElementsRef.current.pop(); // the history has more than one article, navigate back through the history
+          if (currentHistory.length > 1) {
+            // Remove last element
+            dispatchNavigationAction({
+              type: 'removeLastHistoryItem'
+            });
+          } else if (currentHistory.length === 1) {
+            // If the search value is not empty and search result is not empty, show the search results
+            if (searchValue !== '' && ((_searchResult$length = searchResult === null || searchResult === void 0 ? void 0 : searchResult.length) !== null && _searchResult$length !== void 0 ? _searchResult$length : 0) > 0 && onSearch !== undefined) {
+              dispatchNavigationAction({
+                type: 'updateView',
+                payload: VIEW.SEARCH
+              });
+            }
+            // If the search value is empty, show the default content
+            else {
               dispatchNavigationAction({
-                type: 'removeLastHistoryItem'
+                type: 'removeAllHistoryItems'
               });
-            } else if (currentHistory.length === 1) {
-              // If the search value is not empty and search result is not empty, show the search results
-              if (searchValue !== '' && ((_searchResult$length = searchResult === null || searchResult === void 0 ? void 0 : searchResult.length) !== null && _searchResult$length !== void 0 ? _searchResult$length : 0) > 0 && onSearch !== undefined) {
-                dispatchNavigationAction({
-                  type: 'updateView',
-                  payload: VIEW.SEARCH
-                });
-              }
-              // If the search value is empty, show the default content
-              else {
-                dispatchNavigationAction({
-                  type: 'removeAllHistoryItems'
-                });
-              }
             }
           }
-        case 9:
+
+          // Restore focus to the element that triggered the navigation
+          if (!triggerElement) {
+            _context3.next = 14;
+            break;
+          }
+          // Wait for slide-out animation to complete (300ms) plus a buffer
+          timeoutId = setTimeout(function () {
+            if (document.body.contains(triggerElement)) {
+              triggerElement.focus();
+            }
+          }, 400); // Increased from 350ms to 400ms
+          return _context3.abrupt("return", function () {
+            return clearTimeout(timeoutId);
+          });
+        case 14:
         case "end":
           return _context3.stop();
       }
@@ -420,6 +440,8 @@ export var NavigationContextProvider = function NavigationContextProvider(_ref4)
   })), [currentView, searchValue, currentArticleId, currentHistory, onSearch, searchResult === null || searchResult === void 0 ? void 0 : searchResult.length]);
   var onClose = useCallback(function (event, analyticsEvent) {
     if (onCloseButtonClick) {
+      // Clear trigger elements stack when closing
+      triggerElementsRef.current = [];
       dispatchNavigationAction({
         type: 'removeAllHistoryItems'
       });
@@ -427,6 +449,11 @@ export var NavigationContextProvider = function NavigationContextProvider(_ref4)
     }
   }, [onCloseButtonClick]);
   var onOpenArticle = useCallback(function (newArticleId) {
+    // Capture the currently focused element before opening article
+    var triggerElement = document.activeElement;
+    if (triggerElement && triggerElement !== document.body) {
+      triggerElementsRef.current.push(triggerElement);
+    }
     dispatchNavigationAction({
       type: 'addNewHistoryItem',
       payload: newArticleId
@@ -466,7 +493,12 @@ export var NavigationContextProvider = function NavigationContextProvider(_ref4)
       } else {
         /**
          * Otherwise we need to add a new article
+         * Capture the focused element for focus restoration when navigating back
          */
+        var triggerElement = document.activeElement;
+        if (triggerElement && triggerElement !== document.body && propsArticleId.id !== '') {
+          triggerElementsRef.current.push(triggerElement);
+        }
         dispatchNavigationAction({
           type: 'newArticle',
           payload: propsArticleId

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/help",
-	"version": "9.2.2",
+	"version": "9.3.0",
 	"description": "A cross-product help component",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -33,8 +33,8 @@
 	"dependencies": {
 		"@atlaskit/analytics-next": "^11.1.0",
 		"@atlaskit/button": "^23.9.0",
-		"@atlaskit/checkbox": "^17.2.0",
-		"@atlaskit/form": "^15.1.0",
+		"@atlaskit/checkbox": "^17.3.0",
+		"@atlaskit/form": "^15.2.0",
 		"@atlaskit/heading": "^5.2.0",
 		"@atlaskit/help-article": "^6.0.0",
 		"@atlaskit/help-layout": "^6.3.0",
@@ -43,7 +43,7 @@
 		"@atlaskit/notification-log-client": "^6.4.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/primitives": "^17.0.0",
-		"@atlaskit/radio": "^8.3.0",
+		"@atlaskit/radio": "^8.4.0",
 		"@atlaskit/section-message": "^8.11.0",
 		"@atlaskit/select": "^21.6.0",
 		"@atlaskit/spinner": "^19.0.0",