Releases/0.6.0 (#15)

* Reworking way of setting the options on the map (#12)

* Adding SetStyleOptionsAsync on map

* Adding SetUserInteractionAsync on Map

* Adding SetTrafficAsync on Map

* Reworking CameraOptions binding on map

* Reworking StyleOptions bindings on map

* Reworking UserInteractionOptions bindings on map

* Reworking ServiceOptions

* Updating docs

* Adding events on popup (#14)

* Adding events on popups

* Updating popup docs

* Map and drawing toolbar events should be triggered by map instance on map service

Author: arnaudleclerc

docs/drawingtoolbar/README.md

@@ -69,6 +69,7 @@ You can specify the events to enable or disable on the `DrawingToolbarOptions` o
 | `DrawingModeChanged` | Fired when the drawing mode has changed. The new drawing mode is passed into the event handler. |
 | `DrawingStarted` | Fired when the user starts drawing a shape or puts a shape into edit mode. |
 
+Those events are also triggered by the `Map` property on `IMapService`.
 
 ### Updating the toolbar
 

docs/map/README.md

@@ -80,6 +80,8 @@ The events of the map are exposed as `EventCallback` on the `AzureMap` component
 | `zoomend` | `OnZoomEnd` | Fired just after the map completes a transition from one zoom level to another, as the result of either user interaction or methods. |
 | `zoomstart` | `OnZoomStart` | Fired just before the map begins a transition from one zoom level to another, as the result of either user interaction or methods. |
 
+Those events are also triggered by the `Map` property on `IMapService`.
+
 ### Activate or deactivate events
 
 It is possible and recommended to active only the events you need, or at least deactivate the events which are often triggered in order to avoid overflowing the WebSocket communication between the component and the server application. The `AzureMap` component accepts an `EventActivationFlags` parameter where you can define which events should be triggered by the map. By default, all events except `Ready` are deactivated.

docs/popups/README.md

@@ -215,5 +215,52 @@ All the popups can be cleared using the `ClearPopupsAsync` method on the map.
         await eventArgs.Map.ClearPopupsAsync();
     }
 
+}
+```
+
+### Events
+
+You can subscribe to events triggered on the popup by defining the `EventActivationFlags` and subscribing to the corresponding event on the `Popup`. 
+
+The following events are available : `Open`, `DragStart`, `DragEnd`, `Drag` and `Close`.
+
+The following example reacts to the opening of a popup : 
+
+```
+@page "/PopupOnReady"
+
+@using AzureMapsControl.Components.Map
+<AzureMap Id="map"
+          StyleOptions="StyleOptions"
+          EventActivationFlags="MapEventActivationFlags
+                                .None()
+                                .Enable(MapEventType.Ready)"
+          OnReady="OnMapReady" />
+
+@code  {
+
+    public StyleOptions StyleOptions = new StyleOptions
+    {
+        Style = "grayscale_dark"
+    };
+
+    public async Task OnMapReady(MapEventArgs eventArgs)
+    {
+        var popup = new Components.Popups.Popup(new Components.Popups.PopupOptions
+        {
+            CloseButton = false,
+            Content = "Please customize me",
+            Position = new AzureMapsControl.Components.Atlas.Position(11.581990, 48.143534)
+        }, AzureMapsControl.Components.Popups.PopupEventActivationFlags.None().Enable(AzureMapsControl.Components.Popups.PopupEventType.Open));
+
+        popup.OnOpen += eventArgs =>
+        {
+            Console.WriteLine("Popup opened");
+        };
+
+        await eventArgs.Map.AddPopupAsync(popup);
+        await popup.OpenAsync();
+    }
+
 }
 ```

samples/AzureMapsControl.Sample/Pages/PopupOnReady.razor

@@ -22,12 +22,15 @@
             CloseButton = false,
             Content = "Please customize me",
             Position = new AzureMapsControl.Components.Atlas.Position(11.581990, 48.143534)
-        });
+        }, AzureMapsControl.Components.Popups.PopupEventActivationFlags.None().Enable(AzureMapsControl.Components.Popups.PopupEventType.Open));
+
+        popup.OnOpen += eventArgs =>
+        {
+            Console.WriteLine("Popup opened");
+        };
+
         await eventArgs.Map.AddPopupAsync(popup);
         await popup.OpenAsync();
-
-        await popup.UpdateAsync(options => options.Content = "Thanks for updating me");
-        await eventArgs.Map.ClearPopupsAsync();
     }
 
 }

src/AzureMapsControl.Components/Map/AzureMap.razor

@@ -20,6 +20,7 @@
     private Markers.HtmlMarkerInvokeHelper _htmlMarkerEventInvokeHelper;
     private Drawing.DrawingToolbarEventInvokeHelper _drawingToolbarEventInvokeHelper;
     private Layers.LayerEventInvokeHelper _layerEventInvokeHelper;
+    private Popups.PopupInvokeHelper _popupInvokeHelper;
 
     private string _id;
 
@@ -408,6 +409,7 @@
         _htmlMarkerEventInvokeHelper = new Markers.HtmlMarkerInvokeHelper(HtmlMarkerEventReceivedAsync);
         _drawingToolbarEventInvokeHelper = new Drawing.DrawingToolbarEventInvokeHelper(DrawingToolbarEventReceivedAsync);
         _layerEventInvokeHelper = new Layers.LayerEventInvokeHelper(LayerEventReceivedAsync);
+        _popupInvokeHelper = new Popups.PopupInvokeHelper(PopupEventReceivedAsync);
         base.OnInitialized();
     }
 
@@ -512,6 +514,7 @@
 
     private async Task DrawingToolbarEventReceivedAsync(AzureMapsControl.Components.Drawing.DrawingToolbarJsEventArgs drawingToolbarEvent)
     {
+        MapService.Map.DispatchDrawingToolbarEvent(drawingToolbarEvent);
         switch (drawingToolbarEvent.Type)
         {
             case "drawingchanged":
@@ -739,6 +742,7 @@
         && EventActivationFlags.EnabledEvents != null
         && EventActivationFlags.EnabledEvents.Contains(mapEvent.Type))
         {
+            MapService.Map.DispatchEvent(mapEvent);
             switch (mapEvent.Type)
             {
                 case "boxzoomend":
@@ -837,7 +841,7 @@
                 case "sourceadded":
                     await OnSourceAdded.InvokeAsync(new MapDataEventArgs(MapService.Map, mapEvent));
                     break;
-                case "sourcedate":
+                case "sourcedata":
                     await OnSourceData.InvokeAsync(new MapDataEventArgs(MapService.Map, mapEvent));
                     break;
                 case "sourceremoved":
@@ -886,7 +890,7 @@
 
     private async Task AddPopupAsync(AzureMapsControl.Components.Popups.Popup popup)
     {
-        await JSRuntime.InvokeVoidAsync(Constants.JsConstants.MethodAddPopup.ToAzureMapsControlNamespace(), popup.Id, popup.Options);
+        await JSRuntime.InvokeVoidAsync(Constants.JsConstants.MethodAddPopup.ToAzureMapsControlNamespace(), popup.Id, popup.Options, popup.EventActivationFlags.EnabledEvents, DotNetObjectReference.Create(_popupInvokeHelper));
         popup.OpenPopupCallback = Popup_OpenAsync;
         popup.ClosePopupCallback = Popup_CloseAsync;
         popup.RemoveCallback = Popup_RemoveAsync;
@@ -903,5 +907,8 @@
     private async Task Popup_UpdateAsync(string id, AzureMapsControl.Components.Popups.PopupOptions options) => await JSRuntime.InvokeVoidAsync(Constants.JsConstants.MethodPopupUpdate.ToAzureMapsControlNamespace(), id, options);
     private async Task ClearPopupsAsync() => await JSRuntime.InvokeVoidAsync(Constants.JsConstants.MethodClearPopups.ToAzureMapsControlNamespace());
 
+    private async Task PopupEventReceivedAsync(AzureMapsControl.Components.Popups.PopupEventArgs eventArgs) => 
+        await Task.Run(() => MapService.Map.Popups.First(popup => popup.Id == eventArgs.Id).DispatchEvent(eventArgs));
+
     #endregion
 }