Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make Add/Remove Logical public #16046

Merged
merged 21 commits into from
Jul 18, 2023
Merged

Make Add/Remove Logical public #16046

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
4b99a81
Make Add/Remove Logical public
PureWeen Jul 8, 2023
7378a4f
-fix xaml unit test errors
PureWeen Jul 8, 2023
9d50ecb
- remove workarounds and fix up tests
PureWeen Jul 9, 2023
79e9aba
- apply style sheets to visual children
PureWeen Jul 9, 2023
f9b3e11
- fix issues
PureWeen Jul 10, 2023
86793fe
- fix test paths that don't use Element
PureWeen Jul 10, 2023
2153d19
- fix merge conflicts
PureWeen Jul 10, 2023
34689fc
- add public APIs
PureWeen Jul 10, 2023
b19381e
- add comments
PureWeen Jul 10, 2023
30f8c28
- add additional tests
PureWeen Jul 10, 2023
489dca9
- additional cleanup
PureWeen Jul 11, 2023
a43d08f
- fix loaded/loaded timings
PureWeen Jul 11, 2023
d1c8aa8
- add longer wait for android
PureWeen Jul 13, 2023
ef4d539
- fix usage of LogicalChildren
PureWeen Jul 13, 2023
89abfea
- if no index is specifiied add items at the end
PureWeen Jul 13, 2023
2727bbc
- fix added event to properly set _watchingPlatformLoaded
PureWeen Jul 17, 2023
1bfb9b8
- cleanup
PureWeen Jul 17, 2023
3cfe790
- ensure that loaded/unloaded have time to fire
PureWeen Jul 17, 2023
5394d72
- change name to index
PureWeen Jul 17, 2023
ced4dfa
- remove collection changed comment
PureWeen Jul 18, 2023
5b92c30
- remove shadowed methods and add docs
PureWeen Jul 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 0 additions & 44 deletions src/Controls/docs/Microsoft.Maui.Controls/ItemsView.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,28 +31,6 @@
<remarks>To be added.</remarks>
</Docs>
</Member>
<Member MemberName="AddLogicalChild">
<MemberSignature Language="C#" Value="public void AddLogicalChild (Microsoft.Maui.Controls.Element element);" />
<MemberSignature Language="ILAsm" Value=".method public hidebysig instance void AddLogicalChild(class Microsoft.Maui.Controls.Element element) cil managed" />
<MemberSignature Language="DocId" Value="M:Microsoft.Maui.Controls.ItemsView.AddLogicalChild(Microsoft.Maui.Controls.Element)" />
<MemberSignature Language="F#" Value="member this.AddLogicalChild : Microsoft.Maui.Controls.Element -&gt; unit" Usage="itemsView.AddLogicalChild element" />
<MemberType>Method</MemberType>
<AssemblyInfo>
<AssemblyName>Microsoft.Maui.Controls.Core</AssemblyName>
<AssemblyVersion>2.0.0.0</AssemblyVersion>
</AssemblyInfo>
<ReturnValue>
<ReturnType>System.Void</ReturnType>
</ReturnValue>
<Parameters>
<Parameter Name="element" Type="Microsoft.Maui.Controls.Element" />
</Parameters>
<Docs>
<param name="element">To be added.</param>
<summary>To be added.</summary>
<remarks>To be added.</remarks>
</Docs>
</Member>
<Member MemberName="EmptyView">
<MemberSignature Language="C#" Value="public object EmptyView { get; set; }" />
<MemberSignature Language="ILAsm" Value=".property instance object EmptyView" />
Expand Down Expand Up @@ -530,28 +508,6 @@
<remarks>To be added.</remarks>
</Docs>
</Member>
<Member MemberName="RemoveLogicalChild">
<MemberSignature Language="C#" Value="public void RemoveLogicalChild (Microsoft.Maui.Controls.Element element);" />
<MemberSignature Language="ILAsm" Value=".method public hidebysig instance void RemoveLogicalChild(class Microsoft.Maui.Controls.Element element) cil managed" />
<MemberSignature Language="DocId" Value="M:Microsoft.Maui.Controls.ItemsView.RemoveLogicalChild(Microsoft.Maui.Controls.Element)" />
<MemberSignature Language="F#" Value="member this.RemoveLogicalChild : Microsoft.Maui.Controls.Element -&gt; unit" Usage="itemsView.RemoveLogicalChild element" />
<MemberType>Method</MemberType>
<AssemblyInfo>
<AssemblyName>Microsoft.Maui.Controls.Core</AssemblyName>
<AssemblyVersion>2.0.0.0</AssemblyVersion>
</AssemblyInfo>
<ReturnValue>
<ReturnType>System.Void</ReturnType>
</ReturnValue>
<Parameters>
<Parameter Name="element" Type="Microsoft.Maui.Controls.Element" />
</Parameters>
<Docs>
<param name="element">To be added.</param>
<summary>To be added.</summary>
<remarks>To be added.</remarks>
</Docs>
</Member>
<Member MemberName="Scrolled">
<MemberSignature Language="C#" Value="public event EventHandler&lt;Microsoft.Maui.Controls.ItemsViewScrolledEventArgs&gt; Scrolled;" />
<MemberSignature Language="ILAsm" Value=".event class System.EventHandler`1&lt;class Microsoft.Maui.Controls.ItemsViewScrolledEventArgs&gt; Scrolled" />
Expand Down
4 changes: 2 additions & 2 deletions src/Controls/src/Core/Application/Application.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,7 +464,7 @@ internal void RemoveWindow(Window window)

if (window is Element windowElement)
{
RemoveLogicalChildInternal(windowElement);
RemoveLogicalChild(windowElement);
}

_windows.Remove(window);
Expand Down Expand Up @@ -518,7 +518,7 @@ void AddWindow(Window window)

if (window is Element windowElement)
{
AddLogicalChildInternal(windowElement);
AddLogicalChild(windowElement);
}

if (window is NavigableElement ne)
Expand Down
7 changes: 1 addition & 6 deletions src/Controls/src/Core/BindableObject.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,17 +264,12 @@ public static void SetInheritedBindingContext(BindableObject bindable, object va
protected virtual void OnBindingContextChanged()
{
BindingContextChanged?.Invoke(this, EventArgs.Empty);

if (Shell.GetBackButtonBehavior(this) is BackButtonBehavior buttonBehavior)
SetInheritedBindingContext(buttonBehavior, BindingContext);

if (Shell.GetSearchHandler(this) is SearchHandler searchHandler)
SetInheritedBindingContext(searchHandler, BindingContext);

if (Shell.GetTitleView(this) is View titleView)
SetInheritedBindingContext(titleView, BindingContext);

if (FlyoutBase.GetContextFlyout(this) is BindableObject contextFlyout)
SetInheritedBindingContext(contextFlyout, BindingContext);
PureWeen marked this conversation as resolved.
Show resolved Hide resolved
}

protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
Expand Down
12 changes: 12 additions & 0 deletions src/Controls/src/Core/BindableObjectExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,18 @@ internal static bool TrySetDynamicThemeColor(
return false;
}

internal static void AddRemoveLogicalChildren(this BindableObject bindable, object oldValue, object newValue)
{
if (!(bindable is Element owner))
return;

if (oldValue is Element oldView)
owner.RemoveLogicalChild(oldView);

if (newValue is Element newView)
owner.AddLogicalChild(newView);
}

internal static bool TrySetAppTheme(
this BindableObject self,
string lightResourceKey,
Expand Down
10 changes: 4 additions & 6 deletions src/Controls/src/Core/Border/Border.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,7 @@ void NotifyStrokeShapeChanges()

if (strokeShape is VisualElement visualElement)
{
SetInheritedBindingContext(visualElement, BindingContext);
visualElement.Parent = this;
AddLogicalChild(visualElement);
_strokeShapeChanged ??= (sender, e) => OnPropertyChanged(nameof(StrokeShape));
_strokeShapeProxy ??= new();
_strokeShapeProxy.Subscribe(visualElement, _strokeShapeChanged);
Expand All @@ -78,8 +77,7 @@ void StopNotifyingStrokeShapeChanges()

if (strokeShape is VisualElement visualElement)
{
SetInheritedBindingContext(visualElement, null);
visualElement.Parent = null;
RemoveLogicalChild(visualElement);
_strokeShapeProxy?.Unsubscribe();
}
}
Expand Down Expand Up @@ -268,12 +266,12 @@ public static void ContentChanged(BindableObject bindable, object oldValue, obje
{
if (oldValue is Element oldElement)
{
border.RemoveLogicalChildInternal(oldElement);
border.RemoveLogicalChild(oldElement);
}

if (newValue is Element newElement)
{
border.AddLogicalChildInternal(newElement);
border.AddLogicalChild(newElement);
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/Controls/src/Core/Cells/Cell.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ public void SendDisappearing()

void IPropertyPropagationController.PropagatePropertyChanged(string propertyName)
{
PropertyPropagationExtensions.PropagatePropertyChanged(propertyName, this, ((IElementController)this).LogicalChildren);
PropertyPropagationExtensions.PropagatePropertyChanged(propertyName, this, ((IVisualTreeElement)this).GetVisualChildren());
}

void OnContextActionsChanged(object sender, NotifyCollectionChangedEventArgs e)
Expand Down
4 changes: 2 additions & 2 deletions src/Controls/src/Core/Cells/ViewCell.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public View View

if (_view != null)
{
RemoveLogicalChildInternal(_view);
RemoveLogicalChild(_view);
_view.ComputedConstraint = LayoutConstraint.None;
}

Expand All @@ -32,7 +32,7 @@ public View View
if (_view != null)
{
_view.ComputedConstraint = LayoutConstraint.Fixed;
AddLogicalChildInternal(_view);
AddLogicalChild(_view);
}

ForceUpdateSize();
Expand Down
6 changes: 3 additions & 3 deletions src/Controls/src/Core/Compatibility/Handlers/TabbedPage/iOS/TabbedRenderer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,10 +284,10 @@ void Reset()
void SetControllers()
{
var list = new List<UIViewController>();
var logicalChildren = ((IElementController)Element).LogicalChildren;
for (var i = 0; i < logicalChildren.Count; i++)
var pages = Tabbed.InternalChildren;
for (var i = 0; i < pages.Count; i++)
{
var child = logicalChildren[i];
var child = pages[i];
var v = child as Page;
if (v == null)
continue;
Expand Down
Loading