@clr/angular 12.3.0 → 12.4.1
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.
- package/bundles/clr-angular.umd.js +9 -4
- package/bundles/clr-angular.umd.js.map +1 -1
- package/clarity.api.md +2 -0
- package/clr-angular.metadata.json +1 -1
- package/data/datagrid/datagrid-page-size.d.ts +1 -0
- package/esm2015/data/datagrid/built-in/filters/datagrid-property-numeric-filter.js +6 -3
- package/esm2015/data/datagrid/datagrid-page-size.js +6 -3
- package/fesm2015/clr-angular.js +9 -4
- package/fesm2015/clr-angular.js.map +1 -1
- package/package.json +1 -1
|
@@ -12,13 +12,16 @@ export class DatagridPropertyNumericFilter {
|
|
|
12
12
|
}
|
|
13
13
|
accepts(item, low, high) {
|
|
14
14
|
const propValue = this.nestedProp.getPropValue(item);
|
|
15
|
-
if (
|
|
15
|
+
if (propValue === undefined) {
|
|
16
16
|
return false;
|
|
17
17
|
}
|
|
18
|
-
if (
|
|
18
|
+
if (low !== null && (typeof propValue !== 'number' || propValue < low)) {
|
|
19
|
+
return false;
|
|
20
|
+
}
|
|
21
|
+
if (high !== null && (typeof propValue !== 'number' || propValue > high)) {
|
|
19
22
|
return false;
|
|
20
23
|
}
|
|
21
24
|
return true;
|
|
22
25
|
}
|
|
23
26
|
}
|
|
24
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
27
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGF0YWdyaWQtcHJvcGVydHktbnVtZXJpYy1maWx0ZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy9hbmd1bGFyL3NyYy9kYXRhL2RhdGFncmlkL2J1aWx0LWluL2ZpbHRlcnMvZGF0YWdyaWQtcHJvcGVydHktbnVtZXJpYy1maWx0ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7R0FJRztBQUdILE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUVwRCxNQUFNLE9BQU8sNkJBQTZCO0lBR3hDLFlBQW1CLElBQVksRUFBUyxRQUFRLEtBQUs7UUFBbEMsU0FBSSxHQUFKLElBQUksQ0FBUTtRQUFTLFVBQUssR0FBTCxLQUFLLENBQVE7UUFDbkQsSUFBSSxDQUFDLFVBQVUsR0FBRyxJQUFJLGNBQWMsQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUM3QyxDQUFDO0lBRUQsT0FBTyxDQUFDLElBQU8sRUFBRSxHQUFXLEVBQUUsSUFBWTtRQUN4QyxNQUFNLFNBQVMsR0FBRyxJQUFJLENBQUMsVUFBVSxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUNyRCxJQUFJLFNBQVMsS0FBSyxTQUFTLEVBQUU7WUFDM0IsT0FBTyxLQUFLLENBQUM7U0FDZDtRQUNELElBQUksR0FBRyxLQUFLLElBQUksSUFBSSxDQUFDLE9BQU8sU0FBUyxLQUFLLFFBQVEsSUFBSSxTQUFTLEdBQUcsR0FBRyxDQUFDLEVBQUU7WUFDdEUsT0FBTyxLQUFLLENBQUM7U0FDZDtRQUNELElBQUksSUFBSSxLQUFLLElBQUksSUFBSSxDQUFDLE9BQU8sU0FBUyxLQUFLLFFBQVEsSUFBSSxTQUFTLEdBQUcsSUFBSSxDQUFDLEVBQUU7WUFDeEUsT0FBTyxLQUFLLENBQUM7U0FDZDtRQUNELE9BQU8sSUFBSSxDQUFDO0lBQ2QsQ0FBQztDQUNGIiwic291cmNlc0NvbnRlbnQiOlsiLypcbiAqIENvcHlyaWdodCAoYykgMjAxNi0yMDIyIFZNd2FyZSwgSW5jLiBBbGwgUmlnaHRzIFJlc2VydmVkLlxuICogVGhpcyBzb2Z0d2FyZSBpcyByZWxlYXNlZCB1bmRlciBNSVQgbGljZW5zZS5cbiAqIFRoZSBmdWxsIGxpY2Vuc2UgaW5mb3JtYXRpb24gY2FuIGJlIGZvdW5kIGluIExJQ0VOU0UgaW4gdGhlIHJvb3QgZGlyZWN0b3J5IG9mIHRoaXMgcHJvamVjdC5cbiAqL1xuXG5pbXBvcnQgeyBDbHJEYXRhZ3JpZE51bWVyaWNGaWx0ZXJJbnRlcmZhY2UgfSBmcm9tICcuLi8uLi9pbnRlcmZhY2VzL251bWVyaWMtZmlsdGVyLmludGVyZmFjZSc7XG5pbXBvcnQgeyBOZXN0ZWRQcm9wZXJ0eSB9IGZyb20gJy4uL25lc3RlZC1wcm9wZXJ0eSc7XG5cbmV4cG9ydCBjbGFzcyBEYXRhZ3JpZFByb3BlcnR5TnVtZXJpY0ZpbHRlcjxUID0gYW55PiBpbXBsZW1lbnRzIENsckRhdGFncmlkTnVtZXJpY0ZpbHRlckludGVyZmFjZTxUPiB7XG4gIHByaXZhdGUgbmVzdGVkUHJvcDogTmVzdGVkUHJvcGVydHk8VD47XG5cbiAgY29uc3RydWN0b3IocHVibGljIHByb3A6IHN0cmluZywgcHVibGljIGV4YWN0ID0gZmFsc2UpIHtcbiAgICB0aGlzLm5lc3RlZFByb3AgPSBuZXcgTmVzdGVkUHJvcGVydHkocHJvcCk7XG4gIH1cblxuICBhY2NlcHRzKGl0ZW06IFQsIGxvdzogbnVtYmVyLCBoaWdoOiBudW1iZXIpOiBib29sZWFuIHtcbiAgICBjb25zdCBwcm9wVmFsdWUgPSB0aGlzLm5lc3RlZFByb3AuZ2V0UHJvcFZhbHVlKGl0ZW0pO1xuICAgIGlmIChwcm9wVmFsdWUgPT09IHVuZGVmaW5lZCkge1xuICAgICAgcmV0dXJuIGZhbHNlO1xuICAgIH1cbiAgICBpZiAobG93ICE9PSBudWxsICYmICh0eXBlb2YgcHJvcFZhbHVlICE9PSAnbnVtYmVyJyB8fCBwcm9wVmFsdWUgPCBsb3cpKSB7XG4gICAgICByZXR1cm4gZmFsc2U7XG4gICAgfVxuICAgIGlmIChoaWdoICE9PSBudWxsICYmICh0eXBlb2YgcHJvcFZhbHVlICE9PSAnbnVtYmVyJyB8fCBwcm9wVmFsdWUgPiBoaWdoKSkge1xuICAgICAgcmV0dXJuIGZhbHNlO1xuICAgIH1cbiAgICByZXR1cm4gdHJ1ZTtcbiAgfVxufVxuIl19
|
|
@@ -4,10 +4,12 @@
|
|
|
4
4
|
* The full license information can be found in LICENSE in the root directory of this project.
|
|
5
5
|
*/
|
|
6
6
|
import { Component, Input } from '@angular/core';
|
|
7
|
+
import { uniqueIdFactory } from '../../utils/id-generator/id-generator.service';
|
|
7
8
|
import { Page } from './providers/page';
|
|
8
9
|
export class ClrDatagridPageSize {
|
|
9
10
|
constructor(page) {
|
|
10
11
|
this.page = page;
|
|
12
|
+
this.pageSizeOptionsId = uniqueIdFactory();
|
|
11
13
|
}
|
|
12
14
|
ngOnInit() {
|
|
13
15
|
if (!this.pageSizeOptions || this.pageSizeOptions.length === 0) {
|
|
@@ -21,7 +23,7 @@ ClrDatagridPageSize.decorators = [
|
|
|
21
23
|
template: `
|
|
22
24
|
<ng-content></ng-content>
|
|
23
25
|
<div class="clr-select-wrapper">
|
|
24
|
-
<select [class.clr-page-size-select]="true" [(ngModel)]="page.size">
|
|
26
|
+
<select [id]="pageSizeOptionsId" [class.clr-page-size-select]="true" [(ngModel)]="page.size">
|
|
25
27
|
<option *ngFor="let option of pageSizeOptions" [ngValue]="option">{{ option }}</option>
|
|
26
28
|
</select>
|
|
27
29
|
</div>
|
|
@@ -32,6 +34,7 @@ ClrDatagridPageSize.ctorParameters = () => [
|
|
|
32
34
|
{ type: Page }
|
|
33
35
|
];
|
|
34
36
|
ClrDatagridPageSize.propDecorators = {
|
|
35
|
-
pageSizeOptions: [{ type: Input, args: ['clrPageSizeOptions',] }]
|
|
37
|
+
pageSizeOptions: [{ type: Input, args: ['clrPageSizeOptions',] }],
|
|
38
|
+
pageSizeOptionsId: [{ type: Input, args: ['clrPageSizeOptionsId',] }]
|
|
36
39
|
};
|
|
37
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
40
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGF0YWdyaWQtcGFnZS1zaXplLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvYW5ndWxhci9zcmMvZGF0YS9kYXRhZ3JpZC9kYXRhZ3JpZC1wYWdlLXNpemUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7R0FJRztBQUVILE9BQU8sRUFBRSxTQUFTLEVBQUUsS0FBSyxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBRWpELE9BQU8sRUFBRSxlQUFlLEVBQUUsTUFBTSwrQ0FBK0MsQ0FBQztBQUNoRixPQUFPLEVBQUUsSUFBSSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFheEMsTUFBTSxPQUFPLG1CQUFtQjtJQUk5QixZQUFtQixJQUFVO1FBQVYsU0FBSSxHQUFKLElBQUksQ0FBTTtRQUZFLHNCQUFpQixHQUFHLGVBQWUsRUFBRSxDQUFDO0lBRXJDLENBQUM7SUFFakMsUUFBUTtRQUNOLElBQUksQ0FBQyxJQUFJLENBQUMsZUFBZSxJQUFJLElBQUksQ0FBQyxlQUFlLENBQUMsTUFBTSxLQUFLLENBQUMsRUFBRTtZQUM5RCxJQUFJLENBQUMsZUFBZSxHQUFHLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQztTQUN6QztJQUNILENBQUM7OztZQXJCRixTQUFTLFNBQUM7Z0JBQ1QsUUFBUSxFQUFFLGtCQUFrQjtnQkFDNUIsUUFBUSxFQUFFOzs7Ozs7O0dBT1Q7YUFDRjs7O1lBWlEsSUFBSTs7OzhCQWNWLEtBQUssU0FBQyxvQkFBb0I7Z0NBQzFCLEtBQUssU0FBQyxzQkFBc0IiLCJzb3VyY2VzQ29udGVudCI6WyIvKlxuICogQ29weXJpZ2h0IChjKSAyMDE2LTIwMjIgVk13YXJlLCBJbmMuIEFsbCBSaWdodHMgUmVzZXJ2ZWQuXG4gKiBUaGlzIHNvZnR3YXJlIGlzIHJlbGVhc2VkIHVuZGVyIE1JVCBsaWNlbnNlLlxuICogVGhlIGZ1bGwgbGljZW5zZSBpbmZvcm1hdGlvbiBjYW4gYmUgZm91bmQgaW4gTElDRU5TRSBpbiB0aGUgcm9vdCBkaXJlY3Rvcnkgb2YgdGhpcyBwcm9qZWN0LlxuICovXG5cbmltcG9ydCB7IENvbXBvbmVudCwgSW5wdXQgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcblxuaW1wb3J0IHsgdW5pcXVlSWRGYWN0b3J5IH0gZnJvbSAnLi4vLi4vdXRpbHMvaWQtZ2VuZXJhdG9yL2lkLWdlbmVyYXRvci5zZXJ2aWNlJztcbmltcG9ydCB7IFBhZ2UgfSBmcm9tICcuL3Byb3ZpZGVycy9wYWdlJztcblxuQENvbXBvbmVudCh7XG4gIHNlbGVjdG9yOiAnY2xyLWRnLXBhZ2Utc2l6ZScsXG4gIHRlbXBsYXRlOiBgXG4gICAgPG5nLWNvbnRlbnQ+PC9uZy1jb250ZW50PlxuICAgIDxkaXYgY2xhc3M9XCJjbHItc2VsZWN0LXdyYXBwZXJcIj5cbiAgICAgIDxzZWxlY3QgW2lkXT1cInBhZ2VTaXplT3B0aW9uc0lkXCIgW2NsYXNzLmNsci1wYWdlLXNpemUtc2VsZWN0XT1cInRydWVcIiBbKG5nTW9kZWwpXT1cInBhZ2Uuc2l6ZVwiPlxuICAgICAgICA8b3B0aW9uICpuZ0Zvcj1cImxldCBvcHRpb24gb2YgcGFnZVNpemVPcHRpb25zXCIgW25nVmFsdWVdPVwib3B0aW9uXCI+e3sgb3B0aW9uIH19PC9vcHRpb24+XG4gICAgICA8L3NlbGVjdD5cbiAgICA8L2Rpdj5cbiAgYCxcbn0pXG5leHBvcnQgY2xhc3MgQ2xyRGF0YWdyaWRQYWdlU2l6ZSB7XG4gIEBJbnB1dCgnY2xyUGFnZVNpemVPcHRpb25zJykgcGFnZVNpemVPcHRpb25zOiBudW1iZXJbXTtcbiAgQElucHV0KCdjbHJQYWdlU2l6ZU9wdGlvbnNJZCcpIHBhZ2VTaXplT3B0aW9uc0lkID0gdW5pcXVlSWRGYWN0b3J5KCk7XG5cbiAgY29uc3RydWN0b3IocHVibGljIHBhZ2U6IFBhZ2UpIHt9XG5cbiAgbmdPbkluaXQoKSB7XG4gICAgaWYgKCF0aGlzLnBhZ2VTaXplT3B0aW9ucyB8fCB0aGlzLnBhZ2VTaXplT3B0aW9ucy5sZW5ndGggPT09IDApIHtcbiAgICAgIHRoaXMucGFnZVNpemVPcHRpb25zID0gW3RoaXMucGFnZS5zaXplXTtcbiAgICB9XG4gIH1cbn1cbiJdfQ==
|
package/fesm2015/clr-angular.js
CHANGED
|
@@ -11110,10 +11110,13 @@ class DatagridPropertyNumericFilter {
|
|
|
11110
11110
|
}
|
|
11111
11111
|
accepts(item, low, high) {
|
|
11112
11112
|
const propValue = this.nestedProp.getPropValue(item);
|
|
11113
|
-
if (
|
|
11113
|
+
if (propValue === undefined) {
|
|
11114
11114
|
return false;
|
|
11115
11115
|
}
|
|
11116
|
-
if (
|
|
11116
|
+
if (low !== null && (typeof propValue !== 'number' || propValue < low)) {
|
|
11117
|
+
return false;
|
|
11118
|
+
}
|
|
11119
|
+
if (high !== null && (typeof propValue !== 'number' || propValue > high)) {
|
|
11117
11120
|
return false;
|
|
11118
11121
|
}
|
|
11119
11122
|
return true;
|
|
@@ -15220,6 +15223,7 @@ ClrDatagridItemsTrackBy.propDecorators = {
|
|
|
15220
15223
|
class ClrDatagridPageSize {
|
|
15221
15224
|
constructor(page) {
|
|
15222
15225
|
this.page = page;
|
|
15226
|
+
this.pageSizeOptionsId = uniqueIdFactory();
|
|
15223
15227
|
}
|
|
15224
15228
|
ngOnInit() {
|
|
15225
15229
|
if (!this.pageSizeOptions || this.pageSizeOptions.length === 0) {
|
|
@@ -15233,7 +15237,7 @@ ClrDatagridPageSize.decorators = [
|
|
|
15233
15237
|
template: `
|
|
15234
15238
|
<ng-content></ng-content>
|
|
15235
15239
|
<div class="clr-select-wrapper">
|
|
15236
|
-
<select [class.clr-page-size-select]="true" [(ngModel)]="page.size">
|
|
15240
|
+
<select [id]="pageSizeOptionsId" [class.clr-page-size-select]="true" [(ngModel)]="page.size">
|
|
15237
15241
|
<option *ngFor="let option of pageSizeOptions" [ngValue]="option">{{ option }}</option>
|
|
15238
15242
|
</select>
|
|
15239
15243
|
</div>
|
|
@@ -15244,7 +15248,8 @@ ClrDatagridPageSize.ctorParameters = () => [
|
|
|
15244
15248
|
{ type: Page }
|
|
15245
15249
|
];
|
|
15246
15250
|
ClrDatagridPageSize.propDecorators = {
|
|
15247
|
-
pageSizeOptions: [{ type: Input, args: ['clrPageSizeOptions',] }]
|
|
15251
|
+
pageSizeOptions: [{ type: Input, args: ['clrPageSizeOptions',] }],
|
|
15252
|
+
pageSizeOptionsId: [{ type: Input, args: ['clrPageSizeOptionsId',] }]
|
|
15248
15253
|
};
|
|
15249
15254
|
|
|
15250
15255
|
/*
|