fix(radio): add value reset with undefined (#2511)

akveo · Sep 17, 2020 · 9ac12c7 · 9ac12c7
1 parent 10b01fa
commit 9ac12c7
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/src/framework/theme/components/radio/radio-group.component.ts b/src/framework/theme/components/radio/radio-group.component.ts
@@ -182,13 +182,10 @@ export class NbRadioGroupComponent implements AfterContentInit, OnDestroy, Contr
 
   writeValue(value: any): void {
     this.value = value;
-
-    if (typeof value !== 'undefined') {
-      this.updateValues();
-    }
   }
 
   protected updateAndSubscribeToRadios() {
+    this.updateValueFromCheckedOption();
     this.updateNames();
     this.updateValues();
     this.updateDisabled();
@@ -204,9 +201,7 @@ export class NbRadioGroupComponent implements AfterContentInit, OnDestroy, Contr
   }
 
   protected updateValues() {
-    if (typeof this.value !== 'undefined') {
-      this.updateAndMarkForCheckRadios((radio: NbRadioComponent) => radio.checked = radio.value === this.value);
-    }
+    this.updateAndMarkForCheckRadios((radio: NbRadioComponent) => radio.checked = radio.value === this.value);
   }
 
   protected updateDisabled() {
@@ -277,4 +272,12 @@ export class NbRadioGroupComponent implements AfterContentInit, OnDestroy, Contr
       });
     }
   }
+
+  protected updateValueFromCheckedOption() {
+    const checkedRadio = this.radios.find((radio) => radio.checked);
+    const isValueMissing = this.value === undefined || this.value === null;
+    if (checkedRadio && isValueMissing && checkedRadio.value !== this.value) {
+      this.value = checkedRadio.value;
+    }
+  }
 }