@nutui/nutui-react 3.0.0-beta.1 → 3.0.0-beta.10

package/dist/cjs/packages/steps/style/style.css

@@ -1,3 +1,7 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-step {
   flex-grow: 0;
   flex-shrink: 0;
@@ -17,7 +21,7 @@
   left: calc(50% + (100% - var(--nutui-steps-base-line-width, 70%)) / 2);
   height: var(--nutui-steps-base-line-height, 1px);
   width: var(--nutui-steps-base-line-width, 70%);
-  background: var(--nutui-steps-base-line-background, var(--nutui-color-text-help, #888b94));
+  background: var(--nutui-steps-base-line-background, var(--nutui-gray-5));
 }
 .nut-step-icon {
   position: relative;
@@ -28,8 +32,8 @@
   height: var(--nutui-steps-base-icon-height, 25px);
   line-height: var(--nutui-steps-base-icon-line-height, 25px);
   font-size: var(--nutui-steps-base-icon-font-size, var(--nutui-font-size-s, 12px));
-  background-color: var(--nutui-steps-wait-icon-bg-color, var(--nutui-color-text-help, #888b94));
-  border-color: var(--nutui-steps-wait-icon-bg-color, var(--nutui-color-text-help, #888b94));
+  background-color: var(--nutui-steps-wait-icon-bg-color, var(--nutui-gray-5));
+  border-color: var(--nutui-steps-wait-icon-bg-color, var(--nutui-gray-5));
   color: var(--nutui-steps-wait-icon-color, #ffffff);
   z-index: 1;
 }
@@ -58,48 +62,48 @@
   display: block;
   margin-bottom: var(--nutui-steps-base-title-margin-bottom, 10px);
   font-size: var(--nutui-steps-base-title-font-size, var(--nutui-font-size-base, 14px));
-  color: var(--nutui-steps-base-title-color, var(--nutui-color-title, #1a1a1a));
+  color: var(--nutui-steps-base-title-color, var(--nutui-gray-7));
 }
 .nut-step-description {
   display: block;
   font-size: var(--nutui-steps-base-description-font-size, var(--nutui-font-size-s, 12px));
-  color: var(--nutui-steps-base-description-color, var(--nutui-color-text, #505259));
+  color: var(--nutui-steps-base-description-color, var(--nutui-gray-6));
 }
 .nut-step:last-child .nut-step-line {
   display: none;
 }
 .nut-step.nut-step-process .nut-step-icon {
-  background-color: var(--nutui-steps-process-icon-bg-color, var(--nutui-color-primary, #ff0f23));
-  border-color: var(--nutui-steps-process-icon-bg-color, var(--nutui-color-primary, #ff0f23));
+  background-color: var(--nutui-steps-process-icon-bg-color, var(--nutui-brand-6));
+  border-color: var(--nutui-steps-process-icon-bg-color, var(--nutui-brand-6));
   color: var(--nutui-steps-process-icon-color, #ffffff);
 }
 .nut-step.nut-step-process .nut-step-title {
-  color: var(--nutui-steps-process-title-color, var(--nutui-color-primary, #ff0f23));
+  color: var(--nutui-steps-process-title-color, var(--nutui-brand-6));
   font-size: var(--nutui-steps-process-title-font-size, var(--nutui-font-size-base, 14px));
   font-weight: var(--nutui-steps-process-title-font-weight, var(--nutui-font-weight-bold, 600));
 }
 .nut-step.nut-step-process .nut-step-description {
-  color: var(--nutui-steps-process-description-color, var(--nutui-color-text, #505259));
+  color: var(--nutui-steps-process-description-color, var(--nutui-gray-6));
 }
 .nut-step.nut-step-wait .nut-step-title {
-  color: var(--nutui-steps-wait-title-color, var(--nutui-color-title, #1a1a1a));
+  color: var(--nutui-steps-wait-title-color, var(--nutui-gray-7));
 }
 .nut-step.nut-step-wait .nut-step-description {
-  color: var(--nutui-steps-wait-description-color, var(--nutui-color-text, #505259));
+  color: var(--nutui-steps-wait-description-color, var(--nutui-gray-6));
 }
 .nut-step.nut-step-finish .nut-step-icon {
-  background-color: var(--nutui-steps-finish-icon-bg-color, var(--nutui-color-primary-text, #ffffff));
-  border-color: var(--nutui-steps-finish-icon-border-color, var(--nutui-steps-finish-icon-color, var(--nutui-color-primary, #ff0f23)));
-  color: var(--nutui-steps-finish-icon-color, var(--nutui-color-primary, #ff0f23));
+  background-color: var(--nutui-steps-finish-icon-bg-color, #ffffff);
+  border-color: var(--nutui-steps-finish-icon-border-color, var(--nutui-steps-finish-icon-color, var(--nutui-brand-6)));
+  color: var(--nutui-steps-finish-icon-color, var(--nutui-brand-6));
 }
 .nut-step.nut-step-finish .nut-step-line {
-  background: var(--nutui-steps-finish-line-background, var(--nutui-color-primary, #ff0f23));
+  background: var(--nutui-steps-finish-line-background, var(--nutui-brand-6));
 }
 .nut-step.nut-step-finish .nut-step-title {
-  color: var(--nutui-steps-finish-title-color, var(--nutui-color-primary, #ff0f23));
+  color: var(--nutui-steps-finish-title-color, var(--nutui-brand-6));
 }
 .nut-step.nut-step-finish .nut-step-description {
-  color: var(--nutui-steps-finish-description-color, var(--nutui-color-text, #505259));
+  color: var(--nutui-steps-finish-description-color, var(--nutui-gray-6));
 }
 
 .nut-steps-dot .nut-step-head {
@@ -111,16 +115,16 @@
 .nut-steps-dot .nut-step-icon {
   width: var(--nutui-steps-dot-icon-width, 6px);
   height: var(--nutui-steps-dot-icon-height, 6px);
-  border: var(--nutui-steps-dot-icon-border, 2px solid var(--nutui-color-primary-text, #ffffff));
+  border: var(--nutui-steps-dot-icon-border, 2px solid #ffffff);
   border-radius: 50%;
   box-sizing: content-box;
 }
 .nut-steps-dot .nut-step-wait .nut-step-icon {
-  background-color: var(--nutui-steps-dot-wait-icon-bg-color, var(--nutui-steps-wait-icon-bg-color, var(--nutui-color-text-help, #888b94)));
+  background-color: var(--nutui-steps-dot-wait-icon-bg-color, var(--nutui-steps-wait-icon-bg-color, var(--nutui-gray-5)));
 }
 .nut-steps-dot .nut-step-finish .nut-step-icon {
-  background-color: var(--nutui-steps-finish-icon-bg-color, var(--nutui-color-primary-text, #ffffff));
-  border-color: var(--nutui-steps-dot-finish-icon-bg-color, var(--nutui-steps-finish-icon-color, var(--nutui-color-primary, #ff0f23)));
+  background-color: var(--nutui-steps-finish-icon-bg-color, #ffffff);
+  border-color: var(--nutui-steps-dot-finish-icon-bg-color, var(--nutui-steps-finish-icon-color, var(--nutui-brand-6)));
 }
 .nut-steps-dot .nut-step-process .nut-step-icon {
   position: relative;
@@ -154,7 +158,7 @@
   display: inline-block;
   width: 1px;
   height: var(--nutui-steps-base-line-width, 70%);
-  background: var(--nutui-steps-base-line-background, var(--nutui-color-text-help, #888b94));
+  background: var(--nutui-steps-base-line-background, var(--nutui-gray-5));
   top: calc(var(--nutui-steps-base-icon-height, 25px) + (100% - var(--nutui-steps-base-line-width, 70%) - var(--nutui-steps-base-icon-margin-bottom, 12px)) / 2);
   left: calc(50% - 1px);
 }

package/dist/cjs/packages/sticky/style/style.css

@@ -1,3 +1,7 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-sticky-fixed {
   position: fixed;
 }

package/dist/cjs/packages/subsidenavbar/style/style.css

@@ -1,9 +1,13 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-subsidenavbar-title {
   height: var(--nutui-sidenavbar-item-height, 40px);
   padding: var(--nutui-sidenavbar-sub-title-padding, 10px 8px 10px 35px);
   box-sizing: border-box;
-  background-color: var(--nutui-sidenavbar-sub-title-background, var(--nutui-color-background-sunken, #f7f8fc));
-  color: var(--nutui-sidenavbar-sub-title-color, var(--nutui-color-title, #1a1a1a));
+  background-color: var(--nutui-sidenavbar-sub-title-background, var(--nutui-color-background-sunken, var(--nutui-gray-2)));
+  color: var(--nutui-sidenavbar-sub-title-color, var(--nutui-gray-7));
   box-sizing: border-box;
 }
 .nut-subsidenavbar-list.sidenavbar-show .nut-subsidenavbar-content {

package/dist/cjs/packages/swipe/style/style.css

@@ -1,3 +1,7 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-swipe {
   display: flex;
   flex-direction: row;

package/dist/cjs/packages/swiper/style/style.css

@@ -1,59 +1,140 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-indicator {
   display: flex;
-  flex-direction: row;
   width: auto;
+  flex-direction: row;
   flex-wrap: nowrap;
   align-items: center;
-  justify-content: center;
 }
-.nut-indicator-dot {
+.nut-indicator-fixed-width {
+  width: 21px;
+}
+.nut-indicator-dot, .nut-indicator-line {
   display: inline-block;
   vertical-align: middle;
-  width: var(--nutui-indicator-dot-size, 4px);
-  height: var(--nutui-indicator-dot-size, 4px);
+  width: var(--nutui-indicator-dot-size, 3px);
+  height: var(--nutui-indicator-dot-size, 3px);
   border-radius: 50%;
-  background-color: var(--nutui-indicator-dot-color, var(--nutui-color-border, rgba(0, 0, 0, 0.06)));
-  margin: 0 var(--nutui-indicator-dot-margin, 2px);
+  background-color: var(--nutui-gray-4);
+  margin: 0 var(--nutui-indicator-dot-margin, var(--nutui-spacing-xxxs, 2px));
+  opacity: 0.4;
 }
-.nut-indicator-dot:first-child {
+.nut-indicator-dot:first-child, .nut-indicator-line:first-child {
   margin-left: 0px;
 }
-.nut-indicator-dot:last-child {
+.nut-indicator-dot:last-child, .nut-indicator-line:last-child {
   margin-right: 0px;
 }
-.nut-indicator-active {
-  width: var(--nutui-indicator-dot-active-size, 8px);
-  border-radius: var(--nutui-indicator-border-radius, 2px);
-  background: var(--nutui-indicator-color, var(--nutui-color-primary, #ff0f23));
+.nut-indicator-dot-active, .nut-indicator-line-active {
+  width: var(--nutui-indicator-dot-active-size, 6px);
+  border-radius: var(--nutui-indicator-border-radius, var(--nutui-radius-xxs, 2px));
+  background: var(--nutui-indicator-color, var(--nutui-brand-6));
+  opacity: 1;
+}
+.nut-indicator-fixed-width .nut-indicator-dot {
+  width: 12px;
+  border-radius: var(--nutui-indicator-border-radius, var(--nutui-radius-xxs, 2px));
+}
+.nut-indicator-fixed-width .nut-indicator-dot-active {
+  width: 6px;
+}
+.nut-indicator-vertical.nut-indicator-fixed-width {
+  justify-content: flex-start;
+  height: 21px;
+  width: auto;
+}
+.nut-indicator-vertical.nut-indicator-fixed-width .nut-indicator-dot {
+  width: 3px;
+  height: 12px;
+  border-radius: var(--nutui-indicator-border-radius, var(--nutui-radius-xxs, 2px));
+}
+.nut-indicator-vertical.nut-indicator-fixed-width .nut-indicator-dot-active {
+  height: 6px;
+}
+.nut-indicator-line {
+  width: var(--nutui-indicator-dot-active-size, 6px);
+  margin: 0;
+  border-radius: var(--nutui-indicator-border-radius, var(--nutui-radius-xxs, 2px));
+  background-color: transparent;
+}
+.nut-indicator-line-active {
+  transition: transform 0.3s ease-in-out;
+  background: var(--nutui-indicator-color, var(--nutui-brand-6));
+}
+
+.nut-indicator-track {
+  position: relative;
 }
+.nut-indicator-track:after {
+  display: block;
+  content: " ";
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  box-sizing: border-box;
+  border-radius: var(--nutui-indicator-border-radius, var(--nutui-radius-xxs, 2px));
+  background-color: var(--nutui-gray-4);
+  opacity: 0.4;
+}
+
+.nut-indicator-white .nut-indicator-dot, .nut-indicator-white .nut-indicator-line {
+  position: relative;
+  box-sizing: content-box;
+  background: rgba(255, 255, 255, 0.4);
+  border: 1px solid rgba(0, 0, 0, 0.06);
+  opacity: 1;
+}
+.nut-indicator-white .nut-indicator-line {
+  opacity: 0;
+}
+.nut-indicator-white .nut-indicator-line-active {
+  opacity: 1;
+  background: rgb(255, 255, 255);
+}
+.nut-indicator-white .nut-indicator-dot-active {
+  background: rgb(255, 255, 255);
+}
+
+.nut-indicator-track.nut-indicator-white:after {
+  border: 1px solid rgba(0, 0, 0, 0.06);
+  background: rgba(255, 255, 255, 0.4);
+}
+
 .nut-indicator-vertical {
   display: flex;
   flex-direction: column;
   align-items: center;
   justify-content: center;
 }
-.nut-indicator-vertical-dot {
-  margin: var(--nutui-indicator-dot-margin, 2px) 0;
+.nut-indicator-vertical .nut-indicator-dot {
+  margin: var(--nutui-indicator-dot-margin, var(--nutui-spacing-xxxs, 2px)) 0;
 }
-.nut-indicator-vertical-dot:first-child {
+.nut-indicator-vertical .nut-indicator-dot:first-child {
   margin-top: 0px;
 }
-.nut-indicator-vertical-dot:last-child {
+.nut-indicator-vertical .nut-indicator-dot:last-child {
   margin-bottom: 0px;
 }
-.nut-indicator-vertical-active {
-  width: var(--nutui-indicator-dot-size, 4px);
-  height: var(--nutui-indicator-dot-active-size, 8px);
+.nut-indicator-vertical .nut-indicator-dot-active {
+  width: var(--nutui-indicator-dot-size, 3px);
+  height: var(--nutui-indicator-dot-active-size, 6px);
+}
+.nut-indicator-vertical.nut-indicator-track .nut-indicator-line {
+  width: var(--nutui-indicator-dot-size, 3px);
+  height: var(--nutui-indicator-dot-active-size, 6px);
 }
 
 [dir=rtl] .nut-indicator-dot:first-child,
 .nut-rtl .nut-indicator-dot:first-child {
-  margin-left: var(--nutui-indicator-dot-margin, 2px);
+  margin-left: var(--nutui-indicator-dot-margin, var(--nutui-spacing-xxxs, 2px));
   margin-right: 0px;
 }
 [dir=rtl] .nut-indicator-dot:last-child,
 .nut-rtl .nut-indicator-dot:last-child {
-  margin-right: var(--nutui-indicator-dot-margin, 2px);
+  margin-right: var(--nutui-indicator-dot-margin, var(--nutui-spacing-xxxs, 2px));
   margin-left: 0px;
 }
 

package/dist/cjs/packages/swiperitem/style/style.css

@@ -1,3 +1,7 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-swiper-item {
   height: 100%;
 }

package/dist/cjs/packages/switch/style/style.css

@@ -1,71 +1,91 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-switch {
   cursor: pointer;
-  display: flex;
+  position: relative;
+  display: inline-flex;
   flex-direction: row;
   align-items: center;
-  width: var(--nutui-switch-width, 40px);
-  height: var(--nutui-switch-height, 24px);
-  line-height: var(--nutui-switch-line-height, 24px);
-  background-color: var(--nutui-switch-open-background-color, var(--nutui-color-primary, #ff0f23));
-  border-radius: var(--nutui-switch-border-radius, 8px);
+  min-width: var(--nutui-switch-width, 46px);
+  height: var(--nutui-switch-height, 28px);
+  line-height: var(--nutui-switch-line-height, 28px);
+  background-color: var(--nutui-switch-active-background-color, var(--nutui-brand-6));
+  border-radius: var(--nutui-switch-border-radius, 50px);
   background-size: 100% 100%;
   background-repeat: no-repeat;
   background-position: center center;
   flex: 0 0 auto;
 }
 .nut-switch-button {
+  position: absolute;
+  top: 50%;
+  transform: translateY(-50%);
   display: flex;
   flex-direction: row;
   align-items: center;
   justify-content: center;
-  height: var(--nutui-switch-inside-height, 20px);
-  width: var(--nutui-switch-inside-width, 20px);
-  transform: var(--nutui-switch-inside-close-transform, translateX(2px));
-  border-radius: var(--nutui-switch-inside-border-radius, var(--nutui-radius-s, 6px));
-  background: var(--nutui-color-primary-text, #ffffff);
-  transition: transform 0.3s;
-  box-shadow: var(--nutui-switch-box-shadow, 0 0 transparent);
+  height: calc(var(--nutui-switch-height, 28px) - var(--nutui-switch-border-width, 2px) * 2);
+  width: calc(var(--nutui-switch-height, 28px) - var(--nutui-switch-border-width, 2px) * 2);
+  border-radius: var(--nutui-switch-inside-border-radius, 50%);
+  background: #ffffff;
+  transition: left 0.3s linear;
+  box-shadow: var(--nutui-switch-inside-box-shadow, 0px 2px 6px 0px rgba(0, 0, 0, 0.1));
 }
 .nut-switch-button-open {
-  transform: var(--nutui-switch-inside-open-transform, translateX(18px));
+  left: calc(100% - var(--nutui-switch-height, 28px) + var(--nutui-switch-border-width, 2px));
 }
 .nut-switch-button-open-rtl {
-  transform: var(--nutui-switch-inside-open-transform, translateX(-18px));
+  left: var(--nutui-switch-border-width, 2px);
 }
 .nut-switch-button-close {
-  transform: var(--nutui-switch-inside-close-transform, translateX(2px));
+  left: var(--nutui-switch-border-width, 2px);
 }
 .nut-switch-button-close-rtl {
-  transform: var(--nutui-switch-inside-close-transform, translateX(-2px));
+  left: calc(100% - var(--nutui-switch-height, 28px) + var(--nutui-switch-border-width, 2px));
 }
 .nut-switch-close {
-  background-color: var(--nutui-switch-close-background-color, var(--nutui-color-text-disabled, #c2c4cc));
+  background-color: var(--nutui-switch-inactive-background-color, var(--nutui-gray-4));
 }
 .nut-switch-close-line {
-  width: 12px;
+  width: calc((var(--nutui-switch-height, 28px) - var(--nutui-switch-border-width, 2px) * 2) / 2);
   height: 2px;
-  background: var(--nutui-switch-close-line-background-color, #fff);
+  background: var(--nutui-switch-inactive-line-background-color, #ffffff);
   border-radius: 2px;
 }
-.nut-switch-disabled {
-  background-color: var(--nutui-switch-open-disabled-background-color, var(--nutui-color-primary-disabled-special, #ffadbe));
-}
-.nut-switch-disabled-close {
-  background-color: var(--nutui-switch-close-disabled-background-color, var(--nutui-color-background, #f5f6fa));
-}
 .nut-switch-label {
-  color: var(--nutui-color-primary-text, #ffffff);
-  font-size: var(--nutui-font-size-s, 12px);
+  display: inline-flex;
+  align-items: center;
+  height: 100%;
+  white-space: nowrap;
+  color: var(--nutui-switch-label-text-color, #ffffff);
+  font-size: var(--nutui-switch-label-font-size, var(--nutui-font-size-s, 12px));
+}
+.nut-switch-label .nut-icon {
+  color: var(--nutui-switch-label-text-color, #ffffff);
 }
 .nut-switch-label-open {
-  transform: translateX(-18px);
+  margin: 0 calc(var(--nutui-switch-height, 28px) - var(--nutui-switch-border-width, 2px) + 3px) 0 7px;
 }
 .nut-switch-label-open-rtl {
-  transform: translateX(18px);
+  margin: 0 7px 0 calc(var(--nutui-switch-height, 28px) - var(--nutui-switch-border-width, 2px) + 3px);
 }
 .nut-switch-label-close {
-  transform: translateX(18px);
+  margin: 0 7px 0 calc(var(--nutui-switch-height, 28px) - var(--nutui-switch-border-width, 2px) + 3px);
 }
 .nut-switch-label-close-rtl {
-  transform: translateX(-18px);
+  margin: 0 calc(var(--nutui-switch-height, 28px) - var(--nutui-switch-border-width, 2px) + 3px) 0 7px;
+}
+.nut-switch-label-close-disabled {
+  color: var(--nutui-switch-inactive-disabled-label-text-color, var(--nutui-gray-4));
+}
+.nut-switch-label-close-disabled .nut-icon {
+  color: var(--nutui-switch-inactive-disabled-label-text-color, var(--nutui-gray-4));
+}
+.nut-switch-disabled {
+  background-color: var(--nutui-switch-active-disabled-background-color, var(--nutui-brand-3));
+}
+.nut-switch-disabled-close {
+  background-color: var(--nutui-switch-inactive-disabled-background-color, var(--nutui-gray-3));
 }

package/dist/cjs/packages/switch/style/switch.scss

@@ -1,12 +1,13 @@
 .nut-switch {
   cursor: pointer;
-  display: flex;
+  position: relative;
+  display: inline-flex;
   flex-direction: row;
   align-items: center;
-  width: $switch-width;
+  min-width: $switch-width;
   height: $switch-height;
   line-height: $switch-line-height;
-  background-color: $switch-open-background-color;
+  background-color: $switch-active-background-color;
   border-radius: $switch-border-radius;
   background-size: 100% 100%;
   background-repeat: no-repeat;
@@ -14,64 +15,79 @@
   flex: 0 0 auto; // 防止被压缩
 
   &-button {
+    position: absolute;
+    top: 50%;
+    transform: translateY(-50%);
     display: flex;
     flex-direction: row;
     align-items: center;
     justify-content: center;
-    height: $switch-inside-height;
-    width: $switch-inside-width;
-    transform: $switch-inside-close-transform;
+    height: calc($switch-height - $switch-border-width * 2);
+    width: calc($switch-height - $switch-border-width * 2);
     border-radius: $switch-inside-border-radius;
     background: $color-primary-text;
-    transition: transform 0.3s;
-    box-shadow: $switch-button-box-shadow;
+    transition: left 0.3s linear;
+    box-shadow: $switch-inside-box-shadow;
     &-open {
-      transform: $switch-inside-open-transform;
+      left: calc(100% - $switch-height + $switch-border-width);
       &-rtl {
-        transform: var(--nutui-switch-inside-open-transform, translateX(-18px));
+        left: $switch-border-width;
       }
     }
     &-close {
-      transform: $switch-inside-close-transform;
+      left: $switch-border-width;
       &-rtl {
-        transform: var(--nutui-switch-inside-close-transform, translateX(-2px));
+        left: calc(100% - $switch-height + $switch-border-width);
       }
     }
   }
 
   &-close {
-    background-color: $switch-close-background-color;
+    background-color: $switch-inactive-background-color;
     &-line {
-      width: 12px;
+      width: calc(($switch-height - $switch-border-width * 2) / 2);
       height: 2px;
-      background: $switch-close-line-background-color;
+      background: $switch-inactive-line-background-color;
       border-radius: 2px;
     }
   }
 
-  &-disabled {
-    background-color: $switch-open-disabled-background-color;
-    &-close {
-      background-color: $switch-close-disabled-background-color;
-    }
-  }
-
   &-label {
-    color: $color-primary-text;
-    font-size: $font-size-s;
-
+    display: inline-flex;
+    align-items: center;
+    height: 100%;
+    white-space: nowrap;
+    color: $switch-label-text-color;
+    font-size: $switch-label-font-size;
+    .nut-icon {
+      color: $switch-label-text-color;
+    }
     &-open {
-      transform: translateX(-18px);
+      margin: 0 calc($switch-height - $switch-border-width + 3px) 0 7px;
       &-rtl {
-        transform: translateX(18px);
+        margin: 0 7px 0 calc($switch-height - $switch-border-width + 3px);
       }
     }
 
     &-close {
-      transform: translateX(18px);
+      margin: 0 7px 0 calc($switch-height - $switch-border-width + 3px);
       &-rtl {
-        transform: translateX(-18px);
+        margin: 0 calc($switch-height - $switch-border-width + 3px) 0 7px;
       }
     }
+
+    &-close-disabled {
+      color: $switch-inactive-disabled-label-text-color;
+      .nut-icon {
+        color: $switch-inactive-disabled-label-text-color;
+      }
+    }
+  }
+
+  &-disabled {
+    background-color: $switch-active-disabled-background-color;
+    &-close {
+      background-color: $switch-inactive-disabled-background-color;
+    }
   }
 }

package/dist/cjs/packages/switch/switch.d.ts

@@ -4,8 +4,8 @@ export interface SwitchProps extends BasicComponent {
     checked: boolean;
     defaultChecked: boolean;
     disabled: boolean;
-    activeText: string;
-    inactiveText: string;
+    activeText: React.ReactNode;
+    inactiveText: React.ReactNode;
     onChange: (val: boolean, event: React.MouseEvent) => void;
 }
 export declare const Switch: FunctionComponent<Partial<SwitchProps>>;

package/dist/cjs/packages/switch/switch.js

@@ -73,16 +73,8 @@ var Switch = function Switch(props) {
         ])
     }, !value && !activeText && /*#__PURE__*/ _react.default.createElement("div", {
         className: "".concat(classPrefix, "-close-line")
-    }), activeText && /*#__PURE__*/ _react.default.createElement("div", {
-        className: (0, _classnames.default)([
-            [
-                "".concat(classPrefix, "-label")
-            ],
-            [
-                value ? "".concat(classPrefix, "-label-open") : "".concat(classPrefix, "-label-close")
-            ],
-            (_obj1 = {}, (0, _define_property._)(_obj1, "".concat(classPrefix, "-label-open-rtl"), rtl && value), (0, _define_property._)(_obj1, "".concat(classPrefix, "-button-close-rtl"), rtl && !value), _obj1)
-        ])
-    }, value ? activeText : inactiveText)));
+    })), activeText && /*#__PURE__*/ _react.default.createElement("div", {
+        className: (0, _classnames.default)("".concat(classPrefix, "-label"), (_obj1 = {}, (0, _define_property._)(_obj1, "".concat(classPrefix, "-label-open"), value), (0, _define_property._)(_obj1, "".concat(classPrefix, "-label-close"), !value), (0, _define_property._)(_obj1, "".concat(classPrefix, "-label-open-rtl"), rtl && value), (0, _define_property._)(_obj1, "".concat(classPrefix, "-label-close-rtl"), rtl && !value), (0, _define_property._)(_obj1, "".concat(classPrefix, "-label-close-disabled"), disabled && !value), _obj1))
+    }, value ? activeText : inactiveText));
 };
 Switch.displayName = 'NutSwitch';