fix(ui): input no padding-right when button on the far right

xiejay97 · xiejay97 · commit cbedd5632b0d · 2023-02-03T16:54:08.000+08:00
diff --git a/packages/ui/src/components/input/Input.tsx b/packages/ui/src/components/input/Input.tsx
@@ -171,7 +171,7 @@ export function DInput(props: DInputProps): JSX.Element | null {
             {...restProps}
             className={getClassName(restProps.className, `${dPrefix}input`, {
               [`${dPrefix}input--${size}`]: size,
-              [`${dPrefix}input--number`]: dType === 'number',
+              [`${dPrefix}input--button-right`]: dType === 'number' && dNumbetButton && !disabled && !checkNodeExist(dSuffix),
               'is-disabled': disabled,
               'is-focus': isFocus,
             })}
diff --git a/packages/ui/src/styles/components/input.scss b/packages/ui/src/styles/components/input.scss
@@ -44,13 +44,8 @@
     border-color: var(--#{$rd-prefix}color-primary-lighter);
   }
 
-  @include m(number) {
-    &:not(.is-disabled) {
-      padding-right: 0;
-      @include e(suffix) {
-        margin-right: calc(var(--#{$rd-prefix}horizontal-space-size) - 1px);
-      }
-    }
+  @include m(button-right) {
+    padding-right: 0;
   }
 
   @include e(input) {

Original file line number	Diff line number	Diff line change
`@@ -44,13 +44,8 @@`
`44`	`44`	`border-color: var(--#{$rd-prefix}color-primary-lighter);`
`45`	`45`	`}`
`46`	`46`
`47`		`- @include m(number) {`
`48`		`- &:not(.is-disabled) {`
`49`		`- padding-right: 0;`
`50`		`- @include e(suffix) {`
`51`		`- margin-right: calc(var(--#{$rd-prefix}horizontal-space-size) - 1px);`
`52`		`- }`
`53`		`- }`
	`47`	`+ @include m(button-right) {`
	`48`	`+ padding-right: 0;`
`54`	`49`	`}`
`55`	`50`
`56`	`51`	`@include e(input) {`