From 1b227a50f409a400a55a66ff233d30bbbf568ecb Mon Sep 17 00:00:00 2001 From: 4eb0da <4eb0da@yandex-team.com> Date: Thu, 4 May 2023 14:24:06 +0300 Subject: [PATCH] Fix select sizes --- .../src/components/select/Select.svelte | 25 +++++++++++++----- .../select/select/chromeMobile/select.png | Bin 54149 -> 53963 bytes .../select/select/firefoxMobile/select.png | Bin 19379 -> 19270 bytes 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/client/web/divkit/src/components/select/Select.svelte b/client/web/divkit/src/components/select/Select.svelte index 993bf4075..7371584b5 100644 --- a/client/web/divkit/src/components/select/Select.svelte +++ b/client/web/divkit/src/components/select/Select.svelte @@ -69,7 +69,12 @@ let padding = ''; $: { selfPadding = correctEdgeInsertsObject(($jsonPaddings) ? $jsonPaddings : undefined, selfPadding); - padding = selfPadding ? edgeInsertsToCss(selfPadding) : ''; + padding = selfPadding ? edgeInsertsToCss({ + top: (Number(selfPadding.top) || 0) / fontSize * 10, + right: (Number(selfPadding.right) || 0) / fontSize * 10, + bottom: (Number(selfPadding.bottom) || 0) / fontSize * 10, + left: (Number(selfPadding.left) || 0) / fontSize * 10 + }) : ''; } const jsonHintText = rootCtx.getDerivedFromVars(json.hint_text); @@ -131,12 +136,20 @@ }; $: stl = { '--divkit-input-hint-color': hintColor, - 'font-size': pxToEm(fontSize), 'font-weight': fontWeight, - 'line-height': lineHeight, - 'letter-spacing': letterSpacing, color: textColor }; + $: innerStl = { + padding, + 'font-size': pxToEm(fontSize), + 'line-height': lineHeight, + 'letter-spacing': letterSpacing + }; + $: selectStl = { + 'font-size': pxToEm(fontSize), + 'line-height': lineHeight, + 'letter-spacing': letterSpacing + }; {#if !hasError} @@ -151,12 +164,12 @@ {templateContext} {layoutParams} > -