Merge branch '9.0.x' into mkirova/fix-6701-9.0.x

Author: ChronosSF

CHANGELOG.md

@@ -106,6 +106,7 @@ All notable changes for each version of this project will be documented in this
     </igx-grid>
     ```
 - `IgxSlider`:
+    - **Breaking Change** - `isContinuous` - input has been deleted. The option is not supported anymore.
     - `primaryTicks` input was added. Which sets the number of primary ticks
     - `secondaryTicks` input was added. Which sets the number of secondary ticks.
     - `showTicks` input was added. Which show/hide all slider ticks and tick labels.
@@ -114,7 +115,6 @@ All notable changes for each version of this project will be documented in this
     - `ticksOrientation` input was added. Allows to change ticks orientation to top|bottom|mirror.
     - `tickLabelsOrientation` input was added. Allows you to change the rotation of all tick labels from horizontal to vertical(toptobottom, bottomtotop).
     - `igxSliderTickLabel` directive has been introduced. Allows you to set a custom template for all tick labels.
-    - `isContinuous` - input has been deleted. The option is not supported anymore.
     - `onValueChanged` - new output has been exposed. This event is emitted at the end of every slide interaction.
 
 - `IgxCarousel`:

projects/igniteui-angular/src/lib/slider/slider.component.spec.ts

@@ -567,15 +567,15 @@ describe('IgxSlider', () => {
             fixture.detectChanges();
 
             expect(sliderEl).toBeDefined();
-            let activeThumb = sliderEl.query(By.css('.igx-slider__thumb-to--active'));
-            expect(activeThumb).not.toBeNull();
+            let activeLabel = fixture.debugElement.query(By.css('.igx-slider__label-to--active'));
+            expect(activeLabel).not.toBeNull();
 
             sliderEl.nativeElement.dispatchEvent( new PointerEvent('pointerup', { pointerId: 1 }));
             await wait(slider.thumbLabelVisibilityDuration + 10);
             fixture.detectChanges();
 
-            activeThumb = fixture.debugElement.query(By.css('.igx-slider__thumb-to--active'));
-            expect(activeThumb).toBeNull();
+            activeLabel = fixture.debugElement.query(By.css('.igx-slider__label-to--active'));
+            expect(activeLabel).toBeNull();
         });
 
         it('should be able to change thumbLabelVisibilityDuration', async() => {
@@ -586,20 +586,20 @@ describe('IgxSlider', () => {
             fixture.detectChanges();
 
             expect(sliderEl).toBeDefined();
-            let activeThumb = sliderEl.query(By.css('.igx-slider__thumb-to--active'));
-            expect(activeThumb).not.toBeNull();
+            let activeLabel = fixture.debugElement.query(By.css('.igx-slider__label-to--active'));
+            expect(activeLabel).not.toBeNull();
 
             sliderEl.nativeElement.dispatchEvent( new PointerEvent('pointerup', { pointerId: 1 }));
             await wait(750);
             fixture.detectChanges();
 
-            activeThumb = sliderEl.query(By.css('.igx-slider__thumb-to--active'));
-            expect(activeThumb).not.toBeNull();
+            activeLabel = fixture.debugElement.query(By.css('.igx-slider__label-to--active'));
+            expect(activeLabel).not.toBeNull();
 
             await wait(300);
             fixture.detectChanges();
-            activeThumb = sliderEl.query(By.css('.igx-slider__thumb-to--active'));
-            expect(activeThumb).toBeNull();
+            activeLabel = fixture.debugElement.query(By.css('.igx-slider__label-to--active'));
+            expect(activeLabel).toBeNull();
         });
 
         it('rendering of the slider should corresponds to the set labels', () => {
@@ -838,15 +838,15 @@ describe('IgxSlider', () => {
             fixture.detectChanges();
 
             expect(sliderEl).toBeDefined();
-            let activeThumb = fixture.debugElement.query(By.css('.igx-slider__thumb-from--active'));
-            expect(activeThumb).not.toBeNull();
+            let activeLabel = fixture.debugElement.query(By.css('.igx-slider__label-from--active'));
+            expect(activeLabel).not.toBeNull();
 
             sliderEl.dispatchEvent( new PointerEvent('pointerup', { pointerId: 1}));
             await wait(slider.thumbLabelVisibilityDuration + 10);
             fixture.detectChanges();
 
-            activeThumb = fixture.debugElement.query(By.css('.igx-slider__thumb-from--active'));
-            expect(activeThumb).toBeNull();
+            activeLabel = fixture.debugElement.query(By.css('.igx-slider__label-from--active'));
+            expect(activeLabel).toBeNull();
         });
 
         it('should be able to change thumbLabelVisibilityDuration', async() => {
@@ -857,20 +857,20 @@ describe('IgxSlider', () => {
             fixture.detectChanges();
 
             expect(sliderEl).toBeDefined();
-            let activeThumb = fixture.debugElement.query(By.css('.igx-slider__thumb-from--active'));
-            expect(activeThumb).not.toBeNull();
+            let activeLabel = fixture.debugElement.query(By.css('.igx-slider__label-from--active'));
+            expect(activeLabel).not.toBeNull();
 
             sliderEl.dispatchEvent( new PointerEvent('pointerup', { pointerId: 1}));
             await wait(750);
             fixture.detectChanges();
 
-            activeThumb = fixture.debugElement.query(By.css('.igx-slider__thumb-from--active'));
-            expect(activeThumb).not.toBeNull();
+            activeLabel = fixture.debugElement.query(By.css('.igx-slider__label-from--active'));
+            expect(activeLabel).not.toBeNull();
 
             await wait(300);
             fixture.detectChanges();
-            activeThumb = fixture.debugElement.query(By.css('.igx-slider__thumb-from--active'));
-            expect(activeThumb).toBeNull();
+            activeLabel = fixture.debugElement.query(By.css('.igx-slider__label-from--active'));
+            expect(activeLabel).toBeNull();
         });
 
         it('rendering of the slider should corresponds to the set labels', () => {
@@ -884,32 +884,32 @@ describe('IgxSlider', () => {
 
             UIInteractions.triggerKeyDownEvtUponElem('ArrowRight', fromThumb.nativeElement, true);
             fixture.detectChanges();
-            expect(fixture.componentInstance.label).toEqual({lower: 1, upper: 6});
+            expect(fixture.componentInstance.slider.value).toEqual({lower: 1, upper: 6});
             expect(slider.lowerLabel).toEqual('Tuesday');
 
             UIInteractions.triggerKeyDownEvtUponElem('ArrowRight', fromThumb.nativeElement, true);
             fixture.detectChanges();
-            expect(fixture.componentInstance.label).toEqual({lower: 2, upper: 6});
+            expect(fixture.componentInstance.slider.value).toEqual({lower: 2, upper: 6});
             expect(slider.lowerLabel).toEqual('Wednesday');
 
             UIInteractions.triggerKeyDownEvtUponElem('ArrowRight', fromThumb.nativeElement, true);
             fixture.detectChanges();
-            expect(fixture.componentInstance.label).toEqual({lower: 3, upper: 6});
+            expect(fixture.componentInstance.slider.value).toEqual({lower: 3, upper: 6});
             expect(slider.lowerLabel).toEqual('Thursday');
 
             UIInteractions.triggerKeyDownEvtUponElem('ArrowRight', fromThumb.nativeElement, true);
             fixture.detectChanges();
-            expect(fixture.componentInstance.label).toEqual({lower: 4, upper: 6});
+            expect(fixture.componentInstance.slider.value).toEqual({lower: 4, upper: 6});
             expect(slider.lowerLabel).toEqual('Friday');
 
             UIInteractions.triggerKeyDownEvtUponElem('ArrowLeft', toThumb.nativeElement, true);
             fixture.detectChanges();
-            expect(fixture.componentInstance.label).toEqual({lower: 4, upper: 5});
+            expect(fixture.componentInstance.slider.value).toEqual({lower: 4, upper: 5});
             expect(slider.upperLabel).toEqual('Saturday');
 
             UIInteractions.triggerKeyDownEvtUponElem('ArrowLeft', toThumb.nativeElement, true);
             fixture.detectChanges();
-            expect(fixture.componentInstance.label).toEqual({lower: 4, upper: 4});
+            expect(fixture.componentInstance.slider.value).toEqual({lower: 4, upper: 4});
             expect(slider.upperLabel).toEqual('Friday');
         });
 
@@ -1686,19 +1686,21 @@ class SliderWithLabelsComponent {
 
 @Component({
     template: `
-    <igx-slider [(ngModel)]='label' [type]="type"
-        [labels]="['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday']">
+    <igx-slider
+    [labels]="['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday']"
+    [type]="type">
     </igx-slider> `
 })
 class RangeSliderWithLabelsComponent {
-    @ViewChild(IgxSliderComponent, { read: IgxSliderComponent, static: true }) public slider: IgxSliderComponent;
-    public label;
+    @ViewChild(IgxSliderComponent, { read: IgxSliderComponent, static: true })
+    public slider: IgxSliderComponent;
+
     public type = IgxSliderType.RANGE;
 }
 
 @Component({
     template: `
-    <igx-slider [(ngModel)]='label' [type]="type"
+    <igx-slider [type]="type"
         [labels]="['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday']">
         <ng-template igxSliderThumbFrom let-value let-labels="labels">
             <span class="custom"> Lower {{ labels[value.lower] }}</span>

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

@@ -11,7 +11,8 @@ import {
     QueryList,
     ChangeDetectorRef,
     OnChanges,
-    NgZone
+    NgZone,
+    AfterContentInit
 } from '@angular/core';
 import { ControlValueAccessor, NG_VALUE_ACCESSOR, FormsModule } from '@angular/forms';
 import { EditorProvider } from '../core/edit-provider';
@@ -63,6 +64,7 @@ export class IgxSliderComponent implements
     EditorProvider,
     OnInit,
     AfterViewInit,
+    AfterContentInit,
     OnChanges,
     OnDestroy {
 
@@ -81,6 +83,7 @@ export class IgxSliderComponent implements
     private _continuous = false;
     private _disabled = false;
     private _step = 1;
+    private _value: number | IRangeSliderValue = 0;
 
     // ticks
     private _primaryTicks = 0;
@@ -615,18 +618,11 @@ export class IgxSliderComponent implements
      */
     @Input()
     public set value(value: number | IRangeSliderValue) {
-        if (!this.isRange) {
-            this.upperValue = value as number - (value as number % this.step);
-        } else {
-            value = this.validateInitialValue(value as IRangeSliderValue);
-            this.upperValue = (value as IRangeSliderValue).upper;
-            this.lowerValue = (value as IRangeSliderValue).lower;
-        }
-
-        this._onChangeCallback(this.value);
-
         if (this._hasViewInit) {
+            this.setValue(value);
             this.positionHandlersAndUpdateTrack();
+        } else {
+            this._value = value;
         }
     }
 
@@ -987,6 +983,10 @@ export class IgxSliderComponent implements
         }
     }
 
+    public ngAfterContentInit() {
+        this.setValue(this._value);
+    }
+
     /**
      * @hidden
      */
@@ -1405,6 +1405,18 @@ export class IgxSliderComponent implements
         return isSliderWithDifferentValue || isRangeWithOneDifferentValue;
     }
 
+    public setValue(value: number | IRangeSliderValue) {
+        if (!this.isRange) {
+            this.upperValue = value as number - (value as number % this.step);
+        } else {
+            value = this.validateInitialValue(value as IRangeSliderValue);
+            this.upperValue = (value as IRangeSliderValue).upper;
+            this.lowerValue = (value as IRangeSliderValue).lower;
+        }
+
+        this._onChangeCallback(this.value);
+    }
+
     private emitValueChanged(oldValue: number | IRangeSliderValue) {
         this.onValueChange.emit({ oldValue, value: this.value });
     }