[ADF-4915][Form] FormField: When required is set to true, asterisk ap…

…ppears in placeholder text (#7399) * [ADF-4915][Form] FormField: When required is set to true, asterix appears in placeholder text * [ADF-4915][Form] FormField: When required is set to true, asterix appears in placeholder text
Alfresco · Nov 30, 2021 · 2b25b50 · 2b25b50
1 parent ee4efeb
commit 2b25b50
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 9 deletions.
diff --git a/lib/core/form/components/widgets/amount/amount.widget.html b/lib/core/form/components/widgets/amount/amount.widget.html
@@ -3,7 +3,7 @@
      [class.adf-readonly]="field.readOnly">
     <label class="adf-label"
            [attr.for]="field.id">{{field.name | translate }}<span *ngIf="isRequired()">*</span></label>
-    <mat-form-field class="adf-amount-widget__input">
+    <mat-form-field class="adf-amount-widget__input" [hideRequiredMarker]="true">
         <span matPrefix class="adf-amount-widget__prefix-spacing">{{ currency }} &nbsp;</span>
         <input matInput
                [matTooltip]="field.tooltip"

diff --git a/lib/core/form/components/widgets/amount/amount.widget.spec.ts b/lib/core/form/components/widgets/amount/amount.widget.spec.ts
@@ -119,10 +119,8 @@ describe('AmountWidgetComponent - rendering', () => {
         fixture.detectChanges();
         await fixture.whenStable();
 
-        const requiredAsteriscElement = fixture.nativeElement.querySelector('.mat-placeholder-required');
-        expect(requiredAsteriscElement.textContent).toContain('*');
         const widgetPlaceholder = fixture.nativeElement.querySelector('label.mat-form-field-label');
-        expect(widgetPlaceholder.textContent).toBe('Check Placeholder Text *');
+        expect(widgetPlaceholder.textContent).toBe('Check Placeholder Text');
         const widgetLabel = fixture.nativeElement.querySelector('label.adf-label');
         expect(widgetLabel.textContent).toBe('Test Amount*');
         const widgetPrefix = fixture.nativeElement.querySelector('div.mat-form-field-prefix');

diff --git a/lib/core/form/components/widgets/date-time/date-time.widget.html b/lib/core/form/components/widgets/date-time/date-time.widget.html
@@ -1,5 +1,5 @@
 <div class="{{field.className}}" id="data-time-widget" [class.adf-invalid]="!field.isValid">
-    <mat-form-field class="adf-date-time-widget">
+    <mat-form-field class="adf-date-time-widget" [hideRequiredMarker]="true">
         <label class="adf-label" [attr.for]="field.id">{{field.name | translate }} ({{field.dateDisplayFormat}})<span *ngIf="isRequired()">*</span></label>
         <input matInput
                [id]="field.id"

diff --git a/lib/core/form/components/widgets/date/date.widget.html b/lib/core/form/components/widgets/date/date.widget.html
@@ -1,5 +1,5 @@
 <div class="{{field.className}}" id="data-widget" [class.adf-invalid]="!field.isValid">
-    <mat-form-field class="adf-date-widget">
+    <mat-form-field class="adf-date-widget" [hideRequiredMarker]="true">
         <label class="adf-label" [attr.for]="field.id">{{field.name | translate }} ({{field.dateDisplayFormat}})<span *ngIf="isRequired()">*</span></label>
         <input matInput
                [id]="field.id"

diff --git a/lib/core/form/components/widgets/multiline-text/multiline-text.widget.html b/lib/core/form/components/widgets/multiline-text/multiline-text.widget.html
@@ -1,6 +1,6 @@
 <div class="adf-multiline-text-widget {{field.className}}"
      [class.adf-invalid]="!field.isValid" [class.adf-readonly]="field.readOnly">
-    <mat-form-field floatPlaceholder="never">
+    <mat-form-field floatPlaceholder="never" [hideRequiredMarker]="true">
         <label class="adf-label" [attr.for]="field.id">{{field.name | translate }}<span *ngIf="isRequired()">*</span></label>
         <textarea matInput class="adf-input"
                   [matTextareaAutosize]="true"

diff --git a/lib/core/form/components/widgets/number/number.widget.html b/lib/core/form/components/widgets/number/number.widget.html
@@ -1,6 +1,6 @@
 <div class="adf-textfield adf-number-widget {{field.className}}"
      [class.adf-invalid]="!field.isValid" [class.adf-readonly]="field.readOnly">
-    <mat-form-field>
+    <mat-form-field [hideRequiredMarker]="true">
         <label class="adf-label" [attr.for]="field.id">{{field.name | translate }}<span *ngIf="isRequired()">*</span></label>
         <input matInput
                class="adf-input"

diff --git a/lib/core/form/components/widgets/text/text.widget.html b/lib/core/form/components/widgets/text/text.widget.html
@@ -1,6 +1,6 @@
 <div class="adf-textfield adf-text-widget {{field.className}}"
      [class.adf-invalid]="!field.isValid" [class.adf-readonly]="field.readOnly">
-    <mat-form-field>
+    <mat-form-field [hideRequiredMarker]="true">
         <label class="adf-label" [attr.for]="field.id">{{field.name | translate }}<span *ngIf="isRequired()">*</span></label>
         <input matInput
                class="adf-input"