@splunk/react-ui 5.0.0-beta.5 → 5.0.0-rc.2

package/Switch.js

@@ -24,11 +24,11 @@
     /******/    (() => {
         /******/ // define getter functions for harmony exports
         /******/ e.d = (r, a) => {
-            /******/ for (var o in a) {
-                /******/ if (e.o(a, o) && !e.o(r, o)) {
-                    /******/ Object.defineProperty(r, o, {
+            /******/ for (var t in a) {
+                /******/ if (e.o(a, t) && !e.o(r, t)) {
+                    /******/ Object.defineProperty(r, t, {
                         enumerable: true,
-                        get: a[o]
+                        get: a[t]
                     });
                     /******/                }
                 /******/            }
@@ -61,16 +61,16 @@
         e.r(r);
     // EXPORTS
         e.d(r, {
-        default: () => /* reexport */ W
+        default: () => /* reexport */ Q
     });
     // CONCATENATED MODULE: external "react"
     const a = require("react");
-    var o =  e.n(a);
+    var t =  e.n(a);
     // CONCATENATED MODULE: external "prop-types"
-    const l = require("prop-types");
-    var i =  e.n(l);
+    const i = require("prop-types");
+    var o =  e.n(i);
     // CONCATENATED MODULE: external "@splunk/react-ui/AnimationToggle"
-    const t = require("@splunk/react-ui/AnimationToggle");
+    const l = require("@splunk/react-ui/AnimationToggle");
     // CONCATENATED MODULE: external "@splunk/react-ui/ScreenReaderContent"
     const n = require("@splunk/react-ui/ScreenReaderContent");
     var c =  e.n(n);
@@ -84,103 +84,103 @@
     var v =  e.n(b);
     // CONCATENATED MODULE: external "@splunk/react-ui/Clickable"
     const f = require("@splunk/react-ui/Clickable");
-    var g =  e.n(f);
+    var p =  e.n(f);
     // CONCATENATED MODULE: external "@splunk/themes"
-    const p = require("@splunk/themes");
+    const g = require("@splunk/themes");
     // CONCATENATED MODULE: external "@splunk/react-icons/CheckBoxCompleted"
-    const h = require("@splunk/react-icons/CheckBoxCompleted");
-    var m =  e.n(h);
+    const y = require("@splunk/react-icons/CheckBoxCompleted");
+    var m =  e.n(y);
     // CONCATENATED MODULE: external "@splunk/react-icons/CheckBoxIndeterminate"
-    const k = require("@splunk/react-icons/CheckBoxIndeterminate");
-    var y =  e.n(k);
+    const h = require("@splunk/react-icons/CheckBoxIndeterminate");
+    var k =  e.n(h);
     // CONCATENATED MODULE: ./src/Switch/SwitchStyles.ts
     var C = "20px";
-    var w = "12px";
-    var S = "4px";
+    var S = "12px";
+    var w = "4px";
  // diameter - toggleIndicatorDiameter / 2
-        var x = u()(v()).withConfig({
+        var O = u()(v()).withConfig({
         displayName: "SwitchStyles__StyledBox",
         componentId: "sc-844ieu-0"
-    })([ "display:inline;position:relative;flex-shrink:0;gap:", ";min-height:", ";align-items:center;color:", ";", "" ], p.variables.spacingSmall, p.variables.inputHeight, p.variables.contentColorActive, (function(e) {
+    })([ "display:inline;position:relative;flex-shrink:0;gap:", ";min-height:", ";align-items:center;color:", ";", "" ], g.variables.spacingSmall, g.variables.inputHeight, g.variables.contentColorActive, (function(e) {
         var r = e.$disabled;
-        return r && (0, d.css)([ "color:", ";" ], p.variables.contentColorDisabled);
+        return r && (0, d.css)([ "color:", ";" ], g.variables.contentColorDisabled);
     }));
-    var B = (0, d.css)([ "", " position:relative;width:", ";height:", ";line-height:", ";border-radius:", ";border:", " solid ", ";background-color:", ";cursor:pointer;flex:0 0 auto;&:not([disabled]){&:focus{box-shadow:", ";}color:", ";", "}&[disabled]{border-color:", ";background-color:", ";color:", ";cursor:not-allowed;", ";}" ], p.mixins.reset("inline"), C, C, C, p.variables.borderRadius, p.variables.inputBorderWidth, p.variables.interactiveColorBorder, p.variables.interactiveColorBackground, p.variables.focusShadow, (0, 
-    p.pick)({
-        light: p.variables.white,
-        dark: p.variables.black
+    var x = (0, d.css)([ "", " position:relative;width:", ";height:", ";line-height:", ";border-radius:", ";border:", " solid ", ";background-color:", ";cursor:pointer;flex:0 0 auto;&:not([disabled]){&:focus{box-shadow:", ";}color:", ";", "}&[disabled]{border-color:", ";background-color:", ";color:", ";cursor:not-allowed;", ";}" ], g.mixins.reset("inline"), C, C, C, g.variables.borderRadius, g.variables.inputBorderWidth, g.variables.interactiveColorBorder, g.variables.interactiveColorBackground, g.variables.focusShadow, (0, 
+    g.pick)({
+        light: g.variables.white,
+        dark: g.variables.black
     }), (function(e) {
         var r = e.$error, a = e.$selected;
         if (a && !r) {
-            return (0, d.css)([ "background-color:", ";border:none;" ], p.variables.interactiveColorAccent);
+            return (0, d.css)([ "background-color:", ";border:none;" ], g.variables.interactiveColorAccent);
         }
         if (!a && r) {
-            return (0, d.css)([ "border-color:", ";&:hover{border-color:", ";background-color:", ";}" ], p.variables.interactiveColorAccentError, p.mixins.overlayColors(p.variables.interactiveColorAccentError, p.variables.interactiveColorBorderHover), p.mixins.overlayColors(p.variables.interactiveColorBackground, p.variables.interactiveColorOverlayHover));
+            return (0, d.css)([ "border-color:", ";&:hover{border-color:", ";background-color:", ";}" ], g.variables.interactiveColorAccentError, g.mixins.overlayColors(g.variables.interactiveColorAccentError, g.variables.interactiveColorBorderHover), g.mixins.overlayColors(g.variables.interactiveColorBackground, g.variables.interactiveColorOverlayHover));
         }
         if (a && r) {
-            return (0, d.css)([ "background-color:", ";border:none;" ], p.variables.interactiveColorAccentError);
+            return (0, d.css)([ "background-color:", ";border:none;" ], g.variables.interactiveColorAccentError);
         }
-        return (0, d.css)([ "&:hover{border-color:", ";background-color:", ";}" ], p.variables.interactiveColorBorderHover, p.mixins.overlayColors(p.variables.interactiveColorBackground, p.variables.interactiveColorOverlayHover));
-    }), p.variables.interactiveColorBorderDisabled, p.variables.interactiveColorBackgroundDisabled, p.variables.contentColorDisabled, (function(e) {
+        return (0, d.css)([ "&:hover{border-color:", ";background-color:", ";}" ], g.variables.interactiveColorBorderHover, g.mixins.overlayColors(g.variables.interactiveColorBackground, g.variables.interactiveColorOverlayHover));
+    }), g.variables.interactiveColorBorderDisabled, g.variables.interactiveColorBackgroundDisabled, g.variables.contentColorDisabled, (function(e) {
         var r = e.$selected;
-        return r && (0, d.css)([ "border:none;background-color:", ";" ], p.variables.neutral100);
+        return r && (0, d.css)([ "border:none;background-color:", ";" ], g.variables.neutral100);
     }));
-    var O = u()(g()).withConfig({
+    var B = u()(p()).withConfig({
         displayName: "SwitchStyles__StyledCheckboxClickable",
         componentId: "sc-844ieu-1"
-    })([ "", "" ], B);
-    var $ = (0, d.css)([ "display:block;height:", ";width:", ";" ], C, C);
-    var _ = u()(m()).withConfig({
+    })([ "", "" ], x);
+    var j = (0, d.css)([ "display:block;height:", ";width:", ";" ], C, C);
+    var $ = u()(m()).withConfig({
         displayName: "SwitchStyles__StyledCheck",
         componentId: "sc-844ieu-2"
-    })([ "", "" ], $);
-    var E = u()(y()).withConfig({
+    })([ "", "" ], j);
+    var I = u()(k()).withConfig({
         displayName: "SwitchStyles__StyledSome",
         componentId: "sc-844ieu-3"
-    })([ "", "" ], $);
+    })([ "", "" ], j);
     var q = u().div.withConfig({
         displayName: "SwitchStyles__StyledToggleIndicator",
         componentId: "sc-844ieu-4"
-    })([ "--toggle-indicator-margin:calc(", " - ", ");background-color:", ";border-radius:50%;box-sizing:border-box;width:", ";height:", ";position:absolute;left:var(--toggle-indicator-margin);top:var(--toggle-indicator-margin);", ";", " ", " ", ";" ], S, p.variables.inputBorderWidth, (0, 
-    p.pick)({
-        light: p.variables.black,
-        dark: p.variables.white
-    }), w, w, (function(e) {
+    })([ "--toggle-indicator-margin:calc(", " - ", ");background-color:", ";border-radius:50%;box-sizing:border-box;width:", ";height:", ";position:absolute;left:var(--toggle-indicator-margin);top:var(--toggle-indicator-margin);", ";", " ", " ", ";" ], w, g.variables.inputBorderWidth, (0, 
+    g.pick)({
+        light: g.variables.black,
+        dark: g.variables.white
+    }), S, S, (function(e) {
         var r = e.$delay;
         return r && (0, d.css)([ "transition:left ", ";" ], r);
-    }), (0, p.pick)({
-        prisma: (0, d.css)([ "box-shadow:", ";" ], p.variables.embossShadow)
+    }), (0, g.pick)({
+        prisma: (0, d.css)([ "box-shadow:", ";" ], g.variables.embossShadow)
     }), (function(e) {
         var r = e.$selected, a = e.$disabled;
-        return (0, d.css)([ "", " ", "" ], r && (0, d.css)([ "left:calc(100% - (", " + var(--toggle-indicator-margin)));" ], w), !a && r && (0, 
-        d.css)([ "background-color:", ";" ], (0, p.pick)({
-            light: p.variables.white,
-            dark: p.variables.black
+        return (0, d.css)([ "", " ", "" ], r && (0, d.css)([ "left:calc(100% - (", " + var(--toggle-indicator-margin)));" ], S), !a && r && (0, 
+        d.css)([ "background-color:", ";" ], (0, g.pick)({
+            light: g.variables.white,
+            dark: g.variables.black
         })));
     }), (function(e) {
         var r = e.$disabled;
-        return r && (0, d.css)([ "background-color:", ";" ], p.variables.neutral400);
+        return r && (0, d.css)([ "background-color:", ";" ], g.variables.neutral400);
     }));
-    var I = (0, d.css)([ "position:relative;width:calc(", " * 2);height:", ";background-color:", ";transition:background-color ", ";flex:0 0 auto;border-radius:calc(", " / 2);border:", " solid ", ";&:not([disabled]){&:focus{box-shadow:", ";}", "}&[disabled]{border:", " solid ", ";background-color:", ";", "}" ], C, C, p.variables.interactiveColorBackground, (function(e) {
+    var E = (0, d.css)([ "position:relative;width:calc(", " * 2);height:", ";background-color:", ";transition:background-color ", ";flex:0 0 auto;border-radius:calc(", " / 2);border:", " solid ", ";&:not([disabled]){&:focus{box-shadow:", ";}", "}&[disabled]{border:", " solid ", ";background-color:", ";", "}" ], C, C, g.variables.interactiveColorBackground, (function(e) {
         return e.$delay;
-    }), C, p.variables.inputBorderWidth, p.variables.interactiveColorBorder, p.variables.focusShadow, (function(e) {
+    }), C, g.variables.inputBorderWidth, g.variables.interactiveColorBorder, g.variables.focusShadow, (function(e) {
         var r = e.$selected;
         if (!r) {
-            return (0, d.css)([ "&:hover{border-color:", ";background-color:", ";}" ], p.variables.interactiveColorBorderHover, p.mixins.overlayColors(p.variables.interactiveColorBackground, p.variables.interactiveColorOverlayHover));
+            return (0, d.css)([ "&:hover{border-color:", ";background-color:", ";}" ], g.variables.interactiveColorBorderHover, g.mixins.overlayColors(g.variables.interactiveColorBackground, g.variables.interactiveColorOverlayHover));
         }
-        return (0, d.css)([ "border-color:transparent;background-color:", ";" ], p.variables.interactiveColorAccent);
-    }), p.variables.inputBorderWidth, p.variables.interactiveColorBorderDisabled, p.variables.interactiveColorBackgroundDisabled, (function(e) {
+        return (0, d.css)([ "border-color:transparent;background-color:", ";" ], g.variables.interactiveColorAccent);
+    }), g.variables.inputBorderWidth, g.variables.interactiveColorBorderDisabled, g.variables.interactiveColorBackgroundDisabled, (function(e) {
         var r = e.$selected;
-        return r && (0, d.css)([ "background-color:", ";" ], p.variables.neutral100);
+        return r && (0, d.css)([ "background-color:", ";" ], g.variables.neutral100);
     }));
-    var j = u()(g()).withConfig({
+    var P = u()(p()).withConfig({
         displayName: "SwitchStyles__StyledToggleClickable",
         componentId: "sc-844ieu-5"
-    })([ "", "" ], I);
-    var D = u().label.withConfig({
+    })([ "", "" ], E);
+    var _ = u().label.withConfig({
         displayName: "SwitchStyles__StyledLabel",
         componentId: "sc-844ieu-6"
-    })([ "", " flex:1 1 auto;color:inherit;line-height:", ";", ";" ], p.mixins.reset("inline-block"), p.variables.lineHeight, (function(e) {
+    })([ "", " flex:1 1 auto;color:inherit;line-height:", ";", ";" ], g.mixins.reset("inline-block"), g.variables.lineHeight, (function(e) {
         var r = e.$disabled;
         return !r && (0, d.css)([ "cursor:pointer;" ]);
     }));
@@ -191,7 +191,7 @@
  * @param ref - The React callback or object ref. Can be `null` or `undefined`.
  * @param current - The new value of the ref.
  */
-    function L(e, r) {
+    function R(e, r) {
         if (e) {
             if (typeof e === "function") {
                 e(r);
@@ -204,174 +204,247 @@
         }
     }
     // CONCATENATED MODULE: ./src/Switch/Switch.tsx
-    function R() {
-        return R = Object.assign ? Object.assign.bind() : function(e) {
-            for (var r = 1; r < arguments.length; r++) {
-                var a = arguments[r];
-                for (var o in a) {
-                    ({}).hasOwnProperty.call(a, o) && (e[o] = a[o]);
-                }
-            }
-            return e;
-        }, R.apply(null, arguments);
+    function D(e) {
+        "@babel/helpers - typeof";
+        return D = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(e) {
+            return typeof e;
+        } : function(e) {
+            return e && "function" == typeof Symbol && e.constructor === Symbol && e !== Symbol.prototype ? "symbol" : typeof e;
+        }, D(e);
+    }
+    function L(e, r) {
+        var a = Object.keys(e);
+        if (Object.getOwnPropertySymbols) {
+            var t = Object.getOwnPropertySymbols(e);
+            r && (t = t.filter((function(r) {
+                return Object.getOwnPropertyDescriptor(e, r).enumerable;
+            }))), a.push.apply(a, t);
+        }
+        return a;
+    }
+    function T(e) {
+        for (var r = 1; r < arguments.length; r++) {
+            var a = null != arguments[r] ? arguments[r] : {};
+            r % 2 ? L(Object(a), !0).forEach((function(r) {
+                A(e, r, a[r]);
+            })) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(a)) : L(Object(a)).forEach((function(r) {
+                Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(a, r));
+            }));
+        }
+        return e;
+    }
+    function A(e, r, a) {
+        return (r = H(r)) in e ? Object.defineProperty(e, r, {
+            value: a,
+            enumerable: !0,
+            configurable: !0,
+            writable: !0
+        }) : e[r] = a, e;
     }
-    function T(e, r) {
+    function H(e) {
+        var r = N(e, "string");
+        return "symbol" == D(r) ? r : r + "";
+    }
+    function N(e, r) {
+        if ("object" != D(e) || !e) return e;
+        var a = e[Symbol.toPrimitive];
+        if (void 0 !== a) {
+            var t = a.call(e, r || "default");
+            if ("object" != D(t)) return t;
+            throw new TypeError("@@toPrimitive must return a primitive value.");
+        }
+        return ("string" === r ? String : Number)(e);
+    }
+    function M(e, r) {
         if (null == e) return {};
-        var a, o, l = A(e, r);
+        var a, t, i = W(e, r);
         if (Object.getOwnPropertySymbols) {
-            var i = Object.getOwnPropertySymbols(e);
-            for (o = 0; o < i.length; o++) {
-                a = i[o], r.includes(a) || {}.propertyIsEnumerable.call(e, a) && (l[a] = e[a]);
+            var o = Object.getOwnPropertySymbols(e);
+            for (t = 0; t < o.length; t++) {
+                a = o[t], r.includes(a) || {}.propertyIsEnumerable.call(e, a) && (i[a] = e[a]);
             }
         }
-        return l;
+        return i;
     }
-    function A(e, r) {
+    function W(e, r) {
         if (null == e) return {};
         var a = {};
-        for (var o in e) {
-            if ({}.hasOwnProperty.call(e, o)) {
-                if (r.includes(o)) continue;
-                a[o] = e[o];
+        for (var t in e) {
+            if ({}.hasOwnProperty.call(e, t)) {
+                if (r.includes(t)) continue;
+                a[t] = e[t];
             }
         }
         return a;
     }
-    /** @public */
-    /** @public */    var H = {
-        appearance: i().oneOf([ "checkbox", "toggle" ]),
-        children: i().node,
-        disabled: i().bool,
-        elementRef: i().oneOfType([ i().func, i().object ]),
-        error: i().bool,
-        id: i().string,
-        inline: i().bool,
-        labelledBy: i().string,
-        onClick: i().func,
+    function F() {
+        return F = Object.assign ? Object.assign.bind() : function(e) {
+            for (var r = 1; r < arguments.length; r++) {
+                var a = arguments[r];
+                for (var t in a) {
+                    ({}).hasOwnProperty.call(a, t) && (e[t] = a[t]);
+                }
+            }
+            return e;
+        }, F.apply(null, arguments)
+        /** @public */
+        /** @public */;
+    }
+    var z = {
+        appearance: o().oneOf([ "checkbox", "toggle" ]),
+        children: o().node,
+        disabled: o().bool,
+        elementRef: o().oneOfType([ o().func, o().object ]),
+        error: o().bool,
+        id: o().string,
+        inline: o().bool,
+        labelledBy: o().string,
+        onClick: o().func,
         /** @private. */
-        required: i().bool,
-        selected: i().oneOf([ true, false, "some" ]),
-        selectedLabel: i().string,
-        toggleRef: i().oneOfType([ i().func, i().object ]),
-        someSelectedLabel: i().string,
-        unselectedLabel: i().string,
-        value: i().any
+        required: o().bool,
+        selected: o().oneOf([ true, false, "some" ]),
+        selectedLabel: o().string,
+        toggleRef: o().oneOfType([ o().func, o().object ]),
+        someSelectedLabel: o().string,
+        unselectedLabel: o().string,
+        value: o().any
     };
-    var P = function e(r) {
-        var a = r.disabled, l = r.selected, i = T(r, [ "disabled", "selected" ]);
-        var n = a === true ? "disabled" : undefined;
-        var c = (0, t.useAnimationToggle)();
-        var s = c === "on" ? "200ms" : undefined;
-        var d =  o().createElement(q, {
-            $delay: s,
-            $disabled: !!n,
-            $selected: l
+    var G = function e(r) {
+        var a = r.ariaChecked, i = r.ariaInvalid, o = r.ariaLabelledBy, n = r.ariaRequired, c = r.dataTest, s = r.dataSelected, d = r.disabled, u = r.elementRef, b = r.id, v = r.onClick, f = r.selected;
+        var p = d === true ? "disabled" : undefined;
+        var g = (0, l.useAnimationToggle)();
+        var y = g === "on" ? "200ms" : undefined;
+        var m =  t().createElement(q, {
+            $delay: y,
+            $disabled: !!p,
+            $selected: f
         });
         
-        return o().createElement(j, R({
+        return t().createElement(P, {
             role: "switch",
-            $delay: s,
-            disabled: n,
-            $selected: l || false
-        }, i), d);
+            "aria-checked": a,
+            "aria-invalid": i,
+            "aria-labelledby": o,
+            "aria-required": n,
+            "data-selected": s,
+            "data-test": c,
+            disabled: p,
+            elementRef: u,
+            id: b,
+            onClick: v,
+            $delay: y,
+            $selected: f || false
+        }, m);
     };
-    var N = function e(r) {
-        var a = r.appearance, l = r.disabled, i = r.error, t = r.role, n = r.selected, c = T(r, [ "appearance", "disabled", "error", "role", "selected" ]);
+    var J = function e(r) {
+        var a = r.ariaChecked, i = r.ariaInvalid, o = r.ariaLabelledBy, l = r.ariaRequired, n = r.dataTest, c = r.dataSelected, s = r.disabled, d = r.error, u = r.id, b = r.elementRef, v = r.onClick, f = r.role, p = r.selected, g = r.tabIndex;
         /* Setting viewbox to rescale the icons to appear larger. Cannot directly adjust svg
    * width and height without the svg being larger than the checkbox and box-model.
-   */        var s = "4 4 16 16";
-        var d =  o().createElement(o().Fragment, null, n === true &&  o().createElement(_, {
-            viewBox: s
-        }), n === "some" &&  o().createElement(E, {
-            viewBox: s
+   */        var y = "4 4 16 16";
+        var m =  t().createElement(t().Fragment, null, p === true &&  t().createElement($, {
+            viewBox: y
+        }), p === "some" &&  t().createElement(I, {
+            viewBox: y
         }));
-        var u = l === true ? "disabled" : undefined;
+        var h = s === true ? "disabled" : undefined;
         
-        return o().createElement(O, R({
-            as: t === "presentation" ? "div" : undefined,
-            role: t || a,
-            disabled: u,
-            $error: i || false,
-            $selected: n === "some" || n || false
+        return t().createElement(B, F({
+            as: f === "presentation" ? "div" : undefined,
+            "aria-checked": a,
+            "aria-invalid": i,
+            "aria-labelledby": o,
+            "aria-required": l,
+            "data-selected": c,
+            "data-test": n,
+            disabled: h
+        }, {
+            elementRef: f === "presentation" ? undefined : b
+        }, {
+            id: u,
+            onClick: v,
+            role: f || "checkbox",
+            tabIndex: g,
+            $error: d || false,
+            $selected: p === "some" || p || false
         }, {
-            inert: t === "presentation" ? "true" : undefined
-        }, c), d);
+            inert: f === "presentation" ? "true" : undefined
+        }), m);
     };
     /**
  * `Switch` is a basic form control with an on/off state.
- */    function M(e) {
-        var r = e.appearance, l = r === void 0 ? "checkbox" : r, i = e.children, t = e.disabled, n = e.elementRef, d = e.error, u = e.id, b = e.inline, v = e.labelledBy, f = e.onClick, g = e.required, p = e.selected, h = e.selectedLabel, m = e.someSelectedLabel, k = e.toggleRef, y = e.unselectedLabel, C = e.value, w = T(e, [ "appearance", "children", "disabled", "elementRef", "error", "id", "inline", "labelledBy", "onClick", "required", "selected", "selectedLabel", "someSelectedLabel", "toggleRef", "unselectedLabel", "value" ]);
+ */    function K(e) {
+        var r = e.appearance, i = r === void 0 ? "checkbox" : r, o = e.children, l = e.disabled, n = e.elementRef, d = e.error, u = e.id, b = e.inline, v = e.labelledBy, f = e.onClick, p = e.required, g = e.selected, y = e.selectedLabel, m = e.someSelectedLabel, h = e.toggleRef, k = e.unselectedLabel, C = e.value, S = M(e, [ "appearance", "children", "disabled", "elementRef", "error", "id", "inline", "labelledBy", "onClick", "required", "selected", "selectedLabel", "someSelectedLabel", "toggleRef", "unselectedLabel", "value" ]);
         // @docs-props-type SwitchPropsBase
         /* If has internal label defined with children, must have an id and must use generated labelId.
    * Otherwise, use customer defined id and external label.
-   */        var S = i && u == null ? (0, s.createDOMID)("clickable") : u;
-        var B = i ? (0, s.createDOMID)("label") : v;
+   */        var w = o && u == null ? (0, s.createDOMID)("clickable") : u;
+        var x = o ? (0, s.createDOMID)("label") : v;
         (0, a.useEffect)((function() {
             if (false) {}
             if (false) {}
-        }), [ p, l, d ]);
-        var O = (0, a.useCallback)((function(e) {
+        }), [ g, i, d ]);
+        var B = (0, a.useCallback)((function(e) {
             f === null || f === void 0 ? void 0 : f(e, {
                 value: C,
                 // @ts-expect-error - safe due to individual prop interfaces
-                selected: p
+                selected: g
             });
-        }), [ f, C, p ]);
-        var $ = (0, a.useCallback)((function(e) {
-            L(k, e);
-        }), [ k ]);
-        var _ = p === "some" ? "mixed" : p;
-        var E = {
-            true: h,
-            false: y,
+        }), [ f, C, g ]);
+        var j = (0, a.useCallback)((function(e) {
+            R(h, e);
+        }), [ h ]);
+        var $ = g === "some" ? "mixed" : g;
+        var I = {
+            true: y,
+            false: k,
             some: m
         };
-        var q = {
-            id: S,
-            onClick: t || O,
-            elementRef: $,
-            "aria-labelledby": B,
-            "aria-checked": _,
-            "aria-invalid": d ? true : undefined,
-            "aria-required": g,
+        var q = T(T({
+            id: w,
+            onClick: l ? undefined : B,
+            elementRef: j,
+            ariaLabelledBy: x,
+            ariaChecked: $,
+            ariaInvalid: d ? true : undefined,
+            ariaRequired: p,
             // TODO(SUI-7658): Hopefully handled cleaner when Checkbox is removed out of Switch and NonInteractiveCheckbox uptakes that. For now intentionally not spread like others and access directly from otherProps to stress not specific to Switch but base HTML element props.
-            "data-test": w.role === "presentation" ? "presentation-toggle" : "toggle",
-            "data-selected": p,
-            // TODO(SUI-7658): Hopefully handled cleaner when Checkbox is removed out of Switch and NonInteractiveCheckbox uptakes that. For now intentionally not spread like others and access directly from otherProps to stress not specific to Switch but base HTML element props.
-            role: w.role,
-            tabIndex: w.tabIndex
-        };
-        var I = !!h || !!m || !!y;
+            dataTest: S.role === "presentation" ? "presentation-toggle" : "toggle",
+            dataSelected: g
+        }, S.role != null && {
+            role: S.role
+        }), S.tabIndex != null && {
+            tabIndex: S.tabIndex
+        });
+        var E = !!y || !!m || !!k;
         
-        return o().createElement(x, R({
+        return t().createElement(O, F({
             flex: true,
             inline: b,
             "data-test": "switch",
-            "data-test-selected": p,
+            "data-test-selected": g,
             "data-test-value": C,
             "data-test-error": d ? true : undefined,
             "data-error": d ? true : undefined,
-            "data-test-disabled": t ? "disabled" : undefined,
+            "data-test-disabled": l ? "disabled" : undefined,
             elementRef: n,
-            $disabled: t || false
-        }, w), l === "toggle" ?  o().createElement(P, R({
-            disabled: t || false,
-            selected: !!p
-        }, q)) :  o().createElement(N, R({
-            appearance: "checkbox",
+            $disabled: l || false
+        }, S), i === "toggle" ?  t().createElement(G, F({
+            disabled: l || false,
+            selected: !!g
+        }, q)) :  t().createElement(J, F({
             error: d || false,
-            disabled: t || false,
-            selected: p
-        }, q)), I &&  o().createElement(c(), null, E["".concat(p)]), i &&  o().createElement(D, {
-            $disabled: t || false,
+            disabled: l || false,
+            selected: g
+        }, q)), E &&  t().createElement(c(), null, I["".concat(g)]), o &&  t().createElement(_, {
+            $disabled: l || false,
             "data-test": "label",
-            id: B,
-            htmlFor: S,
-            "data-disabled": t || null
-        }, i));
+            id: x,
+            htmlFor: w,
+            "data-disabled": l || null
+        }, o));
     }
-    M.propTypes = H;
-    /* harmony default export */    const W = M;
+    K.propTypes = z;
+    /* harmony default export */    const Q = K;
     // CONCATENATED MODULE: ./src/Switch/index.ts
     module.exports = r;
     /******/})();