@pingux/astro 2.163.1-alpha.1 → 2.163.1-alpha.3

package/lib/cjs/components/PopoverMenu/PopoverMenu.stories.js

@@ -12,10 +12,10 @@ exports["default"] = exports.WithSeparator = exports.WithSections = exports.Plac
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/slicedToArray"));
 var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
 var _react = _interopRequireWildcard(require("react"));
-var _DotsVerticalIcon = _interopRequireDefault(require("@pingux/mdi-react/DotsVerticalIcon"));
 var _addonActions = require("@storybook/addon-actions");
 var _storybookAddonDesigns = require("storybook-addon-designs");
 var _storybookDocsLayout = _interopRequireDefault(require("../../../.storybook/storybookDocsLayout"));
+var _hooks = require("../../hooks");
 var _index = require("../../index");
 var _figmaLinks = require("../../utils/designUtils/figmaLinks");
 var _PopoverMenu = _interopRequireDefault(require("./PopoverMenu.mdx"));
@@ -49,17 +49,20 @@ var _default = exports["default"] = {
   }
 };
 var Default = exports.Default = function Default(args) {
+  var _useGetTheme = (0, _hooks.useGetTheme)(),
+    isOnyx = _useGetTheme.themeState.isOnyx,
+    popoverMenuIcon = _useGetTheme.icons.popoverMenuIcon;
   return (
     // Application must be wrapped in an OverlayProvider so that it can be hidden from screen
     // readers when an overlay opens.
     (0, _react2.jsx)(_index.OverlayProvider, null, (0, _react2.jsx)(_index.PopoverMenu, args, (0, _react2.jsx)(_index.IconButton, {
       "aria-label": "more options",
-      variant: "inverted"
+      variant: isOnyx ? undefined : 'inverted'
     }, (0, _react2.jsx)(_index.Icon, {
-      icon: _DotsVerticalIcon["default"],
+      icon: popoverMenuIcon,
       size: "md",
       title: {
-        name: 'Dots Vertical Icon'
+        name: 'Dots Icon'
       }
     })), (0, _react2.jsx)(_index.Menu, {
       onAction: (0, _addonActions.action)('onAction')
@@ -71,7 +74,7 @@ var Default = exports.Default = function Default(args) {
       key: "delete",
       textValue: "delete"
     }, (0, _react2.jsx)(_index.Text, {
-      color: "critical.bright"
+      color: isOnyx ? 'critical.dark' : 'critical.bright'
     }, "Delete")))))
   );
 };
@@ -82,6 +85,9 @@ Default.parameters = {
   }
 };
 var DefaultOpen = exports.DefaultOpen = function DefaultOpen(args) {
+  var _useGetTheme2 = (0, _hooks.useGetTheme)(),
+    isOnyx = _useGetTheme2.themeState.isOnyx,
+    popoverMenuIcon = _useGetTheme2.icons.popoverMenuIcon;
   return (
     // Application must be wrapped in an OverlayProvider so that it can be hidden from screen
     // readers when an overlay opens.
@@ -89,12 +95,12 @@ var DefaultOpen = exports.DefaultOpen = function DefaultOpen(args) {
       isDefaultOpen: true
     }), (0, _react2.jsx)(_index.IconButton, {
       "aria-label": "more options",
-      variant: "inverted"
+      variant: isOnyx ? undefined : 'inverted'
     }, (0, _react2.jsx)(_index.Icon, {
-      icon: _DotsVerticalIcon["default"],
+      icon: popoverMenuIcon,
       size: "md",
       title: {
-        name: 'Dots Vertical Icon'
+        name: 'Dots Icon'
       }
     })), (0, _react2.jsx)(_index.Menu, {
       onAction: (0, _addonActions.action)('onAction'),
@@ -107,7 +113,7 @@ var DefaultOpen = exports.DefaultOpen = function DefaultOpen(args) {
       key: "delete",
       textValue: "delete"
     }, (0, _react2.jsx)(_index.Text, {
-      color: "critical.bright"
+      color: isOnyx ? 'critical.dark' : 'critical.bright'
     }, "Delete")))))
   );
 };
@@ -116,6 +122,9 @@ var Controlled = exports.Controlled = function Controlled() {
     _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
     isOpen = _useState2[0],
     setIsOpen = _useState2[1];
+  var _useGetTheme3 = (0, _hooks.useGetTheme)(),
+    isOnyx = _useGetTheme3.themeState.isOnyx,
+    popoverMenuIcon = _useGetTheme3.icons.popoverMenuIcon;
   return (
     // Application must be wrapped in an OverlayProvider so that it can be hidden from screen
     // readers when an overlay opens.
@@ -124,12 +133,12 @@ var Controlled = exports.Controlled = function Controlled() {
       onOpenChange: setIsOpen
     }, (0, _react2.jsx)(_index.IconButton, {
       "aria-label": "more options",
-      variant: "inverted"
+      variant: isOnyx ? undefined : 'inverted'
     }, (0, _react2.jsx)(_index.Icon, {
-      icon: _DotsVerticalIcon["default"],
+      icon: popoverMenuIcon,
       size: "md",
       title: {
-        name: 'Dots Vertical Icon'
+        name: 'Dots Icon'
       }
     })), (0, _react2.jsx)(_index.Menu, {
       onAction: (0, _addonActions.action)('onAction')
@@ -141,11 +150,14 @@ var Controlled = exports.Controlled = function Controlled() {
       key: "delete",
       textValue: "delete"
     }, (0, _react2.jsx)(_index.Text, {
-      color: "critical.bright"
+      color: isOnyx ? 'critical.dark' : 'critical.bright'
     }, "Delete")))))
   );
 };
 var Placement = exports.Placement = function Placement(args) {
+  var _useGetTheme4 = (0, _hooks.useGetTheme)(),
+    isOnyx = _useGetTheme4.themeState.isOnyx,
+    popoverMenuIcon = _useGetTheme4.icons.popoverMenuIcon;
   return (
     // Application must be wrapped in an OverlayProvider so that it can be hidden from screen
     // readers when an overlay opens.
@@ -153,12 +165,12 @@ var Placement = exports.Placement = function Placement(args) {
       direction: "left"
     }), (0, _react2.jsx)(_index.IconButton, {
       "aria-label": "more options",
-      variant: "inverted"
+      variant: isOnyx ? undefined : 'inverted'
     }, (0, _react2.jsx)(_index.Icon, {
-      icon: _DotsVerticalIcon["default"],
+      icon: popoverMenuIcon,
       size: "md",
       title: {
-        name: 'Dots Vertical Icon'
+        name: 'Dots Icon'
       }
     })), (0, _react2.jsx)(_index.Menu, {
       onAction: (0, _addonActions.action)('onAction')
@@ -170,11 +182,14 @@ var Placement = exports.Placement = function Placement(args) {
       key: "delete",
       textValue: "delete"
     }, (0, _react2.jsx)(_index.Text, {
-      color: "critical.bright"
+      color: isOnyx ? 'critical.dark' : 'critical.bright'
     }, "Delete")))))
   );
 };
 var NotFlippable = exports.NotFlippable = function NotFlippable(args) {
+  var _useGetTheme5 = (0, _hooks.useGetTheme)(),
+    isOnyx = _useGetTheme5.themeState.isOnyx,
+    popoverMenuIcon = _useGetTheme5.icons.popoverMenuIcon;
   return (
     // Application must be wrapped in an OverlayProvider so that it can be hidden from screen
     // readers when an overlay opens.
@@ -183,12 +198,12 @@ var NotFlippable = exports.NotFlippable = function NotFlippable(args) {
       isNotFlippable: true
     }), (0, _react2.jsx)(_index.IconButton, {
       "aria-label": "more options",
-      variant: "inverted"
+      variant: isOnyx ? undefined : 'inverted'
     }, (0, _react2.jsx)(_index.Icon, {
-      icon: _DotsVerticalIcon["default"],
+      icon: popoverMenuIcon,
       size: "md",
       title: {
-        name: 'Dots Vertical Icon'
+        name: 'Dots Icon'
       }
     })), (0, _react2.jsx)(_index.Menu, {
       onAction: (0, _addonActions.action)('onAction')
@@ -200,11 +215,14 @@ var NotFlippable = exports.NotFlippable = function NotFlippable(args) {
       key: "delete",
       textValue: "delete"
     }, (0, _react2.jsx)(_index.Text, {
-      color: "critical.bright"
+      color: isOnyx ? 'critical.dark' : 'critical.bright'
     }, "Delete")))))
   );
 };
 var NotClosedOnSelect = exports.NotClosedOnSelect = function NotClosedOnSelect(args) {
+  var _useGetTheme6 = (0, _hooks.useGetTheme)(),
+    isOnyx = _useGetTheme6.themeState.isOnyx,
+    popoverMenuIcon = _useGetTheme6.icons.popoverMenuIcon;
   return (
     // Application must be wrapped in an OverlayProvider so that it can be hidden from screen
     // readers when an overlay opens.
@@ -212,12 +230,12 @@ var NotClosedOnSelect = exports.NotClosedOnSelect = function NotClosedOnSelect(a
       isNotClosedOnSelect: true
     }), (0, _react2.jsx)(_index.IconButton, {
       "aria-label": "more options",
-      variant: "inverted"
+      variant: isOnyx ? undefined : 'inverted'
     }, (0, _react2.jsx)(_index.Icon, {
-      icon: _DotsVerticalIcon["default"],
+      icon: popoverMenuIcon,
       size: "md",
       title: {
-        name: 'Dots Vertical Icon'
+        name: 'Dots Icon'
       }
     })), (0, _react2.jsx)(_index.Menu, {
       onAction: (0, _addonActions.action)('onAction')
@@ -229,22 +247,25 @@ var NotClosedOnSelect = exports.NotClosedOnSelect = function NotClosedOnSelect(a
       key: "delete",
       textValue: "delete"
     }, (0, _react2.jsx)(_index.Text, {
-      color: "critical.bright"
+      color: isOnyx ? 'critical.dark' : 'critical.bright'
     }, "Delete")))))
   );
 };
 var WithSeparator = exports.WithSeparator = function WithSeparator(args) {
+  var _useGetTheme7 = (0, _hooks.useGetTheme)(),
+    isOnyx = _useGetTheme7.themeState.isOnyx,
+    popoverMenuIcon = _useGetTheme7.icons.popoverMenuIcon;
   return (
     // Application must be wrapped in an OverlayProvider so that it can be hidden from screen
     // readers when an overlay opens.
     (0, _react2.jsx)(_index.OverlayProvider, null, (0, _react2.jsx)(_index.PopoverMenu, args, (0, _react2.jsx)(_index.IconButton, {
       "aria-label": "more options",
-      variant: "inverted"
+      variant: isOnyx ? undefined : 'inverted'
     }, (0, _react2.jsx)(_index.Icon, {
-      icon: _DotsVerticalIcon["default"],
+      icon: popoverMenuIcon,
       size: "md",
       title: {
-        name: 'Dots Vertical Icon'
+        name: 'Dots Icon'
       }
     })), (0, _react2.jsx)(_index.Menu, {
       onAction: (0, _addonActions.action)('onAction'),
@@ -257,22 +278,25 @@ var WithSeparator = exports.WithSeparator = function WithSeparator(args) {
       key: "delete",
       textValue: "delete"
     }, (0, _react2.jsx)(_index.Text, {
-      color: "critical.bright"
+      color: isOnyx ? 'critical.dark' : 'critical.bright'
     }, "Delete"))))))
   );
 };
 var WithSections = exports.WithSections = function WithSections(args) {
+  var _useGetTheme8 = (0, _hooks.useGetTheme)(),
+    isOnyx = _useGetTheme8.themeState.isOnyx,
+    popoverMenuIcon = _useGetTheme8.icons.popoverMenuIcon;
   return (
     // Application must be wrapped in an OverlayProvider so that it can be hidden from screen
     // readers when an overlay opens.
     (0, _react2.jsx)(_index.OverlayProvider, null, (0, _react2.jsx)(_index.PopoverMenu, args, (0, _react2.jsx)(_index.IconButton, {
       "aria-label": "more options",
-      variant: "inverted"
+      variant: isOnyx ? undefined : 'inverted'
     }, (0, _react2.jsx)(_index.Icon, {
-      icon: _DotsVerticalIcon["default"],
+      icon: popoverMenuIcon,
       size: "md",
       title: {
-        name: 'Dots Vertical Icon'
+        name: 'Dots Icon'
       }
     })), (0, _react2.jsx)(_index.Menu, {
       onAction: (0, _addonActions.action)('onAction'),
@@ -295,7 +319,7 @@ var WithSections = exports.WithSections = function WithSections(args) {
       key: "delete",
       textValue: "delete"
     }, (0, _react2.jsx)(_index.Text, {
-      color: "critical.bright"
+      color: isOnyx ? 'critical.dark' : 'critical.bright'
     }, "Delete"))))))
   );
 };

package/lib/cjs/components/TimeZonePicker/TimeZonePicker.js

@@ -5,7 +5,7 @@ var _Object$keys = require("@babel/runtime-corejs3/core-js-stable/object/keys");
 var _Object$getOwnPropertySymbols = require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-symbols");
 var _filterInstanceProperty2 = require("@babel/runtime-corejs3/core-js-stable/instance/filter");
 var _Object$getOwnPropertyDescriptor = require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptor");
-var _forEachInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/instance/for-each");
+var _forEachInstanceProperty2 = require("@babel/runtime-corejs3/core-js-stable/instance/for-each");
 var _Object$getOwnPropertyDescriptors = require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptors");
 var _Object$defineProperties = require("@babel/runtime-corejs3/core-js-stable/object/define-properties");
 var _Object$defineProperty = require("@babel/runtime-corejs3/core-js-stable/object/define-property");
@@ -16,58 +16,42 @@ _Object$defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/defineProperty"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/slicedToArray"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/objectWithoutProperties"));
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/defineProperty"));
 var _includes = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/includes"));
 var _concat = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/concat"));
+var _sort = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/sort"));
 var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/map"));
 var _entries = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/entries"));
+var _find = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/find"));
 var _filter = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/filter"));
-var _indexOf = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/index-of"));
-var _parseFloat2 = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/parse-float"));
-var _sort = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/sort"));
+var _map2 = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/map"));
+var _forEach = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/for-each"));
 var _react = _interopRequireWildcard(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _index = require("../../index");
 var _pendoID = require("../../utils/devUtils/constants/pendoID");
+var _helper = require("./helper");
 var _timezones = _interopRequireWildcard(require("./timezones"));
 var _react2 = require("@emotion/react");
 var _excluded = ["additionalTimeZones", "emptySearchText", "locales", "localeOptions"];
 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 = _filterInstanceProperty2(o).call(o, 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 _context8, _context9; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context8 = ownKeys(Object(t), !0)).call(_context8, function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context9 = ownKeys(Object(t))).call(_context9, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var _context8, _context9; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty2(_context8 = ownKeys(Object(t), !0)).call(_context8, function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty2(_context9 = ownKeys(Object(t))).call(_context9, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
 var createSearchTags = function createSearchTags(_ref) {
-  var _context, _context2, _context3, _context4;
+  var _context, _context2, _context3;
   var gmt = _ref.gmt,
-    gmtLabel = _ref.gmtLabel,
     timeZone = _ref.timeZone;
+  var normalizedTz = timeZone.replace(/_/g, ' ');
   var additionalTags = '';
-  var americaTimeZone = (0, _includes["default"])(timeZone).call(timeZone, 'America') && timeZone.substring(8);
-  if ((0, _includes["default"])(_timezones.usCities).call(_timezones.usCities, americaTimeZone)) {
-    additionalTags = "US ".concat(americaTimeZone);
+  if ((0, _includes["default"])(timeZone).call(timeZone, 'America')) {
+    var city = timeZone.split('/')[1];
+    if ((0, _includes["default"])(_timezones.usCities).call(_timezones.usCities, city)) {
+      additionalTags = "US ".concat(city);
+    }
   }
-  return (0, _concat["default"])(_context = (0, _concat["default"])(_context2 = (0, _concat["default"])(_context3 = (0, _concat["default"])(_context4 = "".concat(gmt, " ")).call(_context4, gmtLabel, " ")).call(_context3, timeZone, " ")).call(_context2, timeZone === null || timeZone === void 0 ? void 0 : timeZone.replace(/_/g, ' '), " ")).call(_context, additionalTags);
-};
-var getLocaleTime = function getLocaleTime(_ref2) {
-  var timeZone = _ref2.timeZone,
-    locales = _ref2.locales,
-    localeOptions = _ref2.localeOptions;
-  var date = new Date();
-  return date.toLocaleTimeString(locales, _objectSpread({
-    timeZone: timeZone
-  }, localeOptions));
-};
-var getTimezoneOffset = function getTimezoneOffset(timeZone) {
-  var now = new Date();
-  var tzString = now.toLocaleString('en-US', {
-    timeZone: timeZone
-  });
-  var localString = now.toLocaleString('en-US');
-  var diff = (Date.parse(localString) - Date.parse(tzString)) / 3600000;
-  var offset = -(diff + now.getTimezoneOffset() / 60);
-  var formattedString = "".concat(offset, ":00");
-  return offset > 0 ? "+".concat(formattedString) : formattedString;
+  return (0, _concat["default"])(_context = (0, _concat["default"])(_context2 = (0, _concat["default"])(_context3 = "".concat(gmt, " ")).call(_context3, timeZone, " ")).call(_context2, normalizedTz, " ")).call(_context, additionalTags).toUpperCase();
 };
 var TimeZonePicker = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   var additionalTimeZones = props.additionalTimeZones,
@@ -79,127 +63,120 @@ var TimeZonePicker = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
     search = _useState2[0],
     setSearch = _useState2[1];
-  var _useState3 = (0, _react.useState)(true),
+  var _useState3 = (0, _react.useState)(''),
     _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
-    timeUpdate = _useState4[0],
-    setTimeUpdate = _useState4[1];
-  var _useState5 = (0, _react.useState)([]),
-    _useState6 = (0, _slicedToArray2["default"])(_useState5, 2),
-    timeZones = _useState6[0],
-    setTimeZones = _useState6[1];
-  var extendedTimeZonesList = additionalTimeZones ? _objectSpread(_objectSpread({}, _timezones["default"]), additionalTimeZones) : _timezones["default"];
+    selectedKey = _useState4[0],
+    setSelectedKey = _useState4[1];
   var timeZonePickerRef = (0, _react.useRef)();
   /* istanbul ignore next */
   (0, _react.useImperativeHandle)(ref, function () {
     return timeZonePickerRef.current;
   });
-  (0, _react.useEffect)(function () {
-    if (timeUpdate) {
-      var createTimeZoneTimes = function createTimeZoneTimes() {
-        var _context5;
-        return (0, _map["default"])(_context5 = (0, _entries["default"])(extendedTimeZonesList)).call(_context5, function (item) {
-          var _item$;
-          var gmt = "GMT".concat(getTimezoneOffset(item[1]));
-          var gmtLabel = item[0].substring(12);
-          var timeZone = (_item$ = item[1]) === null || _item$ === void 0 ? void 0 : _item$.replace(/_/g, ' ');
-          var time = getLocaleTime({
-            timeZone: item[1],
-            locales: locales,
-            localeOptions: localeOptions
-          });
-          var searchTags = createSearchTags({
-            gmt: gmt,
-            gmtLabel: gmtLabel,
-            timeZone: timeZone
-          });
-          return {
-            gmt: gmt,
-            timeZone: timeZone,
-            time: time,
-            searchTags: searchTags
-          };
-        });
+  var allTimeZones = (0, _react.useMemo)(function () {
+    var _context4, _context5;
+    var sourceList = additionalTimeZones ? _objectSpread(_objectSpread({}, _timezones["default"]), additionalTimeZones) : _timezones["default"];
+    return (0, _sort["default"])(_context4 = (0, _map["default"])(_context5 = (0, _entries["default"])(sourceList)).call(_context5, function (_ref2) {
+      var _context6;
+      var _ref3 = (0, _slicedToArray2["default"])(_ref2, 2),
+        label = _ref3[0],
+        tzValue = _ref3[1];
+      var _getGmtAndOffset = (0, _helper.getGmtAndOffset)(tzValue),
+        gmt = _getGmtAndOffset.gmt,
+        numericOffset = _getGmtAndOffset.numericOffset;
+      var displayTz = tzValue.replace(/_/g, ' ');
+      return {
+        key: (0, _concat["default"])(_context6 = "".concat(displayTz, " ")).call(_context6, gmt),
+        id: tzValue,
+        label: label,
+        timeZone: displayTz,
+        gmt: gmt,
+        numericOffset: numericOffset,
+        searchTags: createSearchTags({
+          gmt: gmt,
+          timeZone: tzValue
+        })
       };
-      setTimeZones(createTimeZoneTimes());
-      setTimeUpdate(false);
+    })).call(_context4, function (a, b) {
+      return a.numericOffset - b.numericOffset;
+    });
+  }, [additionalTimeZones]);
+  var filteredItems = (0, _react.useMemo)(function () {
+    var selectedItem = (0, _find["default"])(allTimeZones).call(allTimeZones, function (tz) {
+      return tz.key === selectedKey;
+    });
+    var isExactMatch = selectedItem && selectedItem.key === search;
+    if (!search || isExactMatch) {
+      return allTimeZones;
     }
-  }, [extendedTimeZonesList, locales, localeOptions, timeUpdate]);
-  var filterTimezones = (0, _react.useCallback)(function (timeZonesList) {
-    return (0, _filter["default"])(timeZonesList).call(timeZonesList, function (_ref3) {
-      var _context6;
-      var searchTags = _ref3.searchTags;
-      return (0, _indexOf["default"])(_context6 = searchTags.toUpperCase()).call(_context6, search.toUpperCase()) > -1;
+    var upperSearch = search.toUpperCase();
+    return (0, _filter["default"])(allTimeZones).call(allTimeZones, function (tz) {
+      var _context7;
+      return (0, _includes["default"])(_context7 = tz.searchTags).call(_context7, upperSearch);
     });
-  }, [search]);
-  var filteredTimezones = (0, _react.useMemo)(function () {
-    return filterTimezones(timeZones);
-  }, [filterTimezones, timeZones]);
-  var sortByGMT = function sortByGMT(a, b) {
-    var aNum = (0, _parseFloat2["default"])(a.gmt.split('GMT')[1].split(':')[0]);
-    var bNum = (0, _parseFloat2["default"])(b.gmt.split('GMT')[1].split(')')[0]);
-    return aNum - bNum;
-  };
-  var checkIsSelectedItem = function checkIsSelectedItem() {
-    return (0, _filter["default"])(timeZones).call(timeZones, function (tz) {
-      return tz.timeZone === search;
-    }).length > 0;
-  };
-  var renderTimeZones = function renderTimeZones(timeZonesToRender) {
-    var _context7;
-    return (0, _map["default"])(_context7 = (0, _sort["default"])(timeZonesToRender).call(timeZonesToRender, sortByGMT)).call(_context7, function (_ref4) {
-      var gmt = _ref4.gmt,
-        time = _ref4.time,
-        timeZone = _ref4.timeZone;
-      return (0, _react2.jsx)(_index.Item, {
-        key: timeZone,
-        "data-id": timeZone,
-        textValue: timeZone
-      }, (0, _react2.jsx)(_index.Box, {
-        flexDirection: "row",
-        justifyContent: "space-between",
-        width: "100%"
-      }, (0, _react2.jsx)(_index.Box, {
-        flexDirection: "row"
-      }, (0, _react2.jsx)(_index.Text, {
-        variant: "variants.timeZone.item.title"
-      }, timeZone), (0, _react2.jsx)(_index.Text, {
-        variant: "variants.timeZone.item.subTitle"
-      }, gmt)), (0, _react2.jsx)(_index.Box, null, (0, _react2.jsx)(_index.Text, {
-        variant: "variants.timeZone.item.time"
-      }, time))));
+  }, [search, selectedKey, allTimeZones]);
+  var timeData = (0, _react.useMemo)(function () {
+    var now = new Date();
+    var map = new _map2["default"]();
+    (0, _forEach["default"])(allTimeZones).call(allTimeZones, function (tz) {
+      map.set(tz.id, now.toLocaleTimeString(locales, _objectSpread({
+        timeZone: tz.id
+      }, localeOptions)));
     });
+    return map;
+  }, [allTimeZones, locales, localeOptions]);
+  var onInputChange = function onInputChange(value) {
+    setSearch(value);
+    if (value === '') {
+      setSelectedKey(null);
+    }
   };
-  var items = (0, _react.useMemo)(function () {
-    if (filteredTimezones.length === 0) {
-      return (0, _react2.jsx)(_index.Item, {
-        key: emptySearchText
-      }, emptySearchText);
+  var onSelectionChange = function onSelectionChange(key) {
+    if (!key) return;
+    var selectedItem = (0, _find["default"])(allTimeZones).call(allTimeZones, function (item) {
+      return item.key === key;
+    });
+    if (selectedItem) {
+      setSearch(selectedItem.key);
+      setSelectedKey(key);
     }
-    return renderTimeZones(checkIsSelectedItem() ? timeZones : filteredTimezones);
-  }, [emptySearchText, filteredTimezones, search, timeZones]);
-  var comboBoxFieldProps = (0, _react.useMemo)(function () {
-    return _objectSpread({
-      containerProps: {
-        sx: {
-          width: 400,
-          fontSize: 'md'
-        }
-      },
-      onInputChange: setSearch,
-      items: filteredTimezones,
-      ref: timeZonePickerRef,
-      onOpenChange: function onOpenChange(isOpen) {
-        return setTimeUpdate(isOpen);
-      },
-      disabledKeys: [{
-        emptySearchText: emptySearchText
-      }]
-    }, otherProps);
-  }, [emptySearchText, filteredTimezones, otherProps]);
-  return (0, _react2.jsx)(_index.ComboBoxField, (0, _extends2["default"])({}, (0, _pendoID.getPendoID)('TimeZonePicker'), comboBoxFieldProps, {
+  };
+  return (0, _react2.jsx)(_index.ComboBoxField, (0, _extends2["default"])({}, (0, _pendoID.getPendoID)('TimeZonePicker'), otherProps, {
+    ref: timeZonePickerRef,
+    items: filteredItems,
+    inputValue: search,
+    selectedKey: selectedKey,
+    onInputChange: onInputChange,
+    onSelectionChange: onSelectionChange,
+    menuTrigger: "input",
     disabledKeys: [emptySearchText],
-    menuTrigger: "input"
-  }), items);
+    containerProps: {
+      sx: {
+        width: 400,
+        fontSize: 'md'
+      }
+    },
+    allowsEmptyCollection: true,
+    renderEmptyState: function renderEmptyState() {
+      return (0, _react2.jsx)("span", null, emptySearchText);
+    }
+  }), function (item) {
+    return (0, _react2.jsx)(_index.Item, {
+      key: "".concat(item.key),
+      textValue: "".concat(item.key)
+    }, (0, _react2.jsx)(_index.Box, {
+      flexDirection: "row",
+      justifyContent: "space-between",
+      width: "100%"
+    }, (0, _react2.jsx)(_index.Box, {
+      flexDirection: "row"
+    }, (0, _react2.jsx)(_index.Text, {
+      variant: "variants.timeZone.item.title"
+    }, item.timeZone), (0, _react2.jsx)(_index.Text, {
+      variant: "variants.timeZone.item.subTitle"
+    }, item.gmt)), (0, _react2.jsx)(_index.Box, null, (0, _react2.jsx)(_index.Text, {
+      variant: "variants.timeZone.item.time"
+    }, timeData.get(item.id)))));
+  });
 });
 TimeZonePicker.propTypes = {
   /**