diff --git a/projects/common/element-components/text-area.component.ts b/projects/common/element-components/text-area.component.ts index 216ce06b1c428411f757daa2b8377d1fb6a3a438..f92f2f4aa47af0f2c810c334c0566e864849b5c0 100644 --- a/projects/common/element-components/text-area.component.ts +++ b/projects/common/element-components/text-area.component.ts @@ -6,7 +6,7 @@ import { FormElementComponent } from '../form-element-component.directive'; selector: 'app-text-area', template: ` <mat-form-field [style.width.%]="100" - [style.height.%]="100" + [style.min-height.%]="100" [style.background-color]="elementModel.backgroundColor" [style.color]="elementModel.fontColor" [style.font-family]="elementModel.font" @@ -19,8 +19,9 @@ import { FormElementComponent } from '../form-element-component.directive'; (focus)="onFocus.emit(input)" (blur)="onBlur.emit(input)" placeholder="{{elementModel.label}}" + [style.min-width.%]="100" [style.resize]="elementModel.resizeEnabled ? 'both' : 'none'"> - </textarea> + </textarea> </mat-form-field> ` }) diff --git a/projects/player/src/app/components/element-overlay/element-overlay.component.ts b/projects/player/src/app/components/element-overlay/element-overlay.component.ts index b29192c461d68895d4c47881b3d2f881d9bba99e..da16bd367316ea2fd6e684e1a3f0969862f18754 100644 --- a/projects/player/src/app/components/element-overlay/element-overlay.component.ts +++ b/projects/player/src/app/components/element-overlay/element-overlay.component.ts @@ -38,7 +38,7 @@ export class ElementOverlayComponent implements OnInit { const elementComponentRef = this.elementComponentContainer.createComponent(elementComponentFactory); elementComponentRef.location.nativeElement.style.display = 'block'; - elementComponentRef.location.nativeElement.style.height = this.elementModel.type === 'text' ? 'auto' : '100%'; + elementComponentRef.location.nativeElement.style.height = '100%'; const elementComponent = elementComponentRef.instance; elementComponent.elementModel = this.elementModel; diff --git a/projects/player/src/app/components/element/element.component.html b/projects/player/src/app/components/element/element.component.html index 2be6d60e027b880af898f2874d0bc8aa660f719a..1c371fed24f7406ece67a66b1a87f5ccbd0c7f71 100644 --- a/projects/player/src/app/components/element/element.component.html +++ b/projects/player/src/app/components/element/element.component.html @@ -1,7 +1,7 @@ <app-element-overlay [style.overflow]="'auto'" - [style.display]="'block'" - [style.width]="elementModel.dynamicPositioning ? '100%': elementModel.width + 'px'" + [style.display]="elementModel.dynamicPositioning ?'contents' : 'block'" + [style.width]="elementModel.dynamicPositioning ? '100%': elementModel.width + 'px'" [style.height]="elementModel.dynamicPositioning ? '100%' : elementModel.height + 'px'" [elementModel]="elementModel" [parentForm]="elementForm" diff --git a/projects/player/src/app/components/page/page.component.html b/projects/player/src/app/components/page/page.component.html index ad3c29be7b73c39f99159f21c07f3be8540b1382..8f4f1daed5694071cf9f3a6f2d7c5b335f82fc51 100644 --- a/projects/player/src/app/components/page/page.component.html +++ b/projects/player/src/app/components/page/page.component.html @@ -8,7 +8,7 @@ [section]="section" [ngStyle]="{ position: 'relative', - display: 'block', + display: section.dynamicPositioning ? 'contents' : 'block', overflow: 'auto', width: '100%', 'background-color': section.backgroundColor, diff --git a/projects/player/src/app/components/section/section.component.html b/projects/player/src/app/components/section/section.component.html index d3ca802beb5ec9ddbe6b4b69ff15b3162350e506..aede4daf39d1fe90ab7c1b6f2cdb72b36f401f11 100644 --- a/projects/player/src/app/components/section/section.component.html +++ b/projects/player/src/app/components/section/section.component.html @@ -30,8 +30,7 @@ [style.grid-column-end]="element.gridColumnEnd" [style.grid-row-start]="element.gridRowStart" [style.grid-row-end]="element.gridRowEnd" - [style.display]=" element.type === 'radio' ? 'inherit' : 'block'" - [style.height.%]="100" + [style.display]="element.dynamicPositioning ? (element.type === 'radio') ? 'contents' : 'inline' : 'block'" [elementModel]="element" [parentForm]="sectionForm" [parentArrayIndex]="i">