@atlaskit/help 6.0.7 → 7.0.2

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # @atlaskit/help
 
+## 7.0.2
+
+### Patch Changes
+
+- [`d4bd99015e9`](https://bitbucket.org/atlassian/atlassian-frontend/commits/d4bd99015e9) - [ux] Fix history initialization
+
+## 7.0.1
+
+### Patch Changes
+
+- [`4ef57768666`](https://bitbucket.org/atlassian/atlassian-frontend/commits/4ef57768666) - [ux] Improve navigation in the "What's new" section
+
+## 7.0.0
+
+### Major Changes
+
+- [`396fbf5fc2d`](https://bitbucket.org/atlassian/atlassian-frontend/commits/396fbf5fc2d) - [ux] Update the way we set the articleId and the history in the component
+
+## 6.0.8
+
+### Patch Changes
+
+- [`222834915fa`](https://bitbucket.org/atlassian/atlassian-frontend/commits/222834915fa) - [ux] Fix date formatting in What's New
+
 ## 6.0.7
 
 ### Patch Changes

package/dist/cjs/components/Article/HelpArticle/index.js

@@ -38,7 +38,7 @@ var HelpArticle = function HelpArticle(_ref) {
       isLoading = _ref.isLoading;
 
   var _useNavigationContext = (0, _navigationContext.useNavigationContext)(),
-      setArticleId = _useNavigationContext.setArticleId,
+      openArticle = _useNavigationContext.openArticle,
       getCurrentArticleItemData = _useNavigationContext.getCurrentArticleItemData;
 
   var _useHelpArticleContex = (0, _helpArticleContext.useHelpArticleContext)(),
@@ -80,13 +80,11 @@ var HelpArticle = function HelpArticle(_ref) {
       onRelatedArticlesListItemClick(event, analyticsEvent, articleData);
     }
 
-    if (setArticleId) {
-      setArticleId({
-        id: articleData.id,
-        type: _Help.ARTICLE_TYPE.HELP_ARTICLE
-      });
-    }
-  }, [setArticleId, onRelatedArticlesListItemClick]);
+    openArticle({
+      id: articleData.id,
+      type: _Help.ARTICLE_TYPE.HELP_ARTICLE
+    });
+  }, [openArticle, onRelatedArticlesListItemClick]);
   var handleOnRelatedArticlesShowMoreClick = (0, _react.useCallback)(function (event, analyticsEvent, isCollapsed) {
     analyticsEvent.payload.attributes = {
       componentName: 'Article',

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

@@ -31,9 +31,9 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 // Animation
 var defaultStyle = {

package/dist/cjs/components/Help.js

@@ -45,6 +45,8 @@ var _MessagesIntlProvider = _interopRequireDefault(require("./MessagesIntlProvid
 
 var _HelpContent = _interopRequireDefault(require("./HelpContent"));
 
+var _excluded = ["children", "footer"];
+
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
 
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
@@ -65,7 +67,7 @@ var Help = /*#__PURE__*/function (_React$PureComponent) {
       var _this$props = this.props,
           children = _this$props.children,
           footer = _this$props.footer,
-          rest = (0, _objectWithoutProperties2.default)(_this$props, ["children", "footer"]);
+          rest = (0, _objectWithoutProperties2.default)(_this$props, _excluded);
       return /*#__PURE__*/_react.default.createElement(_headerContext.HeaderContextProvider, rest.header, /*#__PURE__*/_react.default.createElement(_homeContext.HomeContextProvider, (0, _extends2.default)({}, rest.home, {
         homeContent: children
       }), /*#__PURE__*/_react.default.createElement(_helpArticleContext.HelpArticleContextProvider, rest.helpArticle, /*#__PURE__*/_react.default.createElement(_relatedArticlesContext.RelatedArticlesContextProvider, rest.relatedArticles, /*#__PURE__*/_react.default.createElement(_searchContext.SearchContextProvider, rest.search, /*#__PURE__*/_react.default.createElement(_whatsNewArticleContext.WhatsNewArticleProvider, rest.whatsNew, /*#__PURE__*/_react.default.createElement(_navigationContext.NavigationContextProvider, rest.navigation, /*#__PURE__*/_react.default.createElement(_MessagesIntlProvider.default, null, /*#__PURE__*/_react.default.createElement(_HelpContent.default, {

package/dist/cjs/components/Search/SearchResults/index.js

@@ -39,9 +39,9 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 var defaultStyle = {
   transition: "opacity ".concat(_constants.FADEIN_OVERLAY_TRANSITION_DURATION_MS, "ms"),
@@ -78,19 +78,16 @@ var SearchResults = function SearchResults() {
       onSearchExternalUrlClick = _useSearchContext.onSearchExternalUrlClick;
 
   var _useNavigationContext = (0, _navigationContext.useNavigationContext)(),
-      setArticleId = _useNavigationContext.setArticleId,
+      openArticle = _useNavigationContext.openArticle,
       view = _useNavigationContext.view;
 
   var handleOnSearchResultItemClick = (0, _react.useCallback)(function (event, analyticsEvent, articleData) {
-    if (setArticleId) {
-      setArticleId({
-        id: articleData.id,
-        type: _Help.ARTICLE_TYPE.HELP_ARTICLE
-      });
-    }
-
+    openArticle({
+      id: articleData.id,
+      type: _Help.ARTICLE_TYPE.HELP_ARTICLE
+    });
     onSearchResultItemClick(event, analyticsEvent, articleData);
-  }, [onSearchResultItemClick, setArticleId]);
+  }, [onSearchResultItemClick, openArticle]);
   return /*#__PURE__*/_react.default.createElement(_reactTransitionGroup.Transition, {
     in: view === _constants.VIEW.SEARCH && isSearchResultVisible,
     timeout: _constants.FADEIN_OVERLAY_TRANSITION_DURATION_MS

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

@@ -50,20 +50,18 @@ var WhatsNewButton = function WhatsNewButton(_ref) {
       whatsNewGetNotificationProvider = _useWhatsNewArticleCo.whatsNewGetNotificationProvider;
 
   var _useNavigationContext = (0, _navigationContext.useNavigationContext)(),
-      setArticleId = _useNavigationContext.setArticleId;
+      openArticle = _useNavigationContext.openArticle;
 
   var handleOnButtonClick = (0, _react.useCallback)(function (id, analytics, event) {
     if (onWhatsNewButtonClick) {
       onWhatsNewButtonClick(event, analytics);
     }
 
-    if (setArticleId) {
-      setArticleId({
-        id: '',
-        type: _Help.ARTICLE_TYPE.WHATS_NEW
-      });
-    }
-  }, [onWhatsNewButtonClick, setArticleId]);
+    openArticle({
+      id: '',
+      type: _Help.ARTICLE_TYPE.WHATS_NEW
+    });
+  }, [onWhatsNewButtonClick, openArticle]);
   return /*#__PURE__*/_react.default.createElement(_HelpContentButton.default, {
     id: "whats-new",
     key: "whats-new",

package/dist/cjs/components/WhatsNew/WhatsNewResults/WhatsNewResultsList/WhatsNewResultsList.js

@@ -51,7 +51,7 @@ var WhatsNewResultsList = function WhatsNewResultsList(_ref) {
       var featureRolloutDateString = whatsNewArticle === null || whatsNewArticle === void 0 ? void 0 : whatsNewArticle.featureRolloutDate;
 
       if (featureRolloutDateString) {
-        var featureRolloutDateArray = featureRolloutDateString.replace('-', '/');
+        var featureRolloutDateArray = featureRolloutDateString.replace('/-/g', '/');
         var featureRolloutDate = (0, _toDate.default)(new Date(featureRolloutDateArray));
 
         if (whatsNewArticlesGroupedByDateTemp[featureRolloutDateString]) {

package/dist/cjs/components/WhatsNew/WhatsNewResults/WhatsNewResultsList/index.js

@@ -57,7 +57,7 @@ var WhatsNewResultsList = function WhatsNewResultsList(_ref) {
       onShowMoreButtonClick = _ref.onShowMoreButtonClick;
 
   var _useNavigationContext = (0, _navigationContext.useNavigationContext)(),
-      setArticleId = _useNavigationContext.setArticleId;
+      openArticle = _useNavigationContext.openArticle;
 
   var handleShowMoreButtonClick = function handleShowMoreButtonClick(event, analyticsEvent) {
     if (onShowMoreButtonClick) {
@@ -66,17 +66,15 @@ var WhatsNewResultsList = function WhatsNewResultsList(_ref) {
   };
 
   var handleOnWhatsNewResultItemClick = (0, _react.useCallback)(function (event, analyticsEvent, articleData) {
-    if (setArticleId) {
-      setArticleId({
-        id: articleData.id,
-        type: _Help.ARTICLE_TYPE.WHATS_NEW
-      });
-    }
+    openArticle({
+      id: articleData.id,
+      type: _Help.ARTICLE_TYPE.WHATS_NEW
+    });
 
     if (onWhatsNewResultItemClick) {
       onWhatsNewResultItemClick(event, analyticsEvent, articleData);
     }
-  }, [onWhatsNewResultItemClick, setArticleId]);
+  }, [onWhatsNewResultItemClick, openArticle]);
   return whatsNewArticles && whatsNewArticles.length > 0 ? /*#__PURE__*/_react.default.createElement(_styled.WhatsNewResultsListContainer, null, /*#__PURE__*/_react.default.createElement(_styledComponents.ThemeProvider, {
     theme: (0, _defineProperty2.default)({}, _item.itemThemeNamespace, ITEM_THEME)
   }, /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_WhatsNewResultsList.default, {

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

@@ -17,6 +17,8 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _reactTransitionGroup = require("react-transition-group");
 
+var _isEqual = _interopRequireDefault(require("lodash/isEqual"));
+
 var _select = _interopRequireDefault(require("@atlaskit/select"));
 
 var _reactIntlNext = require("react-intl-next");
@@ -47,9 +49,9 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 var defaultStyle = {
   transition: "opacity ".concat(_constants.FADEIN_OVERLAY_TRANSITION_DURATION_MS, "ms"),
@@ -87,12 +89,18 @@ var WhatsNewResults = function WhatsNewResults(_ref) {
       searchWhatsNewArticlesState = _useWhatsNewArticleCo.searchWhatsNewArticlesState,
       onWhatsNewResultItemClick = _useWhatsNewArticleCo.onWhatsNewResultItemClick;
 
+  var containerRef = (0, _react.useRef)(null);
+  var containerScrollPosition = (0, _react.useRef)(0);
   var SELECT_DEFAULT_VALUE = {
     value: '',
     label: formatMessage(_messages.messages.help_whats_new_filter_select_option_all)
   };
+  var SELECT_EMPTY_VALUE = {
+    value: undefined,
+    label: ''
+  };
 
-  var _useState = (0, _react.useState)(SELECT_DEFAULT_VALUE),
+  var _useState = (0, _react.useState)(SELECT_EMPTY_VALUE),
       _useState2 = (0, _slicedToArray2.default)(_useState, 2),
       selectedOption = _useState2[0],
       setSelectedOption = _useState2[1];
@@ -109,8 +117,25 @@ var WhatsNewResults = function WhatsNewResults(_ref) {
   }, [onSearchWhatsNewArticles, searchWhatsNewArticlesResult, selectedOption]);
 
   var handleOnEnter = function handleOnEnter() {
-    setSelectedOption(SELECT_DEFAULT_VALUE);
-    onSearchWhatsNewArticles && onSearchWhatsNewArticles();
+    setTimeout(function () {
+      if (containerRef.current) {
+        containerRef.current.scrollTop = containerScrollPosition.current;
+      }
+    }, 0);
+
+    if ((0, _isEqual.default)(selectedOption, SELECT_EMPTY_VALUE)) {
+      setSelectedOption(SELECT_DEFAULT_VALUE);
+      onSearchWhatsNewArticles && onSearchWhatsNewArticles();
+    }
+  };
+
+  var handleOnExit = function handleOnExit() {
+    if (helpContextView === _constants.VIEW.DEFAULT_CONTENT) {
+      setSelectedOption(SELECT_EMPTY_VALUE);
+      containerScrollPosition.current = 0;
+    } else {
+      containerScrollPosition.current = containerRef.current ? containerRef.current.scrollTop : 0;
+    }
   };
 
   var handleOnClearFilter = function handleOnClearFilter() {
@@ -126,9 +151,11 @@ var WhatsNewResults = function WhatsNewResults(_ref) {
   return /*#__PURE__*/_react.default.createElement(_reactTransitionGroup.Transition, {
     in: helpContextView === _constants.VIEW.WHATS_NEW,
     timeout: _constants.FADEIN_OVERLAY_TRANSITION_DURATION_MS,
-    onEnter: handleOnEnter
+    onEnter: handleOnEnter,
+    onExit: handleOnExit
   }, function (state) {
     return /*#__PURE__*/_react.default.createElement(_styled.WhatsNewResultsContainer, {
+      ref: containerRef,
       style: _objectSpread(_objectSpread({}, defaultStyle), transitionStyles[state])
     }, /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, searchWhatsNewArticlesState === _Requests.REQUEST_STATE.loading && searchWhatsNewArticlesResult === null && state !== 'exited' && /*#__PURE__*/_react.default.createElement(_WhatsNewResultsLoading.default, null), (searchWhatsNewArticlesState === _Requests.REQUEST_STATE.done || searchWhatsNewArticlesState === _Requests.REQUEST_STATE.loading) && searchWhatsNewArticlesResult !== null && state !== 'exited' && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_styled.SelectContainer, null, /*#__PURE__*/_react.default.createElement(_select.default, {
       defaultValue: selectedOption,

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

@@ -23,6 +23,8 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 
 var _react = _interopRequireWildcard(require("react"));
 
+var _isEqual = _interopRequireDefault(require("lodash/isEqual"));
+
 var _Requests = require("../../model/Requests");
 
 var _Help = require("../../model/Help");
@@ -41,13 +43,21 @@ var _searchContext = require("./searchContext");
 
 var _headerContext = require("./headerContext");
 
+var _excluded = ["body", "relatedArticles"],
+    _excluded2 = ["description"];
+
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+var DEFAULT_ARTICLE_ID = {
+  id: '',
+  type: _Help.ARTICLE_TYPE.HELP_ARTICLE
+};
 
 var _createCtx = (0, _ctx.createCtx)(),
     _createCtx2 = (0, _slicedToArray2.default)(_createCtx, 2),
@@ -86,6 +96,21 @@ var getSimpleHistory = function getSimpleHistory(history) {
     };
   });
 };
+/**
+ * Get history data (list of IDs and UID)
+ */
+
+
+var getHistoryData = function getHistoryData(history) {
+  return history.map(function (historyItem) {
+    var id = historyItem.id,
+        uid = historyItem.uid;
+    return {
+      id: id,
+      uid: uid
+    };
+  });
+};
 /**
  * Get the last article in the history
  */
@@ -109,13 +134,13 @@ var getCurrentArticleItemSlim = function getCurrentArticleItemSlim(history) {
       var _ref = article,
           body = _ref.body,
           relatedArticles = _ref.relatedArticles,
-          articleItemData = (0, _objectWithoutProperties2.default)(_ref, ["body", "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,
-          whatsNewArticleItemData = (0, _objectWithoutProperties2.default)(_ref2, ["description"]);
+          whatsNewArticleItemData = (0, _objectWithoutProperties2.default)(_ref2, _excluded2);
       var currentWhatsNewArticleSlimData = whatsNewArticleItemData;
       return currentWhatsNewArticleSlimData;
     }
@@ -154,10 +179,26 @@ var navigationReducer = function navigationReducer(_ref3, action) {
 
   if (action.type === 'newArticle' && action.payload) {
     var newArticleId = action.payload;
+
+    if ((0, _isEqual.default)(newArticleId, DEFAULT_ARTICLE_ID)) {
+      newState = {
+        articleId: newArticleId,
+        history: [],
+        view: _constants.VIEW.DEFAULT_CONTENT
+      };
+    } else {
+      newState = {
+        articleId: newArticleId,
+        history: [].concat((0, _toConsumableArray2.default)(currentHistory), [getNewHistoryItem(newArticleId.id, newArticleId.type)]),
+        view: getViewForArticleId(newArticleId)
+      };
+    }
+  } else if (action.type === 'addNewHistoryItem' && action.payload) {
+    var _newArticleId = action.payload;
     newState = {
-      articleId: newArticleId,
-      history: [].concat((0, _toConsumableArray2.default)(currentHistory), [getNewHistoryItem(newArticleId.id, newArticleId.type)]),
-      view: getViewForArticleId(newArticleId)
+      articleId: currentArticleId,
+      history: [].concat((0, _toConsumableArray2.default)(currentHistory), [getNewHistoryItem(_newArticleId.id, _newArticleId.type)]),
+      view: getViewForArticleId(currentArticleId)
     };
   } else if (action.type === 'updateHistoryItem' && action.payload) {
     var HistoryItemUpdate = action.payload;
@@ -194,11 +235,11 @@ var navigationReducer = function navigationReducer(_ref3, action) {
       view: _constants.VIEW.DEFAULT_CONTENT
     };
   } else if (action.type === 'updateArticleId' && action.payload) {
-    var _newArticleId = action.payload;
+    var _newArticleId2 = action.payload;
     newState = {
-      articleId: _newArticleId,
+      articleId: _newArticleId2,
       history: currentHistory,
-      view: getViewForArticleId(_newArticleId)
+      view: getViewForArticleId(_newArticleId2)
     };
   } else if (action.type === 'updateView' && action.payload) {
     var newView = action.payload;
@@ -213,15 +254,12 @@ var navigationReducer = function navigationReducer(_ref3, action) {
 };
 
 var NavigationContextProvider = function NavigationContextProvider(_ref4) {
-  var _ref4$articleId = _ref4.articleId,
-      propsArticleId = _ref4$articleId === void 0 ? {
-    id: '',
-    type: _Help.ARTICLE_TYPE.HELP_ARTICLE
-  } : _ref4$articleId,
-      articleIdSetter = _ref4.articleIdSetter,
-      _ref4$history = _ref4.history,
-      propsHistory = _ref4$history === void 0 ? [] : _ref4$history,
-      historySetter = _ref4.historySetter,
+  var _ref4$navigationData = _ref4.navigationData,
+      navigationData = _ref4$navigationData === void 0 ? {
+    articleId: DEFAULT_ARTICLE_ID,
+    history: []
+  } : _ref4$navigationData,
+      setNavigationData = _ref4.setNavigationData,
       children = _ref4.children;
 
   var _useHelpArticleContex = (0, _helpArticleContext.useHelpArticleContext)(),
@@ -242,9 +280,12 @@ var NavigationContextProvider = function NavigationContextProvider(_ref4) {
   var _useHeaderContext = (0, _headerContext.useHeaderContext)(),
       onCloseButtonClick = _useHeaderContext.onCloseButtonClick;
 
+  var propsArticleId = navigationData.articleId,
+      propsHistory = navigationData.history;
+
   var _useReducer = (0, _react.useReducer)(navigationReducer, {
     articleId: propsArticleId,
-    history: propsHistory,
+    history: !(0, _isEqual.default)(propsArticleId, DEFAULT_ARTICLE_ID) && propsHistory.length === 0 ? [getNewHistoryItem(propsArticleId.id, propsArticleId.type)] : propsHistory,
     view: _constants.VIEW.DEFAULT_CONTENT
   }),
       _useReducer2 = (0, _slicedToArray2.default)(_useReducer, 2),
@@ -264,8 +305,6 @@ var NavigationContextProvider = function NavigationContextProvider(_ref4) {
     /**
      * - If default content isn't defined and the history only has one article,
      * we should not display the back button
-     * - If the prop.article.setArticleId is not defined, we should also hide the back
-     * button because we are not able to navigate though the history without it
      */
     if (currentHistory.length === 1 && !isDefaultContentDefined || currentView === _constants.VIEW.WHATS_NEW && !isDefaultContentDefined) {
       return false;
@@ -453,6 +492,12 @@ var NavigationContextProvider = function NavigationContextProvider(_ref4) {
       onCloseButtonClick(event, analyticsEvent);
     }
   }, [onCloseButtonClick]);
+  var onOpenArticle = (0, _react.useCallback)(function (newArticleId) {
+    dispatchNavigationAction({
+      type: 'addNewHistoryItem',
+      payload: newArticleId
+    });
+  }, []);
   (0, _react.useEffect)(function () {
     if (isSearchResultVisible) {
       dispatchNavigationAction({
@@ -462,43 +507,59 @@ var NavigationContextProvider = function NavigationContextProvider(_ref4) {
     }
   }, [isSearchResultVisible]);
   (0, _react.useEffect)(function () {
-    var simpleHistory = getSimpleHistory(currentHistory);
-    historySetter && historySetter(simpleHistory);
-  }, [historySetter, currentHistory]);
-  (0, _react.useEffect)(function () {
+    var lastHistoryItem = currentHistory.length > 0 ? _getCurrentArticle2(currentHistory) : getNewHistoryItem(DEFAULT_ARTICLE_ID.id, DEFAULT_ARTICLE_ID.type);
     /**
      * If the propsArticleId.id (host articleId) is different from currentArticleId.id (internal articleId)
-     * it means the host updated propsArticleId and we need to use this new value to load a new article.
      * */
-    if ((propsArticleId === null || propsArticleId === void 0 ? void 0 : propsArticleId.id) !== currentArticleId.id || (propsArticleId === null || propsArticleId === void 0 ? void 0 : propsArticleId.type) !== currentArticleId.type) {
-      dispatchNavigationAction({
-        type: 'newArticle',
-        payload: propsArticleId
-      });
-    } else {
+
+    if (!(0, _isEqual.default)(propsArticleId, currentArticleId)) {
       /**
-       * If the propsArticleId.id (host articleId) is equal to currentArticleId.id (internal articleId)
-       * and the id from the last history item is different from currentArticleId.id, it means the history
-       * changed and we need to update the host articleId (propsArticleId) using 'articleIdSetter' and the local
-       * history using the dispatchNavigationAction reducer
-       * */
-      var lastHistoryItem = currentHistory.length > 0 ? _getCurrentArticle2(currentHistory) : getNewHistoryItem('', _Help.ARTICLE_TYPE.HELP_ARTICLE);
-
-      if (articleIdSetter && lastHistoryItem && (currentArticleId.id !== lastHistoryItem.id || currentArticleId.type !== lastHistoryItem.type)) {
+       * If propsArticleId and lastHistoryItem are the same, we just need to update the articleId
+       * because is out of sync
+       */
+      if (propsArticleId.id === lastHistoryItem.id && propsArticleId.type === lastHistoryItem.type) {
         dispatchNavigationAction({
           type: 'updateArticleId',
-          payload: {
-            id: lastHistoryItem.id,
-            type: lastHistoryItem.type
-          }
+          payload: propsArticleId
         });
-        articleIdSetter({
-          id: lastHistoryItem.id,
-          type: lastHistoryItem.type
+      } else {
+        /**
+         * Otherwise we need to add a new article
+         */
+        dispatchNavigationAction({
+          type: 'newArticle',
+          payload: propsArticleId
         });
       }
+    } else {
+      // console.log('same articleId');
+      if (setNavigationData) {
+        var simpleHistory = getSimpleHistory(currentHistory);
+
+        if (currentArticleId.id !== lastHistoryItem.id || currentArticleId.type !== lastHistoryItem.type) {
+          /**
+           * If the propsArticleId.id (host articleId) is equal to currentArticleId.id (internal articleId)
+           * and the id from the last history item is different from currentArticleId.id, it means the history
+           * changed
+           * */
+          if (setNavigationData) {
+            setNavigationData({
+              articleId: {
+                id: lastHistoryItem.id,
+                type: lastHistoryItem.type
+              },
+              history: simpleHistory
+            });
+          }
+        } else if (!(0, _isEqual.default)(getHistoryData(propsHistory), getHistoryData(currentHistory))) {
+          setNavigationData({
+            articleId: propsArticleId,
+            history: simpleHistory
+          });
+        }
+      }
     }
-  }, [currentArticleId, propsArticleId, currentHistory, articleIdSetter]);
+  }, [currentArticleId, propsArticleId, currentHistory, setNavigationData, propsHistory]);
   (0, _react.useEffect)(function () {
     var requestNewArticle = /*#__PURE__*/function () {
       var _ref8 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(historyItem) {
@@ -544,7 +605,7 @@ var NavigationContextProvider = function NavigationContextProvider(_ref4) {
     value: {
       view: currentView,
       articleId: currentArticleId,
-      setArticleId: articleIdSetter,
+      openArticle: onOpenArticle,
       history: currentHistory,
       getCurrentArticle: function getCurrentArticle() {
         return _getCurrentArticle2(currentHistory);

package/dist/cjs/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/help",
-	"version": "6.0.7",
+	"version": "7.0.2",
 	"sideEffects": false
 }

package/dist/es2019/components/Article/HelpArticle/index.js

@@ -14,7 +14,7 @@ export const HelpArticle = ({
   isLoading
 }) => {
   const {
-    setArticleId,
+    openArticle,
     getCurrentArticleItemData
   } = useNavigationContext();
   const {
@@ -56,13 +56,11 @@ export const HelpArticle = ({
       onRelatedArticlesListItemClick(event, analyticsEvent, articleData);
     }
 
-    if (setArticleId) {
-      setArticleId({
-        id: articleData.id,
-        type: ARTICLE_TYPE.HELP_ARTICLE
-      });
-    }
-  }, [setArticleId, onRelatedArticlesListItemClick]);
+    openArticle({
+      id: articleData.id,
+      type: ARTICLE_TYPE.HELP_ARTICLE
+    });
+  }, [openArticle, onRelatedArticlesListItemClick]);
   const handleOnRelatedArticlesShowMoreClick = useCallback((event, analyticsEvent, isCollapsed) => {
     analyticsEvent.payload.attributes = {
       componentName: 'Article',

package/dist/es2019/components/Search/SearchResults/index.js

@@ -44,19 +44,16 @@ export const SearchResults = () => {
     onSearchExternalUrlClick
   } = useSearchContext();
   const {
-    setArticleId,
+    openArticle,
     view
   } = useNavigationContext();
   const handleOnSearchResultItemClick = useCallback((event, analyticsEvent, articleData) => {
-    if (setArticleId) {
-      setArticleId({
-        id: articleData.id,
-        type: ARTICLE_TYPE.HELP_ARTICLE
-      });
-    }
-
+    openArticle({
+      id: articleData.id,
+      type: ARTICLE_TYPE.HELP_ARTICLE
+    });
     onSearchResultItemClick(event, analyticsEvent, articleData);
-  }, [onSearchResultItemClick, setArticleId]);
+  }, [onSearchResultItemClick, openArticle]);
   return /*#__PURE__*/React.createElement(Transition, {
     in: view === VIEW.SEARCH && isSearchResultVisible,
     timeout: FADEIN_OVERLAY_TRANSITION_DURATION_MS