From ff8a9844d824880dfb2ea8ad67be110e48b11f01 Mon Sep 17 00:00:00 2001
From: Mykyta Maliarchuk <84377976+nikita-web-ua@users.noreply.github.com>
Date: Fri, 18 Aug 2023 15:07:14 +0200
Subject: [PATCH] [ACS-5849] [ACS-5848] Incomplete string escaping fix (#3390)

* [ACS-5849] Incomplete string escaping fix

* [ACS-5849] Incomplete string escaping fix

* [ACS-5848] Incomplete string escaping fix
---
 .../toolbar/toolbar-button/toolbar-button.component.ts          | 2 +-
 .../toolbar/toolbar-menu-item/toolbar-menu-item.component.ts    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/projects/aca-shared/src/lib/components/toolbar/toolbar-button/toolbar-button.component.ts b/projects/aca-shared/src/lib/components/toolbar/toolbar-button/toolbar-button.component.ts
index 012f407ed..e2d27cb6f 100644
--- a/projects/aca-shared/src/lib/components/toolbar/toolbar-button/toolbar-button.component.ts
+++ b/projects/aca-shared/src/lib/components/toolbar/toolbar-button/toolbar-button.component.ts
@@ -68,7 +68,7 @@ export class ToolbarButtonComponent {
   runAction() {
     if (this.hasClickAction(this.actionRef)) {
       this.extensions.runActionById(this.actionRef.actions.click, {
-        focusedElementOnCloseSelector: `#${this.actionRef.id.replace(/\./g, '\\.')}`
+        focusedElementOnCloseSelector: `#${this.actionRef.id.replace(/\\/g, '\\\\').replace(/\./g, '\\.')}`
       });
     }
   }
diff --git a/projects/aca-shared/src/lib/components/toolbar/toolbar-menu-item/toolbar-menu-item.component.ts b/projects/aca-shared/src/lib/components/toolbar/toolbar-menu-item/toolbar-menu-item.component.ts
index fc875c6c1..56b3845ec 100644
--- a/projects/aca-shared/src/lib/components/toolbar/toolbar-menu-item/toolbar-menu-item.component.ts
+++ b/projects/aca-shared/src/lib/components/toolbar/toolbar-menu-item/toolbar-menu-item.component.ts
@@ -63,7 +63,7 @@ export class ToolbarMenuItemComponent {
         this.actionRef.actions.click,
         this.menuId
           ? {
-              focusedElementOnCloseSelector: `#${this.menuId.replace(/\./g, '\\.')}`
+              focusedElementOnCloseSelector: `#${this.menuId.replace(/\\/g, '\\\\').replace(/\./g, '\\.')}`
             }
           : undefined
       );