amis-ui 3.5.2 → 3.6.0

package/lib/components/Spinner.d.ts

@@ -21,6 +21,8 @@ export interface SpinnerProps extends ThemeProps, SpinnerExtraProps {
     tipPlacement?: 'top' | 'right' | 'bottom' | 'left';
     delay?: number;
     overlay?: boolean;
+    /** 是否处于禁用状态 */
+    disabled?: boolean;
 }
 export interface SpinnerExtraProps {
     loadingConfig?: {
@@ -43,6 +45,7 @@ export declare class Spinner extends React.Component<SpinnerProps, {
         delay: number;
         overlay: boolean;
         loadingConfig: {};
+        disabled: boolean;
     };
     state: {
         spinning: boolean;
@@ -67,18 +70,19 @@ export declare class Spinner extends React.Component<SpinnerProps, {
 }
 declare const _default: {
     new (props: Pick<Omit<SpinnerProps, keyof ThemeProps>, "mode"> & {
-        icon?: React.ReactNode;
-        size?: "" | "sm" | "lg" | undefined;
+        disabled?: boolean | undefined;
         overlay?: boolean | undefined;
         show?: boolean | undefined;
-        delay?: number | undefined;
-        spinnerClassName?: string | undefined;
-        tip?: string | undefined;
-        tipPlacement?: "left" | "right" | "bottom" | "top" | undefined;
+        icon?: React.ReactNode;
+        size?: "" | "sm" | "lg" | undefined;
         loadingConfig?: {
             root?: string | undefined;
             show?: boolean | undefined;
         } | undefined;
+        tip?: string | undefined;
+        spinnerClassName?: string | undefined;
+        tipPlacement?: "left" | "right" | "top" | "bottom" | undefined;
+        delay?: number | undefined;
     } & {
         className?: string | undefined;
     } & import("packages/amis-core/lib/theme").ThemeOuterProps): {
@@ -88,35 +92,37 @@ declare const _default: {
         render(): React.JSX.Element;
         context: unknown;
         setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Pick<Omit<SpinnerProps, keyof ThemeProps>, "mode"> & {
-            icon?: React.ReactNode;
-            size?: "" | "sm" | "lg" | undefined;
+            disabled?: boolean | undefined;
             overlay?: boolean | undefined;
             show?: boolean | undefined;
-            delay?: number | undefined;
-            spinnerClassName?: string | undefined;
-            tip?: string | undefined;
-            tipPlacement?: "left" | "right" | "bottom" | "top" | undefined;
+            icon?: React.ReactNode;
+            size?: "" | "sm" | "lg" | undefined;
             loadingConfig?: {
                 root?: string | undefined;
                 show?: boolean | undefined;
             } | undefined;
+            tip?: string | undefined;
+            spinnerClassName?: string | undefined;
+            tipPlacement?: "left" | "right" | "top" | "bottom" | undefined;
+            delay?: number | undefined;
         } & {
             className?: string | undefined;
         } & import("packages/amis-core/lib/theme").ThemeOuterProps>) => {} | Pick<{}, K> | null) | Pick<{}, K> | null, callback?: (() => void) | undefined): void;
         forceUpdate(callback?: (() => void) | undefined): void;
         readonly props: Readonly<Pick<Omit<SpinnerProps, keyof ThemeProps>, "mode"> & {
-            icon?: React.ReactNode;
-            size?: "" | "sm" | "lg" | undefined;
+            disabled?: boolean | undefined;
             overlay?: boolean | undefined;
             show?: boolean | undefined;
-            delay?: number | undefined;
-            spinnerClassName?: string | undefined;
-            tip?: string | undefined;
-            tipPlacement?: "left" | "right" | "bottom" | "top" | undefined;
+            icon?: React.ReactNode;
+            size?: "" | "sm" | "lg" | undefined;
             loadingConfig?: {
                 root?: string | undefined;
                 show?: boolean | undefined;
             } | undefined;
+            tip?: string | undefined;
+            spinnerClassName?: string | undefined;
+            tipPlacement?: "left" | "right" | "top" | "bottom" | undefined;
+            delay?: number | undefined;
         } & {
             className?: string | undefined;
         } & import("packages/amis-core/lib/theme").ThemeOuterProps>;
@@ -126,118 +132,125 @@ declare const _default: {
         };
         componentDidMount?(): void;
         shouldComponentUpdate?(nextProps: Readonly<Pick<Omit<SpinnerProps, keyof ThemeProps>, "mode"> & {
-            icon?: React.ReactNode;
-            size?: "" | "sm" | "lg" | undefined;
+            disabled?: boolean | undefined;
             overlay?: boolean | undefined;
             show?: boolean | undefined;
-            delay?: number | undefined;
-            spinnerClassName?: string | undefined;
-            tip?: string | undefined;
-            tipPlacement?: "left" | "right" | "bottom" | "top" | undefined;
+            icon?: React.ReactNode;
+            size?: "" | "sm" | "lg" | undefined;
             loadingConfig?: {
                 root?: string | undefined;
                 show?: boolean | undefined;
             } | undefined;
+            tip?: string | undefined;
+            spinnerClassName?: string | undefined;
+            tipPlacement?: "left" | "right" | "top" | "bottom" | undefined;
+            delay?: number | undefined;
         } & {
             className?: string | undefined;
         } & import("packages/amis-core/lib/theme").ThemeOuterProps>, nextState: Readonly<{}>, nextContext: any): boolean;
         componentWillUnmount?(): void;
         componentDidCatch?(error: Error, errorInfo: React.ErrorInfo): void;
         getSnapshotBeforeUpdate?(prevProps: Readonly<Pick<Omit<SpinnerProps, keyof ThemeProps>, "mode"> & {
-            icon?: React.ReactNode;
-            size?: "" | "sm" | "lg" | undefined;
+            disabled?: boolean | undefined;
             overlay?: boolean | undefined;
             show?: boolean | undefined;
-            delay?: number | undefined;
-            spinnerClassName?: string | undefined;
-            tip?: string | undefined;
-            tipPlacement?: "left" | "right" | "bottom" | "top" | undefined;
+            icon?: React.ReactNode;
+            size?: "" | "sm" | "lg" | undefined;
             loadingConfig?: {
                 root?: string | undefined;
                 show?: boolean | undefined;
             } | undefined;
+            tip?: string | undefined;
+            spinnerClassName?: string | undefined;
+            tipPlacement?: "left" | "right" | "top" | "bottom" | undefined;
+            delay?: number | undefined;
         } & {
             className?: string | undefined;
         } & import("packages/amis-core/lib/theme").ThemeOuterProps>, prevState: Readonly<{}>): any;
         componentDidUpdate?(prevProps: Readonly<Pick<Omit<SpinnerProps, keyof ThemeProps>, "mode"> & {
-            icon?: React.ReactNode;
-            size?: "" | "sm" | "lg" | undefined;
+            disabled?: boolean | undefined;
             overlay?: boolean | undefined;
             show?: boolean | undefined;
-            delay?: number | undefined;
-            spinnerClassName?: string | undefined;
-            tip?: string | undefined;
-            tipPlacement?: "left" | "right" | "bottom" | "top" | undefined;
+            icon?: React.ReactNode;
+            size?: "" | "sm" | "lg" | undefined;
             loadingConfig?: {
                 root?: string | undefined;
                 show?: boolean | undefined;
             } | undefined;
+            tip?: string | undefined;
+            spinnerClassName?: string | undefined;
+            tipPlacement?: "left" | "right" | "top" | "bottom" | undefined;
+            delay?: number | undefined;
         } & {
             className?: string | undefined;
         } & import("packages/amis-core/lib/theme").ThemeOuterProps>, prevState: Readonly<{}>, snapshot?: any): void;
         componentWillMount?(): void;
         UNSAFE_componentWillMount?(): void;
         componentWillReceiveProps?(nextProps: Readonly<Pick<Omit<SpinnerProps, keyof ThemeProps>, "mode"> & {
-            icon?: React.ReactNode;
-            size?: "" | "sm" | "lg" | undefined;
+            disabled?: boolean | undefined;
             overlay?: boolean | undefined;
             show?: boolean | undefined;
-            delay?: number | undefined;
-            spinnerClassName?: string | undefined;
-            tip?: string | undefined;
-            tipPlacement?: "left" | "right" | "bottom" | "top" | undefined;
+            icon?: React.ReactNode;
+            size?: "" | "sm" | "lg" | undefined;
             loadingConfig?: {
                 root?: string | undefined;
                 show?: boolean | undefined;
             } | undefined;
+            tip?: string | undefined;
+            spinnerClassName?: string | undefined;
+            tipPlacement?: "left" | "right" | "top" | "bottom" | undefined;
+            delay?: number | undefined;
         } & {
             className?: string | undefined;
         } & import("packages/amis-core/lib/theme").ThemeOuterProps>, nextContext: any): void;
         UNSAFE_componentWillReceiveProps?(nextProps: Readonly<Pick<Omit<SpinnerProps, keyof ThemeProps>, "mode"> & {
-            icon?: React.ReactNode;
-            size?: "" | "sm" | "lg" | undefined;
+            disabled?: boolean | undefined;
             overlay?: boolean | undefined;
             show?: boolean | undefined;
-            delay?: number | undefined;
-            spinnerClassName?: string | undefined;
-            tip?: string | undefined;
-            tipPlacement?: "left" | "right" | "bottom" | "top" | undefined;
+            icon?: React.ReactNode;
+            size?: "" | "sm" | "lg" | undefined;
             loadingConfig?: {
                 root?: string | undefined;
                 show?: boolean | undefined;
             } | undefined;
+            tip?: string | undefined;
+            spinnerClassName?: string | undefined;
+            tipPlacement?: "left" | "right" | "top" | "bottom" | undefined;
+            delay?: number | undefined;
         } & {
             className?: string | undefined;
         } & import("packages/amis-core/lib/theme").ThemeOuterProps>, nextContext: any): void;
         componentWillUpdate?(nextProps: Readonly<Pick<Omit<SpinnerProps, keyof ThemeProps>, "mode"> & {
-            icon?: React.ReactNode;
-            size?: "" | "sm" | "lg" | undefined;
+            disabled?: boolean | undefined;
             overlay?: boolean | undefined;
             show?: boolean | undefined;
-            delay?: number | undefined;
-            spinnerClassName?: string | undefined;
-            tip?: string | undefined;
-            tipPlacement?: "left" | "right" | "bottom" | "top" | undefined;
+            icon?: React.ReactNode;
+            size?: "" | "sm" | "lg" | undefined;
             loadingConfig?: {
                 root?: string | undefined;
                 show?: boolean | undefined;
             } | undefined;
+            tip?: string | undefined;
+            spinnerClassName?: string | undefined;
+            tipPlacement?: "left" | "right" | "top" | "bottom" | undefined;
+            delay?: number | undefined;
         } & {
             className?: string | undefined;
         } & import("packages/amis-core/lib/theme").ThemeOuterProps>, nextState: Readonly<{}>, nextContext: any): void;
         UNSAFE_componentWillUpdate?(nextProps: Readonly<Pick<Omit<SpinnerProps, keyof ThemeProps>, "mode"> & {
-            icon?: React.ReactNode;
-            size?: "" | "sm" | "lg" | undefined;
+            disabled?: boolean | undefined;
             overlay?: boolean | undefined;
             show?: boolean | undefined;
-            delay?: number | undefined;
-            spinnerClassName?: string | undefined;
-            tip?: string | undefined;
-            tipPlacement?: "left" | "right" | "bottom" | "top" | undefined;
+            icon?: React.ReactNode;
+            size?: "" | "sm" | "lg" | undefined;
             loadingConfig?: {
                 root?: string | undefined;
                 show?: boolean | undefined;
             } | undefined;
+            tip?: string | undefined;
+            spinnerClassName?: string | undefined;
+            tipPlacement?: "left" | "right" | "top" | "bottom" | undefined;
+            delay?: number | undefined;
         } & {
             className?: string | undefined;
         } & import("packages/amis-core/lib/theme").ThemeOuterProps>, nextState: Readonly<{}>, nextContext: any): void;

package/lib/components/Spinner.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.5.2
+ * amis-ui v3.6.0
  * Copyright 2018-2023 fex
  */
 
@@ -136,7 +136,7 @@ var Spinner = /** @class */ (function (_super) {
         store.remove(this.parent);
     };
     Spinner.prototype.renderBody = function () {
-        var _a = this.props, cx = _a.classnames, className = _a.className, spinnerClassName = _a.spinnerClassName, _b = _a.size, size = _b === void 0 ? '' : _b, overlay = _a.overlay, delay = _a.delay, iconConfig = _a.icon, tip = _a.tip, _c = _a.tipPlacement, tipPlacement = _c === void 0 ? '' : _c, loadingConfig = _a.loadingConfig;
+        var _a = this.props, cx = _a.classnames, className = _a.className, spinnerClassName = _a.spinnerClassName, _b = _a.size, size = _b === void 0 ? '' : _b, overlay = _a.overlay, delay = _a.delay, iconConfig = _a.icon, tip = _a.tip, _c = _a.tipPlacement, tipPlacement = _c === void 0 ? '' : _c, loadingConfig = _a.loadingConfig, disabled = _a.disabled;
         // 定义了挂载位置时只能使用默认icon
         var icon = (loadingConfig === null || loadingConfig === void 0 ? void 0 : loadingConfig.root) ? undefined : iconConfig;
         var isCustomIcon = icon && React__default["default"].isValidElement(icon);
@@ -158,9 +158,10 @@ var Spinner = /** @class */ (function (_super) {
                             _a), (_b = {}, _b["Spinner--overlay"] = showOverlay, _b), fadeStyles[status], className) },
                         _J$X_("div", { className: cx("Spinner-icon", (_c = {},
                                 _c["Spinner-icon--".concat(size)] = ['lg', 'sm'].includes(size),
-                                _c["Spinner-icon--default"] = !icon,
-                                _c["Spinner-icon--simple"] = !isCustomIcon && icon,
-                                _c["Spinner-icon--custom"] = isCustomIcon,
+                                _c['Spinner-icon--default'] = !icon,
+                                _c['Spinner-icon--simple'] = !isCustomIcon && icon,
+                                _c['Spinner-icon--custom'] = isCustomIcon,
+                                _c['Spinner-icon--disabled'] = disabled,
                                 _c), spinnerClassName) }, icon ? (_J$X_(icons.Icon, { cx: cx, icon: icon, className: "icon" })) : null),
                         tip ? _J$X_("span", { className: cx("Spinner-tip") }, tip) : '')));
             })));
@@ -186,7 +187,8 @@ var Spinner = /** @class */ (function (_super) {
         tipPlacement: 'bottom',
         delay: 0,
         overlay: false,
-        loadingConfig: {}
+        loadingConfig: {},
+        disabled: false
     };
     return Spinner;
 }(React__default["default"].Component));

package/lib/components/Steps.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.5.2
+ * amis-ui v3.6.0
  * Copyright 2018-2023 fex
  */
 

package/lib/components/Switch.d.ts

@@ -23,6 +23,11 @@ interface SwitchProps {
     onText?: React.ReactNode;
     offText?: React.ReactNode;
     checked?: boolean;
+    loading?: boolean;
+    loadingConfig?: {
+        root?: string;
+        show?: boolean;
+    };
 }
 export declare class Switch extends React.PureComponent<SwitchProps, any> {
     static defaultProps: {
@@ -34,7 +39,7 @@ export declare class Switch extends React.PureComponent<SwitchProps, any> {
     render(): React.JSX.Element;
 }
 declare const _default: {
-    new (props: Pick<Omit<SwitchProps, keyof import("amis-core").ThemeProps>, "value" | "id" | "onChange" | "size" | "disabled" | "inline" | "checked" | "readOnly" | "level" | "onText" | "offText"> & {
+    new (props: Pick<Omit<SwitchProps, keyof import("amis-core").ThemeProps>, "disabled" | "value" | "onChange" | "loading" | "size" | "level" | "id" | "loadingConfig" | "inline" | "readOnly" | "checked" | "onText" | "offText"> & {
         trueValue?: string | number | boolean | undefined;
         falseValue?: string | number | boolean | undefined;
     } & {} & import("packages/amis-core/lib/theme").ThemeOuterProps): {
@@ -43,12 +48,12 @@ declare const _default: {
         getWrappedInstance(): any;
         render(): React.JSX.Element;
         context: unknown;
-        setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Pick<Omit<SwitchProps, keyof import("amis-core").ThemeProps>, "value" | "id" | "onChange" | "size" | "disabled" | "inline" | "checked" | "readOnly" | "level" | "onText" | "offText"> & {
+        setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Pick<Omit<SwitchProps, keyof import("amis-core").ThemeProps>, "disabled" | "value" | "onChange" | "loading" | "size" | "level" | "id" | "loadingConfig" | "inline" | "readOnly" | "checked" | "onText" | "offText"> & {
             trueValue?: string | number | boolean | undefined;
             falseValue?: string | number | boolean | undefined;
         } & {} & import("packages/amis-core/lib/theme").ThemeOuterProps>) => {} | Pick<{}, K> | null) | Pick<{}, K> | null, callback?: (() => void) | undefined): void;
         forceUpdate(callback?: (() => void) | undefined): void;
-        readonly props: Readonly<Pick<Omit<SwitchProps, keyof import("amis-core").ThemeProps>, "value" | "id" | "onChange" | "size" | "disabled" | "inline" | "checked" | "readOnly" | "level" | "onText" | "offText"> & {
+        readonly props: Readonly<Pick<Omit<SwitchProps, keyof import("amis-core").ThemeProps>, "disabled" | "value" | "onChange" | "loading" | "size" | "level" | "id" | "loadingConfig" | "inline" | "readOnly" | "checked" | "onText" | "offText"> & {
             trueValue?: string | number | boolean | undefined;
             falseValue?: string | number | boolean | undefined;
         } & {} & import("packages/amis-core/lib/theme").ThemeOuterProps>;
@@ -57,35 +62,35 @@ declare const _default: {
             [key: string]: React.ReactInstance;
         };
         componentDidMount?(): void;
-        shouldComponentUpdate?(nextProps: Readonly<Pick<Omit<SwitchProps, keyof import("amis-core").ThemeProps>, "value" | "id" | "onChange" | "size" | "disabled" | "inline" | "checked" | "readOnly" | "level" | "onText" | "offText"> & {
+        shouldComponentUpdate?(nextProps: Readonly<Pick<Omit<SwitchProps, keyof import("amis-core").ThemeProps>, "disabled" | "value" | "onChange" | "loading" | "size" | "level" | "id" | "loadingConfig" | "inline" | "readOnly" | "checked" | "onText" | "offText"> & {
             trueValue?: string | number | boolean | undefined;
             falseValue?: string | number | boolean | undefined;
         } & {} & import("packages/amis-core/lib/theme").ThemeOuterProps>, nextState: Readonly<{}>, nextContext: any): boolean;
         componentWillUnmount?(): void;
         componentDidCatch?(error: Error, errorInfo: React.ErrorInfo): void;
-        getSnapshotBeforeUpdate?(prevProps: Readonly<Pick<Omit<SwitchProps, keyof import("amis-core").ThemeProps>, "value" | "id" | "onChange" | "size" | "disabled" | "inline" | "checked" | "readOnly" | "level" | "onText" | "offText"> & {
+        getSnapshotBeforeUpdate?(prevProps: Readonly<Pick<Omit<SwitchProps, keyof import("amis-core").ThemeProps>, "disabled" | "value" | "onChange" | "loading" | "size" | "level" | "id" | "loadingConfig" | "inline" | "readOnly" | "checked" | "onText" | "offText"> & {
             trueValue?: string | number | boolean | undefined;
             falseValue?: string | number | boolean | undefined;
         } & {} & import("packages/amis-core/lib/theme").ThemeOuterProps>, prevState: Readonly<{}>): any;
-        componentDidUpdate?(prevProps: Readonly<Pick<Omit<SwitchProps, keyof import("amis-core").ThemeProps>, "value" | "id" | "onChange" | "size" | "disabled" | "inline" | "checked" | "readOnly" | "level" | "onText" | "offText"> & {
+        componentDidUpdate?(prevProps: Readonly<Pick<Omit<SwitchProps, keyof import("amis-core").ThemeProps>, "disabled" | "value" | "onChange" | "loading" | "size" | "level" | "id" | "loadingConfig" | "inline" | "readOnly" | "checked" | "onText" | "offText"> & {
             trueValue?: string | number | boolean | undefined;
             falseValue?: string | number | boolean | undefined;
         } & {} & import("packages/amis-core/lib/theme").ThemeOuterProps>, prevState: Readonly<{}>, snapshot?: any): void;
         componentWillMount?(): void;
         UNSAFE_componentWillMount?(): void;
-        componentWillReceiveProps?(nextProps: Readonly<Pick<Omit<SwitchProps, keyof import("amis-core").ThemeProps>, "value" | "id" | "onChange" | "size" | "disabled" | "inline" | "checked" | "readOnly" | "level" | "onText" | "offText"> & {
+        componentWillReceiveProps?(nextProps: Readonly<Pick<Omit<SwitchProps, keyof import("amis-core").ThemeProps>, "disabled" | "value" | "onChange" | "loading" | "size" | "level" | "id" | "loadingConfig" | "inline" | "readOnly" | "checked" | "onText" | "offText"> & {
             trueValue?: string | number | boolean | undefined;
             falseValue?: string | number | boolean | undefined;
         } & {} & import("packages/amis-core/lib/theme").ThemeOuterProps>, nextContext: any): void;
-        UNSAFE_componentWillReceiveProps?(nextProps: Readonly<Pick<Omit<SwitchProps, keyof import("amis-core").ThemeProps>, "value" | "id" | "onChange" | "size" | "disabled" | "inline" | "checked" | "readOnly" | "level" | "onText" | "offText"> & {
+        UNSAFE_componentWillReceiveProps?(nextProps: Readonly<Pick<Omit<SwitchProps, keyof import("amis-core").ThemeProps>, "disabled" | "value" | "onChange" | "loading" | "size" | "level" | "id" | "loadingConfig" | "inline" | "readOnly" | "checked" | "onText" | "offText"> & {
             trueValue?: string | number | boolean | undefined;
             falseValue?: string | number | boolean | undefined;
         } & {} & import("packages/amis-core/lib/theme").ThemeOuterProps>, nextContext: any): void;
-        componentWillUpdate?(nextProps: Readonly<Pick<Omit<SwitchProps, keyof import("amis-core").ThemeProps>, "value" | "id" | "onChange" | "size" | "disabled" | "inline" | "checked" | "readOnly" | "level" | "onText" | "offText"> & {
+        componentWillUpdate?(nextProps: Readonly<Pick<Omit<SwitchProps, keyof import("amis-core").ThemeProps>, "disabled" | "value" | "onChange" | "loading" | "size" | "level" | "id" | "loadingConfig" | "inline" | "readOnly" | "checked" | "onText" | "offText"> & {
             trueValue?: string | number | boolean | undefined;
             falseValue?: string | number | boolean | undefined;
         } & {} & import("packages/amis-core/lib/theme").ThemeOuterProps>, nextState: Readonly<{}>, nextContext: any): void;
-        UNSAFE_componentWillUpdate?(nextProps: Readonly<Pick<Omit<SwitchProps, keyof import("amis-core").ThemeProps>, "value" | "id" | "onChange" | "size" | "disabled" | "inline" | "checked" | "readOnly" | "level" | "onText" | "offText"> & {
+        UNSAFE_componentWillUpdate?(nextProps: Readonly<Pick<Omit<SwitchProps, keyof import("amis-core").ThemeProps>, "disabled" | "value" | "onChange" | "loading" | "size" | "level" | "id" | "loadingConfig" | "inline" | "readOnly" | "checked" | "onText" | "offText"> & {
             trueValue?: string | number | boolean | undefined;
             falseValue?: string | number | boolean | undefined;
         } & {} & import("packages/amis-core/lib/theme").ThemeOuterProps>, nextState: Readonly<{}>, nextContext: any): void;

package/lib/components/Switch.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.5.2
+ * amis-ui v3.6.0
  * Copyright 2018-2023 fex
  */
 
@@ -10,6 +10,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var tslib = require('tslib');
 var React = require('react');
 var amisCore = require('amis-core');
+var Spinner = require('./Spinner.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -45,7 +46,7 @@ var Switch = /** @class */ (function (_super) {
         onChange(e.currentTarget.checked ? trueValue : falseValue);
     };
     Switch.prototype.render = function () {
-        var _a = this.props, size = _a.size, level = _a.level, className = _a.className; _a.classPrefix; _a.onChange; var value = _a.value; _a.inline; var trueValue = _a.trueValue; _a.falseValue; var _b = _a.onText, onText = _b === void 0 ? '' : _b, _c = _a.offText, offText = _c === void 0 ? '' : _c, disabled = _a.disabled, readOnly = _a.readOnly, checked = _a.checked, cx = _a.classnames, rest = tslib.__rest(_a, ["size", "level", "className", "classPrefix", "onChange", "value", "inline", "trueValue", "falseValue", "onText", "offText", "disabled", "readOnly", "checked", "classnames"]);
+        var _a = this.props, size = _a.size, level = _a.level, className = _a.className, classPrefix = _a.classPrefix; _a.onChange; var value = _a.value; _a.inline; var trueValue = _a.trueValue; _a.falseValue; var _b = _a.onText, onText = _b === void 0 ? '' : _b, _c = _a.offText, offText = _c === void 0 ? '' : _c, disabled = _a.disabled, readOnly = _a.readOnly, checked = _a.checked, cx = _a.classnames, loading = _a.loading, loadingConfig = _a.loadingConfig, rest = tslib.__rest(_a, ["size", "level", "className", "classPrefix", "onChange", "value", "inline", "trueValue", "falseValue", "onText", "offText", "disabled", "readOnly", "checked", "classnames", "loading", "loadingConfig"]);
         className =
             (className ? className : '') +
                 (size && sizeMap[size] ? " ".concat(sizeMap[size]) : '') +
@@ -55,10 +56,17 @@ var Switch = /** @class */ (function (_super) {
             : typeof value === 'undefined'
                 ? false
                 : value == trueValue;
-        return (_J$X_("label", { className: cx("Switch", isChecked ? 'is-checked' : '', disabled ? 'is-disabled' : '', className) },
-            _J$X_("input", tslib.__assign({ type: "checkbox", checked: isChecked, onChange: this.hanldeCheck, disabled: disabled, readOnly: readOnly }, rest)),
+        var isDisabled = disabled || loading;
+        return (_J$X_("label", { className: cx("Switch", className, {
+                'is-checked': isChecked,
+                'is-disabled': isDisabled
+            }) },
+            _J$X_("input", tslib.__assign({ type: "checkbox", checked: isChecked, onChange: this.hanldeCheck, disabled: isDisabled, readOnly: readOnly }, rest)),
             _J$X_("span", { className: "text" }, isChecked ? onText : offText),
-            _J$X_("span", { className: "slider" })));
+            _J$X_("span", { className: "slider" }, loading ? (_J$X_(Spinner.Spinner, { classnames: cx, classPrefix: classPrefix, className: cx('Switch-spinner', {
+                    'Switch-spinner--sm': size === 'sm',
+                    'Switch-spinner--checked': isChecked
+                }), spinnerClassName: cx('Switch-spinner-icon'), disabled: !isChecked, size: "sm", icon: "loading-outline", loadingConfig: loadingConfig })) : null)));
     };
     Switch.defaultProps = {
         trueValue: true,