From 8d2c959711a04c43e46e636a01539152ae5f080c Mon Sep 17 00:00:00 2001
From: xrkffgg <xrkffgg@vip.qq.com>
Date: Fri, 13 Mar 2020 17:30:51 +0800
Subject: [PATCH] style: fix cascader RTL small icon (#22191)

---
 components/cascader/style/index.less | 49 -----------------
 components/cascader/style/index.tsx  |  1 +
 components/cascader/style/rtl.less   | 79 ++++++++++++++++++++++++++++
 3 files changed, 80 insertions(+), 49 deletions(-)
 create mode 100644 components/cascader/style/rtl.less

diff --git a/components/cascader/style/index.less b/components/cascader/style/index.less
index 5d54d9ebe7..58fd9d68ed 100644
--- a/components/cascader/style/index.less
+++ b/components/cascader/style/index.less
@@ -3,8 +3,6 @@
 @import '../../input/style/mixin';
 
 @cascader-prefix-cls: ~'@{ant-prefix}-cascader';
-@picker-rtl-cls: ~'@{cascader-prefix-cls}-picker-rtl';
-@menu-rtl-cls: ~'@{cascader-prefix-cls}-menu-rtl';
 
 .@{cascader-prefix-cls} {
   .reset-component;
@@ -19,12 +17,6 @@
     // because input.less will compile after cascader.less
     background-color: transparent !important;
     cursor: pointer;
-
-    .@{picker-rtl-cls} & {
-      padding-right: @input-padding-horizontal-base;
-      padding-left: 24px;
-      text-align: right;
-    }
   }
 
   &-picker-show-search &-input.@{ant-prefix}-input {
@@ -80,11 +72,6 @@
       line-height: 20px;
       white-space: nowrap;
       text-overflow: ellipsis;
-
-      .@{picker-rtl-cls} & {
-        padding: 0 @control-padding-horizontal 0 20px;
-        text-align: right;
-      }
     }
 
     &-clear {
@@ -105,11 +92,6 @@
       &:hover {
         color: @text-color-secondary;
       }
-
-      .@{picker-rtl-cls} & {
-        right: auto;
-        left: @control-padding-horizontal;
-      }
     }
 
     &:hover &-clear {
@@ -132,11 +114,6 @@
       &&-expand {
         transform: rotate(180deg);
       }
-
-      .@{picker-rtl-cls} & {
-        right: auto;
-        left: @control-padding-horizontal;
-      }
     }
   }
 
@@ -148,11 +125,6 @@
   &-picker-small &-picker-clear,
   &-picker-small &-picker-arrow {
     right: @control-padding-horizontal-sm;
-
-    .@{picker-rtl-cls} & {
-      right: auto;
-      left: @control-padding-horizontal;
-    }
   }
 
   &-menus {
@@ -215,17 +187,6 @@
     &:only-child {
       border-radius: @border-radius-base;
     }
-    &-rtl {
-      direction: rtl;
-      border-right: none;
-      border-left: @border-width-base @border-style-base @border-color-split;
-      &:last-child {
-        margin-right: 0;
-        margin-left: -1px;
-        border-left-color: transparent;
-        border-radius: 0 0 4px 4px;
-      }
-    }
   }
   &-menu-item {
     padding: @cascader-dropdown-vertical-padding @control-padding-horizontal;
@@ -253,11 +214,6 @@
     &-expand {
       position: relative;
       padding-right: 24px;
-
-      .@{menu-rtl-cls} & {
-        padding-right: @control-padding-horizontal;
-        padding-left: 24px;
-      }
     }
 
     &-expand &-expand-icon,
@@ -267,11 +223,6 @@
       position: absolute;
       right: @control-padding-horizontal;
       color: @text-color-secondary;
-
-      .@{menu-rtl-cls} & {
-        right: auto;
-        left: @control-padding-horizontal;
-      }
     }
 
     & &-keyword {
diff --git a/components/cascader/style/index.tsx b/components/cascader/style/index.tsx
index b64c64e2f9..61a8a5d412 100644
--- a/components/cascader/style/index.tsx
+++ b/components/cascader/style/index.tsx
@@ -1,5 +1,6 @@
 import '../../style/index.less';
 import './index.less';
+import './rtl.less';
 
 // style dependencies
 import '../../empty/style';
diff --git a/components/cascader/style/rtl.less b/components/cascader/style/rtl.less
new file mode 100644
index 0000000000..9c206339a0
--- /dev/null
+++ b/components/cascader/style/rtl.less
@@ -0,0 +1,79 @@
+@import '../../style/themes/index';
+@import '../../style/mixins/index';
+@import '../../input/style/mixin';
+
+@cascader-prefix-cls: ~'@{ant-prefix}-cascader';
+@picker-rtl-cls: ~'@{cascader-prefix-cls}-picker-rtl';
+@menu-rtl-cls: ~'@{cascader-prefix-cls}-menu-rtl';
+
+.@{cascader-prefix-cls} {
+  &-input.@{ant-prefix}-input {
+    .@{picker-rtl-cls} & {
+      padding-right: @input-padding-horizontal-base;
+      padding-left: 24px;
+      text-align: right;
+    }
+  }
+
+  &-picker {
+    &-label {
+      .@{picker-rtl-cls} & {
+        padding: 0 @control-padding-horizontal 0 20px;
+        text-align: right;
+      }
+    }
+
+    &-clear {
+      .@{picker-rtl-cls} & {
+        right: auto;
+        left: @control-padding-horizontal;
+      }
+    }
+
+    &-arrow {
+      .@{picker-rtl-cls} & {
+        right: auto;
+        left: @control-padding-horizontal;
+      }
+    }
+  }
+
+  &-picker-small &-picker-clear,
+  &-picker-small &-picker-arrow {
+    .@{picker-rtl-cls}& {
+      right: auto;
+      left: @control-padding-horizontal-sm;
+    }
+  }
+
+  &-menu {
+    &-rtl {
+      direction: rtl;
+      border-right: none;
+      border-left: @border-width-base @border-style-base @border-color-split;
+      &:last-child {
+        margin-right: 0;
+        margin-left: -1px;
+        border-left-color: transparent;
+        border-radius: 0 0 4px 4px;
+      }
+    }
+  }
+
+  &-menu-item {
+    &-expand {
+      .@{menu-rtl-cls} & {
+        padding-right: @control-padding-horizontal;
+        padding-left: 24px;
+      }
+    }
+
+    &-expand &-expand-icon,
+    &-loading-icon {
+      .@{menu-rtl-cls} & {
+        right: auto;
+        left: @control-padding-horizontal;
+      }
+    }
+  }
+}