From 92d3fcee3c04c04540a35b712eccab6e94ed3c87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=91=E6=B8=B8=E5=90=9B?= Date: Mon, 9 May 2022 17:48:31 +0800 Subject: [PATCH] fix(components): date picker range input__inner inherit height (#7586) --- packages/theme-chalk/src/input.scss | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/packages/theme-chalk/src/input.scss b/packages/theme-chalk/src/input.scss index b5326f46c1..e2b476b227 100644 --- a/packages/theme-chalk/src/input.scss +++ b/packages/theme-chalk/src/input.scss @@ -165,11 +165,6 @@ } @include e(wrapper) { - @include set-css-var-value( - 'input-inner-height', - calc(getCssVar('input-height') - $border-width * 2) - ); - display: inline-flex; flex-grow: 1; align-items: center; @@ -202,6 +197,17 @@ } @include e(inner) { + // use map.get as default value for date picker range + @include set-css-var-value( + 'input-inner-height', + calc( + var( + #{getCssVarName('input-height')}, + #{map.get($input-height, 'default')} + ) - $border-width * 2 + ) + ); + width: 100%; flex-grow: 1; -webkit-appearance: none; @@ -341,12 +347,19 @@ font-size: map.get($input-font-size, $size); @include e(wrapper) { + padding: $border-width map.get($input-padding-horizontal, $size)-$border-width; + } + + @include e(inner) { @include set-css-var-value( 'input-inner-height', - calc(getCssVar('input-height', $size) - $border-width * 2) + calc( + var( + #{getCssVarName('input-height', $size)}, + #{map.get($input-height, $size)} + ) - $border-width * 2 + ) ); - - padding: $border-width map.get($input-padding-horizontal, $size)-$border-width; } } }