Skip to content

Commit e0a68e7

Browse files
Merge pull request #754 from dxc-technology/jialecl-radioGroup
error="" behaviour + readOnly cursor
2 parents 86bd6e3 + f33dfa3 commit e0a68e7

File tree

4 files changed

+9
-3
lines changed

4 files changed

+9
-3
lines changed

projects/dxc-ngx-cdk-site/src/app/pages/theme-builder/previews/radio-preview/radio-preview.component.html

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,12 @@
3232
<dxc-radio-group
3333
[options]="options"
3434
label="readOnly radio"
35-
error="error message"
35+
error=""
36+
></dxc-radio-group>
37+
<dxc-radio-group
38+
[options]="options"
39+
label="readOnly radio"
40+
error="Error message"
3641
></dxc-radio-group>
3742
</tbuilder-component-mode>
3843
<tbuilder-component-mode text="Default">

projects/dxc-ngx-cdk/src/lib/dxc-radio-group/dxc-radio-group.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@
1717
</ng-container>
1818
</div>
1919
<input #inputRef class="valueInput" [name]="name" [value]="value" readOnly aria-hidden="true" />
20-
<span *ngIf="error" class="errorMessage">{{ error }}</span>
20+
<span *ngIf="error || error===''" class="errorMessage">{{ error }}</span>

projects/dxc-ngx-cdk/src/lib/dxc-radio-group/dxc-radio-group.component.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -290,6 +290,7 @@ export class DxcRadioGroupComponent implements OnInit {
290290
font-weight: var(--radioGroup-errorMessageFontWeight);
291291
line-height: var(--radioGroup-errorMessageLineHeight);
292292
font-family: var(--radioGroup-labelFontFamily);
293+
height: var(--radioGroup-errorMessageLineHeight);
293294
}
294295
.valueInput {
295296
display: none;

projects/dxc-ngx-cdk/src/lib/dxc-radio-group/dxc-radio/dxc-radio.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ export class DxcRadioGroupItemComponent implements OnInit {
137137
return css`
138138
display: inline-flex;
139139
align-items: center;
140-
${inputs.disabled ? "pointer-events: none" : "cursor: pointer"};
140+
${inputs.disabled ? "pointer-events: none" : inputs.readOnlyState ? "cursor: default" : "cursor: pointer"};
141141
width: fit-content;
142142
.radioInputContainer {
143143
display: flex;

0 commit comments

Comments
 (0)