fix text cropping

DevExpress · Sep 1, 2023 · 489285f · 489285f
1 parent 694676e
commit 489285f
Show file tree

Hide file tree

Showing 13 changed files with 15 additions and 5 deletions.
diff --git a/packages/devextreme/scss/widgets/base/textEditor/_mixins.scss b/packages/devextreme/scss/widgets/base/textEditor/_mixins.scss
@@ -217,7 +217,9 @@
       margin-top: $label-offset-y;
 
       &.dx-daterangebox {
-        .dx-label {  
+        .dx-label {
+          position: relative;
+
           &::before {
             content: '';
             width: 100%;
@@ -333,7 +335,7 @@
   $texteditor-label-line-height,
   $texteditor-label-top-offset,
   $texteditor-font-size,
-  $texteditor-label-empty-height,
+  $texteditor-empty-label-height,
   $texteditor-empty-label-line-height,
   $texteditor-filled-input-horizontal-padding,
   $texteditor-filled-input-with-label-top-padding,
@@ -375,7 +377,7 @@
         .dx-texteditor-label {
           transition: $texteditor-label-transition;
           font-size: $texteditor-font-size;
-          height: $texteditor-label-empty-height;
+          height: $texteditor-empty-label-height;
           line-height: $texteditor-empty-label-line-height;
           top: 50%;
           margin-top: math.div(-$texteditor-label-height, 2);
@@ -421,6 +423,8 @@
   $texteditor-label-line-height,
   $texteditor-label-top-offset,
   $texteditor-font-size,
+  $texteditor-empty-label-height,
+  $texteditor-empty-label-line-height,
   $texteditor-with-label-input-top-padding,
   $texteditor-with-label-input-bottom-padding,
 ) {
@@ -454,8 +458,8 @@
           transition: $texteditor-label-transition;
           transform: translate(0, 0);
           font-size: $texteditor-font-size;
-          height: $texteditor-label-height;
-          line-height: $texteditor-label-line-height;
+          height: $texteditor-empty-label-height;
+          line-height: $texteditor-empty-label-line-height;
           top: 50%;
           margin-top: math.div(-$texteditor-label-height, 2);
         }

diff --git a/packages/devextreme/scss/widgets/fluent/textEditor/_index.scss b/packages/devextreme/scss/widgets/fluent/textEditor/_index.scss
@@ -390,6 +390,8 @@ $fluent-filled-texteditor-spin-button-horizontal-padding: $fluent-filled-textedi
   $fluent-texteditor-label-font-size,
   $fluent-texteditor-label-top-offset,
   $fluent-texteditor-font-size,
+  $fluent-texteditor-font-size,
+  $fluent-texteditor-font-size,
   $fluent-standard-texteditor-with-label-input-top-padding,
   $fluent-standard-texteditor-with-label-input-bottom-padding,
 );

diff --git a/packages/devextreme/scss/widgets/generic/textEditor/_index.scss b/packages/devextreme/scss/widgets/generic/textEditor/_index.scss
@@ -270,6 +270,8 @@ $generic-texteditor-invalid-badge-size: $generic-invalid-badge-size + 2 * $gener
   $generic-base-line-height,
   0,
   $generic-base-font-size,
+  $generic-base-inline-block-height,
+  $generic-base-line-height,
   $generic-texteditor-underlined-input-with-label-top-padding,
   $generic-texteditor-underlined-input-with-label-bottom-padding,
 );

diff --git a/packages/devextreme/scss/widgets/material/textEditor/_index.scss b/packages/devextreme/scss/widgets/material/textEditor/_index.scss
@@ -390,6 +390,8 @@ $material-filled-texteditor-spin-button-horizontal-padding: $material-filled-tex
   $material-texteditor-label-font-size,
   $material-texteditor-label-top-offset,
   $material-texteditor-font-size,
+  $material-texteditor-font-size,
+  $material-texteditor-font-size,
   $material-standard-texteditor-with-label-input-top-padding,
   $material-standard-texteditor-with-label-input-bottom-padding,
 );

diff --git a/...ons/Lookup label with labelMode=floating-styleMode=outlined (generic-light).png b/...ons/Lookup label with labelMode=floating-styleMode=outlined (generic-light).png
diff --git a/...okup label with labelMode=floating-styleMode=outlined (material-blue-light).png b/...okup label with labelMode=floating-styleMode=outlined (material-blue-light).png
diff --git a/...up label with labelMode=floating-styleMode=underlined (material-blue-light).png b/...up label with labelMode=floating-styleMode=underlined (material-blue-light).png
diff --git a/...alons/Lookup label with labelMode=static-styleMode=outlined (generic-light).png b/...alons/Lookup label with labelMode=static-styleMode=outlined (generic-light).png
diff --git a/...Lookup label with labelMode=static-styleMode=outlined (material-blue-light).png b/...Lookup label with labelMode=static-styleMode=outlined (material-blue-light).png
diff --git a/...ons/Lookup label with labelMode=static-styleMode=underlined (generic-light).png b/...ons/Lookup label with labelMode=static-styleMode=underlined (generic-light).png
diff --git a/...okup label with labelMode=static-styleMode=underlined (material-blue-light).png b/...okup label with labelMode=static-styleMode=underlined (material-blue-light).png
diff --git a/...itors/textBox/etalons/Textbox render stylingMode=underlined (generic-light).png b/...itors/textBox/etalons/Textbox render stylingMode=underlined (generic-light).png
diff --git a/...textBox/etalons/Textbox render stylingMode=underlined (material-blue-light).png b/...textBox/etalons/Textbox render stylingMode=underlined (material-blue-light).png