Skip to content

Commit dd023d2

Browse files
committed
ready for something
1 parent f85e35e commit dd023d2

2 files changed

Lines changed: 8 additions & 6 deletions

File tree

src/Lemon.ModuleNavigation.Sample/Views/MainView.axaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
<Border Classes="HSeparator" />
6262
<ContentControl lm:NavigationExtension.ModuleContainerName="NContentControl" />
6363
</StackPanel>
64-
<StackPanel Classes="ForContainerShow" Grid.Column="2">
64+
<!--<StackPanel Classes="ForContainerShow" Grid.Column="2">
6565
<Label Content="TabControl" />
6666
<Border Classes="HSeparator" />
6767
<TabControl lm:NavigationExtension.ModuleContainerName="NTabControl">
@@ -93,7 +93,7 @@
9393
Margin="2"
9494
MaxHeight="600"
9595
lm:NavigationExtension.ModuleContainerName="NListBox">
96-
<!-- https://github.com/AvaloniaUI/Avalonia/issues/17349 -->
96+
--><!-- https://github.com/AvaloniaUI/Avalonia/issues/17349 --><!--
9797
<ListBox.ItemsPanel>
9898
<ItemsPanelTemplate>
9999
<StackPanel />
@@ -105,7 +105,7 @@
105105
<Label Content="TransitioningContentControl" />
106106
<Border Classes="HSeparator" />
107107
<TransitioningContentControl lm:NavigationExtension.ModuleContainerName="NTransitioningContentControl" />
108-
</StackPanel>
108+
</StackPanel>-->
109109
</Grid>
110110
</TabItem>
111111
<TabItem Header="View">

src/Lemon.ModuleNavigation/Core/ModuleManager.cs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using Lemon.ModuleNavigation.Abstracts;
22
using Microsoft.Extensions.DependencyInjection;
3-
using System;
43
using System.Collections.Concurrent;
54
using System.Collections.ObjectModel;
65
using System.ComponentModel;
@@ -13,9 +12,13 @@ public class ModuleManager : IModuleManager, INotifyPropertyChanged
1312
private readonly ConcurrentDictionary<string, IModule> _modulesCache;
1413
private readonly ConcurrentDictionary<(string, string), IView> _regionCache;
1514
private readonly IServiceProvider _serviceProvider;
16-
public ModuleManager(IEnumerable<IModule> modules, IServiceProvider serviceProvider)
15+
private readonly IRegionManager _regionManager;
16+
public ModuleManager(IEnumerable<IModule> modules,
17+
IRegionManager regionManager,
18+
IServiceProvider serviceProvider)
1719
{
1820
_serviceProvider = serviceProvider;
21+
_regionManager = regionManager;
1922
_regionCache = [];
2023
_modulesCache = new ConcurrentDictionary<string, IModule>(modules.ToDictionary(m => m.Key, m => m));
2124
Modules = _modulesCache.Values;
@@ -85,7 +88,6 @@ public void RequestNavigate(IModule module, NavigationParameters parameters)
8588
ActiveModules.Add(module);
8689
}
8790
}
88-
8991
///TODO:Consider an async implementation
9092
module.Initialize();
9193
module.IsActivated = true;

0 commit comments

Comments
 (0)