From 246e1163bb4700f8fc803670c077eb29252d7dc5 Mon Sep 17 00:00:00 2001
From: tangjinzhou <415800467@qq.com>
Date: Mon, 20 Dec 2021 10:09:34 +0800
Subject: [PATCH] refactor: input-number

---
 components/form/style/components.less |  4 ++-
 components/form/style/mixin.less      |  3 ++-
 components/form/style/rtl.less        | 13 +++++++++-
 components/form/style/status.less     | 36 ++++++++++++++-------------
 4 files changed, 36 insertions(+), 20 deletions(-)

diff --git a/components/form/style/components.less b/components/form/style/components.less
index 0379fbdc7..4dc1b2147 100644
--- a/components/form/style/components.less
+++ b/components/form/style/components.less
@@ -65,7 +65,9 @@
   .@{ant-prefix}-picker-calendar-year-select,
   .@{ant-prefix}-picker-calendar-month-select,
   .@{ant-prefix}-input-group .@{ant-prefix}-select,
-  .@{ant-prefix}-input-group .@{ant-prefix}-cascader-picker {
+  .@{ant-prefix}-input-group .@{ant-prefix}-cascader-picker,
+  .@{ant-prefix}-input-number-group .@{ant-prefix}-select,
+  .@{ant-prefix}-input-number-group .@{ant-prefix}-cascader-picker {
     width: auto;
   }
 }
diff --git a/components/form/style/mixin.less b/components/form/style/mixin.less
index 20f3799c2..44c5a0e37 100644
--- a/components/form/style/mixin.less
+++ b/components/form/style/mixin.less
@@ -33,7 +33,8 @@
     color: @text-color;
   }
 
-  .@{ant-prefix}-input-group-addon {
+  .@{ant-prefix}-input-group-addon,
+  .@{ant-prefix}-input-number-group-addon {
     color: @text-color;
     border-color: @border-color;
   }
diff --git a/components/form/style/rtl.less b/components/form/style/rtl.less
index 5874b6fb0..9fcbabad5 100644
--- a/components/form/style/rtl.less
+++ b/components/form/style/rtl.less
@@ -32,6 +32,7 @@
           margin-left: 4px;
         }
       }
+
       &::after {
         .@{form-prefix-cls}-rtl & {
           margin: 0 @form-item-label-colon-margin-left 0 @form-item-label-colon-margin-right;
@@ -97,7 +98,13 @@
     > .@{ant-prefix}-select .@{ant-prefix}-select-arrow,
     > .@{ant-prefix}-select .@{ant-prefix}-select-clear,
     :not(.@{ant-prefix}-input-group-addon) > .@{ant-prefix}-select .@{ant-prefix}-select-arrow,
-    :not(.@{ant-prefix}-input-group-addon) > .@{ant-prefix}-select .@{ant-prefix}-select-clear {
+    :not(.@{ant-prefix}-input-group-addon) > .@{ant-prefix}-select .@{ant-prefix}-select-clear,
+    :not(.@{ant-prefix}-input-number-group-addon)
+      > .@{ant-prefix}-select
+      .@{ant-prefix}-select-arrow,
+    :not(.@{ant-prefix}-input-number-group-addon)
+      > .@{ant-prefix}-select
+      .@{ant-prefix}-select-clear {
       .@{form-prefix-cls}-rtl & {
         right: auto;
         left: 32px;
@@ -106,6 +113,9 @@
 
     > .@{ant-prefix}-select .@{ant-prefix}-select-selection-selected-value,
     :not(.@{ant-prefix}-input-group-addon)
+      > .@{ant-prefix}-select
+      .@{ant-prefix}-select-selection-selected-value,
+    :not(.@{ant-prefix}-input-number-group-addon)
       > .@{ant-prefix}-select
       .@{ant-prefix}-select-selection-selected-value {
       .@{form-prefix-cls}-rtl & {
@@ -121,6 +131,7 @@
           margin-left: 19px;
         }
       }
+
       &-clear {
         .@{form-prefix-cls}-rtl & {
           right: auto;
diff --git a/components/form/style/status.less b/components/form/style/status.less
index 5d90cc4e9..fc78ccb36 100644
--- a/components/form/style/status.less
+++ b/components/form/style/status.less
@@ -48,26 +48,25 @@
     > .@{ant-prefix}-select .@{ant-prefix}-select-arrow,
     > .@{ant-prefix}-select .@{ant-prefix}-select-clear,
     :not(.@{ant-prefix}-input-group-addon) > .@{ant-prefix}-select .@{ant-prefix}-select-arrow,
-    :not(.@{ant-prefix}-input-group-addon) > .@{ant-prefix}-select .@{ant-prefix}-select-clear {
+    :not(.@{ant-prefix}-input-group-addon) > .@{ant-prefix}-select .@{ant-prefix}-select-clear,
+    :not(.@{ant-prefix}-input-number-group-addon)
+      > .@{ant-prefix}-select
+      .@{ant-prefix}-select-arrow,
+    :not(.@{ant-prefix}-input-number-group-addon)
+      > .@{ant-prefix}-select
+      .@{ant-prefix}-select-clear {
       right: 32px;
     }
     > .@{ant-prefix}-select .@{ant-prefix}-select-selection-selected-value,
     :not(.@{ant-prefix}-input-group-addon)
+      > .@{ant-prefix}-select
+      .@{ant-prefix}-select-selection-selected-value,
+    :not(.@{ant-prefix}-input-number-group-addon)
       > .@{ant-prefix}-select
       .@{ant-prefix}-select-selection-selected-value {
       padding-right: 42px;
     }
 
-    // ======================= Cascader ========================
-    .@{ant-prefix}-cascader-picker {
-      &-arrow {
-        margin-right: 19px;
-      }
-      &-clear {
-        right: 32px;
-      }
-    }
-
     // ======================== Picker =========================
     // Fix issue: https://github.com/ant-design/ant-design/issues/4783
     .@{ant-prefix}-picker {
@@ -179,12 +178,15 @@
     }
 
     // fixes https://github.com/ant-design/ant-design/issues/20482
-    .@{ant-prefix}-input-group-addon .@{ant-prefix}-select {
-      &.@{ant-prefix}-select-single:not(.@{ant-prefix}-select-customize-input)
-        .@{ant-prefix}-select-selector {
-        background-color: inherit;
-        border: 0;
-        box-shadow: none;
+    .@{ant-prefix}-input-group-addon,
+    .@{ant-prefix}-input-number-group-addon {
+      .@{ant-prefix}-select {
+        &.@{ant-prefix}-select-single:not(.@{ant-prefix}-select-customize-input)
+          .@{ant-prefix}-select-selector {
+          background-color: inherit;
+          border: 0;
+          box-shadow: none;
+        }
       }
     }