@atlaskit/smart-user-picker 11.3.0 → 11.3.2

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # @atlassian/smart-user-picker
 
+## 11.3.2
+
+### Patch Changes
+
+- [`4bdae29c77827`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/4bdae29c77827) -
+  Fix suggestEmailsForDomain being suppressed for partial (non-email) input when enableEmailSearch
+  and allowEmailSelectionWhenEmailMatched=false are both set. The WAR-5498 FG cleanup (2026-03-04)
+  made the isEmailQuery restriction unconditional, breaking the domain-suggestion creatable option
+  (e.g. "asdf@atlassian.com"). Behind the new gate smart_user_picker_suggest_emails_for_domain,
+  partial queries now allow the domain suggestion to render, while the email option remains
+  suppressed when a full email query matches an existing user, or when the synthesized
+  "<query>@<domain>" address already belongs to a returned user.
+
+## 11.3.1
+
+### Patch Changes
+
+- [`f834c7d669731`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/f834c7d669731) -
+  Removed feature gate TWCG-444 for Unified Share Dialogue experiment. No change in functionality
+- Updated dependencies
+
 ## 11.3.0
 
 ### Minor Changes

package/dist/cjs/analytics.js

@@ -12,7 +12,7 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 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; } // eslint-disable-next-line @typescript-eslint/consistent-type-imports
 // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
 var packageName = "@atlaskit/smart-user-picker";
-var packageVersion = "11.2.0";
+var packageVersion = "11.3.1";
 var startSession = exports.startSession = function startSession() {
   return {
     // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead

package/dist/cjs/components/SmartUserPicker.js

@@ -32,7 +32,7 @@ var _MessagesIntlProvider = _interopRequireDefault(require("./MessagesIntlProvid
 var _types = require("../types");
 var _service = require("../service");
 var _ufoExperiences = require("../ufoExperiences");
-var _excluded = ["allowEmail", "enableEmailSearch", "allowEmailSelectionWhenEmailMatched"];
+var _excluded = ["allowEmail", "enableEmailSearch", "allowEmailSelectionWhenEmailMatched", "suggestEmailsForDomain"];
 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 _t1 in e) "default" !== _t1 && {}.hasOwnProperty.call(e, _t1) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t1)) && (i.get || i.set) ? o(f, _t1, i) : f[_t1] = e[_t1]); return f; })(e, t); }
 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; } } }; }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
@@ -93,6 +93,9 @@ var SmartUserPickerWithoutAnalytics = exports.SmartUserPickerWithoutAnalytics =
     });
     // Track if the last search was an email search that found matches
     (0, _defineProperty2.default)(_this, "lastEmailSearchFoundMatches", false);
+    // Track if the domain-suggested email (`<query>@<suggestEmailsForDomain>`) for a partial
+    // query already belongs to a returned user, in which case the suggestion is redundant
+    (0, _defineProperty2.default)(_this, "lastDomainSuggestionMatchedUser", false);
     (0, _defineProperty2.default)(_this, "abortOptionsShownUfoExperience", function () {
       if (_this.optionsShownUfoExperienceInstance.state.id === _ufo.UFOExperienceState.STARTED.id) {
         // There may be an existing UFO timing running from previous key entry or focus,
@@ -118,7 +121,7 @@ var SmartUserPickerWithoutAnalytics = exports.SmartUserPickerWithoutAnalytics =
     });
     (0, _defineProperty2.default)(_this, "memoizedFilterOptions", (0, _memoizeOne.default)(_this.filterOptions));
     (0, _defineProperty2.default)(_this, "getUsers", (0, _debounce.default)( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
-      var _this$state, query, sessionId, closed, _this$props, baseUrl, childObjectId, containerId, fieldId, includeGroups, includeTeams, includeTeamsUpdates, includeUsers, includeNonLicensedUsers, intl, fetchOptions, maxOptions, objectId, onEmpty, onError, overrideByline, displayEmailInByline, verifiedTeams, orgId, userbaseId, principalId, productAttributes, productKey, restrictTo, searchQueryFilter, siteId, isTeamSyncedToGroupDirectoryFilter, transformOptions, userResolvers, enableEmailSearch, maxNumberOfResults, startTime, isEmail, recommendationsRequest, _yield$onEmpty, _query, recommendedUsers, userRecommendationsPromise, userResolversPromises, _yield$Promise$all, _yield$Promise$all2, mainRecommendations, userResolverResults, _iterator, _step, option, _iterator2, _step2, _option, _iterator3, _step3, _option2, userMatches, elapsedTimeMilli, transformedOptions, displayedUsers, is5xxEvent, onErrorProducedError, defaultUsers, _elapsedTimeMilli, _t, _t2, _t3, _t4, _t5, _t6, _t7, _t8, _t9;
+      var _this$state, query, sessionId, closed, _this$props, baseUrl, childObjectId, containerId, fieldId, includeGroups, includeTeams, includeTeamsUpdates, includeUsers, includeNonLicensedUsers, intl, fetchOptions, maxOptions, objectId, onEmpty, onError, overrideByline, displayEmailInByline, verifiedTeams, orgId, userbaseId, principalId, productAttributes, productKey, restrictTo, searchQueryFilter, siteId, isTeamSyncedToGroupDirectoryFilter, transformOptions, userResolvers, enableEmailSearch, maxNumberOfResults, startTime, isEmail, recommendationsRequest, _yield$onEmpty, _query, recommendedUsers, userRecommendationsPromise, userResolversPromises, _yield$Promise$all, _yield$Promise$all2, mainRecommendations, userResolverResults, _iterator, _step, option, _iterator2, _step2, _option, _iterator3, _step3, _option2, userMatches, suggestEmailsForDomain, suggestedEmail, elapsedTimeMilli, transformedOptions, displayedUsers, is5xxEvent, onErrorProducedError, defaultUsers, _elapsedTimeMilli, _t, _t2, _t3, _t4, _t5, _t6, _t7, _t8, _t9;
       return _regenerator.default.wrap(function (_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -176,13 +179,9 @@ var SmartUserPickerWithoutAnalytics = exports.SmartUserPickerWithoutAnalytics =
             return fetchOptions(_query);
           case 2:
             recommendedUsers = _context.sent;
-            _context.next = 7;
+            _context.next = 5;
             break;
           case 3:
-            if (!(0, _platformFeatureFlags.fg)('twcg-444-invite-usd-improvements-m2-gate')) {
-              _context.next = 5;
-              break;
-            }
             userRecommendationsPromise = (0, _service.getUserRecommendations)(recommendationsRequest, intl);
             userResolversPromises = (userResolvers !== null && userResolvers !== void 0 ? userResolvers : []).map(function (resolver) {
               return resolver(_query).catch(function (error) {
@@ -201,14 +200,7 @@ var SmartUserPickerWithoutAnalytics = exports.SmartUserPickerWithoutAnalytics =
             mainRecommendations = _yield$Promise$all2[0];
             userResolverResults = _arrayLikeToArray(_yield$Promise$all2).slice(1);
             recommendedUsers = [mainRecommendations].concat((0, _toConsumableArray2.default)(userResolverResults)).flat();
-            _context.next = 7;
-            break;
           case 5:
-            _context.next = 6;
-            return (0, _service.getUserRecommendations)(recommendationsRequest, intl);
-          case 6:
-            recommendedUsers = _context.sent;
-          case 7:
             if (overrideByline) {
               _iterator = _createForOfIteratorHelper(recommendedUsers);
               try {
@@ -270,52 +262,66 @@ var SmartUserPickerWithoutAnalytics = exports.SmartUserPickerWithoutAnalytics =
             } else {
               _this.lastEmailSearchFoundMatches = false;
             }
+
+            // For a partial query with a suggested domain, check whether the email we would
+            // synthesize (`<query>@<domain>`) already belongs to one of the returned users. If so,
+            // the real user option is shown instead and the email suggestion is suppressed.
+            suggestEmailsForDomain = _this.props.suggestEmailsForDomain;
+            if (suggestEmailsForDomain && !isEmail && _query) {
+              suggestedEmail = "".concat(_query, "@").concat(suggestEmailsForDomain).toLowerCase();
+              _this.lastDomainSuggestionMatchedUser = recommendedUsers.some(function (option) {
+                var _option$email;
+                return ((0, _userPicker.isUser)(option) || (0, _userPicker.isExternalUser)(option)) && ((_option$email = option.email) === null || _option$email === void 0 ? void 0 : _option$email.toLowerCase()) === suggestedEmail;
+              });
+            } else {
+              _this.lastDomainSuggestionMatchedUser = false;
+            }
             elapsedTimeMilli = window.performance.now() - startTime;
             if (!transformOptions) {
-              _context.next = 9;
+              _context.next = 7;
               break;
             }
-            _context.next = 8;
+            _context.next = 6;
             return transformOptions(recommendedUsers, _query);
-          case 8:
+          case 6:
             _t = _context.sent;
-            _context.next = 10;
+            _context.next = 8;
             break;
-          case 9:
+          case 7:
             _t = recommendedUsers;
-          case 10:
+          case 8:
             transformedOptions = _t;
             if (!(transformedOptions.length === 0 && onEmpty)) {
-              _context.next = 15;
+              _context.next = 13;
               break;
             }
-            _context.next = 11;
+            _context.next = 9;
             return onEmpty(_query);
-          case 11:
+          case 9:
             _t4 = _yield$onEmpty = _context.sent;
             _t3 = _t4 !== null;
             if (!_t3) {
-              _context.next = 12;
+              _context.next = 10;
               break;
             }
             _t3 = _yield$onEmpty !== void 0;
-          case 12:
+          case 10:
             if (!_t3) {
-              _context.next = 13;
+              _context.next = 11;
               break;
             }
             _t5 = _yield$onEmpty;
-            _context.next = 14;
+            _context.next = 12;
             break;
-          case 13:
+          case 11:
             _t5 = [];
-          case 14:
+          case 12:
             _t2 = _t5;
-            _context.next = 16;
+            _context.next = 14;
             break;
-          case 15:
+          case 13:
             _t2 = transformedOptions;
-          case 16:
+          case 14:
             displayedUsers = _t2;
             _this.setState(function (state) {
               var applicable = state.query === _query;
@@ -327,7 +333,7 @@ var SmartUserPickerWithoutAnalytics = exports.SmartUserPickerWithoutAnalytics =
                 displayedUsers: getUsersForAnalytics(displayedUsers),
                 productAttributes: productAttributes,
                 applicable: applicable
-              }, (0, _platformFeatureFlags.fg)('twcg-444-invite-usd-improvements-m2-gate') && {
+              }, {
                 userResolvers: Array.isArray(userResolvers) ? userResolvers.map(function (resolver) {
                   return resolver.name;
                 }) : []
@@ -337,10 +343,10 @@ var SmartUserPickerWithoutAnalytics = exports.SmartUserPickerWithoutAnalytics =
                 loading: loading
               };
             });
-            _context.next = 25;
+            _context.next = 23;
             break;
-          case 17:
-            _context.prev = 17;
+          case 15:
+            _context.prev = 15;
             _t6 = _context["catch"](1);
             is5xxEvent = checkIf500Event(_t6.statusCode);
             if (!closed && !onError && is5xxEvent) {
@@ -353,35 +359,35 @@ var SmartUserPickerWithoutAnalytics = exports.SmartUserPickerWithoutAnalytics =
             });
             onErrorProducedError = false;
             defaultUsers = [];
-            _context.prev = 18;
+            _context.prev = 16;
             if (!onError) {
-              _context.next = 21;
+              _context.next = 19;
               break;
             }
-            _context.next = 19;
+            _context.next = 17;
             return onError(_t6, recommendationsRequest);
-          case 19:
+          case 17:
             _t8 = _context.sent;
             if (_t8) {
-              _context.next = 20;
+              _context.next = 18;
               break;
             }
             _t8 = [];
-          case 20:
+          case 18:
             _t7 = _t8;
-            _context.next = 22;
+            _context.next = 20;
             break;
-          case 21:
+          case 19:
             _t7 = [];
-          case 22:
+          case 20:
             defaultUsers = _t7;
-            _context.next = 24;
+            _context.next = 22;
             break;
-          case 23:
-            _context.prev = 23;
-            _t9 = _context["catch"](18);
+          case 21:
+            _context.prev = 21;
+            _t9 = _context["catch"](16);
             onErrorProducedError = true;
-          case 24:
+          case 22:
             if (onErrorProducedError && is5xxEvent) {
               // Log error from fallback data source `onError` to UFO
               _this.optionsShownUfoExperienceInstance.failure(ufoEndStateConfig(_this.props.fieldId));
@@ -398,11 +404,11 @@ var SmartUserPickerWithoutAnalytics = exports.SmartUserPickerWithoutAnalytics =
               elapsedTimeMilli: _elapsedTimeMilli,
               productAttributes: productAttributes
             });
-          case 25:
+          case 23:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[1, 17], [18, 23]]);
+      }, _callee, null, [[1, 15], [16, 21]]);
     })), (_this$props$debounceT = _this.props.debounceTime) !== null && _this$props$debounceT !== void 0 ? _this$props$debounceT : 0));
     (0, _defineProperty2.default)(_this, "onInputChange", function (newQuery, sessionId) {
       var query = newQuery || '';
@@ -577,19 +583,34 @@ var SmartUserPickerWithoutAnalytics = exports.SmartUserPickerWithoutAnalytics =
         allowEmail = _this$props2.allowEmail,
         enableEmailSearch = _this$props2.enableEmailSearch,
         allowEmailSelectionWhenEmailMatched = _this$props2.allowEmailSelectionWhenEmailMatched,
+        suggestEmailsForDomain = _this$props2.suggestEmailsForDomain,
         restProps = (0, _objectWithoutProperties2.default)(_this$props2, _excluded);
 
       // Determine whether to allow email selection based on allowEmailSelectionWhenEmailMatched, if needed
       var shouldAllowEmail = allowEmail;
+
+      // When suggestEmailsForDomain is active, partial (non-email) input must still reach the base
+      // picker's domain-suggestion creatable logic, so the isEmailQuery restriction is relaxed for
+      // those queries only. Full email queries that matched an existing user remain suppressed.
+      var isDomainSuggestionEnabled = (0, _platformFeatureFlags.fg)('smart_user_picker_suggest_emails_for_domain') && !!suggestEmailsForDomain;
       if (allowEmail && enableEmailSearch && !allowEmailSelectionWhenEmailMatched) {
         var isCurrentQueryEmail = isEmailQuery(this.state.query);
-        // Only allow email selection when:
-        // 1. The query matches email format (validated by regex)
-        // 2. No user/external user matches were found (only teams/groups suggested)
-        shouldAllowEmail = isCurrentQueryEmail && !this.lastEmailSearchFoundMatches;
+        if (isDomainSuggestionEnabled) {
+          // Allow email for partial queries so the "<query>@<domain>" suggestion can render,
+          // but still suppress selection when a full email query matched an existing user,
+          // or when the synthesized "<query>@<domain>" is itself an existing user's email.
+          shouldAllowEmail = isCurrentQueryEmail ? !this.lastEmailSearchFoundMatches // full email: suppress when user matched
+          : !this.lastDomainSuggestionMatchedUser; // partial: suppress when synth email matched a user
+        } else {
+          // Only allow email selection when:
+          // 1. The query matches email format (validated by regex)
+          // 2. No user/external user matches were found (only teams/groups suggested)
+          shouldAllowEmail = isCurrentQueryEmail && !this.lastEmailSearchFoundMatches;
+        }
       }
       return /*#__PURE__*/_react.default.createElement(_MessagesIntlProvider.default, null, /*#__PURE__*/_react.default.createElement(_userPicker.default, (0, _extends2.default)({}, restProps, {
         allowEmail: shouldAllowEmail,
+        suggestEmailsForDomain: suggestEmailsForDomain,
         onInputChange: this.onInputChange,
         onBlur: this.onBlur,
         onFocus: this.onFocus,

package/dist/es2019/analytics.js

@@ -3,7 +3,7 @@ import { createAndFireEvent } from '@atlaskit/analytics-next';
 // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
 import { v4 as uuid } from 'uuid';
 const packageName = "@atlaskit/smart-user-picker";
-const packageVersion = "11.2.0";
+const packageVersion = "11.3.1";
 export const startSession = () => ({
   // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
   id: uuid(),

package/dist/es2019/components/SmartUserPicker.js

@@ -58,6 +58,9 @@ export class SmartUserPickerWithoutAnalytics extends React.Component {
     });
     // Track if the last search was an email search that found matches
     _defineProperty(this, "lastEmailSearchFoundMatches", false);
+    // Track if the domain-suggested email (`<query>@<suggestEmailsForDomain>`) for a partial
+    // query already belongs to a returned user, in which case the suggestion is redundant
+    _defineProperty(this, "lastDomainSuggestionMatchedUser", false);
     _defineProperty(this, "abortOptionsShownUfoExperience", () => {
       if (this.optionsShownUfoExperienceInstance.state.id === UFOExperienceState.STARTED.id) {
         // There may be an existing UFO timing running from previous key entry or focus,
@@ -171,7 +174,7 @@ export class SmartUserPickerWithoutAnalytics extends React.Component {
         let recommendedUsers;
         if (fetchOptions && fg('smart-user-picker-load-options-gate')) {
           recommendedUsers = await fetchOptions(query);
-        } else if (fg('twcg-444-invite-usd-improvements-m2-gate')) {
+        } else {
           const userRecommendationsPromise = getUserRecommendations(recommendationsRequest, intl);
           const userResolversPromises = (userResolvers !== null && userResolvers !== void 0 ? userResolvers : []).map(resolver => resolver(query).catch(error => {
             this.fireEvent(failedUserResolversEvent, {
@@ -182,8 +185,6 @@ export class SmartUserPickerWithoutAnalytics extends React.Component {
           }));
           const [mainRecommendations, ...userResolverResults] = await Promise.all([userRecommendationsPromise, ...userResolversPromises]);
           recommendedUsers = [mainRecommendations, ...userResolverResults].flat();
-        } else {
-          recommendedUsers = await getUserRecommendations(recommendationsRequest, intl);
         }
         if (overrideByline) {
           for (let option of recommendedUsers) {
@@ -220,6 +221,22 @@ export class SmartUserPickerWithoutAnalytics extends React.Component {
         } else {
           this.lastEmailSearchFoundMatches = false;
         }
+
+        // For a partial query with a suggested domain, check whether the email we would
+        // synthesize (`<query>@<domain>`) already belongs to one of the returned users. If so,
+        // the real user option is shown instead and the email suggestion is suppressed.
+        const {
+          suggestEmailsForDomain
+        } = this.props;
+        if (suggestEmailsForDomain && !isEmail && query) {
+          const suggestedEmail = `${query}@${suggestEmailsForDomain}`.toLowerCase();
+          this.lastDomainSuggestionMatchedUser = recommendedUsers.some(option => {
+            var _option$email;
+            return (isUser(option) || isExternalUser(option)) && ((_option$email = option.email) === null || _option$email === void 0 ? void 0 : _option$email.toLowerCase()) === suggestedEmail;
+          });
+        } else {
+          this.lastDomainSuggestionMatchedUser = false;
+        }
         const elapsedTimeMilli = window.performance.now() - startTime;
         const transformedOptions = transformOptions ? await transformOptions(recommendedUsers, query) : recommendedUsers;
         const displayedUsers = transformedOptions.length === 0 && onEmpty ? (_await$onEmpty = await onEmpty(query)) !== null && _await$onEmpty !== void 0 ? _await$onEmpty : [] : transformedOptions;
@@ -233,9 +250,9 @@ export class SmartUserPickerWithoutAnalytics extends React.Component {
             displayedUsers: getUsersForAnalytics(displayedUsers),
             productAttributes,
             applicable,
-            ...(fg('twcg-444-invite-usd-improvements-m2-gate') && {
+            ...{
               userResolvers: Array.isArray(userResolvers) ? userResolvers.map(resolver => resolver.name) : []
-            })
+            }
           });
           return {
             users,
@@ -421,20 +438,35 @@ export class SmartUserPickerWithoutAnalytics extends React.Component {
       allowEmail,
       enableEmailSearch,
       allowEmailSelectionWhenEmailMatched,
+      suggestEmailsForDomain,
       ...restProps
     } = this.props;
 
     // Determine whether to allow email selection based on allowEmailSelectionWhenEmailMatched, if needed
     let shouldAllowEmail = allowEmail;
+
+    // When suggestEmailsForDomain is active, partial (non-email) input must still reach the base
+    // picker's domain-suggestion creatable logic, so the isEmailQuery restriction is relaxed for
+    // those queries only. Full email queries that matched an existing user remain suppressed.
+    const isDomainSuggestionEnabled = fg('smart_user_picker_suggest_emails_for_domain') && !!suggestEmailsForDomain;
     if (allowEmail && enableEmailSearch && !allowEmailSelectionWhenEmailMatched) {
       const isCurrentQueryEmail = isEmailQuery(this.state.query);
-      // Only allow email selection when:
-      // 1. The query matches email format (validated by regex)
-      // 2. No user/external user matches were found (only teams/groups suggested)
-      shouldAllowEmail = isCurrentQueryEmail && !this.lastEmailSearchFoundMatches;
+      if (isDomainSuggestionEnabled) {
+        // Allow email for partial queries so the "<query>@<domain>" suggestion can render,
+        // but still suppress selection when a full email query matched an existing user,
+        // or when the synthesized "<query>@<domain>" is itself an existing user's email.
+        shouldAllowEmail = isCurrentQueryEmail ? !this.lastEmailSearchFoundMatches // full email: suppress when user matched
+        : !this.lastDomainSuggestionMatchedUser; // partial: suppress when synth email matched a user
+      } else {
+        // Only allow email selection when:
+        // 1. The query matches email format (validated by regex)
+        // 2. No user/external user matches were found (only teams/groups suggested)
+        shouldAllowEmail = isCurrentQueryEmail && !this.lastEmailSearchFoundMatches;
+      }
     }
     return /*#__PURE__*/React.createElement(MessagesIntlProvider, null, /*#__PURE__*/React.createElement(UserPicker, _extends({}, restProps, {
       allowEmail: shouldAllowEmail,
+      suggestEmailsForDomain: suggestEmailsForDomain,
       onInputChange: this.onInputChange,
       onBlur: this.onBlur,
       onFocus: this.onFocus,

package/dist/esm/analytics.js

@@ -6,7 +6,7 @@ import { createAndFireEvent } from '@atlaskit/analytics-next';
 // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
 import { v4 as uuid } from 'uuid';
 var packageName = "@atlaskit/smart-user-picker";
-var packageVersion = "11.2.0";
+var packageVersion = "11.3.1";
 export var startSession = function startSession() {
   return {
     // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead

package/dist/esm/components/SmartUserPicker.js

@@ -9,7 +9,7 @@ import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstruct
 import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
 import _inherits from "@babel/runtime/helpers/inherits";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
-var _excluded = ["allowEmail", "enableEmailSearch", "allowEmailSelectionWhenEmailMatched"];
+var _excluded = ["allowEmail", "enableEmailSearch", "allowEmailSelectionWhenEmailMatched", "suggestEmailsForDomain"];
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 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; } } }; }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
@@ -85,6 +85,9 @@ export var SmartUserPickerWithoutAnalytics = /*#__PURE__*/function (_React$Compo
     });
     // Track if the last search was an email search that found matches
     _defineProperty(_this, "lastEmailSearchFoundMatches", false);
+    // Track if the domain-suggested email (`<query>@<suggestEmailsForDomain>`) for a partial
+    // query already belongs to a returned user, in which case the suggestion is redundant
+    _defineProperty(_this, "lastDomainSuggestionMatchedUser", false);
     _defineProperty(_this, "abortOptionsShownUfoExperience", function () {
       if (_this.optionsShownUfoExperienceInstance.state.id === UFOExperienceState.STARTED.id) {
         // There may be an existing UFO timing running from previous key entry or focus,
@@ -110,7 +113,7 @@ export var SmartUserPickerWithoutAnalytics = /*#__PURE__*/function (_React$Compo
     });
     _defineProperty(_this, "memoizedFilterOptions", memoizeOne(_this.filterOptions));
     _defineProperty(_this, "getUsers", debounce( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-      var _this$state, query, sessionId, closed, _this$props, baseUrl, childObjectId, containerId, fieldId, includeGroups, includeTeams, includeTeamsUpdates, includeUsers, includeNonLicensedUsers, intl, fetchOptions, maxOptions, objectId, onEmpty, onError, overrideByline, displayEmailInByline, verifiedTeams, orgId, userbaseId, principalId, productAttributes, productKey, restrictTo, searchQueryFilter, siteId, isTeamSyncedToGroupDirectoryFilter, transformOptions, userResolvers, enableEmailSearch, maxNumberOfResults, startTime, isEmail, recommendationsRequest, _yield$onEmpty, _query, recommendedUsers, userRecommendationsPromise, userResolversPromises, _yield$Promise$all, _yield$Promise$all2, mainRecommendations, userResolverResults, _iterator, _step, option, _iterator2, _step2, _option, _iterator3, _step3, _option2, userMatches, elapsedTimeMilli, transformedOptions, displayedUsers, is5xxEvent, onErrorProducedError, defaultUsers, _elapsedTimeMilli, _t, _t2, _t3, _t4, _t5, _t6, _t7, _t8, _t9;
+      var _this$state, query, sessionId, closed, _this$props, baseUrl, childObjectId, containerId, fieldId, includeGroups, includeTeams, includeTeamsUpdates, includeUsers, includeNonLicensedUsers, intl, fetchOptions, maxOptions, objectId, onEmpty, onError, overrideByline, displayEmailInByline, verifiedTeams, orgId, userbaseId, principalId, productAttributes, productKey, restrictTo, searchQueryFilter, siteId, isTeamSyncedToGroupDirectoryFilter, transformOptions, userResolvers, enableEmailSearch, maxNumberOfResults, startTime, isEmail, recommendationsRequest, _yield$onEmpty, _query, recommendedUsers, userRecommendationsPromise, userResolversPromises, _yield$Promise$all, _yield$Promise$all2, mainRecommendations, userResolverResults, _iterator, _step, option, _iterator2, _step2, _option, _iterator3, _step3, _option2, userMatches, suggestEmailsForDomain, suggestedEmail, elapsedTimeMilli, transformedOptions, displayedUsers, is5xxEvent, onErrorProducedError, defaultUsers, _elapsedTimeMilli, _t, _t2, _t3, _t4, _t5, _t6, _t7, _t8, _t9;
       return _regeneratorRuntime.wrap(function (_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -168,13 +171,9 @@ export var SmartUserPickerWithoutAnalytics = /*#__PURE__*/function (_React$Compo
             return fetchOptions(_query);
           case 2:
             recommendedUsers = _context.sent;
-            _context.next = 7;
+            _context.next = 5;
             break;
           case 3:
-            if (!fg('twcg-444-invite-usd-improvements-m2-gate')) {
-              _context.next = 5;
-              break;
-            }
             userRecommendationsPromise = getUserRecommendations(recommendationsRequest, intl);
             userResolversPromises = (userResolvers !== null && userResolvers !== void 0 ? userResolvers : []).map(function (resolver) {
               return resolver(_query).catch(function (error) {
@@ -193,14 +192,7 @@ export var SmartUserPickerWithoutAnalytics = /*#__PURE__*/function (_React$Compo
             mainRecommendations = _yield$Promise$all2[0];
             userResolverResults = _arrayLikeToArray(_yield$Promise$all2).slice(1);
             recommendedUsers = [mainRecommendations].concat(_toConsumableArray(userResolverResults)).flat();
-            _context.next = 7;
-            break;
           case 5:
-            _context.next = 6;
-            return getUserRecommendations(recommendationsRequest, intl);
-          case 6:
-            recommendedUsers = _context.sent;
-          case 7:
             if (overrideByline) {
               _iterator = _createForOfIteratorHelper(recommendedUsers);
               try {
@@ -262,52 +254,66 @@ export var SmartUserPickerWithoutAnalytics = /*#__PURE__*/function (_React$Compo
             } else {
               _this.lastEmailSearchFoundMatches = false;
             }
+
+            // For a partial query with a suggested domain, check whether the email we would
+            // synthesize (`<query>@<domain>`) already belongs to one of the returned users. If so,
+            // the real user option is shown instead and the email suggestion is suppressed.
+            suggestEmailsForDomain = _this.props.suggestEmailsForDomain;
+            if (suggestEmailsForDomain && !isEmail && _query) {
+              suggestedEmail = "".concat(_query, "@").concat(suggestEmailsForDomain).toLowerCase();
+              _this.lastDomainSuggestionMatchedUser = recommendedUsers.some(function (option) {
+                var _option$email;
+                return (isUser(option) || isExternalUser(option)) && ((_option$email = option.email) === null || _option$email === void 0 ? void 0 : _option$email.toLowerCase()) === suggestedEmail;
+              });
+            } else {
+              _this.lastDomainSuggestionMatchedUser = false;
+            }
             elapsedTimeMilli = window.performance.now() - startTime;
             if (!transformOptions) {
-              _context.next = 9;
+              _context.next = 7;
               break;
             }
-            _context.next = 8;
+            _context.next = 6;
             return transformOptions(recommendedUsers, _query);
-          case 8:
+          case 6:
             _t = _context.sent;
-            _context.next = 10;
+            _context.next = 8;
             break;
-          case 9:
+          case 7:
             _t = recommendedUsers;
-          case 10:
+          case 8:
             transformedOptions = _t;
             if (!(transformedOptions.length === 0 && onEmpty)) {
-              _context.next = 15;
+              _context.next = 13;
               break;
             }
-            _context.next = 11;
+            _context.next = 9;
             return onEmpty(_query);
-          case 11:
+          case 9:
             _t4 = _yield$onEmpty = _context.sent;
             _t3 = _t4 !== null;
             if (!_t3) {
-              _context.next = 12;
+              _context.next = 10;
               break;
             }
             _t3 = _yield$onEmpty !== void 0;
-          case 12:
+          case 10:
             if (!_t3) {
-              _context.next = 13;
+              _context.next = 11;
               break;
             }
             _t5 = _yield$onEmpty;
-            _context.next = 14;
+            _context.next = 12;
             break;
-          case 13:
+          case 11:
             _t5 = [];
-          case 14:
+          case 12:
             _t2 = _t5;
-            _context.next = 16;
+            _context.next = 14;
             break;
-          case 15:
+          case 13:
             _t2 = transformedOptions;
-          case 16:
+          case 14:
             displayedUsers = _t2;
             _this.setState(function (state) {
               var applicable = state.query === _query;
@@ -319,7 +325,7 @@ export var SmartUserPickerWithoutAnalytics = /*#__PURE__*/function (_React$Compo
                 displayedUsers: getUsersForAnalytics(displayedUsers),
                 productAttributes: productAttributes,
                 applicable: applicable
-              }, fg('twcg-444-invite-usd-improvements-m2-gate') && {
+              }, {
                 userResolvers: Array.isArray(userResolvers) ? userResolvers.map(function (resolver) {
                   return resolver.name;
                 }) : []
@@ -329,10 +335,10 @@ export var SmartUserPickerWithoutAnalytics = /*#__PURE__*/function (_React$Compo
                 loading: loading
               };
             });
-            _context.next = 25;
+            _context.next = 23;
             break;
-          case 17:
-            _context.prev = 17;
+          case 15:
+            _context.prev = 15;
             _t6 = _context["catch"](1);
             is5xxEvent = checkIf500Event(_t6.statusCode);
             if (!closed && !onError && is5xxEvent) {
@@ -345,35 +351,35 @@ export var SmartUserPickerWithoutAnalytics = /*#__PURE__*/function (_React$Compo
             });
             onErrorProducedError = false;
             defaultUsers = [];
-            _context.prev = 18;
+            _context.prev = 16;
             if (!onError) {
-              _context.next = 21;
+              _context.next = 19;
               break;
             }
-            _context.next = 19;
+            _context.next = 17;
             return onError(_t6, recommendationsRequest);
-          case 19:
+          case 17:
             _t8 = _context.sent;
             if (_t8) {
-              _context.next = 20;
+              _context.next = 18;
               break;
             }
             _t8 = [];
-          case 20:
+          case 18:
             _t7 = _t8;
-            _context.next = 22;
+            _context.next = 20;
             break;
-          case 21:
+          case 19:
             _t7 = [];
-          case 22:
+          case 20:
             defaultUsers = _t7;
-            _context.next = 24;
+            _context.next = 22;
             break;
-          case 23:
-            _context.prev = 23;
-            _t9 = _context["catch"](18);
+          case 21:
+            _context.prev = 21;
+            _t9 = _context["catch"](16);
             onErrorProducedError = true;
-          case 24:
+          case 22:
             if (onErrorProducedError && is5xxEvent) {
               // Log error from fallback data source `onError` to UFO
               _this.optionsShownUfoExperienceInstance.failure(ufoEndStateConfig(_this.props.fieldId));
@@ -390,11 +396,11 @@ export var SmartUserPickerWithoutAnalytics = /*#__PURE__*/function (_React$Compo
               elapsedTimeMilli: _elapsedTimeMilli,
               productAttributes: productAttributes
             });
-          case 25:
+          case 23:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[1, 17], [18, 23]]);
+      }, _callee, null, [[1, 15], [16, 21]]);
     })), (_this$props$debounceT = _this.props.debounceTime) !== null && _this$props$debounceT !== void 0 ? _this$props$debounceT : 0));
     _defineProperty(_this, "onInputChange", function (newQuery, sessionId) {
       var query = newQuery || '';
@@ -569,19 +575,34 @@ export var SmartUserPickerWithoutAnalytics = /*#__PURE__*/function (_React$Compo
         allowEmail = _this$props2.allowEmail,
         enableEmailSearch = _this$props2.enableEmailSearch,
         allowEmailSelectionWhenEmailMatched = _this$props2.allowEmailSelectionWhenEmailMatched,
+        suggestEmailsForDomain = _this$props2.suggestEmailsForDomain,
         restProps = _objectWithoutProperties(_this$props2, _excluded);
 
       // Determine whether to allow email selection based on allowEmailSelectionWhenEmailMatched, if needed
       var shouldAllowEmail = allowEmail;
+
+      // When suggestEmailsForDomain is active, partial (non-email) input must still reach the base
+      // picker's domain-suggestion creatable logic, so the isEmailQuery restriction is relaxed for
+      // those queries only. Full email queries that matched an existing user remain suppressed.
+      var isDomainSuggestionEnabled = fg('smart_user_picker_suggest_emails_for_domain') && !!suggestEmailsForDomain;
       if (allowEmail && enableEmailSearch && !allowEmailSelectionWhenEmailMatched) {
         var isCurrentQueryEmail = isEmailQuery(this.state.query);
-        // Only allow email selection when:
-        // 1. The query matches email format (validated by regex)
-        // 2. No user/external user matches were found (only teams/groups suggested)
-        shouldAllowEmail = isCurrentQueryEmail && !this.lastEmailSearchFoundMatches;
+        if (isDomainSuggestionEnabled) {
+          // Allow email for partial queries so the "<query>@<domain>" suggestion can render,
+          // but still suppress selection when a full email query matched an existing user,
+          // or when the synthesized "<query>@<domain>" is itself an existing user's email.
+          shouldAllowEmail = isCurrentQueryEmail ? !this.lastEmailSearchFoundMatches // full email: suppress when user matched
+          : !this.lastDomainSuggestionMatchedUser; // partial: suppress when synth email matched a user
+        } else {
+          // Only allow email selection when:
+          // 1. The query matches email format (validated by regex)
+          // 2. No user/external user matches were found (only teams/groups suggested)
+          shouldAllowEmail = isCurrentQueryEmail && !this.lastEmailSearchFoundMatches;
+        }
       }
       return /*#__PURE__*/React.createElement(MessagesIntlProvider, null, /*#__PURE__*/React.createElement(UserPicker, _extends({}, restProps, {
         allowEmail: shouldAllowEmail,
+        suggestEmailsForDomain: suggestEmailsForDomain,
         onInputChange: this.onInputChange,
         onBlur: this.onBlur,
         onFocus: this.onFocus,

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

@@ -8,6 +8,7 @@ import type { DebouncedFunc } from 'lodash';
 export declare class SmartUserPickerWithoutAnalytics extends React.Component<Props & WrappedComponentProps, State> {
     state: State;
     private lastEmailSearchFoundMatches;
+    private lastDomainSuggestionMatchedUser;
     optionsShownUfoExperienceInstance: UFOExperience;
     static defaultProps: {
         baseUrl: string;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/smart-user-picker",
-	"version": "11.3.0",
+	"version": "11.3.2",
 	"license": "Apache-2.0",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -44,7 +44,7 @@
 	"devDependencies": {
 		"@atlaskit/select": "^22.6.0",
 		"@atlaskit/util-data-test": "^19.1.0",
-		"@atlassian/a11y-jest-testing": "^0.13.0",
+		"@atlassian/a11y-jest-testing": "^0.14.0",
 		"@testing-library/dom": "^10.1.0",
 		"@testing-library/react": "^16.3.0",
 		"@testing-library/user-event": "^14.4.3",
@@ -57,7 +57,7 @@
 		"react-intl": "^7.0.0"
 	},
 	"platform-feature-flags": {
-		"twcg-444-invite-usd-improvements-m2-gate": {
+		"smart_user_picker_suggest_emails_for_domain": {
 			"type": "boolean"
 		},
 		"smart-user-picker-load-options-gate": {