From 3a756ca53e13212da1505f99d8671431b3802857 Mon Sep 17 00:00:00 2001
From: Fang Xiaohui <xiaohui.fang@samsung.com>
Date: Thu, 14 Apr 2022 08:38:06 +0800
Subject: [PATCH] [Xaml] Fix issue that the Xaml element which has the
 created-in-csharp parent will not be disposed when exit xaml

---
 src/Tizen.NUI/src/public/EXaml/EXamlExtensions.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Tizen.NUI/src/public/EXaml/EXamlExtensions.cs b/src/Tizen.NUI/src/public/EXaml/EXamlExtensions.cs
index c1fb942..950e38d 100755
--- a/src/Tizen.NUI/src/public/EXaml/EXamlExtensions.cs
+++ b/src/Tizen.NUI/src/public/EXaml/EXamlExtensions.cs
@@ -56,10 +56,11 @@ namespace Tizen.NUI.EXaml
                 {
                     var child = container.Children[i];
 
+                    DisposeXamlElements(child);
+
                     if (child.IsCreateByXaml)
                     {
                         child.Unparent();
-                        DisposeXamlElements(child);
                         child.Dispose();
                     }
                 }
-- 
2.7.4