Merge remote-tracking branch 'remotes/upstream/develop' into trigger-message-refv3

front/src/Api/iframe/ui.ts

@@ -1,20 +1,29 @@
-import { isButtonClickedEvent } from '../Events/ButtonClickedEvent';
-import { isMenuItemClickedEvent } from '../Events/ui/MenuItemClickedEvent';
-import { isMessageReferenceEvent } from '../Events/ui/TriggerMessageEvent';
-import { IframeApiContribution, sendToWorkadventure } from './IframeApiContribution';
+import { isButtonClickedEvent } from "../Events/ButtonClickedEvent";
+import { isMenuItemClickedEvent } from "../Events/ui/MenuItemClickedEvent";
+import { IframeApiContribution, sendToWorkadventure } from "./IframeApiContribution";
 import { apiCallback } from "./registeredCallbacks";
 import type { ButtonClickedCallback, ButtonDescriptor } from "./Ui/ButtonDescriptor";
 import { Popup } from "./Ui/Popup";
-import { TriggerMessage, triggerMessageInstance } from './Ui/TriggerMessage';
+import { TriggerMessage } from "./Ui/TriggerMessage";
 
 let popupId = 0;
 const popups: Map<number, Popup> = new Map<number, Popup>();
-const popupCallbacks: Map<number, Map<number, ButtonClickedCallback>> = new Map<number, Map<number, ButtonClickedCallback>>();
+const popupCallbacks: Map<number, Map<number, ButtonClickedCallback>> = new Map<
+    number,
+    Map<number, ButtonClickedCallback>
+>();
 
-const menuCallbacks: Map<string, (command: string) => void> = new Map()
+const menuCallbacks: Map<string, (command: string) => void> = new Map();
 
-class WorkAdventureUiCommands extends IframeApiContribution<WorkAdventureUiCommands> {
+interface ZonedPopupOptions {
+    zone: string;
+    objectLayerName?: string;
+    popupText: string;
+    delay?: number;
+    popupOptions: Array<ButtonDescriptor>;
+}
 
+export class WorkAdventureUiCommands extends IframeApiContribution<WorkAdventureUiCommands> {
     callbacks = [
         apiCallback({
             type: "buttonClickedEvent",
@@ -28,28 +37,20 @@ class WorkAdventureUiCommands extends IframeApiContribution<WorkAdventureUiComma
                 if (callback) {
                     callback(popup);
                 }
-            }
+            },
         }),
         apiCallback({
             type: "menuItemClicked",
             typeChecker: isMenuItemClickedEvent,
-            callback: event => {
+            callback: (event) => {
                 const callback = menuCallbacks.get(event.menuItem);
                 if (callback) {
-                    callback(event.menuItem)
+                    callback(event.menuItem);
                 }
-            }
+            },
         }),
-        apiCallback({
-            type: "messageTriggered",
-            typeChecker: isMessageReferenceEvent,
-            callback: event => {
-                triggerMessageInstance?.trigger();
-            }
-        })
     ];
 
-
     openPopup(targetObject: string, message: string, buttons: ButtonDescriptor[]): Popup {
         popupId++;
         const popup = new Popup(popupId);
@@ -67,41 +68,42 @@ class WorkAdventureUiCommands extends IframeApiContribution<WorkAdventureUiComma
         }
 
         sendToWorkadventure({
-            'type': 'openPopup',
-            'data': {
+            type: "openPopup",
+            data: {
                 popupId,
                 targetObject,
                 message,
                 buttons: buttons.map((button) => {
                     return {
                         label: button.label,
-                        className: button.className
+                        className: button.className,
                     };
-                })
-            }
+                }),
+            },
         });
 
-        popups.set(popupId, popup)
+        popups.set(popupId, popup);
         return popup;
     }
 
     registerMenuCommand(commandDescriptor: string, callback: (commandDescriptor: string) => void) {
         menuCallbacks.set(commandDescriptor, callback);
         sendToWorkadventure({
-            'type': 'registerMenuCommand',
-            'data': {
-                menutItem: commandDescriptor
-            }
+            type: "registerMenuCommand",
+            data: {
+                menutItem: commandDescriptor,
+            },
         });
     }
 
     displayBubble(): void {
-        sendToWorkadventure({ 'type': 'displayBubble', data: null });
+        sendToWorkadventure({ type: "displayBubble", data: null });
     }
 
     removeBubble(): void {
-        sendToWorkadventure({ 'type': 'removeBubble', data: null });
+        sendToWorkadventure({ type: "removeBubble", data: null });
     }
+
     triggerMessage(message: string, callback: () => void): TriggerMessage {
         return new TriggerMessage(message, callback);
     }