feat: support auto min-height

taiga-family · Aug 6, 2024 · 900e4f3 · 900e4f3
1 parent acf8688
commit 900e4f3
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/projects/demo/src/app/app.component.html b/projects/demo/src/app/app.component.html
@@ -26,4 +26,4 @@
     </div>
 </header>
 
-<tui-doc-main></tui-doc-main>
+<tui-doc-main />
diff --git a/projects/demo/src/app/app.component.ts b/projects/demo/src/app/app.component.ts
@@ -14,11 +14,11 @@ import {TuiPreview} from '@taiga-ui/kit';
     imports: [
         RouterLink,
         TuiAddonDoc,
+        TuiDocHeader,
         TuiIcon,
         TuiLink,
         TuiPreview,
         TuiRoot,
-        TuiDocHeader,
     ],
     templateUrl: './app.component.html',
     styleUrls: ['./app.component.css'],

diff --git a/projects/demo/src/app/pages/starter/index.html b/projects/demo/src/app/pages/starter/index.html
@@ -9,8 +9,8 @@
                 [floatingToolbar]="floating"
                 [formControl]="control"
                 [readOnly]="readOnly"
-                [style.max-height.px]="maxHeight"
-                [style.min-height.px]="minHeight"
+                [style.max-height]="maxHeight"
+                [style.min-height]="minHeight"
                 [tools]="tools"
                 [tuiAutoFocus]="!isE2E"
             >
@@ -87,16 +87,16 @@ <h4>Text:</h4>
             </ng-template>
             <ng-template
                 documentationPropertyMode="input"
-                documentationPropertyName="style.minHeight.px"
-                documentationPropertyType="number"
+                documentationPropertyName="style.min-height"
+                documentationPropertyType="string"
                 [(documentationPropertyValue)]="minHeight"
             >
                 Value of CSS-property "min-height"
             </ng-template>
             <ng-template
                 documentationPropertyMode="input"
-                documentationPropertyName="style.maxHeight.px"
-                documentationPropertyType="number"
+                documentationPropertyName="style.max-height"
+                documentationPropertyType="string"
                 [(documentationPropertyValue)]="maxHeight"
             >
                 Value of CSS-property "max-height"

diff --git a/projects/demo/src/app/pages/starter/index.ts b/projects/demo/src/app/pages/starter/index.ts
@@ -62,8 +62,8 @@ export default class TuiEditorStarter {
     `);
 
     protected exampleText = '';
-    protected minHeight: number | null = null;
-    protected maxHeight: number | null = null;
+    protected minHeight = '';
+    protected maxHeight = '';
 
     protected readonly toolsVariants: ReadonlyArray<
         Set<TuiEditorToolType> | readonly TuiEditorToolType[]

diff --git a/projects/editor/src/components/editor-socket/editor-socket.component.less b/projects/editor/src/components/editor-socket/editor-socket.component.less
@@ -9,7 +9,7 @@
     }
 
     .ProseMirror {
-        min-height: 5.375rem;
+        min-height: 100%;
         padding: 0.2rem 1rem;
         outline: none;
         white-space: pre-wrap;

diff --git a/projects/editor/src/components/editor/editor.component.less b/projects/editor/src/components/editor/editor.component.less
@@ -62,8 +62,8 @@
 
 .t-scrollbar {
     display: flex;
-    border-bottom: 0.3125rem solid transparent;
-    padding-bottom: 1.3125rem;
+    min-height: 100%;
+    padding-bottom: 0.75rem;
     box-sizing: border-box;
     flex: 1;
 }