@atlaskit/range 5.0.11 → 5.1.3

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.
package/CHANGELOG.md CHANGED
@@ -1,5 +1,37 @@
1
1
  # @atlaskit/range
2
2
 
3
+ ## 5.1.3
4
+
5
+ ### Patch Changes
6
+
7
+ - Updated dependencies
8
+
9
+ ## 5.1.2
10
+
11
+ ### Patch Changes
12
+
13
+ - [`c55c736ecea`](https://bitbucket.org/atlassian/atlassian-frontend/commits/c55c736ecea) - Patch VULN AFP-3486 AFP-3487 AFP-3488 AFP-3489
14
+
15
+ ## 5.1.1
16
+
17
+ ### Patch Changes
18
+
19
+ - [`f460cc7c411`](https://bitbucket.org/atlassian/atlassian-frontend/commits/f460cc7c411) - Builds for this package now pass through a tokens babel plugin, removing runtime invocations of the tokens() function and improving bundle size.
20
+ - Updated dependencies
21
+
22
+ ## 5.1.0
23
+
24
+ ### Minor Changes
25
+
26
+ - [`21c178539a2`](https://bitbucket.org/atlassian/atlassian-frontend/commits/21c178539a2) - [ux] Instrumented range with the new theming package, `@atlaskit/tokens`.
27
+
28
+ New tokens will be visible only in applications configured to use the new Tokens API (currently in alpha).
29
+ These changes are intended to be interoperable with the legacy theme implementation. Legacy dark mode users should expect no visual or breaking changes.
30
+
31
+ ### Patch Changes
32
+
33
+ - Updated dependencies
34
+
3
35
  ## 5.0.11
4
36
 
5
37
  ### Patch Changes
package/dist/cjs/range.js CHANGED
@@ -23,13 +23,15 @@ var _styled = require("./styled");
23
23
 
24
24
  var _theme = require("./theme");
25
25
 
26
+ var _excluded = ["isDisabled", "defaultValue", "max", "min", "onChange", "step", "value", "theme", "testId"];
27
+
26
28
  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); }
27
29
 
28
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; }
29
31
 
30
- function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
32
+ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
31
33
 
32
- function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
34
+ 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; }
33
35
 
34
36
  var snapToStep = function snapToStep(value, min, step) {
35
37
  // Normalise the value to allow for division properly with different min values
@@ -69,7 +71,7 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function Range(props, ref) {
69
71
  propsValue = props.value,
70
72
  theme = props.theme,
71
73
  testId = props.testId,
72
- rest = (0, _objectWithoutProperties2.default)(props, ["isDisabled", "defaultValue", "max", "min", "onChange", "step", "value", "theme", "testId"]);
74
+ rest = (0, _objectWithoutProperties2.default)(props, _excluded);
73
75
 
74
76
  var spreadProps = _objectSpread({
75
77
  max: max,
@@ -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.Input = exports.rangeInputStyle = exports.overallHeight = void 0;
8
+ exports.rangeInputStyle = exports.overallHeight = exports.Input = void 0;
9
9
 
10
10
  var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
11
11
 
@@ -17,9 +17,11 @@ var _react = require("react");
17
17
 
18
18
  var _core = require("@emotion/core");
19
19
 
20
+ var _colors = require("@atlaskit/theme/colors");
21
+
20
22
  var _constants = require("@atlaskit/theme/constants");
21
23
 
22
- var _elevation = require("@atlaskit/theme/elevation");
24
+ var _excluded = ["valuePercent", "thumb", "track", "style"];
23
25
 
24
26
  var _templateObject;
25
27
 
@@ -35,27 +37,28 @@ var getBackgroundGradient = function getBackgroundGradient(_ref) {
35
37
  var lower = _ref.lower,
36
38
  upper = _ref.upper;
37
39
  return "\n background: linear-gradient(".concat(lower, ", ").concat(lower, ") 0 / var(--range-inline-width) 100%\n no-repeat ").concat(upper, ";\n [dir='rtl'] & {\n background-position: right;\n }\n ");
38
- }; // Thumb style
40
+ };
39
41
 
42
+ var elevationStyle = "var(--ds-overlay, ".concat("0 4px 8px -2px ".concat(_colors.N50A, ", 0 0 1px ").concat(_colors.N60A), ")"); // Thumb style
40
43
 
41
44
  var sliderThumbStyle = function sliderThumbStyle(_ref2) {
42
45
  var thumb = _ref2.thumb;
43
- return "\n background: ".concat(thumb.default.background, ";\n border: ").concat(sliderThumbBorderThickness, "px solid transparent;\n border-radius: 50%;\n height: ").concat(sliderThumbSize, "px;\n width: ").concat(sliderThumbSize, "px;\n box-sizing: border-box;\n transition: border-color ").concat(transitionDuration, " ease-in-out;\n ").concat((0, _elevation.e200)(), ";\n ");
46
+ return "\n background: ".concat(thumb.default.background, ";\n border: ").concat(sliderThumbBorderThickness, "px solid transparent;\n border-radius: 50%;\n height: ").concat(sliderThumbSize, "px;\n width: ").concat(sliderThumbSize, "px;\n box-sizing: border-box;\n transition: border-color ").concat(transitionDuration, " ease-in-out;\n box-shadow: ").concat(elevationStyle, "\n ");
44
47
  }; // Track styles
45
48
 
46
49
 
47
50
  var sliderTrackStyle = "\n border-radius: ".concat(sliderBorderRadius, "px;\n border: 0;\n cursor: pointer;\n height: ").concat(sliderLineThickness, "px;\n width: 100%;\n transition: background-color ").concat(transitionDuration, " ease-in-out;\n"); // Range input styles
48
51
 
49
52
  var chromeRangeInputStyle = function chromeRangeInputStyle(tokens) {
50
- return "\n &::-webkit-slider-thumb {\n -webkit-appearance: none;\n margin-top: -".concat((sliderThumbSize - sliderLineThickness) / 2, "px;\n ").concat(sliderThumbStyle(tokens), ";\n }\n\n &:focus::-webkit-slider-thumb {\n border-color: ").concat(tokens.thumb.focus.border, ";\n }\n\n &:disabled::-webkit-slider-thumb {\n cursor: not-allowed;\n box-shadow: 0 0 1px ").concat(tokens.thumb.disabled.boxShadow, ";\n }\n\n &::-webkit-slider-runnable-track {\n ").concat(sliderTrackStyle, ";\n ").concat(getBackgroundGradient(tokens.track.default), ";\n }\n\n &:focus::-webkit-slider-runnable-track {\n ").concat(getBackgroundGradient(tokens.track.default), ";\n }\n\n &:active::-webkit-slider-runnable-track,\n &:hover::-webkit-slider-runnable-track {\n ").concat(getBackgroundGradient(tokens.track.hover), ";\n }\n\n &:disabled::-webkit-slider-runnable-track {\n ").concat(getBackgroundGradient(tokens.track.disabled), "\n cursor: not-allowed;\n }\n ");
53
+ return "\n &::-webkit-slider-thumb {\n -webkit-appearance: none;\n margin-top: -".concat((sliderThumbSize - sliderLineThickness) / 2, "px;\n ").concat(sliderThumbStyle(tokens), ";\n }\n\n &:focus::-webkit-slider-thumb {\n border-color: ").concat(tokens.thumb.focus.border, ";\n }\n\n &:disabled::-webkit-slider-thumb {\n cursor: not-allowed;\n box-shadow: ").concat(tokens.thumb.disabled.boxShadow, ";\n }\n\n &::-webkit-slider-runnable-track {\n ").concat(sliderTrackStyle, ";\n ").concat(getBackgroundGradient(tokens.track.default), ";\n }\n\n &:focus::-webkit-slider-runnable-track {\n ").concat(getBackgroundGradient(tokens.track.default), ";\n }\n\n &:active::-webkit-slider-runnable-track,\n &:hover::-webkit-slider-runnable-track {\n ").concat(getBackgroundGradient(tokens.track.hover), ";\n }\n\n &:disabled::-webkit-slider-runnable-track {\n ").concat(getBackgroundGradient(tokens.track.disabled), "\n cursor: not-allowed;\n }\n ");
51
54
  };
52
55
 
53
56
  var firefoxRangeInputStyle = function firefoxRangeInputStyle(tokens) {
54
- return "\n &::-moz-focus-outer {\n border: 0;\n }\n\n &::-moz-range-thumb {\n ".concat(sliderThumbStyle(tokens), ";\n }\n\n &:focus::-moz-range-thumb {\n border-color: ").concat(tokens.thumb.focus.border, ";\n }\n\n &:disabled::-moz-range-thumb {\n cursor: not-allowed;\n box-shadow: 0 0 1px ").concat(tokens.thumb.disabled.boxShadow, ";\n }\n\n &::-moz-range-progress {\n ").concat(sliderTrackStyle, ";\n background: ").concat(tokens.track.default.lower, ";\n }\n\n &::-moz-range-track {\n ").concat(sliderTrackStyle, ";\n background: ").concat(tokens.track.default.upper, ";\n }\n\n &:active::-moz-range-progress,\n &:hover::-moz-range-progress {\n background: ").concat(tokens.track.hover.lower, ";\n }\n\n &:active::-moz-range-track,\n &:hover::-moz-range-track {\n background: ").concat(tokens.track.hover.upper, ";\n }\n\n &:disabled::-moz-range-progress {\n background: ").concat(tokens.track.disabled.lower, ";\n cursor: not-allowed;\n }\n\n &:disabled::-moz-range-track {\n background: ").concat(tokens.track.disabled.upper, ";\n cursor: not-allowed;\n }\n");
57
+ return "\n &::-moz-focus-outer {\n border: 0;\n }\n\n &::-moz-range-thumb {\n ".concat(sliderThumbStyle(tokens), ";\n }\n\n &:focus::-moz-range-thumb {\n border-color: ").concat(tokens.thumb.focus.border, ";\n }\n\n &:disabled::-moz-range-thumb {\n cursor: not-allowed;\n box-shadow: ").concat(tokens.thumb.disabled.boxShadow, ";\n }\n\n &::-moz-range-progress {\n ").concat(sliderTrackStyle, ";\n background: ").concat(tokens.track.default.lower, ";\n }\n\n &::-moz-range-track {\n ").concat(sliderTrackStyle, ";\n background: ").concat(tokens.track.default.upper, ";\n }\n\n &:active::-moz-range-progress,\n &:hover::-moz-range-progress {\n background: ").concat(tokens.track.hover.lower, ";\n }\n\n &:active::-moz-range-track,\n &:hover::-moz-range-track {\n background: ").concat(tokens.track.hover.upper, ";\n }\n\n &:disabled::-moz-range-progress {\n background: ").concat(tokens.track.disabled.lower, ";\n cursor: not-allowed;\n }\n\n &:disabled::-moz-range-track {\n background: ").concat(tokens.track.disabled.upper, ";\n cursor: not-allowed;\n }\n");
55
58
  };
56
59
 
57
60
  var IERangeInputStyle = function IERangeInputStyle(tokens) {
58
- return "\n &::-ms-thumb {\n margin-top: 0;\n ".concat(sliderThumbStyle(tokens), ";\n }\n\n &:focus::-ms-thumb {\n border-color: ").concat(tokens.thumb.focus.border, ";\n }\n\n &:disabled::-ms-thumb {\n cursor: not-allowed;\n box-shadow: 0 0 1px ").concat(tokens.thumb.disabled.boxShadow, ";\n }\n\n &::-ms-track {\n background: transparent;\n border-color: transparent;\n color: transparent;\n cursor: pointer;\n height: ").concat(sliderLineThickness, "px;\n transition: background-color ").concat(transitionDuration, " ease-in-out;\n width: 100%;\n }\n\n &::-ms-fill-lower {\n background: ").concat(tokens.track.default.lower, ";\n border-radius: ").concat(sliderBorderRadius, "px;\n border: 0;\n }\n\n &::-ms-fill-upper {\n background: ").concat(tokens.track.default.upper, ";\n border-radius: ").concat(sliderBorderRadius, "px;\n border: 0;\n }\n\n &:active::-ms-fill-lower,\n &:hover::-ms-fill-lower {\n background: ").concat(tokens.track.hover.lower, ";\n }\n\n &:active::-ms-fill-upper,\n &:hover::-ms-fill-upper {\n background: ").concat(tokens.track.hover.upper, ";\n }\n\n &:disabled::-ms-fill-lower {\n background: ").concat(tokens.track.disabled.lower, ";\n cursor: not-allowed;\n }\n\n &:disabled::-ms-fill-upper {\n background: ").concat(tokens.track.disabled.upper, ";\n cursor: not-allowed;\n }\n");
61
+ return "\n &::-ms-thumb {\n margin-top: 0;\n ".concat(sliderThumbStyle(tokens), ";\n }\n\n &:focus::-ms-thumb {\n border-color: ").concat(tokens.thumb.focus.border, ";\n }\n\n &:disabled::-ms-thumb {\n cursor: not-allowed;\n box-shadow: ").concat(tokens.thumb.disabled.boxShadow, ";\n }\n\n &::-ms-track {\n background: transparent;\n border-color: transparent;\n color: transparent;\n cursor: pointer;\n height: ").concat(sliderLineThickness, "px;\n transition: background-color ").concat(transitionDuration, " ease-in-out;\n width: 100%;\n }\n\n &::-ms-fill-lower {\n background: ").concat(tokens.track.default.lower, ";\n border-radius: ").concat(sliderBorderRadius, "px;\n border: 0;\n }\n\n &::-ms-fill-upper {\n background: ").concat(tokens.track.default.upper, ";\n border-radius: ").concat(sliderBorderRadius, "px;\n border: 0;\n }\n\n &:active::-ms-fill-lower,\n &:hover::-ms-fill-lower {\n background: ").concat(tokens.track.hover.lower, ";\n }\n\n &:active::-ms-fill-upper,\n &:hover::-ms-fill-upper {\n background: ").concat(tokens.track.hover.upper, ";\n }\n\n &:disabled::-ms-fill-lower {\n background: ").concat(tokens.track.disabled.lower, ";\n cursor: not-allowed;\n }\n\n &:disabled::-ms-fill-upper {\n background: ").concat(tokens.track.disabled.upper, ";\n cursor: not-allowed;\n }\n");
59
62
  }; // Styles are split per browser as they are implemented differently
60
63
  // Cannot consolidate as Chrome & Firefox don't recognise styles if they are grouped
61
64
  // with CSS selectors they don't recognise, e.g. &::-ms-thumb
@@ -71,7 +74,7 @@ var Input = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
71
74
  thumb = props.thumb,
72
75
  track = props.track,
73
76
  style = props.style,
74
- strippedProps = (0, _objectWithoutProperties2.default)(props, ["valuePercent", "thumb", "track", "style"]); // Note: emotion will cache unique outputs as their own this
77
+ strippedProps = (0, _objectWithoutProperties2.default)(props, _excluded); // Note: emotion will cache unique outputs as their own this
75
78
  // We are memoizing the creation of this string
76
79
 
77
80
  var styles = (0, _react.useMemo)(function () {
@@ -86,7 +89,8 @@ var Input = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
86
89
  style: {
87
90
  '--range-inline-width': "".concat(valuePercent, "%")
88
91
  },
89
- ref: ref,
92
+ ref: ref // eslint-disable-next-line @repo/internal/react/consistent-css-prop-usage
93
+ ,
90
94
  css: styles
91
95
  }));
92
96
  });
package/dist/cjs/theme.js CHANGED
@@ -5,7 +5,7 @@ var _typeof = require("@babel/runtime/helpers/typeof");
5
5
  Object.defineProperty(exports, "__esModule", {
6
6
  value: true
7
7
  });
8
- exports.Theme = exports.track = exports.thumb = void 0;
8
+ exports.track = exports.thumb = exports.Theme = void 0;
9
9
 
10
10
  var colors = _interopRequireWildcard(require("@atlaskit/theme/colors"));
11
11
 
@@ -17,33 +17,29 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
17
17
 
18
18
  var thumb = {
19
19
  default: {
20
- background: colors.N0,
21
- // This border color is not being used - awaiting focus state lift to props
22
- border: colors.N800
20
+ background: "var(--ds-background-card, ".concat(colors.N0, ")")
23
21
  },
24
22
  disabled: {
25
- boxShadow: colors.N60A
23
+ boxShadow: "var(--ds-card, ".concat("0 0 1px ".concat(colors.N60A), ")")
26
24
  },
27
25
  focus: {
28
- // This border color is not being used - awaiting focus state lift to props
29
- background: colors.N0,
30
- border: colors.B200
26
+ background: "var(--ds-background-boldNeutral-resting, ".concat(colors.N0, ")"),
27
+ border: "var(--ds-border-focus, ".concat(colors.B200, ")")
31
28
  }
32
29
  };
33
30
  exports.thumb = thumb;
34
31
  var track = {
35
- background: colors.N30A,
36
32
  default: {
37
- lower: colors.B400,
38
- upper: colors.N30
33
+ lower: "var(--ds-background-boldBrand-resting, ".concat(colors.B400, ")"),
34
+ upper: "var(--ds-background-subtleNeutral-resting, ".concat(colors.N30, ")")
39
35
  },
40
36
  disabled: {
41
- lower: colors.N50,
42
- upper: colors.N30
37
+ lower: "var(--ds-text-disabled, ".concat(colors.N50, ")"),
38
+ upper: "var(--ds-background-disabled, ".concat(colors.N30, ")")
43
39
  },
44
40
  hover: {
45
- lower: colors.B300,
46
- upper: colors.N40
41
+ lower: "var(--ds-background-boldBrand-hover, ".concat(colors.B300, ")"),
42
+ upper: "var(--ds-background-subtleNeutral-hover, ".concat(colors.N40, ")")
47
43
  }
48
44
  };
49
45
  exports.track = track;
@@ -1,5 +1,5 @@
1
1
  {
2
2
  "name": "@atlaskit/range",
3
- "version": "5.0.11",
3
+ "version": "5.1.3",
4
4
  "sideEffects": false
5
5
  }
@@ -5,8 +5,8 @@ import _extends from "@babel/runtime/helpers/extends";
5
5
  /* eslint-disable no-mixed-operators */
6
6
  import { forwardRef, useMemo } from 'react';
7
7
  import { css, jsx } from '@emotion/core';
8
+ import { N50A, N60A } from '@atlaskit/theme/colors';
8
9
  import { fontFamily } from '@atlaskit/theme/constants';
9
- import { e200 } from '@atlaskit/theme/elevation';
10
10
  const sliderThumbSize = 16;
11
11
  const sliderThumbBorderThickness = 2;
12
12
  const sliderLineThickness = 4;
@@ -23,8 +23,9 @@ const getBackgroundGradient = ({
23
23
  [dir='rtl'] & {
24
24
  background-position: right;
25
25
  }
26
- `; // Thumb style
26
+ `;
27
27
 
28
+ const elevationStyle = `var(--ds-overlay, ${`0 4px 8px -2px ${N50A}, 0 0 1px ${N60A}`})`; // Thumb style
28
29
 
29
30
  const sliderThumbStyle = ({
30
31
  thumb
@@ -37,7 +38,7 @@ const sliderThumbStyle = ({
37
38
  width: ${sliderThumbSize}px;
38
39
  box-sizing: border-box;
39
40
  transition: border-color ${transitionDuration} ease-in-out;
40
- ${e200()};
41
+ box-shadow: ${elevationStyle}
41
42
  `;
42
43
  }; // Track styles
43
44
 
@@ -65,7 +66,7 @@ const chromeRangeInputStyle = tokens => {
65
66
 
66
67
  &:disabled::-webkit-slider-thumb {
67
68
  cursor: not-allowed;
68
- box-shadow: 0 0 1px ${tokens.thumb.disabled.boxShadow};
69
+ box-shadow: ${tokens.thumb.disabled.boxShadow};
69
70
  }
70
71
 
71
72
  &::-webkit-slider-runnable-track {
@@ -105,7 +106,7 @@ const firefoxRangeInputStyle = tokens => {
105
106
 
106
107
  &:disabled::-moz-range-thumb {
107
108
  cursor: not-allowed;
108
- box-shadow: 0 0 1px ${tokens.thumb.disabled.boxShadow};
109
+ box-shadow: ${tokens.thumb.disabled.boxShadow};
109
110
  }
110
111
 
111
112
  &::-moz-range-progress {
@@ -153,7 +154,7 @@ const IERangeInputStyle = tokens => {
153
154
 
154
155
  &:disabled::-ms-thumb {
155
156
  cursor: not-allowed;
156
- box-shadow: 0 0 1px ${tokens.thumb.disabled.boxShadow};
157
+ box-shadow: ${tokens.thumb.disabled.boxShadow};
157
158
  }
158
159
 
159
160
  &::-ms-track {
@@ -248,7 +249,8 @@ export const Input = /*#__PURE__*/forwardRef((props, ref) => {
248
249
  style: {
249
250
  '--range-inline-width': `${valuePercent}%`
250
251
  },
251
- ref: ref,
252
+ ref: ref // eslint-disable-next-line @repo/internal/react/consistent-css-prop-usage
253
+ ,
252
254
  css: styles
253
255
  }));
254
256
  });
@@ -2,32 +2,28 @@ import * as colors from '@atlaskit/theme/colors';
2
2
  import { createTheme } from '@atlaskit/theme/components';
3
3
  export const thumb = {
4
4
  default: {
5
- background: colors.N0,
6
- // This border color is not being used - awaiting focus state lift to props
7
- border: colors.N800
5
+ background: `var(--ds-background-card, ${colors.N0})`
8
6
  },
9
7
  disabled: {
10
- boxShadow: colors.N60A
8
+ boxShadow: `var(--ds-card, ${`0 0 1px ${colors.N60A}`})`
11
9
  },
12
10
  focus: {
13
- // This border color is not being used - awaiting focus state lift to props
14
- background: colors.N0,
15
- border: colors.B200
11
+ background: `var(--ds-background-boldNeutral-resting, ${colors.N0})`,
12
+ border: `var(--ds-border-focus, ${colors.B200})`
16
13
  }
17
14
  };
18
15
  export const track = {
19
- background: colors.N30A,
20
16
  default: {
21
- lower: colors.B400,
22
- upper: colors.N30
17
+ lower: `var(--ds-background-boldBrand-resting, ${colors.B400})`,
18
+ upper: `var(--ds-background-subtleNeutral-resting, ${colors.N30})`
23
19
  },
24
20
  disabled: {
25
- lower: colors.N50,
26
- upper: colors.N30
21
+ lower: `var(--ds-text-disabled, ${colors.N50})`,
22
+ upper: `var(--ds-background-disabled, ${colors.N30})`
27
23
  },
28
24
  hover: {
29
- lower: colors.B300,
30
- upper: colors.N40
25
+ lower: `var(--ds-background-boldBrand-hover, ${colors.B300})`,
26
+ upper: `var(--ds-background-subtleNeutral-hover, ${colors.N40})`
31
27
  }
32
28
  };
33
29
  export const Theme = createTheme(() => ({
@@ -1,5 +1,5 @@
1
1
  {
2
2
  "name": "@atlaskit/range",
3
- "version": "5.0.11",
3
+ "version": "5.1.3",
4
4
  "sideEffects": false
5
5
  }
package/dist/esm/range.js CHANGED
@@ -2,10 +2,11 @@ import _extends from "@babel/runtime/helpers/extends";
2
2
  import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
3
3
  import _defineProperty from "@babel/runtime/helpers/defineProperty";
4
4
  import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
5
+ var _excluded = ["isDisabled", "defaultValue", "max", "min", "onChange", "step", "value", "theme", "testId"];
5
6
 
6
- function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
7
+ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
7
8
 
8
- function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
9
+ 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) { _defineProperty(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; }
9
10
 
10
11
  import React, { forwardRef, useCallback, useState } from 'react';
11
12
  import { Input } from './styled';
@@ -49,7 +50,7 @@ export default /*#__PURE__*/forwardRef(function Range(props, ref) {
49
50
  propsValue = props.value,
50
51
  theme = props.theme,
51
52
  testId = props.testId,
52
- rest = _objectWithoutProperties(props, ["isDisabled", "defaultValue", "max", "min", "onChange", "step", "value", "theme", "testId"]);
53
+ rest = _objectWithoutProperties(props, _excluded);
53
54
 
54
55
  var spreadProps = _objectSpread({
55
56
  max: max,
@@ -1,6 +1,7 @@
1
1
  import _extends from "@babel/runtime/helpers/extends";
2
2
  import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
3
3
  import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral";
4
+ var _excluded = ["valuePercent", "thumb", "track", "style"];
4
5
 
5
6
  var _templateObject;
6
7
 
@@ -9,8 +10,8 @@ var _templateObject;
9
10
  /* eslint-disable no-mixed-operators */
10
11
  import { forwardRef, useMemo } from 'react';
11
12
  import { css, jsx } from '@emotion/core';
13
+ import { N50A, N60A } from '@atlaskit/theme/colors';
12
14
  import { fontFamily } from '@atlaskit/theme/constants';
13
- import { e200 } from '@atlaskit/theme/elevation';
14
15
  var sliderThumbSize = 16;
15
16
  var sliderThumbBorderThickness = 2;
16
17
  var sliderLineThickness = 4;
@@ -22,27 +23,28 @@ var getBackgroundGradient = function getBackgroundGradient(_ref) {
22
23
  var lower = _ref.lower,
23
24
  upper = _ref.upper;
24
25
  return "\n background: linear-gradient(".concat(lower, ", ").concat(lower, ") 0 / var(--range-inline-width) 100%\n no-repeat ").concat(upper, ";\n [dir='rtl'] & {\n background-position: right;\n }\n ");
25
- }; // Thumb style
26
+ };
26
27
 
28
+ var elevationStyle = "var(--ds-overlay, ".concat("0 4px 8px -2px ".concat(N50A, ", 0 0 1px ").concat(N60A), ")"); // Thumb style
27
29
 
28
30
  var sliderThumbStyle = function sliderThumbStyle(_ref2) {
29
31
  var thumb = _ref2.thumb;
30
- return "\n background: ".concat(thumb.default.background, ";\n border: ").concat(sliderThumbBorderThickness, "px solid transparent;\n border-radius: 50%;\n height: ").concat(sliderThumbSize, "px;\n width: ").concat(sliderThumbSize, "px;\n box-sizing: border-box;\n transition: border-color ").concat(transitionDuration, " ease-in-out;\n ").concat(e200(), ";\n ");
32
+ return "\n background: ".concat(thumb.default.background, ";\n border: ").concat(sliderThumbBorderThickness, "px solid transparent;\n border-radius: 50%;\n height: ").concat(sliderThumbSize, "px;\n width: ").concat(sliderThumbSize, "px;\n box-sizing: border-box;\n transition: border-color ").concat(transitionDuration, " ease-in-out;\n box-shadow: ").concat(elevationStyle, "\n ");
31
33
  }; // Track styles
32
34
 
33
35
 
34
36
  var sliderTrackStyle = "\n border-radius: ".concat(sliderBorderRadius, "px;\n border: 0;\n cursor: pointer;\n height: ").concat(sliderLineThickness, "px;\n width: 100%;\n transition: background-color ").concat(transitionDuration, " ease-in-out;\n"); // Range input styles
35
37
 
36
38
  var chromeRangeInputStyle = function chromeRangeInputStyle(tokens) {
37
- return "\n &::-webkit-slider-thumb {\n -webkit-appearance: none;\n margin-top: -".concat((sliderThumbSize - sliderLineThickness) / 2, "px;\n ").concat(sliderThumbStyle(tokens), ";\n }\n\n &:focus::-webkit-slider-thumb {\n border-color: ").concat(tokens.thumb.focus.border, ";\n }\n\n &:disabled::-webkit-slider-thumb {\n cursor: not-allowed;\n box-shadow: 0 0 1px ").concat(tokens.thumb.disabled.boxShadow, ";\n }\n\n &::-webkit-slider-runnable-track {\n ").concat(sliderTrackStyle, ";\n ").concat(getBackgroundGradient(tokens.track.default), ";\n }\n\n &:focus::-webkit-slider-runnable-track {\n ").concat(getBackgroundGradient(tokens.track.default), ";\n }\n\n &:active::-webkit-slider-runnable-track,\n &:hover::-webkit-slider-runnable-track {\n ").concat(getBackgroundGradient(tokens.track.hover), ";\n }\n\n &:disabled::-webkit-slider-runnable-track {\n ").concat(getBackgroundGradient(tokens.track.disabled), "\n cursor: not-allowed;\n }\n ");
39
+ return "\n &::-webkit-slider-thumb {\n -webkit-appearance: none;\n margin-top: -".concat((sliderThumbSize - sliderLineThickness) / 2, "px;\n ").concat(sliderThumbStyle(tokens), ";\n }\n\n &:focus::-webkit-slider-thumb {\n border-color: ").concat(tokens.thumb.focus.border, ";\n }\n\n &:disabled::-webkit-slider-thumb {\n cursor: not-allowed;\n box-shadow: ").concat(tokens.thumb.disabled.boxShadow, ";\n }\n\n &::-webkit-slider-runnable-track {\n ").concat(sliderTrackStyle, ";\n ").concat(getBackgroundGradient(tokens.track.default), ";\n }\n\n &:focus::-webkit-slider-runnable-track {\n ").concat(getBackgroundGradient(tokens.track.default), ";\n }\n\n &:active::-webkit-slider-runnable-track,\n &:hover::-webkit-slider-runnable-track {\n ").concat(getBackgroundGradient(tokens.track.hover), ";\n }\n\n &:disabled::-webkit-slider-runnable-track {\n ").concat(getBackgroundGradient(tokens.track.disabled), "\n cursor: not-allowed;\n }\n ");
38
40
  };
39
41
 
40
42
  var firefoxRangeInputStyle = function firefoxRangeInputStyle(tokens) {
41
- return "\n &::-moz-focus-outer {\n border: 0;\n }\n\n &::-moz-range-thumb {\n ".concat(sliderThumbStyle(tokens), ";\n }\n\n &:focus::-moz-range-thumb {\n border-color: ").concat(tokens.thumb.focus.border, ";\n }\n\n &:disabled::-moz-range-thumb {\n cursor: not-allowed;\n box-shadow: 0 0 1px ").concat(tokens.thumb.disabled.boxShadow, ";\n }\n\n &::-moz-range-progress {\n ").concat(sliderTrackStyle, ";\n background: ").concat(tokens.track.default.lower, ";\n }\n\n &::-moz-range-track {\n ").concat(sliderTrackStyle, ";\n background: ").concat(tokens.track.default.upper, ";\n }\n\n &:active::-moz-range-progress,\n &:hover::-moz-range-progress {\n background: ").concat(tokens.track.hover.lower, ";\n }\n\n &:active::-moz-range-track,\n &:hover::-moz-range-track {\n background: ").concat(tokens.track.hover.upper, ";\n }\n\n &:disabled::-moz-range-progress {\n background: ").concat(tokens.track.disabled.lower, ";\n cursor: not-allowed;\n }\n\n &:disabled::-moz-range-track {\n background: ").concat(tokens.track.disabled.upper, ";\n cursor: not-allowed;\n }\n");
43
+ return "\n &::-moz-focus-outer {\n border: 0;\n }\n\n &::-moz-range-thumb {\n ".concat(sliderThumbStyle(tokens), ";\n }\n\n &:focus::-moz-range-thumb {\n border-color: ").concat(tokens.thumb.focus.border, ";\n }\n\n &:disabled::-moz-range-thumb {\n cursor: not-allowed;\n box-shadow: ").concat(tokens.thumb.disabled.boxShadow, ";\n }\n\n &::-moz-range-progress {\n ").concat(sliderTrackStyle, ";\n background: ").concat(tokens.track.default.lower, ";\n }\n\n &::-moz-range-track {\n ").concat(sliderTrackStyle, ";\n background: ").concat(tokens.track.default.upper, ";\n }\n\n &:active::-moz-range-progress,\n &:hover::-moz-range-progress {\n background: ").concat(tokens.track.hover.lower, ";\n }\n\n &:active::-moz-range-track,\n &:hover::-moz-range-track {\n background: ").concat(tokens.track.hover.upper, ";\n }\n\n &:disabled::-moz-range-progress {\n background: ").concat(tokens.track.disabled.lower, ";\n cursor: not-allowed;\n }\n\n &:disabled::-moz-range-track {\n background: ").concat(tokens.track.disabled.upper, ";\n cursor: not-allowed;\n }\n");
42
44
  };
43
45
 
44
46
  var IERangeInputStyle = function IERangeInputStyle(tokens) {
45
- return "\n &::-ms-thumb {\n margin-top: 0;\n ".concat(sliderThumbStyle(tokens), ";\n }\n\n &:focus::-ms-thumb {\n border-color: ").concat(tokens.thumb.focus.border, ";\n }\n\n &:disabled::-ms-thumb {\n cursor: not-allowed;\n box-shadow: 0 0 1px ").concat(tokens.thumb.disabled.boxShadow, ";\n }\n\n &::-ms-track {\n background: transparent;\n border-color: transparent;\n color: transparent;\n cursor: pointer;\n height: ").concat(sliderLineThickness, "px;\n transition: background-color ").concat(transitionDuration, " ease-in-out;\n width: 100%;\n }\n\n &::-ms-fill-lower {\n background: ").concat(tokens.track.default.lower, ";\n border-radius: ").concat(sliderBorderRadius, "px;\n border: 0;\n }\n\n &::-ms-fill-upper {\n background: ").concat(tokens.track.default.upper, ";\n border-radius: ").concat(sliderBorderRadius, "px;\n border: 0;\n }\n\n &:active::-ms-fill-lower,\n &:hover::-ms-fill-lower {\n background: ").concat(tokens.track.hover.lower, ";\n }\n\n &:active::-ms-fill-upper,\n &:hover::-ms-fill-upper {\n background: ").concat(tokens.track.hover.upper, ";\n }\n\n &:disabled::-ms-fill-lower {\n background: ").concat(tokens.track.disabled.lower, ";\n cursor: not-allowed;\n }\n\n &:disabled::-ms-fill-upper {\n background: ").concat(tokens.track.disabled.upper, ";\n cursor: not-allowed;\n }\n");
47
+ return "\n &::-ms-thumb {\n margin-top: 0;\n ".concat(sliderThumbStyle(tokens), ";\n }\n\n &:focus::-ms-thumb {\n border-color: ").concat(tokens.thumb.focus.border, ";\n }\n\n &:disabled::-ms-thumb {\n cursor: not-allowed;\n box-shadow: ").concat(tokens.thumb.disabled.boxShadow, ";\n }\n\n &::-ms-track {\n background: transparent;\n border-color: transparent;\n color: transparent;\n cursor: pointer;\n height: ").concat(sliderLineThickness, "px;\n transition: background-color ").concat(transitionDuration, " ease-in-out;\n width: 100%;\n }\n\n &::-ms-fill-lower {\n background: ").concat(tokens.track.default.lower, ";\n border-radius: ").concat(sliderBorderRadius, "px;\n border: 0;\n }\n\n &::-ms-fill-upper {\n background: ").concat(tokens.track.default.upper, ";\n border-radius: ").concat(sliderBorderRadius, "px;\n border: 0;\n }\n\n &:active::-ms-fill-lower,\n &:hover::-ms-fill-lower {\n background: ").concat(tokens.track.hover.lower, ";\n }\n\n &:active::-ms-fill-upper,\n &:hover::-ms-fill-upper {\n background: ").concat(tokens.track.hover.upper, ";\n }\n\n &:disabled::-ms-fill-lower {\n background: ").concat(tokens.track.disabled.lower, ";\n cursor: not-allowed;\n }\n\n &:disabled::-ms-fill-upper {\n background: ").concat(tokens.track.disabled.upper, ";\n cursor: not-allowed;\n }\n");
46
48
  }; // Styles are split per browser as they are implemented differently
47
49
  // Cannot consolidate as Chrome & Firefox don't recognise styles if they are grouped
48
50
  // with CSS selectors they don't recognise, e.g. &::-ms-thumb
@@ -56,7 +58,7 @@ export var Input = /*#__PURE__*/forwardRef(function (props, ref) {
56
58
  thumb = props.thumb,
57
59
  track = props.track,
58
60
  style = props.style,
59
- strippedProps = _objectWithoutProperties(props, ["valuePercent", "thumb", "track", "style"]); // Note: emotion will cache unique outputs as their own this
61
+ strippedProps = _objectWithoutProperties(props, _excluded); // Note: emotion will cache unique outputs as their own this
60
62
  // We are memoizing the creation of this string
61
63
 
62
64
 
@@ -72,7 +74,8 @@ export var Input = /*#__PURE__*/forwardRef(function (props, ref) {
72
74
  style: {
73
75
  '--range-inline-width': "".concat(valuePercent, "%")
74
76
  },
75
- ref: ref,
77
+ ref: ref // eslint-disable-next-line @repo/internal/react/consistent-css-prop-usage
78
+ ,
76
79
  css: styles
77
80
  }));
78
81
  });
package/dist/esm/theme.js CHANGED
@@ -2,32 +2,28 @@ import * as colors from '@atlaskit/theme/colors';
2
2
  import { createTheme } from '@atlaskit/theme/components';
3
3
  export var thumb = {
4
4
  default: {
5
- background: colors.N0,
6
- // This border color is not being used - awaiting focus state lift to props
7
- border: colors.N800
5
+ background: "var(--ds-background-card, ".concat(colors.N0, ")")
8
6
  },
9
7
  disabled: {
10
- boxShadow: colors.N60A
8
+ boxShadow: "var(--ds-card, ".concat("0 0 1px ".concat(colors.N60A), ")")
11
9
  },
12
10
  focus: {
13
- // This border color is not being used - awaiting focus state lift to props
14
- background: colors.N0,
15
- border: colors.B200
11
+ background: "var(--ds-background-boldNeutral-resting, ".concat(colors.N0, ")"),
12
+ border: "var(--ds-border-focus, ".concat(colors.B200, ")")
16
13
  }
17
14
  };
18
15
  export var track = {
19
- background: colors.N30A,
20
16
  default: {
21
- lower: colors.B400,
22
- upper: colors.N30
17
+ lower: "var(--ds-background-boldBrand-resting, ".concat(colors.B400, ")"),
18
+ upper: "var(--ds-background-subtleNeutral-resting, ".concat(colors.N30, ")")
23
19
  },
24
20
  disabled: {
25
- lower: colors.N50,
26
- upper: colors.N30
21
+ lower: "var(--ds-text-disabled, ".concat(colors.N50, ")"),
22
+ upper: "var(--ds-background-disabled, ".concat(colors.N30, ")")
27
23
  },
28
24
  hover: {
29
- lower: colors.B300,
30
- upper: colors.N40
25
+ lower: "var(--ds-background-boldBrand-hover, ".concat(colors.B300, ")"),
26
+ upper: "var(--ds-background-subtleNeutral-hover, ".concat(colors.N40, ")")
31
27
  }
32
28
  };
33
29
  export var Theme = createTheme(function () {
@@ -1,5 +1,5 @@
1
1
  {
2
2
  "name": "@atlaskit/range",
3
- "version": "5.0.11",
3
+ "version": "5.1.3",
4
4
  "sideEffects": false
5
5
  }
@@ -1,7 +1,7 @@
1
1
  /// <reference types="react" />
2
2
  export interface ThemeTokensThumb {
3
3
  background: string;
4
- border: string;
4
+ border?: string;
5
5
  }
6
6
  export interface ThemeTokensTrack {
7
7
  lower: string;
@@ -16,7 +16,6 @@ export interface ThemeTokens {
16
16
  focus: ThemeTokensThumb;
17
17
  };
18
18
  track: {
19
- background: string;
20
19
  default: ThemeTokensTrack;
21
20
  disabled: ThemeTokensTrack;
22
21
  hover: ThemeTokensTrack;
@@ -24,30 +23,28 @@ export interface ThemeTokens {
24
23
  }
25
24
  export declare const thumb: {
26
25
  default: {
27
- background: string;
28
- border: string;
26
+ background: "var(--ds-background-card)";
29
27
  };
30
28
  disabled: {
31
- boxShadow: string;
29
+ boxShadow: "var(--ds-card)";
32
30
  };
33
31
  focus: {
34
- background: string;
35
- border: string;
32
+ background: "var(--ds-background-boldNeutral-resting)";
33
+ border: "var(--ds-border-focus)";
36
34
  };
37
35
  };
38
36
  export declare const track: {
39
- background: string;
40
37
  default: {
41
- lower: string;
42
- upper: string;
38
+ lower: "var(--ds-background-boldBrand-resting)";
39
+ upper: "var(--ds-background-subtleNeutral-resting)";
43
40
  };
44
41
  disabled: {
45
- lower: string;
46
- upper: string;
42
+ lower: "var(--ds-text-disabled)";
43
+ upper: "var(--ds-background-disabled)";
47
44
  };
48
45
  hover: {
49
- lower: string;
50
- upper: string;
46
+ lower: "var(--ds-background-boldBrand-hover)";
47
+ upper: "var(--ds-background-subtleNeutral-hover)";
51
48
  };
52
49
  };
53
50
  export declare const Theme: {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/range",
3
- "version": "5.0.11",
3
+ "version": "5.1.3",
4
4
  "description": "A range lets users choose an approximate value on a slider.",
5
5
  "publishConfig": {
6
6
  "registry": "https://registry.npmjs.org/"
@@ -18,14 +18,14 @@
18
18
  "atlassian": {
19
19
  "team": "Design System Team",
20
20
  "deprecatedAutoEntryPoints": true,
21
- "inPublicMirror": true,
22
21
  "releaseModel": "scheduled",
23
22
  "website": {
24
23
  "name": "Range"
25
24
  }
26
25
  },
27
26
  "dependencies": {
28
- "@atlaskit/theme": "^12.0.0",
27
+ "@atlaskit/theme": "^12.1.0",
28
+ "@atlaskit/tokens": "^0.5.0",
29
29
  "@babel/runtime": "^7.0.0",
30
30
  "@emotion/core": "^10.0.9"
31
31
  },
@@ -33,7 +33,6 @@
33
33
  "react": "^16.8.0"
34
34
  },
35
35
  "devDependencies": {
36
- "@atlaskit/build-utils": "*",
37
36
  "@atlaskit/button": "^16.0.0",
38
37
  "@atlaskit/checkbox": "^12.0.0",
39
38
  "@atlaskit/docs": "*",
@@ -47,7 +46,7 @@
47
46
  "@testing-library/react": "^8.0.1",
48
47
  "@types/jscodeshift": "^0.11.0",
49
48
  "jscodeshift": "^0.13.0",
50
- "lodash": "^4.17.15",
49
+ "lodash": "^4.17.21",
51
50
  "react-dom": "^16.8.0",
52
51
  "storybook-addon-performance": "^0.16.0",
53
52
  "typescript": "3.9.6"
@@ -62,17 +61,12 @@
62
61
  "import-structure": "atlassian-conventions"
63
62
  },
64
63
  "@repo/internal": {
65
- "ui-components": [
66
- "lite-mode"
67
- ],
68
- "analytics": [
69
- "analytics-next"
70
- ],
71
- "theming": [
72
- "new-theming-api"
73
- ],
74
- "deprecation": [
75
- "no-deprecated-imports"
64
+ "ui-components": "lite-mode",
65
+ "analytics": "analytics-next",
66
+ "theming": "tokens",
67
+ "deprecation": "no-deprecated-imports",
68
+ "styling": [
69
+ "emotion"
76
70
  ]
77
71
  }
78
72
  },