Add extraLink button which replaced the iframePopout button, fix #654

UI/BigComponents/ExtraLinkButton.ts

@@ -0,0 +1,81 @@
+import {UIElement} from "../UIElement";
+import BaseUIElement from "../BaseUIElement";
+import {UIEventSource} from "../../Logic/UIEventSource";
+import ExtraLinkConfig from "../../Models/ThemeConfig/ExtraLinkConfig";
+import MapControlButton from "../MapControlButton";
+import Link from "../Base/Link";
+import Img from "../Base/Img";
+import {SubtleButton} from "../Base/SubtleButton";
+import Toggle from "../Input/Toggle";
+import Loc from "../../Models/Loc";
+import Locale from "../i18n/Locale";
+import {Utils} from "../../Utils";
+
+export default class ExtraLinkButton extends UIElement{
+    private readonly _config: ExtraLinkConfig;
+    private readonly state: {
+        layoutToUse: {id: string};
+        featureSwitchWelcomeMessage: UIEventSource<boolean>, locationControl: UIEventSource<Loc>};
+
+    constructor(state:  {featureSwitchWelcomeMessage: UIEventSource<boolean>, locationControl: UIEventSource<Loc>, layoutToUse: {id: string}}, 
+                config: ExtraLinkConfig) {
+        super();
+        this.state = state;
+        this._config = config;
+    }
+
+    protected InnerRender():  BaseUIElement {
+        if(this._config === undefined){
+            return undefined;
+        }
+        
+        const c = this._config;
+
+        const isIframe = window !== window.top
+
+        if(c.requirements.has("iframe") && !isIframe){
+            return undefined
+        }
+
+        if(c.requirements.has("no-iframe") && isIframe){
+            return undefined
+        }
+
+        let link : BaseUIElement
+        const theme = this.state.layoutToUse?.id ?? ""
+        const href = this.state.locationControl.map(loc => {
+            const subs = {
+                ...loc,
+                theme: theme,
+                language: Locale.language.data
+            }
+            return Utils.SubstituteKeys(c.href, subs)
+        })
+        
+        if(c.text === undefined){
+            link = new MapControlButton(
+                new Link(new Img(c.icon), href, c.newTab).SetClass("block w-full h-full p-1.5")
+            )
+        }else {
+            let img : BaseUIElement = undefined
+            if(c.icon !== undefined){
+                img = new Img(c.icon).SetClass("h-6")
+            }
+            
+            link = new SubtleButton(img,c.text, {url:
+                href,
+                newTab: c.newTab}).SetClass("w-64 block")
+        }
+        
+        if(c.requirements.has("no-welcome-message")){
+            link = new Toggle(undefined, link, this.state.featureSwitchWelcomeMessage)
+        }
+
+        if(c.requirements.has("welcome-message")){
+            link = new Toggle(link, undefined,  this.state.featureSwitchWelcomeMessage)
+        }
+        
+        return link;
+    }
+    
+}

UI/DefaultGUI.ts

@@ -8,9 +8,7 @@ import Svg from "../Svg";
 import Toggle from "./Input/Toggle";
 import UserBadge from "./BigComponents/UserBadge";
 import SearchAndGo from "./BigComponents/SearchAndGo";
-import Link from "./Base/Link";
 import BaseUIElement from "./BaseUIElement";
-import {VariableUiElement} from "./Base/VariableUIElement";
 import LeftControls from "./BigComponents/LeftControls";
 import RightControls from "./BigComponents/RightControls";
 import CenterMessageBox from "./CenterMessageBox";
@@ -19,7 +17,6 @@ import ScrollableFullScreen from "./Base/ScrollableFullScreen";
 import Translations from "./i18n/Translations";
 import SimpleAddUI from "./BigComponents/SimpleAddUI";
 import StrayClickHandler from "../Logic/Actors/StrayClickHandler";
-import Lazy from "./Base/Lazy";
 import {DefaultGuiState} from "./DefaultGuiState";
 import LayerConfig from "../Models/ThemeConfig/LayerConfig";
 import * as home_location_json from "../assets/layers/home_location/home_location.json";
@@ -27,6 +24,7 @@ import NewNoteUi from "./Popup/NewNoteUi";
 import Combine from "./Base/Combine";
 import AddNewMarker from "./BigComponents/AddNewMarker";
 import FilteredLayer from "../Models/FilteredLayer";
+import ExtraLinkButton from "./BigComponents/ExtraLinkButton";
 
 
 /**
@@ -169,23 +167,17 @@ export default class DefaultGUI {
             () => new SearchAndGo(state))
             .AttachTo("searchbox");
 
-
-        let iframePopout: () => BaseUIElement = undefined;
-
-        if (window !== window.top) {
-            // MapComplete is running in an iframe
-            iframePopout = () => new VariableUiElement(state.locationControl.map(loc => {
-                const url = `${window.location.origin}${window.location.pathname}?z=${loc.zoom ?? 0}&lat=${loc.lat ?? 0}&lon=${loc.lon ?? 0}`;
-                const link = new Link(Svg.pop_out_img, url, true).SetClass("block w-full h-full p-1.5")
-                return new MapControlButton(link)
-            }))
-
-        }
-
-        new Toggle(new Lazy(() => self.InitWelcomeMessage()),
-            Toggle.If(state.featureSwitchIframePopoutEnabled, iframePopout),
-            state.featureSwitchWelcomeMessage
-        ).AttachTo("messagesbox");
+        new Combine([
+            Toggle.If(state.featureSwitchExtraLinkEnabled,
+                () => new ExtraLinkButton(state, state.layoutToUse.extraLink).SetClass("pointer-events-auto")
+                )
+            ,
+            Toggle.If(
+                state.featureSwitchWelcomeMessage,
+                () => self.InitWelcomeMessage()
+            )])
+            .SetClass("flex flex-col")
+            .AttachTo("messagesbox");
 
 
         new LeftControls(state, guiState).AttachTo("bottom-left");