Skip to content

Commit d820bfb

Browse files
authored
[PM-17346] Move A11yTitle and CopyClick to CL (#12936)
* Move A11yTitle and CopyClick to CL
1 parent 43a6a93 commit d820bfb

File tree

8 files changed

+23
-14
lines changed

8 files changed

+23
-14
lines changed

libs/angular/src/jslib.module.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@ import {
2525
TableModule,
2626
ToastModule,
2727
TypographyModule,
28+
CopyClickDirective,
29+
A11yTitleDirective,
2830
} from "@bitwarden/components";
2931

3032
import { TwoFactorIconComponent } from "./auth/components/two-factor-icon.component";
3133
import { DeprecatedCalloutComponent } from "./components/callout.component";
3234
import { A11yInvalidDirective } from "./directives/a11y-invalid.directive";
33-
import { A11yTitleDirective } from "./directives/a11y-title.directive";
3435
import { ApiActionDirective } from "./directives/api-action.directive";
3536
import { BoxRowDirective } from "./directives/box-row.directive";
36-
import { CopyClickDirective } from "./directives/copy-click.directive";
3737
import { CopyTextDirective } from "./directives/copy-text.directive";
3838
import { FallbackSrcDirective } from "./directives/fallback-src.directive";
3939
import { IfFeatureDirective } from "./directives/if-feature.directive";
@@ -83,10 +83,11 @@ import { IconComponent } from "./vault/components/icon.component";
8383
LinkModule,
8484
IconModule,
8585
TextDragDirective,
86+
CopyClickDirective,
87+
A11yTitleDirective,
8688
],
8789
declarations: [
8890
A11yInvalidDirective,
89-
A11yTitleDirective,
9091
ApiActionDirective,
9192
AutofocusDirective,
9293
BoxRowDirective,
@@ -105,7 +106,6 @@ import { IconComponent } from "./vault/components/icon.component";
105106
StopClickDirective,
106107
StopPropDirective,
107108
TrueFalseValueDirective,
108-
CopyClickDirective,
109109
LaunchClickDirective,
110110
UserNamePipe,
111111
PasswordStrengthComponent,

libs/angular/src/directives/a11y-title.directive.ts renamed to libs/components/src/a11y/a11y-title.directive.ts

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import { Directive, ElementRef, Input, OnInit, Renderer2 } from "@angular/core";
44

55
@Directive({
66
selector: "[appA11yTitle]",
7+
standalone: true,
78
})
89
export class A11yTitleDirective implements OnInit {
910
@Input() set appA11yTitle(title: string) {

libs/components/src/a11y/index.ts

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export * from "./a11y-title.directive";

libs/angular/src/directives/copy-click.directive.spec.ts renamed to libs/components/src/copy-click/copy-click.directive.spec.ts

+9-6
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ import { ComponentFixture, TestBed } from "@angular/core/testing";
33

44
import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
55
import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
6-
import { ToastService } from "@bitwarden/components";
6+
7+
import { ToastService } from "../";
78

89
import { CopyClickDirective } from "./copy-click.directive";
910

@@ -20,12 +21,14 @@ import { CopyClickDirective } from "./copy-click.directive";
2021
#toastWithLabel
2122
></button>
2223
`,
24+
standalone: true,
25+
imports: [CopyClickDirective],
2326
})
2427
class TestCopyClickComponent {
25-
@ViewChild("noToast") noToastButton: ElementRef<HTMLButtonElement>;
26-
@ViewChild("infoToast") infoToastButton: ElementRef<HTMLButtonElement>;
27-
@ViewChild("successToast") successToastButton: ElementRef<HTMLButtonElement>;
28-
@ViewChild("toastWithLabel") toastWithLabelButton: ElementRef<HTMLButtonElement>;
28+
@ViewChild("noToast") noToastButton!: ElementRef<HTMLButtonElement>;
29+
@ViewChild("infoToast") infoToastButton!: ElementRef<HTMLButtonElement>;
30+
@ViewChild("successToast") successToastButton!: ElementRef<HTMLButtonElement>;
31+
@ViewChild("toastWithLabel") toastWithLabelButton!: ElementRef<HTMLButtonElement>;
2932
}
3033

3134
describe("CopyClickDirective", () => {
@@ -38,7 +41,7 @@ describe("CopyClickDirective", () => {
3841
showToast.mockClear();
3942

4043
await TestBed.configureTestingModule({
41-
declarations: [CopyClickDirective, TestCopyClickComponent],
44+
imports: [TestCopyClickComponent],
4245
providers: [
4346
{
4447
provide: I18nService,

libs/angular/src/directives/copy-click.directive.ts renamed to libs/components/src/copy-click/copy-click.directive.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,12 @@ import { Directive, HostListener, Input } from "@angular/core";
44

55
import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
66
import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
7-
import { ToastService, ToastVariant } from "@bitwarden/components";
7+
8+
import { ToastService, ToastVariant } from "../";
89

910
@Directive({
1011
selector: "[appCopyClick]",
12+
standalone: true,
1113
})
1214
export class CopyClickDirective {
1315
private _showToast = false;
+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export * from "./copy-click.directive";

libs/components/src/index.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
1+
export { ButtonType } from "./shared/button-like.abstraction";
2+
export * from "./a11y";
13
export * from "./async-actions";
24
export * from "./avatar";
35
export * from "./badge-list";
46
export * from "./badge";
57
export * from "./banner";
68
export * from "./breadcrumbs";
79
export * from "./button";
8-
export { ButtonType } from "./shared/button-like.abstraction";
910
export * from "./callout";
1011
export * from "./card";
1112
export * from "./checkbox";
1213
export * from "./chip-select";
1314
export * from "./color-password";
1415
export * from "./container";
16+
export * from "./copy-click";
1517
export * from "./dialog";
1618
export * from "./disclosure";
1719
export * from "./drawer";

libs/vault/src/cipher-view/login-credentials/login-credentials-view.component.spec.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import { By } from "@angular/platform-browser";
44
import { mock } from "jest-mock-extended";
55
import { BehaviorSubject } from "rxjs";
66

7-
import { CopyClickDirective } from "@bitwarden/angular/directives/copy-click.directive";
87
import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
98
import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
109
import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions";
@@ -17,7 +16,7 @@ import { CipherType } from "@bitwarden/common/vault/enums";
1716
import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
1817
import { Fido2CredentialView } from "@bitwarden/common/vault/models/view/fido2-credential.view";
1918
import { LoginView } from "@bitwarden/common/vault/models/view/login.view";
20-
import { BitFormFieldComponent, ToastService } from "@bitwarden/components";
19+
import { CopyClickDirective, BitFormFieldComponent, ToastService } from "@bitwarden/components";
2120
// FIXME: remove `src` and fix import
2221
// eslint-disable-next-line no-restricted-imports
2322
import { ColorPasswordComponent } from "@bitwarden/components/src/color-password/color-password.component";

0 commit comments

Comments
 (0)