@wailsio/runtime 3.0.0-alpha.20 → 3.0.0-alpha.21

package/src/drag.js

@@ -1,125 +1,119 @@
-/*
- _	   __	  _ __
-| |	 / /___ _(_) /____
-| | /| / / __ `/ / / ___/
-| |/ |/ / /_/ / / (__  )
-|__/|__/\__,_/_/_/____/
-The electron alternative for Go
-(c) Lea Anthony 2019-present
-*/
-
-/* jshint esversion: 9 */
-
-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";
-
-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;
-}
-
-function setResizable(value) {
-    resizable = value;
-}
-
-function endDrag() {
-    document.body.style.cursor = 'default';
-    shouldDrag = false;
-}
-
-function testResize() {
-    if( resizeEdge ) {
-        invoke(`resize:${resizeEdge}`);
-        return true
-    }
-    return false;
-}
-
-function onMouseDown(e) {
-    if(IsWindows() && testResize() || dragTest(e)) {
-        shouldDrag = !!isValidDrag(e);
-    }
-}
-
-function isValidDrag(e) {
-    // Ignore drag on scrollbars
-    return !(e.offsetX > e.target.clientWidth || e.offsetY > e.target.clientHeight);
-}
-
-function onMouseUp(e) {
-    let mousePressed = e.buttons !== undefined ? e.buttons : e.which;
-    if (mousePressed > 0) {
-        endDrag();
-    }
-}
-
-function setResize(cursor = defaultCursor) {
-    document.documentElement.style.cursor = cursor;
-    resizeEdge = cursor;
-}
-
-function onMouseMove(e) {
-    shouldDrag = checkDrag(e);
-    if (IsWindows() && resizable) {
-        handleResize(e);
-    }
-}
-
-function checkDrag(e) {
-    let mousePressed = e.buttons !== undefined ? e.buttons : e.which;
-    if(shouldDrag && mousePressed > 0) {
-        invoke("drag");
-        return false;
-    }
-    return shouldDrag;
-}
-
-function handleResize(e) {
-    let resizeHandleHeight = GetFlag("system.resizeHandleHeight") || 5;
-    let resizeHandleWidth = GetFlag("system.resizeHandleWidth") || 5;
-
-    // Extra pixels for the corner areas
-    let cornerExtra = GetFlag("resizeCornerExtra") || 10;
-
-    let rightBorder = window.outerWidth - e.clientX < resizeHandleWidth;
-    let leftBorder = e.clientX < resizeHandleWidth;
-    let topBorder = e.clientY < resizeHandleHeight;
-    let bottomBorder = window.outerHeight - e.clientY < resizeHandleHeight;
-
-    // Adjust for corners
-    let rightCorner = window.outerWidth - e.clientX < (resizeHandleWidth + cornerExtra);
-    let leftCorner = e.clientX < (resizeHandleWidth + cornerExtra);
-    let topCorner = e.clientY < (resizeHandleHeight + cornerExtra);
-    let bottomCorner = window.outerHeight - e.clientY < (resizeHandleHeight + cornerExtra);
-
-    // If we aren't on an edge, but were, reset the cursor to default
-    if (!leftBorder && !rightBorder && !topBorder && !bottomBorder && resizeEdge !== undefined) {
-        setResize();
-    }
-    // Adjusted for corner areas
-    else if (rightCorner && bottomCorner) setResize("se-resize");
-    else if (leftCorner && bottomCorner) setResize("sw-resize");
-    else if (leftCorner && topCorner) setResize("nw-resize");
-    else if (topCorner && rightCorner) setResize("ne-resize");
-    else if (leftBorder) setResize("w-resize");
-    else if (topBorder) setResize("n-resize");
-    else if (bottomBorder) setResize("s-resize");
-    else if (rightBorder) setResize("e-resize");
-}
+/*
+ _	   __	  _ __
+| |	 / /___ _(_) /____
+| | /| / / __ `/ / / ___/
+| |/ |/ / /_/ / / (__  )
+|__/|__/\__,_/_/_/____/
+The electron alternative for Go
+(c) Lea Anthony 2019-present
+*/
+/* jshint esversion: 9 */
+import {invoke, IsWindows} from "./system";
+import {GetFlag} from "./flags";
+
+// Setup
+let shouldDrag = false;
+let resizable = false;
+let resizeEdge = null;
+let defaultCursor = "auto";
+
+window._wails = window._wails || {};
+
+window._wails.setResizable = function(value) {
+    resizable = value;
+};
+
+window._wails.endDrag = function() {
+    document.body.style.cursor = 'default';
+    shouldDrag = false;
+};
+
+window.addEventListener('mousedown', onMouseDown);
+window.addEventListener('mousemove', onMouseMove);
+window.addEventListener('mouseup', onMouseUp);
+
+
+function dragTest(e) {
+    let val = window.getComputedStyle(e.target).getPropertyValue("--wails-draggable");
+    let mousePressed = e.buttons !== undefined ? e.buttons : e.which;
+    if (!val || val === "" || val.trim() !== "drag" || mousePressed === 0) {
+        return false;
+    }
+    return e.detail === 1;
+}
+
+function onMouseDown(e) {
+
+    // Check for resizing
+    if (resizeEdge) {
+        invoke("resize:" + resizeEdge);
+        e.preventDefault();
+        return;
+    }
+
+    if (dragTest(e)) {
+        // This checks for clicks on the scroll bar
+        if (e.offsetX > e.target.clientWidth || e.offsetY > e.target.clientHeight) {
+            return;
+        }
+        shouldDrag = true;
+    } else {
+        shouldDrag = false;
+    }
+}
+
+function onMouseUp() {
+    shouldDrag = false;
+}
+
+function setResize(cursor) {
+    document.documentElement.style.cursor = cursor || defaultCursor;
+    resizeEdge = cursor;
+}
+
+function onMouseMove(e) {
+    if (shouldDrag) {
+        shouldDrag = false;
+        let mousePressed = e.buttons !== undefined ? e.buttons : e.which;
+        if (mousePressed > 0) {
+            invoke("drag");
+            return;
+        }
+    }
+    if (!resizable || !IsWindows()) {
+        return;
+    }
+    if (defaultCursor == null) {
+        defaultCursor = document.documentElement.style.cursor;
+    }
+    let resizeHandleHeight = GetFlag("system.resizeHandleHeight") || 5;
+    let resizeHandleWidth = GetFlag("system.resizeHandleWidth") || 5;
+
+    // Extra pixels for the corner areas
+    let cornerExtra = GetFlag("resizeCornerExtra") || 10;
+
+    let rightBorder = window.outerWidth - e.clientX < resizeHandleWidth;
+    let leftBorder = e.clientX < resizeHandleWidth;
+    let topBorder = e.clientY < resizeHandleHeight;
+    let bottomBorder = window.outerHeight - e.clientY < resizeHandleHeight;
+
+    // Adjust for corners
+    let rightCorner = window.outerWidth - e.clientX < (resizeHandleWidth + cornerExtra);
+    let leftCorner = e.clientX < (resizeHandleWidth + cornerExtra);
+    let topCorner = e.clientY < (resizeHandleHeight + cornerExtra);
+    let bottomCorner = window.outerHeight - e.clientY < (resizeHandleHeight + cornerExtra);
+
+    // If we aren't on an edge, but were, reset the cursor to default
+    if (!leftBorder && !rightBorder && !topBorder && !bottomBorder && resizeEdge !== undefined) {
+        setResize();
+    }
+    // Adjusted for corner areas
+    else if (rightCorner && bottomCorner) setResize("se-resize");
+    else if (leftCorner && bottomCorner) setResize("sw-resize");
+    else if (leftCorner && topCorner) setResize("nw-resize");
+    else if (topCorner && rightCorner) setResize("ne-resize");
+    else if (leftBorder) setResize("w-resize");
+    else if (topBorder) setResize("n-resize");
+    else if (bottomBorder) setResize("s-resize");
+    else if (rightBorder) setResize("e-resize");
+}

package/src/event_types.js

@@ -155,6 +155,11 @@ export const EventTypes = {
 	},
 	Linux: {
 		SystemThemeChanged: "linux:SystemThemeChanged",
+		WindowLoadChanged: "linux:WindowLoadChanged",
+		WindowDeleteEvent: "linux:WindowDeleteEvent",
+		WindowFocusIn: "linux:WindowFocusIn",
+		WindowFocusOut: "linux:WindowFocusOut",
+		ApplicationStartup: "linux:ApplicationStartup",
 	},
 	Common: {
 		ApplicationStarted: "common:ApplicationStarted",

package/src/events.js

@@ -1,140 +1,140 @@
-/*
- _	   __	  _ __
-| |	 / /___ _(_) /____
-| | /| / / __ `/ / / ___/
-| |/ |/ / /_/ / / (__  )
-|__/|__/\__,_/_/_/____/
-The electron alternative for Go
-(c) Lea Anthony 2019-present
-*/
-
-/* jshint esversion: 9 */
-
-/**
- * @typedef {import("./types").WailsEvent} WailsEvent
- */
-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();
-
-class Listener {
-    constructor(eventName, callback, maxCallbacks) {
-        this.eventName = eventName;
-        this.maxCallbacks = maxCallbacks || -1;
-        this.Callback = (data) => {
-            callback(data);
-            if (this.maxCallbacks === -1) return false;
-            this.maxCallbacks -= 1;
-            return this.maxCallbacks === 0;
-        };
-    }
-}
-
-export class WailsEvent {
-    constructor(name, data = null) {
-        this.name = name;
-        this.data = data;
-    }
-}
-
-export function setup() {
-}
-
-function dispatchWailsEvent(event) {
-    let listeners = eventListeners.get(event.name);
-    if (listeners) {
-        let toRemove = listeners.filter(listener => {
-            let remove = listener.Callback(event);
-            if (remove) return true;
-        });
-        if (toRemove.length > 0) {
-            listeners = listeners.filter(l => !toRemove.includes(l));
-            if (listeners.length === 0) eventListeners.delete(event.name);
-            else eventListeners.set(event.name, listeners);
-        }
-    }
-}
-
-/**
- * Register a callback function to be called multiple times for a specific event.
- *
- * @param {string} eventName - The name of the event to register the callback for.
- * @param {function} callback - The callback function to be called when the event is triggered.
- * @param {number} maxCallbacks - The maximum number of times the callback can be called for the event. Once the maximum number is reached, the callback will no longer be called.
- *
- @return {function} - A function that, when called, will unregister the callback from the event.
- */
-export function OnMultiple(eventName, callback, maxCallbacks) {
-    let listeners = eventListeners.get(eventName) || [];
-    const thisListener = new Listener(eventName, callback, maxCallbacks);
-    listeners.push(thisListener);
-    eventListeners.set(eventName, listeners);
-    return () => listenerOff(thisListener);
-}
-
-/**
- * Registers a callback function to be executed when the specified event occurs.
- *
- * @param {string} eventName - The name of the event.
- * @param {function} callback - The callback function to be executed. It takes no parameters.
- * @return {function} - A function that, when called, will unregister the callback from the event. */
-export function On(eventName, callback) { return OnMultiple(eventName, callback, -1); }
-
-/**
- * Registers a callback function to be executed only once for the specified event.
- *
- * @param {string} eventName - The name of the event.
- * @param {function} callback - The function to be executed when the event occurs.
- * @return {function} - A function that, when called, will unregister the callback from the event.
- */
-export function Once(eventName, callback) { return OnMultiple(eventName, callback, 1); }
-
-/**
- * Removes the specified listener from the event listeners collection.
- * If all listeners for the event are removed, the event key is deleted from the collection.
- *
- * @param {Object} listener - The listener to be removed.
- */
-function listenerOff(listener) {
-    const eventName = listener.eventName;
-    let listeners = eventListeners.get(eventName).filter(l => l !== listener);
-    if (listeners.length === 0) eventListeners.delete(eventName);
-    else eventListeners.set(eventName, listeners);
-}
-
-
-/**
- * Removes event listeners for the specified event names.
- *
- * @param {string} eventName - The name of the event to remove listeners for.
- * @param {...string} additionalEventNames - Additional event names to remove listeners for.
- * @return {undefined}
- */
-export function Off(eventName, ...additionalEventNames) {
-    let eventsToRemove = [eventName, ...additionalEventNames];
-    eventsToRemove.forEach(eventName => eventListeners.delete(eventName));
-}
-/**
- * Removes all event listeners.
- *
- * @function OffAll
- * @returns {void}
- */
-export function OffAll() { eventListeners.clear(); }
-
-/**
- * Emits an event using the given event name.
- *
- * @param {WailsEvent} event - The name of the event to emit.
- * @returns {any} - The result of the emitted event.
- */
-export function Emit(event) { return call(EmitMethod, event); }
+/*
+ _	   __	  _ __
+| |	 / /___ _(_) /____
+| | /| / / __ `/ / / ___/
+| |/ |/ / /_/ / / (__  )
+|__/|__/\__,_/_/_/____/
+The electron alternative for Go
+(c) Lea Anthony 2019-present
+*/
+
+/* jshint esversion: 9 */
+
+/**
+ * @typedef {import("./types").WailsEvent} WailsEvent
+ */
+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();
+
+class Listener {
+    constructor(eventName, callback, maxCallbacks) {
+        this.eventName = eventName;
+        this.maxCallbacks = maxCallbacks || -1;
+        this.Callback = (data) => {
+            callback(data);
+            if (this.maxCallbacks === -1) return false;
+            this.maxCallbacks -= 1;
+            return this.maxCallbacks === 0;
+        };
+    }
+}
+
+export class WailsEvent {
+    constructor(name, data = null) {
+        this.name = name;
+        this.data = data;
+    }
+}
+
+export function setup() {
+}
+
+function dispatchWailsEvent(event) {
+    let listeners = eventListeners.get(event.name);
+    if (listeners) {
+        let toRemove = listeners.filter(listener => {
+            let remove = listener.Callback(event);
+            if (remove) return true;
+        });
+        if (toRemove.length > 0) {
+            listeners = listeners.filter(l => !toRemove.includes(l));
+            if (listeners.length === 0) eventListeners.delete(event.name);
+            else eventListeners.set(event.name, listeners);
+        }
+    }
+}
+
+/**
+ * Register a callback function to be called multiple times for a specific event.
+ *
+ * @param {string} eventName - The name of the event to register the callback for.
+ * @param {function} callback - The callback function to be called when the event is triggered.
+ * @param {number} maxCallbacks - The maximum number of times the callback can be called for the event. Once the maximum number is reached, the callback will no longer be called.
+ *
+ @return {function} - A function that, when called, will unregister the callback from the event.
+ */
+export function OnMultiple(eventName, callback, maxCallbacks) {
+    let listeners = eventListeners.get(eventName) || [];
+    const thisListener = new Listener(eventName, callback, maxCallbacks);
+    listeners.push(thisListener);
+    eventListeners.set(eventName, listeners);
+    return () => listenerOff(thisListener);
+}
+
+/**
+ * Registers a callback function to be executed when the specified event occurs.
+ *
+ * @param {string} eventName - The name of the event.
+ * @param {function} callback - The callback function to be executed. It takes no parameters.
+ * @return {function} - A function that, when called, will unregister the callback from the event. */
+export function On(eventName, callback) { return OnMultiple(eventName, callback, -1); }
+
+/**
+ * Registers a callback function to be executed only once for the specified event.
+ *
+ * @param {string} eventName - The name of the event.
+ * @param {function} callback - The function to be executed when the event occurs.
+ * @return {function} - A function that, when called, will unregister the callback from the event.
+ */
+export function Once(eventName, callback) { return OnMultiple(eventName, callback, 1); }
+
+/**
+ * Removes the specified listener from the event listeners collection.
+ * If all listeners for the event are removed, the event key is deleted from the collection.
+ *
+ * @param {Object} listener - The listener to be removed.
+ */
+function listenerOff(listener) {
+    const eventName = listener.eventName;
+    let listeners = eventListeners.get(eventName).filter(l => l !== listener);
+    if (listeners.length === 0) eventListeners.delete(eventName);
+    else eventListeners.set(eventName, listeners);
+}
+
+
+/**
+ * Removes event listeners for the specified event names.
+ *
+ * @param {string} eventName - The name of the event to remove listeners for.
+ * @param {...string} additionalEventNames - Additional event names to remove listeners for.
+ * @return {undefined}
+ */
+export function Off(eventName, ...additionalEventNames) {
+    let eventsToRemove = [eventName, ...additionalEventNames];
+    eventsToRemove.forEach(eventName => eventListeners.delete(eventName));
+}
+/**
+ * Removes all event listeners.
+ *
+ * @function OffAll
+ * @returns {void}
+ */
+export function OffAll() { eventListeners.clear(); }
+
+/**
+ * Emits an event using the given event name.
+ *
+ * @param {WailsEvent} event - The name of the event to emit.
+ * @returns {any} - The result of the emitted event.
+ */
+export function Emit(event) { return call(EmitMethod, event); }

package/src/flags.js

@@ -1,25 +1,25 @@
-/*
- _	   __	  _ __
-| |	 / /___ _(_) /____
-| | /| / / __ `/ / / ___/
-| |/ |/ / /_/ / / (__  )
-|__/|__/\__,_/_/_/____/
-The electron alternative for Go
-(c) Lea Anthony 2019-present
-*/
-
-/* jshint esversion: 9 */
-
-/**
- * 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) {
-    try {
-        return window._wails.flags[keyString];
-    } catch (e) {
-        throw new Error("Unable to retrieve flag '" + keyString + "': " + e);
-    }
-}
+/*
+ _	   __	  _ __
+| |	 / /___ _(_) /____
+| | /| / / __ `/ / / ___/
+| |/ |/ / /_/ / / (__  )
+|__/|__/\__,_/_/_/____/
+The electron alternative for Go
+(c) Lea Anthony 2019-present
+*/
+
+/* jshint esversion: 9 */
+
+/**
+ * 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) {
+    try {
+        return window._wails.flags[keyString];
+    } catch (e) {
+        throw new Error("Unable to retrieve flag '" + keyString + "': " + e);
+    }
+}