@kdcloudjs/kdesign 1.1.1 → 1.2.0

package/lib/menu/style/index.css

@@ -104,21 +104,25 @@
 /* 多行显示省略号 */
 /* 单行显示省略号 */
 /** 浮层箭头样式 **/
+.hover {
+  background-color: var(--kd-c-menu-sub-color-background, #121319);
+  color: var(--kd-c-menu-sub-color-text-hover, var(--kd-g-color-white, #fff));
+}
 .light-hover {
-  background-color: var(--kd-c-menu-light-color-background, #f5f5f5);
-  color: var(--kd-c-menu-light-color-hover, var(--kd-g-color-text-primary, #212121));
+  background-color: var(--kd-c-menu-light-color-background, var(--kd-g-color-background-ongoing, #f2f9ff));
+  color: var(--kd-c-menu-light-color-text-hover, var(--kd-g-color-ongoing, #276ff5));
 }
 .light-default {
-  color: var(--kd-c-menu-light-color, var(--kd-g-color-text-primary, #212121));
+  color: var(--kd-c-menu-light-color-text, var(--kd-g-color-text-primary, #212121));
   background: #ffffff;
 }
 .kd-menu {
   position: relative;
   width: 100%;
-  min-width: 138px;
   height: 100%;
+  min-width: 138px;
   background-color: var(--kd-c-menu-color-background, #343848);
-  color: var(--kd-c-menu-sub-color, rgba(255, 255, 255, 0.65));
+  color: var(--kd-c-menu-sub-color-text, rgba(255, 255, 255, 0.65));
 }
 .kd-menu-inline .kd-menu-item {
   white-space: nowrap;
@@ -131,9 +135,24 @@
 .kd-menu-inline .kd-menu-submenu {
   padding-right: 0;
 }
+.kd-menu-inline .kd-menu-submenu:not(.kd-menu-submenu-disabled):hover {
+  color: var(--kd-c-menu-inline-color-active, var(--kd-g-color-white, #fff));
+}
+.kd-menu-vertical .kd-menu-submenu:not(.kd-menu-submenu-disabled):hover,
+.kd-menu-vertical .kd-menu-submenu-hover {
+  background-color: var(--kd-c-menu-sub-color-background, #121319);
+  color: var(--kd-c-menu-sub-color-text-hover, var(--kd-g-color-white, #fff));
+}
 .kd-menu-vertical .kd-menu-submenu {
   padding-right: 0;
 }
+.kd-menu-vertical .kd-menu-submenu-sub {
+  background: var(--kd-c-menu-sub-color-background, #121319);
+}
+.kd-menu-vertical .kd-menu-submenu-sub .kd-menu-item:hover,
+.kd-menu-vertical .kd-menu-submenu-sub .kd-menu-item-active {
+  color: var(--kd-c-menu-sub-color-text-active, var(--kd-g-color-white, #fff));
+}
 .kd-menu-vertical .kd-menu-submenu-sub-second,
 .kd-menu-vertical .kd-menu-submenu-sub-third {
   -webkit-animation: kdZoomTopLeftIn calc(var(--kd-c-menu-motion-duration, var(--kd-g-duration, 0.3s)) - 0.1s) cubic-bezier(0, 0.4, 0.4, 1) forwards;
@@ -164,21 +183,42 @@
   min-width: auto;
 }
 .kd-menu-light {
-  color: var(--kd-c-menu-light-color, var(--kd-g-color-text-primary, #212121));
+  color: var(--kd-c-menu-light-color-text, var(--kd-g-color-text-primary, #212121));
   background: #ffffff;
 }
 .kd-menu-light .kd-menu-submenu-hover,
 .kd-menu-light .kd-menu-submenu-sub {
-  color: var(--kd-c-menu-light-color, var(--kd-g-color-text-primary, #212121));
+  color: var(--kd-c-menu-light-color-text, var(--kd-g-color-text-primary, #212121));
+  background: #ffffff;
+}
+.kd-menu-light .kd-menu-submenu-title:hover {
+  color: var(--kd-c-menu-light-color-text-hover, var(--kd-g-color-ongoing, #276ff5));
+}
+.kd-menu-light .kd-menu-submenu:not(.kd-menu-submenu-disabled):hover {
+  color: var(--kd-c-menu-light-color-text, var(--kd-g-color-text-primary, #212121));
   background: #ffffff;
 }
+.kd-menu-light .kd-menu-item-active {
+  background-color: var(--kd-c-menu-light-color-background, var(--kd-g-color-background-ongoing, #f2f9ff));
+  color: var(--kd-c-menu-light-color-text-hover, var(--kd-g-color-ongoing, #276ff5));
+}
 .kd-menu-light .kd-menu-item:not(.kd-menu-item-disabled):hover {
-  background-color: var(--kd-c-menu-light-color-background, #f5f5f5);
-  color: var(--kd-c-menu-light-color-hover, var(--kd-g-color-text-primary, #212121));
+  background-color: var(--kd-c-menu-light-color-background, var(--kd-g-color-background-ongoing, #f2f9ff));
+  color: var(--kd-c-menu-light-color-text-hover, var(--kd-g-color-ongoing, #276ff5));
 }
 .kd-menu-light.kd-menu-vertical .kd-menu-submenu-sub {
-  -webkit-box-shadow: 0 4px 10px 0 #f5f5f5;
-          box-shadow: 0 4px 10px 0 #f5f5f5;
+  -webkit-box-shadow: 0 3px 6px -4px rgba(0, 0, 0, 0.12), 0 6px 16px 0 rgba(0, 0, 0, 0.08), 0 9px 28px 8px rgba(0, 0, 0, 0.05);
+          box-shadow: 0 3px 6px -4px rgba(0, 0, 0, 0.12), 0 6px 16px 0 rgba(0, 0, 0, 0.08), 0 9px 28px 8px rgba(0, 0, 0, 0.05);
+}
+.kd-menu-light.kd-menu-vertical .kd-menu-item:not(.kd-menu-item-disabled):not(.kd-menu-item-active):hover {
+  color: var(--kd-c-menu-light-color-text-hover, var(--kd-g-color-ongoing, #276ff5));
+  background: #fff;
+  border: none;
+}
+.kd-menu-light.kd-menu-vertical .kd-menu-item-active {
+  color: var(--kd-c-menu-light-color-text-active, var(--kd-g-color-theme, #5582f3));
+  background-color: var(--kd-c-menu-light-color-background, var(--kd-g-color-background-ongoing, #f2f9ff));
+  border: none !important;
 }
 .kd-menu-item {
   position: relative;
@@ -235,6 +275,10 @@
   cursor: not-allowed;
   color: var(--kd-c-menu-color-disabled, var(--kd-g-color-disabled, #b2b2b2));
 }
+.kd-menu-item-active {
+  background-color: var(--kd-c-menu-sub-color-background, #121319);
+  color: var(--kd-c-menu-sub-color-text-hover, var(--kd-g-color-white, #fff));
+}
 .kd-menu-item-arrow {
   margin-left: auto;
   font-size: 16px;
@@ -255,6 +299,10 @@
   transition: transform calc(var(--kd-c-menu-motion-duration, var(--kd-g-duration, 0.3s)) - 0.1s) cubic-bezier(0.4, 0, 0.6, 1);
   transition: transform calc(var(--kd-c-menu-motion-duration, var(--kd-g-duration, 0.3s)) - 0.1s) cubic-bezier(0.4, 0, 0.6, 1), -webkit-transform calc(var(--kd-c-menu-motion-duration, var(--kd-g-duration, 0.3s)) - 0.1s) cubic-bezier(0.4, 0, 0.6, 1);
 }
+.kd-menu-item:not(.kd-menu-item-disabled):hover {
+  background-color: var(--kd-c-menu-sub-color-background, #121319);
+  color: var(--kd-c-menu-sub-color-text-hover, var(--kd-g-color-white, #fff));
+}
 .kd-menu-submenu {
   position: static;
   cursor: pointer;
@@ -310,6 +358,10 @@
   cursor: not-allowed;
   color: var(--kd-c-menu-color-disabled, var(--kd-g-color-disabled, #b2b2b2));
 }
+.kd-menu-submenu-active {
+  background-color: var(--kd-c-menu-sub-color-background, #121319);
+  color: var(--kd-c-menu-sub-color-text-hover, var(--kd-g-color-white, #fff));
+}
 .kd-menu-submenu-arrow {
   margin-left: auto;
   font-size: 16px;
@@ -330,10 +382,12 @@
   transition: transform calc(var(--kd-c-menu-motion-duration, var(--kd-g-duration, 0.3s)) - 0.1s) cubic-bezier(0.4, 0, 0.6, 1);
   transition: transform calc(var(--kd-c-menu-motion-duration, var(--kd-g-duration, 0.3s)) - 0.1s) cubic-bezier(0.4, 0, 0.6, 1), -webkit-transform calc(var(--kd-c-menu-motion-duration, var(--kd-g-duration, 0.3s)) - 0.1s) cubic-bezier(0.4, 0, 0.6, 1);
 }
+.kd-menu-submenu-hover {
+  color: var(--kd-c-menu-sub-color-text-hover, var(--kd-g-color-white, #fff));
+}
 .kd-menu-submenu-sub {
   line-height: var(--kd-c-menu-item-sizing-height, 50px);
-  color: var(--kd-c-menu-sub-color, rgba(255, 255, 255, 0.65));
-  min-width: 130px;
+  color: var(--kd-c-menu-sub-color-text, rgba(255, 255, 255, 0.65));
 }
 .kd-menu-submenu-thrid {
   display: -webkit-box;
@@ -342,6 +396,7 @@
   max-width: 810px;
   max-height: 492px;
   padding-left: 24px;
+  background: var(--kd-c-menu-sub-color-background, #121319);
   -ms-flex-wrap: wrap;
       flex-wrap: wrap;
   overflow-y: auto;
@@ -412,6 +467,9 @@
   overflow: hidden;
   text-overflow: ellipsis;
 }
+.kd-menu-submenu-thrid-list > li:hover {
+  color: var(--kd-c-menu-sub-color-text-active, var(--kd-g-color-white, #fff));
+}
 .kd-menu-submenu-thrid-list > li > span {
   white-space: nowrap;
   overflow: hidden;
@@ -421,108 +479,12 @@
   height: auto;
 }
 .kd-menu-submenu-thrid-list > .kd-menu-item-active {
-  color: var(--kd-c-menu-sub-color-active, var(--kd-g-color-white, #fff));
-}
-.kd-menu-dark .kd-menu-item:not(.kd-menu-item-disabled) :hover,
-.kd-menu-dark .kd-menu-submenu:not(.kd-menu-submenu-hover) :hover {
-  background: var(--kd-c-menu-sub-base-color-background-hover, #1f212b);
-  color: var(--kd-c-menu-sub-color-hover, var(--kd-g-color-white, #fff));
-}
-.kd-menu-dark.kd-menu-inline > ul > li.kd-menu-submenu .kd-menu-submenu-sub {
-  background: var(--kd-c-menu-sub-base-color-background-hover, #1f212b);
-  color: var(--kd-c-menu-sub-base-color-hover, #b2b3b7);
-}
-.kd-menu-dark.kd-menu-inline > ul > li.kd-menu-submenu .kd-menu-submenu-sub :hover {
-  background: var(--kd-c-menu-sub-color-background-hover, #121319) !important;
-  color: var(--kd-c-menu-sub-color-hover, var(--kd-g-color-white, #fff));
-}
-.kd-menu-dark .kd-menu-item.kd-menu-item-active {
-  background: var(--kd-c-menu-sub-base-color-background-hover, #1f212b);
-  color: var(--kd-c-menu-sub-color-hover, var(--kd-g-color-white, #fff));
+  color: var(--kd-c-menu-sub-color-text-active, var(--kd-g-color-white, #fff));
 }
 .kd-menu-dark .kd-menu-submenu-sub {
-  background: var(--kd-c-menu-sub-base-color-background-hover, #1f212b);
-  color: var(--kd-c-menu-sub-base-color-hover, #b2b3b7);
-}
-.kd-menu-dark .kd-menu-submenu .kd-menu-item.kd-menu-item-active {
-  background: var(--kd-c-menu-sub-color-background-hover, #121319) !important;
-  color: var(--kd-c-menu-sub-color-hover, var(--kd-g-color-white, #fff));
-}
-.kd-menu-dark > .kd-menu-submenu :hover {
-  background: var(--kd-c-menu-sub-base-color-background-hover, #1f212b);
-  color: var(--kd-c-menu-sub-color-hover, var(--kd-g-color-white, #fff));
-}
-.kd-menu-dark > .kd-menu-item:not(.kd-menu-item-disabled) :hover,
-.kd-menu-dark .kd-menu-submenu-collapsed :hover {
-  background: var(--kd-c-menu-sub-base-color-background-hover, #1f212b);
-  color: var(--kd-c-menu-sub-color-hover, var(--kd-g-color-white, #fff));
-}
-.kd-menu-dark .kd-menu-submenu-sub-second > li:hover {
-  background: var(--kd-c-menu-sub-color-background-hover, #121319) !important;
-  color: var(--kd-c-menu-sub-color-hover, var(--kd-g-color-white, #fff));
-}
-.kd-menu-dark .kd-menu-submenu-sub-third .kd-menu-item:hover {
-  background: var(--kd-c-menu-sub-color-background-hover, #121319) !important;
-  color: var(--kd-c-menu-sub-color-hover, var(--kd-g-color-white, #fff));
-}
-.kd-menu-light.kd-menu-inline > ul > li.kd-menu-submenu .kd-menu-submenu-sub {
-  background: var(--kd-c-menu-light-color-background, #f5f5f5);
-  color: var(--kd-c-menu-light-color, var(--kd-g-color-text-primary, #212121));
-}
-.kd-menu-light.kd-menu-inline > ul > li.kd-menu-submenu .kd-menu-submenu-sub :hover {
-  background: var(--kd-c-menu-light-color-background-hover, #eaeaea);
-  color: var(--kd-c-menu-light-color, var(--kd-g-color-text-primary, #212121));
-}
-.kd-menu-light .kd-menu-item.kd-menu-item-active {
-  background: var(--kd-c-menu-light-color-background, #f5f5f5);
-  color: var(--kd-c-menu-light-color, var(--kd-g-color-text-primary, #212121));
-}
-.kd-menu-light .kd-menu-submenu-sub {
-  background: var(--kd-c-menu-light-color-background, #f5f5f5);
-  color: var(--kd-c-menu-light-color, var(--kd-g-color-text-primary, #212121));
-}
-.kd-menu-light .kd-menu-submenu .kd-menu-item.kd-menu-item-active {
-  background: var(--kd-c-menu-light-color-background-hover, #eaeaea);
-  color: var(--kd-c-menu-light-color, var(--kd-g-color-text-primary, #212121));
-}
-.kd-menu-light > .kd-menu-submenu :hover {
-  background: var(--kd-c-menu-light-color-background, #f5f5f5);
-  color: var(--kd-c-menu-light-color, var(--kd-g-color-text-primary, #212121));
-}
-.kd-menu-light > .kd-menu-item:not(.kd-menu-item-disabled) :hover,
-.kd-menu-light .kd-menu-submenu-collapsed :hover {
-  background: var(--kd-c-menu-light-color-background, #f5f5f5);
-  color: var(--kd-c-menu-light-color, var(--kd-g-color-text-primary, #212121));
-}
-.kd-menu-light .kd-menu-submenu-sub-second > li:hover {
-  background: var(--kd-c-menu-light-color-background-hover, #eaeaea);
-  color: var(--kd-c-menu-light-color, var(--kd-g-color-text-primary, #212121));
-}
-.kd-menu-light .kd-menu-submenu-sub-third .kd-menu-item:hover {
-  background: var(--kd-c-menu-light-color-background-hover, #eaeaea);
-  color: var(--kd-c-menu-light-color, var(--kd-g-color-text-primary, #212121));
-}
-.hover-sub {
-  background: var(--kd-c-menu-sub-base-color-background-hover, #1f212b);
-  color: var(--kd-c-menu-sub-color-hover, var(--kd-g-color-white, #fff));
-}
-.base-sub {
-  background: var(--kd-c-menu-sub-base-color-background-hover, #1f212b);
-  color: var(--kd-c-menu-sub-base-color-hover, #b2b3b7);
-}
-.hover-third {
-  background: var(--kd-c-menu-sub-color-background-hover, #121319) !important;
-  color: var(--kd-c-menu-sub-color-hover, var(--kd-g-color-white, #fff));
-}
-.hover-sub-light {
-  background: var(--kd-c-menu-light-color-background, #f5f5f5);
-  color: var(--kd-c-menu-light-color, var(--kd-g-color-text-primary, #212121));
-}
-.base-sub-light {
-  background: var(--kd-c-menu-light-color-background, #f5f5f5);
-  color: var(--kd-c-menu-light-color, var(--kd-g-color-text-primary, #212121));
+  background: var(--kd-c-menu-sub-inline-color-background, #1f212b);
 }
-.hover-third-light {
-  background: var(--kd-c-menu-light-color-background-hover, #eaeaea);
-  color: var(--kd-c-menu-light-color, var(--kd-g-color-text-primary, #212121));
+.kd-menu-dark .kd-menu-submenu-sub-second,
+.kd-menu-dark .kd-menu-submenu-sub-third {
+  background: var(--kd-c-menu-sub-color-background, #121319);
 }

package/lib/menu/style/index.less

@@ -21,13 +21,31 @@
     .@{submenu-prefix-cls} {
       padding-right: 0;
     }
+
+    .@{submenu-prefix-cls}:not(.@{submenu-prefix-cls}-disabled):hover {
+      color: @menu-inline-color-active;
+    }
   }
 
   &-vertical {
+    .@{submenu-prefix-cls}:not(.@{submenu-prefix-cls}-disabled):hover,
+    .@{submenu-prefix-cls}-hover {
+      .hover();
+    }
+
     .@{submenu-prefix-cls} {
       padding-right: 0;
 
       &-sub {
+        background: @menu-sub-color-background;
+
+        .@{menuitem-prefix-cls} {
+          &:hover,
+          &-active {
+            color: @menu-sub-color-active;
+          }
+        }
+
         &-second,
         &-third {
           animation: kdZoomTopLeftIn calc(@menu-motion-duration - 0.1s) cubic-bezier(0, .4, .4, 1) forwards;
@@ -63,6 +81,20 @@
       .light-default;
     }
 
+    .@{submenu-prefix-cls}-title:hover {
+      color: @menu-light-color-hover;
+    }
+
+    .@{submenu-prefix-cls}:not(.@{submenu-prefix-cls}-disabled):hover {
+      .light-default;
+    }
+
+    .@{menuitem-prefix-cls} {
+      &-active {
+        .light-hover();
+      }
+    }
+
     .@{menuitem-prefix-cls}:not(.@{menuitem-prefix-cls}-disabled):hover {
       .light-hover();
     }
@@ -70,7 +102,22 @@
 
   &-light&-vertical {
     .@{submenu-prefix-cls}-sub {
-      box-shadow: 0 4px 10px 0 #f5f5f5;
+      box-shadow: 0 3px 6px -4px rgba(0, 0, 0, 0.12), 0 6px 16px 0 rgba(0, 0, 0, 0.08),
+      0 9px 28px 8px rgba(0, 0, 0, 0.05);
+    }
+
+    .@{menuitem-prefix-cls} {
+      &:not(.@{menuitem-prefix-cls}-disabled):not(.@{menuitem-prefix-cls}-active):hover {
+        color: @menu-light-color-hover;
+        background: #fff;
+        border: none;
+      }
+
+      &-active {
+        color: @menu-light-color-active;
+        background-color: @menu-light-color-background;
+        border: none !important;
+      }
     }
   }
 }
@@ -81,6 +128,10 @@
   transition: color, background-color;
   transition-duration: calc(@menu-motion-duration - 0.1s);
   transition-timing-function: cubic-bezier(0.4, 0, 0.6, 1);
+
+  &:not(&-disabled):hover {
+    .hover();
+  }
 }
 
 .@{submenu-prefix-cls} {
@@ -90,12 +141,13 @@
   transition-duration: calc(@menu-motion-duration - 0.1s);
   transition-timing-function: cubic-bezier(0.4, 0, 0.6, 1);
 
+  &-hover {
+    color: @menu-sub-color-hover;
+  }
+
   &-sub {
     line-height: @menu-item-height;
     color: @menu-sub-color;
-    min-width: 130px;
-
-
   }
 
   &-thrid {
@@ -103,6 +155,7 @@
     max-width: 810px;
     max-height: 492px;
     padding-left: 24px;
+    background: @menu-sub-color-background;
     flex-wrap: wrap;
     overflow-y: auto;
     cursor: default;
@@ -150,6 +203,10 @@
         cursor: pointer;
         .ellipsis();
 
+        &:hover {
+          color: @menu-sub-color-active;
+        }
+
         & > span {
           .ellipsis();
         }
@@ -166,146 +223,15 @@
   }
 }
 
-.@{kd-prefix}-menu-dark {
-  .@{menu-prefix-cls}-item:not(.@{menu-prefix-cls}-item-disabled) ,
-  .@{menu-prefix-cls}-submenu:not(.@{menu-prefix-cls}-submenu-hover) {
-    :hover {
-      .hover-sub()
-    }
-  }
-
-  &.@{menu-prefix-cls}-inline {
-    > ul > li.@{menu-prefix-cls}-submenu {
-
-      .@{menu-prefix-cls}-submenu-sub {
-        .base-sub();
-
-        :hover {
-          .hover-third()
-        }
-      }
-    }
-  }
-
-  .@{menu-prefix-cls}-item.@{menu-prefix-cls}-item-active {
-    .hover-sub()
-  }
-
-  .@{menu-prefix-cls}-submenu {
-    &-sub {
-      .base-sub();
-    }
-
-    .@{menu-prefix-cls}-item.@{menu-prefix-cls}-item-active {
-      .hover-third()
-    }
-  }
-
-  > .@{menu-prefix-cls}-submenu {
-    :hover {
-      .hover-sub();
-    }
-  }
-
-  > .@{menu-prefix-cls}-item:not(.@{menu-prefix-cls}-item-disabled), .@{menu-prefix-cls}-submenu-collapsed {
-    :hover {
-      .hover-sub()
-    }
-  }
-
-  .@{menu-prefix-cls}-submenu-sub-second {
-    > li:hover {
-      .hover-third()
-    }
-  }
-
-  .@{menu-prefix-cls}-submenu-sub-third {
-    .@{menu-prefix-cls}-item:hover {
-      .hover-third()
-    }
-  }
-}
-
-.@{kd-prefix}-menu-light {
-
-  &.@{menu-prefix-cls}-inline {
-    > ul > li.@{menu-prefix-cls}-submenu {
-
-      .@{menu-prefix-cls}-submenu-sub {
-        .base-sub-light();
-
-        :hover {
-          .hover-third-light()
-        }
-      }
-    }
+.@{menu-prefix-cls}-dark {
+  .@{submenu-prefix-cls}-sub {
+    background: @menu-sub-inline-color-background;
   }
 
-  .@{menu-prefix-cls}-item.@{menu-prefix-cls}-item-active {
-    .hover-sub-light()
+  .@{submenu-prefix-cls}-sub-second,.@{submenu-prefix-cls}-sub-third  {
+    background: @menu-sub-color-background;
   }
-
-  .@{menu-prefix-cls}-submenu {
-    &-sub {
-      .base-sub-light();
-    }
-
-    .@{menu-prefix-cls}-item.@{menu-prefix-cls}-item-active {
-      .hover-third-light()
-    }
-  }
-
-  > .@{menu-prefix-cls}-submenu {
-    :hover {
-      .hover-sub-light();
-    }
-  }
-
-  > .@{menu-prefix-cls}-item:not(.@{menu-prefix-cls}-item-disabled), .@{menu-prefix-cls}-submenu-collapsed {
-    :hover {
-      .hover-sub-light()
-    }
-  }
-
-  .@{menu-prefix-cls}-submenu-sub-second {
-    > li:hover {
-      .hover-third-light()
-    }
-  }
-
-  .@{menu-prefix-cls}-submenu-sub-third {
-    .@{menu-prefix-cls}-item:hover {
-      .hover-third-light()
-    }
-  }
-}
-
-.hover-sub {
-  background: @menu-sub-base-color-background-hover;
-  color: @menu-sub-color-hover;
 }
 
-.base-sub {
-  background: @menu-sub-base-color-background-hover;
-  color: @menu-sub-base-color-hover;
-}
 
-.hover-third {
-  background: @menu-sub-color-background-hover !important;
-  color: @menu-sub-color-hover;
-}
 
-.hover-sub-light {
-  background: @menu-light-color-background;
-  color: @menu-light-color;
-}
-
-.base-sub-light {
-  background: @menu-light-color-background;
-  color: @menu-light-color;
-}
-
-.hover-third-light {
-  background: @menu-light-color-background-hover;
-  color: @menu-light-color;
-}

package/lib/menu/style/mixin.less

@@ -4,8 +4,8 @@
 .menu() {
   position: relative;
   width: 100%;
-  min-width: 138px;
   height: 100%;
+  min-width: 138px;
   background-color: @menu-color-background;
   color: @menu-sub-color;
 }
@@ -52,6 +52,10 @@
     color: @menu-color-disabled;
   }
 
+  &-active {
+    .hover();
+  }
+
   &-arrow {
     margin-left: auto;
     font-size: 16px;
@@ -67,6 +71,11 @@
   }
 }
 
+.hover {
+  background-color: @menu-sub-color-background;
+  color: @menu-sub-color-hover;
+}
+
 .light-hover {
   background-color: @menu-light-color-background;
   color: @menu-light-color-hover;

package/lib/menu/style/token.less

@@ -4,20 +4,17 @@
 
 // color
 @menu-color-disabled: var(~'@{menu-prefix}-color-disabled', @color-disabled);
-@menu-sub-color: var(~'@{menu-prefix}-sub-color', rgba(255, 255, 255, 0.65));
-@menu-sub-color-hover: var(~'@{menu-prefix}-sub-color-hover', @color-white);
-@menu-sub-color-active: var(~'@{menu-prefix}-sub-color-active', @color-white);
-@menu-sub-color-background: var(~'@{menu-prefix}-sub-color-background', #21242d);
-@menu-sub-color-background-hover: var(~'@{menu-prefix}-sub-color-background-hover', #121319);
-@menu-sub-base-color-hover: var(~'@{menu-prefix}-sub-base-color-hover', #b2b3b7);
-@menu-sub-base-color-background-hover: var(~'@{menu-prefix}-sub-base-color-background-hover', #1f212b);
+@menu-sub-color: var(~'@{menu-prefix}-sub-color-text', rgba(255, 255, 255, 0.65));
+@menu-sub-color-hover: var(~'@{menu-prefix}-sub-color-text-hover', @color-white);
+@menu-sub-color-active: var(~'@{menu-prefix}-sub-color-text-active', @color-white);
+@menu-sub-color-background: var(~'@{menu-prefix}-sub-color-background', #121319);
+@menu-sub-inline-color-background: var(~'@{menu-prefix}-sub-inline-color-background', #1f212b);
 @menu-inline-color-active: var(~'@{menu-prefix}-inline-color-active', @color-white);
 @menu-color-background: var(~'@{menu-prefix}-color-background', #343848);
-@menu-light-color: var(~'@{menu-prefix}-light-color', @color-text-primary);
-@menu-light-color-hover: var(~'@{menu-prefix}-light-color-hover', @color-text-primary);
-@menu-light-color-active: var(~'@{menu-prefix}-light-color-active', @color-text-primary);
-@menu-light-color-background: var(~'@{menu-prefix}-light-color-background', #f5f5f5);
-@menu-light-color-background-hover: var(~'@{menu-prefix}-light-color-background-hover', #eaeaea);
+@menu-light-color: var(~'@{menu-prefix}-light-color-text', @color-text-primary);
+@menu-light-color-hover: var(~'@{menu-prefix}-light-color-text-hover', @color-ongoing);
+@menu-light-color-active: var(~'@{menu-prefix}-light-color-text-active', @color-theme);
+@menu-light-color-background: var(~'@{menu-prefix}-light-color-background', @color-background-ongoing);
 
 // font
 @menu-icon-font-size: var(~'@{menu-prefix}-icon-font-size', @font-size-xx-large);

package/lib/menu/subMenu.js

@@ -390,7 +390,8 @@ var SubMenu = function SubMenu(props) {
   return /*#__PURE__*/React.createElement("li", (0, _extends2.default)({
     ref: subMenuRef,
     className: (0, _classnames.default)(prefixCls, className, (_classNames2 = {}, (0, _defineProperty2.default)(_classNames2, "".concat(prefixCls, "-collapsed"), collapsed), (0, _defineProperty2.default)(_classNames2, "".concat(prefixCls, "-disabled"), disabled), (0, _defineProperty2.default)(_classNames2, "".concat(prefixCls, "-hover"), !disabled && isVisible), _classNames2)),
-    key: keyValue
+    key: keyValue,
+    title: title
   }, mouseEvent, {
     style: style
   }), /*#__PURE__*/React.createElement("div", {

package/lib/pagination/pagination.js

@@ -51,7 +51,6 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof _WeakMap !== "functi
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && _Object$getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? _Object$getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-/* eslint-disable react/jsx-no-comment-textnodes */
 var PageTypes = (0, _type.tuple)('basic', 'bill', 'simple', 'less', 'nicety');
 exports.PageTypes = PageTypes;
 
@@ -283,9 +282,11 @@ var Pagination = function Pagination(props) {
     selectedKey: size,
     menu: sizeOptions,
     trigger: "click",
+    placement: "bottomRight",
     disabled: disabled,
+    prefix: "".concat(prefixCls, "-dropdown"),
     popperStyle: {
-      minWidth: 67
+      minWidth: 64
     },
     onItemClick: handleChangeSize,
     getPopupContainer: function getPopupContainer(triggerNode) {
@@ -435,7 +436,7 @@ var Pagination = function Pagination(props) {
       menu: sizeOptions,
       disabled: disabled,
       popperStyle: {
-        minWidth: 67
+        minWidth: 64
       },
       onItemClick: handleChangeSize,
       getPopupContainer: function getPopupContainer(triggerNode) {