CodeCow/clients
1
0
Fork 0
mirror of https://github.com/bitwarden/clients.git synced 2026-07-21 21:17:06 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

[PM-39290] Coachmark navigation in v2 (#21456)

Browse Source
This commit is contained in:
Vijay Oommen 2026-06-24 09:54:56 -05:00 committed by GitHub
parent b60c6f39d1
commit 9ad41a97b5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bitwarden_license/bit-web/src/app/dirt/access-intelligence/risk-insights.component.ts
View File

@ -197,9 +197,11 @@ export class RiskInsightsComponent implements OnInit, OnDestroy {
const activeStepId = untracked(() => this.coachmarkService.activeStepId());
this.coachmarkService.activeStepId.set(null); // close all popovers now
// setTimeout defers re-activation to after Angular's CD + rendering completes,
// afterNextRender defers re-activation to after Angular's CD + rendering completes,
// so the tab button is un-hidden before the popover measures its position.
setTimeout(() => this.coachmarkService.activeStepId.set(activeStepId));
afterNextRender(() => this.coachmarkService.activeStepId.set(activeStepId), {
injector: this.injector,
});
}
});

20
bitwarden_license/bit-web/src/app/dirt/access-intelligence/v2/access-intelligence-page/access-intelligence-page.component.ts
View File

@ -13,6 +13,7 @@ import {
isDevMode,
effect,
afterNextRender,
untracked,
} from "@angular/core";
import { toObservable, toSignal, takeUntilDestroyed } from "@angular/core/rxjs-interop";
import { ActivatedRoute, Router } from "@angular/router";
@ -261,10 +262,21 @@ export class AccessIntelligencePageComponent implements OnInit, OnDestroy {
});
effect(() => {
// coachmarks are running, so set tab index to the coachmark's required tab
const tabIndex = this.coachmarkService.requiredTabIndex();
if (tabIndex !== null && tabIndex !== this.tabIndex()) {
this.tabIndex.set(tabIndex);
const requiredTabIndex = this.coachmarkService.requiredTabIndex();
if (requiredTabIndex !== null && requiredTabIndex !== this.tabIndex()) {
this.tabIndex.set(requiredTabIndex);
// Reset drawer state and close drawer when tabs are changed
// we need to ensure that the popover is closed before the tab is changed,
// otherwise the popover will be hidden behind the new tab content
const activeStepId = untracked(() => this.coachmarkService.activeStepId());
this.coachmarkService.activeStepId.set(null); // close all popovers now
// afterNextRender defers re-activation to after Angular's CD + rendering completes,
// so the tab button is un-hidden before the popover measures its position.
afterNextRender(() => this.coachmarkService.activeStepId.set(activeStepId), {
injector: this.injector,
});
}
});