From 90fce43ca8fba6a083a2c8b74d6c61509bd99901 Mon Sep 17 00:00:00 2001
From: oblomov <102328295+oblomov-dev@users.noreply.github.com>
Date: Mon, 10 Apr 2023 10:26:38 +0200
Subject: [PATCH] bugfixes (#147)

* popup bug

* popup bug

* bugfix
---
 src/00/z2ui5_cl_app_demo_00.clas.abap     |  2 +-
 src/00/z2ui5_cl_app_demo_07.clas.abap     |  2 +-
 src/00/z2ui5_cl_xml_view_helper.clas.abap | 21 ++++++++++++++-------
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/00/z2ui5_cl_app_demo_00.clas.abap b/src/00/z2ui5_cl_app_demo_00.clas.abap
index 31fdc939..3d7a27e5 100644
--- a/src/00/z2ui5_cl_app_demo_00.clas.abap
+++ b/src/00/z2ui5_cl_app_demo_00.clas.abap
@@ -34,7 +34,7 @@ CLASS z2ui5_cl_app_demo_00 IMPLEMENTATION.
 
 
     DATA(page) = z2ui5_cl_xml_view_helper=>factory(
-        )->page(
+        )->shell( )->page(
         title = 'abap2UI5 - Demo Section'
         class = 'sapUiContentPadding sapUiResponsivePadding--content '
         navbuttonpress = client->_event( 'BACK' )
diff --git a/src/00/z2ui5_cl_app_demo_07.clas.abap b/src/00/z2ui5_cl_app_demo_07.clas.abap
index 666a67a8..615bfd6d 100644
--- a/src/00/z2ui5_cl_app_demo_07.clas.abap
+++ b/src/00/z2ui5_cl_app_demo_07.clas.abap
@@ -153,7 +153,7 @@ CLASS z2ui5_cl_app_demo_07 IMPLEMENTATION.
 
   METHOD ui5_render_view_init.
 
-    DATA(lo_view) = z2ui5_cl_xml_view_helper=>factory( check_shell = abap_false ns = VALUE #(
+    DATA(lo_view) = z2ui5_cl_xml_view_helper=>factory( ns = VALUE #(
          ( `xmlns:mvc="sap.ui.core.mvc"` )
          ( `xmlns:m="sap.m"` )
          ( `xmlns:z2ui5="z2ui5"` )
diff --git a/src/00/z2ui5_cl_xml_view_helper.clas.abap b/src/00/z2ui5_cl_xml_view_helper.clas.abap
index 87674f72..b07ac9ce 100644
--- a/src/00/z2ui5_cl_xml_view_helper.clas.abap
+++ b/src/00/z2ui5_cl_xml_view_helper.clas.abap
@@ -24,7 +24,6 @@ CLASS z2ui5_cl_xml_view_helper DEFINITION
     CLASS-METHODS factory
       IMPORTING
         ns            TYPE string_table OPTIONAL
-        check_shell   TYPE abap_bool    DEFAULT abap_true
       RETURNING
         VALUE(result) TYPE REF TO z2ui5_cl_xml_view_helper.
 
@@ -216,6 +215,11 @@ CLASS z2ui5_cl_xml_view_helper DEFINITION
       RETURNING
         VALUE(result) TYPE REF TO z2ui5_cl_xml_view_helper.
 
+    METHODS shell
+      IMPORTING
+        ns            TYPE clike OPTIONAL
+      RETURNING
+        VALUE(result) TYPE REF TO z2ui5_cl_xml_view_helper.
     METHODS blocks
       RETURNING
         VALUE(result) TYPE REF TO z2ui5_cl_xml_view_helper.
@@ -880,12 +884,6 @@ CLASS z2ui5_cl_xml_view_helper IMPLEMENTATION.
     lo_tree->m_parent = lo_tree.
     result = lo_tree.
 
-    if check_shell = abap_true.
-
-    result = result->_generic( 'Shell' ).
-
-    endif.
-
   ENDMETHOD.
 
 
@@ -2283,4 +2281,13 @@ CLASS z2ui5_cl_xml_view_helper IMPLEMENTATION.
 
   ENDMETHOD.
 
+  METHOD shell.
+
+   result = _generic(
+       name   = `Shell`
+       ns     = ns
+     ).
+
+  ENDMETHOD.
+
 ENDCLASS.