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

package/AutoComplete/styles/index.css

@@ -104,8 +104,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);
@@ -146,7 +145,6 @@
   --rs-listbox-option-group-bg: var(--rs-gray-0);
   --rs-listbox-option-hover-bg: rgb(from var(--rs-primary-100) r g b / 50%);
   --rs-listbox-option-hover-text: var(--rs-primary-700);
-  --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;
@@ -157,7 +155,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);
@@ -242,9 +239,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);
@@ -285,15 +281,13 @@
   --rs-listbox-option-group-bg: var(--rs-gray-700);
   --rs-listbox-option-hover-bg: var(--rs-gray-600);
   --rs-listbox-option-hover-text: currentColor;
-  --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);
@@ -379,8 +373,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);
@@ -422,7 +415,6 @@
   --rs-listbox-option-group-bg: var(--rs-gray-800);
   --rs-listbox-option-hover-bg: transparent;
   --rs-listbox-option-hover-text: var(--rs-primary-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);
@@ -477,23 +469,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);
@@ -518,10 +504,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;
@@ -579,10 +561,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);
@@ -1255,18 +1235,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;
@@ -1275,7 +1251,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 {
@@ -1669,15 +1645,6 @@ textarea.rs-input {
 .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;
@@ -1686,12 +1653,10 @@ textarea.rs-input {
 .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;
@@ -1701,6 +1666,7 @@ textarea.rs-input {
   --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%;
@@ -1720,6 +1686,9 @@ textarea.rs-input {
 .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);
 }
@@ -1742,13 +1711,14 @@ textarea.rs-input {
 .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);
@@ -1857,12 +1827,13 @@ textarea.rs-input {
 }
 [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);
 }
@@ -1874,12 +1845,10 @@ textarea.rs-input {
 .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;
@@ -1932,12 +1901,7 @@ textarea.rs-input {
 .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 {
@@ -1998,15 +1962,13 @@ textarea.rs-input {
   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;
 }
@@ -2044,17 +2006,13 @@ textarea.rs-input {
 .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 {
@@ -2135,17 +2093,13 @@ textarea.rs-input {
 .rs-theme-high-contrast .rs-auto-complete-item:hover,
 .rs-theme-high-contrast .rs-auto-complete-item:focus,
 .rs-theme-high-contrast .rs-auto-complete-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-auto-complete-item:hover,
-.rs-theme-high-contrast .rs-theme-high-contrast .rs-auto-complete-item:focus,
-.rs-theme-high-contrast .rs-theme-high-contrast .rs-auto-complete-item-focus {
-  outline-offset: 2px;
-}
 .rs-auto-complete .rs-input:focus::-webkit-textfield-decoration-container {
   visibility: hidden;
   pointer-events: none;

package/Button/styles/index.css

@@ -199,7 +199,7 @@
   --rs-violet-700: #531ba8;
   --rs-violet-800: #470c99;
   --rs-violet-900: #390085;
-  --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);
@@ -235,7 +235,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);
   }
@@ -406,10 +406,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);

package/CHANGELOG.md

@@ -1,3 +1,18 @@
+# [5.80.0](https://github.com/rsuite/rsuite/compare/v5.79.1...v5.80.0) (2025-04-18)
+
+
+### Bug Fixes
+
+* **calendar:** adjust priority of weekStart over isoWeek ([#4234](https://github.com/rsuite/rsuite/issues/4234)) ([4697f22](https://github.com/rsuite/rsuite/commit/4697f221fef5d16edc4b8a18a7491aa7d2187a85))
+* **vite:** resolve circular dependency between chunks ([#4246](https://github.com/rsuite/rsuite/issues/4246)) ([9dca238](https://github.com/rsuite/rsuite/commit/9dca23899d007bcd204711da56c3a98323b87e7d))
+
+
+### Features
+
+* **InlineEdit:** enhance focus handling with TAB navigation support ([#4226](https://github.com/rsuite/rsuite/issues/4226)) ([18d4f6a](https://github.com/rsuite/rsuite/commit/18d4f6a4554fb7c07d6972563272fa67f0ebd1b4))
+
+
+
 ## [5.79.1](https://github.com/rsuite/rsuite/compare/v5.79.0...v5.79.1) (2025-04-03)
 
 

package/Calendar/styles/index.css

@@ -237,7 +237,7 @@
   --rs-bg-well: var(--rs-gray-900);
   --rs-bg-active: var(--rs-primary-700);
   --rs-state-hover-bg: 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);
@@ -281,7 +281,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);
     --rs-calendar-range-bg: rgba(0, 97, 153, 0.5);
@@ -475,10 +475,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);
@@ -1103,12 +1101,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;
@@ -1733,15 +1729,13 @@
   color: var(--rs-listbox-option-hover-text);
 }
 .rs-theme-high-contrast .rs-calendar-time-dropdown-cell: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-calendar-time-dropdown-cell:hover {
-  outline-offset: 2px;
-}
 .rs-calendar-time-dropdown-cell.rs-calendar-time-dropdown-cell-active {
   background-color: var(--rs-bg-active);
   color: var(--rs-calendar-date-selected-text);
@@ -1751,15 +1745,13 @@
   color: var(--rs-listbox-option-hover-text);
 }
 .rs-theme-high-contrast .rs-theme-high-contrast .rs-calendar-time-dropdown-cell.rs-calendar-time-dropdown-cell-active: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-theme-high-contrast .rs-calendar-time-dropdown-cell.rs-calendar-time-dropdown-cell-active:hover {
-  outline-offset: 2px;
-}
 .rs-calendar-time-dropdown-cell.rs-calendar-time-dropdown-cell-disabled {
   color: var(--rs-text-disabled);
   background: none;

package/CascadeTree/styles/index.css

@@ -58,7 +58,7 @@
   --rs-primary-700: #169de0;
   --rs-primary-900: #006199;
   --rs-text-primary: var(--rs-gray-50);
-  --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-listbox-option-hover-bg: var(--rs-gray-600);
   --rs-listbox-option-hover-text: currentColor;
   --rs-listbox-option-selected-text: var(--rs-primary-500);
@@ -67,7 +67,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-listbox-option-selected-bg: rgba(0, 97, 153, 0.2);
   }
 }
@@ -120,29 +120,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);
@@ -210,17 +206,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;