Merge pull request #198 from dymaptic/feature/193_extra_fixes

Extra fixes for Pro widgets
dymaptic · Jul 18, 2023 · dbffbb6 · dbffbb6
2 parents cc3cdb7 + 19a38fe
commit dbffbb6
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 9 deletions.
diff --git a/src/dymaptic.GeoBlazor.Core/Components/Widgets/Widget.cs b/src/dymaptic.GeoBlazor.Core/Components/Widgets/Widget.cs
@@ -41,6 +41,19 @@ public abstract class Widget : MapComponent
     /// </summary>
     [JsonPropertyName("type")]
     public abstract string WidgetType { get; }
+
+    /// <summary>
+    ///     Icon which represents the widget. It is typically used when the widget is controlled by another one (e.g. in the Expand widget).
+    ///     Default Value:null
+    /// </summary>
+    [Parameter]
+    public string? Icon { get; set; }
+
+    /// <summary>
+    ///     The unique ID assigned to the widget when the widget is created. If not set by the developer, it will default to the container ID, or if that is not present then it will be automatically generated.
+    /// </summary>
+    [Parameter]
+    public string? WidgetId { get; set; }
 
     /// <summary>
     ///     DotNet Object Reference to the widget

diff --git a/src/dymaptic.GeoBlazor.Core/Scripts/arcGisJsInterop.ts b/src/dymaptic.GeoBlazor.Core/Scripts/arcGisJsInterop.ts
@@ -1758,6 +1758,14 @@ async function createWidget(widget: any, viewId: string): Promise<Widget | null>
         default:
             return null;
     }
+
+    if (hasValue(widget.icon)) {
+        newWidget.icon = widget.icon;
+    }
+
+    if (hasValue(widget.widgetId)) {
+        newWidget.id = widget.widgetId;
+    }
 
     arcGisObjectRefs[widget.id] = newWidget;
     dotNetRefs[widget.id] = widget.dotNetComponentReference;

diff --git a/src/dymaptic.GeoBlazor.Core/Scripts/jsBuilder.ts b/src/dymaptic.GeoBlazor.Core/Scripts/jsBuilder.ts
@@ -244,15 +244,20 @@ export function buildJsPopupTemplate(popupTemplateObject: DotNetPopupTemplate, v
     if (viewId !== null) {
         let view = arcGisObjectRefs[viewId] as View;
         if (hasValue(view)) {
-            if (hasValue(triggerActionHandler)) {
-                triggerActionHandler.remove();
+            try {
+                if (hasValue(triggerActionHandler)) {
+                    triggerActionHandler.remove();
+                }
+                if (hasValue(templateTriggerActionHandler)) {
+                    templateTriggerActionHandler.remove();
+                }
+                templateTriggerActionHandler = view.popup.on("trigger-action", async (event: PopupTriggerActionEvent) => {
+                    await popupTemplateObject.dotNetPopupTemplateReference.invokeMethodAsync("OnTriggerAction", event.action.id);
+                });
             }
-            if (hasValue(templateTriggerActionHandler)) {
-                templateTriggerActionHandler.remove();
+            catch (error) {
+                console.debug(error);
             }
-            templateTriggerActionHandler = view.popup.on("trigger-action", async (event: PopupTriggerActionEvent) => {
-                await popupTemplateObject.dotNetPopupTemplateReference.invokeMethodAsync("OnTriggerAction", event.action.id);
-            });
         }
     }
 

diff --git a/src/dymaptic.GeoBlazor.Core/dymaptic.GeoBlazor.Core.csproj b/src/dymaptic.GeoBlazor.Core/dymaptic.GeoBlazor.Core.csproj
@@ -78,12 +78,12 @@
         <Exec Command="npm install" />
     </Target>
 
-    <Target Name="Copy Assets Debug" AfterTargets="NPM Install" Condition="$(Configuration) == 'DEBUG' AND $(TargetFrameworks.StartsWith($(TargetFramework))) AND '$(OptOutFromCoreEsBuild)' != 'true'">
+    <Target Name="Copy Assets Debug" AfterTargets="PreBuildEvent" Condition="$(Configuration) == 'DEBUG' AND $(TargetFrameworks.StartsWith($(TargetFramework)))">
         <Message Importance="high" Text="Copying Asset files" />
         <ExecAsync FilePath="pwsh" Arguments="./assetCopy.ps1" />
     </Target>
 
-    <Target Name="Copy Assets Release" AfterTargets="NPM Install" Condition="$(Configuration) == 'RELEASE' AND $(TargetFrameworks.StartsWith($(TargetFramework)))">
+    <Target Name="Copy Assets Release" AfterTargets="PreBuildEvent" Condition="$(Configuration) == 'RELEASE' AND $(TargetFrameworks.StartsWith($(TargetFramework)))">
         <Message Importance="high" Text="Copying Asset files" />
         <Exec Command="pwsh ./assetCopy.ps1" />
     </Target>