@splunk/react-ui 4.39.0 → 4.41.0

package/Card.js

@@ -211,7 +211,8 @@
  */    function S(e) {
         var r = e.children, t = e.showBorder, o = t === void 0 ? true : t, i = w(e, [ "children", "showBorder" ]);
         // @docs-props-type FooterPropsBase
-                
+                if (false) {}
+        
         return n().createElement(h, g({
             "data-test": "footer",
             $showTopBorder: o
@@ -690,6 +691,7 @@
                 be(t, [ {
             key: "render",
             value: function e() {
+                if (false) {}
                 if (Be(this.props)) {
                     var r = Ie(this.props), t = ae(r, 2), o = t[0], i = t[1];
                     var a = o.showBorder;

package/Chip.js

@@ -24,11 +24,11 @@
     /******/    (() => {
         /******/ // define getter functions for harmony exports
         /******/ e.d = (r, a) => {
-            /******/ for (var n in a) {
-                /******/ if (e.o(a, n) && !e.o(r, n)) {
-                    /******/ Object.defineProperty(r, n, {
+            /******/ for (var o in a) {
+                /******/ if (e.o(a, o) && !e.o(r, o)) {
+                    /******/ Object.defineProperty(r, o, {
                         enumerable: true,
-                        get: a[n]
+                        get: a[o]
                     });
                     /******/                }
                 /******/            }
@@ -61,14 +61,14 @@
         e.r(r);
     // EXPORTS
         e.d(r, {
-        default: () => /* reexport */ G
+        default: () => /* reexport */ X
     });
     // CONCATENATED MODULE: external "react"
     const a = require("react");
-    var n =  e.n(a);
+    var o =  e.n(a);
     // CONCATENATED MODULE: external "lodash/omit"
-    const o = require("lodash/omit");
-    var i =  e.n(o);
+    const n = require("lodash/omit");
+    var i =  e.n(n);
     // CONCATENATED MODULE: external "prop-types"
     const t = require("prop-types");
     var l =  e.n(t);
@@ -76,8 +76,8 @@
     const s = require("@splunk/react-icons/Cross");
     var c =  e.n(s);
     // CONCATENATED MODULE: external "@splunk/react-icons/enterprise/Close"
-    const p = require("@splunk/react-icons/enterprise/Close");
-    var u =  e.n(p);
+    const u = require("@splunk/react-icons/enterprise/Close");
+    var p =  e.n(u);
     // CONCATENATED MODULE: external "@splunk/ui-utils/i18n"
     const d = require("@splunk/ui-utils/i18n");
     // CONCATENATED MODULE: external "@splunk/ui-utils/color"
@@ -87,52 +87,56 @@
     // CONCATENATED MODULE: external "@splunk/themes"
     const b = require("@splunk/themes");
     // CONCATENATED MODULE: external "@splunk/react-ui/ScreenReaderContent"
-    const g = require("@splunk/react-ui/ScreenReaderContent");
-    var m =  e.n(g);
+    const m = require("@splunk/react-ui/ScreenReaderContent");
+    var g =  e.n(m);
     // CONCATENATED MODULE: external "styled-components"
     const h = require("styled-components");
     var C =  e.n(h);
     // CONCATENATED MODULE: external "@splunk/react-ui/Clickable"
     const y = require("@splunk/react-ui/Clickable");
-    var x =  e.n(y);
+    var $ =  e.n(y);
     // CONCATENATED MODULE: ./src/Chip/ChipStyles.ts
-    var $ = (0, h.css)([ "", ";background-color:", ";border:1px solid transparent;flex:0 1 auto;max-width:calc(100% - 3px);border-radius:2px;", " ", " ", "" ], b.mixins.reset("inline-flex"), (0, 
+    var x = (0, h.css)([ "", ";background-color:", ";border:1px solid transparent;border-radius:2px;", " flex:0 1 auto;max-width:calc(100% - 3px);", " ", " ", "" ], b.mixins.reset("inline-flex"), (0, 
     b.pickVariant)("$appearance", {
         default: {
-            enterprise: {
-                dark: b.variables.gray45,
-                light: b.variables.gray92
-            },
+            enterprise: b.variables.neutral300,
             prisma: b.variables.neutral100
         },
         info: {
-            enterprise: b.variables.infoColorL30
+            enterprise: b.variables.infoColorL30,
+            prisma: b.variables.statusColorInfo
         },
         success: {
-            enterprise: b.variables.successColorL30
+            enterprise: b.variables.successColorL30,
+            prisma: b.variables.statusColorNormal
         },
         warning: {
-            enterprise: b.variables.warningColorL30
+            enterprise: b.variables.warningColorL30,
+            prisma: b.variables.statusColorMedium
         },
         error: {
             enterprise: b.variables.errorColorL30,
-            prisma: b.variables.accentColorNegative
-        },
-        outline: {
-            prisma: "transparent"
+            prisma: b.variables.statusColorHigh
         },
+        outline: "transparent",
         custom: function e(r) {
             var a = r.$backgroundColor;
             return a;
         }
+    }), (function(e) {
+        var r = e.$appearance;
+        return r === "outline" && (0, h.css)([ "border-color:", ";" ], (0, b.pick)({
+            enterprise: {
+                dark: b.variables.gray80,
+                light: b.variables.gray60
+            },
+            prisma: b.variables.interactiveColorBorder
+        }));
     }), (0, b.pick)({
-        enterprise: (0, h.css)([ "color:", ";line-height:", ";margin:0 2px 2px 0;" ], b.variables.textGray, b.variables.lineHeight),
-        prisma: (0, h.css)([ "color:", ";line-height:16px;margin:1px;", "" ], (function(e) {
-            var r = e.$appearance;
-            return r === "error" ? b.variables.contentColorInverted : b.variables.contentColorDefault;
-        }), (function(e) {
+        enterprise: (0, h.css)([ "line-height:", ";margin:0 2px 2px 0;" ], b.variables.lineHeight),
+        prisma: (0, h.css)([ "color:", ";line-height:16px;margin:1px;" ], (function(e) {
             var r = e.$appearance;
-            return r === "outline" && (0, h.css)([ "border-color:", ";" ], b.variables.interactiveColorBorder);
+            return r === "default" || r === "outline" ? b.variables.contentColorDefault : b.variables.contentColorInverted;
         }))
     }), (0, b.pick)({
         enterprise: {
@@ -154,13 +158,16 @@
                 prisma: b.variables.interactiveColorBackgroundDisabled
             },
             info: {
-                enterprise: b.mixins.colorWithAlpha(b.variables.infoColorL10, .3)
+                enterprise: b.mixins.colorWithAlpha(b.variables.infoColorL10, .3),
+                prisma: b.variables.interactiveColorBackgroundDisabled
             },
             success: {
-                enterprise: b.mixins.colorWithAlpha(b.variables.successColorL10, .3)
+                enterprise: b.mixins.colorWithAlpha(b.variables.successColorL10, .3),
+                prisma: b.variables.interactiveColorBackgroundDisabled
             },
             warning: {
-                enterprise: b.mixins.colorWithAlpha(b.variables.warningColorL10, .3)
+                enterprise: b.mixins.colorWithAlpha(b.variables.warningColorL10, .3),
+                prisma: b.variables.interactiveColorBackgroundDisabled
             },
             error: {
                 enterprise: b.mixins.colorWithAlpha(b.variables.errorColorL10, .3),
@@ -181,7 +188,7 @@
     var k = C().div.withConfig({
         displayName: "ChipStyles__StyledBasic",
         componentId: "sc-1sd3tsh-0"
-    })([ "", "" ], $);
+    })([ "", "" ], x);
     var S = C()(k).withConfig({
         displayName: "ChipStyles__Styled",
         componentId: "sc-1sd3tsh-1"
@@ -199,15 +206,15 @@
             }
         }), (function(e) {
             var r = e.$icon, a = e.$removable;
-            var n = (0, h.css)([ "grid-template-columns:1fr;" ]);
+            var o = (0, h.css)([ "grid-template-columns:1fr;" ]);
             if (r && a) {
-                n = (0, h.css)([ "grid-template-columns:0fr 1fr 0fr;" ]);
+                o = (0, h.css)([ "grid-template-columns:0fr 1fr 0fr;" ]);
             } else if (r) {
-                n = (0, h.css)([ "grid-template-columns:0fr 1fr;" ]);
+                o = (0, h.css)([ "grid-template-columns:0fr 1fr;" ]);
             } else if (a) {
-                n = (0, h.css)([ "grid-template-columns:1fr 0fr;" ]);
+                o = (0, h.css)([ "grid-template-columns:1fr 0fr;" ]);
             }
-            return n;
+            return o;
         }))
     }));
     var O = C().div.withConfig({
@@ -229,8 +236,8 @@
                 return a || b.variables.contentColorDefault;
             },
             prisma: function e(r) {
-                var a = r.$foregroundColor, n = r.$appearance;
-                return a || (n === "error" ? b.variables.contentColorInverted : b.variables.contentColorDefault);
+                var a = r.$foregroundColor, o = r.$appearance;
+                return a || (o === "default" || o === "outline" ? b.variables.contentColorDefault : b.variables.contentColorInverted);
             }
         }
     }));
@@ -243,12 +250,12 @@
         true: b.variables.contentColorDisabled,
         false: {
             enterprise: function e(r) {
-                var a = r.$appearance, n = r.$foregroundColor;
-                return n || (a === "default" || a === "outline" ? b.variables.contentColorDefault : b.variables.gray30);
+                var a = r.$appearance, o = r.$foregroundColor;
+                return o || (a === "default" || a === "outline" ? b.variables.contentColorDefault : b.variables.gray30);
             },
             prisma: function e(r) {
-                var a = r.$appearance, n = r.$foregroundColor;
-                return n || (a === "error" ? b.variables.contentColorInverted : b.variables.contentColorActive);
+                var a = r.$appearance, o = r.$foregroundColor;
+                return o || (a === "default" || a === "outline" ? b.variables.contentColorActive : b.variables.contentColorInverted);
             }
         }
     }));
@@ -264,8 +271,8 @@
             true: b.variables.contentColorDisabled,
             false: {
                 enterprise: function e(r) {
-                    var a = r.$foregroundColor, n = r.$appearance;
-                    return a || (n === "default" || n === "outline" ? b.variables.textGray : b.variables.gray30);
+                    var a = r.$foregroundColor, o = r.$appearance;
+                    return a || (o === "default" || o === "outline" ? b.variables.textGray : b.variables.gray30);
                 }
             }
         })),
@@ -274,10 +281,10 @@
             return r ? b.variables.contentColorDisabled : a || "inherit";
         }))
     }));
-    var q = C()(x()).withConfig({
+    var I = C()($()).withConfig({
         displayName: "ChipStyles__StyledClickable",
         componentId: "sc-1sd3tsh-6"
-    })([ "", " flex:0 1 auto;line-height:16px;cursor:pointer;&:focus{", ";}&:not([disabled]):hover{", ";}", ";" ], $, (0, 
+    })([ "", " flex:0 1 auto;line-height:16px;cursor:pointer;&:focus{", ";}&:not([disabled]):hover{", ";}", ";" ], x, (0, 
     b.pick)({
         enterprise: (0, h.css)([ "box-shadow:", ";color:", ";" ], b.variables.focusShadow, b.variables.linkColor),
         prisma: (0, h.css)([ "color:", ";", "{background-color:", ";box-shadow:0 0 0 3px ", ";}" ], b.variables.contentColorActive, /* sc-sel */ _, b.variables.interactiveColorOverlayHover, b.variables.focusColor)
@@ -299,62 +306,62 @@
             var r = e.$foregroundColor;
             return r || b.variables.linkColor;
         })),
-        prisma: (0, h.css)([ "color:", ";", "{background-color:", ";", ";}" ], b.variables.contentColorActive, /* sc-sel */ _, b.variables.interactiveColorOverlayHover, (function(e) {
-            var r = e.$appearance;
-            return r === "error" && (0, h.css)([ "color:", ";" ], b.variables.contentColorInverted);
+        prisma: (0, h.css)([ "", "{background-color:", ";color:", ";}" ], /* sc-sel */ _, b.variables.interactiveColorOverlayHover, (function(e) {
+            var r = e.$appearance, a = e.$foregroundColor;
+            return a || (r === "default" || r === "outline" ? b.variables.contentColorActive : b.variables.contentColorInverted);
         }))
     }), (0, b.pick)({
         prisma: (0, h.css)([ "&:not([disabled]):active ", "{background-color:", ";}" ], /* sc-sel */ _, b.variables.interactiveColorOverlayActive)
     }));
     // CONCATENATED MODULE: ./src/Chip/Chip.tsx
-    function E() {
-        return E = Object.assign ? Object.assign.bind() : function(e) {
+    function q() {
+        return q = Object.assign ? Object.assign.bind() : function(e) {
             for (var r = 1; r < arguments.length; r++) {
                 var a = arguments[r];
-                for (var n in a) {
-                    ({}).hasOwnProperty.call(a, n) && (e[n] = a[n]);
+                for (var o in a) {
+                    ({}).hasOwnProperty.call(a, o) && (e[o] = a[o]);
                 }
             }
             return e;
-        }, E.apply(null, arguments);
+        }, q.apply(null, arguments);
     }
-    function I(e, r) {
-        return z(e) || L(e, r) || A(e, r) || j();
+    function E(e, r) {
+        return z(e) || L(e, r) || D(e, r) || j();
     }
     function j() {
         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 A(e, r) {
+    function D(e, r) {
         if (e) {
-            if ("string" == typeof e) return D(e, r);
+            if ("string" == typeof e) return A(e, r);
             var a = {}.toString.call(e).slice(8, -1);
-            return "Object" === a && e.constructor && (a = e.constructor.name), "Map" === a || "Set" === a ? Array.from(e) : "Arguments" === a || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(a) ? D(e, r) : void 0;
+            return "Object" === a && e.constructor && (a = e.constructor.name), "Map" === a || "Set" === a ? Array.from(e) : "Arguments" === a || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(a) ? A(e, r) : void 0;
         }
     }
-    function D(e, r) {
+    function A(e, r) {
         (null == r || r > e.length) && (r = e.length);
-        for (var a = 0, n = Array(r); a < r; a++) {
-            n[a] = e[a];
+        for (var a = 0, o = Array(r); a < r; a++) {
+            o[a] = e[a];
         }
-        return n;
+        return o;
     }
     function L(e, r) {
         var a = null == e ? null : "undefined" != typeof Symbol && e[Symbol.iterator] || e["@@iterator"];
         if (null != a) {
-            var n, o, i, t, l = [], s = !0, c = !1;
+            var o, n, i, t, l = [], s = !0, c = !1;
             try {
                 if (i = (a = a.call(e)).next, 0 === r) {
                     if (Object(a) !== a) return;
                     s = !1;
-                } else for (;!(s = (n = i.call(a)).done) && (l.push(n.value), l.length !== r); s = !0) {
+                } else for (;!(s = (o = i.call(a)).done) && (l.push(o.value), l.length !== r); s = !0) {
                 }
             } catch (e) {
-                c = !0, o = e;
+                c = !0, n = e;
             } finally {
                 try {
                     if (!s && null != a["return"] && (t = a["return"](), Object(t) !== t)) return;
                 } finally {
-                    if (c) throw o;
+                    if (c) throw n;
                 }
             }
             return l;
@@ -363,29 +370,29 @@
     function z(e) {
         if (Array.isArray(e)) return e;
     }
-    function N(e, r) {
+    function B(e, r) {
         if (null == e) return {};
-        var a, n, o = P(e, r);
+        var a, o, n = H(e, r);
         if (Object.getOwnPropertySymbols) {
             var i = Object.getOwnPropertySymbols(e);
-            for (n = 0; n < i.length; n++) {
-                a = i[n], r.includes(a) || {}.propertyIsEnumerable.call(e, a) && (o[a] = e[a]);
+            for (o = 0; o < i.length; o++) {
+                a = i[o], r.includes(a) || {}.propertyIsEnumerable.call(e, a) && (n[a] = e[a]);
             }
         }
-        return o;
+        return n;
     }
-    function P(e, r) {
+    function H(e, r) {
         if (null == e) return {};
         var a = {};
-        for (var n in e) {
-            if ({}.hasOwnProperty.call(e, n)) {
-                if (r.includes(n)) continue;
-                a[n] = e[n];
+        for (var o in e) {
+            if ({}.hasOwnProperty.call(e, o)) {
+                if (r.includes(o)) continue;
+                a[o] = e[o];
             }
         }
         return a;
     }
-    /** @public */    var T = {
+    /** @public */    var N = {
         appearance: l().oneOf([ "info", "success", "warning", "error", "outline" ]),
         backgroundColor: l().string,
         children: l().node.isRequired,
@@ -397,92 +404,92 @@
         /** Includes this value in `onRequestRemove` callbacks. */
         value: l().any
     };
-    function H(e) {
+    function P(e) {
         return !!e.onRequestRemove;
     }
-    function B(e) {
-        var r = e.appearance, a = e.backgroundColor, n = e.disabled, o = e.foregroundColor, i = e.icon, t = N(e, [ "appearance", "backgroundColor", "disabled", "foregroundColor", "icon" ]);
+    function T(e) {
+        var r = e.appearance, a = e.backgroundColor, o = e.disabled, n = e.foregroundColor, i = e.icon, t = B(e, [ "appearance", "backgroundColor", "disabled", "foregroundColor", "icon" ]);
  // Validate that the color being rendered into the CSS is restricted to only values that are of CSS type <color>.
-                var l = o && (0, v.isCSSColor)(o) ? o : undefined;
+                var l = n && (0, v.isCSSColor)(n) ? n : undefined;
         var s = a && (0, v.isCSSColor)(a) ? a : undefined;
         var c = {
             "data-test": "chip",
             $appearance: r || (s ? "custom" : "default"),
             $backgroundColor: s,
             $foregroundColor: l,
-            disabled: n,
+            disabled: o,
             icon: i
         };
         return [ c, t ];
     }
     function V(e) {
-        var r = B(e), o = I(r, 2), t = o[0], l = o[1];
-        var s = t.$appearance, p = t.$foregroundColor, v = t.disabled, g = v === void 0 ? false : v, h = t.icon, C = N(t, [ "$appearance", "$foregroundColor", "disabled", "icon" ]);
-        var y = l.children, x = l.elementRef, $ = l.onRequestRemove, k = l.value, S = N(l, [ "children", "elementRef", "onRequestRemove", "value" ]);
-        var j = (0, b.useSplunkTheme)(), A = j.isEnterprise;
-        var D = typeof y === "string";
-        var L = D ? (0, f.sprintf)((0, d._)("Remove %(children)s"), {
+        var r = T(e), n = E(r, 2), t = n[0], l = n[1];
+        var s = t.$appearance, u = t.$foregroundColor, v = t.disabled, m = v === void 0 ? false : v, h = t.icon, C = B(t, [ "$appearance", "$foregroundColor", "disabled", "icon" ]);
+        var y = l.children, $ = l.elementRef, x = l.onRequestRemove, k = l.value, S = B(l, [ "children", "elementRef", "onRequestRemove", "value" ]);
+        var j = (0, b.useSplunkTheme)(), D = j.isEnterprise;
+        var A = typeof y === "string";
+        var L = A ? (0, f.sprintf)((0, d._)("Remove %(children)s"), {
             children: y
         }) : (0, d._)("Remove");
         var z = (0, a.useCallback)((function(e) {
-            $(e, {
+            x(e, {
                 value: k
             });
-        }), [ $, k ]);
+        }), [ x, k ]);
         
-        return n().createElement(q, E({
+        return o().createElement(I, q({
             $appearance: s,
-            $disabled: g,
-            $foregroundColor: p,
+            $disabled: m,
+            $foregroundColor: u,
             "data-test-value": k,
-            disabled: g,
-            elementRef: x,
+            disabled: m,
+            elementRef: $,
             onClick: z
-        }, C, i()(S, Object.keys(T))),  n().createElement(w, {
+        }, C, i()(S, Object.keys(N))),  o().createElement(w, {
             $icon: !!h,
             $removable: true
-        },  n().createElement(m(), null, L), h &&  n().createElement(O, {
+        },  o().createElement(g(), null, L), h &&  o().createElement(O, {
             $appearance: s,
-            $disabled: g,
-            $foregroundColor: p
-        }, h),  n().createElement(R, {
+            $disabled: m,
+            $foregroundColor: u
+        }, h),  o().createElement(R, {
             "data-test": "label",
-            "aria-hidden": D ? true : undefined,
+            "aria-hidden": A ? true : undefined,
             $appearance: s,
-            $disabled: g,
-            $foregroundColor: p
-        }, y),  n().createElement(_, {
+            $disabled: m,
+            $foregroundColor: u
+        }, y),  o().createElement(_, {
             $appearance: s,
-            $disabled: g,
-            $foregroundColor: p
-        }, A ?  n().createElement(u(), {
+            $disabled: m,
+            $foregroundColor: u
+        }, D ?  o().createElement(p(), {
             "data-test": "cross",
             hideDefaultTooltip: true,
             screenReaderText: null,
             size: .85
-        }) :  n().createElement(c(), {
+        }) :  o().createElement(c(), {
             "data-test": "cross",
             height: "20px",
             width: "20px"
         }))));
     }
     function M(e) {
-        var r = B(e), a = I(r, 2), o = a[0], t = a[1];
-        var l = o.$appearance, s = o.$foregroundColor, c = o.disabled, p = o.icon, u = N(o, [ "$appearance", "$foregroundColor", "disabled", "icon" ]);
-        var d = t.children, v = t.elementRef, f = N(t, [ "children", "elementRef" ]);
+        var r = T(e), a = E(r, 2), n = a[0], t = a[1];
+        var l = n.$appearance, s = n.$foregroundColor, c = n.disabled, u = n.icon, p = B(n, [ "$appearance", "$foregroundColor", "disabled", "icon" ]);
+        var d = t.children, v = t.elementRef, f = B(t, [ "children", "elementRef" ]);
         
-        return n().createElement(S, E({
+        return o().createElement(S, q({
             $appearance: l,
             $disabled: c !== null && c !== void 0 ? c : false,
             ref: v
-        }, u, i()(f, Object.keys(T))),  n().createElement(w, {
-            $icon: !!p,
+        }, p, i()(f, Object.keys(N))),  o().createElement(w, {
+            $icon: !!u,
             $removable: false
-        }, p &&  n().createElement(O, {
+        }, u &&  o().createElement(O, {
             $appearance: l,
             $disabled: c !== null && c !== void 0 ? c : false,
             $foregroundColor: s
-        }, p),  n().createElement(R, {
+        }, u),  o().createElement(R, {
             "data-test": "label",
             $appearance: l,
             $disabled: c !== null && c !== void 0 ? c : false,
@@ -491,10 +498,11 @@
     }
     function W(e) {
         // @docs-props-type ChipPropsBase
-        return H(e) ?  n().createElement(V, e) :  n().createElement(M, e);
+        return P(e) ?  o().createElement(V, e) :  o().createElement(M, e);
     }
-    W.propTypes = T;
-    /* harmony default export */    const G = W;
-    // CONCATENATED MODULE: ./src/Chip/index.ts
+    W.propTypes = N;
+    /* harmony default export */    const X = W;
+    // ChipInteractiveProps and ChipNonInteractiveProps are exported for Storybook
+        // CONCATENATED MODULE: ./src/Chip/index.ts
     module.exports = r;
     /******/})();

package/ControlGroup.js

@@ -547,12 +547,11 @@
                 var D = v.isPrisma, B = v.isCompact;
                 var V = r.Children.toArray(i).filter(r.isValidElement);
                 var $ = V.length;
-                var A = L;
-                var G = typeof a === "string";
-                var N = G && a !== "";
-                var W = G || a === true;
+                var A = typeof a === "string";
+                var G = A && a !== "";
+                var N = A || a === true;
                 // Clean the Children
-                                var R = function e(n, o) {
+                                var W = function e(n, o) {
                     var i = {
                         key: n.key || o
                     };
@@ -610,34 +609,31 @@
                             i.id = n.props.id || t.getChildID("id", o);
                         }
                     }
-                    if (N && n.props.error === true) {
+                    if (G && n.props.error === true) {
                         i["aria-errormessage"] = t.errorId;
                     }
                     
                     return (0, r.cloneElement)(n, i);
                 };
-                var z = V.map(R);
-                var F = this.getLinkedId(z);
-                if (a) {
-                    A["aria-invalid"] = true;
-                }
-                var J = y === "left" ? {
+                var R = V.map(W);
+                var z = this.getLinkedId(R);
+                var F = y === "left" ? {
                     width: h
                 } : undefined;
-                var H = p()(h) ? "".concat(h, "px") : h;
-                var U = D ? "16px" : "20px";
-                var X = y === "left" ? {
-                    marginLeft: "calc(".concat(H, " + ").concat(U, ")")
+                var J = p()(h) ? "".concat(h, "px") : h;
+                var H = D ? "16px" : "20px";
+                var U = y === "left" ? {
+                    marginLeft: "calc(".concat(J, " + ").concat(H, ")")
                 } : undefined;
-                var K = l === "stack" ? S : d();
-                var Q = y === "left" ? I : w;
-                var Y =  n().createElement(Q, {
-                    style: J,
+                var X = l === "stack" ? S : d();
+                var K = y === "left" ? I : w;
+                var Q =  n().createElement(K, {
+                    style: F,
                     $labelPosition: y
                 },  n().createElement(x, {
                     "data-test": "label",
                     id: this.labelId,
-                    htmlFor: f || F,
+                    htmlFor: f || z,
                     $tooltip: !!g
                 }, m &&  n().createElement(P, {
                     "aria-hidden": "true"
@@ -652,22 +648,23 @@
                 return n().createElement(O, E({
                     "data-test": "control-group",
                     "data-test-required": m,
-                    $error: W
-                }, A),  n().createElement(T.Provider, {
+                    $error: N,
+                    "aria-invalid": !!a || undefined
+                }, L),  n().createElement(T.Provider, {
                     value: this.getContextValue()
-                }, c ?  n().createElement(b(), null, Y) : Y,  n().createElement(K, {
+                }, c ?  n().createElement(b(), null, Q) : Q,  n().createElement(X, {
                     "data-test": "controls",
                     flex: l !== "none",
-                    style: X
-                }, z), s &&  n().createElement(j, {
+                    style: U
+                }, R), s &&  n().createElement(j, {
                     "data-test": "help",
                     id: this.helpId,
-                    style: X,
-                    $error: W && !N
-                }, s), N &&  n().createElement(k, {
+                    style: U,
+                    $error: N && !G
+                }, s), G &&  n().createElement(k, {
                     "data-test": "error",
                     id: this.errorId,
-                    style: X,
+                    style: U,
                     $help: !!s
                 }, a)));
             }