Merge pull request #384 from dolezaljan/cancel-handle-movement

Subscribe cancel handle movement

Author: piotrdz

CHANGELOG.md

@@ -1,3 +1,5 @@
+ * added cancelUserChange input EventEmitter (issue #139)
+
 # 18.0.0
  * add support for Angular 18 (issue #379)
 

src/demo-app/app/app-router.config.ts

@@ -10,6 +10,7 @@ import {
   LimitedRangeSliderComponent,
   LimitedSliderComponent,
   NoSwitchingRangeSliderComponent,
+  PreventChangeOnScrollSliderComponent,
   PushRangeSliderComponent,
   RangeSliderComponent,
   ReactiveFormRangeSliderComponent,
@@ -34,6 +35,7 @@ export const routerConfig: Routes = [
   { path: 'limited-range-slider', component: LimitedRangeSliderComponent },
   { path: 'limited-slider', component: LimitedSliderComponent },
   { path: 'no-switching-range-slider', component: NoSwitchingRangeSliderComponent },
+  { path: 'prevent-change-on-scroll-slider', component: PreventChangeOnScrollSliderComponent },
   { path: 'push-range-slider', component: PushRangeSliderComponent },
   { path: 'range-slider', component: RangeSliderComponent },
   { path: 'reactive-form-range-slider', component: ReactiveFormRangeSliderComponent },

src/demo-app/app/app.module.ts

@@ -38,6 +38,7 @@ import {
   LogScaleSliderComponent,
   ManualRefreshSliderComponent,
   NoSwitchingRangeSliderComponent,
+  PreventChangeOnScrollSliderComponent,
   PushRangeSliderComponent,
   RangeSliderComponent,
   ReactiveFormRangeSliderComponent,
@@ -96,6 +97,7 @@ import { routerConfig, routerOptions } from './app-router.config';
     LogScaleSliderComponent,
     ManualRefreshSliderComponent,
     NoSwitchingRangeSliderComponent,
+    PreventChangeOnScrollSliderComponent,
     PushRangeSliderComponent,
     RangeSliderComponent,
     ReactiveFormRangeSliderComponent,

src/demo-app/app/demos.component.html

@@ -9,6 +9,7 @@
   <app-limited-slider></app-limited-slider>
   <app-limited-range-slider></app-limited-range-slider>
   <app-no-switching-range-slider></app-no-switching-range-slider>
+  <app-prevent-change-on-scroll-slider></app-prevent-change-on-scroll-slider>
   <app-push-range-slider></app-push-range-slider>
   <app-selection-bar-slider></app-selection-bar-slider>
   <app-selection-bar-at-end-slider></app-selection-bar-at-end-slider>

src/demo-app/app/snippets/index.ts

@@ -25,6 +25,7 @@ export * from './limited-slider/limited-slider.component';
 export * from './log-scale-slider/log-scale-slider.component';
 export * from './manual-refresh-slider/manual-refresh-slider.component';
 export * from './no-switching-range-slider/no-switching-range-slider.component';
+export * from './prevent-change-on-scroll-slider/prevent-change-on-scroll-slider.component';
 export * from './push-range-slider/push-range-slider.component';
 export * from './range-slider/range-slider.component';
 export * from './reactive-form-range-slider/reactive-form-range-slider.component';

src/demo-app/app/snippets/prevent-change-on-scroll-slider/prevent-change-on-scroll-slider.component.id-template.html

@@ -0,0 +1 @@
+prevent-change-on-scroll-slider

src/demo-app/app/snippets/prevent-change-on-scroll-slider/prevent-change-on-scroll-slider.component.template.html

@@ -0,0 +1,2 @@
+<p>Value: <input type="number" [(ngModel)]="value"></p>
+<ngx-slider [(value)]="value" [options]="options" [cancelUserChange]="emitOnScroll"></ngx-slider>

src/demo-app/app/snippets/prevent-change-on-scroll-slider/prevent-change-on-scroll-slider.component.title-template.html

@@ -0,0 +1 @@
+Prevent change on page scroll using touch gesture

src/demo-app/app/snippets/prevent-change-on-scroll-slider/prevent-change-on-scroll-slider.component.ts

@@ -0,0 +1,20 @@
+import { Component, HostListener, EventEmitter } from '@angular/core';
+import { Options } from '@local/ngx-slider';
+
+@Component({
+  selector: 'app-prevent-change-on-scroll-slider',
+  templateUrl: './prevent-change-on-scroll-slider.component.html'
+})
+export class PreventChangeOnScrollSliderComponent {
+  value: number = 100;
+  options: Options = {
+    floor: 0,
+    ceil: 250
+  };
+  emitOnScroll: EventEmitter<void> = new EventEmitter<void>;
+
+  @HostListener('window:scroll', ['$event'])
+  public onScroll(event: any): void {
+    this.emitOnScroll.emit();
+  }
+}

src/ngx-slider/lib/slider.component.ts

@@ -195,6 +195,18 @@ export class SliderComponent
     );
   }
 
+  private cancelUserChangeSubscription: any;
+  @Input() set cancelUserChange(cancelUserChange: EventEmitter<void>) {
+    this.unsubscribeCancelUserChange();
+
+    this.cancelUserChangeSubscription = cancelUserChange.subscribe(() => {
+      if (this.moving) {
+        this.positionTrackingHandle(this.preStartHandleValue);
+        this.forceEnd(true);
+      }
+    });
+  }
+
   // Slider type, true means range slider
   public get range(): boolean {
     return (
@@ -240,6 +252,8 @@ export class SliderComponent
   private touchId: number = null;
   // Values recorded when first dragging the bar
   private dragging: Dragging = new Dragging();
+  // Value of hanlde at the beginning of onStart()
+  private preStartHandleValue: number = null;
 
   /* Slider DOM elements */
 
@@ -575,6 +589,13 @@ export class SliderComponent
     }
   }
 
+  private unsubscribeCancelUserChange(): void {
+    if (!ValueHelper.isNullOrUndefined(this.cancelUserChangeSubscription)) {
+      this.cancelUserChangeSubscription.unsubscribe();
+      this.cancelUserChangeSubscription = null;
+    }
+  }
+
   private getPointerElement(pointerType: PointerType): SliderHandleDirective {
     if (pointerType === PointerType.Min) {
       return this.minHandleElement;
@@ -2165,6 +2186,10 @@ export class SliderComponent
       this.getPointerElement(pointerType);
     pointerElement.active = true;
 
+    // Store currentTrackingValue as soon as it is available to allow
+    // the slide to be canceled. (E.g. on scroll detected.)
+    this.preStartHandleValue = this.getCurrentTrackingValue();
+
     if (this.viewOptions.keyboardSupport) {
       pointerElement.focus();
     }
@@ -2294,18 +2319,16 @@ export class SliderComponent
     this.positionTrackingHandle(newValue);
   }
 
-  private onEnd(event: MouseEvent | TouchEvent): void {
-    if (CompatibilityHelper.isTouchEvent(event)) {
-      const changedTouches: TouchList = (event as TouchEvent).changedTouches;
-      if (changedTouches[0].identifier !== this.touchId) {
-        return;
-      }
-    }
-
+  private forceEnd(disableAnimation: boolean = false): void {
     this.moving = false;
     if (this.viewOptions.animate) {
       this.sliderElementAnimateClass = true;
     }
+    if (disableAnimation) {
+      this.sliderElementAnimateClass = false;
+      // make sure the slider animate class is set according to the viewOptions after forceEnd() with disabled animations finishes
+      setTimeout(() => {this.sliderElementAnimateClass = this.viewOptions.animate});
+    }
 
     this.touchId = null;
 
@@ -2322,6 +2345,17 @@ export class SliderComponent
     this.userChangeEnd.emit(this.getChangeContext());
   }
 
+  private onEnd(event: MouseEvent | TouchEvent): void {
+    if (CompatibilityHelper.isTouchEvent(event)) {
+      const changedTouches: TouchList = (event as TouchEvent).changedTouches;
+      if (changedTouches[0].identifier !== this.touchId) {
+        return;
+      }
+    }
+
+    this.forceEnd();
+  }
+
   private onPointerFocus(pointerType: PointerType): void {
     const pointerElement: SliderHandleDirective =
       this.getPointerElement(pointerType);