Rebase to upstream latest main

rookiejava · Aug 23, 2021 · 05b56d6 · 05b56d6
1 parent 59c5c1f
commit 05b56d6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/Compatibility/Core/src/RendererToHandlerShim.cs b/src/Compatibility/Core/src/RendererToHandlerShim.cs
@@ -12,6 +12,11 @@
 using NativeView = UIKit.UIView;
 using Microsoft.Maui.Controls.Compatibility.Platform.iOS;
 using ViewHandler = Microsoft.Maui.Handlers.ViewHandler<Microsoft.Maui.IView, UIKit.UIView>;
+#elif TIZEN
+using static Microsoft.Maui.Controls.Compatibility.Platform.Tizen.Platform;
+using NativeView = ElmSharp.EvasObject;
+using Microsoft.Maui.Controls.Compatibility.Platform.Tizen;
+using ViewHandler = Microsoft.Maui.Handlers.ViewHandler<Microsoft.Maui.IView, ElmSharp.EvasObject>;
 #elif NETSTANDARD
 using NativeView = System.Object;
 using ViewHandler = Microsoft.Maui.Handlers.ViewHandler<Microsoft.Maui.IView, System.Object>;
@@ -54,7 +59,7 @@ public RendererToHandlerShim() : base(ShimMapper)
 		{
 		}
 
-#if __ANDROID__ || __IOS__ || WINDOWS || MACCATALYST
+#if __ANDROID__ || __IOS__ || WINDOWS || MACCATALYST || TIZEN
 		internal IVisualElementRenderer? VisualElementRenderer { get; private set; }
 		new IView? VirtualView => (this as IViewHandler).VirtualView;
 

diff --git a/src/Core/src/Handlers/View/ViewHandlerOfT.Tizen.cs b/src/Core/src/Handlers/View/ViewHandlerOfT.Tizen.cs
@@ -183,7 +183,6 @@ protected override void RemoveContainer()
 
 		protected override void OnNativeViewDeleted()
 		{
-			NativeView = null;
 			Dispose();
 		}
-Original file line number
+Diff line change
@@ Expand Up / @@ -183,7 +183,6 @@ protected override void RemoveContainer() @@
     		protected override void OnNativeViewDeleted()
     		{
-    			NativeView = null;
     			Dispose();
     		}
@@ Expand Down @@