From 0256495514aec0c931a1b677ef8a172fa9b7c207 Mon Sep 17 00:00:00 2001
From: "Tim.Ebbeke" <Tim.Ebbeke@sennheiser.com>
Date: Fri, 15 Sep 2023 11:26:15 +0200
Subject: [PATCH] Fixed dialog construction.

---
 .../nui/frontend/components/dialog.hpp        | 17 ++++---
 nui/src/nui/frontend/components/dialog.cpp    | 49 ++++++++++---------
 2 files changed, 38 insertions(+), 28 deletions(-)

diff --git a/nui/include/nui/frontend/components/dialog.hpp b/nui/include/nui/frontend/components/dialog.hpp
index 01355c8..fd47b1a 100644
--- a/nui/include/nui/frontend/components/dialog.hpp
+++ b/nui/include/nui/frontend/components/dialog.hpp
@@ -32,11 +32,11 @@ namespace Nui::Components
 
         struct ConstructionArgs
         {
-            Observed<std::optional<std::string>> className{std::nullopt};
-            Observed<std::string> title{""};
-            Observed<std::string> body{""};
-            Observed<std::string> buttonClassName{""};
-            Observed<ButtonConfiguration> buttonConfiguration{ButtonConfiguration::Ok};
+            std::optional<std::string> className{std::nullopt};
+            std::string title{""};
+            std::string body{""};
+            std::string buttonClassName{""};
+            ButtonConfiguration buttonConfiguration{ButtonConfiguration::Ok};
             std::function<void(Button)> onButtonClicked = [](Button) {};
         };
 
@@ -107,6 +107,11 @@ namespace Nui::Components
       private:
         bool isOpen_;
         std::weak_ptr<Dom::Element> element_;
-        ConstructionArgs args_;
+        Observed<std::optional<std::string>> className_;
+        Observed<std::string> title_;
+        Observed<std::string> body_;
+        Observed<std::string> buttonClassName_;
+        Observed<ButtonConfiguration> buttonConfiguration_;
+        std::function<void(Button)> onButtonClicked_;
     };
 }
\ No newline at end of file
diff --git a/nui/src/nui/frontend/components/dialog.cpp b/nui/src/nui/frontend/components/dialog.cpp
index a9c8938..7d4e048 100644
--- a/nui/src/nui/frontend/components/dialog.cpp
+++ b/nui/src/nui/frontend/components/dialog.cpp
@@ -23,7 +23,12 @@ namespace Nui::Components
     DialogController::DialogController(ConstructionArgs&& args)
         : isOpen_{false}
         , element_{}
-        , args_{std::move(args)}
+        , className_{std::move(args.className)}
+        , title_{std::move(args.title)}
+        , body_{std::move(args.body)}
+        , buttonClassName_{std::move(args.buttonClassName)}
+        , buttonConfiguration_{std::move(args.buttonConfiguration)}
+        , onButtonClicked_{std::move(args.onButtonClicked)}
     {}
     //---------------------------------------------------------------------------------------------------------------------
     void DialogController::showModal()
@@ -54,32 +59,32 @@ namespace Nui::Components
     //---------------------------------------------------------------------------------------------------------------------
     void DialogController::setClassName(std::string const& className)
     {
-        args_.className = className;
+        className_ = className;
     }
     //---------------------------------------------------------------------------------------------------------------------
     void DialogController::setButtonClassName(std::string const& className)
     {
-        args_.buttonClassName = className;
+        buttonClassName_ = className;
     }
     //---------------------------------------------------------------------------------------------------------------------
     void DialogController::setTitle(std::string const& title)
     {
-        args_.title = title;
+        title_ = title;
     }
     //---------------------------------------------------------------------------------------------------------------------
     void DialogController::setBody(std::string const& body)
     {
-        args_.body = body;
+        body_ = body;
     }
     //---------------------------------------------------------------------------------------------------------------------
     void DialogController::setButtonConfiguration(ButtonConfiguration buttons)
     {
-        args_.buttonConfiguration = buttons;
+        buttonConfiguration_ = buttons;
     }
     //---------------------------------------------------------------------------------------------------------------------
     void DialogController::setOnButtonClicked(std::function<void(Button)> const& onButtonClicked)
     {
-        args_.onButtonClicked = onButtonClicked;
+        onButtonClicked_ = onButtonClicked;
     }
     //---------------------------------------------------------------------------------------------------------------------
     Nui::ElementRenderer Dialog(DialogController& controller)
@@ -89,7 +94,7 @@ namespace Nui::Components
 
         // clang-format off
         return dialog{
-            class_ = controller.args_.className,
+            class_ = controller.className_,
             reference = [&controller](auto&& element){
                 controller.element_ = std::static_pointer_cast<Dom::Element>(element.lock());
             }
@@ -98,23 +103,23 @@ namespace Nui::Components
                 method = "dialog"
             }(
                 h1{}(
-                    controller.args_.title
+                    controller.title_
                 ),
                 p{}(
-                    controller.args_.body
+                    controller.body_
                 ),
                 menu{}(
-                    observe(controller.args_.buttonConfiguration),
-                    [&controller, &conf = controller.args_.buttonConfiguration]() -> Nui::ElementRenderer {
+                    observe(controller.buttonConfiguration_),
+                    [&controller, &conf = controller.buttonConfiguration_]() -> Nui::ElementRenderer {
                         switch (conf.value()) {
                             case(DialogController::ButtonConfiguration::Ok):
                             {
                                 return button{
-                                    class_ = controller.args_.buttonClassName,
+                                    class_ = controller.buttonClassName_,
                                     type = "submit",
                                     onClick = [&controller](){
                                         controller.isOpen_ = false;
-                                        controller.args_.onButtonClicked(DialogController::Button::Ok);
+                                        controller.onButtonClicked_(DialogController::Button::Ok);
                                     }
                                 }("Ok");
                             }
@@ -122,19 +127,19 @@ namespace Nui::Components
                             {
                                 return fragment(
                                     button{
-                                        class_ = controller.args_.buttonClassName,
+                                        class_ = controller.buttonClassName_,
                                         type = "submit",
                                         onClick = [&controller](){
                                             controller.isOpen_ = false;
-                                            controller.args_.onButtonClicked(DialogController::Button::Ok);
+                                            controller.onButtonClicked_(DialogController::Button::Ok);
                                         }
                                     }("Ok"),
                                     button{
-                                        class_ = controller.args_.buttonClassName,
+                                        class_ = controller.buttonClassName_,
                                         type = "cancel",
                                         onClick = [&controller](){
                                             controller.isOpen_ = false;
-                                            controller.args_.onButtonClicked(DialogController::Button::Cancel);
+                                            controller.onButtonClicked_(DialogController::Button::Cancel);
                                         }
                                     }("Cancel")
                                 );
@@ -143,19 +148,19 @@ namespace Nui::Components
                             {
                                 return fragment(
                                     button{
-                                        class_ = controller.args_.buttonClassName,
+                                        class_ = controller.buttonClassName_,
                                         type = "submit",
                                         onClick = [&controller](){
                                             controller.isOpen_ = false;
-                                            controller.args_.onButtonClicked(DialogController::Button::Yes);
+                                            controller.onButtonClicked_(DialogController::Button::Yes);
                                         }
                                     }("Yes"),
                                     button{
-                                        class_ = controller.args_.buttonClassName,
+                                        class_ = controller.buttonClassName_,
                                         type = "cancel",
                                         onClick = [&controller](){
                                             controller.isOpen_ = false;
-                                            controller.args_.onButtonClicked(DialogController::Button::No);
+                                            controller.onButtonClicked_(DialogController::Button::No);
                                         }
                                     }("No")
                                 );