Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop

2022-02-07 19:56:57 +01:00
parent 8a8abd2961 31f3b2b48e
commit a2e50dcd95
15 changed files with 211 additions and 67 deletions
@@ -6,10 +6,9 @@ import { coWebsiteManager } from "../../WebRtc/CoWebsiteManager";
 import { layoutManagerActionStore } from "../../Stores/LayoutManagerStore";
 import { localUserStore } from "../../Connexion/LocalUserStore";
 import { get } from "svelte/store";
-import { ON_ACTION_TRIGGER_BUTTON } from "../../WebRtc/LayoutManager";
+import { ON_ACTION_TRIGGER_BUTTON, ON_ICON_TRIGGER_BUTTON } from "../../WebRtc/LayoutManager";
 import type { ITiledMapLayer } from "../Map/ITiledMap";
 import { GameMapProperties } from "./GameMapProperties";
-import { highlightedEmbedScreen } from "../../Stores/EmbedScreensStore";
 import { LL } from "../../i18n/i18n-svelte";

 enum OpenCoWebsiteState {
@@ -19,12 +18,14 @@ enum OpenCoWebsiteState {
 }

 interface OpenCoWebsite {
-    coWebsite: CoWebsite;
+    actionId: string;
+    coWebsite?: CoWebsite;
    state: OpenCoWebsiteState;
 }

 export class GameMapPropertiesListener {
    private coWebsitesOpenByLayer = new Map<ITiledMapLayer, OpenCoWebsite>();
+    private coWebsitesActionTriggerByLayer = new Map<ITiledMapLayer, string>();

    constructor(private scene: GameScene, private gameMap: GameMap) {}

@@ -100,29 +101,19 @@ export class GameMapPropertiesListener {
                        return;
                    }

-                    const actionUuid = "openWebsite-" + (Math.random() + 1).toString(36).substring(7);
+                    const actionId = "openWebsite-" + (Math.random() + 1).toString(36).substring(7);

                    if (this.coWebsitesOpenByLayer.has(layer)) {
                        return;
                    }

-                    const coWebsite = coWebsiteManager.addCoWebsite(
-                        openWebsiteProperty,
-                        this.scene.MapUrlFile,
-                        allowApiProperty,
-                        websitePolicyProperty,
-                        websitePositionProperty,
-                        false,
-                        websiteTriggerMessageProperty,
-                        websiteWidthProperty,
-                    );
-
                    this.coWebsitesOpenByLayer.set(layer, {
-                        coWebsite: coWebsite,
+                        actionId: actionId,
+                        coWebsite: undefined,
                        state: OpenCoWebsiteState.ASLEEP,
                    });

-                    const openWebsiteFunction = () => {
+                    const loadCoWebsiteFunction = (coWebsite: CoWebsite) => {
                        coWebsiteManager
                            .loadCoWebsite(coWebsite)
                            .then((coWebsite) => {
@@ -132,8 +123,10 @@ export class GameMapPropertiesListener {
                                        console.error("Error during a co-website closing");
                                    });
                                    this.coWebsitesOpenByLayer.delete(layer);
+                                    this.coWebsitesActionTriggerByLayer.delete(layer);
                                } else {
                                    this.coWebsitesOpenByLayer.set(layer, {
+                                        actionId,
                                        coWebsite,
                                        state: OpenCoWebsiteState.OPENED,
                                    });
@@ -143,14 +136,60 @@ export class GameMapPropertiesListener {
                                console.error("Error during loading a co-website: " + coWebsite.url);
                            });

-                        layoutManagerActionStore.removeAction(actionUuid);
+                        layoutManagerActionStore.removeAction(actionId);
+                    };
+
+                    const openCoWebsiteFunction = () => {
+                        const coWebsite = coWebsiteManager.addCoWebsite(
+                            openWebsiteProperty ?? "",
+                            this.scene.MapUrlFile,
+                            allowApiProperty,
+                            websitePolicyProperty,
+                            websiteWidthProperty,
+                            websitePositionProperty,
+                            false
+                        );
+
+                        loadCoWebsiteFunction(coWebsite);
                    };

                    if (
-                        !localUserStore.getForceCowebsiteTrigger() &&
-                        websiteTriggerProperty !== ON_ACTION_TRIGGER_BUTTON
+                        localUserStore.getForceCowebsiteTrigger() ||
+                        websiteTriggerProperty === ON_ACTION_TRIGGER_BUTTON
                    ) {
-                        openWebsiteFunction();
+                        if (!websiteTriggerMessageProperty) {
+                            websiteTriggerMessageProperty = get(LL).message.openWebsiteTrigger();
+                        }
+
+                        this.coWebsitesActionTriggerByLayer.set(layer, actionId);
+
+                        layoutManagerActionStore.addAction({
+                            uuid: actionId,
+                            type: "message",
+                            message: websiteTriggerMessageProperty,
+                            callback: () => openCoWebsiteFunction(),
+                            userInputManager: this.scene.userInputManager,
+                        });
+                    } else if (websiteTriggerProperty === ON_ICON_TRIGGER_BUTTON) {
+                        const coWebsite = coWebsiteManager.addCoWebsite(
+                            openWebsiteProperty,
+                            this.scene.MapUrlFile,
+                            allowApiProperty,
+                            websitePolicyProperty,
+                            websiteWidthProperty,
+                            websitePositionProperty,
+                            false
+                        );
+
+                        const ObjectByLayer = this.coWebsitesOpenByLayer.get(layer);
+
+                        if (ObjectByLayer) {
+                            ObjectByLayer.coWebsite = coWebsite;
+                        }
+                    }
+
+                    if (!websiteTriggerProperty) {
+                        openCoWebsiteFunction();
                    }
                });
            };
@@ -199,6 +238,28 @@ export class GameMapPropertiesListener {
                    }

                    this.coWebsitesOpenByLayer.delete(layer);
+
+                    if (!websiteTriggerProperty) {
+                        return;
+                    }
+
+                    const actionStore = get(layoutManagerActionStore);
+                    const actionTriggerUuid = this.coWebsitesActionTriggerByLayer.get(layer);
+
+                    if (!actionTriggerUuid) {
+                        return;
+                    }
+
+                    const action =
+                        actionStore && actionStore.length > 0
+                            ? actionStore.find((action) => action.uuid === actionTriggerUuid)
+                            : undefined;
+
+                    if (action) {
+                        layoutManagerActionStore.removeAction(actionTriggerUuid);
+                    }
+
+                    this.coWebsitesActionTriggerByLayer.delete(layer);
                });
            };

@@ -1297,6 +1297,7 @@ export class GameScene extends DirtyScene {
                iframeListener.getBaseUrlFromSource(source),
                openCoWebsite.allowApi,
                openCoWebsite.allowPolicy,
+                openCoWebsite.widthPercent,
                openCoWebsite.position,
                openCoWebsite.closable ?? true
            );