Merge branch 'master' into 0.28

Author: mattlewis92

CHANGELOG.md

@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [0.27.20](https://github.com/mattlewis92/angular-calendar/compare/v0.27.19...v0.27.20) (2019-10-19)
+
+
+### Bug Fixes
+
+* always use native click event rather than hammerjs's tap event ([ca189c3](https://github.com/mattlewis92/angular-calendar/commit/ca189c3)), closes [#1113](https://github.com/mattlewis92/angular-calendar/issues/1113)
+
 ### [0.27.19](https://github.com/mattlewis92/angular-calendar/compare/v0.27.18...v0.27.19) (2019-09-25)
 
 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "angular-calendar",
-  "version": "0.27.19",
+  "version": "0.27.20",
   "description": "A calendar component for angular 6.0+ that can display events on a month, week or day view",
   "scripts": {
     "start": "node --max_old_space_size=8192 ./node_modules/.bin/ng serve --open",
@@ -105,7 +105,6 @@
     "del-cli": "^3.0.0",
     "flatpickr": "^4.6.3",
     "font-awesome": "^4.7.0",
-    "hammerjs": "^2.0.8",
     "highlightjs-loader": "^0.2.3",
     "husky": "^3.0.7",
     "karma": "^4.3.0",
@@ -147,8 +146,8 @@
     "@angular/core": ">=6.0.0 <10.0.0"
   },
   "dependencies": {
-    "angular-draggable-droppable": "^4.3.2",
-    "angular-resizable-element": "^3.2.4",
+    "angular-draggable-droppable": "^4.3.8",
+    "angular-resizable-element": "^3.2.6",
     "calendar-utils": "^0.7.0",
     "positioning": "^2.0.0"
   },

package.json

@@ -12,15 +12,7 @@ import {
 } from '@angular/core';
 import { DOCUMENT } from '@angular/common';
 import { Observable, Subject } from 'rxjs';
-import { requestIdleCallbackObservable } from './request-idle-callback';
-import { switchMapTo, takeUntil } from 'rxjs/operators';
-
-const clickElements = new Set<HTMLElement>();
-
-const eventName: string =
-  typeof window !== 'undefined' && typeof window['Hammer'] !== 'undefined'
-    ? 'tap'
-    : 'click';
+import { takeUntil } from 'rxjs/operators';
 
 @Directive({
   selector: '[mwlClick]'
@@ -35,53 +27,27 @@ export class ClickDirective implements OnInit, OnDestroy {
   constructor(
     private renderer: Renderer2,
     private elm: ElementRef<HTMLElement>,
-    @Inject(DOCUMENT) private document,
-    private zone: NgZone
+    @Inject(DOCUMENT) private document
   ) {}
 
   ngOnInit(): void {
     if (!this.clickListenerDisabled) {
-      this.renderer.setAttribute(
-        this.elm.nativeElement,
-        'data-calendar-clickable',
-        'true'
-      );
-      clickElements.add(this.elm.nativeElement);
-
-      // issue #942 - lazily initialise all click handlers after initial render as hammerjs is slow
-      requestIdleCallbackObservable()
-        .pipe(
-          switchMapTo(this.listen()),
-          takeUntil(this.destroy$)
-        )
+      this.listen()
+        .pipe(takeUntil(this.destroy$))
         .subscribe(event => {
-          // prevent child click events from firing on parent elements that also have click events
-          let nearestClickableParent = event.target as HTMLElement;
-          while (
-            !clickElements.has(nearestClickableParent) &&
-            nearestClickableParent !== this.document.body
-          ) {
-            nearestClickableParent = nearestClickableParent.parentElement;
-          }
-          const isThisClickableElement =
-            this.elm.nativeElement === nearestClickableParent;
-          if (isThisClickableElement) {
-            this.zone.run(() => {
-              this.click.next(event);
-            });
-          }
+          event.stopPropagation();
+          this.click.emit(event);
         });
     }
   }
 
   ngOnDestroy(): void {
     this.destroy$.next();
-    clickElements.delete(this.elm.nativeElement);
   }
 
   private listen() {
     return new Observable<MouseEvent>(observer => {
-      return this.renderer.listen(this.elm.nativeElement, eventName, event => {
+      return this.renderer.listen(this.elm.nativeElement, 'click', event => {
         observer.next(event);
       });
     });

projects/angular-calendar/src/modules/common/click.directive.ts

@@ -1,9 +1,6 @@
 import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
-import {
-  BrowserModule,
-  HAMMER_GESTURE_CONFIG
-} from '@angular/platform-browser';
+import { BrowserModule } from '@angular/platform-browser';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import {
   NgbTabsetModule,
@@ -17,7 +14,6 @@ import { DemoAppComponent } from './demo-app.component';
 import { DemoComponent as DefaultDemoComponent } from './demo-modules/kitchen-sink/component';
 import { DemoModule as DefaultDemoModule } from './demo-modules/kitchen-sink/module';
 import { environment } from '../environments/environment';
-import { CustomHammerConfig } from './hammer-config';
 import { FormsModule } from '@angular/forms';
 import { ClipboardModule } from 'ngx-clipboard';
 
@@ -444,12 +440,6 @@ import { ClipboardModule } from 'ngx-clipboard';
       }
     )
   ],
-  providers: [
-    {
-      provide: HAMMER_GESTURE_CONFIG,
-      useClass: CustomHammerConfig
-    }
-  ],
   bootstrap: [DemoAppComponent]
 })
 export class DemoAppModule {}

projects/angular-calendar/src/modules/common/request-idle-callback.ts

@@ -19,5 +19,4 @@
  */
 
 import 'core-js/modules/es.object.entries';
-import 'hammerjs';
 import 'zone.js/dist/zone';