@theseam/ui-common 0.3.13-beta.0 → 0.3.14-beta.2

package/fesm2015/theseam-ui-common-framework.js

@@ -1323,7 +1323,7 @@ class SideNavComponent {
         this.overlay$ = this._overlay.asObservable();
         this.toggleExpand = new EventEmitter();
         this._backdropHidden = new BehaviorSubject(true);
-        this.items$ = this._items.asObservable().pipe(switchMap(items => this._sideNav.createItemsObservable(items)), shareReplay({ bufferSize: 1, refCount: true }));
+        this.items$ = this._items.asObservable().pipe(switchMap(items => items ? this._sideNav.createItemsObservable(items) : []), shareReplay({ bufferSize: 1, refCount: true }));
         this.isMobile$ = this._layout.isMobile$.pipe(tap(isMobile => isMobile ? this.collapse() : this.expand()));
         this.sideNavExpandedState$ = combineLatest([this.expanded$, this.overlay$]).pipe(map(([expanded, overlay]) => expanded
             ? overlay ? EXPANDED_OVERLAY_STATE : EXPANDED_STATE$1
@@ -2961,6 +2961,7 @@ class TheSeamNavService {
     createItemsObservable(items) {
         return defer(() => {
             this.updateItemsStates(items);
+            this.updateRouterFocusedItem(items);
             return new Observable((subscriber) => {
                 const stateChangeSub = this.itemChanged.pipe(switchMap(change => {
                     if (change.prop === 'focused' && change.newValue) {
@@ -2979,6 +2980,7 @@ class TheSeamNavService {
                 const routeChangeSub = this._router.events.pipe(filter(event => event instanceof NavigationEnd)).subscribe(event => {
                     try {
                         this.updateItemsStates(items);
+                        this.updateRouterFocusedItem(items);
                     }
                     catch (err) {
                         subscriber.error(err);
@@ -2999,7 +3001,6 @@ class TheSeamNavService {
     }
     updateItemsStates(items) {
         this._incUpdatingCount();
-        this.updateRouterFocusedItem(items);
         try {
             for (const item of items) {
                 if (horizontalNavItemHasChildren(item)) {
@@ -3071,11 +3072,13 @@ class TheSeamNavService {
     }
     updateRouterFocusedItem(items) {
         const focusedItem = items.find(i => isHorizontalNavItemActive(i)) || items.find(i => horizontalNavItemHasActiveChild(i));
-        this.updateFocusedItem(items, focusedItem);
+        if (notNullOrUndefined(focusedItem)) {
+            this.updateFocusedItem(items, focusedItem);
+        }
     }
     updateFocusedItem(items, focusedItem) {
         for (const item of items) {
-            if (item === focusedItem) {
+            if (areSameHorizontalNavItem(item, focusedItem)) {
                 setHorizontalNavItemStateProp(item, 'focused', true);
             }
             else {