@splunk/react-ui 5.1.0 → 5.2.0

package/Menu.js

@@ -103,11 +103,11 @@
         componentId: "sc-4kc053-1"
     })([ "", ";display:flex;align-self:flex-start;align-items:center;float:right;padding-left:", ";max-width:50%;min-height:20px;text-align:right;" ], y, p.variables.spacingLarge);
     var w = (0, c.css)([ "", " flex:0 0 auto;& > svg{height:20px;}" ], p.mixins.reset("inline-flex"));
-    var k = u().div.withConfig({
+    var O = u().div.withConfig({
         displayName: "ItemStyles__StyledItemSelectedAdornment",
         componentId: "sc-4kc053-2"
     })([ "", ";padding-left:", ";align-items:flex-start;color:", ";" ], w, p.variables.spacingLarge, p.variables.contentColorActive);
-    var O = u().span.withConfig({
+    var k = u().span.withConfig({
         displayName: "ItemStyles__StyledItemAdornment",
         componentId: "sc-4kc053-3"
     })([ "", ";", " padding-right:", ";align-items:center;color:", ";" ], w, (function(e) {
@@ -121,7 +121,7 @@
     var C = u()(m()).withConfig({
         displayName: "ItemStyles__StyledClickable",
         componentId: "sc-4kc053-5"
-    })([ "display:block;position:relative;cursor:pointer;color:", ";word-wrap:break-word;max-width:100%;width:100%;min-height:", ";padding:", " ", ";line-height:20px;", " ", " ", " &:not([disabled],[aria-disabled='true']){&:hover{background:", ";", "}&:active{background:", ";}", "}&:focus{outline:0;box-shadow:", ";background:", ";}&[disabled],&[aria-disabled='true']{color:", ";", ",", ",", ",", "{color:", ";}}" ], p.variables.contentColorActive, p.variables.inputHeight, p.variables.spacingXSmall, p.variables.spacingLarge, (function(e) {
+    })([ "line-height:", ";display:block;position:relative;cursor:pointer;color:", ";word-wrap:break-word;max-width:100%;width:100%;min-height:", ";padding:", " ", ";", " ", " ", " &:not([disabled],[aria-disabled='true']){&:hover{background:", ";", "}&:active{background:", ";}", "}&:focus{outline:0;box-shadow:", ";background:", ";}&[disabled],&[aria-disabled='true']{color:", ";", ",", ",", ",", "{color:", ";}}" ], p.variables.lineHeightSpacious, p.variables.contentColorActive, p.variables.inputHeight, p.variables.spacingXSmall, p.variables.spacingLarge, (function(e) {
         var t = e.$active, r = e.$preventFocus;
         return t && !r && (0, c.css)([ "box-shadow:", ";" ], p.variables.focusShadowInset);
     }), (function(e) {
@@ -138,7 +138,7 @@
     }), p.variables.interactiveColorOverlayActive, (function(e) {
         var t = e.$selected;
         return t && (0, c.css)([ "background:", ";font-weight:", ";" ], p.variables.interactiveColorOverlaySelected, p.variables.fontWeightSemiBold);
-    }), p.variables.focusShadowInset, p.variables.interactiveColorOverlayHover, p.variables.contentColorDisabled, /* sc-sel */ h, /* sc-sel */ S, /* sc-sel */ k, /* sc-sel */ O, p.variables.contentColorDisabled);
+    }), p.variables.focusShadowInset, p.variables.interactiveColorOverlayHover, p.variables.contentColorDisabled, /* sc-sel */ h, /* sc-sel */ S, /* sc-sel */ O, /* sc-sel */ k, p.variables.contentColorDisabled);
     var I = u().span.withConfig({
         displayName: "ItemStyles__StyledInnerWrapper",
         componentId: "sc-4kc053-6"
@@ -293,7 +293,7 @@
         if (Object.getOwnPropertySymbols) {
             var i = Object.getOwnPropertySymbols(e);
             for (n = 0; n < i.length; n++) {
-                r = i[n], t.includes(r) || {}.propertyIsEnumerable.call(e, r) && (a[r] = e[r]);
+                r = i[n], -1 === t.indexOf(r) && {}.propertyIsEnumerable.call(e, r) && (a[r] = e[r]);
             }
         }
         return a;
@@ -303,7 +303,7 @@
         var r = {};
         for (var n in e) {
             if ({}.hasOwnProperty.call(e, n)) {
-                if (t.includes(n)) continue;
+                if (-1 !== t.indexOf(n)) continue;
                 r[n] = e[n];
             }
         }
@@ -388,7 +388,7 @@
         if (Object.getOwnPropertySymbols) {
             var i = Object.getOwnPropertySymbols(e);
             for (n = 0; n < i.length; n++) {
-                r = i[n], t.includes(r) || {}.propertyIsEnumerable.call(e, r) && (a[r] = e[r]);
+                r = i[n], -1 === t.indexOf(r) && {}.propertyIsEnumerable.call(e, r) && (a[r] = e[r]);
             }
         }
         return a;
@@ -398,7 +398,7 @@
         var r = {};
         for (var n in e) {
             if ({}.hasOwnProperty.call(e, n)) {
-                if (t.includes(n)) continue;
+                if (-1 !== t.indexOf(n)) continue;
                 r[n] = e[n];
             }
         }
@@ -436,10 +436,11 @@
     var ye = (0, se._)("(Opens new window)");
     function he(e) {
         var t = e.active, a = e.children, o = e.description, l = e.descriptionPosition, s = l === void 0 ? "bottom" : l, c = e.disabled, u = e.endAdornment, d = e.elementRef, v = e.hasSubmenu, p = e.itemKey, f = e.matchRanges, m = e.onClick, b = e.onFocus, g = e.openInNewContext, y = e.role, w = e.selectable, N = e.selectableAppearance, D = N === void 0 ? "checkmark" : N, T = e.selected, q = e.startAdornment, R = e.to, $ = e.truncate, H = me(e, [ "active", "children", "description", "descriptionPosition", "disabled", "endAdornment", "elementRef", "hasSubmenu", "itemKey", "matchRanges", "onClick", "onFocus", "openInNewContext", "role", "selectable", "selectableAppearance", "selected", "startAdornment", "to", "truncate" ]);
-        var F = (0, r.useContext)(A), M = F.preventFocus;
+        // @docs-props-type ItemPropsBase
+                var F = (0, r.useContext)(A), M = F.preventFocus;
         (0, r.useEffect)((function() {
             if (false) {}
-        }), [ $, s, f, a ]);
+        }), [ $, s, f, a, T, w, D ]);
         var L = (0, r.useCallback)((function(e) {
             b === null || b === void 0 ? void 0 : b(e, {
                 itemKey: p
@@ -490,7 +491,7 @@
         }
         var G = o && s === "right";
         var J = o && !G;
-        var Q = T && D === "checkmark" &&  n().createElement(k, null,  n().createElement(ne(), {
+        var Q = T && D === "checkmark" &&  n().createElement(O, null,  n().createElement(ne(), {
             "data-test": "selected-checkmark",
             inline: true
         }));
@@ -523,7 +524,7 @@
         }, X, i()(H, "onFocus")), v &&  n().createElement(j, null,  n().createElement(ie(), null)),  n().createElement(I, null, w && D === "checkbox" &&  n().createElement(x, {
             disabled: !!c,
             selected: T
-        }), q &&  n().createElement(O, null, q),  n().createElement(E, {
+        }), q &&  n().createElement(k, null, q),  n().createElement(E, {
             $descriptionBottom: !!J,
             $truncate: $ !== null && $ !== void 0 ? $ : false
         },  n().createElement(_, {
@@ -533,7 +534,7 @@
             "data-test": "description"
         }, o), G &&  n().createElement(S, {
             "data-test": "description"
-        }, o)), u &&  n().createElement(O, {
+        }, o)), u &&  n().createElement(k, {
             endAdornment: u
         }, u), Q));
     }
@@ -543,18 +544,18 @@
     // only for styled components using Item
         // CONCATENATED MODULE: external "@splunk/react-ui/Scroll"
     const we = require("@splunk/react-ui/Scroll");
-    var ke =  e.n(we);
+    var Oe =  e.n(we);
     // CONCATENATED MODULE: ./src/Menu/MenuStyles.ts
-    var Oe = (0, c.css)([ "border-top:1px solid ", ";" ], p.variables.borderColor);
-    var xe = (0, c.css)([ "", ";background-color:", ";border-radius:", ";min-width:60px;overflow:auto;position:relative;padding:", " 0;&:focus{outline:0;box-shadow:", ";background:", ";}& + &{", "}" ], p.mixins.reset("block"), p.variables.backgroundColorPopup, p.variables.borderRadius, p.variables.spacingSmall, p.variables.focusShadowInset, p.variables.interactiveColorOverlayHover, Oe);
+    var ke = (0, c.css)([ "border-top:1px solid ", ";" ], p.variables.borderColor);
+    var xe = (0, c.css)([ "", ";background-color:", ";border-radius:", ";min-width:60px;overflow:auto;position:relative;padding:", " 0;&:focus{outline:0;box-shadow:", ";background:", ";}& + &{", "}" ], p.mixins.reset("block"), p.variables.backgroundColorPopup, p.variables.borderRadius, p.variables.spacingSmall, p.variables.focusShadowInset, p.variables.interactiveColorOverlayHover, ke);
     var Ce = u().div.withConfig({
         displayName: "MenuStyles__Styled",
         componentId: "sc-1olffp9-0"
     })([ "", "" ], xe);
-    var Ie = u()(ke()).withConfig({
+    var Ie = u()(Oe()).withConfig({
         displayName: "MenuStyles__StyledScroll",
         componentId: "sc-1olffp9-1"
-    })([ "", " ", " + &,& + ", "{", "}" ], xe, /* sc-sel */ Ce, /* sc-sel */ Ce, Oe);
+    })([ "", " ", " + &,& + ", "{", "}" ], xe, /* sc-sel */ Ce, /* sc-sel */ Ce, ke);
     // CONCATENATED MODULE: ./src/utils/updateReactRef.ts
     /**
  * Updates a React ref. Callback refs and object refs (from `createRef` and `useRef`) are supported.
@@ -592,7 +593,7 @@
         if (Object.getOwnPropertySymbols) {
             var i = Object.getOwnPropertySymbols(e);
             for (n = 0; n < i.length; n++) {
-                r = i[n], t.includes(r) || {}.propertyIsEnumerable.call(e, r) && (a[r] = e[r]);
+                r = i[n], -1 === t.indexOf(r) && {}.propertyIsEnumerable.call(e, r) && (a[r] = e[r]);
             }
         }
         return a;
@@ -602,7 +603,7 @@
         var r = {};
         for (var n in e) {
             if ({}.hasOwnProperty.call(e, n)) {
-                if (t.includes(n)) continue;
+                if (-1 !== t.indexOf(n)) continue;
                 r[n] = e[n];
             }
         }

package/Message.js

@@ -96,28 +96,28 @@
     const S = require("@splunk/react-ui/Button");
     var O =  e.n(S);
     // CONCATENATED MODULE: external "@splunk/themes"
-    const C = require("@splunk/themes");
+    const x = require("@splunk/themes");
     // CONCATENATED MODULE: ./src/Message/MessageStyles.ts
-    var _ = {
-        info: C.variables.notificationColorInfo,
-        success: C.variables.notificationColorPositive,
-        warning: C.variables.notificationColorCaution,
-        error: C.variables.notificationColorNegative
+    var C = {
+        info: x.variables.notificationColorInfo,
+        success: x.variables.notificationColorPositive,
+        warning: x.variables.notificationColorCaution,
+        error: x.variables.notificationColorNegative
     };
-    var x = w().div.withConfig({
+    var _ = w().div.withConfig({
         displayName: "MessageStyles__StyledTitle",
         componentId: "eg66af-0"
-    })([ "", ";" ], C.mixins.typography("title4"));
+    })([ "", ";" ], x.mixins.typography("title4"));
     var k = w().div.withConfig({
         displayName: "MessageStyles__StyledContent",
         componentId: "eg66af-1"
-    })([ "", ";grid-row:1 / -1;grid-column:content;max-width:", ";word-wrap:break-word;&:not(:has(> ", ")){", ";}" ], C.mixins.typography("body"), C.variables.lineLength, x, C.mixins.typography("body", {
+    })([ "", ";grid-row:1 / -1;grid-column:content;max-width:", ";word-wrap:break-word;&:not(:has(> ", ")){", ";}" ], x.mixins.typography("body"), x.variables.lineLength, _, x.mixins.typography("body", {
         color: "active"
     }));
     var R = w().span.withConfig({
         displayName: "MessageStyles__StyledIcon",
         componentId: "eg66af-2"
-    })([ "fill:", ";grid-row:1;height:20px;width:20px;" ], (0, C.pickVariant)("$type", _));
+    })([ "fill:", ";grid-row:1;height:20px;width:20px;" ], (0, x.pickVariant)("$type", C));
     var q = w()(O()).withConfig({
         displayName: "MessageStyles__StyledRemove",
         componentId: "eg66af-3"
@@ -125,14 +125,14 @@
     var I = w().div.withConfig({
         displayName: "MessageStyles__Styled",
         componentId: "eg66af-4"
-    })([ "", ";grid-template-rows:1lh auto;align-items:center;padding:", ";", ";", "" ], C.mixins.reset("grid"), C.variables.spacingSmall, (function(e) {
+    })([ "", ";grid-template-rows:1lh auto;align-items:center;padding:", ";", ";", "" ], x.mixins.reset("grid"), x.variables.spacingSmall, (function(e) {
         var n = e.$hasRemoveIcon;
-        return (0, h.css)([ "grid-template-columns:[icon] 20px ", " [content] auto ", " [remove] min-content;" ], C.variables.spacingSmall, n ? C.variables.spacingSmall : "0");
+        return (0, h.css)([ "grid-template-columns:[icon] 20px ", " [content] auto ", " [remove] min-content;" ], x.variables.spacingSmall, n ? x.variables.spacingSmall : "0");
     }), (function(e) {
         var n = e.$appearance, r = e.$hasRemoveIcon, t = e.$type;
-        var a = _[t];
-        return n === "fill" && (0, h.css)([ "background-color:", ";border-left:8px solid ", ";border-radius:", ";box-shadow:", ";grid-template-columns:[icon] 20px ", " [content] fit-content(", ");padding-inline:", ";", "" ], C.variables.backgroundColorPopup, a, C.variables.borderRadius, C.variables.embossShadow, C.variables.spacingSmall, C.variables.lineLength, C.variables.spacingMedium, r && (0, 
-        h.css)([ "grid-template-columns:[icon] 20px ", " [content] fit-content(", ") minmax(", ",1fr) [remove] min-content;" ], C.variables.spacingSmall, C.variables.lineLength, C.variables.spacingSmall));
+        var a = C[t];
+        return n === "fill" && (0, h.css)([ "background-color:", ";border-left:8px solid ", ";border-radius:", ";box-shadow:", ";grid-template-columns:[icon] 20px ", " [content] fit-content(", ");padding-inline:", ";", "" ], x.variables.backgroundColorPopup, a, x.variables.borderRadius, x.variables.embossShadow, x.variables.spacingSmall, x.variables.lineLength, x.variables.spacingMedium, r && (0, 
+        h.css)([ "grid-template-columns:[icon] 20px ", " [content] fit-content(", ") minmax(", ",1fr) [remove] min-content;" ], x.variables.spacingSmall, x.variables.lineLength, x.variables.spacingSmall));
     }));
     // CONCATENATED MODULE: ./src/Message/Title.tsx
     function j(e, n) {
@@ -141,7 +141,7 @@
         if (Object.getOwnPropertySymbols) {
             var o = Object.getOwnPropertySymbols(e);
             for (t = 0; t < o.length; t++) {
-                r = o[t], n.includes(r) || {}.propertyIsEnumerable.call(e, r) && (a[r] = e[r]);
+                r = o[t], -1 === n.indexOf(r) && {}.propertyIsEnumerable.call(e, r) && (a[r] = e[r]);
             }
         }
         return a;
@@ -151,7 +151,7 @@
         var r = {};
         for (var t in e) {
             if ({}.hasOwnProperty.call(e, t)) {
-                if (n.includes(t)) continue;
+                if (-1 !== n.indexOf(t)) continue;
                 r[t] = e[t];
             }
         }
@@ -166,7 +166,7 @@
         var n = e.children, r = j(e, [ "children" ]);
         // @docs-props-type TitleProps
                 
-        return t().createElement(x, r, n);
+        return t().createElement(_, r, n);
     }
     M.propTypes = E;
     /* harmony default export */    const $ = M;
@@ -188,7 +188,7 @@
         if (Object.getOwnPropertySymbols) {
             var o = Object.getOwnPropertySymbols(e);
             for (t = 0; t < o.length; t++) {
-                r = o[t], n.includes(r) || {}.propertyIsEnumerable.call(e, r) && (a[r] = e[r]);
+                r = o[t], -1 === n.indexOf(r) && {}.propertyIsEnumerable.call(e, r) && (a[r] = e[r]);
             }
         }
         return a;
@@ -198,7 +198,7 @@
         var r = {};
         for (var t in e) {
             if ({}.hasOwnProperty.call(e, t)) {
-                if (n.includes(t)) continue;
+                if (-1 !== n.indexOf(t)) continue;
                 r[t] = e[t];
             }
         }

package/MessageBar.js

@@ -98,15 +98,15 @@
     // CONCATENATED MODULE: external "@splunk/themes"
     const k = require("@splunk/themes");
     // CONCATENATED MODULE: ./src/MessageBar/MessageBarStyles.ts
-    var q = h().div.withConfig({
+    var O = h().div.withConfig({
         displayName: "MessageBarStyles__MessageBarContent",
         componentId: "sc-1uyhzza-0"
     })([ "", ";", ";grid-column:content;grid-row:1 / -1;max-width:", ";word-wrap:break-word;" ], k.mixins.reset("inline"), k.mixins.typography("body"), k.variables.lineLength);
-    var _ = h()(S()).withConfig({
+    var q = h()(S()).withConfig({
         displayName: "MessageBarStyles__StyledCloseButton",
         componentId: "sc-1uyhzza-1"
     })([ "grid-column:close;" ]);
-    var O = h().span.withConfig({
+    var _ = h().span.withConfig({
         displayName: "MessageBarStyles__StyledIcon",
         componentId: "sc-1uyhzza-2"
     })([ "width:20px;height:20px;margin-left:auto;fill:", ";grid-row:1;grid-column:icon;" ], (0, 
@@ -116,7 +116,7 @@
         warning: k.variables.notificationColorCaution,
         error: k.variables.notificationColorNegative
     }));
-    var I = h().div.withConfig({
+    var x = h().div.withConfig({
         displayName: "MessageBarStyles__MessageBarWrapper",
         componentId: "sc-1uyhzza-3"
     })([ "", ";grid-template-columns:[icon] 20px ", " [content] fit-content(", ") minmax(", ",1fr) [close] min-content;grid-template-rows:1lh auto;align-items:center;border:1px solid ", ";border-radius:", ";background-color:", ";padding:", " ", ";width:100%;" ], k.mixins.reset("grid"), k.variables.spacingSmall, k.variables.lineLength, k.variables.spacingSmall, (0, 
@@ -132,8 +132,8 @@
         error: k.variables.notificationColorNegativeWeak
     }), k.variables.spacingSmall, k.variables.spacingMedium);
     // CONCATENATED MODULE: ./src/MessageBar/MessageBar.tsx
-    function x() {
-        return x = Object.assign ? Object.assign.bind() : function(e) {
+    function I() {
+        return I = Object.assign ? Object.assign.bind() : function(e) {
             for (var r = 1; r < arguments.length; r++) {
                 var n = arguments[r];
                 for (var t in n) {
@@ -141,7 +141,7 @@
                 }
             }
             return e;
-        }, x.apply(null, arguments);
+        }, I.apply(null, arguments);
     }
     function P(e, r) {
         if (null == e) return {};
@@ -149,7 +149,7 @@
         if (Object.getOwnPropertySymbols) {
             var i = Object.getOwnPropertySymbols(e);
             for (t = 0; t < i.length; t++) {
-                n = i[t], r.includes(n) || {}.propertyIsEnumerable.call(e, n) && (a[n] = e[n]);
+                n = i[t], -1 === r.indexOf(n) && {}.propertyIsEnumerable.call(e, n) && (a[n] = e[n]);
             }
         }
         return a;
@@ -159,7 +159,7 @@
         var n = {};
         for (var t in e) {
             if ({}.hasOwnProperty.call(e, t)) {
-                if (r.includes(t)) continue;
+                if (-1 !== r.indexOf(t)) continue;
                 n[t] = e[t];
             }
         }
@@ -188,22 +188,22 @@
                 var s = E[i];
         var l = M[i];
         
-        return t().createElement(I, x({
+        return t().createElement(x, I({
             ref: n,
             $type: i,
             "data-test": "message-bar",
             "data-test-type": i
         }, o, {
             role: "region"
-        }),  t().createElement(O, {
+        }),  t().createElement(_, {
             as: s,
             $type: i,
             variant: "filled",
             "aria-hidden": true,
             "data-test": "icon"
-        }),  t().createElement(y(), null, l),  t().createElement(q, {
+        }),  t().createElement(y(), null, l),  t().createElement(O, {
             "data-test": "content"
-        }, r), a &&  t().createElement(_, {
+        }, r), a &&  t().createElement(q, {
             appearance: "subtle",
             onClick: a
         },  t().createElement(c(), null),  t().createElement(y(), null, (0, b._)("Close"))));

package/Modal.js

@@ -108,8 +108,8 @@
         prisma: w.variables.backgroundColorDialog
     }), w.variables.spacingMedium, w.variables.spacingXLarge);
     // CONCATENATED MODULE: ./src/Modal/Body.tsx
-    function j() {
-        return j = Object.assign ? Object.assign.bind() : function(e) {
+    function x() {
+        return x = Object.assign ? Object.assign.bind() : function(e) {
             for (var r = 1; r < arguments.length; r++) {
                 var t = arguments[r];
                 for (var n in t) {
@@ -117,12 +117,12 @@
                 }
             }
             return e;
-        }, j.apply(null, arguments);
+        }, x.apply(null, arguments);
     }
-    function C(e, r) {
-        return I(e) || E(e, r) || k(e, r) || x();
+    function j(e, r) {
+        return I(e) || E(e, r) || k(e, r) || C();
     }
-    function x() {
+    function C() {
         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 k(e, r) {
@@ -170,7 +170,7 @@
         if (Object.getOwnPropertySymbols) {
             var i = Object.getOwnPropertySymbols(e);
             for (n = 0; n < i.length; n++) {
-                t = i[n], r.includes(t) || {}.propertyIsEnumerable.call(e, t) && (o[t] = e[t]);
+                t = i[n], -1 === r.indexOf(t) && {}.propertyIsEnumerable.call(e, t) && (o[t] = e[t]);
             }
         }
         return o;
@@ -180,7 +180,7 @@
         var t = {};
         for (var n in e) {
             if ({}.hasOwnProperty.call(e, n)) {
-                if (r.includes(n)) continue;
+                if (-1 !== r.indexOf(n)) continue;
                 t[n] = e[n];
             }
         }
@@ -194,12 +194,12 @@
  */    function A(e) {
         var r = e.children, o = q(e, [ "children" ]);
         // @docs-props-type BodyPropsBase
-                var i = (0, t.useState)(), a = C(i, 2), l = a[0], u = a[1];
+                var i = (0, t.useState)(), a = j(i, 2), l = a[0], u = a[1];
         var c = (0, t.useCallback)((function(e) {
             u(e);
         }), []);
         
-        return n().createElement(S, j({
+        return n().createElement(S, x({
             "data-test": "body"
         }, o, {
             elementRef: c
@@ -242,7 +242,7 @@
         if (Object.getOwnPropertySymbols) {
             var i = Object.getOwnPropertySymbols(e);
             for (n = 0; n < i.length; n++) {
-                t = i[n], r.includes(t) || {}.propertyIsEnumerable.call(e, t) && (o[t] = e[t]);
+                t = i[n], -1 === r.indexOf(t) && {}.propertyIsEnumerable.call(e, t) && (o[t] = e[t]);
             }
         }
         return o;
@@ -252,7 +252,7 @@
         var t = {};
         for (var n in e) {
             if ({}.hasOwnProperty.call(e, n)) {
-                if (r.includes(n)) continue;
+                if (-1 !== r.indexOf(n)) continue;
                 t[n] = e[n];
             }
         }
@@ -337,7 +337,7 @@
         if (Object.getOwnPropertySymbols) {
             var i = Object.getOwnPropertySymbols(e);
             for (n = 0; n < i.length; n++) {
-                t = i[n], r.includes(t) || {}.propertyIsEnumerable.call(e, t) && (o[t] = e[t]);
+                t = i[n], -1 === r.indexOf(t) && {}.propertyIsEnumerable.call(e, t) && (o[t] = e[t]);
             }
         }
         return o;
@@ -347,7 +347,7 @@
         var t = {};
         for (var n in e) {
             if ({}.hasOwnProperty.call(e, n)) {
-                if (r.includes(n)) continue;
+                if (-1 !== r.indexOf(n)) continue;
                 t[n] = e[n];
             }
         }
@@ -493,7 +493,7 @@
         }, ge(e);
     }
     function he(e, r) {
-        return Ce(e) || je(e, r) || we(e, r) || Oe();
+        return je(e) || xe(e, r) || we(e, r) || Oe();
     }
     function Oe() {
         throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
@@ -512,7 +512,7 @@
         }
         return n;
     }
-    function je(e, r) {
+    function xe(e, r) {
         var t = null == e ? null : "undefined" != typeof Symbol && e[Symbol.iterator] || e["@@iterator"];
         if (null != t) {
             var n, o, i, a, l = [], u = !0, c = !1;
@@ -534,16 +534,16 @@
             return l;
         }
     }
-    function Ce(e) {
+    function je(e) {
         if (Array.isArray(e)) return e;
     }
-    function xe(e, r) {
+    function Ce(e, r) {
         if (null == e) return {};
         var t, n, o = ke(e, r);
         if (Object.getOwnPropertySymbols) {
             var i = Object.getOwnPropertySymbols(e);
             for (n = 0; n < i.length; n++) {
-                t = i[n], r.includes(t) || {}.propertyIsEnumerable.call(e, t) && (o[t] = e[t]);
+                t = i[n], -1 === r.indexOf(t) && {}.propertyIsEnumerable.call(e, t) && (o[t] = e[t]);
             }
         }
         return o;
@@ -553,7 +553,7 @@
         var t = {};
         for (var n in e) {
             if ({}.hasOwnProperty.call(e, n)) {
-                if (r.includes(n)) continue;
+                if (-1 !== r.indexOf(n)) continue;
                 t[n] = e[n];
             }
         }
@@ -570,13 +570,13 @@
         returnFocus: c().oneOfType([ c().func, c().object ]).isRequired
     };
     function Ee(e) {
-        var r = e.children, o = e.closeOnClickAway, a = e.elementRef, u = e.divider, c = u === void 0 ? "both" : u, s = e.initialFocus, d = s === void 0 ? "first" : s, y = e.onRequestClose, m = e.open, g = m === void 0 ? false : m, h = e.returnFocus, O = e.style, w = xe(e, [ "children", "closeOnClickAway", "elementRef", "divider", "initialFocus", "onRequestClose", "open", "returnFocus", "style" ]);
+        var r = e.children, o = e.closeOnClickAway, a = e.elementRef, u = e.divider, c = u === void 0 ? "both" : u, s = e.initialFocus, d = s === void 0 ? "first" : s, y = e.onRequestClose, m = e.open, g = m === void 0 ? false : m, h = e.returnFocus, O = e.style, w = Ce(e, [ "children", "closeOnClickAway", "elementRef", "divider", "initialFocus", "onRequestClose", "open", "returnFocus", "style" ]);
         // @docs-props-type ModalPropsBase
                 var S = (0, t.useRef)(null);
         // this timeout ensures that the Modal is finished rendering before setting the focus
-                var j;
-        var C = (0, t.useRef)(undefined);
-        var x = (0, t.useRef)(null);
+                var x;
+        var j = (0, t.useRef)(undefined);
+        var C = (0, t.useRef)(null);
         var k = (0, t.useState)((function() {
             return {
                 headerTitleId: (0, b.createDOMID)("titleId"),
@@ -601,12 +601,12 @@
         }), [ g ]);
         var D = (0, t.useCallback)((function(e) {
             if (g) {
-                C.current = i()((function() {
+                j.current = i()((function() {
                     var e;
                     // not using the takeFocus() util here because it
                     // doesn't work for all values of "initialFocus"
                     // and it has a nested defer() call, which we want to avoid
-                                        if (x.current !== d) {
+                                        if (C.current !== d) {
                         if (d === "first") {
                             if (S.current) {
                                 /* eslint-disable prefer-destructuring */
@@ -622,12 +622,12 @@
                                                 if (e != null && "focus" in e) {
                             e.focus();
                         }
-                        x.current = d;
+                        C.current = d;
                     }
                 }));
             } else {
-                x.current = null;
-                clearTimeout(C.current);
+                C.current = null;
+                clearTimeout(j.current);
                 if (e) {
                     /**
          * We return focus to the invoking element here instead of in `handleRequestClose` because users can
@@ -647,13 +647,13 @@
             }
         }), [ d, g, h ]);
         (0, t.useEffect)((function() {
-            if (x.current !== d) {
+            if (C.current !== d) {
                 // cancel the defer() set up in handleInitialFocus()
                 // so that focus won't jump around if "initialFocus" changes
-                clearTimeout(C.current);
+                clearTimeout(j.current);
             }
             D(_);
-        }), [ D, d, g, j, _ ]);
+        }), [ D, d, g, x, _ ]);
         var M = (0, t.useCallback)((function(e) {
             S.current = e;
             fe(a, e);
@@ -664,7 +664,7 @@
             }
         };
         var B = (0, t.useCallback)((function(e) {
-            x.current = null;
+            C.current = null;
             y === null || y === void 0 ? void 0 : y(e);
         }), [ y ]);
         var F = (0, t.useMemo)((function() {