@ts-core/angular 15.0.45 → 15.0.47

package/fesm2020/ts-core-angular.mjs

@@ -4005,23 +4005,28 @@ class RouterSelectListItems extends SelectListItems {
     constructor(router, language) {
         super(language, true);
         this.router = router;
-        //--------------------------------------------------------------------------
-        //
-        // 	Protected Methods
-        //
-        //--------------------------------------------------------------------------
-        this.setData = () => {
-            this.selectedData = this.getRouterSelectedData();
-        };
-        this.setFragment = (item) => {
-            this.router.setFragment(item.data.toString());
-        };
-        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(item => this.setFragment(item));
+        this.router.completed
+            .pipe(filter(() => !this.isDisabled), takeUntil(this.destroyed))
+            .subscribe(() => this.setData());
+    }
+    //--------------------------------------------------------------------------
+    //
+    // 	Protected Methods
+    //
+    //--------------------------------------------------------------------------
+    setData() {
+        let item = this.getRouterSelectedItem();
+        this.selectedItem = !_.isNil(item) ? item : _.first(this.collection);
+    }
+    setFragment(item) {
+        let index = _.indexOf(this.collection, item);
+        this.router.setFragment(index > 0 ? item.data.toString() : null);
     }
-    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 +4034,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) {