mirror of
https://github.com/bitwarden/browser
synced 2025-12-14 23:33:31 +00:00
[PS-1017] corrected web vault accessibility when deleting an item with keyboard (#3893)
* PS-1017 Sending parent property to swal when delete popup appears above a modal * PS-1017 - Added more cases where the parent is necessary to swal react properly to keyboard inputs. Changed the way the ".modal-content" class is added to target to have it only on one place. * [PS-1017] Removed edit of target css selector from platform. Added full target on related component
This commit is contained in:
@@ -140,7 +140,8 @@ export class WebPlatformUtilsService implements PlatformUtilsService {
|
||||
confirmText?: string,
|
||||
cancelText?: string,
|
||||
type?: string,
|
||||
bodyIsHtml = false
|
||||
bodyIsHtml = false,
|
||||
target?: string
|
||||
) {
|
||||
let iconClasses: string = null;
|
||||
if (type != null) {
|
||||
@@ -182,6 +183,7 @@ export class WebPlatformUtilsService implements PlatformUtilsService {
|
||||
cancelButtonText: cancelText,
|
||||
showConfirmButton: true,
|
||||
confirmButtonText: confirmText == null ? this.i18nService.t("ok") : confirmText,
|
||||
target: target != null ? target : "body",
|
||||
});
|
||||
|
||||
if (bootstrapModal != null) {
|
||||
|
||||
@@ -158,7 +158,9 @@ export class CollectionAddEditComponent implements OnInit {
|
||||
this.name,
|
||||
this.i18nService.t("yes"),
|
||||
this.i18nService.t("no"),
|
||||
"warning"
|
||||
"warning",
|
||||
false,
|
||||
"app-collection-add-edit .modal-content"
|
||||
);
|
||||
if (!confirmed) {
|
||||
return false;
|
||||
|
||||
@@ -130,7 +130,9 @@ export class GroupAddEditComponent implements OnInit {
|
||||
this.name,
|
||||
this.i18nService.t("yes"),
|
||||
this.i18nService.t("no"),
|
||||
"warning"
|
||||
"warning",
|
||||
false,
|
||||
"app-group-add-edit .modal-content"
|
||||
);
|
||||
if (!confirmed) {
|
||||
return false;
|
||||
|
||||
@@ -215,7 +215,9 @@ export class UserAddEditComponent implements OnInit {
|
||||
this.i18nService.t("removeUserIdAccess", this.name),
|
||||
this.i18nService.t("yes"),
|
||||
this.i18nService.t("no"),
|
||||
"warning"
|
||||
"warning",
|
||||
false,
|
||||
"app-user-add-edit .modal-content"
|
||||
);
|
||||
if (!confirmed) {
|
||||
return false;
|
||||
@@ -248,7 +250,9 @@ export class UserAddEditComponent implements OnInit {
|
||||
this.i18nService.t("revokeUserId", this.name),
|
||||
this.i18nService.t("revokeAccess"),
|
||||
this.i18nService.t("cancel"),
|
||||
"warning"
|
||||
"warning",
|
||||
false,
|
||||
"app-user-add-edit .modal-content"
|
||||
);
|
||||
if (!confirmed) {
|
||||
return false;
|
||||
|
||||
@@ -29,6 +29,7 @@ import { AddEditComponent as BaseAddEditComponent } from "../../vault/add-edit.c
|
||||
})
|
||||
export class AddEditComponent extends BaseAddEditComponent {
|
||||
originalCipher: Cipher = null;
|
||||
protected override componentName = "app-org-vault-add-edit";
|
||||
|
||||
constructor(
|
||||
cipherService: CipherService,
|
||||
|
||||
@@ -16,6 +16,8 @@ import { StateService } from "@bitwarden/common/abstractions/state.service";
|
||||
templateUrl: "add-edit.component.html",
|
||||
})
|
||||
export class AddEditComponent extends BaseAddEditComponent {
|
||||
override componentName = "app-send-add-edit";
|
||||
|
||||
constructor(
|
||||
i18nService: I18nService,
|
||||
platformUtilsService: PlatformUtilsService,
|
||||
|
||||
@@ -26,6 +26,7 @@ import { AddEditComponent as BaseAddEditComponent } from "../vault/add-edit.comp
|
||||
export class EmergencyAddEditComponent extends BaseAddEditComponent {
|
||||
originalCipher: Cipher = null;
|
||||
viewOnly = true;
|
||||
protected override componentName = "app-org-vault-add-edit";
|
||||
|
||||
constructor(
|
||||
cipherService: CipherService,
|
||||
|
||||
@@ -37,6 +37,7 @@ export class AddEditComponent extends BaseAddEditComponent implements OnInit, On
|
||||
viewOnly = false;
|
||||
|
||||
protected totpInterval: number;
|
||||
protected override componentName = "app-vault-add-edit";
|
||||
|
||||
constructor(
|
||||
cipherService: CipherService,
|
||||
|
||||
@@ -17,6 +17,7 @@ import { AttachmentView } from "@bitwarden/common/models/view/attachment.view";
|
||||
})
|
||||
export class AttachmentsComponent extends BaseAttachmentsComponent {
|
||||
viewOnly = false;
|
||||
protected override componentName = "app-vault-attachments";
|
||||
|
||||
constructor(
|
||||
cipherService: CipherService,
|
||||
|
||||
@@ -12,6 +12,7 @@ import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUti
|
||||
templateUrl: "folder-add-edit.component.html",
|
||||
})
|
||||
export class FolderAddEditComponent extends BaseFolderAddEditComponent {
|
||||
protected override componentName = "app-folder-add-edit";
|
||||
constructor(
|
||||
folderService: FolderService,
|
||||
folderApiService: FolderApiServiceAbstraction,
|
||||
|
||||
Reference in New Issue
Block a user