@firestitch/filter 12.3.1 → 12.3.2
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.
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { filter } from '@firestitch/common';
|
|
1
|
+
import { filter, isArrayEqual } from '@firestitch/common';
|
|
2
2
|
import { clone } from 'lodash-es';
|
|
3
3
|
import { BaseSelectItem } from './base-select-item';
|
|
4
4
|
export class MultipleSelectItem extends BaseSelectItem {
|
|
@@ -52,15 +52,18 @@ export class MultipleSelectItem extends BaseSelectItem {
|
|
|
52
52
|
super._setModel(value);
|
|
53
53
|
}
|
|
54
54
|
_validateModel() {
|
|
55
|
-
|
|
55
|
+
const possibleValues = filter(this.model || [], (item) => {
|
|
56
56
|
return this.values.find(value => {
|
|
57
57
|
return value.value == item;
|
|
58
58
|
});
|
|
59
59
|
});
|
|
60
|
+
if (!isArrayEqual(this.model, possibleValues)) {
|
|
61
|
+
this.model = possibleValues;
|
|
62
|
+
}
|
|
60
63
|
}
|
|
61
64
|
_clearValue(defaultValue = undefined) {
|
|
62
65
|
super._clearValue(defaultValue);
|
|
63
66
|
this.model = defaultValue !== null && defaultValue !== void 0 ? defaultValue : [];
|
|
64
67
|
}
|
|
65
68
|
}
|
|
66
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
69
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibXVsdGlwbGUtc2VsZWN0LWl0ZW0uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBwL21vZGVscy9pdGVtcy9zZWxlY3QvbXVsdGlwbGUtc2VsZWN0LWl0ZW0udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLE1BQU0sRUFBRSxZQUFZLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUUxRCxPQUFPLEVBQUUsS0FBSyxFQUFFLE1BQU0sV0FBVyxDQUFDO0FBR2xDLE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUdwRCxNQUFNLE9BQU8sa0JBQW1CLFNBQVEsY0FBYztJQUVwRCxZQUNFLFVBQW1DLEVBQ25DLGdCQUFxQjtRQUVyQixLQUFLLENBQUMsVUFBVSxFQUFFLGdCQUFnQixDQUFDLENBQUM7SUFDdEMsQ0FBQztJQUVELElBQVcsS0FBSztRQUNkLElBQUksS0FBSyxHQUFHLEtBQUssQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUM7UUFFOUIsSUFBSSxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLElBQUksS0FBSyxDQUFDLE1BQU0sS0FBSyxDQUFDLElBQUksS0FBSyxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLENBQUMsRUFBRTtZQUM5RSxLQUFLLEdBQUcsSUFBSSxDQUFDO1NBQ2Q7UUFFRCxPQUFPLEtBQUssQ0FBQztJQUNmLENBQUM7SUFFRCxJQUFXLGFBQWE7UUFDdEIsT0FBTyxLQUFLLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsSUFBSSxJQUFJLENBQUMsS0FBSyxDQUFDLE1BQU0sR0FBRyxDQUFDLENBQUM7SUFDNUQsQ0FBQztJQUVNLGVBQWUsQ0FBQyxJQUFJLEdBQUcsSUFBSTtRQUNoQyxNQUFNLE9BQU8sR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLE1BQU0sQ0FBQyxDQUFDLEdBQUcsRUFBRSxHQUFHLEVBQUUsRUFBRTtZQUM3QyxNQUFNLFNBQVMsR0FBRyxJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxDQUFDLEdBQUcsRUFBRSxFQUFFLENBQUMsR0FBRyxDQUFDLEtBQUssS0FBSyxHQUFHLENBQUMsQ0FBQztZQUMvRCxJQUFJLFNBQWlCLENBQUM7WUFFdEIsSUFBSSxTQUFTLEVBQUU7Z0JBQ2IsU0FBUyxHQUFHLFNBQVMsQ0FBQyxJQUFJLENBQUM7YUFDNUI7aUJBQU0sSUFBSSxJQUFJLENBQUMsT0FBTyxJQUFJLElBQUksQ0FBQyxPQUFPLENBQUMsT0FBTyxFQUFFO2dCQUMvQyxTQUFTLEdBQUcsSUFBSSxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUM7YUFDaEM7WUFFRCxJQUFJLENBQUMsR0FBRyxDQUFDLFFBQVEsQ0FBQyxTQUFTLENBQUMsRUFBRTtnQkFDNUIsR0FBRyxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsQ0FBQTthQUNwQjtZQUVELE9BQU8sR0FBRyxDQUFDO1FBQ2IsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDO1FBRVAsT0FBTyxPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDO0lBQzVCLENBQUM7SUFFUyxLQUFLO1FBQ2IsS0FBSyxDQUFDLEtBQUssRUFBRSxDQUFDO1FBRWQsSUFBSSxJQUFJLENBQUMsS0FBSyxLQUFLLFNBQVMsSUFBSSxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLFlBQVksQ0FBQyxFQUFFO1lBQ2pFLElBQUksQ0FBQyxLQUFLLEdBQUcsRUFBRSxDQUFDO1NBQ2pCO0lBQ0gsQ0FBQztJQUNTLFNBQVMsQ0FBQyxLQUFLO1FBQ3ZCLElBQUksS0FBSyxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsRUFBRTtZQUN4QixLQUFLLEdBQUcsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDLEdBQUcsRUFBRSxFQUFFO2dCQUN4QixJQUFJLEtBQUssQ0FBQyxHQUFHLENBQUMsRUFBRTtvQkFDZCxPQUFPLEdBQUcsQ0FBQztpQkFDWjtxQkFBTTtvQkFDTCxPQUFPLENBQUMsR0FBRyxDQUFDO2lCQUNiO1lBQ0gsQ0FBQyxDQUFDLENBQUE7U0FDSDtRQUVELEtBQUssQ0FBQyxTQUFTLENBQUMsS0FBSyxDQUFDLENBQUM7SUFDekIsQ0FBQztJQUVTLGNBQWM7UUFDdEIsTUFBTSxjQUFjLEdBQUcsTUFBTSxDQUFDLElBQUksQ0FBQyxLQUFLLElBQUksRUFBRSxFQUFFLENBQUMsSUFBSSxFQUFFLEVBQUU7WUFDdkQsT0FBTyxJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsRUFBRTtnQkFDOUIsT0FBTyxLQUFLLENBQUMsS0FBSyxJQUFJLElBQUksQ0FBQztZQUM3QixDQUFDLENBQUMsQ0FBQztRQUNMLENBQUMsQ0FBQyxDQUFDO1FBRUgsSUFBSSxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsS0FBSyxFQUFFLGNBQWMsQ0FBQyxFQUFFO1lBQzdDLElBQUksQ0FBQyxLQUFLLEdBQUcsY0FBYyxDQUFDO1NBQzdCO0lBQ0gsQ0FBQztJQUVTLFdBQVcsQ0FBQyxlQUF3QixTQUFTO1FBQ3JELEtBQUssQ0FBQyxXQUFXLENBQUMsWUFBWSxDQUFDLENBQUM7UUFFaEMsSUFBSSxDQUFDLEtBQUssR0FBRyxZQUFZLGFBQVosWUFBWSxjQUFaLFlBQVksR0FBSSxFQUFFLENBQUM7SUFDbEMsQ0FBQztDQUNGIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgZmlsdGVyLCBpc0FycmF5RXF1YWwgfSBmcm9tICdAZmlyZXN0aXRjaC9jb21tb24nO1xuXG5pbXBvcnQgeyBjbG9uZSB9IGZyb20gJ2xvZGFzaC1lcyc7XG5cbmltcG9ydCB7IElGaWx0ZXJDb25maWdTZWxlY3RJdGVtIH0gZnJvbSAnLi4vLi4vLi4vaW50ZXJmYWNlcy9pdGVtcy9zZWxlY3QuaW50ZXJmYWNlJztcbmltcG9ydCB7IEJhc2VTZWxlY3RJdGVtIH0gZnJvbSAnLi9iYXNlLXNlbGVjdC1pdGVtJztcblxuXG5leHBvcnQgY2xhc3MgTXVsdGlwbGVTZWxlY3RJdGVtIGV4dGVuZHMgQmFzZVNlbGVjdEl0ZW0ge1xuXG4gIGNvbnN0cnVjdG9yKFxuICAgIGl0ZW1Db25maWc6IElGaWx0ZXJDb25maWdTZWxlY3RJdGVtLFxuICAgIF9wZXJzaXN0ZWRWYWx1ZXM6IGFueVxuICApIHtcbiAgICBzdXBlcihpdGVtQ29uZmlnLCBfcGVyc2lzdGVkVmFsdWVzKTtcbiAgfVxuXG4gIHB1YmxpYyBnZXQgdmFsdWUoKSB7XG4gICAgbGV0IHZhbHVlID0gY2xvbmUodGhpcy5tb2RlbCk7XG5cbiAgICBpZiAoIUFycmF5LmlzQXJyYXkodmFsdWUpIHx8IHZhbHVlLmxlbmd0aCA9PT0gMCB8fCB2YWx1ZS5pbmRleE9mKCdfX2FsbCcpID4gLTEpIHtcbiAgICAgIHZhbHVlID0gbnVsbDtcbiAgICB9XG5cbiAgICByZXR1cm4gdmFsdWU7XG4gIH1cblxuICBwdWJsaWMgZ2V0IGlzQ2hpcFZpc2libGUoKTogYm9vbGVhbiB7XG4gICAgcmV0dXJuIEFycmF5LmlzQXJyYXkodGhpcy5tb2RlbCkgJiYgdGhpcy5tb2RlbC5sZW5ndGggPiAwO1xuICB9XG5cbiAgcHVibGljIGdldENoaXBzQ29udGVudCh0eXBlID0gbnVsbCk6IHN0cmluZyB7XG4gICAgY29uc3Qgb3B0aW9ucyA9IHRoaXMubW9kZWwucmVkdWNlKChhY2MsIGtleSkgPT4ge1xuICAgICAgY29uc3QgaXRlbVZhbHVlID0gdGhpcy52YWx1ZXMuZmluZCgodmFsKSA9PiB2YWwudmFsdWUgPT09IGtleSk7XG4gICAgICBsZXQgaXRlbUxhYmVsOiBzdHJpbmc7XG5cbiAgICAgIGlmIChpdGVtVmFsdWUpIHtcbiAgICAgICAgaXRlbUxhYmVsID0gaXRlbVZhbHVlLm5hbWU7XG4gICAgICB9IGVsc2UgaWYgKHRoaXMuaXNvbGF0ZSAmJiB0aGlzLmlzb2xhdGUuZW5hYmxlZCkge1xuICAgICAgICBpdGVtTGFiZWwgPSB0aGlzLmlzb2xhdGUubGFiZWw7XG4gICAgICB9XG5cbiAgICAgIGlmICghYWNjLmluY2x1ZGVzKGl0ZW1MYWJlbCkpIHtcbiAgICAgICAgYWNjLnB1c2goaXRlbUxhYmVsKVxuICAgICAgfVxuXG4gICAgICByZXR1cm4gYWNjO1xuICAgIH0sIFtdKTtcblxuICAgIHJldHVybiBvcHRpb25zLmpvaW4oJywgJyk7XG4gIH1cblxuICBwcm90ZWN0ZWQgX2luaXQoKSB7XG4gICAgc3VwZXIuX2luaXQoKTtcblxuICAgIGlmICh0aGlzLm1vZGVsID09PSB1bmRlZmluZWQgJiYgIUFycmF5LmlzQXJyYXkodGhpcy5kZWZhdWx0VmFsdWUpKSB7XG4gICAgICB0aGlzLm1vZGVsID0gW107XG4gICAgfVxuICB9XG4gIHByb3RlY3RlZCBfc2V0TW9kZWwodmFsdWUpIHtcbiAgICBpZiAoQXJyYXkuaXNBcnJheSh2YWx1ZSkpIHtcbiAgICAgIHZhbHVlID0gdmFsdWUubWFwKCh2YWwpID0+IHtcbiAgICAgICAgaWYgKGlzTmFOKHZhbCkpIHtcbiAgICAgICAgICByZXR1cm4gdmFsO1xuICAgICAgICB9IGVsc2Uge1xuICAgICAgICAgIHJldHVybiArdmFsO1xuICAgICAgICB9XG4gICAgICB9KVxuICAgIH1cblxuICAgIHN1cGVyLl9zZXRNb2RlbCh2YWx1ZSk7XG4gIH1cblxuICBwcm90ZWN0ZWQgX3ZhbGlkYXRlTW9kZWwoKSB7XG4gICAgY29uc3QgcG9zc2libGVWYWx1ZXMgPSBmaWx0ZXIodGhpcy5tb2RlbCB8fCBbXSwgKGl0ZW0pID0+IHtcbiAgICAgIHJldHVybiB0aGlzLnZhbHVlcy5maW5kKHZhbHVlID0+IHtcbiAgICAgICAgcmV0dXJuIHZhbHVlLnZhbHVlID09IGl0ZW07XG4gICAgICB9KTtcbiAgICB9KTtcblxuICAgIGlmICghaXNBcnJheUVxdWFsKHRoaXMubW9kZWwsIHBvc3NpYmxlVmFsdWVzKSkge1xuICAgICAgdGhpcy5tb2RlbCA9IHBvc3NpYmxlVmFsdWVzO1xuICAgIH1cbiAgfVxuXG4gIHByb3RlY3RlZCBfY2xlYXJWYWx1ZShkZWZhdWx0VmFsdWU6IHVua25vd24gPSB1bmRlZmluZWQpIHtcbiAgICBzdXBlci5fY2xlYXJWYWx1ZShkZWZhdWx0VmFsdWUpO1xuXG4gICAgdGhpcy5tb2RlbCA9IGRlZmF1bHRWYWx1ZSA/PyBbXTtcbiAgfVxufVxuIl19
|
|
@@ -5,7 +5,7 @@ import { RouterModule } from '@angular/router';
|
|
|
5
5
|
import { BehaviorSubject, Subject, isObservable, forkJoin, of, fromEvent, merge, timer, combineLatest } from 'rxjs';
|
|
6
6
|
import { tap, finalize, take, takeUntil, debounceTime, filter as filter$1, distinctUntilChanged, switchMap, delay, skip, mapTo, startWith, map } from 'rxjs/operators';
|
|
7
7
|
import { isFunction, clone, isObject, isString, toString, pickBy } from 'lodash-es';
|
|
8
|
-
import { filter, isEmpty, getNormalizedPath, list, remove, FsCommonModule } from '@firestitch/common';
|
|
8
|
+
import { filter, isArrayEqual, isEmpty, getNormalizedPath, list, remove, FsCommonModule } from '@firestitch/common';
|
|
9
9
|
import { simpleFormat, format } from '@firestitch/date';
|
|
10
10
|
import { parseISO, isValid, isDate, isEqual } from 'date-fns';
|
|
11
11
|
import * as i3$3 from '@firestitch/datepicker';
|
|
@@ -534,11 +534,14 @@ class MultipleSelectItem extends BaseSelectItem {
|
|
|
534
534
|
super._setModel(value);
|
|
535
535
|
}
|
|
536
536
|
_validateModel() {
|
|
537
|
-
|
|
537
|
+
const possibleValues = filter(this.model || [], (item) => {
|
|
538
538
|
return this.values.find(value => {
|
|
539
539
|
return value.value == item;
|
|
540
540
|
});
|
|
541
541
|
});
|
|
542
|
+
if (!isArrayEqual(this.model, possibleValues)) {
|
|
543
|
+
this.model = possibleValues;
|
|
544
|
+
}
|
|
542
545
|
}
|
|
543
546
|
_clearValue(defaultValue = undefined) {
|
|
544
547
|
super._clearValue(defaultValue);
|