Skip to content

Commit 750c23e

Browse files
Merge branch '11.1.x' into ddimitrov/fix-9146-11.1.x
2 parents cdec072 + 3e27163 commit 750c23e

File tree

4 files changed

+13
-1
lines changed

4 files changed

+13
-1
lines changed

projects/igniteui-angular/src/lib/radio/radio.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
[attr.aria-checked]="checked"
1010
[attr.aria-labelledby]="ariaLabelledBy"
1111
[attr.aria-label]="ariaLabel"
12-
(click)="_clicked($event)"
1312
(blur)="onBlur()" />
1413

1514
<label #nativeLabel class="igx-radio__composite" igxRipple
15+
(click)="_clicked($event)"
1616
igxRippleTarget=".igx-radio__ripple"
1717
[igxRippleDisabled]="disableRipple"
1818
[igxRippleCentered]="true"

projects/igniteui-angular/src/lib/radio/radio.component.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -323,6 +323,7 @@ export class IgxRadioComponent implements ControlValueAccessor, EditorProvider {
323323
public onKeyUp(event: KeyboardEvent) {
324324
event.stopPropagation();
325325
this.focused = true;
326+
this.select();
326327
}
327328

328329
/**

src/app/input/input.sample.html

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,4 +114,12 @@ <h4 class="sample-title">Checkbox sample</h4>
114114
</igx-list>
115115
</div>
116116
</article>
117+
118+
<article class="sample-column">
119+
<h4 class="sample-title">Radio w/ ngModel</h4>
120+
121+
<igx-radio [ngModel]="selected" (change)="onChange($event)" value="option1">Option 1</igx-radio>
122+
<igx-radio [ngModel]="selected" (change)="onChange($event)" value="option2">Option 2</igx-radio>
123+
<igx-radio [ngModel]="selected" (change)="onChange($event)" value="option3" disabled="true">Option 3</igx-radio>
124+
</article>
117125
</section>

src/app/input/input.sample.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ import { Component } from '@angular/core';
77
})
88
export class InputSampleComponent {
99
public placeholder = 'Please enter a value';
10+
public selected: string;
11+
1012
public user = {
1113
comment: '',
1214
firstName: 'John',
@@ -51,5 +53,6 @@ export class InputSampleComponent {
5153

5254
public onChange(event) {
5355
console.log(event);
56+
this.selected = event.value;
5457
}
5558
}

0 commit comments

Comments
 (0)