From b2a1793f4d2fd3de41b6ac80febec0c24e370f2d Mon Sep 17 00:00:00 2001
From: Vladyslav_Prykhodko <vprykhodko@thingsboard.io>
Date: Wed, 11 Dec 2024 15:31:16 +0200
Subject: [PATCH] UI: Fixed updated mobile layout and show mobile edit panel

---
 .../mobile/bundes/layout/mobile-page-item-row.component.ts    | 4 ++--
 .../home/pages/mobile/common/editor-panel.component.scss      | 1 +
 .../home/pages/mobile/common/editor-panel.component.ts        | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ui-ngx/src/app/modules/home/pages/mobile/bundes/layout/mobile-page-item-row.component.ts b/ui-ngx/src/app/modules/home/pages/mobile/bundes/layout/mobile-page-item-row.component.ts
index 9a60c87959..c862a48042 100644
--- a/ui-ngx/src/app/modules/home/pages/mobile/bundes/layout/mobile-page-item-row.component.ts
+++ b/ui-ngx/src/app/modules/home/pages/mobile/bundes/layout/mobile-page-item-row.component.ts
@@ -270,8 +270,8 @@ export class MobilePageItemRowComponent implements ControlValueAccessor, OnInit,
 
   private updateModel() {
     this.modelValue.visible = this.mobilePageRowForm.get('visible').value;
-    const label = this.mobilePageRowForm.get('label').value.trim();
-    if (label) {
+    const label = this.mobilePageRowForm.get('label').value;
+    if (label?.trim()) {
       this.modelValue.label = label;
     } else {
       delete this.modelValue.label;
diff --git a/ui-ngx/src/app/modules/home/pages/mobile/common/editor-panel.component.scss b/ui-ngx/src/app/modules/home/pages/mobile/common/editor-panel.component.scss
index 00a2ebca2d..87dd67e8e0 100644
--- a/ui-ngx/src/app/modules/home/pages/mobile/common/editor-panel.component.scss
+++ b/ui-ngx/src/app/modules/home/pages/mobile/common/editor-panel.component.scss
@@ -32,6 +32,7 @@
   }
   .tb-editor {
     height: 400px;
+    overflow-y: auto;
   }
   .tb-editor-buttons {
     height: 40px;
diff --git a/ui-ngx/src/app/modules/home/pages/mobile/common/editor-panel.component.ts b/ui-ngx/src/app/modules/home/pages/mobile/common/editor-panel.component.ts
index 15dff508c8..92ab23f3c2 100644
--- a/ui-ngx/src/app/modules/home/pages/mobile/common/editor-panel.component.ts
+++ b/ui-ngx/src/app/modules/home/pages/mobile/common/editor-panel.component.ts
@@ -59,7 +59,7 @@ export class EditorPanelComponent implements OnInit {
     resize: false,
     setup: (editor) => {
       editor.on('PostRender', function() {
-        const container = editor.getContainer();
+        const container = editor.getContainer().closest('.tb-popover-content');
         const uiContainer = document.querySelector('.tox.tox-tinymce-aux');
         container.parentNode.appendChild(uiContainer);
       });