@porscheinformatik/material-addons 17.3.2 → 17.3.4
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/esm2022/lib/data-table/util/data-table-sort-util.mjs +25 -29
- package/esm2022/version.mjs +2 -2
- package/fesm2022/porscheinformatik-material-addons.mjs +25 -29
- package/fesm2022/porscheinformatik-material-addons.mjs.map +1 -1
- package/lib/data-table/util/data-table-sort-util.d.ts.map +1 -1
- package/package.json +3 -2
- package/version.d.ts +2 -0
|
@@ -10,38 +10,34 @@ export class DataTableSortUtil {
|
|
|
10
10
|
const x = a[sort.active];
|
|
11
11
|
const y = b[sort.active];
|
|
12
12
|
const ascending = sort.direction === 'asc';
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
13
|
+
if (typeof x === 'number' && typeof y === 'number') {
|
|
14
|
+
return DataTableSortUtil.compareNumber(x, y, ascending);
|
|
15
|
+
}
|
|
16
|
+
if (typeof x === 'boolean' && typeof y === 'boolean') {
|
|
17
|
+
return DataTableSortUtil.compareBoolean(x, y, ascending);
|
|
18
|
+
}
|
|
19
|
+
if (typeof x === 'string' || typeof y === 'string') {
|
|
20
|
+
const stringX = String(x ?? '');
|
|
21
|
+
const stringY = String(y ?? '');
|
|
22
|
+
// a string could be a date
|
|
23
|
+
if (!!dateTimeFormat) {
|
|
24
|
+
const dateX = DateTime.fromFormat(stringX, dateTimeFormat);
|
|
25
|
+
const dateY = DateTime.fromFormat(stringY, dateTimeFormat);
|
|
26
|
+
if (dateX.isValid && dateY.isValid) {
|
|
27
|
+
return DataTableSortUtil.compareDate(dateX, dateY, ascending);
|
|
28
28
|
}
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
29
|
+
}
|
|
30
|
+
// .. but also a formatted number
|
|
31
|
+
if (!!numberFormat) {
|
|
32
|
+
const numberX = DataTableSortUtil.parseNumber(stringX, numberFormat);
|
|
33
|
+
const numberY = DataTableSortUtil.parseNumber(stringY, numberFormat);
|
|
34
|
+
if (typeof numberX === 'number' && typeof numberY === 'number') {
|
|
35
|
+
return DataTableSortUtil.compareNumber(numberX, numberY, ascending);
|
|
36
36
|
}
|
|
37
|
-
return DataTableSortUtil.compareString(x, stringY, ascending);
|
|
38
37
|
}
|
|
39
|
-
|
|
40
|
-
return DataTableSortUtil.compareBoolean(x, y, ascending);
|
|
41
|
-
default:
|
|
42
|
-
// cannot compare -> return equal
|
|
43
|
-
return 0;
|
|
38
|
+
return DataTableSortUtil.compareString(stringX, stringY, ascending);
|
|
44
39
|
}
|
|
40
|
+
return 0;
|
|
45
41
|
}
|
|
46
42
|
static compareNumber(x, y, ascending) {
|
|
47
43
|
return ascending ? x - y : y - x;
|
|
@@ -77,4 +73,4 @@ export class DataTableSortUtil {
|
|
|
77
73
|
return value;
|
|
78
74
|
}
|
|
79
75
|
}
|
|
80
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
76
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"data-table-sort-util.js","sourceRoot":"","sources":["../../../../../../projects/material-addons/src/lib/data-table/util/data-table-sort-util.ts"],"names":[],"mappings":"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","sourcesContent":["import { MatSort, Sort } from '@angular/material/sort';\nimport { DateTime } from 'luxon';\nimport { NumberFormat } from '../configuration/data-table-global-configuration';\n\nexport class DataTableSortUtil {\n  static sortData(dateTimeFormat?: string, numberFormat?: NumberFormat): (tableData: any[], matSort: MatSort) => any[] {\n    return (tableData: any[], matSort: MatSort) =>\n      [...tableData].sort((a, b) => DataTableSortUtil.compare(a, b, matSort, dateTimeFormat, numberFormat));\n  }\n\n  static sortNothing(): (tableData: any[], matSort: MatSort) => any[] {\n    return (tableData: any[], _: MatSort) => tableData;\n  }\n\n  static compare(a: Record<string, any>, b: Record<string, any>, sort: Sort, dateTimeFormat?: string, numberFormat?: NumberFormat): number {\n    const x = a[sort.active];\n    const y = b[sort.active];\n    const ascending = sort.direction === 'asc';\n\n    if (typeof x === 'number' && typeof y === 'number') {\n      return DataTableSortUtil.compareNumber(x, y, ascending);\n    }\n    if (typeof x === 'boolean' && typeof y === 'boolean') {\n      return DataTableSortUtil.compareBoolean(x, y, ascending);\n    }\n    if (typeof x === 'string' || typeof y === 'string') {\n      const stringX = String(x ?? '');\n      const stringY = String(y ?? '');\n\n      // a string could be a date\n      if (!!dateTimeFormat) {\n        const dateX = DateTime.fromFormat(stringX, dateTimeFormat);\n        const dateY = DateTime.fromFormat(stringY, dateTimeFormat);\n\n        if (dateX.isValid && dateY.isValid) {\n          return DataTableSortUtil.compareDate(dateX, dateY, ascending);\n        }\n      }\n\n      // .. but also a formatted number\n      if (!!numberFormat) {\n        const numberX = DataTableSortUtil.parseNumber(stringX, numberFormat);\n        const numberY = DataTableSortUtil.parseNumber(stringY, numberFormat);\n\n        if (typeof numberX === 'number' && typeof numberY === 'number') {\n          return DataTableSortUtil.compareNumber(numberX, numberY, ascending);\n        }\n      }\n\n      return DataTableSortUtil.compareString(stringX, stringY, ascending);\n    }\n\n    return 0;\n  }\n\n  static compareNumber(x: number, y: number, ascending: boolean): number {\n    return ascending ? x - y : y - x;\n  }\n\n  static compareDate(x: DateTime, y: DateTime, ascending: boolean): number {\n    return DataTableSortUtil.compareNumber(+x, +y, ascending);\n  }\n\n  static compareString(x: string, y: string, ascending: boolean): number {\n    return ascending ? x.localeCompare(y) : y.localeCompare(x);\n  }\n\n  static compareBoolean(x: boolean, y: boolean, ascending: boolean): number {\n    if (x === y) {\n      return 0;\n    }\n    if (ascending) {\n      // true first\n      return x ? -1 : 1;\n    } else {\n      // false first\n      return x ? 1 : -1;\n    }\n  }\n\n  static parseNumber(value: string, numberFormat?: NumberFormat): number | string {\n    const sanitized = value\n      .replace(numberFormat.groupingSeparator ?? '', '')\n      .replace(numberFormat.decimalSeparator ?? '', '.')\n      .replace(new RegExp((numberFormat.units ?? []).join('|')), '');\n\n    const numberValue = Number(sanitized);\n\n    if (typeof numberValue === 'number' && !isNaN(numberValue)) {\n      return numberValue;\n    }\n\n    return value;\n  }\n}\n"]}
|
package/esm2022/version.mjs
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export const VERSION = '17.3.
|
|
2
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
1
|
+
export const VERSION = '17.3.4';
|
|
2
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmVyc2lvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3Byb2plY3RzL21hdGVyaWFsLWFkZG9ucy9zcmMvdmVyc2lvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxNQUFNLENBQUMsTUFBTSxPQUFPLEdBQUcsUUFBUSxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiZXhwb3J0IGNvbnN0IFZFUlNJT04gPSAnMTcuMy40JztcbiJdfQ==
|
|
@@ -1942,38 +1942,34 @@ class DataTableSortUtil {
|
|
|
1942
1942
|
const x = a[sort.active];
|
|
1943
1943
|
const y = b[sort.active];
|
|
1944
1944
|
const ascending = sort.direction === 'asc';
|
|
1945
|
-
|
|
1946
|
-
|
|
1947
|
-
|
|
1948
|
-
|
|
1945
|
+
if (typeof x === 'number' && typeof y === 'number') {
|
|
1946
|
+
return DataTableSortUtil.compareNumber(x, y, ascending);
|
|
1947
|
+
}
|
|
1948
|
+
if (typeof x === 'boolean' && typeof y === 'boolean') {
|
|
1949
|
+
return DataTableSortUtil.compareBoolean(x, y, ascending);
|
|
1950
|
+
}
|
|
1951
|
+
if (typeof x === 'string' || typeof y === 'string') {
|
|
1952
|
+
const stringX = String(x ?? '');
|
|
1953
|
+
const stringY = String(y ?? '');
|
|
1954
|
+
// a string could be a date
|
|
1955
|
+
if (!!dateTimeFormat) {
|
|
1956
|
+
const dateX = DateTime.fromFormat(stringX, dateTimeFormat);
|
|
1957
|
+
const dateY = DateTime.fromFormat(stringY, dateTimeFormat);
|
|
1958
|
+
if (dateX.isValid && dateY.isValid) {
|
|
1959
|
+
return DataTableSortUtil.compareDate(dateX, dateY, ascending);
|
|
1949
1960
|
}
|
|
1950
|
-
|
|
1951
|
-
|
|
1952
|
-
|
|
1953
|
-
|
|
1954
|
-
|
|
1955
|
-
|
|
1956
|
-
|
|
1957
|
-
if (dateX.isValid && dateY.isValid) {
|
|
1958
|
-
return DataTableSortUtil.compareDate(dateX, dateY, ascending);
|
|
1959
|
-
}
|
|
1960
|
-
}
|
|
1961
|
-
// .. but also a formatted number
|
|
1962
|
-
if (!!numberFormat) {
|
|
1963
|
-
const numberX = DataTableSortUtil.parseNumber(x, numberFormat);
|
|
1964
|
-
const numberY = DataTableSortUtil.parseNumber(y, numberFormat);
|
|
1965
|
-
if (typeof numberX === 'number' && typeof numberY === 'number') {
|
|
1966
|
-
return DataTableSortUtil.compareNumber(numberX, numberY, ascending);
|
|
1967
|
-
}
|
|
1961
|
+
}
|
|
1962
|
+
// .. but also a formatted number
|
|
1963
|
+
if (!!numberFormat) {
|
|
1964
|
+
const numberX = DataTableSortUtil.parseNumber(stringX, numberFormat);
|
|
1965
|
+
const numberY = DataTableSortUtil.parseNumber(stringY, numberFormat);
|
|
1966
|
+
if (typeof numberX === 'number' && typeof numberY === 'number') {
|
|
1967
|
+
return DataTableSortUtil.compareNumber(numberX, numberY, ascending);
|
|
1968
1968
|
}
|
|
1969
|
-
return DataTableSortUtil.compareString(x, stringY, ascending);
|
|
1970
1969
|
}
|
|
1971
|
-
|
|
1972
|
-
return DataTableSortUtil.compareBoolean(x, y, ascending);
|
|
1973
|
-
default:
|
|
1974
|
-
// cannot compare -> return equal
|
|
1975
|
-
return 0;
|
|
1970
|
+
return DataTableSortUtil.compareString(stringX, stringY, ascending);
|
|
1976
1971
|
}
|
|
1972
|
+
return 0;
|
|
1977
1973
|
}
|
|
1978
1974
|
static compareNumber(x, y, ascending) {
|
|
1979
1975
|
return ascending ? x - y : y - x;
|
|
@@ -4173,7 +4169,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.0.4", ngImpor
|
|
|
4173
4169
|
type: Output
|
|
4174
4170
|
}] } });
|
|
4175
4171
|
|
|
4176
|
-
const VERSION = '17.3.
|
|
4172
|
+
const VERSION = '17.3.4';
|
|
4177
4173
|
|
|
4178
4174
|
/*
|
|
4179
4175
|
* Public API Surface of material-addons
|