@splunk/react-ui 5.0.0-rc.2 → 5.1.0

package/ComboBox.js

@@ -61,28 +61,28 @@
         e.r(n);
     // EXPORTS
         e.d(n, {
-        Divider: () => /* reexport */ d.Divider,
-        Heading: () => /* reexport */ d.Heading,
-        Option: () => /* reexport */ D,
+        Divider: () => /* reexport */ f.Divider,
+        Heading: () => /* reexport */ f.Heading,
+        Option: () => /* reexport */ I,
         default: () => /* reexport */ re
     });
     // CONCATENATED MODULE: external "react"
     const r = require("react");
     var t =  e.n(r);
-    // CONCATENATED MODULE: external "prop-types"
-    const o = require("prop-types");
-    var a =  e.n(o);
     // CONCATENATED MODULE: external "lodash/extend"
-    const i = require("lodash/extend");
-    var l =  e.n(i);
+    const o = require("lodash/extend");
+    var a =  e.n(o);
     // CONCATENATED MODULE: external "lodash/memoize"
-    const u = require("lodash/memoize");
-    var c =  e.n(u);
+    const i = require("lodash/memoize");
+    var l =  e.n(i);
     // CONCATENATED MODULE: external "lodash/some"
-    const s = require("lodash/some");
-    var f =  e.n(s);
+    const u = require("lodash/some");
+    var c =  e.n(u);
+    // CONCATENATED MODULE: external "prop-types"
+    const s = require("prop-types");
+    var d =  e.n(s);
     // CONCATENATED MODULE: external "@splunk/react-ui/Menu"
-    const d = require("@splunk/react-ui/Menu");
+    const f = require("@splunk/react-ui/Menu");
     // CONCATENATED MODULE: external "@splunk/react-ui/Popover"
     const p = require("@splunk/react-ui/Popover");
     var v =  e.n(p);
@@ -97,15 +97,17 @@
     var O =  e.n(h);
     // CONCATENATED MODULE: external "@splunk/react-ui/usePrevious"
     const S = require("@splunk/react-ui/usePrevious");
-    var C =  e.n(S);
+    var k =  e.n(S);
     // CONCATENATED MODULE: external "@splunk/ui-utils/filter"
-    const k = require("@splunk/ui-utils/filter");
+    const C = require("@splunk/ui-utils/filter");
     // CONCATENATED MODULE: external "@splunk/ui-utils/i18n"
-    const P = require("@splunk/ui-utils/i18n");
+    const w = require("@splunk/ui-utils/i18n");
     // CONCATENATED MODULE: external "@splunk/ui-utils/id"
-    const w = require("@splunk/ui-utils/id");
+    const P = require("@splunk/ui-utils/id");
     // CONCATENATED MODULE: external "@splunk/ui-utils/keyboard"
     const j = require("@splunk/ui-utils/keyboard");
+    // CONCATENATED MODULE: external "@splunk/ui-utils/scroll"
+    const R = require("@splunk/ui-utils/scroll");
     // CONCATENATED MODULE: ./src/utils/updateReactRef.ts
     /**
  * Updates a React ref. Callback refs and object refs (from `createRef` and `useRef`) are supported.
@@ -113,7 +115,7 @@
  * @param ref - The React callback or object ref. Can be `null` or `undefined`.
  * @param current - The new value of the ref.
  */
-    function R(e, n) {
+    function M(e, n) {
         if (e) {
             if (typeof e === "function") {
                 e(n);
@@ -126,8 +128,8 @@
         }
     }
     // CONCATENATED MODULE: ./src/ComboBox/Option.tsx
-    function M() {
-        return M = Object.assign ? Object.assign.bind() : function(e) {
+    function q() {
+        return q = Object.assign ? Object.assign.bind() : function(e) {
             for (var n = 1; n < arguments.length; n++) {
                 var r = arguments[n];
                 for (var t in r) {
@@ -135,11 +137,11 @@
                 }
             }
             return e;
-        }, M.apply(null, arguments);
+        }, q.apply(null, arguments);
     }
     function E(e, n) {
         if (null == e) return {};
-        var r, t, o = T(e, n);
+        var r, t, o = B(e, n);
         if (Object.getOwnPropertySymbols) {
             var a = Object.getOwnPropertySymbols(e);
             for (t = 0; t < a.length; t++) {
@@ -148,7 +150,7 @@
         }
         return o;
     }
-    function T(e, n) {
+    function B(e, n) {
         if (null == e) return {};
         var r = {};
         for (var t in e) {
@@ -159,28 +161,28 @@
         }
         return r;
     }
-    var q = {
+    var D = {
         /** @private */
-        active: a().bool,
-        description: a().string,
-        descriptionPosition: a().oneOf([ "right", "bottom" ]),
-        disabled: a().bool,
-        elementRef: a().oneOfType([ a().func, a().object ]),
-        icon: a().node,
-        label: a().string,
-        matchRanges: a().arrayOf(a().shape({
-            start: a().number.isRequired,
-            end: a().number.isRequired
+        active: d().bool,
+        description: d().string,
+        descriptionPosition: d().oneOf([ "right", "bottom" ]),
+        disabled: d().bool,
+        elementRef: d().oneOfType([ d().func, d().object ]),
+        icon: d().node,
+        label: d().string,
+        matchRanges: d().arrayOf(d().shape({
+            start: d().number.isRequired,
+            end: d().number.isRequired
         })),
         /** @private */
-        onClick: a().func,
-        truncate: a().bool,
-        value: a().string.isRequired
+        onClick: d().func,
+        truncate: d().bool,
+        value: d().string.isRequired
     };
     /**
  * An option within a `ComboBox`.
- */    function B(e) {
-        var n = e.active, o = e.description, a = e.descriptionPosition, i = a === void 0 ? "bottom" : a, l = e.disabled, u = e.elementRef, c = e.icon, s = e.label, f = e.matchRanges, p = e.onClick, v = e.truncate, b = e.value, m = E(e, [ "active", "description", "descriptionPosition", "disabled", "elementRef", "icon", "label", "matchRanges", "onClick", "truncate", "value" ]);
+ */    function A(e) {
+        var n = e.active, o = e.description, a = e.descriptionPosition, i = a === void 0 ? "bottom" : a, l = e.disabled, u = e.elementRef, c = e.icon, s = e.label, d = e.matchRanges, p = e.onClick, v = e.truncate, b = e.value, m = E(e, [ "active", "description", "descriptionPosition", "disabled", "elementRef", "icon", "label", "matchRanges", "onClick", "truncate", "value" ]);
         // @docs-props-type OptionPropsBase
                 var y = (0, r.useCallback)((function(e) {
             if (!l) {
@@ -190,11 +192,11 @@
             }
         }), [ l, p, b ]);
         var g = (0, r.useCallback)((function(e) {
-            R(u, e);
+            M(u, e);
         }), [ u ]);
         var h = s === undefined ? b : s;
         
-        return t().createElement(d.Item, M({
+        return t().createElement(f.Item, q({
             active: n,
             "data-test": "option",
             "data-test-value": b,
@@ -203,34 +205,16 @@
             disabled: l ? "disabled" : undefined,
             elementRef: g,
             startAdornment: c,
-            matchRanges: f,
+            matchRanges: d,
             onClick: y,
             truncate: v
         }, m, {
             role: "option"
         }), h);
     }
-    B.propTypes = q;
-    B.as = "Item";
-    /* harmony default export */    const D = B;
-    // CONCATENATED MODULE: ./src/utils/scrollIntoViewIfNeeded.ts
-    // A utility that attempts to move an element into view by scrolling it's derived parent.
-    var A = function e(n) {
-        if (!n) {
-            return;
-        }
-        var r = n.offsetParent;
-        if (!r) {
-            return;
-        }
-        // Below the bottom of the container.
-                if (r.scrollTop + r.clientHeight < n.offsetTop + n.clientHeight) {
-            r.scrollTop = n.offsetTop + n.clientHeight - r.clientHeight;
-            // Above the top of the container.
-                } else if (r.scrollTop > n.offsetTop) {
-            r.scrollTop = n.offsetTop;
-        }
-    };
+    A.propTypes = D;
+    A.as = "Item";
+    /* harmony default export */    const I = A;
     // CONCATENATED MODULE: ./src/ComboBox/ComboBox.tsx
     function x(e) {
         "@babel/helpers - typeof";
@@ -240,8 +224,8 @@
             return e && "function" == typeof Symbol && e.constructor === Symbol && e !== Symbol.prototype ? "symbol" : typeof e;
         }, x(e);
     }
-    function I() {
-        return I = Object.assign ? Object.assign.bind() : function(e) {
+    function T() {
+        return T = Object.assign ? Object.assign.bind() : function(e) {
             for (var n = 1; n < arguments.length; n++) {
                 var r = arguments[n];
                 for (var t in r) {
@@ -249,9 +233,9 @@
                 }
             }
             return e;
-        }, I.apply(null, arguments);
+        }, T.apply(null, arguments);
     }
-    function H(e, n) {
+    function L(e, n) {
         var r = Object.keys(e);
         if (Object.getOwnPropertySymbols) {
             var t = Object.getOwnPropertySymbols(e);
@@ -261,30 +245,30 @@
         }
         return r;
     }
-    function L(e) {
+    function H(e) {
         for (var n = 1; n < arguments.length; n++) {
             var r = null != arguments[n] ? arguments[n] : {};
-            n % 2 ? H(Object(r), !0).forEach((function(n) {
-                z(e, n, r[n]);
-            })) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(r)) : H(Object(r)).forEach((function(n) {
+            n % 2 ? L(Object(r), !0).forEach((function(n) {
+                V(e, n, r[n]);
+            })) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(r)) : L(Object(r)).forEach((function(n) {
                 Object.defineProperty(e, n, Object.getOwnPropertyDescriptor(r, n));
             }));
         }
         return e;
     }
-    function z(e, n, r) {
-        return (n = F(n)) in e ? Object.defineProperty(e, n, {
+    function V(e, n, r) {
+        return (n = z(n)) in e ? Object.defineProperty(e, n, {
             value: r,
             enumerable: !0,
             configurable: !0,
             writable: !0
         }) : e[n] = r, e;
     }
-    function F(e) {
-        var n = V(e, "string");
+    function z(e) {
+        var n = F(e, "string");
         return "symbol" == x(n) ? n : n + "";
     }
-    function V(e, n) {
+    function F(e, n) {
         if ("object" != x(e) || !e) return e;
         var r = e[Symbol.toPrimitive];
         if (void 0 !== r) {
@@ -295,19 +279,19 @@
         return ("string" === n ? String : Number)(e);
     }
     function K(e, n) {
-        return X(e) || U(e, n) || W(e, n) || _();
+        return X(e) || U(e, n) || N(e, n) || _();
     }
     function _() {
         throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
     }
-    function W(e, n) {
+    function N(e, n) {
         if (e) {
-            if ("string" == typeof e) return N(e, n);
+            if ("string" == typeof e) return W(e, n);
             var r = {}.toString.call(e).slice(8, -1);
-            return "Object" === r && e.constructor && (r = e.constructor.name), "Map" === r || "Set" === r ? Array.from(e) : "Arguments" === r || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(r) ? N(e, n) : void 0;
+            return "Object" === r && e.constructor && (r = e.constructor.name), "Map" === r || "Set" === r ? Array.from(e) : "Arguments" === r || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(r) ? W(e, n) : void 0;
         }
     }
-    function N(e, n) {
+    function W(e, n) {
         (null == n || n > e.length) && (n = e.length);
         for (var r = 0, t = Array(n); r < n; r++) {
             t[r] = e[r];
@@ -365,96 +349,96 @@
     /** @public */
     /** @public */
     /** @public */    var G = {
-        animateLoading: a().bool,
-        append: a().bool,
-        children: a().node,
-        controlledFilter: a().bool,
-        defaultPlacement: a().oneOf([ "above", "below", "vertical" ]),
-        defaultValue: a().string,
-        describedBy: a().string,
-        disabled: a().bool,
-        elementRef: a().oneOfType([ a().func, a().object ]),
-        error: a().bool,
-        footerMessage: a().node,
-        inline: a().bool,
-        inputId: a().string,
-        inputRef: a().oneOfType([ a().func, a().object ]),
-        isLoadingOptions: a().bool,
-        labelledBy: a().string,
-        loadingMessage: a().node,
-        menuStyle: a().object,
-        name: a().string,
-        noOptionsMessage: a().node,
-        onBlur: a().func,
-        onChange: a().func,
-        onClose: a().func,
-        onFocus: a().func,
-        onKeyDown: a().func,
-        onOpen: a().func,
-        onScroll: a().func,
-        onScrollBottom: a().func,
-        onSelect: a().func,
-        placeholder: a().string,
-        prepend: a().bool,
-        value: a().string,
+        animateLoading: d().bool,
+        append: d().bool,
+        children: d().node,
+        controlledFilter: d().bool,
+        defaultPlacement: d().oneOf([ "above", "below", "vertical" ]),
+        defaultValue: d().string,
+        describedBy: d().string,
+        disabled: d().bool,
+        elementRef: d().oneOfType([ d().func, d().object ]),
+        error: d().bool,
+        footerMessage: d().node,
+        inline: d().bool,
+        inputId: d().string,
+        inputRef: d().oneOfType([ d().func, d().object ]),
+        isLoadingOptions: d().bool,
+        labelledBy: d().string,
+        loadingMessage: d().node,
+        menuStyle: d().object,
+        name: d().string,
+        noOptionsMessage: d().node,
+        onBlur: d().func,
+        onChange: d().func,
+        onClose: d().func,
+        onFocus: d().func,
+        onKeyDown: d().func,
+        onOpen: d().func,
+        onScroll: d().func,
+        onScrollBottom: d().func,
+        onSelect: d().func,
+        placeholder: d().string,
+        prepend: d().bool,
+        value: d().string,
         /** @private. */
-        virtualization: a().number
+        virtualization: d().number
     };
     function J(e, n) {
         var r = n.clientX, t = n.clientY;
         var o = e.getBoundingClientRect(), a = o.top, i = o.left, l = o.bottom, u = o.right;
         return r > i && r < u && t > a && t < l;
     }
-    var Q = c()((function(e) {
+    var Q = l()((function(e) {
         var n = e.anchorWidth, r = e.maxHeight, t = e.menuStyle;
-        return l()({
+        return a()({
             maxHeight: r,
             overflow: "auto",
             width: Math.max(n !== null && n !== void 0 ? n : 0, 200)
         }, t);
     }));
     var Z = {};
-    var ee = (0, P._)("Select...");
+    var ee = (0, w._)("Select...");
     /**
  * `ComboBox` allows the user to select a predefined string or enter a new value. Unlike `Select`
  * and `Multiselect`, `Option` value must always be a string.
  */    function ne(e) {
-        var n = e.animateLoading, o = e.append, a = e.children, i = e.controlledFilter, l = e.defaultPlacement, u = l === void 0 ? "vertical" : l, c = e.defaultValue, s = e.describedBy, d = e.disabled, p = e.elementRef, y = e.error, h = e.footerMessage, S = e.inline, M = e.inputId, E = e.inputRef, T = e.isLoadingOptions, q = e.labelledBy, B = e.loadingMessage, x = e.menuStyle, H = x === void 0 ? Z : x, z = e.name, F = e.noOptionsMessage, V = e.onBlur, _ = e.onChange, W = e.onClose, N = e.onFocus, U = e.onKeyDown, X = e.onOpen, $ = e.onScroll, G = e.onScrollBottom, ne = e.onSelect, re = e.placeholder, te = re === void 0 ? ee : re, oe = e.prepend, ae = e.value, ie = e.virtualization, le = Y(e, [ "animateLoading", "append", "children", "controlledFilter", "defaultPlacement", "defaultValue", "describedBy", "disabled", "elementRef", "error", "footerMessage", "inline", "inputId", "inputRef", "isLoadingOptions", "labelledBy", "loadingMessage", "menuStyle", "name", "noOptionsMessage", "onBlur", "onChange", "onClose", "onFocus", "onKeyDown", "onOpen", "onScroll", "onScrollBottom", "onSelect", "placeholder", "prepend", "value", "virtualization" ]);
+        var n = e.animateLoading, o = e.append, a = e.children, i = e.controlledFilter, l = e.defaultPlacement, u = l === void 0 ? "vertical" : l, s = e.defaultValue, d = e.describedBy, f = e.disabled, p = e.elementRef, y = e.error, h = e.footerMessage, S = e.inline, q = e.inputId, E = e.inputRef, B = e.isLoadingOptions, D = e.labelledBy, A = e.loadingMessage, x = e.menuStyle, L = x === void 0 ? Z : x, V = e.name, z = e.noOptionsMessage, F = e.onBlur, _ = e.onChange, N = e.onClose, W = e.onFocus, U = e.onKeyDown, X = e.onOpen, $ = e.onScroll, G = e.onScrollBottom, ne = e.onSelect, re = e.placeholder, te = re === void 0 ? ee : re, oe = e.prepend, ae = e.value, ie = e.virtualization, le = Y(e, [ "animateLoading", "append", "children", "controlledFilter", "defaultPlacement", "defaultValue", "describedBy", "disabled", "elementRef", "error", "footerMessage", "inline", "inputId", "inputRef", "isLoadingOptions", "labelledBy", "loadingMessage", "menuStyle", "name", "noOptionsMessage", "onBlur", "onChange", "onClose", "onFocus", "onKeyDown", "onOpen", "onScroll", "onScrollBottom", "onSelect", "placeholder", "prepend", "value", "virtualization" ]);
         // @docs-props-type ComboBoxPropsBase
                 var ue = O()({
             componentName: "ComboBox",
             /* eslint-disable-next-line prefer-rest-params */
             componentProps: arguments[0]
         });
-        var ce = (0, r.useState)(0), se = K(ce, 2), fe = se[0], de = se[1];
+        var ce = (0, r.useState)(0), se = K(ce, 2), de = se[0], fe = se[1];
         var pe = (0, r.useState)(null), ve = K(pe, 2), be = ve[0], me = ve[1];
         var ye = (0, r.useState)(false), ge = K(ye, 2), he = ge[0], Oe = ge[1];
-        var Se = (0, r.useState)(null), Ce = K(Se, 2), ke = Ce[0], Pe = Ce[1];
-        var we = (0, r.useState)(), je = K(we, 2), Re = je[0], Me = je[1];
-        var Ee = (0, r.useState)(c || ""), Te = K(Ee, 2), qe = Te[0], Be = Te[1];
-        var De = C()(fe);
-        var Ae = (0, r.useRef)();
+        var Se = (0, r.useState)(null), ke = K(Se, 2), Ce = ke[0], we = ke[1];
+        var Pe = (0, r.useState)(), je = K(Pe, 2), Re = je[0], Me = je[1];
+        var qe = (0, r.useState)(s || ""), Ee = K(qe, 2), Be = Ee[0], De = Ee[1];
+        var Ae = k()(de);
+        var Ie = (0, r.useRef)();
         var xe = (0, r.useRef)(0);
-        var Ie = (0, r.useRef)(De);
-        var He = (0, w.createDOMID)("popover");
-        var Le = (0, w.createDOMID)("active-item");
-        var ze = (0, r.useCallback)((function() {
+        var Te = (0, r.useRef)(Ae);
+        var Le = (0, P.createDOMID)("popover");
+        var He = (0, P.createDOMID)("active-item");
+        var Ve = (0, r.useCallback)((function() {
             Oe(false);
-            Ie.current = null;
-            W === null || W === void 0 ? void 0 : W();
-        }), [ W ]);
-        var Fe = (0, r.useCallback)((function() {
+            Te.current = null;
+            N === null || N === void 0 ? void 0 : N();
+        }), [ N ]);
+        var ze = (0, r.useCallback)((function() {
             if (!he) {
                 Oe(true);
-                de(0);
+                fe(0);
                 X === null || X === void 0 ? void 0 : X();
             }
         }), [ he, X ]);
-        var Ve = (0, r.useCallback)((function() {
-            return ue ? ae : qe;
-        }), [ ue, ae, qe ]);
+        var Fe = (0, r.useCallback)((function() {
+            return ue ? ae : Be;
+        }), [ ue, ae, Be ]);
         var Ke = (0, r.useCallback)((function() {
-            var e = Ve();
+            var e = Fe();
             var n = r.Children.toArray(a).filter(r.isValidElement);
             var t = !Re && n.find((function(n) {
                 return n.props.label !== undefined && n.props.value === e;
@@ -463,67 +447,67 @@
                 return t === null || t === void 0 ? void 0 : t.props.label;
             }
             return e;
-        }), [ a, Ve, Re ]);
+        }), [ a, Fe, Re ]);
         var _e = (0, r.useCallback)((function(e) {
-            Pe(e);
-            R(E, e);
+            we(e);
+            M(E, e);
         }), [ E ]);
-        var We = (0, r.useCallback)((function(e) {
+        var Ne = (0, r.useCallback)((function(e) {
             me(e);
-            R(p, e);
+            M(p, e);
         }), [ p ]);
-        var Ne = (0, r.useCallback)((function(e) {
-            if (Ie.current !== fe) {
-                A(e);
+        var We = (0, r.useCallback)((function(e) {
+            if (Te.current !== de) {
+                (0, R.scrollIntoViewIfNeeded)(e);
             }
-        }), [ fe, Ie ]);
+        }), [ de, Te ]);
         var Ue = (0, r.useCallback)((function(e, n) {
-            Fe();
-            N === null || N === void 0 ? void 0 : N(e, n);
-        }), [ N, Fe ]);
+            ze();
+            W === null || W === void 0 ? void 0 : W(e, n);
+        }), [ W, ze ]);
         var Xe = (0, r.useCallback)((function(e, n) {
             var r = n.value, t = n.selectedOption;
             e.stopPropagation();
             var o = t ? undefined : r;
-            de(0);
+            fe(0);
             Me(o);
             if (!ue) {
-                Be(r);
+                De(r);
             }
             _ === null || _ === void 0 ? void 0 : _(e, {
                 value: r,
-                name: z
+                name: V
             });
-        }), [ ue, z, _ ]);
+        }), [ ue, V, _ ]);
         var Ye = (0, r.useCallback)((function(e, n) {
-            Xe(e, L(L({}, n), {}, {
+            Xe(e, H(H({}, n), {}, {
                 selectedOption: true
             }));
-            ke === null || ke === void 0 ? void 0 : ke.focus();
-            ze();
-        }), [ ze, Xe, ke ]);
+            Ce === null || Ce === void 0 ? void 0 : Ce.focus();
+            Ve();
+        }), [ Ve, Xe, Ce ]);
         var $e = (0, r.useCallback)((function(e) {
             e.stopPropagation();
-            if (!d) {
-                Fe();
+            if (!f) {
+                ze();
             }
-        }), [ d, Fe ]);
+        }), [ f, ze ]);
         var Ge = (0, r.useCallback)((function(e) {
             var n = e.event, r = e.reason;
             var t = r === "offScreen" || r === "escapeKey" || r === "clickAway" && be && !J(be, n);
             if (t) {
-                ze();
+                Ve();
             }
-        }), [ be, ze ]);
+        }), [ be, Ve ]);
         var Je = (0, r.useCallback)((function(e) {
-            if (he && !T) {
+            if (he && !B) {
                 G === null || G === void 0 ? void 0 : G(e);
             }
-        }), [ T, he, G ]);
+        }), [ B, he, G ]);
         var Qe = (0, r.useMemo)((function() {
-            var e = Ve();
+            var e = Fe();
             var n = r.Children.toArray(a).filter(r.isValidElement);
-            var o = f()(n, (function(n) {
+            var o = c()(n, (function(n) {
                 if (n.props.label === undefined) {
                     return n.props.value === e;
                 }
@@ -533,8 +517,8 @@
                 return n.props.value === e;
             }));
             if (!o && e) {
-                n.unshift( t().createElement(D, {
-                    description: (0, P._)("(New value)"),
+                n.unshift( t().createElement(I, {
+                    description: (0, w._)("(New value)"),
                     descriptionPosition: "right",
                     key: "currentValueOption",
                     value: e,
@@ -543,14 +527,14 @@
             }
             // Highlight Active
                         xe.current = 0;
-            Ae.current = undefined;
-            var l = (0, k.stringToKeywords)(Re ? e : Ke());
+            Ie.current = undefined;
+            var l = (0, C.stringToKeywords)(Re ? e : Ke());
             return (i ? n : n.filter((function(e) {
                 if (e.props.label !== undefined) {
-                    return (0, k.testPhrase)(e.props.label, l);
+                    return (0, C.testPhrase)(e.props.label, l);
                 }
                 if (e.props.value !== undefined) {
-                    return (0, k.testPhrase)(e.props.value, l);
+                    return (0, C.testPhrase)(e.props.value, l);
                 }
                 return true;
  // Keep all headers and non-interactive options
@@ -559,19 +543,19 @@
                     // ignore non-Option items such as Headings and Dividers
                     return n;
                 }
-                var a = xe.current === fe;
+                var a = xe.current === de;
                 xe.current += 1;
                 var u = n.props.label !== undefined ? n.props.label : n.props.value;
                 var c = n.props.matchRanges;
-                var s = !i && e && (o || t > 0) ? (0, k.keywordLocations)(u, l) || undefined : undefined;
+                var s = !i && e && (o || t > 0) ? (0, C.keywordLocations)(u, l) || undefined : undefined;
                 if (a) {
                     if (!n.props.disabled) {
-                        Ae.current = n.props.value;
+                        Ie.current = n.props.value;
                     }
                     
                     return (0, r.cloneElement)(n, {
-                        elementRef: Ne,
-                        id: Le,
+                        elementRef: We,
+                        id: He,
                         onClick: Ye,
                         matchRanges: c || s,
                         active: true
@@ -583,10 +567,10 @@
                     matchRanges: c || s
                 });
             }));
-        }), [ fe, Le, a, i, Ke, Ve, Ne, Ye, Re ]);
+        }), [ de, He, a, i, Ke, Fe, We, Ye, Re ]);
         var Ze = (0, r.useCallback)((function(e) {
             var n = xe.current;
-            var t = Ae.current;
+            var t = Ie.current;
             var o = e.key, i = e.nativeEvent;
             if (he) {
                 switch (o) {
@@ -601,23 +585,23 @@
                     }
 
                   case "Tab":
-                    ze();
+                    Ve();
                     break;
 
                   case "ArrowDown":
-                    de((function(e) {
+                    fe((function(e) {
                         return Math.min(e + 1, n - 1);
                     }));
                     if (a && G) {
                         var l = r.Children.count(a) - 2;
-                        if (fe === l) {
+                        if (de === l) {
                             Je(e);
                         }
                     }
                     break;
 
                   case "ArrowUp":
-                    de((function(e) {
+                    fe((function(e) {
                         return Math.max(e - 1, 0);
                     }));
                     break;
@@ -628,33 +612,33 @@
             } else if ((0, j.addsCharacter)(i) !== false || 
             // Safari 9.0 returns undefined
             o === "Enter" || o === "Backspace" || o === "ArrowDown" || o === "ArrowUp") {
-                Fe();
+                ze();
             }
             U === null || U === void 0 ? void 0 : U(e);
-        }), [ fe, a, ze, Je, Ye, he, U, G, Fe ]);
-        var en = Ve();
+        }), [ de, a, Ve, Je, Ye, he, U, G, ze ]);
+        var en = Fe();
         var nn = Ke();
         var rn = function e(r) {
             var o = r.anchorWidth, a = r.maxHeight;
             var i = Q({
                 anchorWidth: o,
                 maxHeight: a,
-                menuStyle: H
+                menuStyle: L
             });
             var l = {
                 animateLoading: n,
                 controlledExternally: ue,
                 footerMessage: h,
-                isLoading: T,
-                loadingMessage: B,
-                noOptionsMessage: F,
+                isLoading: B,
+                loadingMessage: A,
+                noOptionsMessage: z,
                 onScroll: $,
                 onScrollBottom: G ? Je : undefined,
                 style: i
             };
             if (ie) {
                 
-                return t().createElement(b.VirtualizedResultsMenu, I({
+                return t().createElement(b.VirtualizedResultsMenu, T({
                     virtualization: ie
                 }, l), Qe);
             }
@@ -662,30 +646,30 @@
             return t().createElement(m(), l, Qe);
         };
         
-        return t().createElement(g(), I({
+        return t().createElement(g(), T({
             append: o,
-            "aria-activedescendant": he && Array.isArray(Qe) && Qe.length > 0 ? Le : undefined,
+            "aria-activedescendant": he && Array.isArray(Qe) && Qe.length > 0 ? He : undefined,
             "aria-expanded": he,
-            "aria-controls": he ? He : undefined,
+            "aria-controls": he ? Le : undefined,
             autoCapitalize: "off",
             autoComplete: "off",
             autoCorrect: "off",
             canClear: true,
             "data-test": "combo-box",
-            "data-test-popover-id": He,
+            "data-test-popover-id": Le,
             "data-test-label": nn,
             "data-test-value": en,
             "data-test-open": he && !!be,
-            describedBy: s,
-            disabled: d,
-            elementRef: We,
+            describedBy: d,
+            disabled: f,
+            elementRef: Ne,
             error: y,
             inline: S,
-            inputId: M,
+            inputId: q,
             inputRef: _e,
-            labelledBy: q,
-            name: z,
-            onBlur: V,
+            labelledBy: D,
+            name: V,
+            onBlur: F,
             onFocus: Ue,
             onChange: Xe,
             onClick: $e,
@@ -702,15 +686,15 @@
             autoCloseWhenOffScreen: true,
             canCoverAnchor: false,
             defaultPlacement: u,
-            id: He,
+            id: Le,
             onRequestClose: Ge,
             open: he && !!be,
             repositionMode: "flip"
         }, rn));
     }
-    ne.Divider = d.Divider;
-    ne.Heading = d.Heading;
-    ne.Option = D;
+    ne.Divider = f.Divider;
+    ne.Heading = f.Heading;
+    ne.Option = I;
     ne.propTypes = G;
     /* harmony default export */    const re = ne;
     // CONCATENATED MODULE: ./src/ComboBox/index.ts