From c9dce3ed56fef54eec433307a60ba0b65bab858a Mon Sep 17 00:00:00 2001
From: rhenck <richard.henck@iqb.hu-berlin.de>
Date: Thu, 29 Jun 2023 18:42:50 +0200
Subject: [PATCH] Improve naming of ClozeChildComponent
---
...nt.ts => cloze-child-overlay.component.ts} | 25 +++++++++++++------
1 file changed, 17 insertions(+), 8 deletions(-)
rename projects/common/components/compound-elements/cloze/{compound-child-overlay.component.ts => cloze-child-overlay.component.ts} (65%)
diff --git a/projects/common/components/compound-elements/cloze/compound-child-overlay.component.ts b/projects/common/components/compound-elements/cloze/cloze-child-overlay.component.ts
similarity index 65%
rename from projects/common/components/compound-elements/cloze/compound-child-overlay.component.ts
rename to projects/common/components/compound-elements/cloze/cloze-child-overlay.component.ts
index 886750159..264277c74 100644
--- a/projects/common/components/compound-elements/cloze/compound-child-overlay.component.ts
+++ b/projects/common/components/compound-elements/cloze/cloze-child-overlay.component.ts
@@ -15,35 +15,44 @@ import { ValueChangeElement } from 'common/models/elements/element';
selector: 'aspect-compound-child-overlay',
template: `
<div [style.border]="isSelected ? 'purple solid 1px' : ''"
+ [style.width]="element.dimensions.isWidthFixed ? element.dimensions.width+'px' : null"
+ [style.height]="element.dimensions.isHeightFixed ? element.dimensions.height + 'px' : null"
+ [style.min-width]="!element.dimensions.isWidthFixed && element.dimensions.minWidth ?
+ element.dimensions.minWidth + 'px' : null"
+ [style.max-width]="!element.dimensions.isWidthFixed && element.dimensions.maxWidth ?
+ element.dimensions.maxWidth + 'px' : null"
+ [style.min-height]="!element.dimensions.isHeightFixed && element.dimensions.minHeight ?
+ element.dimensions.minHeight + 'px' : null"
+ [style.max-height]="!element.dimensions.isHeightFixed && element.dimensions.maxHeight ?
+ element.dimensions.maxHeight + 'px' : null"
(click)="elementSelected.emit(this); $event.stopPropagation();">
<aspect-text-field-simple *ngIf="element.type === 'text-field-simple'" #childComponent
[style.pointer-events]="editorMode ? 'none' : 'auto'"
[parentForm]="parentForm"
[elementModel]="$any(element)"
- [style.width.px]="element.width"
- [style.height.px]="element.height">
+ [style.width]="element.dimensions.isWidthFixed ? element.dimensions.width+'px' : 'unset'"
+ [style.height.px]="element.dimensions.height">
</aspect-text-field-simple>
<aspect-drop-list *ngIf="element.type === 'drop-list'" #childComponent
[clozeContext]="true"
[style.pointer-events]="editorMode ? 'none' : 'auto'"
[parentForm]="parentForm"
[elementModel]="$any(element)"
- [style.width.px]="element.width"
- [style.height.px]="element.height">
+ >
</aspect-drop-list>
<aspect-toggle-button *ngIf="element.type === 'toggle-button'" #childComponent
[style.pointer-events]="editorMode ? 'none' : 'auto'"
[parentForm]="parentForm"
[elementModel]="$any(element)"
- [style.width]="element.dynamicWidth ? 'unset' : element.width+'px'"
- [style.height.px]="element.height">
+ [style.width]="element.dimensions.isWidthFixed ? element.dimensions.width+'px' : 'unset'"
+ [style.height.px]="element.dimensions.height">
</aspect-toggle-button>
<aspect-button *ngIf="element.type === 'button'" #childComponent
[style.pointer-events]="editorMode ? 'none' : 'auto'"
[elementModel]="$any(element)"
- [style.width.px]="element.width"
- [style.height.px]="element.height">
+ [style.width.px]="element.dimensions.width"
+ [style.height.px]="element.dimensions.height">
</aspect-button>
</div>
`,
--
GitLab