@sd-angular/core 1.3.0 → 1.3.2

package/bundles/sd-angular-core-grid-material.umd.js

@@ -1837,7 +1837,7 @@
         { type: core.NgZone }
     ]; };
 
-    var _paginator, _sort, _subscription$1, _optionChanges, _initCellDef, _initFilterDef, _initFooterDef, _filterExportInfo, _initConfiguration, _filterLocal, _getFilter, _load$1, _render, _exportedItems, _allColumns, _allExportedColumns, _onExport, _updateSelectedItems;
+    var _paginator, _sort, _subscription$1, _optionChanges, _reload, _initCellDef, _initFilterDef, _initFooterDef, _filterExportInfo, _initConfiguration, _filterLocal, _getFilter, _load$1, _render, _exportedItems, _allColumns, _allExportedColumns, _onExport, _updateSelectedItems;
     var SdGridMaterial = /** @class */ (function () {
         function SdGridMaterial(ref, configuration, gridConfigurationService, exportService, notifyService, translateService, columnValuesPipe, editorHandlerColumnPipe) {
             var _this = this;
@@ -1875,6 +1875,7 @@
             // Subcription
             _subscription$1.set(this, new rxjs.Subscription());
             _optionChanges.set(this, new core.EventEmitter());
+            _reload.set(this, new rxjs.Subject());
             this.isExporting = false;
             this.isSelectAll = false;
             this.exportTitle = 'Export';
@@ -2137,17 +2138,18 @@
                 });
             });
             _render.set(this, function (args) { return __awaiter(_this, void 0, void 0, function () {
-                var _a, _b, _c;
+                var _a, _b, _c, _d;
                 return __generator(this, function (_2) {
                     switch (_2.label) {
                         case 0:
+                            (_a = this.sdScroll) === null || _a === void 0 ? void 0 : _a.scrollTop();
                             this.items = (args === null || args === void 0 ? void 0 : args.items) || [];
                             this.total = (args === null || args === void 0 ? void 0 : args.total) || 0;
                             // this.isHiddenPaginator = this.filterInfo.pageNumber === 0 && this.total <= this.filterInfo.pageSize;
                             this.items.forEach(function (item) {
                                 item.originItem = Object.assign({}, item);
                             });
-                            return [4 /*yield*/, ((_c = (_b = (_a = this.gridOption) === null || _a === void 0 ? void 0 : _a.reload) === null || _b === void 0 ? void 0 : _b.onReload) === null || _c === void 0 ? void 0 : _c.call(_b, this.items))];
+                            return [4 /*yield*/, ((_d = (_c = (_b = this.gridOption) === null || _b === void 0 ? void 0 : _b.reload) === null || _c === void 0 ? void 0 : _c.onReload) === null || _d === void 0 ? void 0 : _d.call(_c, this.items))];
                         case 1:
                             _2.sent();
                             this.isSelectAll = this.items.every(function (e) { return e.isSelected; });
@@ -2159,13 +2161,12 @@
             this.reload = function (force) {
                 if (force === void 0) { force = true; }
                 return __awaiter(_this, void 0, void 0, function () {
-                    var _d, data;
+                    var data;
                     return __generator(this, function (_2) {
                         switch (_2.label) {
                             case 0: return [4 /*yield*/, __classPrivateFieldGet(this, _load$1).call(this, __classPrivateFieldGet(this, _getFilter).call(this), force)];
                             case 1:
                                 data = _2.sent();
-                                (_d = this.sdScroll) === null || _d === void 0 ? void 0 : _d.scrollTop();
                                 __classPrivateFieldGet(this, _render).call(this, data);
                                 return [2 /*return*/];
                         }
@@ -2912,10 +2913,11 @@
                 var _this = this;
                 if (gridFilter && this.gridFilter !== gridFilter) {
                     this.gridFilter = gridFilter;
-                    __classPrivateFieldGet(this, _subscription$1).add(gridFilter.filterChange.pipe(operators.debounceTime(200), operators.map(function () {
+                    __classPrivateFieldGet(this, _reload).next(false);
+                    __classPrivateFieldGet(this, _subscription$1).add(gridFilter.filterChange.pipe(operators.map(function () {
                         __classPrivateFieldGet(_this, _paginator).pageIndex = 0;
-                        return __classPrivateFieldGet(_this, _getFilter).call(_this);
-                    }), operators.switchMap(function (filterInfo) { return __classPrivateFieldGet(_this, _load$1).call(_this, filterInfo, false); })).subscribe(__classPrivateFieldGet(this, _render)));
+                        __classPrivateFieldGet(_this, _reload).next(false);
+                    })).subscribe());
                 }
             },
             enumerable: false,
@@ -2928,7 +2930,7 @@
                 if (option) {
                     option = __classPrivateFieldGet(this, _initConfiguration).call(this, option);
                     this.gridOption = option;
-                    __classPrivateFieldGet(this, _optionChanges).emit();
+                    __classPrivateFieldGet(this, _reload).next(true);
                     (_a = option === null || option === void 0 ? void 0 : option.columns) === null || _a === void 0 ? void 0 : _a.forEach(function (col) {
                         var _a;
                         if ((_a = col.filter) === null || _a === void 0 ? void 0 : _a.default) {
@@ -2948,7 +2950,9 @@
                 var _this = this;
                 if (paginator && __classPrivateFieldGet(this, _paginator) !== paginator) {
                     __classPrivateFieldSet(this, _paginator, paginator);
-                    __classPrivateFieldGet(this, _subscription$1).add(paginator.page.pipe(operators.debounceTime(200), operators.map(__classPrivateFieldGet(this, _getFilter)), operators.switchMap(function (filterInfo) { return __classPrivateFieldGet(_this, _load$1).call(_this, filterInfo, false); })).subscribe(__classPrivateFieldGet(this, _render)));
+                    __classPrivateFieldGet(this, _subscription$1).add(paginator.page.pipe(operators.map(function () {
+                        __classPrivateFieldGet(_this, _reload).next(false);
+                    })).subscribe());
                 }
             },
             enumerable: false,
@@ -2959,7 +2963,9 @@
                 var _this = this;
                 if (sort && __classPrivateFieldGet(this, _sort) !== sort) {
                     __classPrivateFieldSet(this, _sort, sort);
-                    __classPrivateFieldGet(this, _subscription$1).add(sort.sortChange.pipe(operators.debounceTime(200), operators.map(__classPrivateFieldGet(this, _getFilter)), operators.switchMap(function (filterInfo) { return __classPrivateFieldGet(_this, _load$1).call(_this, filterInfo, false); })).subscribe(__classPrivateFieldGet(this, _render)));
+                    __classPrivateFieldGet(this, _subscription$1).add(sort.sortChange.pipe(operators.map(function () {
+                        __classPrivateFieldGet(_this, _reload).next(false);
+                    })).subscribe());
                 }
             },
             enumerable: false,
@@ -2970,10 +2976,19 @@
         };
         SdGridMaterial.prototype.ngAfterViewInit = function () {
             var _this = this;
+            __classPrivateFieldGet(this, _subscription$1).add(__classPrivateFieldGet(this, _reload).pipe(operators.startWith(true), operators.debounceTime(200), operators.switchMap(function (force) {
+                var filterInfo = __classPrivateFieldGet(_this, _getFilter).call(_this);
+                return __classPrivateFieldGet(_this, _load$1).call(_this, filterInfo, force);
+            })).subscribe(__classPrivateFieldGet(this, _render)));
             __classPrivateFieldGet(this, _subscription$1).add(this.sdCellDefs.changes.pipe(operators.startWith([])).subscribe(__classPrivateFieldGet(this, _initCellDef)));
             __classPrivateFieldGet(this, _subscription$1).add(this.sdFooterDefs.changes.pipe(operators.startWith([])).subscribe(__classPrivateFieldGet(this, _initFooterDef)));
             __classPrivateFieldGet(this, _subscription$1).add(this.sdFilterDefs.changes.pipe(operators.startWith([])).subscribe(__classPrivateFieldGet(this, _initFilterDef)));
-            __classPrivateFieldGet(this, _subscription$1).add(__classPrivateFieldGet(this, _optionChanges).pipe(operators.startWith({}), operators.debounceTime(200), operators.map(__classPrivateFieldGet(this, _getFilter)), operators.switchMap(function (filterInfo) { return __classPrivateFieldGet(_this, _load$1).call(_this, filterInfo, true); })).subscribe(__classPrivateFieldGet(this, _render)));
+            // this.#subscription.add(this.#optionChanges.pipe(
+            //   debounceTime(200),
+            //   startWith({}),
+            //   map(this.#getFilter),
+            //   switchMap(filterInfo => this.#load(filterInfo, true))
+            // ).subscribe(this.#render));
             this.ref.detectChanges();
         };
         SdGridMaterial.prototype.ngOnDestroy = function () {
@@ -3019,7 +3034,7 @@
         });
         return SdGridMaterial;
     }());
-    _paginator = new WeakMap(), _sort = new WeakMap(), _subscription$1 = new WeakMap(), _optionChanges = new WeakMap(), _initCellDef = new WeakMap(), _initFilterDef = new WeakMap(), _initFooterDef = new WeakMap(), _filterExportInfo = new WeakMap(), _initConfiguration = new WeakMap(), _filterLocal = new WeakMap(), _getFilter = new WeakMap(), _load$1 = new WeakMap(), _render = new WeakMap(), _exportedItems = new WeakMap(), _allColumns = new WeakMap(), _allExportedColumns = new WeakMap(), _onExport = new WeakMap(), _updateSelectedItems = new WeakMap();
+    _paginator = new WeakMap(), _sort = new WeakMap(), _subscription$1 = new WeakMap(), _optionChanges = new WeakMap(), _reload = new WeakMap(), _initCellDef = new WeakMap(), _initFilterDef = new WeakMap(), _initFooterDef = new WeakMap(), _filterExportInfo = new WeakMap(), _initConfiguration = new WeakMap(), _filterLocal = new WeakMap(), _getFilter = new WeakMap(), _load$1 = new WeakMap(), _render = new WeakMap(), _exportedItems = new WeakMap(), _allColumns = new WeakMap(), _allExportedColumns = new WeakMap(), _onExport = new WeakMap(), _updateSelectedItems = new WeakMap();
     SdGridMaterial.decorators = [
         { type: core.Component, args: [{
                     selector: 'sd-grid-material',
@@ -5026,5 +5041,4 @@
     Object.defineProperty(exports, '__esModule', { value: true });
 
 })));
-
-//# sourceMappingURL=sd-angular-core-grid-material.umd.js.map
+//# sourceMappingURL=sd-angular-core-grid-material.umd.js.map