@ts-core/angular 13.1.34 → 13.1.35

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -7,8 +7,6 @@ export declare class ScrollCheckDirective extends DestroyableContainer {
7
7
  limitExceed: EventEmitter<boolean>;
8
8
  private _scrollLimit;
9
9
  private element;
10
- private isTop;
11
- private isBottom;
12
10
  private isExceedLimit;
13
11
  delay: number;
14
12
  offset: number;
@@ -1,6 +1,7 @@
1
1
  import { Directive, Input, EventEmitter, Output } from '@angular/core';
2
2
  import { DestroyableContainer } from '@ts-core/common';
3
3
  import { DateUtil } from '@ts-core/common';
4
+ import * as _ from 'lodash';
4
5
  import { fromEvent } from 'rxjs';
5
6
  import { debounceTime, takeUntil } from 'rxjs';
6
7
  import * as i0 from "@angular/core";
@@ -20,8 +21,6 @@ export class ScrollCheckDirective extends DestroyableContainer {
20
21
  this.top = new EventEmitter();
21
22
  this.bottom = new EventEmitter();
22
23
  this.limitExceed = new EventEmitter();
23
- this.isTop = false;
24
- this.isBottom = false;
25
24
  this.isExceedLimit = false;
26
25
  this.delay = DateUtil.MILLISECONDS_SECOND / 10;
27
26
  this.offset = 50;
@@ -36,22 +35,11 @@ export class ScrollCheckDirective extends DestroyableContainer {
36
35
  this.isExceedLimit = value;
37
36
  this.limitExceed.emit(value);
38
37
  }
39
- value = this.scrollValue + this.clientHeight + this.offset > this.scrollHeight;
38
+ let offset = !_.isNaN(this.offset) ? this.offset : 0;
39
+ value = this.scrollValue + this.clientHeight + offset >= this.scrollHeight;
40
40
  this.bottom.next(value);
41
- /*
42
- if (value !== this.isBottom) {
43
- this.isBottom = value;
44
- this.bottom.next(value);
45
- }
46
- */
47
- value = this.scrollValue < this.offset;
41
+ value = this.scrollValue <= offset;
48
42
  this.top.next(value);
49
- /*
50
- if (value !== this.isTop) {
51
- this.isTop = value;
52
- this.top.next(value);
53
- }
54
- */
55
43
  };
56
44
  this.delay = DateUtil.MILLISECONDS_SECOND / 10;
57
45
  this.element = element.nativeElement;
@@ -113,4 +101,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.11", ngImpo
113
101
  type: Input,
114
102
  args: ['vi-scroll-check']
115
103
  }] } });
116
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ScrollCheckDirective.js","sourceRoot":"","sources":["../../../src/directive/ScrollCheckDirective.ts"],"names":[],"mappings":"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","sourcesContent":["import { Directive, ElementRef, Input, EventEmitter, Output } from '@angular/core';\nimport { DestroyableContainer } from '@ts-core/common';\nimport { DateUtil } from '@ts-core/common';\nimport * as _ from 'lodash';\nimport { fromEvent } from 'rxjs';\nimport { debounceTime, takeUntil } from 'rxjs';\n\n@Directive({\n    selector: '[vi-scroll-check]'\n})\nexport class ScrollCheckDirective extends DestroyableContainer {\n    //--------------------------------------------------------------------------\n    //\n    //\tProperties\n    //\n    //--------------------------------------------------------------------------\n\n    @Output()\n    public top: EventEmitter<boolean> = new EventEmitter();\n    @Output()\n    public bottom: EventEmitter<boolean> = new EventEmitter();\n    @Output()\n    public limitExceed: EventEmitter<boolean> = new EventEmitter();\n\n    private _scrollLimit: number;\n\n    private element: HTMLElement;\n    private isTop: boolean = false;\n    private isBottom: boolean = false;\n    private isExceedLimit: boolean = false;\n\n    @Input()\n    public delay: number = DateUtil.MILLISECONDS_SECOND / 10;\n    @Input()\n    public offset: number = 50;\n\n    //--------------------------------------------------------------------------\n    //\n    //\tConstructor\n    //\n    //--------------------------------------------------------------------------\n\n    constructor(element: ElementRef) {\n        super();\n        this.delay = DateUtil.MILLISECONDS_SECOND / 10;\n        this.element = element.nativeElement;\n\n        fromEvent(this.element, 'scroll').pipe(debounceTime(this.delay), takeUntil(this.destroyed)).subscribe(this.check);\n    }\n\n    //--------------------------------------------------------------------------\n    //\n    //\tProtected Methods\n    //\n    //--------------------------------------------------------------------------\n\n    protected check = (): void => {\n        let value = this.scrollValue >= this.scrollLimit;\n        if (value !== this.isExceedLimit) {\n            this.isExceedLimit = value;\n            this.limitExceed.emit(value);\n        }\n\n        value = this.scrollValue + this.clientHeight + this.offset > this.scrollHeight;\n        this.bottom.next(value);\n\n        /*\n        if (value !== this.isBottom) {\n            this.isBottom = value;\n            this.bottom.next(value);\n        }\n        */\n\n        value = this.scrollValue < this.offset;\n        this.top.next(value);\n        /*\n        if (value !== this.isTop) {\n            this.isTop = value;\n            this.top.next(value);\n        }\n        */\n    };\n\n    //--------------------------------------------------------------------------\n    //\n    //\tPrivate Properties\n    //\n    //--------------------------------------------------------------------------\n\n    // --------------------------------------------------------------------------\n    //\n    //\tPrivate Properties\n    //\n    // --------------------------------------------------------------------------\n\n    protected get scrollValue(): number {\n        return this.element.scrollTop;\n    }\n    protected get scrollHeight() {\n        return this.element.scrollHeight;\n    }\n    protected get clientHeight(): number {\n        return this.element.clientHeight;\n    }\n\n    //--------------------------------------------------------------------------\n    //\n    //\tPublic Properties\n    //\n    //--------------------------------------------------------------------------\n\n    @Input('vi-scroll-check')\n    public set scrollLimit(value: number) {\n        if (value == this._scrollLimit) {\n            return;\n        }\n        this._scrollLimit = value;\n        this.check();\n    }\n    public get scrollLimit(): number {\n        return this._scrollLimit;\n    }\n}\n"]}
104
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ScrollCheckDirective.js","sourceRoot":"","sources":["../../../src/directive/ScrollCheckDirective.ts"],"names":[],"mappings":"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","sourcesContent":["import { Directive, ElementRef, Input, EventEmitter, Output } from '@angular/core';\nimport { DestroyableContainer } from '@ts-core/common';\nimport { DateUtil } from '@ts-core/common';\nimport * as _ from 'lodash';\nimport { fromEvent } from 'rxjs';\nimport { debounceTime, takeUntil } from 'rxjs';\n\n@Directive({\n    selector: '[vi-scroll-check]'\n})\nexport class ScrollCheckDirective extends DestroyableContainer {\n    //--------------------------------------------------------------------------\n    //\n    //\tProperties\n    //\n    //--------------------------------------------------------------------------\n\n    @Output()\n    public top: EventEmitter<boolean> = new EventEmitter();\n    @Output()\n    public bottom: EventEmitter<boolean> = new EventEmitter();\n    @Output()\n    public limitExceed: EventEmitter<boolean> = new EventEmitter();\n\n    private _scrollLimit: number;\n\n    private element: HTMLElement;\n    private isExceedLimit: boolean = false;\n\n    @Input()\n    public delay: number = DateUtil.MILLISECONDS_SECOND / 10;\n    @Input()\n    public offset: number = 50;\n\n    //--------------------------------------------------------------------------\n    //\n    //\tConstructor\n    //\n    //--------------------------------------------------------------------------\n\n    constructor(element: ElementRef) {\n        super();\n        this.delay = DateUtil.MILLISECONDS_SECOND / 10;\n        this.element = element.nativeElement;\n\n        fromEvent(this.element, 'scroll').pipe(debounceTime(this.delay), takeUntil(this.destroyed)).subscribe(this.check);\n    }\n\n    //--------------------------------------------------------------------------\n    //\n    //\tProtected Methods\n    //\n    //--------------------------------------------------------------------------\n\n    protected check = (): void => {\n        let value = this.scrollValue >= this.scrollLimit;\n        if (value !== this.isExceedLimit) {\n            this.isExceedLimit = value;\n            this.limitExceed.emit(value);\n        }\n\n        let offset = !_.isNaN(this.offset) ? this.offset : 0;\n        value = this.scrollValue + this.clientHeight + offset >= this.scrollHeight;\n        this.bottom.next(value);\n\n        value = this.scrollValue <= offset;\n        this.top.next(value);\n    };\n\n    //--------------------------------------------------------------------------\n    //\n    //\tPrivate Properties\n    //\n    //--------------------------------------------------------------------------\n\n    // --------------------------------------------------------------------------\n    //\n    //\tPrivate Properties\n    //\n    // --------------------------------------------------------------------------\n\n    protected get scrollValue(): number {\n        return this.element.scrollTop;\n    }\n    protected get scrollHeight() {\n        return this.element.scrollHeight;\n    }\n    protected get clientHeight(): number {\n        return this.element.clientHeight;\n    }\n\n    //--------------------------------------------------------------------------\n    //\n    //\tPublic Properties\n    //\n    //--------------------------------------------------------------------------\n\n    @Input('vi-scroll-check')\n    public set scrollLimit(value: number) {\n        if (value == this._scrollLimit) {\n            return;\n        }\n        this._scrollLimit = value;\n        this.check();\n    }\n    public get scrollLimit(): number {\n        return this._scrollLimit;\n    }\n}\n"]}
@@ -2954,8 +2954,6 @@ class ScrollCheckDirective extends DestroyableContainer {
2954
2954
  this.top = new EventEmitter();
2955
2955
  this.bottom = new EventEmitter();
2956
2956
  this.limitExceed = new EventEmitter();
2957
- this.isTop = false;
2958
- this.isBottom = false;
2959
2957
  this.isExceedLimit = false;
2960
2958
  this.delay = DateUtil.MILLISECONDS_SECOND / 10;
2961
2959
  this.offset = 50;
@@ -2970,22 +2968,11 @@ class ScrollCheckDirective extends DestroyableContainer {
2970
2968
  this.isExceedLimit = value;
2971
2969
  this.limitExceed.emit(value);
2972
2970
  }
2973
- value = this.scrollValue + this.clientHeight + this.offset > this.scrollHeight;
2971
+ let offset = !_.isNaN(this.offset) ? this.offset : 0;
2972
+ value = this.scrollValue + this.clientHeight + offset >= this.scrollHeight;
2974
2973
  this.bottom.next(value);
2975
- /*
2976
- if (value !== this.isBottom) {
2977
- this.isBottom = value;
2978
- this.bottom.next(value);
2979
- }
2980
- */
2981
- value = this.scrollValue < this.offset;
2974
+ value = this.scrollValue <= offset;
2982
2975
  this.top.next(value);
2983
- /*
2984
- if (value !== this.isTop) {
2985
- this.isTop = value;
2986
- this.top.next(value);
2987
- }
2988
- */
2989
2976
  };
2990
2977
  this.delay = DateUtil.MILLISECONDS_SECOND / 10;
2991
2978
  this.element = element.nativeElement;