Fixed dialogs on macOS. Update WML example to use compiled runtime.

atterpac · Jan 25, 2024 · 7674f8e · 7674f8e
1 parent 773bdf8
commit 7674f8e
Show file tree

Hide file tree

Showing 43 changed files with 394 additions and 1,171 deletions.
diff --git a/v3/examples/window/main.go b/v3/examples/window/main.go
@@ -21,7 +21,7 @@ func main() {
 		Description: "A demo of the WebviewWindow API",
 		Assets:      application.AlphaAssets,
 		Mac: application.MacOptions{
-			ApplicationShouldTerminateAfterLastWindowClosed: true,
+			ApplicationShouldTerminateAfterLastWindowClosed: false,
 		},
 	})
 	app.On(events.Mac.ApplicationDidFinishLaunching, func(event *application.Event) {

diff --git a/v3/examples/wml/assets/index.html b/v3/examples/wml/assets/index.html
@@ -129,6 +129,7 @@
             font-size: large;
         }
     </style>
+    <script src="runtime.js"></script>
 </head>
 <body style="--webkit-app-region: drag;">
 <img class="logo"

diff --git a/v3/examples/wml/assets/runtime.js b/v3/examples/wml/assets/runtime.js
diff --git a/v3/internal/commands/build_assets/runtime/compiled.go b/v3/internal/commands/build_assets/runtime/compiled.go
@@ -0,0 +1,9 @@
+package runtime
+
+import _ "embed"
+
+//go:embed runtime.js
+var runtimeJS []byte
+
+//go:embed runtime.debug.js
+var runtimeDebugJS []byte
diff --git a/v3/internal/runtime/Taskfile.yaml b/v3/internal/runtime/Taskfile.yaml
@@ -21,12 +21,12 @@ tasks:
   build:debug:
     internal: true
     cmds:
-      - npx esbuild@latest desktop/main.js --bundle --tree-shaking=true --sourcemap=inline --outfile=runtime_debug.js --define:DEBUG=true
+      - npx esbuild@latest desktop/compiled/main.js --bundle --tree-shaking=true --sourcemap=inline --outfile=../commands/build_assets/runtime/runtime.debug.js --define:DEBUG=true
 
   build:production:
     internal: true
     cmds:
-      - npx esbuild@latest desktop/main.js --bundle --tree-shaking=true --minify --outfile=runtime.js --drop:console
+      - npx esbuild@latest desktop/compiled/main.js --bundle --tree-shaking=true --minify --outfile=../commands/build_assets/runtime/runtime.js --define:DEBUG=false --drop:console
 
   build:all:
     internal: true

diff --git a/v3/internal/runtime/assets.go b/v3/internal/runtime/assets.go
diff --git a/v3/internal/runtime/assets_dev.go b/v3/internal/runtime/assets_dev.go
diff --git a/v3/internal/runtime/desktop/@wailsio/runtime/.npmignore b/v3/internal/runtime/desktop/@wailsio/runtime/.npmignore
@@ -1,2 +1,4 @@
 events.test.js
-node_modules
+node_modules
+types/drag.d.ts
+types/contextmenu.d.ts
diff --git a/v3/internal/runtime/desktop/@wailsio/runtime/src/calls.js b/v3/internal/runtime/desktop/@wailsio/runtime/src/calls.js
@@ -12,14 +12,16 @@ The electron alternative for Go
 import { newRuntimeCallerWithID, objectNames } from "./runtime";
 import { nanoid } from 'nanoid/non-secure';
 
-const CallBinding = 0;
-const call = newRuntimeCallerWithID(objectNames.Call, '');
-let callResponses = new Map();
-
+// Setup
 window._wails = window._wails || {};
 window._wails.callResultHandler = resultHandler;
 window._wails.callErrorHandler = errorHandler;
 
+
+const CallBinding = 0;
+const call = newRuntimeCallerWithID(objectNames.Call, '');
+let callResponses = new Map();
+
 /**
  * Generates a unique ID using the nanoid library.
  *

diff --git a/v3/internal/runtime/desktop/@wailsio/runtime/src/contextmenu.js b/v3/internal/runtime/desktop/@wailsio/runtime/src/contextmenu.js
@@ -13,17 +13,16 @@ The electron alternative for Go
 import {newRuntimeCallerWithID, objectNames} from "./runtime";
 import {IsDebug} from "./system";
 
+// setup
+window.addEventListener('contextmenu', contextMenuHandler);
+
 const call = newRuntimeCallerWithID(objectNames.ContextMenu, '');
 const ContextMenuOpen = 0;
 
 function openContextMenu(id, x, y, data) {
     void call(ContextMenuOpen, {id, x, y, data});
 }
 
-export function setupContextMenus() {
-    window.addEventListener('contextmenu', contextMenuHandler);
-}
-
 function contextMenuHandler(event) {
     // Check for custom context menu
     let element = event.target;

diff --git a/v3/internal/runtime/desktop/@wailsio/runtime/src/dialogs.js b/v3/internal/runtime/desktop/@wailsio/runtime/src/dialogs.js
@@ -73,6 +73,11 @@ The electron alternative for Go
  * @property {string} [Pattern] - Pattern to match for the filter, e.g. "*.txt;*.md" for text markdown files.
  */
 
+// setup
+window._wails = window._wails || {};
+window._wails.dialogErrorCallback = dialogErrorCallback;
+window._wails.dialogResultCallback = dialogResultCallback;
+
 import {newRuntimeCallerWithID, objectNames} from "./runtime";
 
 import { nanoid } from 'nanoid/non-secure';
@@ -118,10 +123,6 @@ function dialog(type, options = {}) {
     });
 }
 
-window._wails = window._wails || {};
-window._wails.dialogErrorCallback = dialogErrorCallback;
-window._wails.dialogResultCallback = dialogResultCallback;
-
 /**
  * Handles the callback from a dialog.
  *

diff --git a/v3/internal/runtime/desktop/@wailsio/runtime/src/drag.js b/v3/internal/runtime/desktop/@wailsio/runtime/src/drag.js
@@ -13,33 +13,32 @@ The electron alternative for Go
 import {invoke, IsWindows} from "./system";
 import {GetFlag} from "./flags";
 
+// Setup
+window._wails = window._wails || {};
+window._wails.setResizable = setResizable;
+window._wails.endDrag = endDrag;
+window.addEventListener('mousedown', onMouseDown);
+window.addEventListener('mousemove', onMouseMove);
+window.addEventListener('mouseup', onMouseUp);
+
 let shouldDrag = false;
 let resizeEdge = null;
 let resizable = false;
 let defaultCursor = "auto";
-window._wails = window._wails || {};
-window._wails.setResizable = setResizable;
-window._wails.endDrag = endDrag;
 
-export function dragTest(e) {
+function dragTest(e) {
     let val = window.getComputedStyle(e.target).getPropertyValue("--webkit-app-region");
     if (!val || val === "" || val.trim() !== "drag" || e.buttons !== 1) {
         return false;
     }
     return e.detail === 1;
 }
 
-export function setupDrag() {
-    window.addEventListener('mousedown', onMouseDown);
-    window.addEventListener('mousemove', onMouseMove);
-    window.addEventListener('mouseup', onMouseUp);
-}
-
-export function setResizable(value) {
+function setResizable(value) {
     resizable = value;
 }
 
-export function endDrag() {
+function endDrag() {
     document.body.style.cursor = 'default';
     shouldDrag = false;
 }

diff --git a/v3/internal/runtime/desktop/@wailsio/runtime/src/event_types.js b/v3/internal/runtime/desktop/@wailsio/runtime/src/event_types.js
@@ -176,6 +176,7 @@ export const EventTypes = {
 		WindowHide: "common:WindowHide",
 		WindowDPIChanged: "common:WindowDPIChanged",
 		WindowFilesDropped: "common:WindowFilesDropped",
+		WindowRuntimeReady: "common:WindowRuntimeReady",
 		ThemeChanged: "common:ThemeChanged",
 	},
 };
diff --git a/v3/internal/runtime/desktop/@wailsio/runtime/src/events.js b/v3/internal/runtime/desktop/@wailsio/runtime/src/events.js
@@ -18,6 +18,10 @@ import {newRuntimeCallerWithID, objectNames} from "./runtime";
 import {EventTypes} from "./event_types";
 export const Types = EventTypes;
 
+// Setup
+window._wails = window._wails || {};
+window._wails.dispatchWailsEvent = dispatchWailsEvent;
+
 const call = newRuntimeCallerWithID(objectNames.Events, '');
 const EmitMethod = 0;
 const eventListeners = new Map();
@@ -42,19 +46,7 @@ export class WailsEvent {
     }
 }
 
-/**
- * Sets up event callbacks for Wails.
- *
- * @function setupEventCallbacks
- *
- * @description This method is responsible for setting up event callbacks for Wails. It checks if the global object `_wails` exists on the `window` object, and if not, initializes it
- *. It then assigns the `dispatchWailsEvent` function as a property on the `_wails` object.
- *
- * @returns {undefined} Returns nothing.
- */
-export function setupEventCallbacks() {
-    window._wails = window._wails || {};
-    window._wails.dispatchWailsEvent = dispatchWailsEvent;
+export function setup() {
 }
 
 function dispatchWailsEvent(event) {

diff --git a/v3/internal/runtime/desktop/@wailsio/runtime/src/events.test.js b/v3/internal/runtime/desktop/@wailsio/runtime/src/events.test.js
@@ -58,28 +58,7 @@ describe('Once', () => {
     cancel();
   })
 })
-//
-// describe('EventsNotify', () => {
-//   it('should inform a listener', () => {
-//     const cb = vi.fn()
-//     EventsOn('a', cb)
-//     EventsNotify(JSON.stringify({name: 'a', data: ["one", "two", "three"]}))
-//     expect(cb).toBeCalledTimes(1);
-//     expect(cb).toHaveBeenLastCalledWith("one", "two", "three");
-//     expect(window.WailsInvoke).toBeCalledTimes(0);
-//   })
-// })
-//
-// describe('EventsEmit', () => {
-//   it('should emit an event', () => {
-//     EventsEmit('a', 'one', 'two', 'three')
-//     expect(window.WailsInvoke).toBeCalledTimes(1);
-//     const calledWith = window.WailsInvoke.calls[0][0];
-//     expect(calledWith.slice(0, 2)).toBe('EE')
-//     expect(JSON.parse(calledWith.slice(2))).toStrictEqual({data: ["one", "two", "three"], name: "a"})
-//   })
-// })
-//
+
 describe('Off', () => {
   beforeEach(() => {
     On('a', () => {})

diff --git a/v3/internal/runtime/desktop/@wailsio/runtime/src/flags.js b/v3/internal/runtime/desktop/@wailsio/runtime/src/flags.js
@@ -10,54 +10,16 @@ The electron alternative for Go
 
 /* jshint esversion: 9 */
 
-let flags = new Map();
-
-function convertToMap(obj) {
-    const map = new Map();
-
-    for (const [key, value] of Object.entries(obj)) {
-        if (typeof value === 'object' && value !== null) {
-            map.set(key, convertToMap(value)); // Recursively convert nested object
-        } else {
-            map.set(key, value);
-        }
-    }
-
-    return map;
-}
-
-fetch("/wails/flags").then((response) => {
-    response.json().then((data) => {
-        flags = convertToMap(data);
-    });
-});
-
-
-function getValueFromMap(keyString) {
-    const keys = keyString.split('.');
-    let value = flags;
-
-    for (const key of keys) {
-        if (value instanceof Map) {
-            value = value.get(key);
-        } else {
-            value = value[key];
-        }
-
-        if (value === undefined) {
-            break;
-        }
-    }
-
-    return value;
-}
-
 /**
  * Retrieves the value associated with the specified key from the flag map.
  *
  * @param {string} keyString - The key to retrieve the value for.
  * @return {*} - The value associated with the specified key.
  */
 export function GetFlag(keyString) {
-    return getValueFromMap(keyString);
+    try {
+        return window._wails.flags[keyString];
+    } catch (e) {
+        throw new Error("Unable to retrieve flag '" + keyString + "': " + e);
+    }
 }