Remove INonChildContainerElement interface

Dreamescaper · Aug 24, 2023 · a12cb31 · a12cb31
1 parent 8c0fa00
commit a12cb31
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 29 deletions.
diff --git a/src/BlazorBindings.Core/INonChildContainerElement.cs b/src/BlazorBindings.Core/INonChildContainerElement.cs
diff --git a/src/BlazorBindings.Core/NativeComponentAdapter.cs b/src/BlazorBindings.Core/NativeComponentAdapter.cs
@@ -217,9 +217,7 @@ private int ApplyPrependFrame(RenderBatch batch, int componentId, int siblingInd
                         var typeName = _targetElement?.TargetElement?.GetType()?.Name;
                         throw new NotImplementedException($"Element {typeName} does not support markup content: " + frame.MarkupContent);
                     }
-#pragma warning disable CA2000 // Dispose objects before losing scope; adapters are disposed when they are removed from the adapter tree
                     var childAdapter = CreateAdapter(_targetElement ?? _closestPhysicalParent);
-#pragma warning restore CA2000 // Dispose objects before losing scope
                     childAdapter.Name = $"Markup, sib#={siblingIndex}";
                     AddChildAdapter(siblingIndex, childAdapter);
                     return 1;
@@ -235,9 +233,7 @@ private int ApplyPrependFrame(RenderBatch batch, int componentId, int siblingInd
                         var typeName = _targetElement?.TargetElement?.GetType()?.Name;
                         throw new NotImplementedException($"Element {typeName} does not support text content: " + frame.MarkupContent);
                     }
-#pragma warning disable CA2000 // Dispose objects before losing scope; adapters are disposed when they are removed from the adapter tree
                     var childAdapter = CreateAdapter(_targetElement ?? _closestPhysicalParent);
-#pragma warning restore CA2000 // Dispose objects before losing scope
                     childAdapter.Name = $"Text, sib#={siblingIndex}";
                     AddChildAdapter(siblingIndex, childAdapter);
                     return 1;
@@ -387,7 +383,7 @@ private static NativeComponentAdapter GetEarlierSiblingMatch(NativeComponentAdap
         for (var i = indexOfParentsChildAdapter - 1; i >= 0; i--)
         {
             var sibling = parentAdapter.Children[i];
-            if (sibling._targetElement is INonChildContainerElement)
+            if (sibling._targetElement is INonPhysicalChild)
             {
                 continue;
             }
@@ -406,7 +402,7 @@ private static NativeComponentAdapter GetEarlierSiblingMatch(NativeComponentAdap
 
     private NativeComponentAdapter GetLastDescendantWithPhysicalElement()
     {
-        if (_targetElement is INonChildContainerElement)
+        if (_targetElement is INonPhysicalChild)
         {
             return null;
         }

diff --git a/src/BlazorBindings.Maui/Elements/GridCell.cs b/src/BlazorBindings.Maui/Elements/GridCell.cs
@@ -5,7 +5,7 @@
 
 namespace BlazorBindings.Maui.Elements;
 
-public class GridCell : NativeControlComponentBase, IContainerElementHandler, INonChildContainerElement
+public class GridCell : NativeControlComponentBase, IContainerElementHandler, INonPhysicalChild
 {
     [Parameter] public int? Column { get; set; }
     [Parameter] public int? ColumnSpan { get; set; }

diff --git a/src/BlazorBindings.Maui/Elements/Handlers/RootContainerHandler.cs b/src/BlazorBindings.Maui/Elements/Handlers/RootContainerHandler.cs
@@ -9,7 +9,7 @@ namespace BlazorBindings.Maui.Elements.Handlers;
 /// </summary>
 /// <remarks>Experimental API, subject to change.</remarks>
 [RequiresPreviewFeatures]
-public class RootContainerHandler : IContainerElementHandler, INonChildContainerElement
+public class RootContainerHandler : IContainerElementHandler, INonPhysicalChild
 {
     private TaskCompletionSource<object> _taskCompletionSource;
 

diff --git a/src/BlazorBindings.Maui/Elements/Internal/ContentPropertyComponent.cs b/src/BlazorBindings.Maui/Elements/Internal/ContentPropertyComponent.cs
@@ -2,7 +2,7 @@
 
 namespace BlazorBindings.Maui.Elements.Internal;
 
-internal class ContentPropertyComponent<TControl> : NativeControlComponentBase, IContainerElementHandler, INonChildContainerElement
+internal class ContentPropertyComponent<TControl> : NativeControlComponentBase, IContainerElementHandler, INonPhysicalChild
 {
     private TControl _parent;
 

diff --git a/src/BlazorBindings.Maui/Elements/Internal/DataTemplates/ControlTemplateItemsComponent.cs b/src/BlazorBindings.Maui/Elements/Internal/DataTemplates/ControlTemplateItemsComponent.cs
@@ -9,7 +9,7 @@ namespace BlazorBindings.Maui.Elements.DataTemplates;
 /// This ControlTemplate implementation wraps the content in an additional View, therefore it is not suitable in cases when non-View content
 /// is expected from template.
 /// </summary>
-internal class ControlTemplateItemsComponent<T> : NativeControlComponentBase, IContainerElementHandler, INonChildContainerElement
+internal class ControlTemplateItemsComponent<T> : NativeControlComponentBase, IContainerElementHandler, INonPhysicalChild
     where T : MC.BindableObject
 {
     protected override RenderFragment GetChildContent()

diff --git a/src/BlazorBindings.Maui/Elements/Internal/DataTemplates/DataTemplateItemsComponent.cs b/src/BlazorBindings.Maui/Elements/Internal/DataTemplates/DataTemplateItemsComponent.cs
@@ -6,7 +6,7 @@
 namespace BlazorBindings.Maui.Elements.DataTemplates;
 
 #pragma warning disable CA1812 // Avoid uninstantiated internal classes. Class is used as generic parameter.
-internal class DataTemplateItemsComponent<TControl, TItem> : NativeControlComponentBase, IContainerElementHandler, INonChildContainerElement
+internal class DataTemplateItemsComponent<TControl, TItem> : NativeControlComponentBase, IContainerElementHandler, INonPhysicalChild
 #pragma warning restore CA1812 // Avoid uninstantiated internal classes
 {
     protected override RenderFragment GetChildContent() => builder =>

diff --git a/src/BlazorBindings.Maui/Elements/Internal/DataTemplates/DataTemplateSelectorComponent.cs b/src/BlazorBindings.Maui/Elements/Internal/DataTemplates/DataTemplateSelectorComponent.cs
@@ -7,7 +7,7 @@
 
 namespace BlazorBindings.Maui.Elements.DataTemplates;
 
-internal class DataTemplateSelectorComponent<TControl, TItem> : NativeControlComponentBase, IContainerElementHandler, INonChildContainerElement
+internal class DataTemplateSelectorComponent<TControl, TItem> : NativeControlComponentBase, IContainerElementHandler, INonPhysicalChild
 {
     protected override RenderFragment GetChildContent() => builder =>
     {

diff --git a/src/BlazorBindings.Maui/Elements/Internal/DataTemplates/SyncControlTemplateItemsComponent.cs b/src/BlazorBindings.Maui/Elements/Internal/DataTemplates/SyncControlTemplateItemsComponent.cs
@@ -11,7 +11,7 @@ namespace BlazorBindings.Maui.Elements.DataTemplates;
 /// This makes it possible to use when returning a View from template is not an option.
 /// However, it requires a DataTemplate to render synchronously, which does not always work with Blazor.
 /// </summary>
-internal class SyncControlTemplateItemsComponent<T> : NativeControlComponentBase, IContainerElementHandler, INonChildContainerElement
+internal class SyncControlTemplateItemsComponent<T> : NativeControlComponentBase, IContainerElementHandler, INonPhysicalChild
     where T : MC.BindableObject
 {
     protected override RenderFragment GetChildContent()

diff --git a/src/BlazorBindings.Maui/Elements/Internal/DataTemplates/SyncDataTemplateItemsComponent.cs b/src/BlazorBindings.Maui/Elements/Internal/DataTemplates/SyncDataTemplateItemsComponent.cs
@@ -10,7 +10,7 @@ namespace BlazorBindings.Maui.Elements.DataTemplates;
 /// This makes it possible to use when returning a View from template is not an option.
 /// However, it requires a DataTemplate to render synchronously, which does not always work with Blazor.
 /// </summary>
-internal class SyncDataTemplateItemsComponent<TControl, TItem> : NativeControlComponentBase, IContainerElementHandler, INonChildContainerElement
+internal class SyncDataTemplateItemsComponent<TControl, TItem> : NativeControlComponentBase, IContainerElementHandler, INonPhysicalChild
 {
     protected override RenderFragment GetChildContent() => builder =>
     {

diff --git a/src/BlazorBindings.Maui/Elements/Internal/ListContentPropertyComponent.cs b/src/BlazorBindings.Maui/Elements/Internal/ListContentPropertyComponent.cs
@@ -2,7 +2,7 @@
 
 namespace BlazorBindings.Maui.Elements.Internal;
 
-internal class ListContentPropertyComponent<TControl, TItem> : NativeControlComponentBase, IContainerElementHandler, INonChildContainerElement
+internal class ListContentPropertyComponent<TControl, TItem> : NativeControlComponentBase, IContainerElementHandler, INonPhysicalChild
     where TItem : class
 {
     private TControl _parent;

diff --git a/src/BlazorBindings.Maui/Elements/Internal/RootContainerComponent.cs b/src/BlazorBindings.Maui/Elements/Internal/RootContainerComponent.cs
@@ -3,7 +3,7 @@
 
 namespace BlazorBindings.Maui.Elements.Internal;
 
-internal class RootContainerComponent : NativeControlComponentBase, IContainerElementHandler, INonChildContainerElement
+internal class RootContainerComponent : NativeControlComponentBase, IContainerElementHandler, INonPhysicalChild
 {
     [Parameter] public RenderFragment ChildContent { get; set; }
     [Parameter] public EventCallback<object> OnElementAdded { get; set; }