Skip to content

Restrict AddPopup extensions to View to avoid ContentPage from being allowed #2715

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

Merged
bijington merged 3 commits into from
Jun 13, 2025
Merged

Restrict AddPopup extensions to View to avoid ContentPage from being allowed #2715

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6b1c8e0
Restrict AddPopup extensions to View to avoid ContentPage from being …
bijington Jun 13, 2025
d290f0a
Merge branch 'main' into feature/sl-restrict-add-popup
TheCodeTraveler Jun 13, 2025
a08db38
Merge branch 'main' into feature/sl-restrict-add-popup
TheCodeTraveler Jun 13, 2025
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
24 changes: 12 additions & 12 deletions src/CommunityToolkit.Maui/Extensions/ServiceCollectionExtensions.shared.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ public static class ServiceCollectionExtensions
/// Adds a <see cref="View"/> of the type specified in <typeparamref name="TPopupView"/>
/// <see cref="IServiceCollection"/> with <see cref="ServiceLifetime.Transient"/> lifetime.
/// </summary>
/// <typeparam name="TPopupView">The type of the Popup to add. Constrained to <see cref="IView"/></typeparam>
/// <typeparam name="TPopupView">The type of the Popup to add. Constrained to <see cref="View"/></typeparam>
/// <param name="services">The <see cref="IServiceCollection"/> to add the service to.</param>
/// <returns>A reference to this instance after the operation has completed.</returns>
public static IServiceCollection AddTransientPopup<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] TPopupView>(this IServiceCollection services)
where TPopupView : IView
where TPopupView : View
{
PopupService.AddPopup<TPopupView>(services, ServiceLifetime.Transient);

Expand All @@ -33,13 +33,13 @@ public static class ServiceCollectionExtensions
/// of the type specified in <typeparamref name="TPopupViewModel"/> to the specified
/// <see cref="IServiceCollection"/> with <see cref="ServiceLifetime.Transient"/> lifetime.
/// </summary>
/// <typeparam name="TPopupView">The type of the Popup to add. Constrained to <see cref="IView"/></typeparam>
/// <typeparam name="TPopupView">The type of the Popup to add. Constrained to <see cref="View"/></typeparam>
/// <typeparam name="TPopupViewModel">The type of the ViewModel to add. Constrained to
/// <see cref="INotifyPropertyChanged"/></typeparam>
/// <param name="services">The <see cref="IServiceCollection"/> to add the service to.</param>
/// <returns>A reference to this instance after the operation has completed.</returns>
public static IServiceCollection AddTransientPopup<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] TPopupView, [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] TPopupViewModel>(this IServiceCollection services)
where TPopupView : IView
where TPopupView : View
where TPopupViewModel : notnull
{
PopupService.AddPopup<TPopupView, TPopupViewModel>(services, ServiceLifetime.Transient);
Expand All @@ -51,11 +51,11 @@ public static class ServiceCollectionExtensions
/// Adds a <see cref="View"/> of the type specified in <typeparamref name="TPopupView"/> and a ViewModel
/// <see cref="IServiceCollection"/> with <see cref="ServiceLifetime.Transient"/> lifetime.
/// </summary>
/// <typeparam name="TPopupView">The type of the Popup to add. Constrained to <see cref="IView"/></typeparam>
/// <typeparam name="TPopupView">The type of the Popup to add. Constrained to <see cref="View"/></typeparam>
/// <param name="services">The <see cref="IServiceCollection"/> to add the service to.</param>
/// <returns>A reference to this instance after the operation has completed.</returns>
public static IServiceCollection AddSingletonPopup<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] TPopupView>(this IServiceCollection services)
where TPopupView : IView
where TPopupView : View
{
PopupService.AddPopup<TPopupView>(services, ServiceLifetime.Singleton);

Expand All @@ -67,13 +67,13 @@ public static class ServiceCollectionExtensions
/// of the type specified in <typeparamref name="TPopupViewModel"/> to the specified
/// <see cref="IServiceCollection"/> with <see cref="ServiceLifetime.Transient"/> lifetime.
/// </summary>
/// <typeparam name="TPopupView">The type of the Popup to add. Constrained to <see cref="IView"/></typeparam>
/// <typeparam name="TPopupView">The type of the Popup to add. Constrained to <see cref="View"/></typeparam>
/// <typeparam name="TPopupViewModel">The type of the ViewModel to add. Constrained to
/// <see cref="INotifyPropertyChanged"/></typeparam>
/// <param name="services">The <see cref="IServiceCollection"/> to add the service to.</param>
/// <returns>A reference to this instance after the operation has completed.</returns>
public static IServiceCollection AddSingletonPopup<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] TPopupView, [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] TPopupViewModel>(this IServiceCollection services)
where TPopupView : IView
where TPopupView : View
where TPopupViewModel : notnull
{
PopupService.AddPopup<TPopupView, TPopupViewModel>(services, ServiceLifetime.Singleton);
Expand All @@ -85,11 +85,11 @@ public static class ServiceCollectionExtensions
/// Adds a <see cref="View"/> of the type specified in <typeparamref name="TPopupView"/> and a ViewModel
/// <see cref="IServiceCollection"/> with <see cref="ServiceLifetime.Transient"/> lifetime.
/// </summary>
/// <typeparam name="TPopupView">The type of the Popup to add. Constrained to <see cref="IView"/></typeparam>
/// <typeparam name="TPopupView">The type of the Popup to add. Constrained to <see cref="View"/></typeparam>
/// <param name="services">The <see cref="IServiceCollection"/> to add the service to.</param>
/// <returns>A reference to this instance after the operation has completed.</returns>
public static IServiceCollection AddScopedPopup<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] TPopupView>(this IServiceCollection services)
where TPopupView : IView
where TPopupView : View
{
PopupService.AddPopup<TPopupView>(services, ServiceLifetime.Scoped);

Expand All @@ -101,13 +101,13 @@ public static class ServiceCollectionExtensions
/// of the type specified in <typeparamref name="TPopupViewModel"/> to the specified
/// <see cref="IServiceCollection"/> with <see cref="ServiceLifetime.Transient"/> lifetime.
/// </summary>
/// <typeparam name="TPopupView">The type of the Popup to add. Constrained to <see cref="IView"/></typeparam>
/// <typeparam name="TPopupView">The type of the Popup to add. Constrained to <see cref="View"/></typeparam>
/// <typeparam name="TPopupViewModel">The type of the ViewModel to add. Constrained to
/// <see cref="INotifyPropertyChanged"/></typeparam>
/// <param name="services">The <see cref="IServiceCollection"/> to add the service to.</param>
/// <returns>A reference to this instance after the operation has completed.</returns>
public static IServiceCollection AddScopedPopup<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] TPopupView, [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] TPopupViewModel>(this IServiceCollection services)
where TPopupView : IView
where TPopupView : View
where TPopupViewModel : notnull
{
PopupService.AddPopup<TPopupView, TPopupViewModel>(services, ServiceLifetime.Scoped);
Expand Down
Loading