rsuite 6.0.0-canary-20250403 → 6.0.0-canary-20250424

package/Input/styles/mixin.less

@@ -23,12 +23,11 @@
     color: var(--rs-text-secondary);
   }
 
-  &:focus,
-  &:hover:not(:disabled) {
+  &:focus {
     border-color: var(--rs-input-focus-border);
   }
 
-  &:focus {
+  &:focus-visible {
     .focus-ring();
   }
 
@@ -36,8 +35,4 @@
     background-color: var(--rs-input-disabled-bg);
     color: var(--rs-text-disabled);
   }
-
-  textarea& {
-    height: auto;
-  }
 }

package/InputGroup/styles/index.css

@@ -209,7 +209,7 @@
   --rs-text-primary: var(--rs-gray-50);
   --rs-text-disabled: var(--rs-gray-400);
   --rs-border-primary: var(--rs-gray-600);
-  --rs-color-focus-ring: 0 0 0 3px rgb(from var(--rs-gray-500) r g b / 25%);
+  --rs-color-focus-ring: 0 0 0 2px rgb(from var(--rs-gray-500) r g b / 25%);
   --rs-btn-default-bg: var(--rs-gray-600);
   --rs-btn-default-text: var(--rs-gray-50);
   --rs-btn-default-border-color: var(--rs-gray-700);
@@ -248,7 +248,7 @@
 }
 @supports not (color: rgb(from white r g b)) {
   .rs-theme-dark {
-    --rs-color-focus-ring: 0 0 0 3px rgba(52, 195, 255, 0.25);
+    --rs-color-focus-ring: 0 0 0 2px rgba(52, 195, 255, 0.25);
     --rs-loader-ring: rgba(233, 235, 240, 0.3);
     --rs-loader-ring-inverse: rgba(233, 235, 240, 0.8);
   }
@@ -425,10 +425,8 @@
   border-color: var(--rs-btn-default-border-color);
 }
 .rs-btn:focus-visible {
-  outline: 3px solid var(--rs-color-focus-ring);
-}
-.rs-theme-high-contrast .rs-btn:focus-visible {
-  outline-offset: 2px;
+  outline: 2px solid var(--rs-color-focus-ring);
+  outline-offset: -1px;
 }
 .rs-btn:hover {
   color: var(--rs-btn-default-hover-text);
@@ -1101,18 +1099,14 @@
 .rs-theme-high-contrast .rs-input-group {
   transition: none;
 }
-.rs-input-group:not(.rs-input-group-disabled):hover,
 .rs-input-group:not(.rs-input-group-disabled).rs-input-group-focus,
 .rs-input-group:focus-within {
   border-color: var(--rs-input-focus-border);
 }
 .rs-input-group:not(.rs-input-group-disabled).rs-input-group-focus,
 .rs-input-group:focus-within {
-  outline: 3px solid var(--rs-color-focus-ring);
-}
-.rs-theme-high-contrast .rs-input-group:not(.rs-input-group-disabled).rs-input-group-focus,
-.rs-theme-high-contrast .rs-input-group:focus-within {
-  outline-offset: 2px;
+  outline: 2px solid var(--rs-color-focus-ring);
+  outline-offset: -1px;
 }
 .rs-input-group .rs-input-group {
   outline: none !important;
@@ -1121,7 +1115,7 @@
 .rs-input-group .rs-input-group-btn {
   height: var(--rs-input-group-input-height);
 }
-.rs-input-group .rs-input-number,
+.rs-input-group .rs-number-input,
 .rs-input-group .rs-input-group-addon,
 .rs-input-group .rs-input-group-btn,
 .rs-input-group .rs-picker[data-picker='date'] .rs-picker-toggle {

package/InputGroup/styles/index.less

@@ -57,9 +57,8 @@
     transition: none;
   });
 
-  // Hover and Focus States
-  // Apply special styles when the input group is hovered or focused
-  &:not(.rs-input-group-disabled):hover,
+  // Focus States
+  // Apply special styles when the input group is focused
   &:not(.rs-input-group-disabled).rs-input-group-focus,
   &:focus-within {
     border-color: var(--rs-input-focus-border);
@@ -83,7 +82,7 @@
 
   // Child Component Styles
   // Remove borders and border radius from child components
-  .rs-input-number,
+  .rs-number-input,
   .rs-input-group-addon,
   .rs-input-group-btn,
   .rs-picker[data-picker='date'] .rs-picker-toggle {

package/InputNumber/styles/index.css

@@ -94,6 +94,7 @@
   --rs-text-secondary: var(--rs-gray-600);
   --rs-text-disabled: var(--rs-gray-600);
   --rs-border-primary: var(--rs-gray-200);
+  --rs-border-secondary: var(--rs-gray-100);
   --rs-color-focus-ring: rgb(from var(--rs-primary-500) r g b / 25%);
   --rs-btn-default-bg: var(--rs-gray-50);
   --rs-btn-default-text: var(--rs-gray-800);
@@ -211,7 +212,8 @@
   --rs-text-secondary: var(--rs-gray-200);
   --rs-text-disabled: var(--rs-gray-400);
   --rs-border-primary: var(--rs-gray-600);
-  --rs-color-focus-ring: 0 0 0 3px rgb(from var(--rs-gray-500) r g b / 25%);
+  --rs-border-secondary: var(--rs-gray-700);
+  --rs-color-focus-ring: 0 0 0 2px rgb(from var(--rs-gray-500) r g b / 25%);
   --rs-btn-default-bg: var(--rs-gray-600);
   --rs-btn-default-text: var(--rs-gray-50);
   --rs-btn-default-border-color: var(--rs-gray-700);
@@ -250,7 +252,7 @@
 }
 @supports not (color: rgb(from white r g b)) {
   .rs-theme-dark {
-    --rs-color-focus-ring: 0 0 0 3px rgba(52, 195, 255, 0.25);
+    --rs-color-focus-ring: 0 0 0 2px rgba(52, 195, 255, 0.25);
     --rs-loader-ring: rgba(233, 235, 240, 0.3);
     --rs-loader-ring-inverse: rgba(233, 235, 240, 0.8);
   }
@@ -327,6 +329,7 @@
   --rs-text-secondary: var(--rs-gray-200);
   --rs-text-disabled: var(--rs-gray-400);
   --rs-border-primary: var(--rs-gray-100);
+  --rs-border-secondary: var(--rs-gray-700);
   --rs-color-focus-ring: var(--rs-gray-0);
   --rs-btn-default-bg: transparent;
   --rs-btn-default-text: var(--rs-primary-500);
@@ -413,23 +416,17 @@
 .rs-input::placeholder {
   color: var(--rs-text-secondary);
 }
-.rs-input:focus,
-.rs-input:hover:not(:disabled) {
-  border-color: var(--rs-input-focus-border);
-}
 .rs-input:focus {
-  outline: 3px solid var(--rs-color-focus-ring);
+  border-color: var(--rs-input-focus-border);
 }
-.rs-theme-high-contrast .rs-input:focus {
-  outline-offset: 2px;
+.rs-input:focus-visible {
+  outline: 2px solid var(--rs-color-focus-ring);
+  outline-offset: -1px;
 }
 .rs-input:disabled {
   background-color: var(--rs-input-disabled-bg);
   color: var(--rs-text-disabled);
 }
-textarea.rs-input {
-  height: auto;
-}
 .rs-input.rs-input-xs {
   --rs-input-font-size: var(--rs-input-font-size-xs);
   --rs-input-line-height: var(--rs-input-line-height-xs);
@@ -454,10 +451,6 @@ textarea.rs-input {
   --rs-input-padding-block: var(--rs-input-padding-block-lg);
   --rs-input-padding-inline: var(--rs-input-padding-inline-lg);
 }
-textarea.rs-input {
-  overflow: auto;
-  resize: vertical;
-}
 :root {
   --rs-btn-size-xs: 1.5rem;
   --rs-btn-size-sm: 1.875rem;
@@ -515,10 +508,8 @@ textarea.rs-input {
   border-color: var(--rs-btn-default-border-color);
 }
 .rs-btn:focus-visible {
-  outline: 3px solid var(--rs-color-focus-ring);
-}
-.rs-theme-high-contrast .rs-btn:focus-visible {
-  outline-offset: 2px;
+  outline: 2px solid var(--rs-color-focus-ring);
+  outline-offset: -1px;
 }
 .rs-btn:hover {
   color: var(--rs-btn-default-hover-text);
@@ -1191,18 +1182,14 @@ textarea.rs-input {
 .rs-theme-high-contrast .rs-input-group {
   transition: none;
 }
-.rs-input-group:not(.rs-input-group-disabled):hover,
 .rs-input-group:not(.rs-input-group-disabled).rs-input-group-focus,
 .rs-input-group:focus-within {
   border-color: var(--rs-input-focus-border);
 }
 .rs-input-group:not(.rs-input-group-disabled).rs-input-group-focus,
 .rs-input-group:focus-within {
-  outline: 3px solid var(--rs-color-focus-ring);
-}
-.rs-theme-high-contrast .rs-input-group:not(.rs-input-group-disabled).rs-input-group-focus,
-.rs-theme-high-contrast .rs-input-group:focus-within {
-  outline-offset: 2px;
+  outline: 2px solid var(--rs-color-focus-ring);
+  outline-offset: -1px;
 }
 .rs-input-group .rs-input-group {
   outline: none !important;
@@ -1211,7 +1198,7 @@ textarea.rs-input {
 .rs-input-group .rs-input-group-btn {
   height: var(--rs-input-group-input-height);
 }
-.rs-input-group .rs-input-number,
+.rs-input-group .rs-number-input,
 .rs-input-group .rs-input-group-addon,
 .rs-input-group .rs-input-group-btn,
 .rs-input-group .rs-picker[data-picker='date'] .rs-picker-toggle {
@@ -1345,33 +1332,40 @@ textarea.rs-input {
   border-radius: var(--rs-radius-none);
   font-size: var(--rs-input-group-font-size);
 }
-.rs-input-number {
+.rs-number-input {
   --rs-number-input-touchspin-font-size: var(--rs-font-size-xs);
   --rs-number-input-touchspin-height-xs: calc(calc(24px - 2px) / 2);
   --rs-number-input-touchspin-height-sm: calc(calc(30px - 2px) / 2);
   --rs-number-input-touchspin-height-md: calc(calc(36px - 2px) / 2);
   --rs-number-input-touchspin-height-lg: calc(calc(42px - 2px) / 2);
-  background-color: var(--rs-input-bg);
 }
-.rs-input-number.rs-input-group-xs {
+.rs-number-input.rs-input-group {
+  width: auto;
+}
+.rs-number-input.rs-input-group-xs {
   --rs-number-input-touchspin-height: var(--rs-number-input-touchspin-height-xs);
+  --rs-number-input-icon-height: calc(var(--rs-number-input-touchspin-height) - 0px);
 }
-.rs-input-number.rs-input-group-sm {
+.rs-number-input.rs-input-group-sm {
   --rs-number-input-touchspin-height: var(--rs-number-input-touchspin-height-sm);
+  --rs-number-input-icon-height: calc(var(--rs-number-input-touchspin-height) - 2px);
 }
-.rs-input-number.rs-input-group-md {
+.rs-number-input.rs-input-group-md {
   --rs-number-input-touchspin-height: var(--rs-number-input-touchspin-height-md);
+  --rs-number-input-icon-height: calc(var(--rs-number-input-touchspin-height) - 4px);
 }
-.rs-input-number.rs-input-group-lg {
+.rs-number-input.rs-input-group-lg {
   --rs-number-input-touchspin-height: var(--rs-number-input-touchspin-height-lg);
+  --rs-number-input-icon-height: calc(var(--rs-number-input-touchspin-height) - 6px);
 }
-.rs-input-number-btn-group-vertical {
+.rs-number-input-btn-group-vertical {
+  border-left: 1px solid var(--rs-border-secondary);
   position: relative;
   width: 20px;
   flex: 0 0 20px;
   display: block;
 }
-.rs-input-number-btn-group-vertical > .rs-btn {
+.rs-number-input-btn-group-vertical > .rs-btn {
   display: block;
   float: none;
   width: 100%;
@@ -1379,30 +1373,30 @@ textarea.rs-input {
   position: relative;
   border: none;
 }
-.rs-input-number .rs-input-number-touchspin-up,
-.rs-input-number .rs-input-number-touchspin-down {
+.rs-number-input .rs-number-input-touchspin-up,
+.rs-number-input .rs-number-input-touchspin-down {
   position: relative;
   border-radius: var(--rs-radius-none);
   padding: 0;
   box-shadow: none !important;
   height: var(--rs-number-input-touchspin-height);
 }
-.rs-input-number .rs-input-number-touchspin-up > .rs-icon,
-.rs-input-number .rs-input-number-touchspin-down > .rs-icon {
+.rs-number-input .rs-number-input-touchspin-up > .rs-icon,
+.rs-number-input .rs-number-input-touchspin-down > .rs-icon {
   width: 100%;
   font-size: var(--rs-number-input-touchspin-font-size);
   color: var(--rs-text-secondary);
-  height: var(--rs-number-input-touchspin-height);
+  height: var(--rs-number-input-icon-height);
   display: flex;
   align-items: center;
   justify-content: center;
 }
-.rs-input-number input[type='number'] {
+.rs-number-input input[type='number'] {
   -webkit-appearance: textfield;
      -moz-appearance: textfield;
           appearance: textfield;
 }
-.rs-input-number input[type='number']::-webkit-inner-spin-button {
+.rs-number-input input[type='number']::-webkit-inner-spin-button {
   /* stylelint-disable */
   -webkit-appearance: none;
 }

package/InputNumber/styles/index.less

@@ -1,67 +1 @@
-@import '../../styles/common';
-@import '../../Input/styles/index';
-@import '../../InputGroup/styles/index';
-@import 'mixin';
-
-.rs-input-number {
-  --rs-number-input-touchspin-font-size: var(--rs-font-size-xs);
-  --rs-number-input-touchspin-height-xs: calc(calc(@input-height-extra-small - 2px) / 2);
-  --rs-number-input-touchspin-height-sm: calc(calc(@input-height-small - 2px) / 2);
-  --rs-number-input-touchspin-height-md: calc(calc(@input-height-base - 2px) / 2);
-  --rs-number-input-touchspin-height-lg: calc(calc(@input-height-large - 2px) / 2);
-
-  background-color: var(--rs-input-bg);
-
-  @sizes: xs, sm, md, lg;
-  each(@sizes, .(@size) {
-    &.rs-input-group-@{size} {
-      --rs-number-input-touchspin-height: var(~'--rs-number-input-touchspin-height-@{size}');
-    }
-  });
-
-  &-btn-group-vertical {
-    position: relative;
-    width: 20px;
-    flex: 0 0 20px;
-    display: block;
-
-    & > .rs-btn {
-      display: block;
-      float: none;
-      width: 100%;
-      max-width: 100%;
-      position: relative;
-      border: none;
-    }
-  }
-
-  .rs-input-number-touchspin-up,
-  .rs-input-number-touchspin-down {
-    position: relative;
-     border-radius: var(--rs-radius-none);
-    padding: 0;
-    box-shadow: none !important;
-    height: var(--rs-number-input-touchspin-height);
-
-    > .rs-icon {
-      width: 100%;
-      font-size: var(--rs-number-input-touchspin-font-size);
-      color: var(--rs-text-secondary);
-      height: var(--rs-number-input-touchspin-height);
-      display: flex;
-      align-items: center;
-      justify-content: center;
-    }
-  }
-
-  // Reset Input Number styling
-  // Reference https://stackoverflow.com/questions/26024771/styling-a-input-type-number#answer-40189766
-  input[type='number'] {
-    appearance: textfield;
-
-    &::-webkit-inner-spin-button {
-      /* stylelint-disable */
-      -webkit-appearance: none;
-    }
-  }
-}
+@import '../../NumberInput/styles/index.less';