@atlaskit/user-picker 10.12.5 → 10.12.7

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,17 @@
1
1
  # @atlaskit/user-picker
2
2
 
3
+ ## 10.12.7
4
+
5
+ ### Patch Changes
6
+
7
+ - [#58511](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/58511) [`25cdcae132b5`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/25cdcae132b5) - Fix for user picker correctly rendering noOptionsMessage when provided a react node
8
+
9
+ ## 10.12.6
10
+
11
+ ### Patch Changes
12
+
13
+ - [#57137](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/57137) [`9b9900944973`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/9b9900944973) - Remove legacy theming logic from @atlaskit/date, @atlaskit/mention, @atlaskit/task-decision and @atlaskit/user-picker.
14
+
3
15
  ## 10.12.5
4
16
 
5
17
  ### Patch Changes
@@ -12,7 +12,7 @@ var _utils = require("./components/utils");
12
12
  function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
13
13
  function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
14
14
  var packageName = "@atlaskit/user-picker";
15
- var packageVersion = "10.12.5";
15
+ var packageVersion = "10.12.7";
16
16
  var UUID_REGEXP_TEAMS_GROUPS = /^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$/;
17
17
  var UUID_REGEXP_OLD_AAID = /^[a-fA-F0-9]{1,8}:[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$/;
18
18
  var UUID_REGEXP_NEW_AAID = /^[a-fA-F0-9]{24,24}$/;
@@ -542,7 +542,9 @@ var BaseUserPickerWithoutAnalytics = exports.BaseUserPickerWithoutAnalytics = /*
542
542
  subtle: subtle,
543
543
  blurInputOnSelect: !isMulti,
544
544
  closeMenuOnSelect: !isMulti,
545
- noOptionsMessage: showError ? loadOptionsErrorMessage : noOptionsMessage,
545
+ noOptionsMessage: showError ? loadOptionsErrorMessage : typeof noOptionsMessage === 'function' ? noOptionsMessage : function () {
546
+ return noOptionsMessage;
547
+ },
546
548
  footer: footer,
547
549
  openMenuOnFocus: true,
548
550
  isDisabled: isDisabled,
@@ -11,38 +11,30 @@ var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits
11
11
  var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
12
12
  var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
13
13
  var _react = _interopRequireDefault(require("react"));
14
- var _components = require("@atlaskit/theme/components");
15
- var _constants = require("@atlaskit/theme/constants");
16
14
  var _select = require("@atlaskit/select");
17
15
  var _react2 = require("@emotion/react");
18
16
  var _colors = require("@atlaskit/theme/colors");
19
17
  function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
20
18
  function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } } /** @jsx jsx */
21
- var spacing = (0, _constants.gridSize)();
19
+ var spacing = 8;
22
20
  var fontSize = 12;
23
21
  var innerHeight = spacing * 2; // 16px
24
22
  var lineHeight = innerHeight / fontSize;
25
23
  var controlWrapper = (0, _react2.css)({
26
24
  display: 'flex',
27
25
  flexDirection: 'column',
28
- padding: "0px ".concat(spacing, "px ").concat(spacing, "px")
29
- });
30
- var getColor = (0, _components.themed)({
31
- light: "var(--ds-text-subtlest, ".concat(_colors.N200, ")"),
32
- dark: "var(--ds-text-subtlest, ".concat(_colors.DN90, ")")
26
+ padding: "0px ".concat("var(--ds-space-100, 8px)", " ", "var(--ds-space-100, 8px)")
33
27
  });
34
28
  var getLabelStyle = function getLabelStyle() {
35
- var right = 0;
36
- var bottom = spacing / 2;
37
- var left = 0;
38
- var top = spacing * 2.5;
39
- var color = getColor();
40
29
  return (0, _react2.css)({
41
- color: color,
30
+ color: "var(--ds-text-subtlest, ".concat(_colors.N200, ")"),
42
31
  fontSize: "".concat(fontSize, "px"),
43
32
  fontWeight: 600,
44
33
  lineHeight: "".concat(lineHeight),
45
- padding: "".concat(top, "px ").concat(right, "px ").concat(bottom, "px ").concat(left, "px")
34
+ paddingBottom: "var(--ds-space-050, 4px)",
35
+ paddingLeft: "var(--ds-space-0, 0px)",
36
+ paddingRight: "var(--ds-space-0, 0px)",
37
+ paddingTop: "var(--ds-space-250, 20px)"
46
38
  });
47
39
  };
48
40
  var PopupControl = exports.PopupControl = /*#__PURE__*/function (_React$PureComponent) {
@@ -2,7 +2,7 @@ import { createAndFireEvent } from '@atlaskit/analytics-next';
2
2
  import { v4 as uuidv4 } from 'uuid';
3
3
  import { isCustom, isExternalUser } from './components/utils';
4
4
  const packageName = "@atlaskit/user-picker";
5
- const packageVersion = "10.12.5";
5
+ const packageVersion = "10.12.7";
6
6
  const UUID_REGEXP_TEAMS_GROUPS = /^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$/;
7
7
  const UUID_REGEXP_OLD_AAID = /^[a-fA-F0-9]{1,8}:[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$/;
8
8
  const UUID_REGEXP_NEW_AAID = /^[a-fA-F0-9]{24,24}$/;
@@ -515,7 +515,7 @@ export class BaseUserPickerWithoutAnalytics extends React.Component {
515
515
  subtle: subtle,
516
516
  blurInputOnSelect: !isMulti,
517
517
  closeMenuOnSelect: !isMulti,
518
- noOptionsMessage: showError ? loadOptionsErrorMessage : noOptionsMessage,
518
+ noOptionsMessage: showError ? loadOptionsErrorMessage : typeof noOptionsMessage === 'function' ? noOptionsMessage : () => noOptionsMessage,
519
519
  footer: footer,
520
520
  openMenuOnFocus: true,
521
521
  isDisabled: isDisabled,
@@ -1,37 +1,27 @@
1
1
  /** @jsx jsx */
2
2
  import React from 'react';
3
- import { themed } from '@atlaskit/theme/components';
4
- import { gridSize } from '@atlaskit/theme/constants';
5
3
  import { components } from '@atlaskit/select';
6
4
  import { css, jsx } from '@emotion/react';
7
- import { N200, DN90 } from '@atlaskit/theme/colors';
8
- const spacing = gridSize();
5
+ import { N200 } from '@atlaskit/theme/colors';
6
+ const spacing = 8;
9
7
  const fontSize = 12;
10
8
  const innerHeight = spacing * 2; // 16px
11
9
  const lineHeight = innerHeight / fontSize;
12
10
  const controlWrapper = css({
13
11
  display: 'flex',
14
12
  flexDirection: 'column',
15
- padding: `0px ${spacing}px ${spacing}px`
13
+ padding: `0px ${"var(--ds-space-100, 8px)"} ${"var(--ds-space-100, 8px)"}`
16
14
  });
17
- const getColor = themed({
18
- light: `var(--ds-text-subtlest, ${N200})`,
19
- dark: `var(--ds-text-subtlest, ${DN90})`
15
+ const getLabelStyle = () => css({
16
+ color: `var(--ds-text-subtlest, ${N200})`,
17
+ fontSize: `${fontSize}px`,
18
+ fontWeight: 600,
19
+ lineHeight: `${lineHeight}`,
20
+ paddingBottom: "var(--ds-space-050, 4px)",
21
+ paddingLeft: "var(--ds-space-0, 0px)",
22
+ paddingRight: "var(--ds-space-0, 0px)",
23
+ paddingTop: "var(--ds-space-250, 20px)"
20
24
  });
21
- const getLabelStyle = () => {
22
- const right = 0;
23
- const bottom = spacing / 2;
24
- const left = 0;
25
- const top = spacing * 2.5;
26
- const color = getColor();
27
- return css({
28
- color,
29
- fontSize: `${fontSize}px`,
30
- fontWeight: 600,
31
- lineHeight: `${lineHeight}`,
32
- padding: `${top}px ${right}px ${bottom}px ${left}px`
33
- });
34
- };
35
25
  export class PopupControl extends React.PureComponent {
36
26
  render() {
37
27
  const {
@@ -5,7 +5,7 @@ import { createAndFireEvent } from '@atlaskit/analytics-next';
5
5
  import { v4 as uuidv4 } from 'uuid';
6
6
  import { isCustom, isExternalUser } from './components/utils';
7
7
  var packageName = "@atlaskit/user-picker";
8
- var packageVersion = "10.12.5";
8
+ var packageVersion = "10.12.7";
9
9
  var UUID_REGEXP_TEAMS_GROUPS = /^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$/;
10
10
  var UUID_REGEXP_OLD_AAID = /^[a-fA-F0-9]{1,8}:[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$/;
11
11
  var UUID_REGEXP_NEW_AAID = /^[a-fA-F0-9]{24,24}$/;
@@ -535,7 +535,9 @@ export var BaseUserPickerWithoutAnalytics = /*#__PURE__*/function (_React$Compon
535
535
  subtle: subtle,
536
536
  blurInputOnSelect: !isMulti,
537
537
  closeMenuOnSelect: !isMulti,
538
- noOptionsMessage: showError ? loadOptionsErrorMessage : noOptionsMessage,
538
+ noOptionsMessage: showError ? loadOptionsErrorMessage : typeof noOptionsMessage === 'function' ? noOptionsMessage : function () {
539
+ return noOptionsMessage;
540
+ },
539
541
  footer: footer,
540
542
  openMenuOnFocus: true,
541
543
  isDisabled: isDisabled,
@@ -7,36 +7,28 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
7
7
  function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
8
8
  /** @jsx jsx */
9
9
  import React from 'react';
10
- import { themed } from '@atlaskit/theme/components';
11
- import { gridSize } from '@atlaskit/theme/constants';
12
10
  import { components } from '@atlaskit/select';
13
11
  import { css, jsx } from '@emotion/react';
14
- import { N200, DN90 } from '@atlaskit/theme/colors';
15
- var spacing = gridSize();
12
+ import { N200 } from '@atlaskit/theme/colors';
13
+ var spacing = 8;
16
14
  var fontSize = 12;
17
15
  var innerHeight = spacing * 2; // 16px
18
16
  var lineHeight = innerHeight / fontSize;
19
17
  var controlWrapper = css({
20
18
  display: 'flex',
21
19
  flexDirection: 'column',
22
- padding: "0px ".concat(spacing, "px ").concat(spacing, "px")
23
- });
24
- var getColor = themed({
25
- light: "var(--ds-text-subtlest, ".concat(N200, ")"),
26
- dark: "var(--ds-text-subtlest, ".concat(DN90, ")")
20
+ padding: "0px ".concat("var(--ds-space-100, 8px)", " ", "var(--ds-space-100, 8px)")
27
21
  });
28
22
  var getLabelStyle = function getLabelStyle() {
29
- var right = 0;
30
- var bottom = spacing / 2;
31
- var left = 0;
32
- var top = spacing * 2.5;
33
- var color = getColor();
34
23
  return css({
35
- color: color,
24
+ color: "var(--ds-text-subtlest, ".concat(N200, ")"),
36
25
  fontSize: "".concat(fontSize, "px"),
37
26
  fontWeight: 600,
38
27
  lineHeight: "".concat(lineHeight),
39
- padding: "".concat(top, "px ").concat(right, "px ").concat(bottom, "px ").concat(left, "px")
28
+ paddingBottom: "var(--ds-space-050, 4px)",
29
+ paddingLeft: "var(--ds-space-0, 0px)",
30
+ paddingRight: "var(--ds-space-0, 0px)",
31
+ paddingTop: "var(--ds-space-250, 20px)"
40
32
  });
41
33
  };
42
34
  export var PopupControl = /*#__PURE__*/function (_React$PureComponent) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/user-picker",
3
- "version": "10.12.5",
3
+ "version": "10.12.7",
4
4
  "description": "Fabric component for display a dropdown to select a user from",
5
5
  "publishConfig": {
6
6
  "registry": "https://registry.npmjs.org/"