@atlaskit/reactions 22.0.3 → 22.1.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 (38) hide show
  1. package/CHANGELOG.md +12 -0
  2. package/dist/cjs/components/Counter/styles.js +2 -4
  3. package/dist/cjs/components/FlashAnimation/styles.js +6 -8
  4. package/dist/cjs/components/Reaction/styles.js +8 -10
  5. package/dist/cjs/components/ReactionDialog/styles.js +5 -7
  6. package/dist/cjs/components/ReactionPicker/styles.js +3 -6
  7. package/dist/cjs/components/ReactionTooltip/styles.js +4 -6
  8. package/dist/cjs/components/Reactions/Reactions.js +6 -5
  9. package/dist/cjs/components/Reactions/styles.js +8 -7
  10. package/dist/cjs/components/ShowMore/styles.js +2 -4
  11. package/dist/cjs/components/Trigger/styles.js +12 -9
  12. package/dist/cjs/version.json +1 -1
  13. package/dist/es2019/components/Counter/styles.js +2 -3
  14. package/dist/es2019/components/FlashAnimation/styles.js +6 -7
  15. package/dist/es2019/components/Reaction/styles.js +9 -10
  16. package/dist/es2019/components/ReactionDialog/styles.js +5 -6
  17. package/dist/es2019/components/ReactionPicker/styles.js +3 -5
  18. package/dist/es2019/components/ReactionTooltip/styles.js +4 -5
  19. package/dist/es2019/components/Reactions/Reactions.js +5 -5
  20. package/dist/es2019/components/Reactions/styles.js +6 -5
  21. package/dist/es2019/components/ShowMore/styles.js +2 -3
  22. package/dist/es2019/components/Trigger/styles.js +11 -8
  23. package/dist/es2019/version.json +1 -1
  24. package/dist/esm/components/Counter/styles.js +2 -3
  25. package/dist/esm/components/FlashAnimation/styles.js +6 -7
  26. package/dist/esm/components/Reaction/styles.js +9 -10
  27. package/dist/esm/components/ReactionDialog/styles.js +5 -6
  28. package/dist/esm/components/ReactionPicker/styles.js +3 -5
  29. package/dist/esm/components/ReactionTooltip/styles.js +4 -5
  30. package/dist/esm/components/Reactions/Reactions.js +6 -5
  31. package/dist/esm/components/Reactions/styles.js +6 -5
  32. package/dist/esm/components/ShowMore/styles.js +2 -3
  33. package/dist/esm/components/Trigger/styles.js +11 -8
  34. package/dist/esm/version.json +1 -1
  35. package/dist/types/components/Reactions/Reactions.d.ts +1 -1
  36. package/dist/types/components/Reactions/styles.d.ts +1 -1
  37. package/dist/types/containers/ConnectedReactionsView/ConnectedReactionsView.d.ts +1 -1
  38. package/package.json +1 -1
package/CHANGELOG.md CHANGED
@@ -1,5 +1,17 @@
1
1
  # @atlaskit/reactions
2
2
 
3
+ ## 22.1.0
4
+
5
+ ### Minor Changes
6
+
7
+ - [`14258b03842`](https://bitbucket.org/atlassian/atlassian-frontend/commits/14258b03842) - make reaction buttons more compact, and introduce miniMode for add reaction button
8
+
9
+ ## 22.0.4
10
+
11
+ ### Patch Changes
12
+
13
+ - [`6455cf006b3`](https://bitbucket.org/atlassian/atlassian-frontend/commits/6455cf006b3) - Builds for this package now pass through a tokens babel plugin, removing runtime invocations of the tokens() function and improving performance.
14
+
3
15
  ## 22.0.3
4
16
 
5
17
  ### Patch Changes
@@ -9,12 +9,10 @@ var _react = require("@emotion/react");
9
9
 
10
10
  var _colors = require("@atlaskit/theme/colors");
11
11
 
12
- var _tokens = require("@atlaskit/tokens");
13
-
14
12
  /** @jsx jsx */
15
13
  var countStyle = (0, _react.css)({
16
14
  fontSize: 11,
17
- color: (0, _tokens.token)('color.text.subtlest', _colors.N90),
15
+ color: "var(--ds-text-subtlest, ".concat(_colors.N90, ")"),
18
16
  overflow: 'hidden',
19
17
  position: 'relative',
20
18
  padding: '4px 8px 4px 0',
@@ -22,7 +20,7 @@ var countStyle = (0, _react.css)({
22
20
  });
23
21
  exports.countStyle = countStyle;
24
22
  var highlightStyle = (0, _react.css)({
25
- color: (0, _tokens.token)('color.text.selected', _colors.B400),
23
+ color: "var(--ds-text-selected, ".concat(_colors.B400, ")"),
26
24
  fontWeight: 600
27
25
  });
28
26
  exports.highlightStyle = highlightStyle;
@@ -9,8 +9,6 @@ var _react = require("@emotion/react");
9
9
 
10
10
  var _colors = require("@atlaskit/theme/colors");
11
11
 
12
- var _tokens = require("@atlaskit/tokens");
13
-
14
12
  /** @jsx jsx */
15
13
  var flashTime = 700;
16
14
  var flashAnimation = (0, _react.keyframes)({
@@ -18,16 +16,16 @@ var flashAnimation = (0, _react.keyframes)({
18
16
  backgroundColor: 'transparent'
19
17
  },
20
18
  '20%': {
21
- backgroundColor: (0, _tokens.token)('color.background.selected.pressed', _colors.B75),
22
- borderColor: (0, _tokens.token)('color.border.selected', _colors.B300)
19
+ backgroundColor: "var(--ds-background-selected-pressed, ".concat(_colors.B75, ")"),
20
+ borderColor: "var(--ds-border-selected, ".concat(_colors.B300, ")")
23
21
  },
24
22
  '75%': {
25
- backgroundColor: (0, _tokens.token)('color.background.selected.pressed', _colors.B75),
26
- borderColor: (0, _tokens.token)('color.border.selected', _colors.B300)
23
+ backgroundColor: "var(--ds-background-selected-pressed, ".concat(_colors.B75, ")"),
24
+ borderColor: "var(--ds-border-selected, ".concat(_colors.B300, ")")
27
25
  },
28
26
  '100%': {
29
- backgroundColor: (0, _tokens.token)('color.background.selected.pressed', _colors.B75),
30
- borderColor: (0, _tokens.token)('color.border.selected', _colors.B300)
27
+ backgroundColor: "var(--ds-background-selected-pressed, ".concat(_colors.B75, ")"),
28
+ borderColor: "var(--ds-border-selected, ".concat(_colors.B300, ")")
31
29
  }
32
30
  });
33
31
  exports.flashAnimation = flashAnimation;
@@ -9,8 +9,6 @@ var _react = require("@emotion/react");
9
9
 
10
10
  var _colors = require("@atlaskit/theme/colors");
11
11
 
12
- var _tokens = require("@atlaskit/tokens");
13
-
14
12
  /** @jsx jsx */
15
13
 
16
14
  /**
@@ -36,19 +34,19 @@ var reactionStyle = (0, _react.css)({
36
34
  minWidth: '36px',
37
35
  height: "".concat(akHeight, "px"),
38
36
  background: 'transparent',
39
- border: "1px solid ".concat((0, _tokens.token)('color.border', _colors.N40)),
37
+ border: "1px solid ".concat("var(--ds-border, ".concat(_colors.N40, ")")),
40
38
  boxSizing: 'border-box',
41
39
  borderRadius: '20px',
42
- color: "".concat((0, _tokens.token)('color.text.subtle', _colors.N400)),
40
+ color: "".concat("var(--ds-text-subtle, ".concat(_colors.N400, ")")),
43
41
  cursor: 'pointer',
44
- margin: 0,
42
+ margin: '4px 4px 0 0',
45
43
  padding: 0,
46
44
  transition: '200ms ease-in-out',
47
45
  '&:hover': {
48
- background: "".concat((0, _tokens.token)('color.background.neutral.subtle.hovered', _colors.N20))
46
+ background: "".concat("var(--ds-background-neutral-subtle-hovered, ".concat(_colors.N20, ")"))
49
47
  },
50
48
  '&:focus': {
51
- boxShadow: "0 0 0 2px ".concat((0, _tokens.token)('color.border.focused', _colors.B100)),
49
+ boxShadow: "0 0 0 2px ".concat("var(--ds-border-focused, ".concat(_colors.B100, ")")),
52
50
  // background, box-shadow
53
51
  transitionDuration: '0s, 0.2s',
54
52
  // disabling browser focus outline
@@ -57,10 +55,10 @@ var reactionStyle = (0, _react.css)({
57
55
  });
58
56
  exports.reactionStyle = reactionStyle;
59
57
  var reactedStyle = (0, _react.css)({
60
- backgroundColor: (0, _tokens.token)('color.background.selected', _colors.B50),
61
- borderColor: (0, _tokens.token)('color.border.selected', _colors.B300),
58
+ backgroundColor: "var(--ds-background-selected, ".concat(_colors.B50, ")"),
59
+ borderColor: "var(--ds-border-selected, ".concat(_colors.B300, ")"),
62
60
  '&:hover': {
63
- background: "".concat((0, _tokens.token)('color.background.selected.hovered', _colors.B75))
61
+ background: "".concat("var(--ds-background-selected-hovered, ".concat(_colors.B75, ")"))
64
62
  }
65
63
  });
66
64
  exports.reactedStyle = reactedStyle;
@@ -9,8 +9,6 @@ var _react = require("@emotion/react");
9
9
 
10
10
  var _colors = require("@atlaskit/theme/colors");
11
11
 
12
- var _tokens = require("@atlaskit/tokens");
13
-
14
12
  var _shared = require("../../shared");
15
13
 
16
14
  /** @jsx jsx */
@@ -48,7 +46,7 @@ exports.containerStyle = containerStyle;
48
46
  var titleStyle = (0, _react.css)({
49
47
  '& > h1': {
50
48
  fontSize: '24px!important',
51
- color: "".concat((0, _tokens.token)('color.text', _colors.N800))
49
+ color: "".concat("var(--ds-text, ".concat(_colors.N800, ")"))
52
50
  }
53
51
  });
54
52
  exports.titleStyle = titleStyle;
@@ -70,7 +68,7 @@ var counterStyle = function counterStyle(isSelected) {
70
68
  width: '100%',
71
69
  padding: '0px!important',
72
70
  //Counter component has its own styles overriding them to match designs
73
- color: isSelected ? "".concat((0, _tokens.token)('color.text', _colors.B400), "!important") : "2px solid ".concat((0, _tokens.token)('color.text', _colors.N500), "!important")
71
+ color: isSelected ? "".concat("var(--ds-text, ".concat(_colors.B400, ")"), "!important") : "2px solid ".concat("var(--ds-text, ".concat(_colors.N500, ")"), "!important")
74
72
  }
75
73
  });
76
74
  };
@@ -118,7 +116,7 @@ var customTabWrapper = function customTabWrapper(isSelected, selectedEmojiId, th
118
116
  '&.disabled + &.disabled:after': fadedCss('leftEdge', theme),
119
117
  '&:after': isSelected ? {
120
118
  content: '""',
121
- borderBottom: "2px solid ".concat((0, _tokens.token)('color.text', _colors.B400)),
119
+ borderBottom: "2px solid ".concat("var(--ds-text, ".concat(_colors.B400, ")")),
122
120
  width: "".concat(REACTIONS_CONTAINER_WIDTH, "px"),
123
121
  bottom: '0px',
124
122
  display: 'block',
@@ -152,7 +150,7 @@ var reactionViewStyle = (0, _react.css)({
152
150
  flexDirection: 'column',
153
151
  p: {
154
152
  margin: 0,
155
- color: "".concat((0, _tokens.token)('color.text', _colors.N800)),
153
+ color: "".concat("var(--ds-text, ".concat(_colors.N800, ")")),
156
154
  textTransform: 'capitalize',
157
155
  fontWeight: 600,
158
156
  fontSize: 16,
@@ -169,7 +167,7 @@ var userListStyle = (0, _react.css)({
169
167
  padding: 0,
170
168
  textAlign: 'left',
171
169
  li: {
172
- color: "".concat((0, _tokens.token)('color.text', _colors.N500)),
170
+ color: "".concat("var(--ds-text, ".concat(_colors.N500, ")")),
173
171
  fontSize: 14
174
172
  }
175
173
  });
@@ -11,14 +11,11 @@ var _constants = require("@atlaskit/theme/constants");
11
11
 
12
12
  var _colors = require("@atlaskit/theme/colors");
13
13
 
14
- var _tokens = require("@atlaskit/tokens");
15
-
16
14
  /** @jsx jsx */
17
15
  var pickerStyle = (0, _react.css)({
18
16
  verticalAlign: 'middle',
19
17
  '&.miniMode': {
20
- display: 'inline-block',
21
- marginRight: '4px'
18
+ display: 'inline-block'
22
19
  }
23
20
  });
24
21
  exports.pickerStyle = pickerStyle;
@@ -27,9 +24,9 @@ var contentStyle = (0, _react.css)({
27
24
  });
28
25
  exports.contentStyle = contentStyle;
29
26
  var popupStyle = (0, _react.css)({
30
- background: (0, _tokens.token)('elevation.surface.overlay', _colors.N0),
27
+ background: "var(--ds-surface-overlay, ".concat(_colors.N0, ")"),
31
28
  borderRadius: "".concat((0, _constants.borderRadius)(), "px"),
32
- boxShadow: (0, _tokens.token)('elevation.shadow.overlay', "0 4px 8px -2px ".concat(_colors.N50A, ", 0 0 1px ").concat(_colors.N60A)),
29
+ boxShadow: "var(--ds-shadow-overlay, ".concat("0 4px 8px -2px ".concat(_colors.N50A, ", 0 0 1px ").concat(_colors.N60A), ")"),
33
30
  '&> div': {
34
31
  boxShadow: undefined,
35
32
  marginTop: '4px',
@@ -7,8 +7,6 @@ exports.verticalMargin = exports.underlineStyle = exports.tooltipStyle = exports
7
7
 
8
8
  var _react = require("@emotion/react");
9
9
 
10
- var _tokens = require("@atlaskit/tokens");
11
-
12
10
  var _colors = require("@atlaskit/theme/colors");
13
11
 
14
12
  /** @jsx jsx */
@@ -35,12 +33,12 @@ var tooltipStyle = (0, _react.css)({
35
33
  exports.tooltipStyle = tooltipStyle;
36
34
  var emojiNameStyle = (0, _react.css)({
37
35
  textTransform: 'capitalize',
38
- color: (0, _tokens.token)('color.text.inverse', _colors.N90),
36
+ color: "var(--ds-text-inverse, ".concat(_colors.N90, ")"),
39
37
  fontWeight: 600
40
38
  });
41
39
  exports.emojiNameStyle = emojiNameStyle;
42
40
  var footerStyle = (0, _react.css)({
43
- color: (0, _tokens.token)('color.text.inverse', _colors.N90),
41
+ color: "var(--ds-text-inverse, ".concat(_colors.N90, ")"),
44
42
  fontWeight: 300
45
43
  });
46
44
  exports.footerStyle = footerStyle;
@@ -48,8 +46,8 @@ var underlineStyle = (0, _react.css)({
48
46
  cursor: 'pointer',
49
47
  textDecoration: 'underline',
50
48
  ':hover': {
51
- backgroundColor: (0, _tokens.token)('color.background.neutral.bold', _colors.N800),
52
- color: (0, _tokens.token)('color.text.inverse', _colors.N0)
49
+ backgroundColor: "var(--ds-background-neutral-bold, ".concat(_colors.N800, ")"),
50
+ color: "var(--ds-text-inverse, ".concat(_colors.N0, ")")
53
51
  }
54
52
  });
55
53
  exports.underlineStyle = underlineStyle;
@@ -131,7 +131,9 @@ var Reactions = /*#__PURE__*/_react.default.memo(function (_ref) {
131
131
  _ref$onDialogSelectRe = _ref.onDialogSelectReactionCallback,
132
132
  onDialogSelectReactionCallback = _ref$onDialogSelectRe === void 0 ? function () {} : _ref$onDialogSelectRe,
133
133
  _ref$emojiPickerSize = _ref.emojiPickerSize,
134
- emojiPickerSize = _ref$emojiPickerSize === void 0 ? 'medium' : _ref$emojiPickerSize;
134
+ emojiPickerSize = _ref$emojiPickerSize === void 0 ? 'medium' : _ref$emojiPickerSize,
135
+ _ref$miniMode = _ref.miniMode,
136
+ miniMode = _ref$miniMode === void 0 ? false : _ref$miniMode;
135
137
 
136
138
  var _useState = (0, _react.useState)(),
137
139
  _useState2 = (0, _slicedToArray2.default)(_useState, 2),
@@ -297,7 +299,6 @@ var Reactions = /*#__PURE__*/_react.default.memo(function (_ref) {
297
299
  }, memorizedReactions.map(function (reaction) {
298
300
  return (0, _react2.jsx)(_Reaction.Reaction, {
299
301
  key: reaction.emojiId,
300
- css: styles.reactionStyle,
301
302
  reaction: reaction,
302
303
  emojiProvider: emojiProvider,
303
304
  onClick: onReactionClick,
@@ -308,9 +309,8 @@ var Reactions = /*#__PURE__*/_react.default.memo(function (_ref) {
308
309
  allowUserDialog: allowUserDialog
309
310
  });
310
311
  }), (0, _react2.jsx)(_ReactionPicker.ReactionPicker, {
311
- css: styles.reactionStyle,
312
+ css: styles.reactionPickerStyle,
312
313
  emojiProvider: emojiProvider,
313
- miniMode: true,
314
314
  allowAllEmojis: allowAllEmojis,
315
315
  pickerQuickReactionEmojiIds: pickerQuickReactionEmojiIds,
316
316
  disabled: status !== _types.ReactionStatus.ready,
@@ -319,7 +319,8 @@ var Reactions = /*#__PURE__*/_react.default.memo(function (_ref) {
319
319
  onCancel: handleOnCancel,
320
320
  onShowMore: handleOnMore,
321
321
  tooltipContent: getTooltip(status, errorMessage),
322
- emojiPickerSize: emojiPickerSize
322
+ emojiPickerSize: emojiPickerSize,
323
+ miniMode: miniMode
323
324
  }), allowUserDialog && reactions.length > 0 && (0, _react2.jsx)(_tooltip.default, {
324
325
  content: (0, _react2.jsx)(_reactIntlNext.FormattedMessage, _shared.i18n.messages.seeWhoReactedTooltip),
325
326
  hideTooltipOnClick: true
@@ -3,22 +3,23 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
- exports.wrapperStyle = exports.seeWhoReacted = exports.reactionStyle = void 0;
6
+ exports.wrapperStyle = exports.seeWhoReacted = exports.reactionPickerStyle = void 0;
7
7
 
8
8
  var _react = require("@emotion/react");
9
9
 
10
10
  /** @jsx jsx */
11
- var reactionStyle = (0, _react.css)({
11
+ var reactionPickerStyle = (0, _react.css)({
12
12
  display: 'inline-block',
13
- margin: '4px'
13
+ marginTop: '4px'
14
14
  });
15
- exports.reactionStyle = reactionStyle;
15
+ exports.reactionPickerStyle = reactionPickerStyle;
16
16
  var seeWhoReacted = (0, _react.css)({
17
17
  height: '24px',
18
18
  lineHeight: '24px',
19
- paddingLeft: '4px',
20
- paddingRight: '4px',
21
- margin: '4px'
19
+ paddingLeft: 0,
20
+ paddingRight: 0,
21
+ marginTop: '4px',
22
+ marginLeft: '4px'
22
23
  });
23
24
  exports.seeWhoReacted = seeWhoReacted;
24
25
  var wrapperStyle = (0, _react.css)({
@@ -11,8 +11,6 @@ var _constants = require("@atlaskit/theme/constants");
11
11
 
12
12
  var _colors = require("@atlaskit/theme/colors");
13
13
 
14
- var _tokens = require("@atlaskit/tokens");
15
-
16
14
  /** @jsx jsx */
17
15
  var moreEmojiContainerStyle = (0, _react.css)({
18
16
  display: 'flex'
@@ -30,12 +28,12 @@ var moreButtonStyle = (0, _react.css)({
30
28
  width: '38px',
31
29
  verticalAlign: 'top',
32
30
  '&:hover': {
33
- backgroundColor: (0, _tokens.token)('color.background.neutral.subtle.hovered', _colors.N30A)
31
+ backgroundColor: "var(--ds-background-neutral-subtle-hovered, ".concat(_colors.N30A, ")")
34
32
  }
35
33
  });
36
34
  exports.moreButtonStyle = moreButtonStyle;
37
35
  var separatorStyle = (0, _react.css)({
38
- backgroundColor: (0, _tokens.token)('color.border', _colors.N30A),
36
+ backgroundColor: "var(--ds-border, ".concat(_colors.N30A, ")"),
39
37
  margin: '8px 8px 8px 4px',
40
38
  width: '1px',
41
39
  height: '60%',
@@ -11,15 +11,15 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
11
11
 
12
12
  var _react = require("@emotion/react");
13
13
 
14
- var _tokens = require("@atlaskit/tokens");
15
-
16
14
  var _colors = require("@atlaskit/theme/colors");
17
15
 
16
+ var _constants = require("@atlaskit/theme/constants");
17
+
18
18
  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; }
19
19
 
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
- var DISABLED_BUTTON_COLOR = "".concat((0, _tokens.token)('color.text.disabled', _colors.N70), " !important");
22
+ var DISABLED_BUTTON_COLOR = "".concat("var(--ds-text-disabled, ".concat(_colors.N70, ")"), " !important");
23
23
  exports.DISABLED_BUTTON_COLOR = DISABLED_BUTTON_COLOR;
24
24
 
25
25
  var triggerStyle = function triggerStyle(_ref) {
@@ -29,22 +29,25 @@ var triggerStyle = function triggerStyle(_ref) {
29
29
  disabled = _ref$disabled === void 0 ? false : _ref$disabled;
30
30
  return (0, _react.css)(_objectSpread(_objectSpread(_objectSpread({
31
31
  minWidth: '32px',
32
- height: '32px',
32
+ height: '24px',
33
+ padding: 0,
34
+ border: "1px solid ".concat("var(--ds-border, ".concat(_colors.N40, ")")),
35
+ borderRadius: '20px',
33
36
  display: 'flex',
34
37
  justifyContent: 'center',
35
38
  alignItems: 'center',
36
39
  lineHeight: '16px'
37
40
  }, miniMode && {
38
- height: '24px',
39
- padding: 0,
40
- border: "1px solid ".concat((0, _tokens.token)('color.border', _colors.N40)),
41
- borderRadius: '20px'
41
+ minWidth: '24px',
42
+ padding: '4px',
43
+ border: 'none',
44
+ borderRadius: "".concat((0, _constants.borderRadius)(), "px")
42
45
  }), disabled && {
43
46
  color: DISABLED_BUTTON_COLOR,
44
47
  cursor: 'not-allowed'
45
48
  }), {}, {
46
49
  '&:hover': {
47
- background: "".concat((0, _tokens.token)('color.background.neutral.subtle.hovered', _colors.N20))
50
+ background: "".concat("var(--ds-background-neutral-subtle-hovered, ".concat(_colors.N20, ")"))
48
51
  }
49
52
  }));
50
53
  };
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "name": "@atlaskit/reactions",
3
- "version": "22.0.3"
3
+ "version": "22.1.0"
4
4
  }
@@ -1,17 +1,16 @@
1
1
  /** @jsx jsx */
2
2
  import { css } from '@emotion/react';
3
3
  import { N90, B400 } from '@atlaskit/theme/colors';
4
- import { token } from '@atlaskit/tokens';
5
4
  export const countStyle = css({
6
5
  fontSize: 11,
7
- color: token('color.text.subtlest', N90),
6
+ color: `var(--ds-text-subtlest, ${N90})`,
8
7
  overflow: 'hidden',
9
8
  position: 'relative',
10
9
  padding: '4px 8px 4px 0',
11
10
  lineHeight: '14px'
12
11
  });
13
12
  export const highlightStyle = css({
14
- color: token('color.text.selected', B400),
13
+ color: `var(--ds-text-selected, ${B400})`,
15
14
  fontWeight: 600
16
15
  });
17
16
  export const containerStyle = css({
@@ -1,23 +1,22 @@
1
1
  /** @jsx jsx */
2
2
  import { css, keyframes } from '@emotion/react';
3
3
  import { B75, B300 } from '@atlaskit/theme/colors';
4
- import { token } from '@atlaskit/tokens';
5
4
  const flashTime = 700;
6
5
  export const flashAnimation = keyframes({
7
6
  '0%': {
8
7
  backgroundColor: 'transparent'
9
8
  },
10
9
  '20%': {
11
- backgroundColor: token('color.background.selected.pressed', B75),
12
- borderColor: token('color.border.selected', B300)
10
+ backgroundColor: `var(--ds-background-selected-pressed, ${B75})`,
11
+ borderColor: `var(--ds-border-selected, ${B300})`
13
12
  },
14
13
  '75%': {
15
- backgroundColor: token('color.background.selected.pressed', B75),
16
- borderColor: token('color.border.selected', B300)
14
+ backgroundColor: `var(--ds-background-selected-pressed, ${B75})`,
15
+ borderColor: `var(--ds-border-selected, ${B300})`
17
16
  },
18
17
  '100%': {
19
- backgroundColor: token('color.background.selected.pressed', B75),
20
- borderColor: token('color.border.selected', B300)
18
+ backgroundColor: `var(--ds-background-selected-pressed, ${B75})`,
19
+ borderColor: `var(--ds-border-selected, ${B300})`
21
20
  }
22
21
  });
23
22
  export const containerStyle = css({
@@ -1,11 +1,10 @@
1
1
  /** @jsx jsx */
2
2
  import { css } from '@emotion/react';
3
3
  import { B50, B75, B300, N20, N40, N400, B100 } from '@atlaskit/theme/colors';
4
- import { token } from '@atlaskit/tokens';
4
+
5
5
  /**
6
6
  * Default styling px height for an emoji reaction
7
7
  */
8
-
9
8
  const akHeight = 24;
10
9
  /**
11
10
  * Styling Note:
@@ -25,19 +24,19 @@ export const reactionStyle = css({
25
24
  minWidth: '36px',
26
25
  height: `${akHeight}px`,
27
26
  background: 'transparent',
28
- border: `1px solid ${token('color.border', N40)}`,
27
+ border: `1px solid ${`var(--ds-border, ${N40})`}`,
29
28
  boxSizing: 'border-box',
30
29
  borderRadius: '20px',
31
- color: `${token('color.text.subtle', N400)}`,
30
+ color: `${`var(--ds-text-subtle, ${N400})`}`,
32
31
  cursor: 'pointer',
33
- margin: 0,
32
+ margin: '4px 4px 0 0',
34
33
  padding: 0,
35
34
  transition: '200ms ease-in-out',
36
35
  '&:hover': {
37
- background: `${token('color.background.neutral.subtle.hovered', N20)}`
36
+ background: `${`var(--ds-background-neutral-subtle-hovered, ${N20})`}`
38
37
  },
39
38
  '&:focus': {
40
- boxShadow: `0 0 0 2px ${token('color.border.focused', B100)}`,
39
+ boxShadow: `0 0 0 2px ${`var(--ds-border-focused, ${B100})`}`,
41
40
  // background, box-shadow
42
41
  transitionDuration: '0s, 0.2s',
43
42
  // disabling browser focus outline
@@ -45,10 +44,10 @@ export const reactionStyle = css({
45
44
  }
46
45
  });
47
46
  export const reactedStyle = css({
48
- backgroundColor: token('color.background.selected', B50),
49
- borderColor: token('color.border.selected', B300),
47
+ backgroundColor: `var(--ds-background-selected, ${B50})`,
48
+ borderColor: `var(--ds-border-selected, ${B300})`,
50
49
  '&:hover': {
51
- background: `${token('color.background.selected.hovered', B75)}`
50
+ background: `${`var(--ds-background-selected-hovered, ${B75})`}`
52
51
  }
53
52
  });
54
53
  export const flashHeight = akHeight - 2; // height without the 1px border
@@ -1,7 +1,6 @@
1
1
  /** @jsx jsx */
2
2
  import { css } from '@emotion/react';
3
3
  import { B400, N500, N800 } from '@atlaskit/theme/colors';
4
- import { token } from '@atlaskit/tokens';
5
4
  import { constants } from '../../shared';
6
5
  const REACTIONS_CONTAINER_WIDTH = 48;
7
6
  const REACTION_RIGHT_MARGIN = 8;
@@ -33,7 +32,7 @@ export const containerStyle = reactionsBorderWidth => css({
33
32
  export const titleStyle = css({
34
33
  '& > h1': {
35
34
  fontSize: '24px!important',
36
- color: `${token('color.text', N800)}`
35
+ color: `${`var(--ds-text, ${N800})`}`
37
36
  }
38
37
  });
39
38
  const containerEdgeAngle = {
@@ -52,7 +51,7 @@ export const counterStyle = isSelected => css({
52
51
  width: '100%',
53
52
  padding: '0px!important',
54
53
  //Counter component has its own styles overriding them to match designs
55
- color: isSelected ? `${token('color.text', B400)}!important` : `2px solid ${token('color.text', N500)}!important`
54
+ color: isSelected ? `${`var(--ds-text, ${B400})`}!important` : `2px solid ${`var(--ds-text, ${N500})`}!important`
56
55
  }
57
56
  });
58
57
 
@@ -94,7 +93,7 @@ export const customTabWrapper = (isSelected, selectedEmojiId, theme) => css({
94
93
  '&.disabled + &.disabled:after': fadedCss('leftEdge', theme),
95
94
  '&:after': isSelected ? {
96
95
  content: '""',
97
- borderBottom: `2px solid ${token('color.text', B400)}`,
96
+ borderBottom: `2px solid ${`var(--ds-text, ${B400})`}`,
98
97
  width: `${REACTIONS_CONTAINER_WIDTH}px`,
99
98
  bottom: '0px',
100
99
  display: 'block',
@@ -124,7 +123,7 @@ export const reactionViewStyle = css({
124
123
  flexDirection: 'column',
125
124
  p: {
126
125
  margin: 0,
127
- color: `${token('color.text', N800)}`,
126
+ color: `${`var(--ds-text, ${N800})`}`,
128
127
  textTransform: 'capitalize',
129
128
  fontWeight: 600,
130
129
  fontSize: 16,
@@ -140,7 +139,7 @@ export const userListStyle = css({
140
139
  padding: 0,
141
140
  textAlign: 'left',
142
141
  li: {
143
- color: `${token('color.text', N500)}`,
142
+ color: `${`var(--ds-text, ${N500})`}`,
144
143
  fontSize: 14
145
144
  }
146
145
  });
@@ -2,21 +2,19 @@
2
2
  import { css } from '@emotion/react';
3
3
  import { borderRadius } from '@atlaskit/theme/constants';
4
4
  import { N0, N50A, N60A } from '@atlaskit/theme/colors';
5
- import { token } from '@atlaskit/tokens';
6
5
  export const pickerStyle = css({
7
6
  verticalAlign: 'middle',
8
7
  '&.miniMode': {
9
- display: 'inline-block',
10
- marginRight: '4px'
8
+ display: 'inline-block'
11
9
  }
12
10
  });
13
11
  export const contentStyle = css({
14
12
  display: 'flex'
15
13
  });
16
14
  export const popupStyle = css({
17
- background: token('elevation.surface.overlay', N0),
15
+ background: `var(--ds-surface-overlay, ${N0})`,
18
16
  borderRadius: `${borderRadius()}px`,
19
- boxShadow: token('elevation.shadow.overlay', `0 4px 8px -2px ${N50A}, 0 0 1px ${N60A}`),
17
+ boxShadow: `var(--ds-shadow-overlay, ${`0 4px 8px -2px ${N50A}, 0 0 1px ${N60A}`})`,
20
18
  '&> div': {
21
19
  boxShadow: undefined,
22
20
  marginTop: '4px',
@@ -1,6 +1,5 @@
1
1
  /** @jsx jsx */
2
2
  import { css } from '@emotion/react';
3
- import { token } from '@atlaskit/tokens';
4
3
  import { N90, N800, N0 } from '@atlaskit/theme/colors';
5
4
  export const verticalMargin = 5;
6
5
  export const tooltipStyle = css({
@@ -23,18 +22,18 @@ export const tooltipStyle = css({
23
22
  });
24
23
  export const emojiNameStyle = css({
25
24
  textTransform: 'capitalize',
26
- color: token('color.text.inverse', N90),
25
+ color: `var(--ds-text-inverse, ${N90})`,
27
26
  fontWeight: 600
28
27
  });
29
28
  export const footerStyle = css({
30
- color: token('color.text.inverse', N90),
29
+ color: `var(--ds-text-inverse, ${N90})`,
31
30
  fontWeight: 300
32
31
  });
33
32
  export const underlineStyle = css({
34
33
  cursor: 'pointer',
35
34
  textDecoration: 'underline',
36
35
  ':hover': {
37
- backgroundColor: token('color.background.neutral.bold', N800),
38
- color: token('color.text.inverse', N0)
36
+ backgroundColor: `var(--ds-background-neutral-bold, ${N800})`,
37
+ color: `var(--ds-text-inverse, ${N0})`
39
38
  }
40
39
  });
@@ -86,7 +86,8 @@ export const Reactions = /*#__PURE__*/React.memo(({
86
86
  onDialogOpenCallback = () => {},
87
87
  onDialogCloseCallback = () => {},
88
88
  onDialogSelectReactionCallback = () => {},
89
- emojiPickerSize = 'medium'
89
+ emojiPickerSize = 'medium',
90
+ miniMode = false
90
91
  }) => {
91
92
  const [selectedEmojiId, setSelectedEmojiId] = useState();
92
93
  const {
@@ -239,7 +240,6 @@ export const Reactions = /*#__PURE__*/React.memo(({
239
240
  "data-testid": RENDER_REACTIONS_TESTID
240
241
  }, memorizedReactions.map(reaction => jsx(Reaction, {
241
242
  key: reaction.emojiId,
242
- css: styles.reactionStyle,
243
243
  reaction: reaction,
244
244
  emojiProvider: emojiProvider,
245
245
  onClick: onReactionClick,
@@ -249,9 +249,8 @@ export const Reactions = /*#__PURE__*/React.memo(({
249
249
  handleUserListClick: handleOpenReactionsDialog,
250
250
  allowUserDialog: allowUserDialog
251
251
  })), jsx(ReactionPicker, {
252
- css: styles.reactionStyle,
252
+ css: styles.reactionPickerStyle,
253
253
  emojiProvider: emojiProvider,
254
- miniMode: true,
255
254
  allowAllEmojis: allowAllEmojis,
256
255
  pickerQuickReactionEmojiIds: pickerQuickReactionEmojiIds,
257
256
  disabled: status !== ReactionStatus.ready,
@@ -260,7 +259,8 @@ export const Reactions = /*#__PURE__*/React.memo(({
260
259
  onCancel: handleOnCancel,
261
260
  onShowMore: handleOnMore,
262
261
  tooltipContent: getTooltip(status, errorMessage),
263
- emojiPickerSize: emojiPickerSize
262
+ emojiPickerSize: emojiPickerSize,
263
+ miniMode: miniMode
264
264
  }), allowUserDialog && reactions.length > 0 && jsx(Tooltip, {
265
265
  content: jsx(FormattedMessage, i18n.messages.seeWhoReactedTooltip),
266
266
  hideTooltipOnClick: true
@@ -1,15 +1,16 @@
1
1
  /** @jsx jsx */
2
2
  import { css } from '@emotion/react';
3
- export const reactionStyle = css({
3
+ export const reactionPickerStyle = css({
4
4
  display: 'inline-block',
5
- margin: '4px'
5
+ marginTop: '4px'
6
6
  });
7
7
  export const seeWhoReacted = css({
8
8
  height: '24px',
9
9
  lineHeight: '24px',
10
- paddingLeft: '4px',
11
- paddingRight: '4px',
12
- margin: '4px'
10
+ paddingLeft: 0,
11
+ paddingRight: 0,
12
+ marginTop: '4px',
13
+ marginLeft: '4px'
13
14
  });
14
15
  export const wrapperStyle = css({
15
16
  display: 'flex',
@@ -2,7 +2,6 @@
2
2
  import { css } from '@emotion/react';
3
3
  import { borderRadius } from '@atlaskit/theme/constants';
4
4
  import { N30A } from '@atlaskit/theme/colors';
5
- import { token } from '@atlaskit/tokens';
6
5
  export const moreEmojiContainerStyle = css({
7
6
  display: 'flex'
8
7
  });
@@ -18,11 +17,11 @@ export const moreButtonStyle = css({
18
17
  width: '38px',
19
18
  verticalAlign: 'top',
20
19
  '&:hover': {
21
- backgroundColor: token('color.background.neutral.subtle.hovered', N30A)
20
+ backgroundColor: `var(--ds-background-neutral-subtle-hovered, ${N30A})`
22
21
  }
23
22
  });
24
23
  export const separatorStyle = css({
25
- backgroundColor: token('color.border', N30A),
24
+ backgroundColor: `var(--ds-border, ${N30A})`,
26
25
  margin: '8px 8px 8px 4px',
27
26
  width: '1px',
28
27
  height: '60%',
@@ -1,29 +1,32 @@
1
1
  /** @jsx jsx */
2
2
  import { css } from '@emotion/react';
3
- import { token } from '@atlaskit/tokens';
4
3
  import { N70, N20, N40 } from '@atlaskit/theme/colors';
5
- export const DISABLED_BUTTON_COLOR = `${token('color.text.disabled', N70)} !important`;
4
+ import { borderRadius } from '@atlaskit/theme/constants';
5
+ export const DISABLED_BUTTON_COLOR = `${`var(--ds-text-disabled, ${N70})`} !important`;
6
6
  export const triggerStyle = ({
7
7
  miniMode = false,
8
8
  disabled = false
9
9
  }) => css({
10
10
  minWidth: '32px',
11
- height: '32px',
11
+ height: '24px',
12
+ padding: 0,
13
+ border: `1px solid ${`var(--ds-border, ${N40})`}`,
14
+ borderRadius: '20px',
12
15
  display: 'flex',
13
16
  justifyContent: 'center',
14
17
  alignItems: 'center',
15
18
  lineHeight: '16px',
16
19
  ...(miniMode && {
17
- height: '24px',
18
- padding: 0,
19
- border: `1px solid ${token('color.border', N40)}`,
20
- borderRadius: '20px'
20
+ minWidth: '24px',
21
+ padding: '4px',
22
+ border: 'none',
23
+ borderRadius: `${borderRadius()}px`
21
24
  }),
22
25
  ...(disabled && {
23
26
  color: DISABLED_BUTTON_COLOR,
24
27
  cursor: 'not-allowed'
25
28
  }),
26
29
  '&:hover': {
27
- background: `${token('color.background.neutral.subtle.hovered', N20)}`
30
+ background: `${`var(--ds-background-neutral-subtle-hovered, ${N20})`}`
28
31
  }
29
32
  });
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "name": "@atlaskit/reactions",
3
- "version": "22.0.3"
3
+ "version": "22.1.0"
4
4
  }
@@ -1,17 +1,16 @@
1
1
  /** @jsx jsx */
2
2
  import { css } from '@emotion/react';
3
3
  import { N90, B400 } from '@atlaskit/theme/colors';
4
- import { token } from '@atlaskit/tokens';
5
4
  export var countStyle = css({
6
5
  fontSize: 11,
7
- color: token('color.text.subtlest', N90),
6
+ color: "var(--ds-text-subtlest, ".concat(N90, ")"),
8
7
  overflow: 'hidden',
9
8
  position: 'relative',
10
9
  padding: '4px 8px 4px 0',
11
10
  lineHeight: '14px'
12
11
  });
13
12
  export var highlightStyle = css({
14
- color: token('color.text.selected', B400),
13
+ color: "var(--ds-text-selected, ".concat(B400, ")"),
15
14
  fontWeight: 600
16
15
  });
17
16
  export var containerStyle = css({
@@ -1,23 +1,22 @@
1
1
  /** @jsx jsx */
2
2
  import { css, keyframes } from '@emotion/react';
3
3
  import { B75, B300 } from '@atlaskit/theme/colors';
4
- import { token } from '@atlaskit/tokens';
5
4
  var flashTime = 700;
6
5
  export var flashAnimation = keyframes({
7
6
  '0%': {
8
7
  backgroundColor: 'transparent'
9
8
  },
10
9
  '20%': {
11
- backgroundColor: token('color.background.selected.pressed', B75),
12
- borderColor: token('color.border.selected', B300)
10
+ backgroundColor: "var(--ds-background-selected-pressed, ".concat(B75, ")"),
11
+ borderColor: "var(--ds-border-selected, ".concat(B300, ")")
13
12
  },
14
13
  '75%': {
15
- backgroundColor: token('color.background.selected.pressed', B75),
16
- borderColor: token('color.border.selected', B300)
14
+ backgroundColor: "var(--ds-background-selected-pressed, ".concat(B75, ")"),
15
+ borderColor: "var(--ds-border-selected, ".concat(B300, ")")
17
16
  },
18
17
  '100%': {
19
- backgroundColor: token('color.background.selected.pressed', B75),
20
- borderColor: token('color.border.selected', B300)
18
+ backgroundColor: "var(--ds-background-selected-pressed, ".concat(B75, ")"),
19
+ borderColor: "var(--ds-border-selected, ".concat(B300, ")")
21
20
  }
22
21
  });
23
22
  export var containerStyle = css({
@@ -1,11 +1,10 @@
1
1
  /** @jsx jsx */
2
2
  import { css } from '@emotion/react';
3
3
  import { B50, B75, B300, N20, N40, N400, B100 } from '@atlaskit/theme/colors';
4
- import { token } from '@atlaskit/tokens';
4
+
5
5
  /**
6
6
  * Default styling px height for an emoji reaction
7
7
  */
8
-
9
8
  var akHeight = 24;
10
9
  /**
11
10
  * Styling Note:
@@ -25,19 +24,19 @@ export var reactionStyle = css({
25
24
  minWidth: '36px',
26
25
  height: "".concat(akHeight, "px"),
27
26
  background: 'transparent',
28
- border: "1px solid ".concat(token('color.border', N40)),
27
+ border: "1px solid ".concat("var(--ds-border, ".concat(N40, ")")),
29
28
  boxSizing: 'border-box',
30
29
  borderRadius: '20px',
31
- color: "".concat(token('color.text.subtle', N400)),
30
+ color: "".concat("var(--ds-text-subtle, ".concat(N400, ")")),
32
31
  cursor: 'pointer',
33
- margin: 0,
32
+ margin: '4px 4px 0 0',
34
33
  padding: 0,
35
34
  transition: '200ms ease-in-out',
36
35
  '&:hover': {
37
- background: "".concat(token('color.background.neutral.subtle.hovered', N20))
36
+ background: "".concat("var(--ds-background-neutral-subtle-hovered, ".concat(N20, ")"))
38
37
  },
39
38
  '&:focus': {
40
- boxShadow: "0 0 0 2px ".concat(token('color.border.focused', B100)),
39
+ boxShadow: "0 0 0 2px ".concat("var(--ds-border-focused, ".concat(B100, ")")),
41
40
  // background, box-shadow
42
41
  transitionDuration: '0s, 0.2s',
43
42
  // disabling browser focus outline
@@ -45,10 +44,10 @@ export var reactionStyle = css({
45
44
  }
46
45
  });
47
46
  export var reactedStyle = css({
48
- backgroundColor: token('color.background.selected', B50),
49
- borderColor: token('color.border.selected', B300),
47
+ backgroundColor: "var(--ds-background-selected, ".concat(B50, ")"),
48
+ borderColor: "var(--ds-border-selected, ".concat(B300, ")"),
50
49
  '&:hover': {
51
- background: "".concat(token('color.background.selected.hovered', B75))
50
+ background: "".concat("var(--ds-background-selected-hovered, ".concat(B75, ")"))
52
51
  }
53
52
  });
54
53
  export var flashHeight = akHeight - 2; // height without the 1px border
@@ -1,7 +1,6 @@
1
1
  /** @jsx jsx */
2
2
  import { css } from '@emotion/react';
3
3
  import { B400, N500, N800 } from '@atlaskit/theme/colors';
4
- import { token } from '@atlaskit/tokens';
5
4
  import { constants } from '../../shared';
6
5
  var REACTIONS_CONTAINER_WIDTH = 48;
7
6
  var REACTION_RIGHT_MARGIN = 8;
@@ -35,7 +34,7 @@ export var containerStyle = function containerStyle(reactionsBorderWidth) {
35
34
  export var titleStyle = css({
36
35
  '& > h1': {
37
36
  fontSize: '24px!important',
38
- color: "".concat(token('color.text', N800))
37
+ color: "".concat("var(--ds-text, ".concat(N800, ")"))
39
38
  }
40
39
  });
41
40
  var containerEdgeAngle = {
@@ -55,7 +54,7 @@ export var counterStyle = function counterStyle(isSelected) {
55
54
  width: '100%',
56
55
  padding: '0px!important',
57
56
  //Counter component has its own styles overriding them to match designs
58
- color: isSelected ? "".concat(token('color.text', B400), "!important") : "2px solid ".concat(token('color.text', N500), "!important")
57
+ color: isSelected ? "".concat("var(--ds-text, ".concat(B400, ")"), "!important") : "2px solid ".concat("var(--ds-text, ".concat(N500, ")"), "!important")
59
58
  }
60
59
  });
61
60
  };
@@ -101,7 +100,7 @@ export var customTabWrapper = function customTabWrapper(isSelected, selectedEmoj
101
100
  '&.disabled + &.disabled:after': fadedCss('leftEdge', theme),
102
101
  '&:after': isSelected ? {
103
102
  content: '""',
104
- borderBottom: "2px solid ".concat(token('color.text', B400)),
103
+ borderBottom: "2px solid ".concat("var(--ds-text, ".concat(B400, ")")),
105
104
  width: "".concat(REACTIONS_CONTAINER_WIDTH, "px"),
106
105
  bottom: '0px',
107
106
  display: 'block',
@@ -132,7 +131,7 @@ export var reactionViewStyle = css({
132
131
  flexDirection: 'column',
133
132
  p: {
134
133
  margin: 0,
135
- color: "".concat(token('color.text', N800)),
134
+ color: "".concat("var(--ds-text, ".concat(N800, ")")),
136
135
  textTransform: 'capitalize',
137
136
  fontWeight: 600,
138
137
  fontSize: 16,
@@ -148,7 +147,7 @@ export var userListStyle = css({
148
147
  padding: 0,
149
148
  textAlign: 'left',
150
149
  li: {
151
- color: "".concat(token('color.text', N500)),
150
+ color: "".concat("var(--ds-text, ".concat(N500, ")")),
152
151
  fontSize: 14
153
152
  }
154
153
  });
@@ -2,21 +2,19 @@
2
2
  import { css } from '@emotion/react';
3
3
  import { borderRadius } from '@atlaskit/theme/constants';
4
4
  import { N0, N50A, N60A } from '@atlaskit/theme/colors';
5
- import { token } from '@atlaskit/tokens';
6
5
  export var pickerStyle = css({
7
6
  verticalAlign: 'middle',
8
7
  '&.miniMode': {
9
- display: 'inline-block',
10
- marginRight: '4px'
8
+ display: 'inline-block'
11
9
  }
12
10
  });
13
11
  export var contentStyle = css({
14
12
  display: 'flex'
15
13
  });
16
14
  export var popupStyle = css({
17
- background: token('elevation.surface.overlay', N0),
15
+ background: "var(--ds-surface-overlay, ".concat(N0, ")"),
18
16
  borderRadius: "".concat(borderRadius(), "px"),
19
- boxShadow: token('elevation.shadow.overlay', "0 4px 8px -2px ".concat(N50A, ", 0 0 1px ").concat(N60A)),
17
+ boxShadow: "var(--ds-shadow-overlay, ".concat("0 4px 8px -2px ".concat(N50A, ", 0 0 1px ").concat(N60A), ")"),
20
18
  '&> div': {
21
19
  boxShadow: undefined,
22
20
  marginTop: '4px',
@@ -1,6 +1,5 @@
1
1
  /** @jsx jsx */
2
2
  import { css } from '@emotion/react';
3
- import { token } from '@atlaskit/tokens';
4
3
  import { N90, N800, N0 } from '@atlaskit/theme/colors';
5
4
  export var verticalMargin = 5;
6
5
  export var tooltipStyle = css({
@@ -23,18 +22,18 @@ export var tooltipStyle = css({
23
22
  });
24
23
  export var emojiNameStyle = css({
25
24
  textTransform: 'capitalize',
26
- color: token('color.text.inverse', N90),
25
+ color: "var(--ds-text-inverse, ".concat(N90, ")"),
27
26
  fontWeight: 600
28
27
  });
29
28
  export var footerStyle = css({
30
- color: token('color.text.inverse', N90),
29
+ color: "var(--ds-text-inverse, ".concat(N90, ")"),
31
30
  fontWeight: 300
32
31
  });
33
32
  export var underlineStyle = css({
34
33
  cursor: 'pointer',
35
34
  textDecoration: 'underline',
36
35
  ':hover': {
37
- backgroundColor: token('color.background.neutral.bold', N800),
38
- color: token('color.text.inverse', N0)
36
+ backgroundColor: "var(--ds-background-neutral-bold, ".concat(N800, ")"),
37
+ color: "var(--ds-text-inverse, ".concat(N0, ")")
39
38
  }
40
39
  });
@@ -96,7 +96,9 @@ export var Reactions = /*#__PURE__*/React.memo(function (_ref) {
96
96
  _ref$onDialogSelectRe = _ref.onDialogSelectReactionCallback,
97
97
  onDialogSelectReactionCallback = _ref$onDialogSelectRe === void 0 ? function () {} : _ref$onDialogSelectRe,
98
98
  _ref$emojiPickerSize = _ref.emojiPickerSize,
99
- emojiPickerSize = _ref$emojiPickerSize === void 0 ? 'medium' : _ref$emojiPickerSize;
99
+ emojiPickerSize = _ref$emojiPickerSize === void 0 ? 'medium' : _ref$emojiPickerSize,
100
+ _ref$miniMode = _ref.miniMode,
101
+ miniMode = _ref$miniMode === void 0 ? false : _ref$miniMode;
100
102
 
101
103
  var _useState = useState(),
102
104
  _useState2 = _slicedToArray(_useState, 2),
@@ -258,7 +260,6 @@ export var Reactions = /*#__PURE__*/React.memo(function (_ref) {
258
260
  }, memorizedReactions.map(function (reaction) {
259
261
  return jsx(Reaction, {
260
262
  key: reaction.emojiId,
261
- css: styles.reactionStyle,
262
263
  reaction: reaction,
263
264
  emojiProvider: emojiProvider,
264
265
  onClick: onReactionClick,
@@ -269,9 +270,8 @@ export var Reactions = /*#__PURE__*/React.memo(function (_ref) {
269
270
  allowUserDialog: allowUserDialog
270
271
  });
271
272
  }), jsx(ReactionPicker, {
272
- css: styles.reactionStyle,
273
+ css: styles.reactionPickerStyle,
273
274
  emojiProvider: emojiProvider,
274
- miniMode: true,
275
275
  allowAllEmojis: allowAllEmojis,
276
276
  pickerQuickReactionEmojiIds: pickerQuickReactionEmojiIds,
277
277
  disabled: status !== ReactionStatus.ready,
@@ -280,7 +280,8 @@ export var Reactions = /*#__PURE__*/React.memo(function (_ref) {
280
280
  onCancel: handleOnCancel,
281
281
  onShowMore: handleOnMore,
282
282
  tooltipContent: getTooltip(status, errorMessage),
283
- emojiPickerSize: emojiPickerSize
283
+ emojiPickerSize: emojiPickerSize,
284
+ miniMode: miniMode
284
285
  }), allowUserDialog && reactions.length > 0 && jsx(Tooltip, {
285
286
  content: jsx(FormattedMessage, i18n.messages.seeWhoReactedTooltip),
286
287
  hideTooltipOnClick: true
@@ -1,15 +1,16 @@
1
1
  /** @jsx jsx */
2
2
  import { css } from '@emotion/react';
3
- export var reactionStyle = css({
3
+ export var reactionPickerStyle = css({
4
4
  display: 'inline-block',
5
- margin: '4px'
5
+ marginTop: '4px'
6
6
  });
7
7
  export var seeWhoReacted = css({
8
8
  height: '24px',
9
9
  lineHeight: '24px',
10
- paddingLeft: '4px',
11
- paddingRight: '4px',
12
- margin: '4px'
10
+ paddingLeft: 0,
11
+ paddingRight: 0,
12
+ marginTop: '4px',
13
+ marginLeft: '4px'
13
14
  });
14
15
  export var wrapperStyle = css({
15
16
  display: 'flex',
@@ -2,7 +2,6 @@
2
2
  import { css } from '@emotion/react';
3
3
  import { borderRadius } from '@atlaskit/theme/constants';
4
4
  import { N30A } from '@atlaskit/theme/colors';
5
- import { token } from '@atlaskit/tokens';
6
5
  export var moreEmojiContainerStyle = css({
7
6
  display: 'flex'
8
7
  });
@@ -18,11 +17,11 @@ export var moreButtonStyle = css({
18
17
  width: '38px',
19
18
  verticalAlign: 'top',
20
19
  '&:hover': {
21
- backgroundColor: token('color.background.neutral.subtle.hovered', N30A)
20
+ backgroundColor: "var(--ds-background-neutral-subtle-hovered, ".concat(N30A, ")")
22
21
  }
23
22
  });
24
23
  export var separatorStyle = css({
25
- backgroundColor: token('color.border', N30A),
24
+ backgroundColor: "var(--ds-border, ".concat(N30A, ")"),
26
25
  margin: '8px 8px 8px 4px',
27
26
  width: '1px',
28
27
  height: '60%',
@@ -6,9 +6,9 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
6
6
 
7
7
  /** @jsx jsx */
8
8
  import { css } from '@emotion/react';
9
- import { token } from '@atlaskit/tokens';
10
9
  import { N70, N20, N40 } from '@atlaskit/theme/colors';
11
- export var DISABLED_BUTTON_COLOR = "".concat(token('color.text.disabled', N70), " !important");
10
+ import { borderRadius } from '@atlaskit/theme/constants';
11
+ export var DISABLED_BUTTON_COLOR = "".concat("var(--ds-text-disabled, ".concat(N70, ")"), " !important");
12
12
  export var triggerStyle = function triggerStyle(_ref) {
13
13
  var _ref$miniMode = _ref.miniMode,
14
14
  miniMode = _ref$miniMode === void 0 ? false : _ref$miniMode,
@@ -16,22 +16,25 @@ export var triggerStyle = function triggerStyle(_ref) {
16
16
  disabled = _ref$disabled === void 0 ? false : _ref$disabled;
17
17
  return css(_objectSpread(_objectSpread(_objectSpread({
18
18
  minWidth: '32px',
19
- height: '32px',
19
+ height: '24px',
20
+ padding: 0,
21
+ border: "1px solid ".concat("var(--ds-border, ".concat(N40, ")")),
22
+ borderRadius: '20px',
20
23
  display: 'flex',
21
24
  justifyContent: 'center',
22
25
  alignItems: 'center',
23
26
  lineHeight: '16px'
24
27
  }, miniMode && {
25
- height: '24px',
26
- padding: 0,
27
- border: "1px solid ".concat(token('color.border', N40)),
28
- borderRadius: '20px'
28
+ minWidth: '24px',
29
+ padding: '4px',
30
+ border: 'none',
31
+ borderRadius: "".concat(borderRadius(), "px")
29
32
  }), disabled && {
30
33
  color: DISABLED_BUTTON_COLOR,
31
34
  cursor: 'not-allowed'
32
35
  }), {}, {
33
36
  '&:hover': {
34
- background: "".concat(token('color.background.neutral.subtle.hovered', N20))
37
+ background: "".concat("var(--ds-background-neutral-subtle-hovered, ".concat(N20, ")"))
35
38
  }
36
39
  }));
37
40
  };
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "name": "@atlaskit/reactions",
3
- "version": "22.0.3"
3
+ "version": "22.1.0"
4
4
  }
@@ -31,7 +31,7 @@ export declare const RENDER_REACTIONS_TESTID = "render-reactions";
31
31
  * Test id for the view all reacted user to trigger the dialog
32
32
  */
33
33
  export declare const RENDER_VIEWALL_REACTED_USERS_DIALOG = "viewall-reacted-users-dialog";
34
- export interface ReactionsProps extends Pick<ReactionPickerProps, 'allowAllEmojis' | 'emojiProvider' | 'emojiPickerSize'>, Pick<SelectorProps, 'pickerQuickReactionEmojiIds'>, Pick<ReactionProps, 'allowUserDialog'> {
34
+ export interface ReactionsProps extends Pick<ReactionPickerProps, 'allowAllEmojis' | 'emojiProvider' | 'emojiPickerSize' | 'miniMode'>, Pick<SelectorProps, 'pickerQuickReactionEmojiIds'>, Pick<ReactionProps, 'allowUserDialog'> {
35
35
  /**
36
36
  * event handler to fetching the reactions
37
37
  */
@@ -1,3 +1,3 @@
1
- export declare const reactionStyle: import("@emotion/react").SerializedStyles;
1
+ export declare const reactionPickerStyle: import("@emotion/react").SerializedStyles;
2
2
  export declare const seeWhoReacted: import("@emotion/react").SerializedStyles;
3
3
  export declare const wrapperStyle: import("@emotion/react").SerializedStyles;
@@ -1,7 +1,7 @@
1
1
  import React from 'react';
2
2
  import { ReactionsProps, ReactionPickerProps } from '../../components';
3
3
  import { ReactionStatus, Actions, State, StorePropInput } from '../../types';
4
- export interface ConnectedReactionsViewProps extends Pick<ReactionsProps, 'quickReactionEmojis' | 'onDialogOpenCallback' | 'onDialogCloseCallback' | 'onDialogSelectReactionCallback' | 'allowUserDialog' | 'allowAllEmojis' | 'emojiProvider' | 'emojiPickerSize'>, Pick<ReactionPickerProps, 'pickerQuickReactionEmojiIds'> {
4
+ export interface ConnectedReactionsViewProps extends Pick<ReactionsProps, 'quickReactionEmojis' | 'onDialogOpenCallback' | 'onDialogCloseCallback' | 'onDialogSelectReactionCallback' | 'allowUserDialog' | 'allowAllEmojis' | 'emojiProvider' | 'emojiPickerSize' | 'miniMode'>, Pick<ReactionPickerProps, 'pickerQuickReactionEmojiIds'> {
5
5
  /**
6
6
  * Wrapper id for reactions list
7
7
  */
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/reactions",
3
- "version": "22.0.3",
3
+ "version": "22.1.0",
4
4
  "description": "Reactions component",
5
5
  "publishConfig": {
6
6
  "registry": "https://registry.npmjs.org/"