Add Custom Control Removal Functionality #296

rungwiroon · Dec 5, 2023 · 73214a0 · 73214a0
1 parent f022c9a
commit 73214a0
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 17 deletions.
diff --git a/GoogleMapsComponents/GoogleMapsComponents.csproj b/GoogleMapsComponents/GoogleMapsComponents.csproj
@@ -18,7 +18,7 @@
 		<RazorLangVersion>3.0</RazorLangVersion>
 		<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
 		<PackageId>BlazorGoogleMaps</PackageId>
-		<Version>3.2.5</Version>
+		<Version>3.3.1</Version>
 		<Authors>Rungwiroon</Authors>
 		<Company>QueueStack Solution</Company>
 		<Product>BlazorGoogleMaps</Product>

diff --git a/GoogleMapsComponents/Maps/Map.cs b/GoogleMapsComponents/Maps/Map.cs
@@ -6,18 +6,16 @@
 using System;
 using System.Threading.Tasks;
 
-#nullable enable
-
 namespace GoogleMapsComponents.Maps;
 
 /// <summary>
 /// google.maps.Map class
 /// </summary>
-//[JsonConverter(typeof(JsObjectRefConverter<Map>))]
-public class Map : EventEntityBase, IJsObjectRef, IDisposable, IAsyncDisposable
+public class Map : EventEntityBase, IJsObjectRef, IAsyncDisposable
 {
     public Guid Guid => _jsObjectRef.Guid;
-    bool isDisposed;
+
+    private bool _isDisposed;
     public MapData Data { get; private set; }
 
     public static async Task<Map> CreateAsync(
@@ -50,9 +48,9 @@ public async Task RemoveControl(ControlPosition position, ElementReference refer
         await _jsObjectRef.JSRuntime.MyInvokeAsync<object>("blazorGoogleMaps.objectManager.removeControl", this.Guid.ToString(), position, reference);
     }
 
-    public async Task RemoveAllControls(ControlPosition position)
+    public async Task RemoveControls(ControlPosition position)
     {
-        await _jsObjectRef.JSRuntime.MyInvokeAsync<object>("blazorGoogleMaps.objectManager.clearControls", this.Guid.ToString(), position);
+        await _jsObjectRef.JSRuntime.MyInvokeAsync<object>("blazorGoogleMaps.objectManager.removeControls", this.Guid.ToString(), position);
     }
 
     public async Task AddImageLayer(ImageMapType reference)
@@ -68,7 +66,7 @@ public async Task RemoveAllImageLayers()
         await _jsObjectRef.JSRuntime.MyInvokeAsync<object>("blazorGoogleMaps.objectManager.removeAllImageLayers", this.Guid.ToString());
     }
 
-   
+
 
     /// <summary>
     /// Sets the viewport to contain the given bounds.
@@ -232,7 +230,7 @@ public Task SetOptions(MapOptions mapOptions)
         return _jsObjectRef.InvokeAsync("setOptions", mapOptions);
     }
 
-    
+
 
     public override async ValueTask DisposeAsync()
     {
@@ -256,7 +254,7 @@ protected override async ValueTask DisposeAsyncCore()
     protected override void Dispose(bool disposing)
     {
 
-        if (!isDisposed)
+        if (!_isDisposed)
         {
             base.Dispose(disposing);
             //_jsObjectRef.Dispose();
@@ -268,7 +266,7 @@ protected override void Dispose(bool disposing)
 
             // TODO: free unmanaged resources (unmanaged objects) and override finalizer
             // TODO: set large fields to null
-            isDisposed = true;
+            _isDisposed = true;
         }
     }
 

diff --git a/GoogleMapsComponents/wwwroot/js/objectManager.js b/GoogleMapsComponents/wwwroot/js/objectManager.js
@@ -392,6 +392,7 @@
             addControls(args) {
                 let map = mapObjects[args[0]];
                 let elem = args[2];
+                //Without this the original element is removed and can not be added again.
                 let clone = elem.cloneNode(true);
                 //I know i am lazy. Two quotes appear after serialization
                 let position = getGooglePositionFromString(args[1].replace("\"", "").replace("\"", ""));
@@ -411,7 +412,7 @@
                     }
                 }
             },
-            clearControls(args) {
+            removeControls(args) {
                 let map = mapObjects[args[0]];
                 let position = getGooglePositionFromString(args[1].replace("\"", "").replace("\"", ""));
 

diff --git a/ServerSideDemo/Pages/MapLegendPage.razor.cs b/ServerSideDemo/Pages/MapLegendPage.razor.cs
@@ -1,8 +1,8 @@
-using System.Threading.Tasks;
-using GoogleMapsComponents;
+using GoogleMapsComponents;
 using GoogleMapsComponents.Maps;
 using Microsoft.AspNetCore.Components;
 using Microsoft.JSInterop;
+using System.Threading.Tasks;
 
 namespace ServerSideDemo.Pages;
 
@@ -40,7 +40,7 @@ protected override async Task OnAfterRenderAsync(bool firstRender)
 
     private async Task AfterMapInit()
     {
-        
+
     }
 
     private async Task RemoveLegend()
@@ -50,7 +50,7 @@ private async Task RemoveLegend()
 
     private async Task RemoveAllControls()
     {
-        await map1.InteropObject.RemoveAllControls(ControlPosition.TopLeft);
+        await map1.InteropObject.RemoveControls(ControlPosition.TopLeft);
     }
 
     private async Task AddLegend()