Merge branch 'master' into rivanova/fix-12245-master

Author: teodosiah

projects/igniteui-angular/migrations/update-15_0_0/changes/inputs.json

@@ -0,0 +1,21 @@
+{
+    "@scheme": "../../common/schema/binding.schema.json",
+    "changes": [
+        {
+            "name": "disabled",
+            "remove": "true",
+            "owner": {
+                "selector": "igx-radio-group",
+                "type": "component"
+            }
+        },
+        {
+            "name": "labelPosition",
+            "remove": "true",
+            "owner": {
+                "selector": "igx-radio-group",
+                "type": "component"
+            }
+        }
+    ]
+}

projects/igniteui-angular/migrations/update-15_0_0/index.spec.ts

@@ -147,4 +147,28 @@ describe(`Update to ${version}`, () => {
 `@include igniteui.elevations($material-elevations);`
         );
     });
+
+    it('should remove the disabled property from the igx-radio-group', async () => {
+        appTree.create(
+            '/testSrc/appPrefix/component/test.component.html', `
+            <igx-radio-group disabled="true"></igx-radio-group>`);
+        const tree = await schematicRunner.runSchematicAsync(migrationName, {}, appTree)
+            .toPromise();
+
+        expect(tree.readContent('/testSrc/appPrefix/component/test.component.html'))
+            .toEqual(`
+            <igx-radio-group></igx-radio-group>`);
+    });
+
+    it('should remove the labelPosition property from the igx-radio-group', async () => {
+        appTree.create(
+            '/testSrc/appPrefix/component/test.component.html', `
+            <igx-radio-group labelPosition="before"></igx-radio-group>`);
+        const tree = await schematicRunner.runSchematicAsync(migrationName, {}, appTree)
+            .toPromise();
+
+        expect(tree.readContent('/testSrc/appPrefix/component/test.component.html'))
+            .toEqual(`
+            <igx-radio-group></igx-radio-group>`);
+    });
 });

projects/igniteui-angular/src/lib/directives/radio/radio-group.directive.spec.ts

@@ -43,9 +43,6 @@ describe('IgxRadioGroupDirective', () => {
         const allButtonsWithGroupName = radioInstance.radioButtons.filter((btn) => btn.name === radioInstance.name);
         expect(allButtonsWithGroupName.length).toEqual(radioInstance.radioButtons.length);
 
-        const allButtonsWithGroupLabelPos = radioInstance.radioButtons.filter((btn) => btn.labelPosition === radioInstance.labelPosition);
-        expect(allButtonsWithGroupLabelPos.length).toEqual(radioInstance.radioButtons.length);
-
         const buttonWithGroupValue = radioInstance.radioButtons.find((btn) => btn.value === radioInstance.value);
         expect(buttonWithGroupValue).toBeDefined();
         expect(buttonWithGroupValue).toEqual(radioInstance.selected);
@@ -73,20 +70,6 @@ describe('IgxRadioGroupDirective', () => {
 
         const allRequiredButtons = radioInstance.radioButtons.filter((btn) => btn.required);
         expect(allRequiredButtons.length).toEqual(radioInstance.radioButtons.length);
-
-        // labelPosition
-        radioInstance.labelPosition = 'after';
-        fixture.detectChanges();
-
-        const allAfterButtons = radioInstance.radioButtons.filter((btn) => btn.labelPosition === 'after');
-        expect(allAfterButtons.length).toEqual(radioInstance.radioButtons.length);
-
-        // disabled
-        radioInstance.disabled = true;
-        fixture.detectChanges();
-
-        const allDisabledButtons = radioInstance.radioButtons.filter((btn) => btn.disabled);
-        expect(allDisabledButtons.length).toEqual(radioInstance.radioButtons.length);
     }));
 
     it('Set value should change selected property and emit change event.', fakeAsync(() => {
@@ -244,7 +227,7 @@ class RadioGroupSimpleComponent {
 }
 
 @Component({
-    template: `<igx-radio-group #radioGroup name="radioGroup" value="Baz" required="true" labelPosition="before">
+    template: `<igx-radio-group #radioGroup name="radioGroup" value="Baz" required="true">
     <igx-radio *ngFor="let item of ['Foo', 'Bar', 'Baz']" value="{{item}}">
         {{item}}
     </igx-radio>

projects/igniteui-angular/src/lib/directives/radio/radio-group.directive.ts

@@ -6,7 +6,7 @@ import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
 import { noop, Subject } from 'rxjs';
 import { startWith, takeUntil } from 'rxjs/operators';
 import { mkenum } from '../../core/utils';
-import { IChangeRadioEventArgs, IgxRadioComponent, RadioLabelPosition } from '../../radio/radio.component';
+import { IChangeRadioEventArgs, IgxRadioComponent } from '../../radio/radio.component';
 import { IgxRippleModule } from '../ripple/ripple.directive';
 
 /**
@@ -50,7 +50,6 @@ let nextId = 0;
 })
 export class IgxRadioGroupDirective implements AfterContentInit, ControlValueAccessor, OnDestroy {
     private static ngAcceptInputType_required: boolean | '';
-    private static ngAcceptInputType_disabled: boolean | '';
     /**
      * Returns reference to the child radio buttons.
      *
@@ -119,49 +118,6 @@ export class IgxRadioGroupDirective implements AfterContentInit, ControlValueAcc
         this._setRadioButtonsRequired();
     }
 
-    /**
-     * @deprecated in version 12.2.0
-     *
-     * An input property that allows you to disable the radio group. By default it's false.
-     *
-     * @example
-     *  ```html
-     * <igx-radio-group disabled></igx-radio-group>
-     * ```
-     */
-    @Input()
-    public get disabled(): boolean {
-        return this._disabled;
-    }
-    public set disabled(value: boolean) {
-        this._disabled = (value as any) === '' || value;
-        this.setDisabledState(value);
-    }
-
-    /**
-     * @deprecated in version 12.2.0
-     *
-     * Sets/gets the position of the `label` in the child radio buttons.
-     *
-     * @remarks
-     * If not set, `labelPosition` will have value `"after"`.
-     *
-     * @example
-     * ```html
-     * <igx-radio-group labelPosition = "before"></igx-radio-group>
-     * ```
-     */
-    @Input()
-    public get labelPosition(): RadioLabelPosition | string {
-        return this._labelPosition;
-    }
-    public set labelPosition(newValue: RadioLabelPosition | string) {
-        if (this._labelPosition !== newValue) {
-            this._labelPosition = newValue === RadioLabelPosition.BEFORE ? RadioLabelPosition.BEFORE : RadioLabelPosition.AFTER;
-            this._setRadioButtonLabelPosition();
-        }
-    }
-
     /**
      * Sets/gets the selected child radio button.
      *
@@ -271,16 +227,6 @@ export class IgxRadioGroupDirective implements AfterContentInit, ControlValueAcc
      * @internal
      */
     private _isInitialized = false;
-    /**
-     * @hidden
-     * @internal
-     */
-    private _labelPosition: RadioLabelPosition | string = 'after';
-    /**
-     * @hidden
-     * @internal
-     */
-    private _disabled = false;
     /**
      * @hidden
      * @internal
@@ -338,18 +284,6 @@ export class IgxRadioGroupDirective implements AfterContentInit, ControlValueAcc
         this._onChangeCallback = fn;
     }
 
-    /**
-     * @hidden
-     * @internal
-     */
-    public setDisabledState(isDisabled: boolean) {
-        if (this.radioButtons) {
-            this.radioButtons.forEach((button) => {
-                button.setDisabledState(isDisabled);
-            });
-        }
-    }
-
     /**
      * Registers a function called when the control is touched.
      *
@@ -383,14 +317,6 @@ export class IgxRadioGroupDirective implements AfterContentInit, ControlValueAcc
             this.radioButtons.forEach((button) => {
                 Object.assign(button, props);
 
-                if(button.disabled === undefined) {
-                    button.disabled = this._disabled;
-                }
-
-                if(button.labelPosition === undefined) {
-                    button.labelPosition = this._labelPosition;
-                }
-
                 if (button.value === this._value) {
                     button.checked = true;
                     this._selected = button;
@@ -468,18 +394,6 @@ export class IgxRadioGroupDirective implements AfterContentInit, ControlValueAcc
         }
     }
 
-    /**
-     * @hidden
-     * @internal
-     */
-    private _setRadioButtonLabelPosition() {
-        if (this.radioButtons) {
-            this.radioButtons.forEach((button) => {
-                button.labelPosition = this._labelPosition;
-            });
-        }
-    }
-
     /**
      * @hidden
      * @internal