From 9cb35af1157f5121f29054f5ac8b10f2d403dd20 Mon Sep 17 00:00:00 2001 From: EugeniyKiyashko Date: Thu, 6 Feb 2025 16:09:54 +0400 Subject: [PATCH] DateBox: Placeholder alignment is not correct on iOS (T1256510) (#28926) --- .../scss/widgets/fluent/dateBox/_index.scss | 4 ---- .../scss/widgets/fluent/dateBox/_sizes.scss | 1 - .../scss/widgets/material/dateBox/_index.scss | 12 ++++++++++-- .../scss/widgets/material/dateBox/_sizes.scss | 11 ++++++++++- 4 files changed, 20 insertions(+), 8 deletions(-) diff --git a/packages/devextreme-scss/scss/widgets/fluent/dateBox/_index.scss b/packages/devextreme-scss/scss/widgets/fluent/dateBox/_index.scss index 85c5ca246d9f..f9a79bc642dd 100644 --- a/packages/devextreme-scss/scss/widgets/fluent/dateBox/_index.scss +++ b/packages/devextreme-scss/scss/widgets/fluent/dateBox/_index.scss @@ -135,10 +135,6 @@ } } -.dx-device-ios .dx-datebox.dx-texteditor-empty .dx-texteditor-input { - min-height: $fluent-datebox-input-min-height; -} - .dx-texteditor { &.dx-datebox-native { .dx-texteditor-input { diff --git a/packages/devextreme-scss/scss/widgets/fluent/dateBox/_sizes.scss b/packages/devextreme-scss/scss/widgets/fluent/dateBox/_sizes.scss index d4eafe1ae114..9190ee007c1c 100644 --- a/packages/devextreme-scss/scss/widgets/fluent/dateBox/_sizes.scss +++ b/packages/devextreme-scss/scss/widgets/fluent/dateBox/_sizes.scss @@ -5,4 +5,3 @@ $fluent-datebox-overlay-item-margin: 16px !default; $fluent-datebox-overlay-item-margin-adaptive: 18px !default; $fluent-datebox-popup-content-margin: 0 34px !default; -$fluent-datebox-input-min-height: 33px !default; diff --git a/packages/devextreme-scss/scss/widgets/material/dateBox/_index.scss b/packages/devextreme-scss/scss/widgets/material/dateBox/_index.scss index 8c78afd35002..7572451b7d1c 100644 --- a/packages/devextreme-scss/scss/widgets/material/dateBox/_index.scss +++ b/packages/devextreme-scss/scss/widgets/material/dateBox/_index.scss @@ -143,8 +143,16 @@ } } -.dx-device-ios .dx-datebox.dx-texteditor-empty .dx-texteditor-input { - min-height: $material-datebox-input-min-height; +.dx-device-ios .dx-datebox { + &.dx-texteditor-empty { + .dx-texteditor-input { + height: $datebox-input-min-height-device-ios; + } + } + + input[type="date"] { + line-height: $datebox-input-line-height-device-ios; + } } .dx-texteditor { diff --git a/packages/devextreme-scss/scss/widgets/material/dateBox/_sizes.scss b/packages/devextreme-scss/scss/widgets/material/dateBox/_sizes.scss index 972b1a175e15..d2f3e6c9b1aa 100644 --- a/packages/devextreme-scss/scss/widgets/material/dateBox/_sizes.scss +++ b/packages/devextreme-scss/scss/widgets/material/dateBox/_sizes.scss @@ -5,4 +5,13 @@ $material-datebox-overlay-item-margin: 16px !default; $material-datebox-overlay-item-margin-adaptive: 18px !default; $material-datebox-popup-content-margin: 0 34px !default; -$material-datebox-input-min-height: 33px !default; +$datebox-input-min-height-device-ios: $material-base-inline-widget-height !default; +$datebox-input-line-height-device-ios: null !default; + +@if $size == "default" { + $datebox-input-line-height-device-ios: normal !default; +} + +@else if $size == "compact" { + $datebox-input-line-height-device-ios: 1.1667 !default; +}