rsuite 6.0.0-canary-20250416 → 6.0.0-canary-20250507

package/Cascader/styles/index.css

@@ -105,8 +105,7 @@
   --rs-border-primary: var(--rs-gray-200);
   --rs-bg-overlay: var(--rs-gray-0);
   --rs-color-focus-ring: rgb(from var(--rs-primary-500) r g b / 25%);
-  --rs-state-focus-shadow: 0 0 0 3px rgb(from var(--rs-primary-500) r g b / 25%);
-  --rs-state-error-outline: 3px solid rgb(from var(--rs-color-red) r g b / 25%);
+  --rs-state-error-outline: 2px solid rgb(from var(--rs-color-red) r g b / 25%);
   --rs-btn-default-bg: var(--rs-gray-50);
   --rs-btn-default-text: var(--rs-gray-800);
   --rs-btn-default-border-color: var(--rs-gray-200);
@@ -150,7 +149,6 @@
   --rs-listbox-option-selected-text: var(--rs-primary-700);
   --rs-listbox-option-selected-bg: var(--rs-primary-50);
   --rs-listbox-option-disabled-text: var(--rs-gray-400);
-  --rs-close-button-hover-color: var(--rs-color-red);
   --rs-picker-value: var(--rs-primary-700);
   --rs-picker-count-bg: var(--rs-primary-500);
   --rs-picker-count-text: #fff;
@@ -161,7 +159,6 @@
   :root,
   .rs-theme-light {
     --rs-color-focus-ring: rgba(52, 152, 255, 0.25);
-    --rs-state-focus-shadow: 0 0 0 3px rgba(52, 152, 255, 0.25);
     --rs-loader-ring: rgba(247, 247, 250, 0.8);
     --rs-loader-backdrop: rgba(255, 255, 255, 0.9);
     --rs-loader-ring-inverse: rgba(247, 247, 250, 0.3);
@@ -247,9 +244,8 @@
   --rs-text-disabled: var(--rs-gray-400);
   --rs-border-primary: var(--rs-gray-600);
   --rs-bg-overlay: var(--rs-gray-700);
-  --rs-color-focus-ring: 0 0 0 3px rgb(from var(--rs-gray-500) r g b / 25%);
-  --rs-state-focus-shadow: 0 0 0 3px rgb(from var(--rs-gray-500) r g b / 25%);
-  --rs-state-error-outline: 3px solid rgb(from var(--rs-color-red) r g b / 25%);
+  --rs-color-focus-ring: 0 0 0 2px rgb(from var(--rs-gray-500) r g b / 25%);
+  --rs-state-error-outline: 2px solid rgb(from var(--rs-color-red) 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);
@@ -293,15 +289,13 @@
   --rs-listbox-option-selected-text: var(--rs-primary-500);
   --rs-listbox-option-selected-bg: rgb(from var(--rs-primary-900) r g b / 20%);
   --rs-listbox-option-disabled-text: var(--rs-gray-500);
-  --rs-close-button-hover-color: var(--rs-color-red);
   --rs-picker-value: var(--rs-primary-500);
   --rs-picker-count-bg: var(--rs-primary-700);
   --rs-picker-count-text: #fff;
 }
 @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-state-focus-shadow: 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-backdrop: rgba(15, 19, 26, 0.83);
     --rs-loader-ring-inverse: rgba(233, 235, 240, 0.8);
@@ -389,8 +383,7 @@
   --rs-border-primary: var(--rs-gray-100);
   --rs-bg-overlay: var(--rs-gray-800);
   --rs-color-focus-ring: var(--rs-gray-0);
-  --rs-state-focus-shadow: 0 0 0 3px var(--rs-gray-900), 0 0 0 5px var(--rs-gray-0);
-  --rs-state-error-outline: 3px solid rgb(from var(--rs-color-red) r g b / 25%);
+  --rs-state-error-outline: 2px solid rgb(from var(--rs-color-red) r g b / 25%);
   --rs-btn-default-bg: transparent;
   --rs-btn-default-text: var(--rs-primary-500);
   --rs-btn-default-border-color: var(--rs-primary-500);
@@ -435,7 +428,6 @@
   --rs-listbox-option-selected-text: var(--rs-primary-500);
   --rs-listbox-option-selected-bg: transparent;
   --rs-listbox-option-disabled-text: var(--rs-gray-500);
-  --rs-close-button-hover-color: var(--rs-color-red);
   --rs-picker-value: var(--rs-primary-500);
   --rs-picker-count-bg: var(--rs-primary-500);
   --rs-picker-count-text: var(--rs-gray-900);
@@ -476,29 +468,25 @@
   color: var(--rs-listbox-option-hover-text);
 }
 .rs-theme-high-contrast .rs-cascade-search-view-row:hover {
-  outline: 3px solid var(--rs-color-focus-ring);
+  outline: 2px solid var(--rs-color-focus-ring);
+  outline-offset: -1px;
   outline-offset: -3px;
   outline-width: 2px;
   color: var(--rs-listbox-option-hover-text);
   text-decoration: underline;
 }
-.rs-theme-high-contrast .rs-theme-high-contrast .rs-cascade-search-view-row:hover {
-  outline-offset: 2px;
-}
 .rs-cascade-search-view-row.rs-cascade-search-view-row-focus {
   background-color: var(--rs-listbox-option-hover-bg);
   color: var(--rs-listbox-option-hover-text);
 }
 .rs-theme-high-contrast .rs-cascade-search-view-row.rs-cascade-search-view-row-focus {
-  outline: 3px solid var(--rs-color-focus-ring);
+  outline: 2px solid var(--rs-color-focus-ring);
+  outline-offset: -1px;
   outline-offset: -3px;
   outline-width: 2px;
   color: var(--rs-listbox-option-hover-text);
   text-decoration: underline;
 }
-.rs-theme-high-contrast .rs-theme-high-contrast .rs-cascade-search-view-row.rs-cascade-search-view-row-focus {
-  outline-offset: 2px;
-}
 .rs-cascade-search-view-row:disabled,
 .rs-cascade-search-view-row.rs-cascade-search-view-row-disabled {
   color: var(--rs-listbox-option-disabled-text);
@@ -566,17 +554,13 @@
 .rs-theme-high-contrast .rs-cascade-tree-item:hover,
 .rs-theme-high-contrast .rs-cascade-tree-item:focus,
 .rs-theme-high-contrast .rs-cascade-tree-item.rs-cascade-tree-item-focus {
-  outline: 3px solid var(--rs-color-focus-ring);
+  outline: 2px solid var(--rs-color-focus-ring);
+  outline-offset: -1px;
   outline-offset: -3px;
   outline-width: 2px;
   color: var(--rs-listbox-option-hover-text);
   text-decoration: underline;
 }
-.rs-theme-high-contrast .rs-theme-high-contrast .rs-cascade-tree-item:hover,
-.rs-theme-high-contrast .rs-theme-high-contrast .rs-cascade-tree-item:focus,
-.rs-theme-high-contrast .rs-theme-high-contrast .rs-cascade-tree-item.rs-cascade-tree-item-focus {
-  outline-offset: 2px;
-}
 .rs-cascade-tree-item.rs-cascade-tree-item-active {
   background-color: var(--rs-listbox-option-selected-bg);
   font-weight: bold;
@@ -662,10 +646,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);
@@ -1567,15 +1549,12 @@
 .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);
@@ -1660,18 +1639,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;
@@ -1680,7 +1655,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 {
@@ -1824,15 +1799,6 @@
 .rs-btn-close .rs-icon {
   vertical-align: bottom;
 }
-.rs-btn-close:hover,
-.rs-btn-close:focus {
-  color: var(--rs-close-button-hover-color);
-}
-.rs-btn-close:hover svg path,
-.rs-btn-close:focus svg path {
-  stroke: var(--rs-close-button-hover-color);
-  stroke-width: 1;
-}
 .rs-picker[data-variant='subtle'] .picker-subtle-toggle {
   --rs-picker-toggle-border-width: 0px;
   position: relative;
@@ -1841,12 +1807,10 @@
 .rs-picker[data-variant='subtle'][data-disabled='true'] .picker-subtle-toggle {
   cursor: not-allowed;
 }
-.rs-picker[data-variant='subtle'][data-disabled='true'] .picker-subtle-toggle:hover,
 .rs-picker[data-variant='subtle'][data-disabled='true'] .picker-subtle-toggle:focus,
 .rs-picker[data-variant='subtle'][data-disabled='true'] .picker-subtle-toggle:active {
   background: none;
 }
-.rs-picker[data-variant='subtle'][data-disabled='true'] .picker-subtle-toggle:hover::after,
 .rs-picker[data-variant='subtle'][data-disabled='true'] .picker-subtle-toggle:focus::after,
 .rs-picker[data-variant='subtle'][data-disabled='true'] .picker-subtle-toggle:active::after {
   display: none;
@@ -1856,6 +1820,7 @@
   --rs-picker-loader-size: 20px;
   --rs-picker-toggle-border-width: 1px;
   --rs-picker-toggle-bg: var(--rs-input-bg);
+  --rs-picker-toggle-border-color: var(--rs-border-primary);
   display: inline-block;
   vertical-align: middle;
   max-width: 100%;
@@ -1875,6 +1840,9 @@
 .rs-picker[data-disabled='true'] .rs-picker-value-count {
   opacity: 0.5;
 }
+.rs-picker[data-disabled='true'] .rs-picker-toggle {
+  pointer-events: none;
+}
 .rs-picker-toggle .rs-picker-toggle-placeholder {
   color: var(--rs-text-secondary);
 }
@@ -1897,13 +1865,14 @@
 .rs-picker-value-separator {
   margin: 0 var(--rs-spacing) 0 0;
 }
-.rs-picker:not([data-disabled='true']):hover,
 .rs-picker.rs-picker-focused {
   border-color: var(--rs-input-focus-border);
 }
 .rs-picker-toggle-active,
 .rs-picker.rs-picker-focused {
-  box-shadow: var(--rs-state-focus-shadow);
+  --rs-picker-toggle-border-color: var(--rs-input-focus-border);
+  outline: 2px solid var(--rs-color-focus-ring);
+  outline-offset: -1px;
 }
 .rs-picker-label.rs-input-group-addon {
   color: var(--rs-text-primary);
@@ -2012,12 +1981,13 @@
 }
 [data-variant='default'] .rs-picker-toggle {
   color: var(--rs-text-primary);
-  border: var(--rs-picker-toggle-border-width) solid var(--rs-border-primary);
+  border-width: var(--rs-picker-toggle-border-width);
+  border-color: var(--rs-picker-toggle-border-color);
+  border-style: solid;
 }
 [data-disabled='true'] .rs-picker-toggle {
   cursor: not-allowed;
 }
-.rs-picker-toggle [data-variant='default']:not([data-disabled='true']):hover,
 .rs-picker-toggle [data-variant='default']:not([data-disabled='true']):focus {
   border-color: var(--rs-input-focus-border);
 }
@@ -2029,12 +1999,10 @@
 .rs-picker[data-variant='subtle'][data-disabled='true'] .rs-picker-toggle {
   cursor: not-allowed;
 }
-.rs-picker[data-variant='subtle'][data-disabled='true'] .rs-picker-toggle:hover,
 .rs-picker[data-variant='subtle'][data-disabled='true'] .rs-picker-toggle:focus,
 .rs-picker[data-variant='subtle'][data-disabled='true'] .rs-picker-toggle:active {
   background: none;
 }
-.rs-picker[data-variant='subtle'][data-disabled='true'] .rs-picker-toggle:hover::after,
 .rs-picker[data-variant='subtle'][data-disabled='true'] .rs-picker-toggle:focus::after,
 .rs-picker[data-variant='subtle'][data-disabled='true'] .rs-picker-toggle:active::after {
   display: none;
@@ -2087,12 +2055,7 @@
 .rs-theme-high-contrast .rs-picker-toggle {
   transition: none;
 }
-.rs-picker-toggle .rs-picker[data-variant='default']:hover,
-:not([data-disabled='true']) .rs-picker-toggle:hover,
-.rs-picker-toggle .rs-picker[data-variant='default']:focus,
-:not([data-disabled='true']) .rs-picker-toggle:focus,
-.rs-picker-toggle .rs-picker[data-variant='default']-active,
-:not([data-disabled='true']) .rs-picker-toggle-active {
+.rs-picker-toggle .rs-picker[data-variant='default']:focus {
   border-color: var(--rs-input-focus-border);
 }
 .rs-picker[data-variant='subtle'] .rs-picker-toggle {
@@ -2153,15 +2116,13 @@
   align-items: center;
 }
 .rs-picker-toggle-indicator .rs-picker-clean {
-  display: inline-flex;
-  align-items: center;
-  height: 20px;
-  font-size: var(--rs-font-size-sm);
-  background: inherit;
   color: var(--rs-text-secondary);
   transition: 0.2s color linear;
   cursor: pointer;
 }
+.rs-picker-toggle-indicator .rs-picker-clean:hover {
+  color: var(--rs-text-primary);
+}
 .rs-picker-toggle-indicator .rs-picker-clean.rs-btn-close {
   padding: 0;
 }
@@ -2199,17 +2160,13 @@
 .rs-theme-high-contrast .rs-check-item:not(.rs-checkbox-disabled):hover,
 .rs-theme-high-contrast .rs-check-item:focus,
 .rs-theme-high-contrast .rs-check-item.rs-check-item-focus {
-  outline: 3px solid var(--rs-color-focus-ring);
+  outline: 2px solid var(--rs-color-focus-ring);
+  outline-offset: -1px;
   outline-offset: -3px;
   outline-width: 2px;
   color: var(--rs-listbox-option-hover-text);
   text-decoration: underline;
 }
-.rs-theme-high-contrast .rs-theme-high-contrast .rs-check-item:not(.rs-checkbox-disabled):hover,
-.rs-theme-high-contrast .rs-theme-high-contrast .rs-check-item:focus,
-.rs-theme-high-contrast .rs-theme-high-contrast .rs-check-item.rs-check-item-focus {
-  outline-offset: 2px;
-}
 .rs-theme-high-contrast .rs-check-item:not(.rs-checkbox-disabled):hover .rs-check-tree-node-text-wrapper,
 .rs-theme-high-contrast .rs-check-item:focus .rs-check-tree-node-text-wrapper,
 .rs-theme-high-contrast .rs-check-item.rs-check-item-focus .rs-check-tree-node-text-wrapper {

package/CheckPicker/styles/index.css

@@ -105,8 +105,7 @@
   --rs-border-primary: var(--rs-gray-200);
   --rs-bg-overlay: var(--rs-gray-0);
   --rs-color-focus-ring: rgb(from var(--rs-primary-500) r g b / 25%);
-  --rs-state-focus-shadow: 0 0 0 3px rgb(from var(--rs-primary-500) r g b / 25%);
-  --rs-state-error-outline: 3px solid rgb(from var(--rs-color-red) r g b / 25%);
+  --rs-state-error-outline: 2px solid rgb(from var(--rs-color-red) r g b / 25%);
   --rs-btn-default-bg: var(--rs-gray-50);
   --rs-btn-default-text: var(--rs-gray-800);
   --rs-btn-default-border-color: var(--rs-gray-200);
@@ -152,7 +151,6 @@
   --rs-checkbox-border: var(--rs-gray-300);
   --rs-checkbox-checked-bg: var(--rs-primary-500);
   --rs-checkbox-disabled-bg: var(--rs-gray-50);
-  --rs-close-button-hover-color: var(--rs-color-red);
   --rs-picker-value: var(--rs-primary-700);
   --rs-picker-count-bg: var(--rs-primary-500);
   --rs-picker-count-text: #fff;
@@ -163,7 +161,6 @@
   :root,
   .rs-theme-light {
     --rs-color-focus-ring: rgba(52, 152, 255, 0.25);
-    --rs-state-focus-shadow: 0 0 0 3px rgba(52, 152, 255, 0.25);
     --rs-loader-ring: rgba(247, 247, 250, 0.8);
     --rs-loader-backdrop: rgba(255, 255, 255, 0.9);
     --rs-loader-ring-inverse: rgba(247, 247, 250, 0.3);
@@ -249,9 +246,8 @@
   --rs-text-disabled: var(--rs-gray-400);
   --rs-border-primary: var(--rs-gray-600);
   --rs-bg-overlay: var(--rs-gray-700);
-  --rs-color-focus-ring: 0 0 0 3px rgb(from var(--rs-gray-500) r g b / 25%);
-  --rs-state-focus-shadow: 0 0 0 3px rgb(from var(--rs-gray-500) r g b / 25%);
-  --rs-state-error-outline: 3px solid rgb(from var(--rs-color-red) r g b / 25%);
+  --rs-color-focus-ring: 0 0 0 2px rgb(from var(--rs-gray-500) r g b / 25%);
+  --rs-state-error-outline: 2px solid rgb(from var(--rs-color-red) 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);
@@ -297,15 +293,13 @@
   --rs-checkbox-border: var(--rs-gray-400);
   --rs-checkbox-checked-bg: var(--rs-primary-500);
   --rs-checkbox-disabled-bg: var(--rs-gray-500);
-  --rs-close-button-hover-color: var(--rs-color-red);
   --rs-picker-value: var(--rs-primary-500);
   --rs-picker-count-bg: var(--rs-primary-700);
   --rs-picker-count-text: #fff;
 }
 @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-state-focus-shadow: 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-backdrop: rgba(15, 19, 26, 0.83);
     --rs-loader-ring-inverse: rgba(233, 235, 240, 0.8);
@@ -392,8 +386,7 @@
   --rs-border-primary: var(--rs-gray-100);
   --rs-bg-overlay: var(--rs-gray-800);
   --rs-color-focus-ring: var(--rs-gray-0);
-  --rs-state-focus-shadow: 0 0 0 3px var(--rs-gray-900), 0 0 0 5px var(--rs-gray-0);
-  --rs-state-error-outline: 3px solid rgb(from var(--rs-color-red) r g b / 25%);
+  --rs-state-error-outline: 2px solid rgb(from var(--rs-color-red) r g b / 25%);
   --rs-btn-default-bg: transparent;
   --rs-btn-default-text: var(--rs-primary-500);
   --rs-btn-default-border-color: var(--rs-primary-500);
@@ -440,7 +433,6 @@
   --rs-checkbox-border: var(--rs-gray-100);
   --rs-checkbox-checked-bg: var(--rs-primary-500);
   --rs-checkbox-disabled-bg: var(--rs-gray-500);
-  --rs-close-button-hover-color: var(--rs-color-red);
   --rs-picker-value: var(--rs-primary-500);
   --rs-picker-count-bg: var(--rs-primary-500);
   --rs-picker-count-text: var(--rs-gray-900);
@@ -476,7 +468,8 @@
   color: var(--rs-text-disabled);
 }
 .rs-checkbox [type='checkbox']:focus-visible ~ .rs-checkbox-inner::before {
-  box-shadow: var(--rs-state-focus-shadow);
+  outline: 2px solid var(--rs-color-focus-ring);
+  outline-offset: -1px;
 }
 .rs-checkbox-checker {
   position: relative;
@@ -667,10 +660,8 @@ label:hover .rs-checkbox-control .rs-checkbox-inner::before {
   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);
@@ -1572,15 +1563,12 @@ label:hover .rs-checkbox-control .rs-checkbox-inner::before {
 .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);
@@ -1665,18 +1653,14 @@ label:hover .rs-checkbox-control .rs-checkbox-inner::before {
 .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;
@@ -1685,7 +1669,7 @@ label:hover .rs-checkbox-control .rs-checkbox-inner::before {
 .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 {
@@ -1835,15 +1819,6 @@ label:hover .rs-checkbox-control .rs-checkbox-inner::before {
 .rs-btn-close .rs-icon {
   vertical-align: bottom;
 }
-.rs-btn-close:hover,
-.rs-btn-close:focus {
-  color: var(--rs-close-button-hover-color);
-}
-.rs-btn-close:hover svg path,
-.rs-btn-close:focus svg path {
-  stroke: var(--rs-close-button-hover-color);
-  stroke-width: 1;
-}
 .rs-picker[data-variant='subtle'] .picker-subtle-toggle {
   --rs-picker-toggle-border-width: 0px;
   position: relative;
@@ -1852,12 +1827,10 @@ label:hover .rs-checkbox-control .rs-checkbox-inner::before {
 .rs-picker[data-variant='subtle'][data-disabled='true'] .picker-subtle-toggle {
   cursor: not-allowed;
 }
-.rs-picker[data-variant='subtle'][data-disabled='true'] .picker-subtle-toggle:hover,
 .rs-picker[data-variant='subtle'][data-disabled='true'] .picker-subtle-toggle:focus,
 .rs-picker[data-variant='subtle'][data-disabled='true'] .picker-subtle-toggle:active {
   background: none;
 }
-.rs-picker[data-variant='subtle'][data-disabled='true'] .picker-subtle-toggle:hover::after,
 .rs-picker[data-variant='subtle'][data-disabled='true'] .picker-subtle-toggle:focus::after,
 .rs-picker[data-variant='subtle'][data-disabled='true'] .picker-subtle-toggle:active::after {
   display: none;
@@ -1867,6 +1840,7 @@ label:hover .rs-checkbox-control .rs-checkbox-inner::before {
   --rs-picker-loader-size: 20px;
   --rs-picker-toggle-border-width: 1px;
   --rs-picker-toggle-bg: var(--rs-input-bg);
+  --rs-picker-toggle-border-color: var(--rs-border-primary);
   display: inline-block;
   vertical-align: middle;
   max-width: 100%;
@@ -1886,6 +1860,9 @@ label:hover .rs-checkbox-control .rs-checkbox-inner::before {
 .rs-picker[data-disabled='true'] .rs-picker-value-count {
   opacity: 0.5;
 }
+.rs-picker[data-disabled='true'] .rs-picker-toggle {
+  pointer-events: none;
+}
 .rs-picker-toggle .rs-picker-toggle-placeholder {
   color: var(--rs-text-secondary);
 }
@@ -1908,13 +1885,14 @@ label:hover .rs-checkbox-control .rs-checkbox-inner::before {
 .rs-picker-value-separator {
   margin: 0 var(--rs-spacing) 0 0;
 }
-.rs-picker:not([data-disabled='true']):hover,
 .rs-picker.rs-picker-focused {
   border-color: var(--rs-input-focus-border);
 }
 .rs-picker-toggle-active,
 .rs-picker.rs-picker-focused {
-  box-shadow: var(--rs-state-focus-shadow);
+  --rs-picker-toggle-border-color: var(--rs-input-focus-border);
+  outline: 2px solid var(--rs-color-focus-ring);
+  outline-offset: -1px;
 }
 .rs-picker-label.rs-input-group-addon {
   color: var(--rs-text-primary);
@@ -2023,12 +2001,13 @@ label:hover .rs-checkbox-control .rs-checkbox-inner::before {
 }
 [data-variant='default'] .rs-picker-toggle {
   color: var(--rs-text-primary);
-  border: var(--rs-picker-toggle-border-width) solid var(--rs-border-primary);
+  border-width: var(--rs-picker-toggle-border-width);
+  border-color: var(--rs-picker-toggle-border-color);
+  border-style: solid;
 }
 [data-disabled='true'] .rs-picker-toggle {
   cursor: not-allowed;
 }
-.rs-picker-toggle [data-variant='default']:not([data-disabled='true']):hover,
 .rs-picker-toggle [data-variant='default']:not([data-disabled='true']):focus {
   border-color: var(--rs-input-focus-border);
 }
@@ -2040,12 +2019,10 @@ label:hover .rs-checkbox-control .rs-checkbox-inner::before {
 .rs-picker[data-variant='subtle'][data-disabled='true'] .rs-picker-toggle {
   cursor: not-allowed;
 }
-.rs-picker[data-variant='subtle'][data-disabled='true'] .rs-picker-toggle:hover,
 .rs-picker[data-variant='subtle'][data-disabled='true'] .rs-picker-toggle:focus,
 .rs-picker[data-variant='subtle'][data-disabled='true'] .rs-picker-toggle:active {
   background: none;
 }
-.rs-picker[data-variant='subtle'][data-disabled='true'] .rs-picker-toggle:hover::after,
 .rs-picker[data-variant='subtle'][data-disabled='true'] .rs-picker-toggle:focus::after,
 .rs-picker[data-variant='subtle'][data-disabled='true'] .rs-picker-toggle:active::after {
   display: none;
@@ -2098,12 +2075,7 @@ label:hover .rs-checkbox-control .rs-checkbox-inner::before {
 .rs-theme-high-contrast .rs-picker-toggle {
   transition: none;
 }
-.rs-picker-toggle .rs-picker[data-variant='default']:hover,
-:not([data-disabled='true']) .rs-picker-toggle:hover,
-.rs-picker-toggle .rs-picker[data-variant='default']:focus,
-:not([data-disabled='true']) .rs-picker-toggle:focus,
-.rs-picker-toggle .rs-picker[data-variant='default']-active,
-:not([data-disabled='true']) .rs-picker-toggle-active {
+.rs-picker-toggle .rs-picker[data-variant='default']:focus {
   border-color: var(--rs-input-focus-border);
 }
 .rs-picker[data-variant='subtle'] .rs-picker-toggle {
@@ -2164,15 +2136,13 @@ label:hover .rs-checkbox-control .rs-checkbox-inner::before {
   align-items: center;
 }
 .rs-picker-toggle-indicator .rs-picker-clean {
-  display: inline-flex;
-  align-items: center;
-  height: 20px;
-  font-size: var(--rs-font-size-sm);
-  background: inherit;
   color: var(--rs-text-secondary);
   transition: 0.2s color linear;
   cursor: pointer;
 }
+.rs-picker-toggle-indicator .rs-picker-clean:hover {
+  color: var(--rs-text-primary);
+}
 .rs-picker-toggle-indicator .rs-picker-clean.rs-btn-close {
   padding: 0;
 }
@@ -2210,17 +2180,13 @@ label:hover .rs-checkbox-control .rs-checkbox-inner::before {
 .rs-theme-high-contrast .rs-check-item:not(.rs-checkbox-disabled):hover,
 .rs-theme-high-contrast .rs-check-item:focus,
 .rs-theme-high-contrast .rs-check-item.rs-check-item-focus {
-  outline: 3px solid var(--rs-color-focus-ring);
+  outline: 2px solid var(--rs-color-focus-ring);
+  outline-offset: -1px;
   outline-offset: -3px;
   outline-width: 2px;
   color: var(--rs-listbox-option-hover-text);
   text-decoration: underline;
 }
-.rs-theme-high-contrast .rs-theme-high-contrast .rs-check-item:not(.rs-checkbox-disabled):hover,
-.rs-theme-high-contrast .rs-theme-high-contrast .rs-check-item:focus,
-.rs-theme-high-contrast .rs-theme-high-contrast .rs-check-item.rs-check-item-focus {
-  outline-offset: 2px;
-}
 .rs-theme-high-contrast .rs-check-item:not(.rs-checkbox-disabled):hover .rs-check-tree-node-text-wrapper,
 .rs-theme-high-contrast .rs-check-item:focus .rs-check-tree-node-text-wrapper,
 .rs-theme-high-contrast .rs-check-item.rs-check-item-focus .rs-check-tree-node-text-wrapper {