@atlaskit/media-viewer 47.1.2 → 47.2.0

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 (136) hide show
  1. package/CHANGELOG.md +13 -0
  2. package/dist/cjs/analytics/index.js +1 -1
  3. package/dist/cjs/analytics/ufoExperiences.js +1 -1
  4. package/dist/cjs/components/media-viewer-loader.js +13 -6
  5. package/dist/cjs/header.js +6 -1
  6. package/dist/cjs/list.js +17 -5
  7. package/dist/cjs/navigation.js +16 -8
  8. package/dist/cjs/styleWrappers.js +11 -5
  9. package/dist/cjs/styles.js +33 -23
  10. package/dist/cjs/version.json +1 -1
  11. package/dist/cjs/viewers/archiveSidebar/archive-sidebar-folder-entry.js +30 -16
  12. package/dist/cjs/viewers/archiveSidebar/archive.js +2 -1
  13. package/dist/cjs/viewers/archiveSidebar/archiveViewerLoader.js +4 -4
  14. package/dist/cjs/viewers/archiveSidebar/styles.js +15 -11
  15. package/dist/cjs/viewers/audio.js +3 -1
  16. package/dist/cjs/viewers/codeViewer/styles.js +8 -2
  17. package/dist/cjs/viewers/doc/pdfRenderer.js +4 -0
  18. package/dist/cjs/viewers/image/interactive-img.js +4 -2
  19. package/dist/cjs/viewers/useThemeObserverHoc.js +26 -0
  20. package/dist/es2019/analytics/index.js +1 -1
  21. package/dist/es2019/analytics/ufoExperiences.js +1 -1
  22. package/dist/es2019/components/media-viewer-loader.js +11 -5
  23. package/dist/es2019/header.js +6 -1
  24. package/dist/es2019/list.js +12 -5
  25. package/dist/es2019/navigation.js +16 -7
  26. package/dist/es2019/styleWrappers.js +17 -9
  27. package/dist/es2019/styles.js +48 -25
  28. package/dist/es2019/version.json +1 -1
  29. package/dist/es2019/viewers/archiveSidebar/archive-sidebar-folder-entry.js +30 -7
  30. package/dist/es2019/viewers/archiveSidebar/archive.js +4 -1
  31. package/dist/es2019/viewers/archiveSidebar/archiveViewerLoader.js +3 -3
  32. package/dist/es2019/viewers/archiveSidebar/styles.js +21 -14
  33. package/dist/es2019/viewers/audio.js +3 -1
  34. package/dist/es2019/viewers/codeViewer/styles.js +7 -2
  35. package/dist/es2019/viewers/doc/pdfRenderer.js +4 -0
  36. package/dist/es2019/viewers/image/interactive-img.js +4 -2
  37. package/dist/es2019/viewers/useThemeObserverHoc.js +14 -0
  38. package/dist/esm/analytics/index.js +1 -1
  39. package/dist/esm/analytics/ufoExperiences.js +1 -1
  40. package/dist/esm/components/media-viewer-loader.js +7 -6
  41. package/dist/esm/header.js +6 -1
  42. package/dist/esm/list.js +17 -5
  43. package/dist/esm/navigation.js +17 -7
  44. package/dist/esm/styleWrappers.js +12 -6
  45. package/dist/esm/styles.js +28 -21
  46. package/dist/esm/version.json +1 -1
  47. package/dist/esm/viewers/archiveSidebar/archive-sidebar-folder-entry.js +30 -14
  48. package/dist/esm/viewers/archiveSidebar/archive.js +4 -1
  49. package/dist/esm/viewers/archiveSidebar/archiveViewerLoader.js +3 -3
  50. package/dist/esm/viewers/archiveSidebar/styles.js +15 -12
  51. package/dist/esm/viewers/audio.js +3 -1
  52. package/dist/esm/viewers/codeViewer/styles.js +7 -2
  53. package/dist/esm/viewers/doc/pdfRenderer.js +4 -0
  54. package/dist/esm/viewers/image/interactive-img.js +4 -2
  55. package/dist/esm/viewers/useThemeObserverHoc.js +14 -0
  56. package/dist/types/components/media-viewer-loader.d.ts +5 -2
  57. package/dist/types/header.d.ts +1 -0
  58. package/dist/types/list.d.ts +1 -0
  59. package/dist/types/navigation.d.ts +1 -0
  60. package/dist/types/styleWrappers.d.ts +8 -2
  61. package/dist/types/styles.d.ts +10 -4
  62. package/dist/types/viewers/archiveSidebar/archive-sidebar-folder-entry.d.ts +6 -4
  63. package/dist/types/viewers/archiveSidebar/styles.d.ts +4 -1
  64. package/dist/types/viewers/useThemeObserverHoc.d.ts +3 -0
  65. package/example-helpers/styles.ts +2 -1
  66. package/package.json +16 -17
  67. package/report.api.md +46 -52
  68. package/dist/types-ts4.0/analytics/events/index.d.ts +0 -14
  69. package/dist/types-ts4.0/analytics/events/operational/_mediaFile.d.ts +0 -3
  70. package/dist/types-ts4.0/analytics/events/operational/commenced.d.ts +0 -5
  71. package/dist/types-ts4.0/analytics/events/operational/loadFailed.d.ts +0 -6
  72. package/dist/types-ts4.0/analytics/events/operational/loadSucceeded.d.ts +0 -5
  73. package/dist/types-ts4.0/analytics/events/operational/previewUnsupported.d.ts +0 -6
  74. package/dist/types-ts4.0/analytics/events/operational/zipEntryLoadFailed.d.ts +0 -13
  75. package/dist/types-ts4.0/analytics/events/operational/zipEntryLoadSucceeded.d.ts +0 -12
  76. package/dist/types-ts4.0/analytics/events/screen/modal.d.ts +0 -3
  77. package/dist/types-ts4.0/analytics/events/ui/_clickedButton.d.ts +0 -2
  78. package/dist/types-ts4.0/analytics/events/ui/closed.d.ts +0 -8
  79. package/dist/types-ts4.0/analytics/events/ui/downloadButtonClicked.d.ts +0 -8
  80. package/dist/types-ts4.0/analytics/events/ui/failedPreviewDownloadButtonClicked.d.ts +0 -10
  81. package/dist/types-ts4.0/analytics/events/ui/navigated.d.ts +0 -12
  82. package/dist/types-ts4.0/analytics/events/ui/zoomInButtonClicked.d.ts +0 -8
  83. package/dist/types-ts4.0/analytics/events/ui/zoomOutButtonClicked.d.ts +0 -6
  84. package/dist/types-ts4.0/analytics/index.d.ts +0 -28
  85. package/dist/types-ts4.0/analytics/ufoExperiences.d.ts +0 -19
  86. package/dist/types-ts4.0/classnames.d.ts +0 -5
  87. package/dist/types-ts4.0/collection.d.ts +0 -36
  88. package/dist/types-ts4.0/components/media-viewer-analytics-error-boundary.d.ts +0 -10
  89. package/dist/types-ts4.0/components/media-viewer-loader.d.ts +0 -20
  90. package/dist/types-ts4.0/components/media-viewer.d.ts +0 -7
  91. package/dist/types-ts4.0/components/types.d.ts +0 -31
  92. package/dist/types-ts4.0/content.d.ts +0 -10
  93. package/dist/types-ts4.0/domain/index.d.ts +0 -10
  94. package/dist/types-ts4.0/domain/outcome.d.ts +0 -32
  95. package/dist/types-ts4.0/domain/zoomLevel.d.ts +0 -15
  96. package/dist/types-ts4.0/download.d.ts +0 -24
  97. package/dist/types-ts4.0/error-images.d.ts +0 -2
  98. package/dist/types-ts4.0/errorMessage.d.ts +0 -29
  99. package/dist/types-ts4.0/errors.d.ts +0 -23
  100. package/dist/types-ts4.0/header.d.ts +0 -40
  101. package/dist/types-ts4.0/index.d.ts +0 -2
  102. package/dist/types-ts4.0/item-viewer.d.ts +0 -44
  103. package/dist/types-ts4.0/list.d.ts +0 -27
  104. package/dist/types-ts4.0/loading.d.ts +0 -2
  105. package/dist/types-ts4.0/media-viewer.d.ts +0 -33
  106. package/dist/types-ts4.0/navigation.d.ts +0 -19
  107. package/dist/types-ts4.0/styleWrappers.d.ts +0 -114
  108. package/dist/types-ts4.0/styles.d.ts +0 -57
  109. package/dist/types-ts4.0/utils/closeOnDirectClick.d.ts +0 -2
  110. package/dist/types-ts4.0/utils/getIdentifierCollection.d.ts +0 -2
  111. package/dist/types-ts4.0/utils/getObjectUrlFromFileState.d.ts +0 -2
  112. package/dist/types-ts4.0/utils/index.d.ts +0 -10
  113. package/dist/types-ts4.0/utils/isIE.d.ts +0 -1
  114. package/dist/types-ts4.0/viewers/archiveSidebar/archive-sidebar-folder-entry.d.ts +0 -25
  115. package/dist/types-ts4.0/viewers/archiveSidebar/archive-sidebar-header.d.ts +0 -9
  116. package/dist/types-ts4.0/viewers/archiveSidebar/archive-sidebar-renderer.d.ts +0 -26
  117. package/dist/types-ts4.0/viewers/archiveSidebar/archive-sidebar.d.ts +0 -26
  118. package/dist/types-ts4.0/viewers/archiveSidebar/archive.d.ts +0 -37
  119. package/dist/types-ts4.0/viewers/archiveSidebar/archiveViewerLoader.d.ts +0 -12
  120. package/dist/types-ts4.0/viewers/archiveSidebar/consts.d.ts +0 -2
  121. package/dist/types-ts4.0/viewers/archiveSidebar/styleWrappers.d.ts +0 -24
  122. package/dist/types-ts4.0/viewers/archiveSidebar/styles.d.ts +0 -23
  123. package/dist/types-ts4.0/viewers/archiveSidebar/types.d.ts +0 -9
  124. package/dist/types-ts4.0/viewers/audio.d.ts +0 -31
  125. package/dist/types-ts4.0/viewers/base-viewer.d.ts +0 -28
  126. package/dist/types-ts4.0/viewers/codeViewer/codeViewerRenderer.d.ts +0 -31
  127. package/dist/types-ts4.0/viewers/codeViewer/index.d.ts +0 -25
  128. package/dist/types-ts4.0/viewers/codeViewer/msg-parser.d.ts +0 -8
  129. package/dist/types-ts4.0/viewers/codeViewer/styles.d.ts +0 -3
  130. package/dist/types-ts4.0/viewers/codeViewer/util.d.ts +0 -4
  131. package/dist/types-ts4.0/viewers/doc/index.d.ts +0 -27
  132. package/dist/types-ts4.0/viewers/doc/pdfRenderer.d.ts +0 -30
  133. package/dist/types-ts4.0/viewers/image/index.d.ts +0 -32
  134. package/dist/types-ts4.0/viewers/image/interactive-img.d.ts +0 -41
  135. package/dist/types-ts4.0/viewers/video.d.ts +0 -30
  136. package/dist/types-ts4.0/zoomControls.d.ts +0 -15
package/CHANGELOG.md CHANGED
@@ -1,5 +1,18 @@
1
1
  # @atlaskit/media-viewer
2
2
 
3
+ ## 47.2.0
4
+
5
+ ### Minor Changes
6
+
7
+ - [`0213586e12e`](https://bitbucket.org/atlassian/atlassian-frontend/commits/0213586e12e) - [ux] Instrumented '@atlaskit/media-viewer' with the new theming package, `@atlaskit/tokens`, and updated the lightbox experience to use new colors from the new color palette.
8
+
9
+ New tokens will be visible only in applications configured to use the new Tokens API (currently in alpha). These changes are intended to be interoperable with the legacy theme implementation. Legacy dark mode users should expect no visual or breaking changes.
10
+
11
+ ### Patch Changes
12
+
13
+ - [`75a4a904bcb`](https://bitbucket.org/atlassian/atlassian-frontend/commits/75a4a904bcb) - fix archive sidebar content if some directory entries are missing
14
+ - Updated dependencies
15
+
3
16
  ## 47.1.2
4
17
 
5
18
  ### Patch Changes
@@ -14,7 +14,7 @@ var componentName = 'mediaViewer';
14
14
  exports.component = exports.componentName = componentName;
15
15
  var packageName = "@atlaskit/media-viewer";
16
16
  exports.packageName = packageName;
17
- var packageVersion = "47.1.2";
17
+ var packageVersion = "47.2.0";
18
18
  exports.packageVersion = packageVersion;
19
19
  var relevantFlags = {
20
20
  newCardExperience: false,
@@ -20,7 +20,7 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
20
20
  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; }
21
21
 
22
22
  var packageName = "@atlaskit/media-viewer";
23
- var packageVersion = "47.1.2";
23
+ var packageVersion = "47.2.0";
24
24
  var ufoExperience;
25
25
 
26
26
  var getExperience = function getExperience() {
@@ -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.default = void 0;
10
+ exports.default = exports.AsyncMediaViewer = void 0;
11
11
 
12
12
  var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
13
13
 
@@ -33,7 +33,9 @@ var _react = _interopRequireDefault(require("react"));
33
33
 
34
34
  var _mediaUi = require("@atlaskit/media-ui");
35
35
 
36
- var colors = _interopRequireWildcard(require("@atlaskit/theme/colors"));
36
+ var _styles = require("../styles");
37
+
38
+ var _useThemeObserverHoc = _interopRequireDefault(require("../viewers/useThemeObserverHoc"));
37
39
 
38
40
  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); }
39
41
 
@@ -128,14 +130,15 @@ var AsyncMediaViewer = /*#__PURE__*/function (_React$PureComponent) {
128
130
  }, {
129
131
  key: "render",
130
132
  value: function render() {
133
+ var theme = this.props.theme;
131
134
  var _this$state = this.state,
132
135
  MediaViewer = _this$state.MediaViewer,
133
136
  MediaViewerErrorBoundary = _this$state.MediaViewerErrorBoundary;
134
137
 
135
138
  if (!MediaViewer || !MediaViewerErrorBoundary) {
136
139
  return /*#__PURE__*/_react.default.createElement(_mediaUi.ModalSpinner, {
137
- blankedColor: colors.DN30,
138
- invertSpinnerColor: true
140
+ blankedColor: _styles.headerAndSidebarBackgroundColor,
141
+ invertSpinnerColor: theme !== 'dark'
139
142
  });
140
143
  }
141
144
 
@@ -145,5 +148,9 @@ var AsyncMediaViewer = /*#__PURE__*/function (_React$PureComponent) {
145
148
  return AsyncMediaViewer;
146
149
  }(_react.default.PureComponent);
147
150
 
148
- exports.default = AsyncMediaViewer;
149
- (0, _defineProperty2.default)(AsyncMediaViewer, "displayName", 'AsyncMediaViewer');
151
+ exports.AsyncMediaViewer = AsyncMediaViewer;
152
+ (0, _defineProperty2.default)(AsyncMediaViewer, "displayName", 'AsyncMediaViewer');
153
+
154
+ var _default = (0, _useThemeObserverHoc.default)(AsyncMediaViewer);
155
+
156
+ exports.default = _default;
@@ -184,7 +184,8 @@ var Header = /*#__PURE__*/function (_React$Component) {
184
184
 
185
185
  this.setState(initialState, function () {
186
186
  var mediaClient = props.mediaClient,
187
- identifier = props.identifier;
187
+ identifier = props.identifier,
188
+ onSetArchiveSideBarVisible = props.onSetArchiveSideBarVisible;
188
189
 
189
190
  if ((0, _mediaClient.isExternalImageIdentifier)(identifier)) {
190
191
  var _identifier$name = identifier.name,
@@ -212,6 +213,10 @@ var Header = /*#__PURE__*/function (_React$Component) {
212
213
  collectionName: identifier.collectionName
213
214
  }).subscribe({
214
215
  next: function next(file) {
216
+ if (!(0, _mediaClient.isErrorFileState)(file) && file.mediaType === 'archive' && onSetArchiveSideBarVisible) {
217
+ onSetArchiveSideBarVisible(true);
218
+ }
219
+
215
220
  _this2.setState({
216
221
  item: _domain.Outcome.successful(file)
217
222
  });
package/dist/cjs/list.js CHANGED
@@ -54,7 +54,8 @@ var List = /*#__PURE__*/function (_React$Component) {
54
54
  _this = _super.call.apply(_super, [this].concat(args));
55
55
  (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "state", {
56
56
  selectedItem: _this.props.defaultSelectedItem,
57
- previewCount: 0
57
+ previewCount: 0,
58
+ isArchiveSideBarVisible: false
58
59
  });
59
60
  (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "onNavigationChange", function (selectedItem) {
60
61
  var _this$props = _this.props,
@@ -86,6 +87,8 @@ var List = /*#__PURE__*/function (_React$Component) {
86
87
  }, {
87
88
  key: "renderContent",
88
89
  value: function renderContent(items) {
90
+ var _this2 = this;
91
+
89
92
  var _this$props2 = this.props,
90
93
  mediaClient = _this$props2.mediaClient,
91
94
  onClose = _this$props2.onClose,
@@ -95,9 +98,12 @@ var List = /*#__PURE__*/function (_React$Component) {
95
98
  isSidebarVisible = _this$props2.isSidebarVisible,
96
99
  contextId = _this$props2.contextId,
97
100
  featureFlags = _this$props2.featureFlags;
98
- var selectedItem = this.state.selectedItem;
101
+ var _this$state = this.state,
102
+ selectedItem = _this$state.selectedItem,
103
+ isArchiveSideBarVisible = _this$state.isArchiveSideBarVisible;
99
104
  return /*#__PURE__*/_react.default.createElement(_styleWrappers.ListWrapper, null, /*#__PURE__*/_react.default.createElement(_styleWrappers.HeaderWrapper, {
100
- className: _mediaUi.hideControlsClassName
105
+ className: _mediaUi.hideControlsClassName,
106
+ isArchiveSideBarVisible: isArchiveSideBarVisible
101
107
  }, /*#__PURE__*/_react.default.createElement(_header.default, {
102
108
  mediaClient: mediaClient,
103
109
  identifier: selectedItem,
@@ -105,7 +111,12 @@ var List = /*#__PURE__*/function (_React$Component) {
105
111
  extensions: extensions,
106
112
  onSidebarButtonClick: onSidebarButtonClick,
107
113
  isSidebarVisible: isSidebarVisible,
108
- featureFlags: featureFlags
114
+ featureFlags: featureFlags,
115
+ onSetArchiveSideBarVisible: function onSetArchiveSideBarVisible(isVisible) {
116
+ return _this2.setState({
117
+ isArchiveSideBarVisible: isVisible
118
+ });
119
+ }
109
120
  })), /*#__PURE__*/_react.default.createElement(_itemViewer.ItemViewer, {
110
121
  mediaClient: mediaClient,
111
122
  identifier: selectedItem,
@@ -117,7 +128,8 @@ var List = /*#__PURE__*/function (_React$Component) {
117
128
  }), /*#__PURE__*/_react.default.createElement(_navigation.Navigation, {
118
129
  items: items,
119
130
  selectedItem: selectedItem,
120
- onChange: this.onNavigationChange
131
+ onChange: this.onNavigationChange,
132
+ isArchiveSideBarVisible: isArchiveSideBarVisible
121
133
  }));
122
134
  }
123
135
  }]);
@@ -25,8 +25,6 @@ var _chevronLeftCircle = _interopRequireDefault(require("@atlaskit/icon/glyph/ch
25
25
 
26
26
  var _chevronRightCircle = _interopRequireDefault(require("@atlaskit/icon/glyph/chevron-right-circle"));
27
27
 
28
- var _colors = require("@atlaskit/theme/colors");
29
-
30
28
  var _mediaUi = require("@atlaskit/media-ui");
31
29
 
32
30
  var _standardButton = _interopRequireDefault(require("@atlaskit/button/standard-button"));
@@ -95,7 +93,9 @@ var NavigationBase = /*#__PURE__*/function (_Component) {
95
93
  value: function render() {
96
94
  var _this2 = this;
97
95
 
98
- var items = this.props.items;
96
+ var _this$props3 = this.props,
97
+ items = _this$props3.items,
98
+ isArchiveSideBarVisible = _this$props3.isArchiveSideBarVisible;
99
99
  var selectedIndex = this.selectedIndex;
100
100
 
101
101
  if (selectedIndex === -1) {
@@ -113,7 +113,9 @@ var NavigationBase = /*#__PURE__*/function (_Component) {
113
113
  return _this2.navigate('next', source);
114
114
  };
115
115
 
116
- return /*#__PURE__*/_react.default.createElement(_styleWrappers.ArrowsWrapper, null, /*#__PURE__*/_react.default.createElement(_styleWrappers.LeftWrapper, null, isLeftVisible ? /*#__PURE__*/_react.default.createElement(_styleWrappers.Arrow, {
116
+ return /*#__PURE__*/_react.default.createElement(_styleWrappers.ArrowsWrapper, null, /*#__PURE__*/_react.default.createElement(_styleWrappers.LeftWrapper, {
117
+ isArchiveSideBarVisible: !!isArchiveSideBarVisible
118
+ }, isLeftVisible ? /*#__PURE__*/_react.default.createElement(_styleWrappers.Arrow, {
117
119
  className: _mediaUi.hideControlsClassName
118
120
  }, /*#__PURE__*/_react.default.createElement(_mediaUi.Shortcut, {
119
121
  keyCode: 37,
@@ -121,8 +123,11 @@ var NavigationBase = /*#__PURE__*/function (_Component) {
121
123
  }), /*#__PURE__*/_react.default.createElement(_standardButton.default, {
122
124
  testId: prevNavButtonId,
123
125
  onClick: prev('mouse'),
124
- iconBefore: /*#__PURE__*/_react.default.createElement(_chevronLeftCircle.default, {
125
- primaryColor: _colors.N800,
126
+ iconBefore: /*#__PURE__*/_react.default.createElement(_chevronLeftCircle.default // DN800
127
+ , {
128
+ primaryColor: "#9FADBC" // DN0
129
+ ,
130
+ secondaryColor: "#161A1D",
126
131
  size: "xlarge",
127
132
  label: "Previous"
128
133
  })
@@ -134,8 +139,11 @@ var NavigationBase = /*#__PURE__*/function (_Component) {
134
139
  }), /*#__PURE__*/_react.default.createElement(_standardButton.default, {
135
140
  testId: nextNavButtonId,
136
141
  onClick: next('mouse'),
137
- iconBefore: /*#__PURE__*/_react.default.createElement(_chevronRightCircle.default, {
138
- primaryColor: _colors.N800,
142
+ iconBefore: /*#__PURE__*/_react.default.createElement(_chevronRightCircle.default // DN800
143
+ , {
144
+ primaryColor: "#9FADBC" // DN0
145
+ ,
146
+ secondaryColor: "#161A1D",
139
147
  size: "xlarge",
140
148
  label: "Next"
141
149
  })
@@ -27,9 +27,12 @@ exports.Blanket = Blanket;
27
27
 
28
28
  var HeaderWrapper = function HeaderWrapper(_ref2) {
29
29
  var className = _ref2.className,
30
- children = _ref2.children;
30
+ children = _ref2.children,
31
+ isArchiveSideBarVisible = _ref2.isArchiveSideBarVisible;
31
32
  return (0, _react.jsx)("div", {
32
- css: _styles.headerWrapperStyles,
33
+ css: (0, _styles.headerWrapperStyles)({
34
+ isArchiveSideBarVisible: isArchiveSideBarVisible
35
+ }),
33
36
  className: className
34
37
  }, children);
35
38
  };
@@ -189,9 +192,12 @@ var Arrow = function Arrow(_ref16) {
189
192
  exports.Arrow = Arrow;
190
193
 
191
194
  var LeftWrapper = function LeftWrapper(_ref17) {
192
- var children = _ref17.children;
195
+ var children = _ref17.children,
196
+ isArchiveSideBarVisible = _ref17.isArchiveSideBarVisible;
193
197
  return (0, _react.jsx)("div", {
194
- css: _styles.leftWrapperStyles
198
+ css: (0, _styles.leftWrapperStyles)({
199
+ isArchiveSideBarVisible: isArchiveSideBarVisible
200
+ })
195
201
  }, children);
196
202
  };
197
203
 
@@ -402,7 +408,7 @@ exports.AudioCover = AudioCover;
402
408
  var DefaultCoverWrapper = function DefaultCoverWrapper(_ref33) {
403
409
  var children = _ref33.children;
404
410
  return (0, _react.jsx)("div", {
405
- css: _styles.downloadButtonWrapperStyles
411
+ css: _styles.defaultCoverWrapperStyles
406
412
  }, children);
407
413
  };
408
414
 
@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
5
5
  Object.defineProperty(exports, "__esModule", {
6
6
  value: true
7
7
  });
8
- exports.zoomWrapperStyles = exports.zoomLevelIndicatorStyles = exports.zoomControlsWrapperStyles = exports.videoStyles = exports.spinnerWrapperStyles = exports.sidebarWrapperStyles = exports.rightWrapperStyles = exports.rightHeaderStyles = exports.pdfWrapperStyles = exports.metadataWrapperStyles = exports.metadataSubTextStyles = exports.metadataIconWrapperStyles = exports.metadataFileNameStyles = exports.medatadataTextWrapperStyles = exports.listWrapperStyles = exports.leftWrapperStyles = exports.leftHeaderStyles = exports.imgStyles = exports.imageWrapperStyles = exports.headerWrapperStyles = exports.headerStyles = exports.hdIconWrapperStyles = exports.hdIconGroupWrapperStyles = exports.formattedMessageWrapperStyles = exports.errorReasonTipStyles = exports.errorMessageWrapperStyles = exports.errorImageStyles = exports.downloadButtonWrapperStyles = exports.defaultCoverWrapperStyles = exports.customVideoPlayerWrapperStyles = exports.customAudioPlayerWrapperStyles = exports.contentWrapperStyles = exports.closeButtonWrapperStyles = exports.blanketStyles = exports.blanketColor = exports.baselineExtendStyles = exports.audioStyles = exports.audioPlayerStyles = exports.audioCoverStyles = exports.arrowsWrapperStyles = exports.arrowStyles = void 0;
8
+ exports.zoomWrapperStyles = exports.zoomLevelIndicatorStyles = exports.zoomControlsWrapperStyles = exports.videoStyles = exports.spinnerWrapperStyles = exports.sidebarWrapperStyles = exports.rightWrapperStyles = exports.rightHeaderStyles = exports.pdfWrapperStyles = exports.metadataWrapperStyles = exports.metadataSubTextStyles = exports.metadataIconWrapperStyles = exports.metadataFileNameStyles = exports.medatadataTextWrapperStyles = exports.listWrapperStyles = exports.leftWrapperStyles = exports.leftHeaderStyles = exports.imgStyles = exports.imageWrapperStyles = exports.headerWrapperStyles = exports.headerStyles = exports.headerAndSidebarBackgroundColor = exports.hdIconWrapperStyles = exports.hdIconGroupWrapperStyles = exports.formattedMessageWrapperStyles = exports.errorMessageWrapperStyles = exports.errorImageStyles = exports.downloadButtonWrapperStyles = exports.defaultCoverWrapperStyles = exports.customVideoPlayerWrapperStyles = exports.customAudioPlayerWrapperStyles = exports.contentWrapperStyles = exports.closeButtonWrapperStyles = exports.blanketStyles = exports.blanketColor = exports.baselineExtendStyles = exports.audioStyles = exports.audioPlayerStyles = exports.audioCoverStyles = exports.arrowsWrapperStyles = exports.arrowStyles = void 0;
9
9
 
10
10
  var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
11
11
 
@@ -13,21 +13,28 @@ var _react = require("@emotion/react");
13
13
 
14
14
  var _constants = require("@atlaskit/theme/constants");
15
15
 
16
- var _colors = require("@atlaskit/theme/colors");
16
+ var _tokens = require("@atlaskit/tokens");
17
17
 
18
18
  var _mediaUi = require("@atlaskit/media-ui");
19
19
 
20
20
  var _styles = require("./viewers/archiveSidebar/styles");
21
21
 
22
- var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9, _templateObject10, _templateObject11, _templateObject12, _templateObject13, _templateObject14, _templateObject15, _templateObject16, _templateObject17, _templateObject18, _templateObject19, _templateObject20, _templateObject21, _templateObject22, _templateObject23, _templateObject24, _templateObject25, _templateObject26, _templateObject27, _templateObject28, _templateObject29, _templateObject30, _templateObject31, _templateObject32, _templateObject33, _templateObject34, _templateObject35, _templateObject36, _templateObject37, _templateObject38, _templateObject39, _templateObject40, _templateObject41;
22
+ var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9, _templateObject10, _templateObject11, _templateObject12, _templateObject13, _templateObject14, _templateObject15, _templateObject16, _templateObject17, _templateObject18, _templateObject19, _templateObject20, _templateObject21, _templateObject22, _templateObject23, _templateObject24, _templateObject25, _templateObject26, _templateObject27, _templateObject28, _templateObject29, _templateObject30, _templateObject31, _templateObject32, _templateObject33, _templateObject34, _templateObject35, _templateObject36, _templateObject37, _templateObject38, _templateObject39, _templateObject40;
23
23
 
24
24
  var overlayZindex = _constants.layers.modal() + 10;
25
25
  var sidebarWidth = 416;
26
- var blanketColor = _colors.DN30;
26
+ var blanketColor = '#22272B';
27
27
  exports.blanketColor = blanketColor;
28
+ var headerAndSidebarBackgroundColor = '#101214';
29
+ exports.headerAndSidebarBackgroundColor = headerAndSidebarBackgroundColor;
28
30
  var blanketStyles = (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n position: fixed;\n top: 0;\n left: 0;\n bottom: 0;\n right: 0;\n background-color: ", ";\n z-index: ", ";\n display: flex;\n"])), blanketColor, overlayZindex);
29
31
  exports.blanketStyles = blanketStyles;
30
- var headerWrapperStyles = (0, _react.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n position: absolute;\n top: 0;\n left: 0;\n width: 100%;\n height: 98px;\n opacity: 0.85;\n background-image: linear-gradient(to bottom, #0e1624, rgba(14, 22, 36, 0));\n color: #b8c7e0;\n font-weight: 500;\n padding-top: 15px;\n padding: 24px;\n box-sizing: border-box;\n pointer-events: none;\n z-index: ", ";\n"])), overlayZindex + 1);
32
+
33
+ var headerWrapperStyles = function headerWrapperStyles(_ref) {
34
+ var isArchiveSideBarVisible = _ref.isArchiveSideBarVisible;
35
+ return (0, _react.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n position: absolute;\n top: 0;\n left: 0;\n width: 100%;\n height: 98px;\n opacity: 0.85;\n background: linear-gradient(\n to bottom,\n ", ",\n rgba(14, 22, 36, 0)\n )\n no-repeat;\n background-position: ", ";\n color: #c7d1db;\n font-weight: 500;\n padding-top: 15px;\n padding: 24px;\n box-sizing: border-box;\n pointer-events: none;\n z-index: ", ";\n"])), headerAndSidebarBackgroundColor, isArchiveSideBarVisible ? "".concat(_styles.ArchiveSideBarWidth, "px 0") : '0', overlayZindex + 1);
36
+ };
37
+
31
38
  exports.headerWrapperStyles = headerWrapperStyles;
32
39
  var listWrapperStyles = (0, _react.css)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2.default)(["\n width: 100%;\n height: 100%;\n position: relative;\n display: flex;\n align-items: center;\n justify-content: center;\n"])));
33
40
  exports.listWrapperStyles = listWrapperStyles;
@@ -36,23 +43,23 @@ exports.arrowsWrapperStyles = arrowsWrapperStyles;
36
43
  var closeButtonWrapperStyles = (0, _react.css)(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2.default)(["\n position: absolute;\n top: 24px;\n right: 20px;\n z-index: ", ";\n"])), overlayZindex + 2);
37
44
  exports.closeButtonWrapperStyles = closeButtonWrapperStyles;
38
45
 
39
- var contentWrapperStyles = function contentWrapperStyles(_ref) {
40
- var isSidebarVisible = _ref.isSidebarVisible;
46
+ var contentWrapperStyles = function contentWrapperStyles(_ref2) {
47
+ var isSidebarVisible = _ref2.isSidebarVisible;
41
48
  return (0, _react.css)(_templateObject6 || (_templateObject6 = (0, _taggedTemplateLiteral2.default)(["\n width: ", ";\n"])), isSidebarVisible ? "calc(100% - ".concat(sidebarWidth, "px)") : '100%');
42
49
  };
43
50
 
44
51
  exports.contentWrapperStyles = contentWrapperStyles;
45
- var zoomWrapperStyles = (0, _react.css)(_templateObject7 || (_templateObject7 = (0, _taggedTemplateLiteral2.default)(["\n width: 100%;\n position: absolute;\n bottom: 0;\n height: 98px;\n background-image: linear-gradient(to top, #0e1624, rgba(14, 22, 36, 0));\n opacity: 0.85;\n pointer-events: none;\n"])));
52
+ var zoomWrapperStyles = (0, _react.css)(_templateObject7 || (_templateObject7 = (0, _taggedTemplateLiteral2.default)(["\n width: 100%;\n position: absolute;\n bottom: 0;\n height: 98px;\n background-image: linear-gradient(\n to top,\n ", ",\n rgba(14, 22, 36, 0)\n );\n opacity: 0.85;\n pointer-events: none;\n"])), headerAndSidebarBackgroundColor);
46
53
  exports.zoomWrapperStyles = zoomWrapperStyles;
47
54
  var zoomControlsWrapperStyles = (0, _react.css)(_templateObject8 || (_templateObject8 = (0, _taggedTemplateLiteral2.default)(["\n width: 100%;\n position: absolute;\n text-align: center;\n bottom: 10px;\n button {\n margin-right: 10px;\n }\n > * {\n pointer-events: all;\n }\n"])));
48
55
  exports.zoomControlsWrapperStyles = zoomControlsWrapperStyles;
49
- var zoomLevelIndicatorStyles = (0, _react.css)(_templateObject9 || (_templateObject9 = (0, _taggedTemplateLiteral2.default)(["\n position: absolute;\n right: 24px;\n bottom: 22px;\n color: #b8c7e0;\n pointer-events: all;\n"])));
56
+ var zoomLevelIndicatorStyles = (0, _react.css)(_templateObject9 || (_templateObject9 = (0, _taggedTemplateLiteral2.default)(["\n position: absolute;\n right: 24px;\n bottom: 22px;\n color: #c7d1db;\n pointer-events: all;\n"])));
50
57
  exports.zoomLevelIndicatorStyles = zoomLevelIndicatorStyles;
51
58
  var hdIconGroupWrapperStyles = (0, _react.css)(_templateObject10 || (_templateObject10 = (0, _taggedTemplateLiteral2.default)(["\n position: absolute;\n right: 69px;\n bottom: 16px;\n"])));
52
59
  exports.hdIconGroupWrapperStyles = hdIconGroupWrapperStyles;
53
60
  var hdIconWrapperStyles = (0, _react.css)(_templateObject11 || (_templateObject11 = (0, _taggedTemplateLiteral2.default)(["\n display: inline-block;\n vertical-align: top;\n margin-left: -24px;\n"])));
54
61
  exports.hdIconWrapperStyles = hdIconWrapperStyles;
55
- var errorMessageWrapperStyles = (0, _react.css)(_templateObject12 || (_templateObject12 = (0, _taggedTemplateLiteral2.default)(["\n text-align: center;\n color: #b8c7e0;\n p {\n line-height: 100%;\n }\n"])));
62
+ var errorMessageWrapperStyles = (0, _react.css)(_templateObject12 || (_templateObject12 = (0, _taggedTemplateLiteral2.default)(["\n text-align: center;\n color: #c7d1db;\n p {\n line-height: 100%;\n }\n"])));
56
63
  exports.errorMessageWrapperStyles = errorMessageWrapperStyles;
57
64
  var errorImageStyles = (0, _react.css)(_templateObject13 || (_templateObject13 = (0, _taggedTemplateLiteral2.default)(["\n margin-bottom: 10px;\n user-select: none;\n"])));
58
65
  exports.errorImageStyles = errorImageStyles;
@@ -60,17 +67,22 @@ var videoStyles = (0, _react.css)(_templateObject14 || (_templateObject14 = (0,
60
67
  exports.videoStyles = videoStyles;
61
68
  var pdfWrapperStyles = (0, _react.css)(_templateObject15 || (_templateObject15 = (0, _taggedTemplateLiteral2.default)(["\n overflow: auto;\n position: absolute;\n top: 0;\n left: 0;\n bottom: 0;\n right: 0;\n\n .", " {\n position: fixed;\n }\n"])), _mediaUi.hideControlsClassName);
62
69
  exports.pdfWrapperStyles = pdfWrapperStyles;
63
- var arrowStyles = (0, _react.css)(_templateObject16 || (_templateObject16 = (0, _taggedTemplateLiteral2.default)(["\n cursor: pointer;\n && button {\n height: inherit;\n background: none;\n }\n > span {\n color: rgba(27, 38, 56, 0.5);\n fill: #9fb0cc;\n filter: drop-shadow(1px 1px 1px rgba(27, 38, 56, 0.2));\n\n &:hover {\n color: #fff;\n }\n }\n"])));
70
+ var arrowStyles = (0, _react.css)(_templateObject16 || (_templateObject16 = (0, _taggedTemplateLiteral2.default)(["\n cursor: pointer;\n\n svg {\n filter: drop-shadow(0px 1px 1px rgb(9 30 66 / 25%))\n drop-shadow(0px 0px 1px rgb(9 30 66 / 31%));\n }\n\n && button {\n height: inherit;\n background: none;\n\n &:hover {\n svg {\n color: #b6c2cf;\n }\n }\n\n &:active {\n svg {\n color: #c7d1db;\n }\n }\n }\n"])));
64
71
  exports.arrowStyles = arrowStyles;
65
72
  var arrowWrapperStyles = (0, _react.css)(_templateObject17 || (_templateObject17 = (0, _taggedTemplateLiteral2.default)(["\n position: absolute;\n top: 50%;\n transform: translateY(-50%);\n padding: 20px;\n"])));
66
- var leftWrapperStyles = (0, _react.css)(_templateObject18 || (_templateObject18 = (0, _taggedTemplateLiteral2.default)(["\n ", "\n text-align: left;\n left: 0;\n"])), arrowWrapperStyles);
73
+
74
+ var leftWrapperStyles = function leftWrapperStyles(_ref3) {
75
+ var isArchiveSideBarVisible = _ref3.isArchiveSideBarVisible;
76
+ return (0, _react.css)(_templateObject18 || (_templateObject18 = (0, _taggedTemplateLiteral2.default)(["\n ", "\n text-align: left;\n left: ", ";\n"])), arrowWrapperStyles, isArchiveSideBarVisible ? "".concat(_styles.ArchiveSideBarWidth, "px") : '0');
77
+ };
78
+
67
79
  exports.leftWrapperStyles = leftWrapperStyles;
68
80
  var rightWrapperStyles = (0, _react.css)(_templateObject19 || (_templateObject19 = (0, _taggedTemplateLiteral2.default)(["\n ", "\n text-align: right;\n right: 0;\n"])), arrowWrapperStyles); // header.tsx
69
81
 
70
82
  exports.rightWrapperStyles = rightWrapperStyles;
71
83
 
72
- var headerStyles = function headerStyles(_ref2) {
73
- var isArchiveSideBarVisible = _ref2.isArchiveSideBarVisible;
84
+ var headerStyles = function headerStyles(_ref4) {
85
+ var isArchiveSideBarVisible = _ref4.isArchiveSideBarVisible;
74
86
  return (0, _react.css)(_templateObject20 || (_templateObject20 = (0, _taggedTemplateLiteral2.default)(["\n display: flex;\n padding-left: ", ";\n"])), isArchiveSideBarVisible ? "".concat(_styles.ArchiveSideBarWidth, "px") : '0');
75
87
  };
76
88
 
@@ -82,9 +94,9 @@ exports.imageWrapperStyles = imageWrapperStyles;
82
94
  var baselineExtendStyles = (0, _react.css)(_templateObject23 || (_templateObject23 = (0, _taggedTemplateLiteral2.default)(["\n height: 100%;\n display: inline-block;\n vertical-align: middle;\n"])));
83
95
  exports.baselineExtendStyles = baselineExtendStyles;
84
96
 
85
- var imgStyles = function imgStyles(_ref3) {
86
- var cursor = _ref3.cursor,
87
- shouldPixelate = _ref3.shouldPixelate;
97
+ var imgStyles = function imgStyles(_ref5) {
98
+ var cursor = _ref5.cursor,
99
+ shouldPixelate = _ref5.shouldPixelate;
88
100
  return (0, _react.css)(_templateObject24 || (_templateObject24 = (0, _taggedTemplateLiteral2.default)(["\n display: inline-block;\n vertical-align: middle;\n position: relative;\n cursor: ", ";\n ", "\n"])), cursor, shouldPixelate ? "/* Prevent images from being smoothed when scaled up */\n image-rendering: optimizeSpeed; /* Legal fallback */\n image-rendering: -moz-crisp-edges; /* Firefox */\n image-rendering: -o-crisp-edges; /* Opera */\n image-rendering: -webkit-optimize-contrast; /* Safari */\n image-rendering: optimize-contrast; /* CSS3 Proposed */\n image-rendering: crisp-edges; /* CSS4 Proposed */\n image-rendering: pixelated; /* CSS4 Proposed */\n -ms-interpolation-mode: nearest-neighbor; /* IE8+ */" : "");
89
101
  };
90
102
 
@@ -95,7 +107,7 @@ var metadataWrapperStyles = (0, _react.css)(_templateObject26 || (_templateObjec
95
107
  exports.metadataWrapperStyles = metadataWrapperStyles;
96
108
  var metadataFileNameStyles = (0, _react.css)(_templateObject27 || (_templateObject27 = (0, _taggedTemplateLiteral2.default)(["\n &::first-letter {\n text-transform: uppercase;\n }\n ", ";\n"])), (0, _mediaUi.ellipsis)());
97
109
  exports.metadataFileNameStyles = metadataFileNameStyles;
98
- var metadataSubTextStyles = (0, _react.css)(_templateObject28 || (_templateObject28 = (0, _taggedTemplateLiteral2.default)(["\n color: ", ";\n ", ";\n"])), _colors.DN400, (0, _mediaUi.ellipsis)());
110
+ var metadataSubTextStyles = (0, _react.css)(_templateObject28 || (_templateObject28 = (0, _taggedTemplateLiteral2.default)(["\n color: #c7d1db;\n ", ";\n"])), (0, _mediaUi.ellipsis)());
99
111
  exports.metadataSubTextStyles = metadataSubTextStyles;
100
112
  var metadataIconWrapperStyles = (0, _react.css)(_templateObject29 || (_templateObject29 = (0, _taggedTemplateLiteral2.default)(["\n padding-top: 4px;\n padding-right: 12px;\n"])));
101
113
  exports.metadataIconWrapperStyles = metadataIconWrapperStyles;
@@ -111,15 +123,13 @@ var audioCoverStyles = (0, _react.css)(_templateObject34 || (_templateObject34 =
111
123
  exports.audioCoverStyles = audioCoverStyles;
112
124
  var defaultCoverWrapperStyles = (0, _react.css)(_templateObject35 || (_templateObject35 = (0, _taggedTemplateLiteral2.default)(["\n width: 100%;\n height: 100%;\n display: flex;\n align-items: center;\n justify-content: center;\n\n > * {\n transform: scale(2);\n }\n"])));
113
125
  exports.defaultCoverWrapperStyles = defaultCoverWrapperStyles;
114
- var downloadButtonWrapperStyles = (0, _react.css)(_templateObject36 || (_templateObject36 = (0, _taggedTemplateLiteral2.default)(["\n margin-top: 28px;\n text-align: center;\n\n button {\n font-weight: bold;\n }\n"])));
126
+ var downloadButtonWrapperStyles = (0, _react.css)(_templateObject36 || (_templateObject36 = (0, _taggedTemplateLiteral2.default)(["\n margin-top: 28px;\n text-align: center;\n\n button {\n &:hover,\n &:active {\n color: #161a1d !important;\n }\n }\n"])));
115
127
  exports.downloadButtonWrapperStyles = downloadButtonWrapperStyles;
116
128
  var customVideoPlayerWrapperStyles = (0, _react.css)(_templateObject37 || (_templateObject37 = (0, _taggedTemplateLiteral2.default)(["\n video {\n flex: 1;\n width: 100vw;\n height: 100vh;\n max-height: 100vh;\n }\n"])));
117
129
  exports.customVideoPlayerWrapperStyles = customVideoPlayerWrapperStyles;
118
- var sidebarWrapperStyles = (0, _react.css)(_templateObject38 || (_templateObject38 = (0, _taggedTemplateLiteral2.default)(["\n top: 0;\n right: 0;\n width: ", "px;\n height: 100vh;\n overflow: hidden auto;\n background-color: ", ";\n color: ", ";\n"])), sidebarWidth, _colors.DN50, _colors.N0);
130
+ var sidebarWrapperStyles = (0, _react.css)(_templateObject38 || (_templateObject38 = (0, _taggedTemplateLiteral2.default)(["\n top: 0;\n right: 0;\n width: ", "px;\n height: 100vh;\n overflow: hidden auto;\n background-color: ", ";\n color: ", ";\n"])), sidebarWidth, (0, _tokens.token)('elevation.surface', headerAndSidebarBackgroundColor), (0, _tokens.token)('color.text', '#c7d1db'));
119
131
  exports.sidebarWrapperStyles = sidebarWrapperStyles;
120
132
  var spinnerWrapperStyles = (0, _react.css)(_templateObject39 || (_templateObject39 = (0, _taggedTemplateLiteral2.default)(["\n display: flex;\n justify-content: center;\n align-items: center;\n height: 100%;\n"])));
121
133
  exports.spinnerWrapperStyles = spinnerWrapperStyles;
122
- var errorReasonTipStyles = (0, _react.css)(_templateObject40 || (_templateObject40 = (0, _taggedTemplateLiteral2.default)(["\n font-size: 10pt;\n margin: 10px 0 40px 0;\n color: ", ";\n"])), _colors.DN400);
123
- exports.errorReasonTipStyles = errorReasonTipStyles;
124
- var formattedMessageWrapperStyles = (0, _react.css)(_templateObject41 || (_templateObject41 = (0, _taggedTemplateLiteral2.default)([""])));
134
+ var formattedMessageWrapperStyles = (0, _react.css)(_templateObject40 || (_templateObject40 = (0, _taggedTemplateLiteral2.default)([""])));
125
135
  exports.formattedMessageWrapperStyles = formattedMessageWrapperStyles;
@@ -1,5 +1,5 @@
1
1
  {
2
2
  "name": "@atlaskit/media-viewer",
3
- "version": "47.1.2",
3
+ "version": "47.2.0",
4
4
  "sideEffects": false
5
5
  }
@@ -148,32 +148,46 @@ var ArchiveSidebarFolderEntry = /*#__PURE__*/function (_React$Component) {
148
148
  }
149
149
 
150
150
  (0, _createClass2.default)(ArchiveSidebarFolderEntry, [{
151
- key: "isDirectChild",
152
- value: function isDirectChild(root, entry) {
153
- return entry.name.startsWith(root) && entry.name.replace(root, '').match(/^[^/]+\/?$/g);
154
- }
155
- }, {
156
151
  key: "formatName",
157
152
  value: function formatName(root, name) {
158
153
  return name.replace(root, '');
159
154
  }
155
+ }, {
156
+ key: "renderSidebarContent",
157
+ value: function renderSidebarContent(root, entries) {
158
+ var navItems = new Map();
159
+
160
+ for (var _i = 0, _Object$values = Object.values(entries); _i < _Object$values.length; _i++) {
161
+ var value = _Object$values[_i];
162
+ var name = value.name;
163
+
164
+ if (!name.startsWith(root) || (0, _utils.isMacPrivateFile)(name)) {
165
+ continue;
166
+ }
167
+
168
+ var paths = name.replace(root, '').split('/').filter(Boolean);
169
+
170
+ if (paths.length > 1) {
171
+ if (!navItems.has(paths[0])) {
172
+ navItems.set(paths[0], {
173
+ name: "".concat(root).concat(paths[0], "/"),
174
+ isDirectory: true
175
+ });
176
+ }
177
+ } else if (paths.length === 1) {
178
+ navItems.set(paths[0], value);
179
+ }
180
+ }
181
+
182
+ return Array.from(navItems.values()).map(this.renderEntry);
183
+ }
160
184
  }, {
161
185
  key: "render",
162
186
  value: function render() {
163
- var _this2 = this;
164
-
165
187
  var _this$props2 = this.props,
166
188
  root = _this$props2.root,
167
189
  entries = _this$props2.entries;
168
- var entriesContent = Object.values(entries).filter(function (entry) {
169
- return _this2.isDirectChild(root, entry);
170
- }).filter(function (entry) {
171
- return !(0, _utils.isMacPrivateFile)(entry.name);
172
- }).map(this.renderEntry);
173
-
174
- var archiveSidebarFolder = /*#__PURE__*/_react.default.createElement(_styleWrappers.ArchiveSidebarFolderWrapper, null, entriesContent);
175
-
176
- return archiveSidebarFolder;
190
+ return /*#__PURE__*/_react.default.createElement(_styleWrappers.ArchiveSidebarFolderWrapper, null, this.renderSidebarContent(root, entries));
177
191
  }
178
192
  }]);
179
193
  return ArchiveSidebarFolderEntry;
@@ -386,7 +386,8 @@ var ArchiveViewerBase = /*#__PURE__*/function (_BaseViewer) {
386
386
  }, /*#__PURE__*/_react.default.createElement(_styleWrappers.DefaultCoverWrapper, null, /*#__PURE__*/_react.default.createElement(_audio.default, {
387
387
  label: "cover",
388
388
  size: "xlarge",
389
- primaryColor: _styles.blanketColor
389
+ primaryColor: _styles.blanketColor,
390
+ secondaryColor: "#9FADBC"
390
391
  })), /*#__PURE__*/_react.default.createElement(_styleWrappers.CustomAudioPlayerWrapper, null, /*#__PURE__*/_react.default.createElement(_mediaUi.CustomMediaPlayer, {
391
392
  type: "audio",
392
393
  isAutoPlay: false,
@@ -29,14 +29,14 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
29
29
 
30
30
  var _react = _interopRequireDefault(require("react"));
31
31
 
32
- var _colors = require("@atlaskit/theme/colors");
33
-
34
32
  var _modalSpinner = _interopRequireDefault(require("@atlaskit/media-ui/modalSpinner"));
35
33
 
36
34
  var _errorMessage = _interopRequireDefault(require("../../errorMessage"));
37
35
 
38
36
  var _errors = require("../../errors");
39
37
 
38
+ var _styles = require("../../styles");
39
+
40
40
  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); }
41
41
 
42
42
  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; }
@@ -137,8 +137,8 @@ var ArchiveViewerLoader = /*#__PURE__*/function (_React$PureComponent) {
137
137
  return /*#__PURE__*/_react.default.createElement(ArchiveViewer, this.props);
138
138
  } else {
139
139
  return /*#__PURE__*/_react.default.createElement(_modalSpinner.default, {
140
- blankedColor: _colors.DN30,
141
- invertSpinnerColor: true
140
+ blankedColor: _styles.headerAndSidebarBackgroundColor,
141
+ invertSpinnerColor: false
142
142
  });
143
143
  }
144
144
  }
@@ -13,6 +13,8 @@ var _react = require("@emotion/react");
13
13
 
14
14
  var _constants = require("@atlaskit/theme/constants");
15
15
 
16
+ var _tokens = require("@atlaskit/tokens");
17
+
16
18
  var _colors = require("@atlaskit/theme/colors");
17
19
 
18
20
  var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9, _templateObject10, _templateObject11, _templateObject12, _templateObject13;
@@ -21,12 +23,12 @@ var ArchiveSideBarWidth = 300;
21
23
  exports.ArchiveSideBarWidth = ArchiveSideBarWidth;
22
24
  var archiveItemViewerWrapperStyles = (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n width: 100%;\n display: flex;\n justify-content: center;\n"])));
23
25
  exports.archiveItemViewerWrapperStyles = archiveItemViewerWrapperStyles;
24
- var archiveSideBarStyles = (0, _react.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n padding: 22px 20px 20px 20px;\n /** TODO [BMPT-370] Use new bg color after ThemeProvider is removed */\n background-color: rgba(14, 22, 36);\n position: absolute;\n left: 0;\n top: 0;\n width: ", "px;\n bottom: 0;\n box-sizing: border-box;\n overflow-y: scroll;\n"])), ArchiveSideBarWidth);
26
+ var archiveSideBarStyles = (0, _react.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n padding: 22px 20px 20px 20px;\n background-color: ", ";\n position: absolute;\n left: 0;\n top: 0;\n width: ", "px;\n bottom: 0;\n box-sizing: border-box;\n overflow-y: scroll;\n"])), (0, _tokens.token)('elevation.surface', '#101214'), ArchiveSideBarWidth);
25
27
  exports.archiveSideBarStyles = archiveSideBarStyles;
26
28
  var slideDown = (0, _react.keyframes)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2.default)(["\n 0% {\n opacity: 0;\n transform: translateY(-100%);\n }\n\n 100% {\n transform: translateY(0);\n opacity: 1;\n }\n"])));
27
29
  var archiveSidebarFolderWrapperStyles = (0, _react.css)(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2.default)(["\n transform: translateY(-100%);\n transition: all 1s;\n opacity: 0;\n animation: ", " 0.3s forwards;\n"])), slideDown);
28
30
  exports.archiveSidebarFolderWrapperStyles = archiveSidebarFolderWrapperStyles;
29
- var archiveDownloadButtonWrapperStyles = (0, _react.css)(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2.default)(["\n padding: 8px 7px 5px 8px;\n border: none;\n border-radius: 3px;\n background-color: transparent;\n\n &:hover {\n cursor: pointer;\n background-color: #253a5f;\n /** TODO [BMPT-370] Use new color after ThemeProvider is removed */\n }\n"])));
31
+ var archiveDownloadButtonWrapperStyles = (0, _react.css)(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2.default)(["\n padding: 8px 7px 5px 8px;\n border: none;\n border-radius: 3px;\n background-color: transparent;\n color: ", ";\n\n &:hover {\n cursor: pointer;\n background-color: ", ";\n }\n\n &:active {\n cursor: pointer;\n background-color: ", ";\n }\n"])), (0, _tokens.token)('color.icon', '#9FADBC'), (0, _tokens.token)('color.background.neutral.subtle.hovered', '#A1BDD914'), (0, _tokens.token)('color.background.neutral.subtle.pressed', '#A6C5E229'));
30
32
  exports.archiveDownloadButtonWrapperStyles = archiveDownloadButtonWrapperStyles;
31
33
  var sidebarItemWrapperStyles = (0, _react.css)(_templateObject6 || (_templateObject6 = (0, _taggedTemplateLiteral2.default)(["\n width: 85%;\n"])));
32
34
  exports.sidebarItemWrapperStyles = sidebarItemWrapperStyles;
@@ -36,23 +38,25 @@ var archiveLayoutStyles = (0, _react.css)(_templateObject8 || (_templateObject8
36
38
  exports.archiveLayoutStyles = archiveLayoutStyles;
37
39
  var archiveViewerWrapperStyles = (0, _react.css)(_templateObject9 || (_templateObject9 = (0, _taggedTemplateLiteral2.default)(["\n position: absolute;\n top: 0;\n left: ", "px;\n right: 0;\n bottom: 0;\n align-items: center;\n display: flex;\n"])), ArchiveSideBarWidth);
38
40
  exports.archiveViewerWrapperStyles = archiveViewerWrapperStyles;
39
- var separatorStyles = (0, _react.css)(_templateObject10 || (_templateObject10 = (0, _taggedTemplateLiteral2.default)(["\n border-radius: 1px;\n height: 2px;\n margin: ", "px 0;\n background-color: rgb(36, 50, 76);\n flex-shrink: 0;\n"])), ((0, _constants.gridSize)() * 5 - 2) / 2);
41
+ var separatorStyles = (0, _react.css)(_templateObject10 || (_templateObject10 = (0, _taggedTemplateLiteral2.default)(["\n border-radius: 1px;\n height: 2px;\n margin: ", "px 0;\n background-color: ", ";\n flex-shrink: 0;\n"])), ((0, _constants.gridSize)() * 5 - 2) / 2, (0, _tokens.token)('color.border', '#A6C5E229'));
40
42
  exports.separatorStyles = separatorStyles;
41
43
  var sidebarHeaderWrapperStyles = (0, _react.css)(_templateObject11 || (_templateObject11 = (0, _taggedTemplateLiteral2.default)(["\n display: flex;\n align-items: center;\n flex-shrink: 0;\n"])));
42
44
  exports.sidebarHeaderWrapperStyles = sidebarHeaderWrapperStyles;
43
45
  var sidebarHeaderIconStyles = (0, _react.css)(_templateObject12 || (_templateObject12 = (0, _taggedTemplateLiteral2.default)(["\n display: flex;\n align-items: center;\n margin-right: 10px;\n flex-shrink: 0;\n"])));
44
46
  exports.sidebarHeaderIconStyles = sidebarHeaderIconStyles;
45
- var sidebarHeaderEntryStyles = (0, _react.css)(_templateObject13 || (_templateObject13 = (0, _taggedTemplateLiteral2.default)(["\n flex: 1 1 auto;\n overflow: hidden;\n text-overflow: ellipsis;\n white-space: nowrap;\n line-height: 1.14286;\n color: ", ";\n"])), _colors.DN500);
46
- /** TODO Replace background colors of item with theme from @atlaskit/tokens once ready*/
47
-
47
+ var sidebarHeaderEntryStyles = (0, _react.css)(_templateObject13 || (_templateObject13 = (0, _taggedTemplateLiteral2.default)(["\n flex: 1 1 auto;\n overflow: hidden;\n text-overflow: ellipsis;\n white-space: nowrap;\n line-height: 1.14286;\n color: ", ";\n"])), (0, _tokens.token)('color.text', _colors.DN500));
48
48
  exports.sidebarHeaderEntryStyles = sidebarHeaderEntryStyles;
49
49
  var itemStyle = {
50
- backgroundColor: "".concat(_colors.DN10),
51
- fill: "".concat(_colors.DN10),
52
- color: "".concat(_colors.DN500),
50
+ backgroundColor: "".concat((0, _tokens.token)('color.background.neutral.subtle', '#101214')),
51
+ fill: "".concat((0, _tokens.token)('color.icon.success', '#101214')),
52
+ color: "".concat((0, _tokens.token)('color.text', _colors.DN500)),
53
53
  ':hover': {
54
- backgroundColor: '#253a5f',
55
- color: "".concat(_colors.DN500)
54
+ backgroundColor: "".concat((0, _tokens.token)('color.background.neutral.subtle.hovered', '#A1BDD914')),
55
+ color: "".concat((0, _tokens.token)('color.text', _colors.DN500))
56
+ },
57
+ ':active': {
58
+ backgroundColor: "".concat((0, _tokens.token)('color.background.neutral.subtle.pressed', '#A6C5E229')),
59
+ color: "".concat((0, _tokens.token)('color.text', _colors.DN500))
56
60
  }
57
61
  };
58
62
  exports.itemStyle = itemStyle;
@@ -54,7 +54,9 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
54
54
  var defaultCover = /*#__PURE__*/_react.default.createElement(_styleWrappers.DefaultCoverWrapper, null, /*#__PURE__*/_react.default.createElement(_audio.default, {
55
55
  label: "cover",
56
56
  size: "xlarge",
57
- primaryColor: _styles.blanketColor
57
+ primaryColor: _styles.blanketColor // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage
58
+ ,
59
+ secondaryColor: "#9FADBC"
58
60
  }));
59
61
 
60
62
  var getCoverUrl = function getCoverUrl(item, mediaClient, collectionName) {