@ts-core/angular 15.0.45 → 15.0.46

package/fesm2020/ts-core-angular.mjs

@@ -4011,17 +4011,21 @@ class RouterSelectListItems extends SelectListItems {
         //
         //--------------------------------------------------------------------------
         this.setData = () => {
-            this.selectedData = this.getRouterSelectedData();
+            this.selectedItem = this.getRouterSelectedItem();
         };
         this.setFragment = (item) => {
-            this.router.setFragment(item.data.toString());
+            let index = _.indexOf(this.collection, item);
+            this.router.setFragment(index > 0 ? item.data.toString() : null);
         };
-        this.changed.pipe(takeUntil(this.destroyed)).subscribe(this.setFragment);
-        this.router.completed.pipe(takeUntil(this.destroyed)).subscribe(this.setData);
+        this.changed
+            .pipe(filter(() => !this.isDisabled), takeUntil(this.destroyed))
+            .subscribe(this.setFragment);
+        this.router.completed
+            .pipe(filter(() => !this.isDisabled), takeUntil(this.destroyed))
+            .subscribe(this.setData);
     }
-    getRouterSelectedData() {
-        let item = _.find(this.collection, { data: this.router.getFragment() });
-        return !_.isNil(item) ? item.data : null;
+    getRouterSelectedItem() {
+        return _.find(this.collection, { data: this.router.getFragment() });
     }
     //--------------------------------------------------------------------------
     //
@@ -4029,8 +4033,8 @@ class RouterSelectListItems extends SelectListItems {
     //
     //--------------------------------------------------------------------------
     complete() {
-        let item = this.getRouterSelectedData();
-        super.complete(_.isNil(item) ? 0 : item);
+        let item = this.getRouterSelectedItem();
+        super.complete(!_.isNil(item) ? item.data : 0);
     }
     destroy() {
         if (this.isDestroyed) {