amis-ui 2.9.0 → 3.1.0

package/scss/components/_menu.scss

@@ -3,77 +3,99 @@
     background-color: var(--Menu-dark-backgroundColor);
 
     .#{$ns}Nav-Menu-item {
-      color: var(--Menu-dark-fontColor);
+      @include item-dark();
 
-      .#{$ns}Nav-Menu-item-icon,
-      .#{$ns}Nav-Menu-item-label {
-        color: var(--Menu-dark-fontColor);
+      &-active,
+      &-selected {
+        @include item-active-dark();
       }
+    }
 
-      &-active {
-        background-color: var(--Menu-dark-backgroundColor);
-        color: var(--Menu-dark-fontColor-onHover);
+    .#{$ns}Nav-Menu-submenu-title {
+      @include item-dark();
+    }
 
-        .#{$ns}Nav-Menu-item-icon,
-        .#{$ns}Nav-Menu-item-label {
-          color: var(--Menu-dark-fontColor-onHover);
-        }
+    .#{$ns}Nav-Menu-submenu-active,
+    .#{$ns}Nav-Menu-submenu-selected {
+      > .#{$ns}Nav-Menu-submenu-title {
+        @include item-active-dark();
       }
+    }
+  }
+}
 
-      &-selected {
-        background-color: var(--Menu-dark-backgroundColor);
-        color: var(--Menu-dark-ancestor-fontColor-onActive) !important;
+@mixin item-dark {
+  color: var(--Menu-dark-fontColor);
 
-        .#{$ns}Nav-Menu-item-icon,
-        .#{$ns}Nav-Menu-item-label {
-          color: var(--Menu-dark-ancestor-fontColor-onActive) !important;
-        }
-      }
+  .#{$ns}Nav-Menu-item-icon,
+  .#{$ns}Nav-Menu-item-icon-after,
+  .#{$ns}Nav-Menu-item-label,
+  .#{$ns}Nav-Menu-submenu-arrow {
+    color: var(--Menu-dark-fontColor);
+
+    svg {
+      fill: var(--Menu-dark-fontColor);
     }
+  }
+}
 
-    .#{$ns}Nav-Menu-submenu-dark {
-      .#{$ns}Nav-Menu-submenu-title {
-        color: var(--Menu-dark-fontColor);
+@mixin item-selected-dark {
+  color: var(--Menu-dark-fontColor-onActive);
 
-        .#{$ns}Nav-Menu-item-icon,
-        .#{$ns}Nav-Menu-item-label,
-        .#{$ns}Nav-Menu-submenu-arrow {
-          color: var(--Menu-dark-fontColor);
-        }
+  .#{$ns}Nav-Menu-item-icon,
+  .#{$ns}Nav-Menu-item-icon-after,
+  .#{$ns}Nav-Menu-item-label,
+  .#{$ns}Nav-Menu-submenu-arrow {
+    color: var(--Menu-dark-fontColor-onActive);
 
-        &:hover {
-          .#{$ns}Nav-Menu-item-label,
-          .#{$ns}Nav-Menu-item-icon,
-          .#{$ns}Nav-Menu-submenu-arrow {
-            color: var(--Menu-dark-fontColor-onHover);
-          }
-        }
-      }
+    svg {
+      fill: var(--Menu-dark-fontColor-onActive);
     }
+  }
+}
 
-    .#{$ns}Nav-Menu-submenu-active {
-      .#{$ns}Nav-Menu-submenu-title {
-        background-color: var(--Menu-dark-backgroundColor);
-        color: var(--Menu-dark-fontColor-onActive);
+@mixin item-active-dark {
+  background-color: var(--Menu-dark-backgroundColor);
+  color: var(--Menu-dark-fontColor-onHover);
 
-        .#{$ns}Nav-Menu-item-icon,
-        .#{$ns}Nav-Menu-item-label {
-          color: var(--Menu-dark-fontColor-onActive);
-        }
-      }
+  .#{$ns}Nav-Menu-item-icon,
+  .#{$ns}Nav-Menu-item-icon-after,
+  .#{$ns}Nav-Menu-item-label,
+  .#{$ns}Nav-Menu-submenu-arrow {
+    color: var(--Menu-dark-fontColor-onHover);
+
+    svg {
+      fill: currentColor;
     }
+  }
+}
 
-    .#{$ns}Nav-Menu-submenu-selected {
-      .#{$ns}Nav-Menu-submenu-title {
-        background-color: var(--Menu-dark-backgroundColor);
-        color: var(--Menu-dark-ancestor-fontColor-onActive);
+@mixin item-selected {
+  color: var(--Menu-light-fontColor-onHover);
 
-        .#{$ns}Nav-Menu-item-icon,
-        .#{$ns}Nav-Menu-item-label,
-        .#{$ns}Nav-Menu-submenu-arrow {
-          color: var(--Menu-dark-ancestor-fontColor-onActive);
-        }
-      }
+  .#{$ns}Nav-Menu-item-label,
+  .#{$ns}Nav-Menu-item-icon,
+  .#{$ns}Nav-Menu-item-icon-after,
+  .#{$ns}Nav-Menu-submenu-arrow {
+    color: var(--Menu-light-fontColor-onHover);
+
+    svg {
+      fill: currentColor;
+    }
+  }
+}
+
+@mixin item-active {
+  color: var(--Menu-light-fontColor-onActive);
+
+  .#{$ns}Nav-Menu-item-label,
+  .#{$ns}Nav-Menu-item-icon,
+  .#{$ns}Nav-Menu-item-icon-after,
+  .#{$ns}Nav-Menu-submenu-arrow {
+    color: var(--Menu-light-fontColor-onActive);
+
+    svg {
+      fill: currentColor;
     }
   }
 }
@@ -97,18 +119,12 @@
 .#{$ns}Nav-Menu {
   --Menu-width: var(--Layout-aside-width);
   --Menu-width--collapsed: var(--Layout-aside-width-collapsed);
-  --Menu-fontSize: var(--Nav-item-fontSize);
   --Menu-fontSize--collapsed: var(--Nav-item-collapsed-fontSize);
-  --Menu-fontWeight: var(--Nav-item-fontWeight);
   --Menu-fontColor-onDisabled: var(--Nav-item-fontColor-onDisabled);
-  --Menu-item-height--vertical: #{px2rem(40px)};
-  --Menu-item-height--horizontal: var(--Nav-Item-height--horizontal);
-  --Menu-Submenu-title-paddingX: var(--Layout-paddingX);
   --Menu-Submenu-item-paddingX: var(--Nav-Item-Badge-paddingRight);
 
-  --Menu-icon-size: var(--Layout-icon-size);
-
   --Menu-light-backgroundColor: var(--Layout-light-backgroundColor);
+  --Menu-light-active-backgroundColor: var(--colors-neutral-fill-12);
   --Menu-light-backgroundColor-onHover: var(--Layout-light-bgColor-onHover);
   --Menu-light-fontColor: var(--Layout-light-fontColor);
   --Menu-light-fontColor-onHover: var(--Layout-fontColor--onHover);
@@ -121,32 +137,21 @@
   --Menu-dark-backgroundColor-onHover: var(--Layout-fontColor--info);
   --Menu-dark-fontColor: var(--Layout-dark-fontColor);
   --Menu-dark-fontColor-onHover: var(--Layout-fontColor--onHover);
-  --Menu-dark-ancestor-fontColor-onActive: var(--Layout-fontColor--onActive);
   --Menu-dark-fontColor-onActive: var(--Layout-dark-fontColor);
   --Menu-dark-groupTitle-fontColor: #84868c;
   --Menu-dark-selectedIndicator-color: var(--Layout-dark-selected-color);
 
   outline: none;
-  margin-bottom: 0;
-  margin-top: 0;
-  padding-left: 0; // Override default ul/ol
-  padding-right: 0; // Override default ul/ol in RTL direction
+  margin: 0;
+  padding: 0;
   list-style: none;
-  color: var(--Menu-light-fontColor);
-  background-color: var(--Menu-light-backgroundColor);
   transition: all 0.3s;
   width: 100%;
 
-  &.#{$ns}Nav-Menu-dark {
-    color: var(--Menu-dark-fontColor);
+  &-dark {
     background-color: var(--Menu-dark-backgroundColor);
   }
 
-  &.#{$ns}Nav-Menu-light {
-    color: var(--Menu-light-fontColor);
-    background-color: var(--Menu-light-backgroundColor);
-  }
-
   &-horizontal {
     display: flex;
     flex-wrap: nowrap;
@@ -162,10 +167,6 @@
     flex: none;
   }
 
-  &-rtl {
-    direction: rtl;
-  }
-
   &-hidden {
     display: none;
   }
@@ -179,10 +180,6 @@
     width: var(--Menu-width--collapsed);
   }
 
-  &-disabled {
-    cursor: not-allowed;
-  }
-
   &-root.#{$ns}Nav-Menu-collapsed {
     .#{$ns}Nav-Menu-item,
     .#{$ns}Nav-Menu-submenu-title {
@@ -192,11 +189,20 @@
   }
 
   &-item-link {
-    display: flex;
-    align-items: center;
-    height: var(--Nav-Item-height);
-    flex-grow: 1;
+    max-width: var(--Menu-width);
+    white-space: nowrap;
     overflow: hidden;
+    text-overflow: ellipsis;
+    color: inherit;
+    font-size: inherit;
+    flex: 1;
+    cursor: inherit;
+    font-weight: inherit;
+
+    &:hover,
+    &:active {
+      font-size: inherit;
+    }
   }
 
   &-item-divider {
@@ -207,15 +213,19 @@
     }
   }
 
-  &-item-icon {
-    margin-right: var(--gap-sm);
-    font-size: var(--Menu-icon-size);
-    color: var(--Menu-light-fontColor);
-
-    img {
+  &-item-icon,
+  &-item-icon-after {
+    img,
+    svg {
+      width: var(--Tabs-linkFontSize);
       height: var(--Tabs-linkFontSize);
       vertical-align: middle;
+      fill: currentColor;
     }
+  }
+
+  &-item-icon {
+    margin-right: var(--gap-sm);
 
     &-collapsed {
       font-size: var(--Menu-fontSize--collapsed);
@@ -226,31 +236,17 @@
       &-collapsed {
         font-size: var(--Menu-fontSize--collapsed);
         margin: 0 auto;
-        height: var(--Menu-item-height--vertical);
       }
     }
+  }
 
-    .#{$ns}Nav-Menu-dark & {
-      color: var(--Menu-dark-fontColor);
-    }
-
-    .#{$ns}Nav-Menu-light & {
-      color: var(--Menu-light-fontColor);
-    }
+  // 悬浮菜单是挂在body下面的
+  &-item-icon-after {
+    margin-right: 0;
+    margin-left: var(--gap-sm);
   }
 
   &-item-label {
-    opacity: 0.95;
-    font-size: var(--Menu-fontSize);
-    color: var(--Menu-light-fontColor);
-    font-weight: var(--Menu-fontWeight);
-    padding: 0;
-    text-align: left;
-    display: inline-block;
-    max-width: var(--Menu-width);
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
     user-select: none;
 
     &-collapsed {
@@ -258,14 +254,6 @@
       margin: 0 auto;
       font-weight: 600;
     }
-
-    .#{$ns}Nav-Menu-dark & {
-      color: var(--Menu-dark-fontColor);
-    }
-
-    .#{$ns}Nav-Menu-light & {
-      color: var(--Menu-light-fontColor);
-    }
   }
 
   &-item-dragBar {
@@ -278,6 +266,7 @@
   &-item-group-list {
     margin: 0;
     padding: 0;
+    list-style: none;
   }
 
   &-item-group-title {
@@ -290,64 +279,15 @@
     &.#{$ns}Nav-Menu-dark {
       color: var(--Menu-dark-groupTitle-fontColor);
     }
-
-    &.#{$ns}Nav-Menu-light {
-      color: var(--Menu-light-groupTitle-fontColor);
-    }
-  }
-
-  &-item-active,
-  &-submenu-active {
-    background-color: var(--Menu-light-backgroundColor);
-    color: var(--Menu-light-fontColor-onActive);
-
-    .#{$ns}Nav-Menu-dark & {
-      background-color: var(--Menu-dark-backgroundColor);
-      color: var(--Menu-dark-fontColor-onActive);
-    }
-
-    .#{$ns}Nav-Menu-light & {
-      background-color: var(--Menu-light-backgroundColor);
-      color: var(--Menu-light-fontColor-onActive);
-    }
-  }
-
-  &-item-selected {
-    background-color: var(--Menu-light-backgroundColor);
-    // fix chrome render bug
-    transform: translateZ(0);
-
-    .#{$ns}Nav-Menu-item-icon,
-    .#{$ns}Nav-Menu-item-label {
-      color: var(--Menu-light-fontColor-onActive) !important;
-    }
-
-    &.#{$ns}Nav-Menu-dark {
-      background-color: var(--Menu-dark-backgroundColor-onHover);
-
-      .#{$ns}Nav-Menu-item-icon,
-      .#{$ns}Menu-item-label {
-        color: var(--Menu-dark-fontColor-onActive) !important;
-      }
-    }
-
-    &.#{$ns}Nav-Menu-light {
-      background-color: var(--Menu-light-backgroundColor-onHover);
-
-      .#{$ns}Nav-Menu-item-icon,
-      .#{$ns}Nav-Menu-item-label {
-        color: var(--Menu-light-fontColor-onActive) !important;
-      }
-    }
   }
 
   &-item,
   &-submenu {
     .#{$ns}Badge {
       position: static;
-      flex: 1;
-      width: 0;
+      overflow: hidden;
       display: flex;
+      flex: 1;
     }
     .#{$ns}Nav-Menu-item-wrap {
       display: flex;
@@ -361,6 +301,7 @@
     .#{$ns}DropDown {
       > .#{$ns}Button {
         padding: 0;
+        color: inherit;
 
         > i {
           margin: 0;
@@ -371,90 +312,22 @@
 
   &-inline {
     .#{$ns}Nav-Menu-item-selected {
-      background-color: var(--Menu-light-backgroundColor-onHover);
+      background-color: var(--Menu-light-active-backgroundColor);
+      @include item-selected();
       @include selected-indicator(var(--Menu-light-selectedIndicator-color));
-
-      .#{$ns}Nav-Menu-item-icon,
-      .#{$ns}Nav-Menu-item-label {
-        color: var(--Menu-light-fontColor-onActive) !important;
-      }
     }
 
     &.#{$ns}Nav-Menu-dark {
       .#{$ns}Nav-Menu-item-selected {
         background-color: var(--Menu-dark-backgroundColor-onHover);
+        @include item-selected-dark();
         @include selected-indicator(var(--Menu-dark-selectedIndicator-color));
-
-        .#{$ns}Nav-Menu-item-icon,
-        .#{$ns}Nav-Menu-item-label {
-          color: var(--Menu-dark-fontColor-onActive) !important;
-        }
-      }
-    }
-
-    &.#{$ns}Nav-Menu-light {
-      .#{$ns}Nav-Menu-item-selected {
-        background-color: var(--Menu-light-backgroundColor-onHover);
-        @include selected-indicator(var(--Menu-light-selectedIndicator-color));
-
-        .#{$ns}Nav-Menu-item-icon,
-        .#{$ns}Nav-Menu-item-label {
-          color: var(--Menu-light-fontColor-onActive) !important;
-        }
-      }
-
-      .#{$ns}Nav-Menu-submenu-selected {
-        > .#{$ns}Nav-Menu-submenu-title {
-          .#{$ns}Nav-Menu-item-icon,
-          .#{$ns}Nav-Menu-item-label,
-          .#{$ns}Nav-Menu-submenu-arrow {
-            color: var(--Menu-light-fontColor-onActive) !important;
-          }
-        }
-      }
-    }
-  }
-
-  .#{$ns}Nav-Menu-dark {
-    .#{$ns}Nav-Menu-submenu-selected {
-      background-color: transparent;
-
-      & > .#{$ns}Nav-Menu-submenu-title {
-        color: var(--Menu-dark-ancestor-fontColor-onActive);
-
-        & > .#{$ns}Nav-Menu-item-label,
-        & > .#{$ns}Nav-Menu-item-icon {
-          color: var(--Menu-dark-ancestor-fontColor-onActive);
-        }
-
-        .#{$ns}Nav-Menu-item-label,
-        .#{$ns}Nav-Menu-item-icon {
-          color: var(--Menu-dark-ancestor-fontColor-onActive);
-        }
       }
     }
   }
 
-  .#{$ns}Nav-Menu-light {
-    .#{$ns}Nav-Menu-submenu-selected {
-      & > .#{$ns}Nav-Menu-submenu-title {
-        color: var(--Menu-light-ancestor-fontColor-onActive);
-
-        .#{$ns}Nav-Menu-item-label,
-        .#{$ns}Nav-Menu-item-icon {
-          color: var(--Menu-light-ancestor-fontColor-onActive);
-        }
-      }
-    }
-  }
-
-  & > li.#{$ns}Nav-Menu-submenu {
-    padding: 0;
-  }
-
   &-vertical.#{$ns}Nav-Menu-sub {
     min-width: 160px;
-    margin-top: 0;
     border-radius: 2px;
     box-shadow: 0 4px 5px 0 rgba(21, 26, 38, 0.06),
       0 1px 10px 0 rgba(21, 26, 38, 0.05), 0 2px 4px -1px rgba(21, 26, 38, 0.04);
@@ -465,59 +338,78 @@
     margin: 0;
     position: relative;
     padding: 0 px2rem(16px);
-    line-height: var(--Nav-Item-height);
     display: block;
     white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;
-    color: var(--Menu-light-fontColor);
 
-    &:hover {
-      .#{$ns}Nav-Menu-item-label,
-      .#{$ns}Nav-Menu-item-icon,
-      .#{$ns}Nav-Menu-submenu-arrow {
-        color: var(--Menu-light-fontColor-onHover);
-      }
+    &:active {
+      @include item-active();
+    }
+  }
+
+  &-submenu-title {
+    display: flex;
+    justify-content: space-between;
+
+    .#{$ns}Nav-Menu-item-wrap {
+      flex: 1;
+      overflow: hidden;
+    }
+  }
+
+  &-item-active {
+    @include item-selected();
+
+    .#{$ns}Nav-Menu-item-dragBar {
+      visibility: visible;
+    }
+  }
+
+  &-item-selected {
+    @include item-selected();
+  }
+
+  .#{$ns}Nav-Menu-submenu-active {
+    > .#{$ns}Nav-Menu-submenu-title {
+      @include item-selected();
 
       .#{$ns}Nav-Menu-item-dragBar {
         visibility: visible;
       }
     }
+  }
 
-    .#{$ns}Nav-Menu-dark & {
-      color: var(--Menu-dark-fontColor);
-      background-color: var(--Menu-dark-backgroundColor);
+  .#{$ns}Nav-Menu-submenu-selected {
+    > .#{$ns}Nav-Menu-submenu-title {
+      @include item-selected();
+    }
+  }
 
-      &:hover {
-        .#{$ns}Nav-Menu-item-label,
-        .#{$ns}Nav-Menu-item-icon,
-        .#{$ns}Nav-Menu-submenu-arrow {
-          color: var(--Menu-dark-fontColor-onHover);
-        }
-      }
+  &-dark {
+    .#{$ns}Nav-Menu-item,
+    .#{$ns}Nav-Menu-submenu-title {
+      @include item-dark();
     }
 
-    .#{$ns}Nav-Menu-light & {
-      color: var(--Menu-light-fontColor);
-      background-color: var(--Menu-light-backgroundColor);
+    .#{$ns}Nav-Menu-item-active {
+      @include item-active-dark();
+    }
 
-      &:hover {
-        .#{$ns}Nav-Menu-item-label,
-        .#{$ns}Nav-Menu-item-icon,
-        .#{$ns}Nav-Menu-submenu-arrow {
-          color: var(--Menu-light-fontColor-onHover);
-        }
-      }
+    .#{$ns}Nav-Menu-item-selected {
+      @include item-active-dark();
     }
 
-    .#{$ns}Nav-Menu-rtl & {
-      padding: 7px 16px 7px 7px;
+    .#{$ns}Nav-Menu-submenu-active {
+      > .#{$ns}Nav-Menu-submenu-title {
+        @include item-active-dark();
+      }
     }
 
-    // Disabled state sets text to gray and nukes hover/tab effects
-    &.#{$ns}Nav-Menu-item-disabled,
-    &.#{$ns}Nav-Menu-submenu-disabled {
-      color: #777 !important;
+    .#{$ns}Nav-Menu-submenu-selected {
+      > .#{$ns}Nav-Menu-submenu-title {
+        @include item-active-dark();
+      }
     }
   }
 
@@ -536,22 +428,26 @@
     margin: 0 16px 4px 16px;
     overflow: hidden;
     padding: 0;
-    line-height: 0;
     background-color: #ebebeb;
   }
 
   &-submenu {
     &-popup {
-      position: absolute;
+      position: absolute !important;
       z-index: 1500;
-    }
-
-    > .#{$ns}Nav-Menu {
-      background-color: var(--Menu-light-backgroundColor);
-    }
+      background-color: var(--Layout-light-backgroundColor);
+      line-height: var(--Nav-Item-height);
+      cursor: pointer;
 
-    &.#{$ns}Nav-Menu-submenu-dark > .#{$ns}Nav-Menu {
-      background-color: var(--Menu-dark-backgroundColor);
+      // 横向收纳模式且有子菜单项的情况下 会显示2个展开箭头
+      // 用css隐藏1个 自适应收纳的情况下 判断不出是子菜单项还是收纳项
+      .#{$ns}Nav-Menu-submenu-title {
+        .#{$ns}Nav-Menu-item-link {
+          .#{$ns}Nav-Menu-submenu-arrow {
+            display: none;
+          }
+        }
+      }
     }
   }
 
@@ -559,39 +455,15 @@
     @include popup-dark();
   }
 
-  .#{$ns}Nav-Menu-submenu-title,
-  .#{$ns}Nav-Menu-item {
-    cursor: pointer;
-
-    .anticon {
-      width: 14px;
-      height: 14px;
-      margin-right: 8px;
-      top: -1px;
-
-      .#{$ns}Nav-Menu-rtl & {
-        margin-right: 0;
-        margin-left: 8px;
-      }
-    }
-  }
-
   &-overflow {
     &-item-rest {
       .#{$ns}Nav-Menu-submenu-title {
         margin: 0;
       }
-
-      .#{$ns}Nav-Menu-item-icon {
-        display: initial;
-        position: static;
-      }
     }
   }
 
   &-horizontal {
-    height: var(--Menu-item-height--horizontal);
-    background-color: var(--Menu-light-backgroundColor);
     border: none;
     white-space: nowrap;
     overflow: hidden;
@@ -607,139 +479,61 @@
       > .#{$ns}Nav-Menu-submenu-title {
       .#{$ns}Nav-Menu-overflowedIcon {
         margin-right: 0;
-      }
-    }
-
-    &.#{$ns}Nav-Menu-dark {
-      background-color: var(--Menu-dark-backgroundColor);
-    }
-
-    &.#{$ns}Nav-Menu-light {
-      background-color: var(--Menu-light-backgroundColor);
-    }
-
-    & > .#{$ns}Nav-Menu-item-tooltip-wrap > .#{$ns}Nav-Menu-item,
-    & > .#{$ns}Nav-Menu-submenu > .#{$ns}Nav-Menu-submenu-title {
-      padding: 0 px2rem(16px);
-      height: var(--Menu-item-height--horizontal);
-
-      .#{$ns}Nav-Menu-item-link {
-        height: var(--Menu-item-height--horizontal);
-      }
-
-      .#{$ns}Nav-Menu-item-icon,
-      .#{$ns}Nav-Menu-item-label {
-        line-height: var(--Menu-item-height--horizontal);
+        line-height: inherit; // 到了saas中 会被fortawesome的样式影响 因此需要覆盖一下
       }
     }
 
     .#{$ns}Nav-Menu-item.#{$ns}Nav-Menu-item-selected {
+      background: none;
       &:after {
         content: ' ';
         width: 100%;
         height: 2px;
-        background: var(--Menu-dark-ancestor-fontColor-onActive);
+        background: var(--Menu-light-fontColor-onHover);
         position: absolute;
         left: 0;
         bottom: 0;
       }
+      &:before {
+        display: none;
+      }
+      &:active {
+        &:after {
+          background: var(--Menu-light-fontColor-onActive);
+        }
+      }
     }
 
     & > .#{$ns}Nav-Menu-submenu,
     & > .#{$ns}Nav-Menu-item {
       margin: 0;
-      border-bottom: 2px solid transparent;
       display: inline-block;
       vertical-align: bottom;
-
-      &-active {
-        background-color: var(--Menu-light-backgroundColor);
-        color: var(--Menu-light-fontColor-onActive);
-      }
-
-      &-selected {
-        border-bottom: 2px solid var(--Menu-light-fontColor-onActive);
-        background-color: transparent;
-
-        .#{$ns}Nav-Menu-item-icon,
-        .#{$ns}Nav-Menu-item-label {
-          color: var(--Menu-light-fontColor-onActive);
-        }
-      }
-    }
-
-    &:after {
-      content: '\20';
-      display: block;
-      height: 0;
-      clear: both;
     }
 
     .#{$ns}Nav-Menu-submenu-arrow {
       display: inline-block;
       font-size: px2rem(9px);
-      text-align: center;
       vertical-align: middle;
       text-transform: none;
       text-rendering: auto;
       line-height: px2rem(20px);
-      margin-left: 5px;
-      color: var(--Menu-light-fontColor);
+      margin-left: px2rem(5px);
 
       & > svg {
         top: auto;
       }
     }
 
-    .#{$ns}Nav-Menu-item-label {
-      vertical-align: middle;
-    }
-
-    &.#{$ns}Nav-Menu-dark {
-      & > .#{$ns}Nav-Menu-submenu,
-      & > .#{$ns}Nav-Menu-item {
-        &-active {
-          background-color: var(--Menu-dark-backgroundColor);
-          color: var(--Menu-dark-fontColor-onActive);
-        }
-
-        &-selected {
-          border-bottom: 2px solid var(--Menu-dark-selectedIndicator-color);
-
-          .#{$ns}Nav-Menu-item-icon,
-          .#{$ns}Nav-Menu-item-label {
-            color: var(--Menu-dark-fontColor-onActive);
-          }
-        }
-      }
-
+    &.#{$ns}Nav-Menu-rtl {
       .#{$ns}Nav-Menu-submenu-arrow {
-        color: var(--Menu-dark-fontColor);
+        margin-left: 0;
+        margin-right: px2rem(5px);
       }
     }
 
-    &.#{$ns}Nav-Menu-light {
-      & > .#{$ns}Nav-Menu-submenu,
-      & > .#{$ns}Nav-Menu-item {
-        &-active {
-          background-color: var(--Menu-light-backgroundColor);
-          color: var(--Menu-light-fontColor-onActive);
-        }
-
-        &-selected {
-          border-bottom: 2px solid var(--Menu-light-selectedIndicator-color);
-
-          .#{$ns}Nav-Menu-item-icon,
-          .#{$ns}Nav-Menu-item-label,
-          .#{$ns}Nav-Menu-submenu-arrow {
-            color: var(--Menu-light-fontColor-onActive);
-          }
-        }
-      }
-
-      .#{$ns}Nav-Menu-submenu-arrow {
-        color: var(--Menu-light-fontColor);
-      }
+    .#{$ns}Nav-Menu-item-label {
+      vertical-align: middle;
     }
   }
 
@@ -747,79 +541,77 @@
   &-vertical-left,
   &-vertical-right,
   &-inline {
-    & > .#{$ns}Nav-Menu-item,
-    & > .#{$ns}Nav-Menu-submenu > .#{$ns}Nav-Menu-submenu-title {
-      .#{$ns}Nav-Menu-rtl & {
-        padding: 12px 24px 12px 8px;
-      }
-    }
-
     .#{$ns}Nav-Menu-submenu-arrow {
-      display: inline-block;
-      font-size: px2rem(9px);
-      vertical-align: baseline;
-      text-align: center;
-      text-transform: none;
-      text-rendering: auto;
-      position: absolute;
-      right: var(--Menu-Submenu-item-paddingX);
-      top: 0;
-      line-height: var(--Menu-item-height--vertical);
-
-      & > svg {
-        top: auto;
-      }
-
-      .#{$ns}Nav-Menu-rtl &,
-      .#{$ns}Nav-Menu-submenu-rtl & {
-        right: auto;
-        left: 16px;
-      }
+      font-size: px2rem(10px);
+      margin: 0 0 0 px2rem(10px);
     }
 
     &.#{$ns}Nav-Menu-expand-before {
       .#{$ns}Nav-Menu-submenu-title {
-        .#{$ns}Nav-Menu-item-wrap {
-          padding-right: 0;
-          padding-left: px2rem(16px);
+        flex-direction: row-reverse;
+
+        > .#{$ns}Nav-Menu-submenu-arrow {
+          margin: 0 px2rem(10px) 0 0;
         }
       }
+    }
 
-      .#{$ns}Nav-Menu-submenu-arrow {
-        right: auto;
+    &.#{$ns}Nav-Menu-rtl {
+      &.#{$ns}Nav-Menu-expand-before {
+        .#{$ns}Nav-Menu-submenu-title {
+          .#{$ns}Nav-Menu-item-wrap {
+            padding-right: px2rem(16px);
+            padding-left: 0;
+          }
+        }
       }
     }
+  }
 
-    &.#{$ns}Nav-Menu-dark {
+  &-inline {
+    &.#{$ns}Nav-Menu-rtl {
       .#{$ns}Nav-Menu-submenu-arrow {
-        color: var(--Menu-dark-fontColor);
+        margin: 0 px2rem(10px) 0 0;
+      }
+
+      &.#{$ns}Nav-Menu-expand-before {
+        .#{$ns}Nav-Menu-submenu-arrow {
+          margin: 0 0 0 px2rem(10px);
+        }
       }
     }
+  }
 
-    &.#{$ns}Nav-Menu-light {
+  &-vertical {
+    &.#{$ns}Nav-Menu-rtl {
       .#{$ns}Nav-Menu-submenu-arrow {
-        color: var(--Menu-light-fontColor);
+        margin: 0 0 0 px2rem(10px);
       }
     }
   }
 
   &-vertical-right {
-    .#{$ns}Nav-Menu-submenu-arrow {
-      right: px2rem(10px);
+    &.#{$ns}Nav-Menu-rtl {
+      .#{$ns}Nav-Menu-submenu-arrow {
+        margin: 0 px2rem(10px) 0 0;
+      }
     }
   }
 
   &-inline,
   &-horizontal {
     .#{$ns}Nav-Menu-submenu-arrow {
-      cursor: pointer;
-      transition: transform 0.3s;
-      transform: rotate(90deg);
+      svg {
+        transition: transform 0.3s;
+        transform: rotate(90deg);
+      }
     }
 
     & .#{$ns}Nav-Menu-submenu-open > .#{$ns}Nav-Menu-submenu-title {
       .#{$ns}Nav-Menu-submenu-arrow {
-        transform: rotate(270deg);
+        svg {
+          transform: rotate(270deg);
+        }
       }
     }
   }
@@ -827,7 +619,7 @@
   &-collapsed {
     .#{$ns}Nav-Menu-item {
       &-wrap {
-        overflow: hidden;
+        justify-content: center;
       }
     }
 
@@ -848,65 +640,13 @@
     }
   }
 
-  &-submenu-vertical.#{$ns}Nav-Menu-submenu,
-  &-submenu-vertical-left.#{$ns}Nav-Menu-submenu,
-  &-submenu-vertical-right.#{$ns}Nav-Menu-submenu {
-    padding: 0;
-
-    .#{$ns}Nav-Menu-submenu-rtl & {
-      direction: rtl;
-    }
-
-    &.#{$ns}Nav-Menu-submenu-selected {
-      & > .#{$ns}Nav-Menu-submenu-title {
-        color: var(--Menu-light-fontColor-onActive);
-      }
-
-      .#{$ns}Nav-Menu-item-icon,
-      .#{$ns}Nav-Menu-item-label,
-      .#{$ns}Nav-Menu-submenu-arrow {
-        color: var(--Menu-light-fontColor-onActive);
-      }
-    }
-  }
-
-  &-sub.#{$ns}Nav-Menu-inline {
-    padding: 0;
-    border: none;
-    border-radius: 0;
-    box-shadow: none;
-
-    & > .#{$ns}Nav-Menu-item,
-    & > .#{$ns}Nav-Menu-submenu > .#{$ns}Nav-Menu-submenu-title {
-      padding-top: 0;
-      padding-bottom: 0;
-      display: block;
-      white-space: nowrap;
-      overflow: hidden;
-      text-overflow: ellipsis;
-
-      .#{$ns}Nav-Menu-rtl & {
-        padding-left: 0;
-      }
-    }
-
-    &
-      > .#{$ns}Nav-Menu-submenu.#{$ns}Nav-Menu-submenu-dark.#{$ns}Nav-Menu-submenu-selected
-      > .#{$ns}Nav-Menu-submenu-title {
-      color: var(--Menu-dark-ancestor-fontColor-onActive);
-
-      .#{$ns}Nav-Menu-item-label,
-      .#{$ns}Nav-Menu-item-icon,
-      .#{$ns}Nav-Menu-submenu-arrow {
-        color: var(--Menu-dark-ancestor-fontColor-onActive);
-      }
-    }
-  }
-
   @mixin item-disabled {
     cursor: not-allowed;
     color: var(--Menu-fontColor-onDisabled) !important;
-    // pointer-events: none;
+
+    svg {
+      fill: currentColor !important;
+    }
   }
 
   .#{$ns}Nav-Menu-item-disabled,
@@ -924,6 +664,7 @@
     .#{$ns}Nav-Menu-submenu-title {
       @include item-disabled();
       & > .#{$ns}Nav-Menu-item-icon,
+      & > .#{$ns}Nav-Menu-item-icon-after,
       & > .#{$ns}Nav-Menu-item-label,
       & > .#{$ns}Nav-Menu-submenu-arrow {
         @include item-disabled();
@@ -931,124 +672,12 @@
     }
 
     .#{$ns}Nav-Menu-item-icon,
+    .#{$ns}Nav-Menu-item-icon-after,
     .#{$ns}Nav-Menu-item-label,
     .#{$ns}Nav-Menu-submenu-arrow {
       @include item-disabled();
     }
   }
-
-  @mixin effect {
-    animation-duration: 0.3s;
-    animation-fill-mode: both;
-    transform-origin: 0 0;
-  }
-
-  &-open {
-    &-slide-up-enter,
-    &-slide-up-appear {
-      @include effect;
-      opacity: 0;
-      animation-timing-function: cubic-bezier(0.08, 0.82, 0.17, 1);
-      animation-play-state: paused;
-    }
-
-    &-slide-up-leave {
-      @include effect;
-      opacity: 1;
-      animation-timing-function: cubic-bezier(0.6, 0.04, 0.98, 0.34);
-      animation-play-state: paused;
-    }
-
-    &-slide-up-enter &-slide-up-enter-active,
-    &-slide-up-appear &-slide-up-appear-active {
-      animation-name: rcMenuOpenSlideUpIn;
-      animation-play-state: running;
-    }
-
-    &-slide-up-leave &-slide-up-leave-active {
-      animation-name: rcMenuOpenSlideUpOut;
-      animation-play-state: running;
-    }
-
-    @keyframes rcMenuOpenSlideUpIn {
-      0% {
-        opacity: 0;
-        transform-origin: 0% 0%;
-        transform: scaleY(0);
-      }
-      100% {
-        opacity: 1;
-        transform-origin: 0% 0%;
-        transform: scaleY(1);
-      }
-    }
-    @keyframes rcMenuOpenSlideUpOut {
-      0% {
-        opacity: 1;
-        transform-origin: 0% 0%;
-        transform: scaleY(1);
-      }
-      100% {
-        opacity: 0;
-        transform-origin: 0% 0%;
-        transform: scaleY(0);
-      }
-    }
-
-    &-zoom-enter,
-    &-zoom-appear {
-      opacity: 0;
-      @include effect;
-      animation-timing-function: cubic-bezier(0.08, 0.82, 0.17, 1);
-      animation-play-state: paused;
-    }
-
-    &-zoom-leave {
-      @include effect;
-      animation-timing-function: cubic-bezier(0.6, 0.04, 0.98, 0.34);
-      animation-play-state: paused;
-    }
-
-    &-zoom-enter &-zoom-enter-active,
-    &-zoom-appear &-zoom-appear-active {
-      animation-name: rcMenuOpenZoomIn;
-      animation-play-state: running;
-    }
-
-    &-zoom-leave &-zoom-leave-active {
-      animation-name: rcMenuOpenZoomOut;
-      animation-play-state: running;
-    }
-
-    &-zoom-enter,
-    &-zoom-appear,
-    &-zoom-leave {
-      .#{$ns}Nav-Menu-submenu-rtl &,
-      .#{$ns}Nav-Menu-submenu-rtl & {
-        transform-origin: top right !important;
-      }
-    }
-
-    @keyframes rcMenuOpenZoomIn {
-      0% {
-        opacity: 0;
-        transform: scale(0, 0);
-      }
-      100% {
-        opacity: 1;
-        transform: scale(1, 1);
-      }
-    }
-    @keyframes rcMenuOpenZoomOut {
-      0% {
-        transform: scale(1, 1);
-      }
-      100% {
-        opacity: 0;
-        transform: scale(0, 0);
-      }
-    }
-  }
 }
 
 .#{$ns}Nav-Menu-item-tooltip {
@@ -1060,17 +689,7 @@
   box-shadow: 0px 4px 6px 0px rgb(8 14 26 / 6%),
     0px 1px 10px 0px rgb(8 14 26 / 5%), 0px 2px 4px -1px rgb(8 14 26 / 4%);
 
-  .#{$ns}Tooltip-body {
-    &,
-    span {
-      color: var(--Layout-light-fontColor);
-    }
-  }
-
   .#{$ns}Tooltip-arrow {
-    &:after {
-      left: px2rem(4px);
-    }
     &:before {
       display: none;
     }
@@ -1079,6 +698,12 @@
   &.#{$ns}Nav-Menu-item-tooltip-dark {
     background: var(--Layout-dark-tooltip-backgroundColor);
 
+    .#{$ns}Tooltip-arrow {
+      &:after {
+        border-right-color: var(--Layout-dark-tooltip-backgroundColor);
+      }
+    }
+
     .#{$ns}Tooltip-body {
       &,
       span {