@bundle-stats/ui 4.0.3 → 4.0.4

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 (31) hide show
  1. package/lib/components/metric/metric.js +40 -25
  2. package/lib/components/metric/metric.module.css +4 -14
  3. package/lib/components/summary-item/summary-item.js +1 -1
  4. package/lib/components/summary-item/summary-item.module.css +0 -9
  5. package/lib/ui/dropdown/dropdown.module.css +3 -2
  6. package/lib/ui/filters/filters.js +11 -8
  7. package/lib/ui/filters/filters.module.css +11 -12
  8. package/lib/ui/hover-card/hover-card.js +2 -1
  9. package/lib/ui/sort-dropdown/sort-dropdown.js +90 -30
  10. package/lib/ui/sort-dropdown/sort-dropdown.module.css +5 -3
  11. package/lib-esm/components/metric/metric.js +40 -15
  12. package/lib-esm/components/metric/metric.module.css +4 -14
  13. package/lib-esm/components/summary-item/summary-item.js +1 -1
  14. package/lib-esm/components/summary-item/summary-item.module.css +0 -9
  15. package/lib-esm/ui/dropdown/dropdown.module.css +3 -2
  16. package/lib-esm/ui/filters/filters.js +9 -7
  17. package/lib-esm/ui/filters/filters.module.css +11 -12
  18. package/lib-esm/ui/hover-card/hover-card.js +2 -1
  19. package/lib-esm/ui/sort-dropdown/sort-dropdown.js +72 -23
  20. package/lib-esm/ui/sort-dropdown/sort-dropdown.module.css +5 -3
  21. package/package.json +5 -5
  22. package/src/components/metric/metric.jsx +32 -24
  23. package/src/components/metric/metric.module.css +4 -14
  24. package/src/components/summary-item/summary-item.jsx +1 -1
  25. package/src/components/summary-item/summary-item.module.css +0 -9
  26. package/src/ui/dropdown/dropdown.module.css +3 -2
  27. package/src/ui/filters/filters.jsx +24 -18
  28. package/src/ui/filters/filters.module.css +11 -12
  29. package/src/ui/hover-card/hover-card.jsx +1 -1
  30. package/src/ui/sort-dropdown/sort-dropdown.jsx +70 -27
  31. package/src/ui/sort-dropdown/sort-dropdown.module.css +5 -3
@@ -1,11 +1,13 @@
1
1
  "use strict";
2
2
 
3
+ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
4
+
3
5
  Object.defineProperty(exports, "__esModule", {
4
6
  value: true
5
7
  });
6
8
  exports.Metric = void 0;
7
9
 
8
- var _react = _interopRequireDefault(require("react"));
10
+ var _react = _interopRequireWildcard(require("react"));
9
11
 
10
12
  var _propTypes = _interopRequireDefault(require("prop-types"));
11
13
 
@@ -15,17 +17,9 @@ var _metricModule = _interopRequireDefault(require("./metric.module.css"));
15
17
 
16
18
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
17
19
 
18
- function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
19
-
20
- function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
21
-
22
- function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
23
-
24
- function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
20
+ 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); }
25
21
 
26
- function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
27
-
28
- function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
22
+ 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; }
29
23
 
30
24
  // Separate value and unit
31
25
  var EXTRACT_VALUE_UNIT_PATTERN = /([\d|.|,| ]*)(\w*|%)$/;
@@ -35,27 +29,50 @@ var Metric = function Metric(_ref) {
35
29
  value = _ref.value,
36
30
  formatter = _ref.formatter,
37
31
  inline = _ref.inline,
38
- anchored = _ref.anchored,
39
32
  children = _ref.children,
40
33
  enhanced = _ref.enhanced;
41
- var formattedValue = formatter(value); // eslint-disable-next-line no-unused-vars
42
-
43
- var _ref2 = enhanced && formattedValue ? formattedValue.match(EXTRACT_VALUE_UNIT_PATTERN) : [null, formattedValue, null],
44
- _ref3 = _slicedToArray(_ref2, 3),
45
- matched = _ref3[0],
46
- displayValue = _ref3[1],
47
- displayUnit = _ref3[2];
48
34
 
49
- var rootClassName = (0, _classnames["default"])(className, _metricModule["default"].root, inline && _metricModule["default"].inline, anchored && _metricModule["default"].anchored);
50
- return /*#__PURE__*/_react["default"].createElement("span", {
35
+ var _useMemo = (0, _react.useMemo)(function () {
36
+ var formattedValue = formatter === null || formatter === void 0 ? void 0 : formatter(value);
37
+
38
+ if (!formattedValue) {
39
+ return {
40
+ displayValue: value
41
+ };
42
+ }
43
+
44
+ if (!enhanced) {
45
+ return {
46
+ displayValue: formattedValue
47
+ };
48
+ }
49
+
50
+ var matches = formattedValue.match(EXTRACT_VALUE_UNIT_PATTERN);
51
+
52
+ if (!matches) {
53
+ return {
54
+ displayValue: value
55
+ };
56
+ }
57
+
58
+ return {
59
+ displayUnit: matches[2],
60
+ displayValue: matches[1]
61
+ };
62
+ }, [formatter, value]),
63
+ displayValue = _useMemo.displayValue,
64
+ displayUnit = _useMemo.displayUnit;
65
+
66
+ var rootClassName = (0, _classnames["default"])(className, _metricModule["default"].root, inline && _metricModule["default"].inline);
67
+ return /*#__PURE__*/_react["default"].createElement("div", {
51
68
  className: rootClassName
52
- }, /*#__PURE__*/_react["default"].createElement("span", {
69
+ }, /*#__PURE__*/_react["default"].createElement("div", {
53
70
  className: _metricModule["default"].display
54
71
  }, /*#__PURE__*/_react["default"].createElement("span", {
55
72
  className: _metricModule["default"].displayValue
56
73
  }, displayValue), displayUnit && /*#__PURE__*/_react["default"].createElement("span", {
57
74
  className: _metricModule["default"].displayUnit
58
- }, displayUnit)), /*#__PURE__*/_react["default"].createElement("span", {
75
+ }, displayUnit)), /*#__PURE__*/_react["default"].createElement("div", {
59
76
  className: _metricModule["default"].delta
60
77
  }, children));
61
78
  };
@@ -63,7 +80,6 @@ var Metric = function Metric(_ref) {
63
80
  exports.Metric = Metric;
64
81
  Metric.defaultProps = {
65
82
  className: '',
66
- anchored: false,
67
83
  enhanced: false,
68
84
  inline: false,
69
85
  value: 0,
@@ -76,7 +92,6 @@ Metric.propTypes = {
76
92
  className: _propTypes["default"].string,
77
93
  enhanced: _propTypes["default"].bool,
78
94
  inline: _propTypes["default"].bool,
79
- anchored: _propTypes["default"].bool,
80
95
  value: _propTypes["default"].oneOfType([_propTypes["default"].number, _propTypes["default"].string]),
81
96
  formatter: _propTypes["default"].func,
82
97
  children: _propTypes["default"].node
@@ -1,27 +1,17 @@
1
1
  .root {
2
- display: block;
3
2
  letter-spacing: 0.05em;
4
3
  }
5
4
 
6
5
  .displayUnit {
7
- color: var(--color-text-ultra-light);
6
+ font-size: var(--size-small);
8
7
  }
9
8
 
10
9
  .delta {
11
- display: block;
12
- font-size: var(--size-xsmall);
10
+ font-size: var(--size-small);
13
11
  }
14
12
 
15
- .anchored {
16
- position: relative;
17
- }
18
-
19
- .anchored .delta {
20
- position: absolute;
21
- right: 0;
22
- top: 100%;
23
- line-height: 1;
24
- margin-top: -2px;
13
+ .inline .display {
14
+ display: inline-block;
25
15
  }
26
16
 
27
17
  .inline .delta {
@@ -80,7 +80,7 @@ var SummaryItem = function SummaryItem(_ref2) {
80
80
  var showMetricDescriptionTooltip = showMetricDescription && (metric === null || metric === void 0 ? void 0 : metric.description);
81
81
  var rootClassName = (0, _classnames["default"])(_summaryItemModule["default"].root, className, _summaryItemModule["default"][size], showDelta && _summaryItemModule["default"].showDelta);
82
82
  return /*#__PURE__*/_react["default"].createElement(_stack.Stack, _extends({
83
- space: "xxsmall",
83
+ space: "xxxsmall",
84
84
  as: Component,
85
85
  className: rootClassName
86
86
  }, props), /*#__PURE__*/_react["default"].createElement("h3", {
@@ -8,23 +8,15 @@
8
8
  }
9
9
 
10
10
  .currentMetric {
11
- display: block;
12
11
  color: var(--color-heading);
13
12
  font-size: var(--size-xlarge);
14
- line-height: var(--space-medium);
15
13
  white-space: nowrap;
16
14
  font-weight: bold;
17
15
  }
18
16
 
19
- .delta {
20
- font-size: var(--size-small);
21
- line-height: var(--space-medium);
22
- }
23
-
24
17
  .baselineMetric {
25
18
  color: var(--color-text-light);
26
19
  font-size: var(--size-small);
27
- line-height: var(--space-small);
28
20
  }
29
21
 
30
22
  .readMoreLink {
@@ -63,5 +55,4 @@
63
55
  /* Size large */
64
56
  .large .currentMetric {
65
57
  font-size: var(--size-xxxlarge);
66
- line-height: var(--space-medium);
67
58
  }
@@ -40,7 +40,7 @@
40
40
  background: var(--color-background);
41
41
  min-width: 180px;
42
42
  z-index: var(--layer-high);
43
- padding: var(--space-xsmall) 0;
43
+ padding: var(--space-xxsmall) 0;
44
44
  }
45
45
 
46
46
  .dropdown:focus {
@@ -55,12 +55,13 @@
55
55
  width: 100%;
56
56
  outline: none;
57
57
  border: 0;
58
- padding: var(--space-xxxsmall) var(--space-small);
58
+ padding: var(--space-xxxsmall) var(--space-xsmall);
59
59
  background: none;
60
60
  text-align: left;
61
61
  color: var(--color-text-light);
62
62
  font-size: var(--size-small);
63
63
  line-height: inherit;
64
+ text-decoration: none;
64
65
  }
65
66
 
66
67
  .menuItem:hover {
@@ -21,7 +21,7 @@ var _filters = require("./filters.utils");
21
21
 
22
22
  var _filtersModule = _interopRequireDefault(require("./filters.module.css"));
23
23
 
24
- var _excluded = ["className", "buttonClassName", "label", "name", "getOnOnlyClick"],
24
+ var _excluded = ["className", "as", "buttonClassName", "label", "name", "getOnOnlyClick"],
25
25
  _excluded2 = ["label"];
26
26
 
27
27
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -56,6 +56,8 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
56
56
 
57
57
  var Filter = function Filter(props) {
58
58
  var className = props.className,
59
+ _props$as = props.as,
60
+ Component = _props$as === void 0 ? 'div' : _props$as,
59
61
  buttonClassName = props.buttonClassName,
60
62
  label = props.label,
61
63
  name = props.name,
@@ -64,7 +66,7 @@ var Filter = function Filter(props) {
64
66
 
65
67
  var id = "filter-".concat(name);
66
68
  var rootClassName = (0, _classnames["default"])(_filtersModule["default"].filter, className);
67
- return /*#__PURE__*/_react["default"].createElement("div", {
69
+ return /*#__PURE__*/_react["default"].createElement(Component, {
68
70
  className: rootClassName
69
71
  }, /*#__PURE__*/_react["default"].createElement(_flexStack.FlexStack, {
70
72
  space: "xxxsmall",
@@ -87,6 +89,7 @@ var Filter = function Filter(props) {
87
89
 
88
90
  Filter.propTypes = {
89
91
  className: _propTypes["default"].string,
92
+ as: _propTypes["default"].elementType,
90
93
  buttonClassName: _propTypes["default"].string,
91
94
  name: _propTypes["default"].string.isRequired,
92
95
  label: _propTypes["default"].string.isRequired,
@@ -94,6 +97,7 @@ Filter.propTypes = {
94
97
  };
95
98
  Filter.defaultProps = {
96
99
  className: '',
100
+ as: 'div',
97
101
  buttonClassName: '',
98
102
  getOnOnlyClick: null
99
103
  };
@@ -168,18 +172,17 @@ var FilterGroup = function FilterGroup(props) {
168
172
  return getOnGroupCheck(false, _defineProperty({}, id, true));
169
173
  };
170
174
 
171
- return /*#__PURE__*/_react["default"].createElement(MenuItem, _extends({
172
- key: id
173
- }, menu, {
174
- className: (0, _classnames["default"])(menuItemClassName, _filtersModule["default"].filterGroupItem)
175
- }), /*#__PURE__*/_react["default"].createElement(Filter, {
175
+ return /*#__PURE__*/_react["default"].createElement(Filter, {
176
+ key: id,
177
+ className: menuItemClassName,
178
+ as: MenuItem,
176
179
  name: id,
177
180
  label: itemData.label,
178
181
  onChange: onCheckboxChange,
179
182
  checked: values[id],
180
183
  disabled: itemData.disabled,
181
184
  getOnOnlyClick: getOnOnlyClick
182
- }));
185
+ });
183
186
  })), /*#__PURE__*/_react["default"].createElement("div", {
184
187
  className: _filtersModule["default"].filterGroupActions
185
188
  }, areAllGroupItemsChecked ? /*#__PURE__*/_react["default"].createElement(MenuItem, {
@@ -1,5 +1,9 @@
1
1
  /* Checkbox + label + button */
2
2
  .filter {
3
+ /* Update MenuItem padding */
4
+ padding-top: calc(var(--space-xxxsmall) / 2);
5
+ padding-bottom: calc(var(--space-xxxsmall) / 2);
6
+
3
7
  position: relative;
4
8
  width: 100%;
5
9
  max-width: 240px;
@@ -11,7 +15,6 @@
11
15
  }
12
16
 
13
17
  .filterInput {
14
- border-radius: var(--radius-small) 0 0 var(--radius-small);
15
18
  flex: 0 0 auto;
16
19
  height: 1em;
17
20
  cursor: pointer;
@@ -26,17 +29,17 @@
26
29
  }
27
30
 
28
31
  .filterOnlyButton {
29
- padding: var(--space-xxsmall);
32
+ padding: var(--space-xxxsmall) var(--space-xsmall);
30
33
  display: none;
31
34
  appearance: none;
32
35
  border: none;
33
36
  background: linear-gradient(90deg, rgba(255, 255, 255, 0.2), rgba(255, 255, 255) 30%);
34
37
  cursor: pointer;
35
- line-height: 1;
36
38
  position: absolute;
37
39
  right: 0;
38
- top: 50%;
39
- transform: translateY(-50%);
40
+ top: 0;
41
+ bottom: 0;
42
+ line-height: var(--space-xsmall);
40
43
  }
41
44
 
42
45
  /** filter disabled state */
@@ -63,6 +66,7 @@
63
66
 
64
67
  /** Filter standard variation */
65
68
  .filterStandalone {
69
+ padding: 0;
66
70
  width: auto;
67
71
  color: var(--color-text-light);
68
72
  z-index: var(--layout-xlow); /* show collapsed border */
@@ -95,16 +99,11 @@
95
99
  overflow: auto;
96
100
  }
97
101
 
98
- .filterGroupItem {
99
- padding-top: 2px;
100
- padding-bottom: 2px;
101
- }
102
-
103
102
  .filterGroupActions {
104
- margin-top: var(--space-xxsmall);
103
+ margin-top: var(--space-xxxsmall);
105
104
  padding-top: var(--space-xxxsmall);
106
105
  padding-bottom: var(--space-xxxsmall);
107
- margin-bottom: calc(0px - var(--space-xsmall));
106
+ margin-bottom: calc(0px - var(--space-xxsmall));
108
107
  border-top: 1px solid var(--color-outline);
109
108
  }
110
109
 
@@ -46,7 +46,8 @@ var HoverCard = function HoverCard(props) {
46
46
  label = props.label,
47
47
  children = props.children;
48
48
  var state = (0, _hovercard.useHovercardState)({
49
- gutter: 8
49
+ gutter: 8,
50
+ timeout: 700
50
51
  });
51
52
  var hoverCardProps = (0, _hovercard.useHovercard)({
52
53
  state: state,
@@ -1,11 +1,13 @@
1
1
  "use strict";
2
2
 
3
+ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
4
+
3
5
  Object.defineProperty(exports, "__esModule", {
4
6
  value: true
5
7
  });
6
8
  exports.SortDropdown = void 0;
7
9
 
8
- var _react = _interopRequireDefault(require("react"));
10
+ var _react = _interopRequireWildcard(require("react"));
9
11
 
10
12
  var _propTypes = _interopRequireDefault(require("prop-types"));
11
13
 
@@ -17,11 +19,15 @@ var _icon = require("../icon");
17
19
 
18
20
  var _sortDropdownModule = _interopRequireDefault(require("./sort-dropdown.module.css"));
19
21
 
22
+ var _excluded = ["className", "as", "id", "label", "active", "direction", "defaultDirection", "getButtonOnClick"];
23
+
20
24
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
21
25
 
22
- function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
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); }
23
27
 
24
- function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
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; }
29
+
30
+ function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
25
31
 
26
32
  function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
27
33
 
@@ -35,6 +41,67 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
35
41
 
36
42
  function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
37
43
 
44
+ function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
45
+
46
+ function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
47
+
48
+ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
49
+
50
+ var Item = function Item(_ref) {
51
+ var className = _ref.className,
52
+ Component = _ref.as,
53
+ id = _ref.id,
54
+ label = _ref.label,
55
+ active = _ref.active,
56
+ direction = _ref.direction,
57
+ defaultDirection = _ref.defaultDirection,
58
+ getButtonOnClick = _ref.getButtonOnClick,
59
+ restProps = _objectWithoutProperties(_ref, _excluded);
60
+
61
+ var buttonProps = (0, _react.useMemo)(function () {
62
+ var resolveNextDirection = defaultDirection;
63
+
64
+ if (active) {
65
+ resolveNextDirection = direction === 'asc' ? 'desc' : 'asc';
66
+ }
67
+
68
+ if (resolveNextDirection === 'desc') {
69
+ return {
70
+ className: _sortDropdownModule["default"].itemAsc,
71
+ onClick: getButtonOnClick(id, 'desc'),
72
+ title: "Order data by ".concat(label, " descending")
73
+ };
74
+ }
75
+
76
+ return {
77
+ onClick: getButtonOnClick(id, 'asc'),
78
+ title: "Order data by ".concat(label, " ascending")
79
+ };
80
+ }, [active, direction, defaultDirection, id, label]);
81
+ return /*#__PURE__*/_react["default"].createElement(Component, _extends({}, restProps, buttonProps, {
82
+ className: (0, _classnames["default"])(className, _sortDropdownModule["default"].item, active && _sortDropdownModule["default"].itemActive, buttonProps.className)
83
+ }), /*#__PURE__*/_react["default"].createElement(_icon.Icon, {
84
+ className: _sortDropdownModule["default"].itemIcon,
85
+ glyph: "arrow"
86
+ }), /*#__PURE__*/_react["default"].createElement("span", {
87
+ className: _sortDropdownModule["default"].itemLabel
88
+ }, label));
89
+ };
90
+
91
+ Item.propTypes = {
92
+ className: _propTypes["default"].string,
93
+ as: _propTypes["default"].element.isRequired,
94
+ id: _propTypes["default"].string.isRequired,
95
+ label: _propTypes["default"].string.isRequired,
96
+ active: _propTypes["default"].bool.isRequired,
97
+ direction: _propTypes["default"].string.isRequired,
98
+ defaultDirection: _propTypes["default"].string.isRequired,
99
+ getButtonOnClick: _propTypes["default"].func.isRequired
100
+ };
101
+ Item.defaultProps = {
102
+ className: ''
103
+ };
104
+
38
105
  var SortDropdown = function SortDropdown(props) {
39
106
  var className = props.className,
40
107
  label = props.label,
@@ -49,11 +116,11 @@ var SortDropdown = function SortDropdown(props) {
49
116
  label: customLabel,
50
117
  glyph: "sort",
51
118
  align: "right"
52
- }, function (_ref) {
53
- var MenuItem = _ref.MenuItem,
54
- menu = _ref.menu,
55
- menuItemClassName = _ref.menuItemClassName,
56
- menuItemActiveClassName = _ref.menuItemActiveClassName;
119
+ }, function (_ref2) {
120
+ var MenuItem = _ref2.MenuItem,
121
+ menu = _ref2.menu,
122
+ menuItemClassName = _ref2.menuItemClassName,
123
+ menuItemActiveClassName = _ref2.menuItemActiveClassName;
57
124
 
58
125
  var getButtonOnClick = function getButtonOnClick(newField, newDirection) {
59
126
  return function () {
@@ -67,30 +134,23 @@ var SortDropdown = function SortDropdown(props) {
67
134
 
68
135
  return /*#__PURE__*/_react["default"].createElement("div", {
69
136
  className: _sortDropdownModule["default"].items
70
- }, Object.entries(fields).map(function (_ref2) {
71
- var _ref3 = _slicedToArray(_ref2, 2),
72
- key = _ref3[0],
73
- item = _ref3[1];
137
+ }, Object.entries(fields).map(function (_ref3) {
138
+ var _ref4 = _slicedToArray(_ref3, 2),
139
+ key = _ref4[0],
140
+ item = _ref4[1];
74
141
 
75
- var buttonProps = direction === 'asc' ? {
76
- className: _sortDropdownModule["default"].itemAsc,
77
- onClick: getButtonOnClick(key, 'desc'),
78
- title: "Order data by ".concat(item.label, " descending")
79
- } : {
80
- onClick: getButtonOnClick(key, 'asc'),
81
- title: "Order data by ".concat(item.label, " ascending")
82
- };
83
142
  var isActive = field === key;
84
- return /*#__PURE__*/_react["default"].createElement(MenuItem, _extends({
85
- key: key
86
- }, menu, buttonProps, {
87
- className: (0, _classnames["default"])(buttonProps.className, menuItemClassName, _sortDropdownModule["default"].item, isActive && menuItemActiveClassName, isActive && _sortDropdownModule["default"].active)
88
- }), /*#__PURE__*/_react["default"].createElement("span", {
89
- className: _sortDropdownModule["default"].itemLabel
90
- }, item.label), /*#__PURE__*/_react["default"].createElement(_icon.Icon, {
91
- className: _sortDropdownModule["default"].itemIcon,
92
- glyph: "arrow"
93
- }));
143
+ return /*#__PURE__*/_react["default"].createElement(Item, {
144
+ key: key,
145
+ as: MenuItem,
146
+ className: (0, _classnames["default"])(menuItemClassName, isActive && menuItemActiveClassName),
147
+ id: key,
148
+ label: item.label,
149
+ direction: direction,
150
+ defaultDirection: item.defaultDirection,
151
+ active: isActive,
152
+ getButtonOnClick: getButtonOnClick
153
+ });
94
154
  }));
95
155
  });
96
156
  };
@@ -4,7 +4,9 @@
4
4
  }
5
5
 
6
6
  .itemIcon {
7
- display: none;
7
+ flex: 0 0 auto;
8
+ visibility: hidden;
9
+ margin-right: var(--space-xxxsmall);
8
10
  }
9
11
 
10
12
  .itemLabel {
@@ -15,6 +17,6 @@
15
17
  transform: rotate(180deg);
16
18
  }
17
19
 
18
- .item.active .itemIcon {
19
- display: block;
20
+ .itemActive .itemIcon {
21
+ visibility: visible;
20
22
  }
@@ -1,7 +1,7 @@
1
- import React from 'react';
1
+ import React, { useMemo } from 'react';
2
2
  import PropTypes from 'prop-types';
3
3
  import cx from 'classnames';
4
- import styles from './metric.module.css'; // Separate value and unit
4
+ import css from './metric.module.css'; // Separate value and unit
5
5
 
6
6
  const EXTRACT_VALUE_UNIT_PATTERN = /([\d|.|,| ]*)(\w*|%)$/;
7
7
  export const Metric = _ref => {
@@ -10,29 +10,55 @@ export const Metric = _ref => {
10
10
  value,
11
11
  formatter,
12
12
  inline,
13
- anchored,
14
13
  children,
15
14
  enhanced
16
15
  } = _ref;
17
- const formattedValue = formatter(value); // eslint-disable-next-line no-unused-vars
16
+ const {
17
+ displayValue,
18
+ displayUnit
19
+ } = useMemo(() => {
20
+ const formattedValue = formatter == null ? void 0 : formatter(value);
18
21
 
19
- const [matched, displayValue, displayUnit] = enhanced && formattedValue ? formattedValue.match(EXTRACT_VALUE_UNIT_PATTERN) : [null, formattedValue, null];
20
- const rootClassName = cx(className, styles.root, inline && styles.inline, anchored && styles.anchored);
21
- return /*#__PURE__*/React.createElement("span", {
22
+ if (!formattedValue) {
23
+ return {
24
+ displayValue: value
25
+ };
26
+ }
27
+
28
+ if (!enhanced) {
29
+ return {
30
+ displayValue: formattedValue
31
+ };
32
+ }
33
+
34
+ const matches = formattedValue.match(EXTRACT_VALUE_UNIT_PATTERN);
35
+
36
+ if (!matches) {
37
+ return {
38
+ displayValue: value
39
+ };
40
+ }
41
+
42
+ return {
43
+ displayUnit: matches[2],
44
+ displayValue: matches[1]
45
+ };
46
+ }, [formatter, value]);
47
+ const rootClassName = cx(className, css.root, inline && css.inline);
48
+ return /*#__PURE__*/React.createElement("div", {
22
49
  className: rootClassName
50
+ }, /*#__PURE__*/React.createElement("div", {
51
+ className: css.display
23
52
  }, /*#__PURE__*/React.createElement("span", {
24
- className: styles.display
25
- }, /*#__PURE__*/React.createElement("span", {
26
- className: styles.displayValue
53
+ className: css.displayValue
27
54
  }, displayValue), displayUnit && /*#__PURE__*/React.createElement("span", {
28
- className: styles.displayUnit
29
- }, displayUnit)), /*#__PURE__*/React.createElement("span", {
30
- className: styles.delta
55
+ className: css.displayUnit
56
+ }, displayUnit)), /*#__PURE__*/React.createElement("div", {
57
+ className: css.delta
31
58
  }, children));
32
59
  };
33
60
  Metric.defaultProps = {
34
61
  className: '',
35
- anchored: false,
36
62
  enhanced: false,
37
63
  inline: false,
38
64
  value: 0,
@@ -43,7 +69,6 @@ Metric.propTypes = {
43
69
  className: PropTypes.string,
44
70
  enhanced: PropTypes.bool,
45
71
  inline: PropTypes.bool,
46
- anchored: PropTypes.bool,
47
72
  value: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
48
73
  formatter: PropTypes.func,
49
74
  children: PropTypes.node
@@ -1,27 +1,17 @@
1
1
  .root {
2
- display: block;
3
2
  letter-spacing: 0.05em;
4
3
  }
5
4
 
6
5
  .displayUnit {
7
- color: var(--color-text-ultra-light);
6
+ font-size: var(--size-small);
8
7
  }
9
8
 
10
9
  .delta {
11
- display: block;
12
- font-size: var(--size-xsmall);
10
+ font-size: var(--size-small);
13
11
  }
14
12
 
15
- .anchored {
16
- position: relative;
17
- }
18
-
19
- .anchored .delta {
20
- position: absolute;
21
- right: 0;
22
- top: 100%;
23
- line-height: 1;
24
- margin-top: -2px;
13
+ .inline .display {
14
+ display: inline-block;
25
15
  }
26
16
 
27
17
  .inline .delta {