@veracity/vui 0.2.0 → 0.2.2

package/radio/radioGroup.js

@@ -71,27 +71,34 @@ var context_1 = require("./context");
 var core_1 = require("../core");
 var system_1 = require("../system");
 var utils_1 = require("../utils");
-exports.RadioGroupBase = styled_components_1.default.div.withConfig(core_1.forwardPropConfig(system_1.system))(templateObject_1 || (templateObject_1 = __makeTemplateObject(["\n\tdisplay: flex;\n\tflex-direction: column;\n\n\t", "\n"], ["\n\tdisplay: flex;\n\tflex-direction: column;\n\n\t", "\n"])), system_1.system);
-exports.RadioGroup = core_1.vui(function (props, ref) {
-    var className = props.className, colorScheme = props.colorScheme, _a = props.defaultValue, defaultValue = _a === void 0 ? '' : _a, disabled = props.disabled, name = props.name, onBlur = props.onBlur, onChange = props.onChange, onFocus = props.onFocus, row = props.row, size = props.size, valueProp = props.value, variant = props.variant, rest = __rest(props, ["className", "colorScheme", "defaultValue", "disabled", "name", "onBlur", "onChange", "onFocus", "row", "size", "value", "variant"]);
-    var isControlled = react_1.useRef(valueProp !== undefined).current;
-    var _b = __read(react_1.useState(defaultValue), 2), valueState = _b[0], setValueState = _b[1];
-    var value = isControlled ? valueProp : valueState;
-    var handleOnChange = react_1.useCallback(function (e) {
-        setValue(e.target.value);
+exports.RadioGroupBase = styled_components_1.default.div.withConfig((0, core_1.forwardPropConfig)(system_1.system))(templateObject_1 || (templateObject_1 = __makeTemplateObject(["\n\tdisplay: flex;\n\tflex-direction: column;\n\n\t", "\n"], ["\n\tdisplay: flex;\n\tflex-direction: column;\n\n\t", "\n"])), system_1.system);
+exports.RadioGroup = (0, core_1.vui)(function (props, ref) {
+    var className = props.className, colorScheme = props.colorScheme, defaultValue = props.defaultValue, disabled = props.disabled, isRow = props.isRow, name = props.name, onBlur = props.onBlur, onChange = props.onChange, onFocus = props.onFocus, size = props.size, value = props.value, variant = props.variant, rest = __rest(props, ["className", "colorScheme", "defaultValue", "disabled", "isRow", "name", "onBlur", "onChange", "onFocus", "size", "value", "variant"]);
+    var _a = __read((0, react_1.useState)(value !== null && value !== void 0 ? value : defaultValue), 2), isChecked = _a[0], setIsChecked = _a[1];
+    var handleOnChange = (0, react_1.useCallback)(function (e) {
+        setIsChecked(e.target.value);
         onChange === null || onChange === void 0 ? void 0 : onChange(e);
     }, [onChange]);
-    var setValue = react_1.useCallback(function (value) {
-        !isControlled && setValueState(value);
-    }, []);
-    var context = react_1.useMemo(function () {
-        return utils_1.filterUndefined({ colorScheme: colorScheme, disabled: disabled, name: name, onBlur: onBlur, onChange: handleOnChange, onFocus: onFocus, size: size, value: value, variant: variant });
-    }, [colorScheme, disabled, name, handleOnChange, onBlur, onFocus, size, value, variant]);
-    var aliasedProps = utils_1.filterUndefined({
-        flexDirection: row ? 'row' : undefined
+    var context = (0, react_1.useMemo)(function () {
+        return (0, utils_1.filterUndefined)({
+            colorScheme: colorScheme,
+            defaultValue: defaultValue,
+            disabled: disabled,
+            isChecked: isChecked,
+            name: name,
+            onBlur: onBlur,
+            onChange: handleOnChange,
+            onFocus: onFocus,
+            size: size,
+            value: value,
+            variant: variant
+        });
+    }, [colorScheme, defaultValue, disabled, handleOnChange, isChecked, name, onBlur, onFocus, size, value, variant]);
+    var aliasedProps = (0, utils_1.filterUndefined)({
+        flexDirection: isRow ? 'row' : undefined
     });
     return (react_1.default.createElement(context_1.RadioGroupProvider, { value: context },
-        react_1.default.createElement(exports.RadioGroupBase, __assign({ className: utils_1.cs('vui-radioGroup', className), ref: ref }, aliasedProps, rest))));
+        react_1.default.createElement(exports.RadioGroupBase, __assign({ className: (0, utils_1.cs)('vui-radioGroup', className), ref: ref }, aliasedProps, rest))));
 });
 exports.RadioGroup.displayName = 'RadioGroup';
 exports.default = exports.RadioGroup;

package/radio/radioGroup.types.d.ts

@@ -1,13 +1,13 @@
-import { ChangeEventHandler, FocusEventHandler } from '../core';
 import { SystemProps } from '../system';
 import { ThemingProps } from '../theme';
+import { ChangeEventHandler, FocusEventHandler } from '../utils';
 export interface RadioGroupProps extends SystemProps, ThemingProps<'Radio'> {
     colorScheme?: 'blue' | 'prussian';
     disabled?: boolean;
+    isRow?: boolean;
     name?: string;
     onBlur?: FocusEventHandler;
     onChange?: ChangeEventHandler;
     onFocus?: FocusEventHandler;
-    row?: boolean;
     value?: number | string;
 }

package/radio/theme.js

@@ -2,12 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 function variantDefault(props) {
     var c = props.colorScheme;
-    var controlStyles = {
+    var control = {
         color: c + ".80",
         hoverColor: c + ".90"
     };
+    if (c === 'prussian') {
+        control.hoverColor = 'prussian.70';
+    }
     return {
-        control: controlStyles
+        control: control
     };
 }
 var defaultProps = {

package/skeleton/skeleton.js

@@ -35,15 +35,15 @@ var styled_components_1 = __importDefault(require("styled-components"));
 var core_1 = require("../core");
 var system_1 = require("../system");
 var utils_1 = require("../utils");
-exports.SkeletonBase = styled_components_1.default.div.withConfig(core_1.forwardPropConfig(system_1.system))(templateObject_1 || (templateObject_1 = __makeTemplateObject(["\n\tanimation: vui-pulse 1.5s ease-in-out 0.5s infinite;\n\n\t", "\n"], ["\n\tanimation: vui-pulse 1.5s ease-in-out 0.5s infinite;\n\n\t", "\n"])), system_1.system);
-exports.Skeleton = core_1.vui(function (props, ref) {
-    var _a = core_1.omitThemingProps(props), className = _a.className, _b = _a.repeat, repeat = _b === void 0 ? 1 : _b, rest = __rest(_a, ["className", "repeat"]);
-    var styles = core_1.useStyleConfig('Skeleton', props);
+exports.SkeletonBase = styled_components_1.default.div.withConfig((0, core_1.forwardPropConfig)(system_1.system))(templateObject_1 || (templateObject_1 = __makeTemplateObject(["\n\tanimation: vui-pulse 1.5s ease-in-out 0.5s infinite;\n\n\t", "\n"], ["\n\tanimation: vui-pulse 1.5s ease-in-out 0.5s infinite;\n\n\t", "\n"])), system_1.system);
+exports.Skeleton = (0, core_1.vui)(function (props, ref) {
+    var _a = (0, core_1.omitThemingProps)(props), className = _a.className, _b = _a.repeat, repeat = _b === void 0 ? 1 : _b, rest = __rest(_a, ["className", "repeat"]);
+    var styles = (0, core_1.useStyleConfig)('Skeleton', props);
     var arr = Array(repeat).fill(0);
-    var aliasedProps = utils_1.filterUndefined({
+    var aliasedProps = (0, utils_1.filterUndefined)({
         w: props.variant === 'circle' ? styles.h : undefined
     });
-    return (react_1.default.createElement(react_1.default.Fragment, null, arr.map(function (_, i) { return (react_1.default.createElement(exports.SkeletonBase, __assign({ className: utils_1.cs('vui-skeleton', className), key: i, ref: ref }, styles, aliasedProps, rest))); })));
+    return (react_1.default.createElement(react_1.default.Fragment, null, arr.map(function (_, i) { return (react_1.default.createElement(exports.SkeletonBase, __assign({ className: (0, utils_1.cs)('vui-skeleton', className), key: i, ref: ref }, styles, aliasedProps, rest))); })));
 });
 exports.Skeleton.displayName = 'Skeleton';
 exports.default = exports.Skeleton;

package/spinner/spinner.js

@@ -38,21 +38,21 @@ var core_1 = require("../core");
 var system_1 = require("../system");
 var t_1 = __importDefault(require("../t"));
 var utils_1 = require("../utils");
-exports.SpinnerCircle = styled_components_1.default.div.withConfig(core_1.forwardPropConfig(system_1.system))(templateObject_1 || (templateObject_1 = __makeTemplateObject(["\n\tdisplay: flex;\n\tflex-shrink: 0;\n\n\t", "\n\n\tanimation-duration: ", ";\n"], ["\n\tdisplay: flex;\n\tflex-shrink: 0;\n\n\t", "\n\n\tanimation-duration: ", ";\n"])), system_1.system, function (p) { return p.speed; });
-exports.Spinner = core_1.vui(function (props, ref) {
+exports.SpinnerCircle = styled_components_1.default.div.withConfig((0, core_1.forwardPropConfig)(system_1.system))(templateObject_1 || (templateObject_1 = __makeTemplateObject(["\n\tdisplay: flex;\n\tflex-shrink: 0;\n\n\t", "\n\n\tanimation-duration: ", ";\n"], ["\n\tdisplay: flex;\n\tflex-shrink: 0;\n\n\t", "\n\n\tanimation-duration: ", ";\n"])), system_1.system, function (p) { return p.speed; });
+exports.Spinner = (0, core_1.vui)(function (props, ref) {
     var _a;
     var className = props.className, emptyColor = props.emptyColor, size = props.size, _b = props.speed, speedProp = _b === void 0 ? 'normal' : _b, text = props.text, _c = props.textPosition, textPosition = _c === void 0 ? 'bottom' : _c, thickness = props.thickness, rest = __rest(props, ["className", "emptyColor", "size", "speed", "text", "textPosition", "thickness"]);
-    var styles = core_1.useStyleConfig('Spinner', props);
+    var styles = (0, core_1.useStyleConfig)('Spinner', props);
     var isCustomSize = typeof size === 'number';
     var positionProps = consts_1.spinnerPositionMapping[textPosition];
     var speed = (_a = consts_1.spinnerSpeedMapping[speedProp]) !== null && _a !== void 0 ? _a : speedProp;
-    var circleProps = utils_1.filterUndefined({
+    var circleProps = (0, utils_1.filterUndefined)({
         borderColor: emptyColor,
         borderWidth: isCustomSize ? thickness !== null && thickness !== void 0 ? thickness : 4 : thickness,
         h: isCustomSize ? size : undefined,
         w: isCustomSize ? size : undefined
     });
-    return (react_1.default.createElement(box_1.default, __assign({ center: true, className: utils_1.cs('vui-spinner', className), ref: ref, transitionDuration: "fast" }, styles.container, positionProps.container, rest),
+    return (react_1.default.createElement(box_1.default, __assign({ center: true, className: (0, utils_1.cs)('vui-spinner', className), ref: ref, transitionDuration: "fast" }, styles.container, positionProps.container, rest),
         react_1.default.createElement(exports.SpinnerCircle, __assign({ animation: "spin", borderRadius: "round", className: "vui-spinnerCircle", speed: speed }, styles.circle, positionProps.circle, circleProps)),
         text && (react_1.default.createElement(t_1.default, __assign({ className: "vui-spinnerText" }, styles.text), text))));
 });

package/svg/svg.js

@@ -108,21 +108,21 @@ var helpers_1 = require("./helpers");
 var core_1 = require("../core");
 var system_1 = require("../system");
 var utils_1 = require("../utils");
-exports.SvgBase = styled_components_1.default.svg.withConfig(core_1.forwardPropConfig(system_1.system))(templateObject_1 || (templateObject_1 = __makeTemplateObject(["\n\t& > path:nth-child(1) {\n\t\tfill: ", ";\n\t}\n\n\t& > path:nth-child(2) {\n\t\tfill: ", ";\n\t}\n\n\t", "\n"], ["\n\t& > path:nth-child(1) {\n\t\tfill: ", ";\n\t}\n\n\t& > path:nth-child(2) {\n\t\tfill: ", ";\n\t}\n\n\t", "\n"])), function (p) { var _a, _b, _c; return core_1.th.color((_c = (_b = (_a = p.fill) === null || _a === void 0 ? void 0 : _a[0]) !== null && _b !== void 0 ? _b : p.fill) !== null && _c !== void 0 ? _c : '')(p); }, function (p) { var _a, _b, _c; return core_1.th.color((_c = (_b = (_a = p.fill) === null || _a === void 0 ? void 0 : _a[1]) !== null && _b !== void 0 ? _b : p.fill) !== null && _c !== void 0 ? _c : '')(p); }, system_1.system);
-exports.Svg = core_1.vui(function (props, ref) {
+exports.SvgBase = styled_components_1.default.svg.withConfig((0, core_1.forwardPropConfig)(system_1.system))(templateObject_1 || (templateObject_1 = __makeTemplateObject(["\n\t& > path:nth-child(1) {\n\t\tfill: ", ";\n\t}\n\n\t& > path:nth-child(2) {\n\t\tfill: ", ";\n\t}\n\n\t", "\n"], ["\n\t& > path:nth-child(1) {\n\t\tfill: ", ";\n\t}\n\n\t& > path:nth-child(2) {\n\t\tfill: ", ";\n\t}\n\n\t", "\n"])), function (p) { var _a, _b, _c; return core_1.th.color((_c = (_b = (_a = p.fill) === null || _a === void 0 ? void 0 : _a[0]) !== null && _b !== void 0 ? _b : p.fill) !== null && _c !== void 0 ? _c : '')(p); }, function (p) { var _a, _b, _c; return core_1.th.color((_c = (_b = (_a = p.fill) === null || _a === void 0 ? void 0 : _a[1]) !== null && _b !== void 0 ? _b : p.fill) !== null && _c !== void 0 ? _c : '')(p); }, system_1.system);
+exports.Svg = (0, core_1.vui)(function (props, ref) {
     var children = props.children, className = props.className, src = props.src, rest = __rest(props, ["children", "className", "src"]);
-    var _a = __read(react_1.useState(helpers_1.initState()), 2), state = _a[0], setState = _a[1];
-    var isMountedRef = react_1.useRef(false);
-    var srcRef = react_1.useRef(src);
+    var _a = __read((0, react_1.useState)((0, helpers_1.initState)()), 2), state = _a[0], setState = _a[1];
+    var isMountedRef = (0, react_1.useRef)(false);
+    var srcRef = (0, react_1.useRef)(src);
     var _b = state.content, content = _b === void 0 ? '' : _b, _c = state.svgAttributes, svgAttributes = _c === void 0 ? {} : _c;
     var innerHTML = !children ? { __html: content } : undefined;
-    react_1.useEffect(function () {
+    (0, react_1.useEffect)(function () {
         isMountedRef.current = true;
         return function () {
             isMountedRef.current = false;
         };
     }, []);
-    react_1.useEffect(function () {
+    (0, react_1.useEffect)(function () {
         srcRef.current = src;
         function loadSvg(src) {
             return __awaiter(this, void 0, void 0, function () {
@@ -134,9 +134,9 @@ exports.Svg = core_1.vui(function (props, ref) {
                             return [4 /*yield*/, cache_1.default.get(src)];
                         case 1:
                             response = _a.sent();
-                            content_1 = helpers_1.getSvgContent(response);
-                            svgEl = helpers_1.stringToHTML(response);
-                            svgAttributes_1 = helpers_1.getAttributes(svgEl);
+                            content_1 = (0, helpers_1.getSvgContent)(response);
+                            svgEl = (0, helpers_1.stringToHTML)(response);
+                            svgAttributes_1 = (0, helpers_1.getAttributes)(svgEl);
                             svgAttributes_1['data-src'] = src !== null && src !== void 0 ? src : '';
                             // Update state only when requested 'src' and current 'src' are the same
                             if (srcRef.current === src && isMountedRef.current) {
@@ -147,7 +147,7 @@ exports.Svg = core_1.vui(function (props, ref) {
                             error_1 = _a.sent();
                             console.error(error_1); // eslint-disable-line no-console
                             if (isMountedRef.current) {
-                                setState(helpers_1.initState());
+                                setState((0, helpers_1.initState)());
                             }
                             return [3 /*break*/, 3];
                         case 3: return [2 /*return*/];
@@ -157,7 +157,7 @@ exports.Svg = core_1.vui(function (props, ref) {
         }
         src && loadSvg(src);
     }, [src]);
-    return (react_1.default.createElement(exports.SvgBase, __assign({ className: utils_1.cs('vui-svg', className), dangerouslySetInnerHTML: innerHTML, ref: ref, xmlns: "http://www.w3.org/2000/svg" }, svgAttributes, rest), children));
+    return (react_1.default.createElement(exports.SvgBase, __assign({ className: (0, utils_1.cs)('vui-svg', className), dangerouslySetInnerHTML: innerHTML, ref: ref, xmlns: "http://www.w3.org/2000/svg" }, svgAttributes, rest), children));
 });
 exports.Svg.displayName = 'Svg';
 exports.default = exports.Svg;

package/switch/context.js

@@ -18,6 +18,6 @@ var __read = (this && this.__read) || function (o, n) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useSwitch = exports.SwitchProvider = void 0;
 var core_1 = require("../core");
-var _a = __read(core_1.createContext({ isOptional: true }), 2), SwitchProvider = _a[0], useSwitch = _a[1];
+var _a = __read((0, core_1.createContext)({ isOptional: true }), 2), SwitchProvider = _a[0], useSwitch = _a[1];
 exports.SwitchProvider = SwitchProvider;
 exports.useSwitch = useSwitch;

package/switch/switch.js

@@ -44,22 +44,6 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
-var __read = (this && this.__read) || function (o, n) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator];
-    if (!m) return o;
-    var i = m.call(o), r, ar = [], e;
-    try {
-        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
-    }
-    catch (error) { e = { error: error }; }
-    finally {
-        try {
-            if (r && !r.done && (m = i["return"])) m.call(i);
-        }
-        finally { if (e) throw e.error; }
-    }
-    return ar;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -74,56 +58,34 @@ var core_1 = require("../core");
 var system_1 = require("../system");
 var t_1 = require("../t");
 var utils_1 = require("../utils");
-exports.SwitchBase = styled_components_1.default.label.withConfig(core_1.forwardPropConfig(system_1.system))(templateObject_1 || (templateObject_1 = __makeTemplateObject(["\n\talign-items: center;\n\tcursor: pointer;\n\tdisplay: inline-flex;\n\tline-height: normal;\n\twidth: fit-content;\n\n\t&[data-disabled='true'] {\n\t\tcursor: not-allowed;\n\n\t\t", " {\n\t\t\tcolor: var(--vui-colors-disabled-font);\n\t\t}\n\t}\n\n\t", "\n"], ["\n\talign-items: center;\n\tcursor: pointer;\n\tdisplay: inline-flex;\n\tline-height: normal;\n\twidth: fit-content;\n\n\t&[data-disabled='true'] {\n\t\tcursor: not-allowed;\n\n\t\t", " {\n\t\t\tcolor: var(--vui-colors-disabled-font);\n\t\t}\n\t}\n\n\t", "\n"])), t_1.TBase, system_1.system);
-exports.Switch = core_1.vui(function (props, ref) {
+exports.SwitchBase = styled_components_1.default.label.withConfig((0, core_1.forwardPropConfig)(system_1.system))(templateObject_1 || (templateObject_1 = __makeTemplateObject(["\n\talign-items: center;\n\tcursor: pointer;\n\tdisplay: inline-flex;\n\tline-height: normal;\n\twidth: fit-content;\n\n\t&[data-disabled='true'] {\n\t\tcursor: not-allowed;\n\n\t\t", " {\n\t\t\tcolor: var(--vui-colors-disabled-font);\n\t\t}\n\t}\n\n\t", "\n"], ["\n\talign-items: center;\n\tcursor: pointer;\n\tdisplay: inline-flex;\n\tline-height: normal;\n\twidth: fit-content;\n\n\t&[data-disabled='true'] {\n\t\tcursor: not-allowed;\n\n\t\t", " {\n\t\t\tcolor: var(--vui-colors-disabled-font);\n\t\t}\n\t}\n\n\t", "\n"])), t_1.TBase, system_1.system);
+exports.Switch = (0, core_1.vui)(function (props, ref) {
     var _a;
     var button = props.button, checked = props.checked, children = props.children, className = props.className, colorScheme = props.colorScheme, defaultChecked = props.defaultChecked, disabled = props.disabled, id = props.id, innerLabelOff = props.innerLabelOff, innerLabelOn = props.innerLabelOn, inputRef = props.inputRef, labelLeft = props.labelLeft, labelRight = props.labelRight, name = props.name, onBlur = props.onBlur, onChange = props.onChange, onFocus = props.onFocus, required = props.required, size = props.size, value = props.value, variant = props.variant, rest = __rest(props, ["button", "checked", "children", "className", "colorScheme", "defaultChecked", "disabled", "id", "innerLabelOff", "innerLabelOn", "inputRef", "labelLeft", "labelRight", "name", "onBlur", "onChange", "onFocus", "required", "size", "value", "variant"]);
-    var _b = __read(react_1.useState(defaultChecked), 2), isChecked = _b[0], setIsChecked = _b[1];
-    var styles = core_1.useStyleConfig('Switch', props);
-    react_1.useEffect(function () {
-        checked !== undefined && setIsChecked(checked);
-    }, [checked]);
-    var handleOnChange = react_1.useCallback(function (e) {
-        setIsChecked(e.target.checked);
-        onChange === null || onChange === void 0 ? void 0 : onChange(e);
-    }, [onChange]);
-    var context = react_1.useMemo(function () {
-        return utils_1.filterUndefined({
+    var styles = (0, core_1.useStyleConfig)('Switch', props);
+    var context = (0, react_1.useMemo)(function () {
+        return (0, utils_1.filterUndefined)({
+            checked: checked,
             colorScheme: colorScheme,
             defaultChecked: defaultChecked,
             disabled: disabled,
-            isChecked: isChecked,
             name: name,
             onBlur: onBlur,
-            onChange: handleOnChange,
+            onChange: onChange,
             onFocus: onFocus,
             required: required,
             size: size,
             value: value,
             variant: variant
         });
-    }, [
-        colorScheme,
-        defaultChecked,
-        disabled,
-        handleOnChange,
-        isChecked,
-        name,
-        onBlur,
-        onFocus,
-        required,
-        size,
-        value,
-        variant
-    ]);
-    var aliasedProps = utils_1.filterUndefined({
-        'data-checked': isChecked ? true : false,
+    }, [checked, colorScheme, defaultChecked, disabled, name, onBlur, onChange, onFocus, required, size, value, variant]);
+    var aliasedProps = (0, utils_1.filterUndefined)({
         'data-disabled': disabled ? true : false
     });
     return (react_1.default.createElement(context_1.SwitchProvider, { value: context },
-        react_1.default.createElement(exports.SwitchBase, __assign({ className: utils_1.cs('vui-switch', className), ref: ref }, styles.container, aliasedProps, rest),
-            utils_1.isReactText(labelLeft) ? react_1.default.createElement(switchLabel_1.SwitchLabel, { mr: 1, text: labelLeft }) : labelLeft, (_a = children !== null && children !== void 0 ? children : button) !== null && _a !== void 0 ? _a : react_1.default.createElement(switchButton_1.SwitchButton, __assign({}, { id: id, innerLabelOff: innerLabelOff, innerLabelOn: innerLabelOn, inputRef: inputRef })),
-            utils_1.isReactText(labelRight) ? react_1.default.createElement(switchLabel_1.SwitchLabel, { ml: 1, text: labelRight }) : labelRight)));
+        react_1.default.createElement(exports.SwitchBase, __assign({ className: (0, utils_1.cs)('vui-switch', className), ref: ref }, styles.container, aliasedProps, rest),
+            (0, utils_1.isReactText)(labelLeft) ? react_1.default.createElement(switchLabel_1.SwitchLabel, { mr: 1, text: labelLeft }) : labelLeft, (_a = children !== null && children !== void 0 ? children : button) !== null && _a !== void 0 ? _a : react_1.default.createElement(switchButton_1.SwitchButton, __assign({}, { id: id, innerLabelOff: innerLabelOff, innerLabelOn: innerLabelOn, inputRef: inputRef })),
+            (0, utils_1.isReactText)(labelRight) ? react_1.default.createElement(switchLabel_1.SwitchLabel, { ml: 1, text: labelRight }) : labelRight)));
 });
 exports.Switch.displayName = 'Switch';
 exports.Switch.Button = switchButton_1.SwitchButton;

package/switch/switch.types.d.ts

@@ -1,10 +1,10 @@
 import { ReactNode, ReactText } from 'react';
-import { ChangeEventHandler, FocusEventHandler, PropsOf } from '../core';
 import { SystemProps } from '../system';
 import { ThemingProps } from '../theme';
+import { ChangeEventHandler, FocusEventHandler, PropsOf } from '../utils';
 export interface SwitchButtonProps extends SystemProps, ThemingProps<'Switch'> {
     checked?: boolean;
-    colorScheme?: 'blue' | 'green' | 'prussian' | 'red';
+    colorScheme?: 'blue' | 'green' | 'prussian';
     disabled?: boolean;
     innerLabelOff?: ReactNode;
     innerLabelOn?: ReactNode;
@@ -20,7 +20,7 @@ export interface SwitchButtonProps extends SystemProps, ThemingProps<'Switch'> {
 export interface SwitchProps extends SystemProps, ThemingProps<'Switch'> {
     button?: ReactNode;
     checked?: boolean;
-    colorScheme?: 'blue' | 'green' | 'prussian' | 'red';
+    colorScheme?: 'blue' | 'green' | 'prussian';
     disabled?: boolean;
     innerLabelOff?: ReactNode;
     innerLabelOn?: ReactNode;

package/switch/switchButton.js

@@ -71,25 +71,23 @@ var context_1 = require("./context");
 var core_1 = require("../core");
 var system_1 = require("../system");
 var utils_1 = require("../utils");
-exports.SwitchInput = styled_components_1.default.input.withConfig(core_1.forwardPropConfig(system_1.system))(templateObject_1 || (templateObject_1 = __makeTemplateObject(["\n\tcursor: inherit;\n\theight: calc(100% + 10px);\n\tleft: -5px;\n\tmargin: 0;\n\topacity: 0;\n\tpadding: 0;\n\tposition: absolute;\n\ttop: -5px;\n\twidth: calc(100% + 10px);\n\tz-index: 1;\n\n\t", "\n"], ["\n\tcursor: inherit;\n\theight: calc(100% + 10px);\n\tleft: -5px;\n\tmargin: 0;\n\topacity: 0;\n\tpadding: 0;\n\tposition: absolute;\n\ttop: -5px;\n\twidth: calc(100% + 10px);\n\tz-index: 1;\n\n\t", "\n"])), system_1.system);
-exports.SwitchThumb = styled_components_1.default.span.withConfig(core_1.forwardPropConfig(system_1.system))(templateObject_2 || (templateObject_2 = __makeTemplateObject(["\n\tdisplay: inline-flex;\n\tflex-shrink: 0;\n\tposition: absolute;\n\n\t", "\n"], ["\n\tdisplay: inline-flex;\n\tflex-shrink: 0;\n\tposition: absolute;\n\n\t", "\n"])), system_1.system);
-exports.SwitchTrack = styled_components_1.default.span.withConfig(core_1.forwardPropConfig(system_1.system))(templateObject_3 || (templateObject_3 = __makeTemplateObject(["\n\talign-items: center;\n\tdisplay: inline-flex;\n\tflex: 1;\n\tposition: relative;\n\n\t", "\n"], ["\n\talign-items: center;\n\tdisplay: inline-flex;\n\tflex: 1;\n\tposition: relative;\n\n\t", "\n"])), system_1.system);
-exports.SwitchButtonBase = styled_components_1.default.span.withConfig(core_1.forwardPropConfig(system_1.system))(templateObject_4 || (templateObject_4 = __makeTemplateObject(["\n\tcolor: white;\n\tcursor: pointer;\n\tdisplay: inline-flex;\n\tflex-shrink: 0;\n\tposition: relative;\n\n\t&[data-disabled='true'] {\n\t\tcursor: not-allowed;\n\n\t\t", " {\n\t\t\tborder-color: var(--vui-colors-disabled-border);\n\t\t\tbackground-color: var(--vui-colors-disabled-font);\n\t\t}\n\n\t\t", " {\n\t\t\t--x-ring-color: var(--vui-colors-disabled-border);\n\t\t\tbackground-color: var(--vui-colors-disabled-bg);\n\t\t}\n\t}\n\n\t", "\n"], ["\n\tcolor: white;\n\tcursor: pointer;\n\tdisplay: inline-flex;\n\tflex-shrink: 0;\n\tposition: relative;\n\n\t&[data-disabled='true'] {\n\t\tcursor: not-allowed;\n\n\t\t", " {\n\t\t\tborder-color: var(--vui-colors-disabled-border);\n\t\t\tbackground-color: var(--vui-colors-disabled-font);\n\t\t}\n\n\t\t", " {\n\t\t\t--x-ring-color: var(--vui-colors-disabled-border);\n\t\t\tbackground-color: var(--vui-colors-disabled-bg);\n\t\t}\n\t}\n\n\t", "\n"])), exports.SwitchThumb, exports.SwitchTrack, system_1.system);
-exports.SwitchButton = core_1.vui(function (props, ref) {
+exports.SwitchInput = styled_components_1.default.input.withConfig((0, core_1.forwardPropConfig)(system_1.system))(templateObject_1 || (templateObject_1 = __makeTemplateObject(["\n\tcursor: inherit;\n\theight: calc(100% + 10px);\n\tleft: -5px;\n\tmargin: 0;\n\topacity: 0;\n\tpadding: 0;\n\tposition: absolute;\n\ttop: -5px;\n\twidth: calc(100% + 10px);\n\tz-index: 1;\n\n\t", "\n"], ["\n\tcursor: inherit;\n\theight: calc(100% + 10px);\n\tleft: -5px;\n\tmargin: 0;\n\topacity: 0;\n\tpadding: 0;\n\tposition: absolute;\n\ttop: -5px;\n\twidth: calc(100% + 10px);\n\tz-index: 1;\n\n\t", "\n"])), system_1.system);
+exports.SwitchThumb = styled_components_1.default.span.withConfig((0, core_1.forwardPropConfig)(system_1.system))(templateObject_2 || (templateObject_2 = __makeTemplateObject(["\n\tdisplay: inline-flex;\n\tflex-shrink: 0;\n\tposition: absolute;\n\n\t", "\n"], ["\n\tdisplay: inline-flex;\n\tflex-shrink: 0;\n\tposition: absolute;\n\n\t", "\n"])), system_1.system);
+exports.SwitchTrack = styled_components_1.default.span.withConfig((0, core_1.forwardPropConfig)(system_1.system))(templateObject_3 || (templateObject_3 = __makeTemplateObject(["\n\talign-items: center;\n\tdisplay: inline-flex;\n\tflex: 1;\n\tposition: relative;\n\n\t", "\n"], ["\n\talign-items: center;\n\tdisplay: inline-flex;\n\tflex: 1;\n\tposition: relative;\n\n\t", "\n"])), system_1.system);
+exports.SwitchButtonBase = styled_components_1.default.span.withConfig((0, core_1.forwardPropConfig)(system_1.system))(templateObject_4 || (templateObject_4 = __makeTemplateObject(["\n\tcolor: white;\n\tcursor: pointer;\n\tdisplay: inline-flex;\n\tflex-shrink: 0;\n\tposition: relative;\n\n\t&[data-disabled='true'] {\n\t\tcursor: not-allowed;\n\n\t\t", " {\n\t\t\tborder-color: var(--vui-colors-disabled-border);\n\t\t\tbackground-color: var(--vui-colors-disabled-font);\n\t\t}\n\n\t\t", " {\n\t\t\t--x-ring-color: var(--vui-colors-disabled-border);\n\t\t\tbackground-color: var(--vui-colors-disabled-bg);\n\t\t}\n\t}\n\n\t", "\n"], ["\n\tcolor: white;\n\tcursor: pointer;\n\tdisplay: inline-flex;\n\tflex-shrink: 0;\n\tposition: relative;\n\n\t&[data-disabled='true'] {\n\t\tcursor: not-allowed;\n\n\t\t", " {\n\t\t\tborder-color: var(--vui-colors-disabled-border);\n\t\t\tbackground-color: var(--vui-colors-disabled-font);\n\t\t}\n\n\t\t", " {\n\t\t\t--x-ring-color: var(--vui-colors-disabled-border);\n\t\t\tbackground-color: var(--vui-colors-disabled-bg);\n\t\t}\n\t}\n\n\t", "\n"])), exports.SwitchThumb, exports.SwitchTrack, system_1.system);
+exports.SwitchButton = (0, core_1.vui)(function (props, ref) {
     var _a;
-    var _b = (_a = context_1.useSwitch()) !== null && _a !== void 0 ? _a : {}, switchIsChecked = _b.isChecked, switchProps = __rest(_b, ["isChecked"]);
+    var switchProps = (_a = (0, context_1.useSwitch)()) !== null && _a !== void 0 ? _a : {};
     var mergedProps = __assign(__assign({}, switchProps), props);
-    var _c = core_1.omitThemingProps(mergedProps), checked = _c.checked, className = _c.className, defaultChecked = _c.defaultChecked, disabled = _c.disabled, id = _c.id, innerLabelOff = _c.innerLabelOff, innerLabelOn = _c.innerLabelOn, inputProps = _c.inputProps, inputRef = _c.inputRef, name = _c.name, onBlur = _c.onBlur, onChange = _c.onChange, onFocus = _c.onFocus, required = _c.required, value = _c.value, rest = __rest(_c, ["checked", "className", "defaultChecked", "disabled", "id", "innerLabelOff", "innerLabelOn", "inputProps", "inputRef", "name", "onBlur", "onChange", "onFocus", "required", "value"]);
-    var _d = __read(react_1.useState(defaultChecked), 2), isChecked = _d[0], setIsChecked = _d[1];
-    var _e = __read(react_1.useState(false), 2), isFocused = _e[0], setIsFocused = _e[1];
-    var styles = core_1.useStyleConfig('Switch', mergedProps);
-    var _f = styles.button, thumbStyles = _f.thumb, trackStyles = _f.track, buttonStyles = __rest(_f, ["thumb", "track"]);
-    var isControlled = checked !== undefined || switchIsChecked !== undefined;
-    react_1.useEffect(function () {
-        if (isControlled) {
-            setIsChecked(checked !== null && checked !== void 0 ? checked : switchIsChecked);
-        }
-    }, [checked, isControlled, switchIsChecked]);
+    var _b = (0, core_1.omitThemingProps)(mergedProps), checked = _b.checked, className = _b.className, defaultChecked = _b.defaultChecked, disabled = _b.disabled, id = _b.id, innerLabelOff = _b.innerLabelOff, innerLabelOn = _b.innerLabelOn, inputProps = _b.inputProps, inputRef = _b.inputRef, name = _b.name, onBlur = _b.onBlur, onChange = _b.onChange, onFocus = _b.onFocus, required = _b.required, value = _b.value, rest = __rest(_b, ["checked", "className", "defaultChecked", "disabled", "id", "innerLabelOff", "innerLabelOn", "inputProps", "inputRef", "name", "onBlur", "onChange", "onFocus", "required", "value"]);
+    var isControlled = (0, react_1.useRef)(checked !== undefined).current;
+    var _c = __read((0, react_1.useState)(checked !== null && checked !== void 0 ? checked : defaultChecked), 2), isChecked = _c[0], setIsChecked = _c[1];
+    var _d = __read((0, react_1.useState)(false), 2), isFocused = _d[0], setIsFocused = _d[1];
+    var styles = (0, core_1.useStyleConfig)('Switch', mergedProps);
+    var _e = styles.button, thumbStyles = _e.thumb, trackStyles = _e.track, buttonStyles = __rest(_e, ["thumb", "track"]);
+    (0, react_1.useEffect)(function () {
+        isControlled && setIsChecked(checked);
+    }, [checked, isControlled]);
     function handleOnBlur(e) {
         setIsFocused(false);
         onBlur === null || onBlur === void 0 ? void 0 : onBlur(e);
@@ -105,22 +103,22 @@ exports.SwitchButton = core_1.vui(function (props, ref) {
     var hDiff = (thumbStyles.h - trackStyles.h) / 2;
     var thumbOffset = "calc(100% - " + Math.abs(hDiff - thumbStyles.h) + "px)";
     var labelOffset = thumbStyles.h - hDiff + 4 + "px";
-    var buttonAliasedProps = utils_1.filterUndefined({
+    var buttonAliasedProps = (0, utils_1.filterUndefined)({
         'data-checked': isChecked ? true : false,
         'data-disabled': disabled ? true : false,
         'data-focused': isFocused ? true : false
     });
-    var thumbAliasedProps = utils_1.filterUndefined({
+    var thumbAliasedProps = (0, utils_1.filterUndefined)({
         left: isChecked ? thumbOffset : -hDiff,
         ring: isFocused ? thumbStyles.ring : 0
     });
-    var trackAliasedProps = utils_1.filterUndefined({
+    var trackAliasedProps = (0, utils_1.filterUndefined)({
         bg: isChecked ? trackStyles.bg : 'grey.50',
         pl: isChecked ? 1 : labelOffset,
         pr: isChecked ? labelOffset : 1,
         ring: isFocused ? trackStyles.ring : disabled ? 1 : 0
     });
-    return (react_1.default.createElement(exports.SwitchButtonBase, __assign({ className: utils_1.cs('vui-switchButton', className), ref: ref }, buttonStyles, buttonAliasedProps, rest),
+    return (react_1.default.createElement(exports.SwitchButtonBase, __assign({ className: (0, utils_1.cs)('vui-switchButton', className), ref: ref }, buttonStyles, buttonAliasedProps, rest),
         react_1.default.createElement(exports.SwitchInput, __assign({ className: "vui-switchInput", onBlur: handleOnBlur, onChange: handleOnChange, onFocus: handleOnFocus, ref: inputRef, type: "checkbox" }, { checked: checked, defaultChecked: defaultChecked, disabled: disabled, id: id, name: name, required: required, value: value }, inputProps)),
         react_1.default.createElement(exports.SwitchTrack, __assign({ borderRadius: "round", className: "vui-switchTrack", transitionDuration: "fast" }, trackStyles, trackAliasedProps),
             !isChecked && innerLabelOff,

package/switch/switchLabel.js

@@ -19,11 +19,11 @@ var react_1 = __importDefault(require("react"));
 var context_1 = require("./context");
 var core_1 = require("../core");
 var t_1 = __importDefault(require("../t"));
-exports.SwitchLabel = core_1.vui(function (props, ref) {
+exports.SwitchLabel = (0, core_1.vui)(function (props, ref) {
     var _a;
-    var switchProps = (_a = context_1.useSwitch()) !== null && _a !== void 0 ? _a : {};
+    var switchProps = (_a = (0, context_1.useSwitch)()) !== null && _a !== void 0 ? _a : {};
     var mergedProps = __assign(__assign({}, switchProps), props);
-    var styles = core_1.useStyleConfig('Switch', mergedProps);
+    var styles = (0, core_1.useStyleConfig)('Switch', mergedProps);
     return react_1.default.createElement(t_1.default, __assign({ className: "vui-switchLabel", display: "flex", ref: ref }, styles.label, props));
 });
 exports.SwitchLabel.displayName = 'SwitchLabel';

package/switch/theme.d.ts

@@ -1,6 +1,5 @@
 import { Dict } from '../utils';
 declare function sizeLg(): {
-    container: {};
     button: {
         fontSize: string;
         minW: number;
@@ -17,7 +16,6 @@ declare function sizeLg(): {
     };
 };
 declare function sizeMd(): {
-    container: {};
     button: {
         fontSize: string;
         minW: number;
@@ -34,7 +32,6 @@ declare function sizeMd(): {
     };
 };
 declare function sizeSm(): {
-    container: {};
     button: {
         fontSize: string;
         minW: number;
@@ -51,7 +48,6 @@ declare function sizeSm(): {
     };
 };
 declare function variantContained(props: Dict): {
-    container: {};
     button: {
         thumb: {
             bg: string;
@@ -61,7 +57,6 @@ declare function variantContained(props: Dict): {
             ring: number;
         };
     };
-    label: {};
 };
 declare const _default: {
     defaultProps: {

package/switch/theme.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 function sizeLg() {
-    var container = {};
     var button = {
         fontSize: 'md',
         minW: 50,
@@ -16,10 +15,9 @@ function sizeLg() {
     var label = {
         size: 'lg'
     };
-    return { container: container, button: button, label: label };
+    return { button: button, label: label };
 }
 function sizeMd() {
-    var container = {};
     var button = {
         fontSize: 'sm',
         minW: 42,
@@ -34,10 +32,9 @@ function sizeMd() {
     var label = {
         size: 'md'
     };
-    return { container: container, button: button, label: label };
+    return { button: button, label: label };
 }
 function sizeSm() {
-    var container = {};
     var button = {
         fontSize: 'xs',
         minW: 34,
@@ -52,11 +49,10 @@ function sizeSm() {
     var label = {
         size: 'sm'
     };
-    return { container: container, button: button, label: label };
+    return { button: button, label: label };
 }
 function variantContained(props) {
     var c = props.colorScheme;
-    var container = {};
     var button = {
         thumb: {
             bg: 'white'
@@ -66,8 +62,7 @@ function variantContained(props) {
             ring: 3
         }
     };
-    var label = {};
-    return { container: container, button: button, label: label };
+    return { button: button };
 }
 var defaultProps = {
     colorScheme: 'blue',

package/system/custom.d.ts

@@ -1,31 +1,18 @@
-import { BorderRadiusProp } from './borders';
-export interface BorderRadiusBottomProps {
-    borderRadiusBottom?: BorderRadiusProp;
-}
-export declare const borderRadiusBottom: import("@xstyled/system").StyleGenerator;
-export interface BorderRadiusLeftProps {
-    borderRadiusLeft?: BorderRadiusProp;
-}
-export declare const borderRadiusLeft: import("@xstyled/system").StyleGenerator;
-export interface BorderRadiusRightProps {
-    borderRadiusRight?: BorderRadiusProp;
-}
-export declare const borderRadiusRight: import("@xstyled/system").StyleGenerator;
-export interface BorderRadiusTopProps {
-    borderRadiusTop?: BorderRadiusProp;
-}
-export declare const borderRadiusTop: import("@xstyled/system").StyleGenerator;
 export interface IsTruncatedProps {
     isTruncated?: boolean;
 }
 /** Provides styling to truncate single-line text. */
-export declare const isTruncated: import("@xstyled/system").StyleGenerator;
+export declare const isTruncated: import("@xstyled/styled-components").StyleGenerator;
 export interface MaxLinesProps {
     maxLines?: number;
 }
 /** Provides styling to truncate multi-line text. */
-export declare const maxLines: import("@xstyled/system").StyleGenerator;
+export declare const maxLines: import("@xstyled/styled-components").StyleGenerator;
+export declare type SpaceAroundProps = {
+    spaceAround?: number | string;
+};
+export declare const spaceAround: import("@xstyled/styled-components").StyleGenerator;
 export declare type WordBreakProps = {
     wordBreak?: 'normal' | 'break-all' | 'keep-all' | 'break-word';
 };
-export declare const wordBreak: import("@xstyled/system").StyleGenerator;
+export declare const wordBreak: import("@xstyled/styled-components").StyleGenerator;

package/system/custom.js

@@ -1,29 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.wordBreak = exports.maxLines = exports.isTruncated = exports.borderRadiusTop = exports.borderRadiusRight = exports.borderRadiusLeft = exports.borderRadiusBottom = void 0;
-var system_1 = require("@xstyled/system");
-exports.borderRadiusBottom = system_1.style({
-    prop: 'borderRadiusBottom',
-    themeGet: system_1.getRadius,
-    cssProperty: ['borderBottomLeftRadius', 'borderBottomRightRadius']
-});
-exports.borderRadiusLeft = system_1.style({
-    prop: 'borderRadiusLeft',
-    themeGet: system_1.getRadius,
-    cssProperty: ['borderBottomLeftRadius', 'borderTopLeftRadius']
-});
-exports.borderRadiusRight = system_1.style({
-    prop: 'borderRadiusRight',
-    themeGet: system_1.getRadius,
-    cssProperty: ['borderBottomRightRadius', 'borderTopRightRadius']
-});
-exports.borderRadiusTop = system_1.style({
-    prop: 'borderRadiusTop',
-    themeGet: system_1.getRadius,
-    cssProperty: ['borderTopLeftRadius', 'borderTopRightRadius']
-});
+exports.wordBreak = exports.spaceAround = exports.maxLines = exports.isTruncated = void 0;
+var styled_components_1 = require("@xstyled/styled-components");
 /** Provides styling to truncate single-line text. */
-exports.isTruncated = system_1.style({
+exports.isTruncated = (0, styled_components_1.style)({
     prop: 'isTruncated',
     cssProperty: function () {
         return {
@@ -35,7 +15,7 @@ exports.isTruncated = system_1.style({
     states: {}
 });
 /** Provides styling to truncate multi-line text. */
-exports.maxLines = system_1.style({
+exports.maxLines = (0, styled_components_1.style)({
     prop: 'maxLines',
     cssProperty: function (value) {
         return {
@@ -47,6 +27,20 @@ exports.maxLines = system_1.style({
     },
     states: {}
 });
-exports.wordBreak = system_1.style({
+exports.spaceAround = (0, styled_components_1.style)({
+    prop: 'spaceAround',
+    themeGet: styled_components_1.getSpace,
+    cssProperty: function (value) {
+        return {
+            '&': {
+                margin: '-' + value
+            },
+            '& > *': {
+                margin: value
+            }
+        };
+    }
+});
+exports.wordBreak = (0, styled_components_1.style)({
     prop: 'wordBreak'
 });