change namespace

astro-panda · Oct 28, 2024 · 2de9186 · 2de9186
1 parent a2b42a0
commit 2de9186
Show file tree

Hide file tree

Showing 14 changed files with 60 additions and 62 deletions.
diff --git a/src/AstroPanda.Blazor.Toolkit/Components/ContextMenu.razor b/src/AstroPanda.Blazor.Toolkit/Components/ContextMenu.razor
@@ -1,4 +1,6 @@
-<div class="context-menu" tabindex="0" style="transform: translateX(min(@(X)px, calc(100vw - 100%)))
+@namespace AstroPanda.Blazor.Toolkit
+
+<div class="context-menu" tabindex="0" style="transform: translateX(min(@(X)px, calc(100vw - 100%)))
              translateY(min(@(Y)px, calc(100vh - 100%))); z-index: 1405;" @onclick="Close">
     @Content
 </div>
diff --git a/src/AstroPanda.Blazor.Toolkit/Components/ContextMenu.razor.cs b/src/AstroPanda.Blazor.Toolkit/Components/ContextMenu.razor.cs
@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Components;
 
-namespace AstroPanda.Blazor.Toolkit.Components
+namespace AstroPanda.Blazor.Toolkit
 {
     public partial class ContextMenu
     {

diff --git a/src/AstroPanda.Blazor.Toolkit/Components/ContextMenuProvider.razor b/src/AstroPanda.Blazor.Toolkit/Components/ContextMenuProvider.razor
@@ -1,4 +1,7 @@
-<CascadingValue Value="this" IsFixed="true">
+
+@namespace AstroPanda.Blazor.Toolkit
+
+<CascadingValue Value="this" IsFixed="true">
     @foreach (var item in _contextMenus)
     {
         @item.Content

diff --git a/src/AstroPanda.Blazor.Toolkit/Components/ContextMenuProvider.razor.cs b/src/AstroPanda.Blazor.Toolkit/Components/ContextMenuProvider.razor.cs
@@ -1,51 +1,49 @@
 using Microsoft.AspNetCore.Components.Routing;
 using Microsoft.AspNetCore.Components;
-using AstroPanda.Blazor.Toolkit.Services;
 
-namespace AstroPanda.Blazor.Toolkit.Components
+namespace AstroPanda.Blazor.Toolkit;
+
+public partial class ContextMenuProvider : IDisposable
 {
-    public partial class ContextMenuProvider : IDisposable
+    [Inject]
+    private IContextMenuService _contextMenuService { get; set; }
+
+    [Inject]
+    private NavigationManager _navigationManager { get; set; }
+
+    private List<ContextMenuReference> _contextMenus { get; set; } = new List<ContextMenuReference>();
+
+
+    protected override void OnInitialized()
+    {
+        ((ContextMenuService)_contextMenuService).OnInstanceAdded += AddInstance;
+        ((ContextMenuService)_contextMenuService).OnInstanceCloseRequested += CloseAll;
+
+        if (_navigationManager != null)
+            _navigationManager.LocationChanged += HandleLocationChanged;
+    }
+
+    private void AddInstance(ContextMenuReference contextMenu)
+    {
+        _contextMenus.Clear();
+        _contextMenus.Add(contextMenu);
+        StateHasChanged();
+    }
+
+    public void CloseAll()
+    {
+        _contextMenus.Clear();
+        StateHasChanged();
+    }
+
+    private void HandleLocationChanged(object sender, LocationChangedEventArgs args)
+    {
+        CloseAll();
+    }
+
+    public void Dispose()
     {
-        [Inject]
-        private IContextMenuService _contextMenuService { get; set; }
-
-        [Inject]
-        private NavigationManager _navigationManager { get; set; }
-
-        private List<ContextMenuReference> _contextMenus { get; set; } = new List<ContextMenuReference>();
-
-
-        protected override void OnInitialized()
-        {
-            ((ContextMenuService)_contextMenuService).OnInstanceAdded += AddInstance;
-            ((ContextMenuService)_contextMenuService).OnInstanceCloseRequested += CloseAll;
-
-            if (_navigationManager != null)
-                _navigationManager.LocationChanged += HandleLocationChanged;
-        }
-
-        private void AddInstance(ContextMenuReference contextMenu)
-        {
-            _contextMenus.Clear();
-            _contextMenus.Add(contextMenu);
-            StateHasChanged();
-        }
-
-        public void CloseAll()
-        {
-            _contextMenus.Clear();
-            StateHasChanged();
-        }
-
-        private void HandleLocationChanged(object sender, LocationChangedEventArgs args)
-        {
-            CloseAll();
-        }
-
-        public void Dispose()
-        {
-            if (_navigationManager != null)
-                _navigationManager.LocationChanged -= HandleLocationChanged;
-        }
+        if (_navigationManager != null)
+            _navigationManager.LocationChanged -= HandleLocationChanged;
     }
 }
diff --git a/src/AstroPanda.Blazor.Toolkit/Extensions/ServiceCollectionExtensions.cs b/src/AstroPanda.Blazor.Toolkit/Extensions/ServiceCollectionExtensions.cs
@@ -1,4 +1,3 @@
-using AstroPanda.Blazor.Toolkit.Services;
 using BlazorComponentBus;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;

diff --git a/src/AstroPanda.Blazor.Toolkit/Services/ContextMenu/ContextMenuReference.cs b/src/AstroPanda.Blazor.Toolkit/Services/ContextMenu/ContextMenuReference.cs
@@ -1,7 +1,6 @@
-using AstroPanda.Blazor.Toolkit.Components;
-using Microsoft.AspNetCore.Components;
+using Microsoft.AspNetCore.Components;
 
-namespace AstroPanda.Blazor.Toolkit.Services;
+namespace AstroPanda.Blazor.Toolkit;
 
 public class ContextMenuReference : IContextMenuReference
 {

diff --git a/src/AstroPanda.Blazor.Toolkit/Services/ContextMenu/ContextMenuService.cs b/src/AstroPanda.Blazor.Toolkit/Services/ContextMenu/ContextMenuService.cs
@@ -1,7 +1,6 @@
-using AstroPanda.Blazor.Toolkit.Components;
-using Microsoft.AspNetCore.Components;
+using Microsoft.AspNetCore.Components;
 
-namespace AstroPanda.Blazor.Toolkit.Services;
+namespace AstroPanda.Blazor.Toolkit;
 
 public class ContextMenuService : IContextMenuService
 {

diff --git a/src/AstroPanda.Blazor.Toolkit/Services/ContextMenu/IContextMenuReference.cs b/src/AstroPanda.Blazor.Toolkit/Services/ContextMenu/IContextMenuReference.cs
@@ -1,5 +1,5 @@
 
-namespace AstroPanda.Blazor.Toolkit.Services;
+namespace AstroPanda.Blazor.Toolkit;
 
 public interface IContextMenuReference
 {

diff --git a/src/AstroPanda.Blazor.Toolkit/Services/ContextMenu/IContextMenuService.cs b/src/AstroPanda.Blazor.Toolkit/Services/ContextMenu/IContextMenuService.cs
@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Components;
 
-namespace AstroPanda.Blazor.Toolkit.Services;
+namespace AstroPanda.Blazor.Toolkit;
 
 public interface IContextMenuService
 {

diff --git a/src/AstroPanda.Blazor.Toolkit/Services/IPersistentStateService.cs b/src/AstroPanda.Blazor.Toolkit/Services/IPersistentStateService.cs
@@ -4,7 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace AstroPanda.Blazor.Toolkit.Services;
+namespace AstroPanda.Blazor.Toolkit
 
 public interface IPersistentStateService<T>
 {

diff --git a/src/AstroPanda.Blazor.Toolkit/Services/PeristentStateService.cs b/src/AstroPanda.Blazor.Toolkit/Services/PeristentStateService.cs
@@ -1,6 +1,6 @@
 using Blazored.LocalStorage;
 
-namespace AstroPanda.Blazor.Toolkit.Services;
+namespace AstroPanda.Blazor.Toolkit
 
 public class PersistentStateService<T> : IPersistentStateService<T> where T: new()
 {

diff --git a/src/BlazorToolkit.Wasm/Components/ExampleContextMenu.razor b/src/BlazorToolkit.Wasm/Components/ExampleContextMenu.razor
@@ -1,4 +1,4 @@
-@using AstroPanda.Blazor.Toolkit.Services
+@using AstroPanda.Blazor.Toolkit
 <MudPaper>
     <MudButton OnClick="Close">Close</MudButton>
 </MudPaper>

diff --git a/src/BlazorToolkit.Wasm/Layout/MainLayout.razor b/src/BlazorToolkit.Wasm/Layout/MainLayout.razor
@@ -1,8 +1,6 @@
 @inherits LayoutComponentBase
 @using AstroPanda.Blazor.Toolkit
-@using AstroPanda.Blazor.Toolkit.Services
 @using BlazorToolkit.Wasm.Components
-@using AstroPanda.Blazor.Toolkit.Components
 @using MudBlazor
 
 <MyMudThemeProvider />

diff --git a/src/BlazorToolkit.Wasm/Pages/Home.razor b/src/BlazorToolkit.Wasm/Pages/Home.razor
@@ -1,5 +1,5 @@
 @page "/"
-@using AstroPanda.Blazor.Toolkit.Components
+@using AstroPanda.Blazor.Toolkit
 
 <PageTitle>Home</PageTitle>