@progress/kendo-angular-buttons 7.0.6 → 7.0.7-dev.202204111624

package/dist/es2015/dropdownbutton/dropdownbutton.component.js

@@ -16,7 +16,7 @@ import { FocusService } from '../focusable/focus.service';
 import { NavigationService } from '../navigation/navigation.service';
 import { NAVIGATION_CONFIG } from '../navigation/navigation-config';
 import { PreventableEvent } from '../preventable-event';
-import { merge } from 'rxjs';
+import { merge, Subscription } from 'rxjs';
 const NAVIGATION_SETTINGS = {
     useLeftRightArrows: true
 };
@@ -151,6 +151,7 @@ let DropDownButtonComponent = class DropDownButtonComponent extends ListButton {
         this.onBlur = new EventEmitter(); //tslint:disable-line:no-output-rename
         this.listId = guid();
         this._fillMode = 'solid';
+        this.popupSubs = new Subscription();
         this._itemClick = this.itemClick;
         this._blur = this.onBlur;
     }
@@ -402,11 +403,11 @@ let DropDownButtonComponent = class DropDownButtonComponent extends ListButton {
             || (this.popupRef && this.popupRef.popupElement.contains(element));
     }
     subscribeNavigationEvents() {
-        this.navigationSubscription = this.navigationService.navigate
-            .subscribe(this.onArrowKeyNavigate.bind(this));
-        this.enterUpSubscription = this.navigationService.enterup.subscribe(this.onNavigationEnterUp.bind(this));
-        this.openSubscription = this.navigationService.open.subscribe(this.onNavigationOpen.bind(this));
-        this.closeSubscription = merge(this.navigationService.close, this.navigationService.esc).subscribe(this.onNavigationClose.bind(this));
+        this.subs.add(this.navigationService.navigate
+            .subscribe(this.onArrowKeyNavigate.bind(this)));
+        this.subs.add(this.navigationService.enterup.subscribe(this.onNavigationEnterUp.bind(this)));
+        this.subs.add(this.navigationService.open.subscribe(this.onNavigationOpen.bind(this)));
+        this.subs.add(merge(this.navigationService.close, this.navigationService.esc).subscribe(this.onNavigationClose.bind(this)));
     }
     onNavigationEnterUp() {
         if (!this._disabled && !this.openState) {
@@ -459,13 +460,14 @@ let DropDownButtonComponent = class DropDownButtonComponent extends ListButton {
             popupAlign: this.popupAlign,
             popupClass: this.popupClasses
         });
-        this.popupRef.popupAnchorViewportLeave.subscribe(() => this.openState = false);
-        this.popupRef.popupOpen.subscribe(this.focusFirstItem.bind(this));
+        this.popupSubs.add(this.popupRef.popupAnchorViewportLeave.subscribe(() => this.openState = false));
+        this.popupSubs.add(this.popupRef.popupOpen.subscribe(this.focusFirstItem.bind(this)));
     }
     destroyPopup() {
         if (this.popupRef) {
             this.popupRef.close();
             this.popupRef = null;
+            this.popupSubs.unsubscribe();
         }
     }
 };

package/dist/es2015/focusable/focusable.directive.d.ts

@@ -12,7 +12,7 @@ export declare class FocusableDirective implements OnInit, OnDestroy {
     private renderer;
     index: number;
     private element;
-    private focusSubscription;
+    private subs;
     constructor(focusService: FocusService, elementRef: ElementRef, renderer: Renderer2);
     ngOnInit(): void;
     /**
@@ -20,5 +20,4 @@ export declare class FocusableDirective implements OnInit, OnDestroy {
      */
     ngOnDestroy(): void;
     private subscribeEvents;
-    private unsubscribeEvents;
 }

package/dist/es2015/focusable/focusable.directive.js

@@ -5,6 +5,7 @@
 import * as tslib_1 from "tslib";
 import { Directive, Input, ElementRef, Renderer2 } from '@angular/core';
 import { FocusService } from './focus.service';
+import { Subscription } from 'rxjs';
 import { isDocumentAvailable } from '@progress/kendo-angular-common';
 /**
  * @hidden
@@ -13,6 +14,7 @@ let FocusableDirective = class FocusableDirective {
     constructor(focusService, elementRef, renderer) {
         this.focusService = focusService;
         this.renderer = renderer;
+        this.subs = new Subscription();
         this.element = elementRef.nativeElement;
         this.subscribeEvents();
     }
@@ -28,13 +30,13 @@ let FocusableDirective = class FocusableDirective {
      * @hidden
      */
     ngOnDestroy() {
-        this.unsubscribeEvents();
+        this.subs.unsubscribe();
     }
     subscribeEvents() {
         if (!isDocumentAvailable()) {
             return;
         }
-        this.focusSubscription = this.focusService.onFocus.subscribe((index) => {
+        this.subs.add(this.focusService.onFocus.subscribe((index) => {
             if (this.index === index) {
                 this.renderer.addClass(this.element, 'k-focus');
                 this.element.focus();
@@ -42,15 +44,7 @@ let FocusableDirective = class FocusableDirective {
             else {
                 this.renderer.removeClass(this.element, 'k-focus');
             }
-        });
-    }
-    unsubscribeEvents() {
-        if (!isDocumentAvailable()) {
-            return;
-        }
-        if (this.focusSubscription) {
-            this.focusSubscription.unsubscribe();
-        }
+        }));
     }
 };
 tslib_1.__decorate([