@atlaskit/help 7.1.8 → 7.1.11

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (50) hide show
  1. package/CHANGELOG.md +18 -0
  2. package/dist/cjs/components/Article/HelpArticle/index.js +6 -2
  3. package/dist/cjs/components/ArticlesList/ArticlesList.js +19 -17
  4. package/dist/cjs/components/ArticlesList/ArticlesListItem/index.js +4 -20
  5. package/dist/cjs/components/ArticlesList/ArticlesListItem/styled.js +2 -2
  6. package/dist/cjs/components/ArticlesList/index.js +4 -25
  7. package/dist/cjs/components/WhatsNew/WhatsNewResults/WhatsNewResultsList/index.js +4 -25
  8. package/dist/cjs/util/testing/mock.js +12 -6
  9. package/dist/cjs/version.json +1 -1
  10. package/dist/es2019/components/Article/HelpArticle/index.js +6 -2
  11. package/dist/es2019/components/ArticlesList/ArticlesList.js +21 -13
  12. package/dist/es2019/components/ArticlesList/ArticlesListItem/index.js +3 -17
  13. package/dist/es2019/components/ArticlesList/ArticlesListItem/styled.js +4 -2
  14. package/dist/es2019/components/ArticlesList/index.js +2 -19
  15. package/dist/es2019/components/WhatsNew/WhatsNewResults/WhatsNewResultsList/index.js +2 -19
  16. package/dist/es2019/util/testing/mock.js +12 -6
  17. package/dist/es2019/version.json +1 -1
  18. package/dist/esm/components/Article/HelpArticle/index.js +6 -2
  19. package/dist/esm/components/ArticlesList/ArticlesList.js +21 -13
  20. package/dist/esm/components/ArticlesList/ArticlesListItem/index.js +4 -17
  21. package/dist/esm/components/ArticlesList/ArticlesListItem/styled.js +2 -2
  22. package/dist/esm/components/ArticlesList/index.js +2 -18
  23. package/dist/esm/components/RelatedArticles/index.js +1 -1
  24. package/dist/esm/components/WhatsNew/WhatsNewResults/WhatsNewResultsList/index.js +2 -18
  25. package/dist/esm/components/contexts/navigationContext.js +1 -1
  26. package/dist/esm/components/contexts/searchContext.js +1 -1
  27. package/dist/esm/components/contexts/whatsNewArticleContext.js +1 -1
  28. package/dist/esm/util/testing/mock.js +12 -6
  29. package/dist/esm/version.json +1 -1
  30. package/dist/types/components/Article/ArticleLoadingFail/styled.d.ts +2 -2
  31. package/dist/types/components/Article/HelpArticle/WasHelpfulForm/styled.d.ts +3 -3
  32. package/dist/types/components/Article/WhatsNewArticle/styled.d.ts +6 -6
  33. package/dist/types/components/Article/styled.d.ts +1 -1
  34. package/dist/types/components/ArticlesList/ArticlesListItem/index.d.ts +1 -2
  35. package/dist/types/components/ArticlesList/ArticlesListItem/styled.d.ts +6 -6
  36. package/dist/types/components/ArticlesList/styled.d.ts +2 -2
  37. package/dist/types/components/RelatedArticles/styled.d.ts +4 -4
  38. package/dist/types/components/Search/SearchInput/styled.d.ts +3 -3
  39. package/dist/types/components/Search/SearchResults/styled.d.ts +5 -5
  40. package/dist/types/components/WhatsNew/WhatsNewResults/WhatsNewResultsEmpty/styled.d.ts +2 -2
  41. package/dist/types/components/WhatsNew/WhatsNewResults/WhatsNewResultsError/styled.d.ts +2 -2
  42. package/dist/types/components/WhatsNew/WhatsNewResults/WhatsNewResultsList/WhatsNewResultItem/styled.d.ts +4 -4
  43. package/dist/types/components/WhatsNew/WhatsNewResults/WhatsNewResultsList/styled.d.ts +4 -4
  44. package/dist/types/components/WhatsNew/WhatsNewResults/WhatsNewResultsLoading/styled.d.ts +2 -2
  45. package/dist/types/components/WhatsNew/WhatsNewResults/styled.d.ts +4 -4
  46. package/dist/types/components/styled.d.ts +3 -3
  47. package/dist/types/model/Article.d.ts +4 -2
  48. package/dist/types/util/styled.d.ts +4 -4
  49. package/package.json +2 -3
  50. package/report.api.md +320 -0
package/CHANGELOG.md CHANGED
@@ -1,5 +1,23 @@
1
1
  # @atlaskit/help
2
2
 
3
+ ## 7.1.11
4
+
5
+ ### Patch Changes
6
+
7
+ - [`ce7d477bc24`](https://bitbucket.org/atlassian/atlassian-frontend/commits/ce7d477bc24) - [ux] Fixing styling on the ArticleListItem component
8
+
9
+ ## 7.1.10
10
+
11
+ ### Patch Changes
12
+
13
+ - [`cf6b2085c95`](https://bitbucket.org/atlassian/atlassian-frontend/commits/cf6b2085c95) - Use articles "routes" attribute instead of "routeName" and "routeGroup"
14
+
15
+ ## 7.1.9
16
+
17
+ ### Patch Changes
18
+
19
+ - [`4113699bb4d`](https://bitbucket.org/atlassian/atlassian-frontend/commits/4113699bb4d) - [ux] Cleanup item usage and minor refactoring in `@atlaskit/help`
20
+
3
21
  ## 7.1.8
4
22
 
5
23
  ### Patch Changes
@@ -102,6 +102,10 @@ var HelpArticle = function HelpArticle(_ref) {
102
102
  }
103
103
 
104
104
  if (article) {
105
+ var _article$routes, _article$routes2;
106
+
107
+ var routeGroup = article.routes && ((_article$routes = article.routes) === null || _article$routes === void 0 ? void 0 : _article$routes.length) > 0 ? article.routes[0].routeGroup : '';
108
+ var routeName = article.routes && ((_article$routes2 = article.routes) === null || _article$routes2 === void 0 ? void 0 : _article$routes2.length) > 0 ? article.routes[0].routeGroup : '';
105
109
  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_helpArticle.default, {
106
110
  title: article.title,
107
111
  body: article.body,
@@ -115,8 +119,8 @@ var HelpArticle = function HelpArticle(_ref) {
115
119
  style: "secondary",
116
120
  onRelatedArticlesListItemClick: handleOnRelatedArticlesListItemClick,
117
121
  onGetRelatedArticles: onGetRelatedArticles,
118
- routeGroup: article.routeGroup,
119
- routeName: article.routeName,
122
+ routeGroup: routeGroup,
123
+ routeName: routeName,
120
124
  onRelatedArticlesShowMoreClick: handleOnRelatedArticlesShowMoreClick
121
125
  }));
122
126
  }
@@ -2,8 +2,6 @@
2
2
 
3
3
  var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
4
 
5
- var _typeof = require("@babel/runtime/helpers/typeof");
6
-
7
5
  Object.defineProperty(exports, "__esModule", {
8
6
  value: true
9
7
  });
@@ -13,7 +11,7 @@ var _react = _interopRequireDefault(require("react"));
13
11
 
14
12
  var _constants = require("@atlaskit/theme/constants");
15
13
 
16
- var colors = _interopRequireWildcard(require("@atlaskit/theme/colors"));
14
+ var _colors = require("@atlaskit/theme/colors");
17
15
 
18
16
  var _tokens = require("@atlaskit/tokens");
19
17
 
@@ -23,9 +21,21 @@ var _ArticlesListItem = _interopRequireDefault(require("./ArticlesListItem"));
23
21
 
24
22
  var _constants2 = require("./constants");
25
23
 
26
- 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); }
24
+ var getStyles = function getStyles(style) {
25
+ if (style === 'secondary') {
26
+ return {
27
+ border: "2px solid ".concat((0, _tokens.token)('color.border', _colors.N30)),
28
+ padding: "".concat((0, _constants.gridSize)() * 2, "px"),
29
+ marginBottom: "".concat((0, _constants.gridSize)() * 1.5, "px")
30
+ };
31
+ }
27
32
 
28
- 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; }
33
+ return {
34
+ border: 0,
35
+ padding: "".concat((0, _constants.gridSize)(), "px"),
36
+ marginBottom: 0
37
+ };
38
+ };
29
39
 
30
40
  var articlesList = function articlesList(_ref) {
31
41
  var _ref$style = _ref.style,
@@ -37,13 +47,9 @@ var articlesList = function articlesList(_ref) {
37
47
  _ref$numberOfArticles = _ref.numberOfArticlesToDisplay,
38
48
  numberOfArticlesToDisplay = _ref$numberOfArticles === void 0 ? _constants2.MIN_ITEMS_TO_DISPLAY : _ref$numberOfArticles,
39
49
  onArticlesListItemClick = _ref.onArticlesListItemClick;
40
- return articles && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", null, articles.slice(0, minItemsToDisplay).map(function (article, i) {
50
+ return articles && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", null, articles.slice(0, minItemsToDisplay).map(function (article) {
41
51
  return /*#__PURE__*/_react.default.createElement(_ArticlesListItem.default, {
42
- styles: {
43
- border: style === 'secondary' ? "2px solid ".concat((0, _tokens.token)('color.border', colors.N30)) : 0,
44
- padding: style === 'secondary' ? "".concat((0, _constants.gridSize)(), "px ").concat((0, _constants.gridSize)() * 2, "px") : "".concat((0, _constants.gridSize)(), "px"),
45
- marginBottom: style === 'secondary' ? "".concat((0, _constants.gridSize)() * 1.5, "px") : 0
46
- },
52
+ styles: getStyles(style),
47
53
  id: article.id,
48
54
  onClick: function onClick(event, analyticsEvent) {
49
55
  if (onArticlesListItemClick) {
@@ -59,13 +65,9 @@ var articlesList = function articlesList(_ref) {
59
65
  duration: _constants2.ANIMATE_HEIGHT_TRANSITION_DURATION_MS,
60
66
  easing: "linear",
61
67
  height: numberOfArticlesToDisplay > minItemsToDisplay ? 'auto' : 0
62
- }, articles.slice(minItemsToDisplay, articles.length).map(function (article, i) {
68
+ }, articles.slice(minItemsToDisplay, articles.length).map(function (article) {
63
69
  return /*#__PURE__*/_react.default.createElement(_ArticlesListItem.default, {
64
- styles: {
65
- border: style === 'secondary' ? "2px solid ".concat((0, _tokens.token)('color.border', colors.N30)) : 0,
66
- padding: style === 'secondary' ? "".concat((0, _constants.gridSize)(), "px ").concat((0, _constants.gridSize)() * 2, "px") : "".concat((0, _constants.gridSize)(), "px"),
67
- marginBottom: style === 'secondary' ? "".concat((0, _constants.gridSize)() * 1.5, "px") : 0
68
- },
70
+ styles: getStyles(style),
69
71
  id: article.id,
70
72
  onClick: function onClick(event, analyticsEvent) {
71
73
  if (onArticlesListItemClick) {
@@ -7,7 +7,7 @@ var _typeof = require("@babel/runtime/helpers/typeof");
7
7
  Object.defineProperty(exports, "__esModule", {
8
8
  value: true
9
9
  });
10
- exports.getTypeTitle = exports.default = exports.ArticlesListItem = void 0;
10
+ exports.default = exports.ArticlesListItem = void 0;
11
11
 
12
12
  var _react = _interopRequireDefault(require("react"));
13
13
 
@@ -29,39 +29,23 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
29
29
 
30
30
  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; }
31
31
 
32
- // import { messages } from '../../../messages';
33
32
  var ANALYTICS_CONTEXT_DATA = {
34
33
  componentName: 'ArticlesListItem',
35
34
  packageName: _version.name,
36
35
  packageVersion: _version.version
37
36
  };
38
37
 
39
- var getTypeTitle = function getTypeTitle(itemType) {
40
- switch (itemType) {
41
- // case ARTICLE_ITEM_TYPES.topicInProduct:
42
- // return messages.help_article_list_item_type_help_article;
43
- default:
44
- return null;
45
- }
46
- };
47
-
48
- exports.getTypeTitle = getTypeTitle;
49
-
50
38
  var ArticlesListItem = function ArticlesListItem(_ref) {
51
- var formatMessage = _ref.intl.formatMessage,
52
- styles = _ref.styles,
39
+ var styles = _ref.styles,
53
40
  title = _ref.title,
54
41
  description = _ref.description,
55
42
  _ref$href = _ref.href,
56
43
  href = _ref$href === void 0 ? '' : _ref$href,
57
- type = _ref.type,
58
44
  onClick = _ref.onClick;
59
45
 
60
46
  var _useAnalyticsEvents = (0, _analyticsNext.useAnalyticsEvents)(),
61
47
  createAnalyticsEvent = _useAnalyticsEvents.createAnalyticsEvent;
62
48
 
63
- var typeTitle = getTypeTitle(type);
64
-
65
49
  var handleOnClick = function handleOnClick(event) {
66
50
  event.preventDefault();
67
51
 
@@ -80,12 +64,12 @@ var ArticlesListItem = function ArticlesListItem(_ref) {
80
64
  role: "button",
81
65
  href: href,
82
66
  onClick: handleOnClick
83
- }, /*#__PURE__*/_react.default.createElement(_styled.ArticlesListItemContainer, null, typeTitle && /*#__PURE__*/_react.default.createElement(_styled.ArticlesListItemTypeTitle, null, formatMessage(typeTitle)), /*#__PURE__*/_react.default.createElement(_styled.ArticlesListItemTitleText, null, title), href && /*#__PURE__*/_react.default.createElement(_styled.ArticlesListItemLinkIcon, null, /*#__PURE__*/_react.default.createElement(_shortcut.default, {
67
+ }, /*#__PURE__*/_react.default.createElement(_styled.ArticlesListItemContainer, null, /*#__PURE__*/_react.default.createElement(_styled.ArticlesListItemTitleText, null, title, href && /*#__PURE__*/_react.default.createElement(_styled.ArticlesListItemLinkIcon, null, /*#__PURE__*/_react.default.createElement(_shortcut.default, {
84
68
  size: "small",
85
69
  label: "",
86
70
  primaryColor: (0, _tokens.token)('color.icon.subtle', colors.N90),
87
71
  secondaryColor: (0, _tokens.token)('color.icon.subtle', colors.N90)
88
- }))), /*#__PURE__*/_react.default.createElement(_styled.ArticlesListItemDescription, null, description));
72
+ })))), /*#__PURE__*/_react.default.createElement(_styled.ArticlesListItemDescription, null, description));
89
73
  };
90
74
 
91
75
  exports.ArticlesListItem = ArticlesListItem;
@@ -63,11 +63,11 @@ var ArticlesListItemTypeTitle = _styled.default.div(_templateObject2 || (_templa
63
63
 
64
64
  exports.ArticlesListItemTypeTitle = ArticlesListItemTypeTitle;
65
65
 
66
- var ArticlesListItemLinkIcon = _styled.default.div(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2.default)(["\n align-self: auto;\n"])));
66
+ var ArticlesListItemLinkIcon = _styled.default.span(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2.default)(["\n align-self: auto;\n padding-inline-start: 5px;\n vertical-align: middle;\n"])));
67
67
 
68
68
  exports.ArticlesListItemLinkIcon = ArticlesListItemLinkIcon;
69
69
 
70
- var ArticlesListItemTitleText = _styled.default.span(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2.default)(["\n text-decoration: none;\n color: ", ";\n font-size: ", "px;\n font-weight: 600;\n display: block;\n line-height: ", "px;\n white-space: normal;\n overflow-x: hidden;\n margin-bottom: ", "px;\n"])), (0, _tokens.token)('color.text', colors.N800), (0, _constants.fontSize)(), (0, _constants.gridSize)() * 2.5, (0, _constants.gridSize)());
70
+ var ArticlesListItemTitleText = _styled.default.span(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2.default)(["\n text-decoration: none;\n color: ", ";\n font-size: ", "px;\n font-weight: 600;\n display: inline-block;\n line-height: ", "px;\n white-space: normal;\n overflow-x: hidden;\n margin-bottom: ", "px;\n"])), (0, _tokens.token)('color.text', colors.N800), (0, _constants.fontSize)(), (0, _constants.gridSize)() * 2.5, (0, _constants.gridSize)());
71
71
 
72
72
  exports.ArticlesListItemTitleText = ArticlesListItemTitleText;
73
73
 
@@ -9,41 +9,22 @@ Object.defineProperty(exports, "__esModule", {
9
9
  });
10
10
  exports.default = void 0;
11
11
 
12
- var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
13
-
14
12
  var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
15
13
 
16
14
  var _react = _interopRequireWildcard(require("react"));
17
15
 
18
- var _styledComponents = require("styled-components");
19
-
20
- var _item = require("@atlaskit/item");
21
-
22
- var _constants = require("@atlaskit/theme/constants");
23
-
24
16
  var _ArticlesList = _interopRequireDefault(require("./ArticlesList"));
25
17
 
26
18
  var _ShowMoreButton = _interopRequireDefault(require("../ShowMoreButton"));
27
19
 
28
20
  var _styled = require("./styled");
29
21
 
30
- var _constants2 = require("./constants");
22
+ var _constants = require("./constants");
31
23
 
32
24
  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); }
33
25
 
34
26
  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; }
35
27
 
36
- var ITEM_THEME = {
37
- padding: {
38
- default: {
39
- bottom: (0, _constants.gridSize)(),
40
- left: (0, _constants.gridSize)(),
41
- top: (0, _constants.gridSize)(),
42
- right: (0, _constants.gridSize)()
43
- }
44
- }
45
- };
46
-
47
28
  var ArticleList = function ArticleList(_ref) {
48
29
  var style = _ref.style,
49
30
  articles = _ref.articles,
@@ -58,7 +39,7 @@ var ArticleList = function ArticleList(_ref) {
58
39
  setShowMoreToggled = _useState2[1];
59
40
 
60
41
  var getMinItemsToDisplay = function getMinItemsToDisplay() {
61
- return minItemsToDisplay ? minItemsToDisplay : _constants2.MIN_ITEMS_TO_DISPLAY;
42
+ return minItemsToDisplay ? minItemsToDisplay : _constants.MIN_ITEMS_TO_DISPLAY;
62
43
  };
63
44
 
64
45
  var getMaxItemsToDisplay = function getMaxItemsToDisplay() {
@@ -81,9 +62,7 @@ var ArticleList = function ArticleList(_ref) {
81
62
  }
82
63
  };
83
64
 
84
- return articles && articles.length > 0 ? /*#__PURE__*/_react.default.createElement(_styled.ArticlesListContainer, null, /*#__PURE__*/_react.default.createElement(_styledComponents.ThemeProvider, {
85
- theme: (0, _defineProperty2.default)({}, _item.itemThemeNamespace, ITEM_THEME)
86
- }, /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_ArticlesList.default, {
65
+ return articles && articles.length > 0 ? /*#__PURE__*/_react.default.createElement(_styled.ArticlesListContainer, null, /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_ArticlesList.default, {
87
66
  style: style,
88
67
  onArticlesListItemClick: onArticlesListItemClick,
89
68
  articles: articles,
@@ -94,7 +73,7 @@ var ArticleList = function ArticleList(_ref) {
94
73
  showMoreToggeled: showMoreToggled,
95
74
  onToggle: toggleArticlesList,
96
75
  itemsType: "articles"
97
- })))) : null;
76
+ }))) : null;
98
77
  };
99
78
 
100
79
  var _default = ArticleList;
@@ -9,23 +9,15 @@ Object.defineProperty(exports, "__esModule", {
9
9
  });
10
10
  exports.default = void 0;
11
11
 
12
- var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
13
-
14
12
  var _react = _interopRequireWildcard(require("react"));
15
13
 
16
- var _styledComponents = require("styled-components");
17
-
18
- var _item = require("@atlaskit/item");
19
-
20
- var _constants = require("@atlaskit/theme/constants");
21
-
22
14
  var _ShowMoreButton = _interopRequireDefault(require("../../../ShowMoreButton"));
23
15
 
24
16
  var _navigationContext = require("../../../contexts/navigationContext");
25
17
 
26
18
  var _Help = require("../../../../model/Help");
27
19
 
28
- var _constants2 = require("../../../constants");
20
+ var _constants = require("../../../constants");
29
21
 
30
22
  var _WhatsNewResultsList = _interopRequireDefault(require("./WhatsNewResultsList"));
31
23
 
@@ -35,17 +27,6 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
35
27
 
36
28
  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; }
37
29
 
38
- var ITEM_THEME = {
39
- padding: {
40
- default: {
41
- bottom: (0, _constants.gridSize)(),
42
- left: (0, _constants.gridSize)(),
43
- top: (0, _constants.gridSize)(),
44
- right: (0, _constants.gridSize)()
45
- }
46
- }
47
- };
48
-
49
30
  var WhatsNewResultsList = function WhatsNewResultsList(_ref) {
50
31
  var style = _ref.style,
51
32
  whatsNewArticles = _ref.whatsNewArticles,
@@ -75,20 +56,18 @@ var WhatsNewResultsList = function WhatsNewResultsList(_ref) {
75
56
  onWhatsNewResultItemClick(event, analyticsEvent, articleData);
76
57
  }
77
58
  }, [onWhatsNewResultItemClick, openArticle]);
78
- return whatsNewArticles && whatsNewArticles.length > 0 ? /*#__PURE__*/_react.default.createElement(_styled.WhatsNewResultsListContainer, null, /*#__PURE__*/_react.default.createElement(_styledComponents.ThemeProvider, {
79
- theme: (0, _defineProperty2.default)({}, _item.itemThemeNamespace, ITEM_THEME)
80
- }, /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_WhatsNewResultsList.default, {
59
+ return whatsNewArticles && whatsNewArticles.length > 0 ? /*#__PURE__*/_react.default.createElement(_styled.WhatsNewResultsListContainer, null, /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_WhatsNewResultsList.default, {
81
60
  style: style,
82
61
  onWhatsNewResultItemClick: handleOnWhatsNewResultItemClick,
83
62
  whatsNewArticles: whatsNewArticles
84
63
  }), nextPage && hasNextPage && /*#__PURE__*/_react.default.createElement(_ShowMoreButton.default, {
85
64
  onToggle: handleShowMoreButtonClick,
86
65
  minItemsToDisplay: 0,
87
- maxItemsToDisplay: _constants2.NUMBER_OF_WHATS_NEW_ITEMS_PER_PAGE,
66
+ maxItemsToDisplay: _constants.NUMBER_OF_WHATS_NEW_ITEMS_PER_PAGE,
88
67
  showMoreToggeled: true,
89
68
  itemsType: "changes",
90
69
  loading: loadingMore
91
- })))) : null;
70
+ }))) : null;
92
71
  };
93
72
 
94
73
  var _default = WhatsNewResultsList;
@@ -19,8 +19,10 @@ var getMockArticle = function getMockArticle(id) {
19
19
  lastPublished: '2020-04-29T06:05:02.426Z',
20
20
  title: 'mockArticle title',
21
21
  type: _Article.ARTICLE_ITEM_TYPES.topicInProduct,
22
- routeName: routeName,
23
- routeGroup: routeGroup,
22
+ routes: [{
23
+ routeName: routeName,
24
+ routeGroup: routeGroup
25
+ }],
24
26
  topicId: 'mock-topic',
25
27
  productName: productName,
26
28
  href: href,
@@ -42,8 +44,10 @@ var getMockArticleItem = function getMockArticleItem(id) {
42
44
  lastPublished: '2020-04-29T06:05:02.426Z',
43
45
  title: 'mockArticle title',
44
46
  type: _Article.ARTICLE_ITEM_TYPES.topicInProduct,
45
- routeName: routeName,
46
- routeGroup: routeGroup,
47
+ routes: [{
48
+ routeName: routeName,
49
+ routeGroup: routeGroup
50
+ }],
47
51
  topicId: 'mock-topic',
48
52
  productName: productName,
49
53
  href: href
@@ -76,8 +80,10 @@ var getMockWhatsNewArticle = function getMockWhatsNewArticle(id) {
76
80
  lastPublished: '2020-04-29T06:05:02.426Z',
77
81
  title: 'mock article title',
78
82
  type: _Article.ARTICLE_ITEM_TYPES.topicInProduct,
79
- routeName: routeName,
80
- routeGroup: routeGroup,
83
+ routes: [{
84
+ routeName: routeName,
85
+ routeGroup: routeGroup
86
+ }],
81
87
  topicId: 'mock-topic',
82
88
  productName: productName,
83
89
  href: href,
@@ -1,5 +1,5 @@
1
1
  {
2
2
  "name": "@atlaskit/help",
3
- "version": "7.1.8",
3
+ "version": "7.1.11",
4
4
  "sideEffects": false
5
5
  }
@@ -78,6 +78,10 @@ export const HelpArticle = ({
78
78
  }
79
79
 
80
80
  if (article) {
81
+ var _article$routes, _article$routes2;
82
+
83
+ const routeGroup = article.routes && ((_article$routes = article.routes) === null || _article$routes === void 0 ? void 0 : _article$routes.length) > 0 ? article.routes[0].routeGroup : '';
84
+ const routeName = article.routes && ((_article$routes2 = article.routes) === null || _article$routes2 === void 0 ? void 0 : _article$routes2.length) > 0 ? article.routes[0].routeGroup : '';
81
85
  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(HelpArticleContent, {
82
86
  title: article.title,
83
87
  body: article.body,
@@ -91,8 +95,8 @@ export const HelpArticle = ({
91
95
  style: "secondary",
92
96
  onRelatedArticlesListItemClick: handleOnRelatedArticlesListItemClick,
93
97
  onGetRelatedArticles: onGetRelatedArticles,
94
- routeGroup: article.routeGroup,
95
- routeName: article.routeName,
98
+ routeGroup: routeGroup,
99
+ routeName: routeName,
96
100
  onRelatedArticlesShowMoreClick: handleOnRelatedArticlesShowMoreClick
97
101
  }));
98
102
  }
@@ -1,24 +1,36 @@
1
1
  import React from 'react';
2
2
  import { gridSize } from '@atlaskit/theme/constants';
3
- import * as colors from '@atlaskit/theme/colors';
3
+ import { N30 } from '@atlaskit/theme/colors';
4
4
  import { token } from '@atlaskit/tokens';
5
5
  import AnimateHeight from 'react-animate-height';
6
6
  import ArticlesListItem from './ArticlesListItem';
7
7
  import { MIN_ITEMS_TO_DISPLAY, ANIMATE_HEIGHT_TRANSITION_DURATION_MS } from './constants';
8
8
 
9
+ const getStyles = style => {
10
+ if (style === 'secondary') {
11
+ return {
12
+ border: `2px solid ${token('color.border', N30)}`,
13
+ padding: `${gridSize() * 2}px`,
14
+ marginBottom: `${gridSize() * 1.5}px`
15
+ };
16
+ }
17
+
18
+ return {
19
+ border: 0,
20
+ padding: `${gridSize()}px`,
21
+ marginBottom: 0
22
+ };
23
+ };
24
+
9
25
  const articlesList = ({
10
26
  style = 'primary',
11
27
  articles = [],
12
28
  minItemsToDisplay = MIN_ITEMS_TO_DISPLAY,
13
29
  numberOfArticlesToDisplay = MIN_ITEMS_TO_DISPLAY,
14
30
  onArticlesListItemClick
15
- }) => articles && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", null, articles.slice(0, minItemsToDisplay).map((article, i) => {
31
+ }) => articles && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", null, articles.slice(0, minItemsToDisplay).map(article => {
16
32
  return /*#__PURE__*/React.createElement(ArticlesListItem, {
17
- styles: {
18
- border: style === 'secondary' ? `2px solid ${token('color.border', colors.N30)}` : 0,
19
- padding: style === 'secondary' ? `${gridSize()}px ${gridSize() * 2}px` : `${gridSize()}px`,
20
- marginBottom: style === 'secondary' ? `${gridSize() * 1.5}px` : 0
21
- },
33
+ styles: getStyles(style),
22
34
  id: article.id,
23
35
  onClick: (event, analyticsEvent) => {
24
36
  if (onArticlesListItemClick) {
@@ -34,12 +46,8 @@ const articlesList = ({
34
46
  duration: ANIMATE_HEIGHT_TRANSITION_DURATION_MS,
35
47
  easing: "linear",
36
48
  height: numberOfArticlesToDisplay > minItemsToDisplay ? 'auto' : 0
37
- }, articles.slice(minItemsToDisplay, articles.length).map((article, i) => /*#__PURE__*/React.createElement(ArticlesListItem, {
38
- styles: {
39
- border: style === 'secondary' ? `2px solid ${token('color.border', colors.N30)}` : 0,
40
- padding: style === 'secondary' ? `${gridSize()}px ${gridSize() * 2}px` : `${gridSize()}px`,
41
- marginBottom: style === 'secondary' ? `${gridSize() * 1.5}px` : 0
42
- },
49
+ }, articles.slice(minItemsToDisplay, articles.length).map(article => /*#__PURE__*/React.createElement(ArticlesListItem, {
50
+ styles: getStyles(style),
43
51
  id: article.id,
44
52
  onClick: (event, analyticsEvent) => {
45
53
  if (onArticlesListItemClick) {
@@ -5,36 +5,22 @@ import ShortcutIcon from '@atlaskit/icon/glyph/shortcut';
5
5
  import { token } from '@atlaskit/tokens';
6
6
  import { injectIntl } from 'react-intl-next';
7
7
  import { name as packageName, version as packageVersion } from '../../../version.json';
8
- // import { messages } from '../../../messages';
9
- import { ArticlesListItemTypeTitle, ArticlesListItemWrapper, ArticlesListItemContainer, ArticlesListItemTitleText, ArticlesListItemDescription, ArticlesListItemLinkIcon } from './styled';
8
+ import { ArticlesListItemWrapper, ArticlesListItemContainer, ArticlesListItemTitleText, ArticlesListItemDescription, ArticlesListItemLinkIcon } from './styled';
10
9
  const ANALYTICS_CONTEXT_DATA = {
11
10
  componentName: 'ArticlesListItem',
12
11
  packageName,
13
12
  packageVersion
14
13
  };
15
- export const getTypeTitle = itemType => {
16
- switch (itemType) {
17
- // case ARTICLE_ITEM_TYPES.topicInProduct:
18
- // return messages.help_article_list_item_type_help_article;
19
- default:
20
- return null;
21
- }
22
- };
23
14
  export const ArticlesListItem = ({
24
- intl: {
25
- formatMessage
26
- },
27
15
  styles,
28
16
  title,
29
17
  description,
30
18
  href = '',
31
- type,
32
19
  onClick
33
20
  }) => {
34
21
  const {
35
22
  createAnalyticsEvent
36
23
  } = useAnalyticsEvents();
37
- const typeTitle = getTypeTitle(type);
38
24
 
39
25
  const handleOnClick = event => {
40
26
  event.preventDefault();
@@ -53,12 +39,12 @@ export const ArticlesListItem = ({
53
39
  role: "button",
54
40
  href: href,
55
41
  onClick: handleOnClick
56
- }, /*#__PURE__*/React.createElement(ArticlesListItemContainer, null, typeTitle && /*#__PURE__*/React.createElement(ArticlesListItemTypeTitle, null, formatMessage(typeTitle)), /*#__PURE__*/React.createElement(ArticlesListItemTitleText, null, title), href && /*#__PURE__*/React.createElement(ArticlesListItemLinkIcon, null, /*#__PURE__*/React.createElement(ShortcutIcon, {
42
+ }, /*#__PURE__*/React.createElement(ArticlesListItemContainer, null, /*#__PURE__*/React.createElement(ArticlesListItemTitleText, null, title, href && /*#__PURE__*/React.createElement(ArticlesListItemLinkIcon, null, /*#__PURE__*/React.createElement(ShortcutIcon, {
57
43
  size: "small",
58
44
  label: "",
59
45
  primaryColor: token('color.icon.subtle', colors.N90),
60
46
  secondaryColor: token('color.icon.subtle', colors.N90)
61
- }))), /*#__PURE__*/React.createElement(ArticlesListItemDescription, null, description));
47
+ })))), /*#__PURE__*/React.createElement(ArticlesListItemDescription, null, description));
62
48
  };
63
49
 
64
50
  const ArticlesListItemWithContext = props => {
@@ -39,15 +39,17 @@ export const ArticlesListItemTypeTitle = styled.div`
39
39
  color: ${token('color.text.subtlest', colors.N200)};
40
40
  padding-bottom: ${gridSize() / 2}px;
41
41
  `;
42
- export const ArticlesListItemLinkIcon = styled.div`
42
+ export const ArticlesListItemLinkIcon = styled.span`
43
43
  align-self: auto;
44
+ padding-inline-start: 5px;
45
+ vertical-align: middle;
44
46
  `;
45
47
  export const ArticlesListItemTitleText = styled.span`
46
48
  text-decoration: none;
47
49
  color: ${token('color.text', colors.N800)};
48
50
  font-size: ${fontSize()}px;
49
51
  font-weight: 600;
50
- display: block;
52
+ display: inline-block;
51
53
  line-height: ${gridSize() * 2.5}px;
52
54
  white-space: normal;
53
55
  overflow-x: hidden;
@@ -1,21 +1,8 @@
1
1
  import React, { useState } from 'react';
2
- import { ThemeProvider } from 'styled-components';
3
- import { itemThemeNamespace } from '@atlaskit/item';
4
- import { gridSize } from '@atlaskit/theme/constants';
5
2
  import ArticlesList from './ArticlesList';
6
3
  import ShowMoreButton from '../ShowMoreButton';
7
4
  import { ArticlesListContainer } from './styled';
8
5
  import { MIN_ITEMS_TO_DISPLAY } from './constants';
9
- const ITEM_THEME = {
10
- padding: {
11
- default: {
12
- bottom: gridSize(),
13
- left: gridSize(),
14
- top: gridSize(),
15
- right: gridSize()
16
- }
17
- }
18
- };
19
6
 
20
7
  const ArticleList = ({
21
8
  style,
@@ -51,11 +38,7 @@ const ArticleList = ({
51
38
  }
52
39
  };
53
40
 
54
- return articles && articles.length > 0 ? /*#__PURE__*/React.createElement(ArticlesListContainer, null, /*#__PURE__*/React.createElement(ThemeProvider, {
55
- theme: {
56
- [itemThemeNamespace]: ITEM_THEME
57
- }
58
- }, /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ArticlesList, {
41
+ return articles && articles.length > 0 ? /*#__PURE__*/React.createElement(ArticlesListContainer, null, /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ArticlesList, {
59
42
  style: style,
60
43
  onArticlesListItemClick: onArticlesListItemClick,
61
44
  articles: articles,
@@ -66,7 +49,7 @@ const ArticleList = ({
66
49
  showMoreToggeled: showMoreToggled,
67
50
  onToggle: toggleArticlesList,
68
51
  itemsType: "articles"
69
- })))) : null;
52
+ }))) : null;
70
53
  };
71
54
 
72
55
  export default ArticleList;
@@ -1,23 +1,10 @@
1
1
  import React, { useCallback } from 'react';
2
- import { ThemeProvider } from 'styled-components';
3
- import { itemThemeNamespace } from '@atlaskit/item';
4
- import { gridSize } from '@atlaskit/theme/constants';
5
2
  import ShowMoreButton from '../../../ShowMoreButton';
6
3
  import { useNavigationContext } from '../../../contexts/navigationContext';
7
4
  import { ARTICLE_TYPE } from '../../../../model/Help';
8
5
  import { NUMBER_OF_WHATS_NEW_ITEMS_PER_PAGE } from '../../../constants';
9
6
  import ArticlesList from './WhatsNewResultsList';
10
7
  import { WhatsNewResultsListContainer } from './styled';
11
- const ITEM_THEME = {
12
- padding: {
13
- default: {
14
- bottom: gridSize(),
15
- left: gridSize(),
16
- top: gridSize(),
17
- right: gridSize()
18
- }
19
- }
20
- };
21
8
 
22
9
  const WhatsNewResultsList = ({
23
10
  style,
@@ -48,11 +35,7 @@ const WhatsNewResultsList = ({
48
35
  onWhatsNewResultItemClick(event, analyticsEvent, articleData);
49
36
  }
50
37
  }, [onWhatsNewResultItemClick, openArticle]);
51
- return whatsNewArticles && whatsNewArticles.length > 0 ? /*#__PURE__*/React.createElement(WhatsNewResultsListContainer, null, /*#__PURE__*/React.createElement(ThemeProvider, {
52
- theme: {
53
- [itemThemeNamespace]: ITEM_THEME
54
- }
55
- }, /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ArticlesList, {
38
+ return whatsNewArticles && whatsNewArticles.length > 0 ? /*#__PURE__*/React.createElement(WhatsNewResultsListContainer, null, /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ArticlesList, {
56
39
  style: style,
57
40
  onWhatsNewResultItemClick: handleOnWhatsNewResultItemClick,
58
41
  whatsNewArticles: whatsNewArticles
@@ -63,7 +46,7 @@ const WhatsNewResultsList = ({
63
46
  showMoreToggeled: true,
64
47
  itemsType: "changes",
65
48
  loading: loadingMore
66
- })))) : null;
49
+ }))) : null;
67
50
  };
68
51
 
69
52
  export default WhatsNewResultsList;