@atlaskit/user-picker 11.9.0 → 11.11.0

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @atlaskit/user-picker
 
+## 11.11.0
+
+### Minor Changes
+
+- [`11f67199573c8`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/11f67199573c8) -
+  Clean up the FG and remove findDOMNode for good
+
+## 11.10.0
+
+### Minor Changes
+
+- [`b7c680ed7d6c8`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/b7c680ed7d6c8) -
+  [ux] fix screenreader doesn't announce selected option when both aria labelledby and describedby
+  are provided
+
 ## 11.9.0
 
 ### Minor Changes

package/dist/cjs/analytics.js

@@ -12,7 +12,7 @@ var _utils = require("./components/utils");
 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; }
 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; }
 var packageName = "@atlaskit/user-picker";
-var packageVersion = "11.8.2";
+var packageVersion = "0.0.0-development";
 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}$/;
 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}$/;
 var UUID_REGEXP_NEW_AAID = /^[a-fA-F0-9]{24,24}$/;

package/dist/cjs/components/BaseUserPicker.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.BaseUserPickerWithoutAnalytics = exports.BaseUserPicker = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
@@ -24,6 +25,8 @@ var _i18n = require("./i18n");
 var _utils = require("./utils");
 var _groupOptionsByType = require("../util/group-options-by-type");
 var _ufoExperiences = require("../util/ufoExperiences");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _excluded = ["aria-labelledby", "aria-describedby"];
 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; }
 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; }
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
@@ -524,12 +527,18 @@ var BaseUserPickerWithoutAnalytics = exports.BaseUserPickerWithoutAnalytics = /*
         blurInputOnSelect: !isMulti,
         openMenuOnFocus: true
       });
+      var _this$ariaProps = this.ariaProps,
+        ariaLabelledByStandard = _this$ariaProps['aria-labelledby'],
+        ariaDescribedByStandard = _this$ariaProps['aria-describedby'],
+        restAriaProps = (0, _objectWithoutProperties2.default)(_this$ariaProps, _excluded);
       return /*#__PURE__*/_react.default.createElement(SelectComponent, (0, _extends2.default)({
         name: name,
         value: value,
         autoFocus: autoFocus !== undefined ? autoFocus : menuIsOpen,
-        "aria-labelledby": ariaLabelledBy,
-        "aria-describedby": ariaDescribedBy,
+        labelId: (0, _platformFeatureFlags.fg)('user_picker_migrate_aria_label_description') ? ariaLabelledBy !== null && ariaLabelledBy !== void 0 ? ariaLabelledBy : ariaLabelledByStandard : undefined,
+        "aria-labelledby": (0, _platformFeatureFlags.fg)('user_picker_migrate_aria_label_description') ? undefined : ariaLabelledBy,
+        descriptionId: (0, _platformFeatureFlags.fg)('user_picker_migrate_aria_label_description') ? ariaDescribedBy !== null && ariaDescribedBy !== void 0 ? ariaDescribedBy : ariaDescribedByStandard : undefined,
+        "aria-describedby": (0, _platformFeatureFlags.fg)('user_picker_migrate_aria_label_description') ? undefined : ariaDescribedBy,
         "aria-live": ariaLive,
         "aria-required": required // This has been added as a safety net.
         ,
@@ -582,7 +591,7 @@ var BaseUserPickerWithoutAnalytics = exports.BaseUserPickerWithoutAnalytics = /*
         textFieldBackgroundColor: textFieldBackgroundColor,
         header: header,
         placeholderAvatar: placeholderAvatar
-      }, this.ariaProps, pickerProps, UNSAFE_hasDraggableParentComponent && {
+      }, (0, _platformFeatureFlags.fg)('user_picker_migrate_aria_label_description') ? restAriaProps : this.ariaProps, pickerProps, UNSAFE_hasDraggableParentComponent && {
         onValueContainerClick: this.handleClickDraggableParentComponent
       }, menuOpenDeciderProps));
     }

package/dist/cjs/components/ExternalUserOption/InfoIcon.js

@@ -33,7 +33,7 @@ var _default = exports.default = function _default() {
     return setHoverState(false);
   }, [setHoverState]);
   return (
-    // eslint-disable-next-line @atlassian/a11y/no-static-element-interactions, @atlassian/a11y/mouse-events-have-key-events
+    // eslint-disable-next-line @atlassian/a11y/mouse-events-have-key-events
     (0, _react2.jsx)("div", {
       css: wrapper,
       onMouseEnter: onMouseEnter,

package/dist/cjs/components/ExternalUserOption/main.js

@@ -95,6 +95,7 @@ var ExternalUserOptionImpl = /*#__PURE__*/function (_React$PureComponent) {
           }, emailDomainWithAt))
         );
       }
+      return null;
     });
     (0, _defineProperty2.default)(_this, "renderAvatar", function () {
       var _this$props = _this.props,

package/dist/cjs/components/MultiValueContainer.js

@@ -19,12 +19,10 @@ var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _select = require("@atlaskit/select");
 var _react = _interopRequireWildcard(require("react"));
-var _reactDom = _interopRequireDefault(require("react-dom"));
 var _reactIntlNext = require("react-intl-next");
 var _i18n = require("./i18n");
 var _utils = require("./utils");
 var _ValueContainerWrapper = _interopRequireDefault(require("./ValueContainerWrapper"));
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _excluded = ["children", "innerProps"];
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 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; }
@@ -44,14 +42,7 @@ var MultiValueContainer = exports.MultiValueContainer = /*#__PURE__*/function (_
       _this.timeoutId = window.setTimeout(function () {
         var current = _this.valueContainerInnerProps.ref.current;
         if (current !== null) {
-          if ((0, _platformFeatureFlags.fg)('user-picker-migrate-off-finddomnode')) {
-            current.scrollTop = current.scrollHeight;
-          } else {
-            var container = _reactDom.default.findDOMNode(current);
-            if (container instanceof HTMLDivElement) {
-              container.scrollTop = container.scrollHeight;
-            }
-          }
+          current.scrollTop = current.scrollHeight;
         }
         _this.timeoutId = null;
       });

package/dist/cjs/components/utils.js

@@ -107,6 +107,7 @@ var callCallback = exports.callCallback = function callCallback(callback) {
       console.error('@atlassian/user-select: an error happening in `callCallback`: ', error);
     }
   }
+  return undefined;
 };
 var getAvatarUrl = exports.getAvatarUrl = function getAvatarUrl(optionData) {
   if (isUser(optionData) || isTeam(optionData) || isCustom(optionData) || isExternalUser(optionData)) {

package/dist/es2019/analytics.js

@@ -2,7 +2,7 @@ import { createAndFireEvent } from '@atlaskit/analytics-next';
 import { v4 as uuidv4 } from 'uuid';
 import { isCustom, isExternalUser } from './components/utils';
 const packageName = "@atlaskit/user-picker";
-const packageVersion = "11.8.2";
+const packageVersion = "0.0.0-development";
 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}$/;
 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}$/;
 const UUID_REGEXP_NEW_AAID = /^[a-fA-F0-9]{24,24}$/;

package/dist/es2019/components/BaseUserPicker.js

@@ -12,6 +12,7 @@ import { messages } from './i18n';
 import { callCallback, extractOptionValue, getOptions, isIterable, isPopupUserPickerByComponent, isDefaultValuePopulated, isSingleValue, optionToSelectableOptions } from './utils';
 import { groupOptionsByType } from '../util/group-options-by-type';
 import { userPickerOptionsShownUfoExperience } from '../util/ufoExperiences';
+import { fg } from '@atlaskit/platform-feature-flags';
 const loadingMessage = () => null;
 const classNamePrefix = 'fabric-user-picker';
 export class BaseUserPickerWithoutAnalytics extends React.Component {
@@ -505,12 +506,19 @@ export class BaseUserPickerWithoutAnalytics extends React.Component {
         openMenuOnFocus: true
       })
     };
+    const {
+      'aria-labelledby': ariaLabelledByStandard,
+      'aria-describedby': ariaDescribedByStandard,
+      ...restAriaProps
+    } = this.ariaProps;
     return /*#__PURE__*/React.createElement(SelectComponent, _extends({
       name: name,
       value: value,
       autoFocus: autoFocus !== undefined ? autoFocus : menuIsOpen,
-      "aria-labelledby": ariaLabelledBy,
-      "aria-describedby": ariaDescribedBy,
+      labelId: fg('user_picker_migrate_aria_label_description') ? ariaLabelledBy !== null && ariaLabelledBy !== void 0 ? ariaLabelledBy : ariaLabelledByStandard : undefined,
+      "aria-labelledby": fg('user_picker_migrate_aria_label_description') ? undefined : ariaLabelledBy,
+      descriptionId: fg('user_picker_migrate_aria_label_description') ? ariaDescribedBy !== null && ariaDescribedBy !== void 0 ? ariaDescribedBy : ariaDescribedByStandard : undefined,
+      "aria-describedby": fg('user_picker_migrate_aria_label_description') ? undefined : ariaDescribedBy,
       "aria-live": ariaLive,
       "aria-required": required // This has been added as a safety net.
       ,
@@ -561,7 +569,7 @@ export class BaseUserPickerWithoutAnalytics extends React.Component {
       textFieldBackgroundColor: textFieldBackgroundColor,
       header: header,
       placeholderAvatar: placeholderAvatar
-    }, this.ariaProps, pickerProps, UNSAFE_hasDraggableParentComponent && {
+    }, fg('user_picker_migrate_aria_label_description') ? restAriaProps : this.ariaProps, pickerProps, UNSAFE_hasDraggableParentComponent && {
       onValueContainerClick: this.handleClickDraggableParentComponent
     }, menuOpenDeciderProps));
   }

package/dist/es2019/components/ExternalUserOption/InfoIcon.js

@@ -16,7 +16,7 @@ export default (() => {
   const onMouseEnter = useCallback(() => setHoverState(true), [setHoverState]);
   const onMouseLeave = useCallback(() => setHoverState(false), [setHoverState]);
   return (
-    // eslint-disable-next-line @atlassian/a11y/no-static-element-interactions, @atlassian/a11y/mouse-events-have-key-events
+    // eslint-disable-next-line @atlassian/a11y/mouse-events-have-key-events
     jsx("div", {
       css: wrapper,
       onMouseEnter: onMouseEnter,

package/dist/es2019/components/ExternalUserOption/main.js

@@ -80,6 +80,7 @@ class ExternalUserOptionImpl extends React.PureComponent {
           }, emailDomainWithAt))
         );
       }
+      return null;
     });
     _defineProperty(this, "renderAvatar", () => {
       const {

package/dist/es2019/components/MultiValueContainer.js

@@ -5,12 +5,10 @@ import "./MultiValueContainer.compiled.css";
 import { ax, ix } from "@compiled/react/runtime";
 import { components } from '@atlaskit/select';
 import React, { Fragment } from 'react';
-import ReactDOM from 'react-dom';
 import { FormattedMessage } from 'react-intl-next';
 import { messages } from './i18n';
 import { isChildInput } from './utils';
 import ValueContainerWrapper from './ValueContainerWrapper';
-import { fg } from '@atlaskit/platform-feature-flags';
 const valueContainerStyles = {
   root: "_yv0e5bpd _ca0q12x7 _n3td12x7 _19bv12x7 _1reo15vq _18m91wug _1fjgglyw _c71l1osq _1suq1j28 _1ke8idpf"
 };
@@ -32,14 +30,7 @@ export class MultiValueContainer extends React.PureComponent {
           }
         } = this.valueContainerInnerProps;
         if (current !== null) {
-          if (fg('user-picker-migrate-off-finddomnode')) {
-            current.scrollTop = current.scrollHeight;
-          } else {
-            const container = ReactDOM.findDOMNode(current);
-            if (container instanceof HTMLDivElement) {
-              container.scrollTop = container.scrollHeight;
-            }
-          }
+          current.scrollTop = current.scrollHeight;
         }
         this.timeoutId = null;
       });

package/dist/es2019/components/utils.js

@@ -65,6 +65,7 @@ export const callCallback = (callback, ...args) => {
       console.error('@atlassian/user-select: an error happening in `callCallback`: ', error);
     }
   }
+  return undefined;
 };
 export const getAvatarUrl = optionData => {
   if (isUser(optionData) || isTeam(optionData) || isCustom(optionData) || isExternalUser(optionData)) {

package/dist/esm/analytics.js

@@ -5,7 +5,7 @@ import { createAndFireEvent } from '@atlaskit/analytics-next';
 import { v4 as uuidv4 } from 'uuid';
 import { isCustom, isExternalUser } from './components/utils';
 var packageName = "@atlaskit/user-picker";
-var packageVersion = "11.8.2";
+var packageVersion = "0.0.0-development";
 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}$/;
 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}$/;
 var UUID_REGEXP_NEW_AAID = /^[a-fA-F0-9]{24,24}$/;

package/dist/esm/components/BaseUserPicker.js

@@ -1,10 +1,12 @@
 import _extends from "@babel/runtime/helpers/extends";
+import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
 import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
 import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
 import _inherits from "@babel/runtime/helpers/inherits";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
+var _excluded = ["aria-labelledby", "aria-describedby"];
 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; }
 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) { _defineProperty(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; }
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
@@ -24,6 +26,7 @@ import { messages } from './i18n';
 import { callCallback, extractOptionValue, getOptions, isIterable, isPopupUserPickerByComponent, isDefaultValuePopulated, isSingleValue, optionToSelectableOptions } from './utils';
 import { groupOptionsByType } from '../util/group-options-by-type';
 import { userPickerOptionsShownUfoExperience } from '../util/ufoExperiences';
+import { fg } from '@atlaskit/platform-feature-flags';
 var loadingMessage = function loadingMessage() {
   return null;
 };
@@ -517,12 +520,18 @@ export var BaseUserPickerWithoutAnalytics = /*#__PURE__*/function (_React$Compon
         blurInputOnSelect: !isMulti,
         openMenuOnFocus: true
       });
+      var _this$ariaProps = this.ariaProps,
+        ariaLabelledByStandard = _this$ariaProps['aria-labelledby'],
+        ariaDescribedByStandard = _this$ariaProps['aria-describedby'],
+        restAriaProps = _objectWithoutProperties(_this$ariaProps, _excluded);
       return /*#__PURE__*/React.createElement(SelectComponent, _extends({
         name: name,
         value: value,
         autoFocus: autoFocus !== undefined ? autoFocus : menuIsOpen,
-        "aria-labelledby": ariaLabelledBy,
-        "aria-describedby": ariaDescribedBy,
+        labelId: fg('user_picker_migrate_aria_label_description') ? ariaLabelledBy !== null && ariaLabelledBy !== void 0 ? ariaLabelledBy : ariaLabelledByStandard : undefined,
+        "aria-labelledby": fg('user_picker_migrate_aria_label_description') ? undefined : ariaLabelledBy,
+        descriptionId: fg('user_picker_migrate_aria_label_description') ? ariaDescribedBy !== null && ariaDescribedBy !== void 0 ? ariaDescribedBy : ariaDescribedByStandard : undefined,
+        "aria-describedby": fg('user_picker_migrate_aria_label_description') ? undefined : ariaDescribedBy,
         "aria-live": ariaLive,
         "aria-required": required // This has been added as a safety net.
         ,
@@ -575,7 +584,7 @@ export var BaseUserPickerWithoutAnalytics = /*#__PURE__*/function (_React$Compon
         textFieldBackgroundColor: textFieldBackgroundColor,
         header: header,
         placeholderAvatar: placeholderAvatar
-      }, this.ariaProps, pickerProps, UNSAFE_hasDraggableParentComponent && {
+      }, fg('user_picker_migrate_aria_label_description') ? restAriaProps : this.ariaProps, pickerProps, UNSAFE_hasDraggableParentComponent && {
         onValueContainerClick: this.handleClickDraggableParentComponent
       }, menuOpenDeciderProps));
     }

package/dist/esm/components/ExternalUserOption/InfoIcon.js

@@ -24,7 +24,7 @@ export default (function () {
     return setHoverState(false);
   }, [setHoverState]);
   return (
-    // eslint-disable-next-line @atlassian/a11y/no-static-element-interactions, @atlassian/a11y/mouse-events-have-key-events
+    // eslint-disable-next-line @atlassian/a11y/mouse-events-have-key-events
     jsx("div", {
       css: wrapper,
       onMouseEnter: onMouseEnter,

package/dist/esm/components/ExternalUserOption/main.js

@@ -91,6 +91,7 @@ var ExternalUserOptionImpl = /*#__PURE__*/function (_React$PureComponent) {
           }, emailDomainWithAt))
         );
       }
+      return null;
     });
     _defineProperty(_this, "renderAvatar", function () {
       var _this$props = _this.props,

package/dist/esm/components/MultiValueContainer.js

@@ -16,12 +16,10 @@ function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstruct
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 import { components } from '@atlaskit/select';
 import React, { Fragment } from 'react';
-import ReactDOM from 'react-dom';
 import { FormattedMessage } from 'react-intl-next';
 import { messages } from './i18n';
 import { isChildInput } from './utils';
 import ValueContainerWrapper from './ValueContainerWrapper';
-import { fg } from '@atlaskit/platform-feature-flags';
 var valueContainerStyles = {
   root: "_yv0e5bpd _ca0q12x7 _n3td12x7 _19bv12x7 _1reo15vq _18m91wug _1fjgglyw _c71l1osq _1suq1j28 _1ke8idpf"
 };
@@ -35,14 +33,7 @@ export var MultiValueContainer = /*#__PURE__*/function (_React$PureComponent) {
       _this.timeoutId = window.setTimeout(function () {
         var current = _this.valueContainerInnerProps.ref.current;
         if (current !== null) {
-          if (fg('user-picker-migrate-off-finddomnode')) {
-            current.scrollTop = current.scrollHeight;
-          } else {
-            var container = ReactDOM.findDOMNode(current);
-            if (container instanceof HTMLDivElement) {
-              container.scrollTop = container.scrollHeight;
-            }
-          }
+          current.scrollTop = current.scrollHeight;
         }
         _this.timeoutId = null;
       });

package/dist/esm/components/utils.js

@@ -100,6 +100,7 @@ export var callCallback = function callCallback(callback) {
       console.error('@atlassian/user-select: an error happening in `callCallback`: ', error);
     }
   }
+  return undefined;
 };
 export var getAvatarUrl = function getAvatarUrl(optionData) {
   if (isUser(optionData) || isTeam(optionData) || isCustom(optionData) || isExternalUser(optionData)) {

package/dist/types/components/BaseUserPicker.d.ts

@@ -1,5 +1,6 @@
 import React from 'react';
 import type { Appearance, OptionData, UserPickerProps, UserPickerState } from '../types';
+import type { AriaAttributes } from 'react';
 export type BaseUserPickerProps = UserPickerProps & {
     components: any;
     name?: string;
@@ -60,7 +61,7 @@ export declare class BaseUserPickerWithoutAnalytics extends React.Component<Base
     handleClearIndicatorHover: (hoveringClearIndicator: boolean) => void;
     private getOptions;
     private getAppearance;
-    get ariaProps(): {};
+    get ariaProps(): Partial<AriaAttributes>;
     private handleClickDraggableParentComponent;
     render(): React.JSX.Element;
 }

package/dist/types-ts4.5/components/BaseUserPicker.d.ts

@@ -1,5 +1,6 @@
 import React from 'react';
 import type { Appearance, OptionData, UserPickerProps, UserPickerState } from '../types';
+import type { AriaAttributes } from 'react';
 export type BaseUserPickerProps = UserPickerProps & {
     components: any;
     name?: string;
@@ -60,7 +61,7 @@ export declare class BaseUserPickerWithoutAnalytics extends React.Component<Base
     handleClearIndicatorHover: (hoveringClearIndicator: boolean) => void;
     private getOptions;
     private getAppearance;
-    get ariaProps(): {};
+    get ariaProps(): Partial<AriaAttributes>;
     private handleClickDraggableParentComponent;
     render(): React.JSX.Element;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/user-picker",
-	"version": "11.9.0",
+	"version": "11.11.0",
 	"description": "Fabric component for display a dropdown to select a user from",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -51,13 +51,13 @@
 		"@atlaskit/people-teams-ui-public": "^3.5.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/popper": "^7.1.0",
-		"@atlaskit/primitives": "^16.0.0",
+		"@atlaskit/primitives": "^16.1.0",
 		"@atlaskit/select": "^21.3.0",
 		"@atlaskit/spinner": "^19.0.0",
 		"@atlaskit/teams-avatar": "^2.3.0",
 		"@atlaskit/theme": "^21.0.0",
-		"@atlaskit/tokens": "^7.0.0",
-		"@atlaskit/tooltip": "^20.6.0",
+		"@atlaskit/tokens": "^7.1.0",
+		"@atlaskit/tooltip": "^20.7.0",
 		"@atlaskit/ufo": "^0.4.0",
 		"@babel/runtime": "^7.0.0",
 		"@compiled/react": "^0.18.6",
@@ -112,10 +112,10 @@
 		"product-terminology-refresh": {
 			"type": "boolean"
 		},
-		"user-picker-migrate-off-finddomnode": {
+		"jira_ai_agent_avatar_user_picker_user_option": {
 			"type": "boolean"
 		},
-		"jira_ai_agent_avatar_user_picker_user_option": {
+		"user_picker_migrate_aria_label_description": {
 			"type": "boolean"
 		}
 	}

package/afm-dev-agents/tsconfig.json

@@ -1,75 +0,0 @@
-{
-	"extends": "../../../../tsconfig.entry-points.dev-agents.json",
-	"compilerOptions": {
-		"declaration": true,
-		"target": "es5",
-		"outDir": "../../../../../dev-agents/tsDist/@atlaskit__user-picker/app",
-		"rootDir": "../",
-		"composite": true
-	},
-	"include": [
-		"../src/**/*.ts",
-		"../src/**/*.tsx"
-	],
-	"exclude": [
-		"../src/**/__tests__/*",
-		"../src/**/*.test.*",
-		"../src/**/test.*",
-		"../src/**/examples.*",
-		"../src/**/examples/*",
-		"../src/**/examples/**/*",
-		"../src/**/*.stories.*",
-		"../src/**/stories/*",
-		"../src/**/stories/**/*"
-	],
-	"references": [
-		{
-			"path": "../../../analytics/analytics-next/afm-dev-agents/tsconfig.json"
-		},
-		{
-			"path": "../../../design-system/avatar/afm-dev-agents/tsconfig.json"
-		},
-		{
-			"path": "../../../design-system/icon/afm-dev-agents/tsconfig.json"
-		},
-		{
-			"path": "../../../design-system/logo/afm-dev-agents/tsconfig.json"
-		},
-		{
-			"path": "../../../design-system/lozenge/afm-dev-agents/tsconfig.json"
-		},
-		{
-			"path": "../../../people-and-teams/people-teams-ui-public/afm-dev-agents/tsconfig.json"
-		},
-		{
-			"path": "../../../platform/feature-flags/afm-dev-agents/tsconfig.json"
-		},
-		{
-			"path": "../../../design-system/popper/afm-dev-agents/tsconfig.json"
-		},
-		{
-			"path": "../../../design-system/primitives/afm-dev-agents/tsconfig.json"
-		},
-		{
-			"path": "../../../design-system/select/afm-dev-agents/tsconfig.json"
-		},
-		{
-			"path": "../../../design-system/spinner/afm-dev-agents/tsconfig.json"
-		},
-		{
-			"path": "../../../people-and-teams/teams-avatar/afm-dev-agents/tsconfig.json"
-		},
-		{
-			"path": "../../../design-system/theme/afm-dev-agents/tsconfig.json"
-		},
-		{
-			"path": "../../../design-system/tokens/afm-dev-agents/tsconfig.json"
-		},
-		{
-			"path": "../../../design-system/tooltip/afm-dev-agents/tsconfig.json"
-		},
-		{
-			"path": "../../../data/ufo-external/afm-dev-agents/tsconfig.json"
-		}
-	]
-}

package/afm-passionfruit/tsconfig.json

@@ -1,75 +0,0 @@
-{
-	"extends": "../../../../tsconfig.entry-points.passionfruit.json",
-	"compilerOptions": {
-		"declaration": true,
-		"target": "es5",
-		"outDir": "../../../../../passionfruit/tsDist/@atlaskit__user-picker/app",
-		"rootDir": "../",
-		"composite": true
-	},
-	"include": [
-		"../src/**/*.ts",
-		"../src/**/*.tsx"
-	],
-	"exclude": [
-		"../src/**/__tests__/*",
-		"../src/**/*.test.*",
-		"../src/**/test.*",
-		"../src/**/examples.*",
-		"../src/**/examples/*",
-		"../src/**/examples/**/*",
-		"../src/**/*.stories.*",
-		"../src/**/stories/*",
-		"../src/**/stories/**/*"
-	],
-	"references": [
-		{
-			"path": "../../../analytics/analytics-next/afm-passionfruit/tsconfig.json"
-		},
-		{
-			"path": "../../../design-system/avatar/afm-passionfruit/tsconfig.json"
-		},
-		{
-			"path": "../../../design-system/icon/afm-passionfruit/tsconfig.json"
-		},
-		{
-			"path": "../../../design-system/logo/afm-passionfruit/tsconfig.json"
-		},
-		{
-			"path": "../../../design-system/lozenge/afm-passionfruit/tsconfig.json"
-		},
-		{
-			"path": "../../../people-and-teams/people-teams-ui-public/afm-passionfruit/tsconfig.json"
-		},
-		{
-			"path": "../../../platform/feature-flags/afm-passionfruit/tsconfig.json"
-		},
-		{
-			"path": "../../../design-system/popper/afm-passionfruit/tsconfig.json"
-		},
-		{
-			"path": "../../../design-system/primitives/afm-passionfruit/tsconfig.json"
-		},
-		{
-			"path": "../../../design-system/select/afm-passionfruit/tsconfig.json"
-		},
-		{
-			"path": "../../../design-system/spinner/afm-passionfruit/tsconfig.json"
-		},
-		{
-			"path": "../../../people-and-teams/teams-avatar/afm-passionfruit/tsconfig.json"
-		},
-		{
-			"path": "../../../design-system/theme/afm-passionfruit/tsconfig.json"
-		},
-		{
-			"path": "../../../design-system/tokens/afm-passionfruit/tsconfig.json"
-		},
-		{
-			"path": "../../../design-system/tooltip/afm-passionfruit/tsconfig.json"
-		},
-		{
-			"path": "../../../data/ufo-external/afm-passionfruit/tsconfig.json"
-		}
-	]
-}

package/afm-post-office/tsconfig.json

@@ -1,75 +0,0 @@
-{
-	"extends": "../../../../tsconfig.entry-points.post-office.json",
-	"compilerOptions": {
-		"declaration": true,
-		"target": "es5",
-		"outDir": "../../../../../post-office/tsDist/@atlaskit__user-picker/app",
-		"rootDir": "../",
-		"composite": true
-	},
-	"include": [
-		"../src/**/*.ts",
-		"../src/**/*.tsx"
-	],
-	"exclude": [
-		"../src/**/__tests__/*",
-		"../src/**/*.test.*",
-		"../src/**/test.*",
-		"../src/**/examples.*",
-		"../src/**/examples/*",
-		"../src/**/examples/**/*",
-		"../src/**/*.stories.*",
-		"../src/**/stories/*",
-		"../src/**/stories/**/*"
-	],
-	"references": [
-		{
-			"path": "../../../analytics/analytics-next/afm-post-office/tsconfig.json"
-		},
-		{
-			"path": "../../../design-system/avatar/afm-post-office/tsconfig.json"
-		},
-		{
-			"path": "../../../design-system/icon/afm-post-office/tsconfig.json"
-		},
-		{
-			"path": "../../../design-system/logo/afm-post-office/tsconfig.json"
-		},
-		{
-			"path": "../../../design-system/lozenge/afm-post-office/tsconfig.json"
-		},
-		{
-			"path": "../../../people-and-teams/people-teams-ui-public/afm-post-office/tsconfig.json"
-		},
-		{
-			"path": "../../../platform/feature-flags/afm-post-office/tsconfig.json"
-		},
-		{
-			"path": "../../../design-system/popper/afm-post-office/tsconfig.json"
-		},
-		{
-			"path": "../../../design-system/primitives/afm-post-office/tsconfig.json"
-		},
-		{
-			"path": "../../../design-system/select/afm-post-office/tsconfig.json"
-		},
-		{
-			"path": "../../../design-system/spinner/afm-post-office/tsconfig.json"
-		},
-		{
-			"path": "../../../people-and-teams/teams-avatar/afm-post-office/tsconfig.json"
-		},
-		{
-			"path": "../../../design-system/theme/afm-post-office/tsconfig.json"
-		},
-		{
-			"path": "../../../design-system/tokens/afm-post-office/tsconfig.json"
-		},
-		{
-			"path": "../../../design-system/tooltip/afm-post-office/tsconfig.json"
-		},
-		{
-			"path": "../../../data/ufo-external/afm-post-office/tsconfig.json"
-		}
-	]
-}

package/afm-rovo-extension/tsconfig.json

@@ -1,75 +0,0 @@
-{
-	"extends": "../../../../tsconfig.entry-points.rovo-extension.json",
-	"compilerOptions": {
-		"declaration": true,
-		"target": "es5",
-		"outDir": "../../../../../rovo-extension/tsDist/@atlaskit__user-picker/app",
-		"rootDir": "../",
-		"composite": true
-	},
-	"include": [
-		"../src/**/*.ts",
-		"../src/**/*.tsx"
-	],
-	"exclude": [
-		"../src/**/__tests__/*",
-		"../src/**/*.test.*",
-		"../src/**/test.*",
-		"../src/**/examples.*",
-		"../src/**/examples/*",
-		"../src/**/examples/**/*",
-		"../src/**/*.stories.*",
-		"../src/**/stories/*",
-		"../src/**/stories/**/*"
-	],
-	"references": [
-		{
-			"path": "../../../analytics/analytics-next/afm-rovo-extension/tsconfig.json"
-		},
-		{
-			"path": "../../../design-system/avatar/afm-rovo-extension/tsconfig.json"
-		},
-		{
-			"path": "../../../design-system/icon/afm-rovo-extension/tsconfig.json"
-		},
-		{
-			"path": "../../../design-system/logo/afm-rovo-extension/tsconfig.json"
-		},
-		{
-			"path": "../../../design-system/lozenge/afm-rovo-extension/tsconfig.json"
-		},
-		{
-			"path": "../../../people-and-teams/people-teams-ui-public/afm-rovo-extension/tsconfig.json"
-		},
-		{
-			"path": "../../../platform/feature-flags/afm-rovo-extension/tsconfig.json"
-		},
-		{
-			"path": "../../../design-system/popper/afm-rovo-extension/tsconfig.json"
-		},
-		{
-			"path": "../../../design-system/primitives/afm-rovo-extension/tsconfig.json"
-		},
-		{
-			"path": "../../../design-system/select/afm-rovo-extension/tsconfig.json"
-		},
-		{
-			"path": "../../../design-system/spinner/afm-rovo-extension/tsconfig.json"
-		},
-		{
-			"path": "../../../people-and-teams/teams-avatar/afm-rovo-extension/tsconfig.json"
-		},
-		{
-			"path": "../../../design-system/theme/afm-rovo-extension/tsconfig.json"
-		},
-		{
-			"path": "../../../design-system/tokens/afm-rovo-extension/tsconfig.json"
-		},
-		{
-			"path": "../../../design-system/tooltip/afm-rovo-extension/tsconfig.json"
-		},
-		{
-			"path": "../../../data/ufo-external/afm-rovo-extension/tsconfig.json"
-		}
-	]
-}

package/afm-townsquare/tsconfig.json

@@ -1,75 +0,0 @@
-{
-	"extends": "../../../../tsconfig.entry-points.townsquare.json",
-	"compilerOptions": {
-		"declaration": true,
-		"target": "es5",
-		"outDir": "../../../../../townsquare/tsDist/@atlaskit__user-picker/app",
-		"rootDir": "../",
-		"composite": true
-	},
-	"include": [
-		"../src/**/*.ts",
-		"../src/**/*.tsx"
-	],
-	"exclude": [
-		"../src/**/__tests__/*",
-		"../src/**/*.test.*",
-		"../src/**/test.*",
-		"../src/**/examples.*",
-		"../src/**/examples/*",
-		"../src/**/examples/**/*",
-		"../src/**/*.stories.*",
-		"../src/**/stories/*",
-		"../src/**/stories/**/*"
-	],
-	"references": [
-		{
-			"path": "../../../analytics/analytics-next/afm-townsquare/tsconfig.json"
-		},
-		{
-			"path": "../../../design-system/avatar/afm-townsquare/tsconfig.json"
-		},
-		{
-			"path": "../../../design-system/icon/afm-townsquare/tsconfig.json"
-		},
-		{
-			"path": "../../../design-system/logo/afm-townsquare/tsconfig.json"
-		},
-		{
-			"path": "../../../design-system/lozenge/afm-townsquare/tsconfig.json"
-		},
-		{
-			"path": "../../../people-and-teams/people-teams-ui-public/afm-townsquare/tsconfig.json"
-		},
-		{
-			"path": "../../../platform/feature-flags/afm-townsquare/tsconfig.json"
-		},
-		{
-			"path": "../../../design-system/popper/afm-townsquare/tsconfig.json"
-		},
-		{
-			"path": "../../../design-system/primitives/afm-townsquare/tsconfig.json"
-		},
-		{
-			"path": "../../../design-system/select/afm-townsquare/tsconfig.json"
-		},
-		{
-			"path": "../../../design-system/spinner/afm-townsquare/tsconfig.json"
-		},
-		{
-			"path": "../../../people-and-teams/teams-avatar/afm-townsquare/tsconfig.json"
-		},
-		{
-			"path": "../../../design-system/theme/afm-townsquare/tsconfig.json"
-		},
-		{
-			"path": "../../../design-system/tokens/afm-townsquare/tsconfig.json"
-		},
-		{
-			"path": "../../../design-system/tooltip/afm-townsquare/tsconfig.json"
-		},
-		{
-			"path": "../../../data/ufo-external/afm-townsquare/tsconfig.json"
-		}
-	]
-}

package/afm-volt/tsconfig.json

@@ -1,75 +0,0 @@
-{
-	"extends": "../../../../tsconfig.entry-points.volt.json",
-	"compilerOptions": {
-		"declaration": true,
-		"target": "es5",
-		"outDir": "../../../../../volt/tsDist/@atlaskit__user-picker/app",
-		"rootDir": "../",
-		"composite": true
-	},
-	"include": [
-		"../src/**/*.ts",
-		"../src/**/*.tsx"
-	],
-	"exclude": [
-		"../src/**/__tests__/*",
-		"../src/**/*.test.*",
-		"../src/**/test.*",
-		"../src/**/examples.*",
-		"../src/**/examples/*",
-		"../src/**/examples/**/*",
-		"../src/**/*.stories.*",
-		"../src/**/stories/*",
-		"../src/**/stories/**/*"
-	],
-	"references": [
-		{
-			"path": "../../../analytics/analytics-next/afm-volt/tsconfig.json"
-		},
-		{
-			"path": "../../../design-system/avatar/afm-volt/tsconfig.json"
-		},
-		{
-			"path": "../../../design-system/icon/afm-volt/tsconfig.json"
-		},
-		{
-			"path": "../../../design-system/logo/afm-volt/tsconfig.json"
-		},
-		{
-			"path": "../../../design-system/lozenge/afm-volt/tsconfig.json"
-		},
-		{
-			"path": "../../../people-and-teams/people-teams-ui-public/afm-volt/tsconfig.json"
-		},
-		{
-			"path": "../../../platform/feature-flags/afm-volt/tsconfig.json"
-		},
-		{
-			"path": "../../../design-system/popper/afm-volt/tsconfig.json"
-		},
-		{
-			"path": "../../../design-system/primitives/afm-volt/tsconfig.json"
-		},
-		{
-			"path": "../../../design-system/select/afm-volt/tsconfig.json"
-		},
-		{
-			"path": "../../../design-system/spinner/afm-volt/tsconfig.json"
-		},
-		{
-			"path": "../../../people-and-teams/teams-avatar/afm-volt/tsconfig.json"
-		},
-		{
-			"path": "../../../design-system/theme/afm-volt/tsconfig.json"
-		},
-		{
-			"path": "../../../design-system/tokens/afm-volt/tsconfig.json"
-		},
-		{
-			"path": "../../../design-system/tooltip/afm-volt/tsconfig.json"
-		},
-		{
-			"path": "../../../data/ufo-external/afm-volt/tsconfig.json"
-		}
-	]
-}