mirror of
https://github.com/DSpace/dspace-angular.git
synced 2025-10-07 18:14:17 +00:00
[TLC-254] Hidden fields can collapse in row, revert drag-handle problem
apply d-none class to form-control container when model is hidden
css rule for ds-form-control-container.d-none forces collapse
drag-handle fix from 9019b809
was recent and is applied manually here too
This commit is contained in:
@@ -3,6 +3,7 @@
|
|||||||
[group]="formGroup"
|
[group]="formGroup"
|
||||||
[hasErrorMessaging]="model.hasErrorMessages"
|
[hasErrorMessaging]="model.hasErrorMessages"
|
||||||
[hidden]="model.hidden"
|
[hidden]="model.hidden"
|
||||||
|
[class.d-none]="model.hidden"
|
||||||
[layout]="formLayout"
|
[layout]="formLayout"
|
||||||
[model]="model"
|
[model]="model"
|
||||||
[templates]="templates"
|
[templates]="templates"
|
||||||
|
@@ -17,8 +17,8 @@
|
|||||||
[cdkDragPreviewClass]="'ds-submission-reorder-dragging'"
|
[cdkDragPreviewClass]="'ds-submission-reorder-dragging'"
|
||||||
[class.grey-background]="model.isInlineGroupArray">
|
[class.grey-background]="model.isInlineGroupArray">
|
||||||
<!-- Item content -->
|
<!-- Item content -->
|
||||||
<div class="drag-handle" [class.invisible]="dragDisabled" tabindex="0">
|
<div class="drag-handle" [class.drag-disable]="dragDisabled" tabindex="0">
|
||||||
<i class="drag-icon fas fa-grip-vertical fa-fw" ></i>
|
<i class="drag-icon fas fa-grip-vertical fa-fw" [class.drag-disable]="dragDisabled" ></i>
|
||||||
</div>
|
</div>
|
||||||
<ng-container *ngTemplateOutlet="startTemplate?.templateRef; context: groupModel"></ng-container>
|
<ng-container *ngTemplateOutlet="startTemplate?.templateRef; context: groupModel"></ng-container>
|
||||||
<ds-dynamic-form-control-container *ngFor="let _model of groupModel.group"
|
<ds-dynamic-form-control-container *ngFor="let _model of groupModel.group"
|
||||||
@@ -28,6 +28,7 @@
|
|||||||
[context]="groupModel"
|
[context]="groupModel"
|
||||||
[group]="control.get([idx])"
|
[group]="control.get([idx])"
|
||||||
[hidden]="_model.hidden"
|
[hidden]="_model.hidden"
|
||||||
|
[class.d-none]="_model.hidden"
|
||||||
[layout]="formLayout"
|
[layout]="formLayout"
|
||||||
[model]="_model"
|
[model]="_model"
|
||||||
[templates]="templates"
|
[templates]="templates"
|
||||||
|
@@ -11,6 +11,7 @@
|
|||||||
[group]="control"
|
[group]="control"
|
||||||
[hasErrorMessaging]="model.hasErrorMessages"
|
[hasErrorMessaging]="model.hasErrorMessages"
|
||||||
[hidden]="_model.hidden"
|
[hidden]="_model.hidden"
|
||||||
|
[class.d-none]="_model.hidden"
|
||||||
[layout]="formLayout"
|
[layout]="formLayout"
|
||||||
[model]="_model"
|
[model]="_model"
|
||||||
[templates]="templates"
|
[templates]="templates"
|
||||||
|
@@ -108,3 +108,10 @@ ngb-modal-backdrop {
|
|||||||
.ml-gap {
|
.ml-gap {
|
||||||
margin-left: var(--ds-gap);
|
margin-left: var(--ds-gap);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ds-dynamic-form-control-container.d-none {
|
||||||
|
/* Ensures that form-control containers hidden and disabled by type binding collapse and let other fields in
|
||||||
|
the same row expand accordingly
|
||||||
|
*/
|
||||||
|
visibility: collapse;
|
||||||
|
}
|
||||||
|
Reference in New Issue
Block a user