From c3ae675b5f7add8b60d786ce82adc9135f406c2a Mon Sep 17 00:00:00 2001
From: danranvm <danranvm@gmail.com>
Date: Thu, 13 Jan 2022 17:53:04 +0800
Subject: [PATCH] refactor(comp:dropdown): move less variable

---
 packages/components/dropdown/style/index.less | 53 ++++++++++++++++---
 .../dropdown/style/themes/default.less        |  1 -
 .../style/themes/default.variable.less        |  9 ++++
 packages/components/menu/style/dropdown.less  | 40 --------------
 packages/components/menu/style/index.less     |  1 -
 .../components/menu/style/themes/default.less |  2 -
 .../menu/style/themes/default.variable.less   |  2 +
 7 files changed, 57 insertions(+), 51 deletions(-)
 delete mode 100644 packages/components/menu/style/dropdown.less

diff --git a/packages/components/dropdown/style/index.less b/packages/components/dropdown/style/index.less
index 050cde27f..f5d57c3bb 100644
--- a/packages/components/dropdown/style/index.less
+++ b/packages/components/dropdown/style/index.less
@@ -2,13 +2,11 @@
 @import '../../style/motion/fade.less';
 
 .@{dropdown-prefix} {
-  .reset-component();
-
-  z-index: @menu-overlay-zindex;
-  min-width: @menu-overlay-min-width;
-  background-color: @menu-bg-color;
-  border-radius: @menu-overlay-border-radius;
-  box-shadow: @menu-overlay-box-shadow;
+  z-index: @dropdown-overlay-zindex;
+  min-width: @dropdown-overlay-min-width;
+  background-color: @dropdown-bg-color;
+  border-radius: @dropdown-overlay-border-radius;
+  box-shadow: @dropdown-overlay-box-shadow;
 
   &-trigger {
     cursor: pointer;
@@ -18,3 +16,44 @@
     color: @dropdown-background-color;
   }
 }
+
+.@{menu-prefix} {
+
+  &&-dropdown {
+    &.@{menu-prefix}-vertical,
+    &.@{menu-prefix}-inline {
+      .@{menu-prefix}-item {
+
+        &-selected {
+
+          &::after {
+            transform: scaleY(0);
+            opacity: 0;
+          }
+        }
+      }
+    }
+
+    &.@{menu-prefix}-horizontal {
+      .@{menu-prefix}-item,
+      .@{menu-prefix}-sub {
+
+        &:hover,
+        &-expanded,
+        &-selected {
+          border-color: transparent;
+        }
+      }
+    }
+  }
+}
+
+.@{menu-prefix}-dropdown {
+  .@{menu-prefix}-item,
+  .@{menu-prefix}-sub-title,
+  .@{menu-prefix}-item-group .@{menu-prefix}-item-group-title {
+    height: @dropdown-menu-item-height;
+    line-height: @dropdown-menu-item-height;
+    margin: @dropdown-menu-item-margin;
+  }
+}
diff --git a/packages/components/dropdown/style/themes/default.less b/packages/components/dropdown/style/themes/default.less
index 7bfe1181a..711fb59f1 100644
--- a/packages/components/dropdown/style/themes/default.less
+++ b/packages/components/dropdown/style/themes/default.less
@@ -1,3 +1,2 @@
-@import '../../../style/themes/default.less';
 @import './default.variable.less';
 @import '../index.less';
diff --git a/packages/components/dropdown/style/themes/default.variable.less b/packages/components/dropdown/style/themes/default.variable.less
index a224b1c7a..efdd0b3d2 100644
--- a/packages/components/dropdown/style/themes/default.variable.less
+++ b/packages/components/dropdown/style/themes/default.variable.less
@@ -1,3 +1,12 @@
+@import '../../../style/themes/default.less';
+@import '../../../menu/style/themes/default.variable.less';
+
 @dropdown-menu-item-height: @height-md;
 @dropdown-menu-item-margin: 0;
 @dropdown-background-color: @background-color-component;
+
+@dropdown-overlay-zindex: @menu-overlay-zindex;
+@dropdown-overlay-min-width: @menu-overlay-min-width;
+@dropdown-bg-color: @menu-bg-color;
+@dropdown-overlay-border-radius: @menu-overlay-border-radius;
+@dropdown-overlay-box-shadow: @menu-overlay-box-shadow;
diff --git a/packages/components/menu/style/dropdown.less b/packages/components/menu/style/dropdown.less
deleted file mode 100644
index 48174401f..000000000
--- a/packages/components/menu/style/dropdown.less
+++ /dev/null
@@ -1,40 +0,0 @@
-.@{menu-prefix} {
-
-  &&-dropdown {
-    &.@{menu-prefix}-vertical,
-    &.@{menu-prefix}-inline {
-      .@{menu-prefix}-item {
-
-        &-selected {
-
-          &::after {
-            transform: scaleY(0);
-            opacity: 0;
-          }
-        }
-      }
-    }
-
-    &.@{menu-prefix}-horizontal {
-      .@{menu-prefix}-item,
-      .@{menu-prefix}-sub {
-
-        &:hover,
-        &-expanded,
-        &-selected {
-          border-color: transparent;
-        }
-      }
-    }
-  }
-}
-
-.@{menu-prefix}-dropdown {
-  .@{menu-prefix}-item,
-  .@{menu-prefix}-sub-title,
-  .@{menu-prefix}-item-group .@{menu-prefix}-item-group-title {
-    height: @dropdown-menu-item-height;
-    line-height: @dropdown-menu-item-height;
-    margin: @dropdown-menu-item-margin;
-  }
-}
diff --git a/packages/components/menu/style/index.less b/packages/components/menu/style/index.less
index 8f92d28b8..c9d7f0415 100644
--- a/packages/components/menu/style/index.less
+++ b/packages/components/menu/style/index.less
@@ -5,7 +5,6 @@
 @import './menu.less';
 @import './dark.less';
 @import './collapsed.less';
-@import './dropdown.less';
 
 .@{menu-prefix} {
   .reset-component();
diff --git a/packages/components/menu/style/themes/default.less b/packages/components/menu/style/themes/default.less
index 41d2a79e4..c1c89d158 100644
--- a/packages/components/menu/style/themes/default.less
+++ b/packages/components/menu/style/themes/default.less
@@ -1,4 +1,2 @@
-@import '../../../style/themes/default.less';
-@import '../../../dropdown/style/themes/default.variable.less';
 @import '../index.less';
 @import './default.variable.less';
diff --git a/packages/components/menu/style/themes/default.variable.less b/packages/components/menu/style/themes/default.variable.less
index c0cf0361c..6595d383f 100644
--- a/packages/components/menu/style/themes/default.variable.less
+++ b/packages/components/menu/style/themes/default.variable.less
@@ -1,3 +1,5 @@
+@import '../../../style/themes/default.less';
+
 @menu-text-color: @text-color;
 @menu-bg-color: @background-color-component;
 @menu-highlight-color: @color-primary;