Removed OnShouldClose: Create single way of handling conditional and unconditional close.

v3/examples/hide-window/main.go

@@ -2,12 +2,11 @@ package main
 
 import (
 	_ "embed"
-	"log"
-	"runtime"
-
 	"github.com/wailsapp/wails/v3/pkg/application"
 	"github.com/wailsapp/wails/v3/pkg/events"
 	"github.com/wailsapp/wails/v3/pkg/icons"
+	"log"
+	"runtime"
 )
 
 func main() {
@@ -29,16 +28,16 @@ func main() {
 		AlwaysOnTop:   false,
 		Hidden:        false,
 		DisableResize: false,
-		ShouldClose: func(window *application.WebviewWindow) bool {
-			println("close")
-			window.Hide()
-			return false
-		},
 		Windows: application.WindowsWindow{
 			HiddenOnTaskbar: true,
 		},
 	})
 
+	window.RegisterHook(events.Common.WindowClosing, func(e *application.WindowEvent) {
+		window.Hide()
+		e.Cancel()
+	})
+
 	if runtime.GOOS == "darwin" {
 		systemTray.SetTemplateIcon(icons.SystrayMacTemplate)
 	}

v3/examples/systray-basic/main.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	_ "embed"
+	"github.com/wailsapp/wails/v3/pkg/events"
 	"log"
 	"runtime"
 
@@ -29,10 +30,6 @@ func main() {
 		AlwaysOnTop:   true,
 		Hidden:        true,
 		DisableResize: true,
-		ShouldClose: func(window *application.WebviewWindow) bool {
-			window.Hide()
-			return false
-		},
 		Windows: application.WindowsWindow{
 			HiddenOnTaskbar: true,
 		},
@@ -43,6 +40,11 @@ func main() {
 		},
 	})
 
+	window.RegisterHook(events.Common.WindowClosing, func(e *application.WindowEvent) {
+		window.Hide()
+		e.Cancel()
+	})
+
 	if runtime.GOOS == "darwin" {
 		systemTray.SetTemplateIcon(icons.SystrayMacTemplate)
 	}

v3/examples/systray-custom/main.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	_ "embed"
+	"github.com/wailsapp/wails/v3/pkg/events"
 	"log"
 	"runtime"
 
@@ -29,15 +30,16 @@ func main() {
 		AlwaysOnTop:   true,
 		Hidden:        true,
 		DisableResize: true,
-		ShouldClose: func(window *application.WebviewWindow) bool {
-			window.Hide()
-			return false
-		},
 		Windows: application.WindowsWindow{
 			HiddenOnTaskbar: true,
 		},
 	})
 
+	window.RegisterHook(events.Common.WindowClosing, func(e *application.WindowEvent) {
+		window.Hide()
+		e.Cancel()
+	})
+
 	if runtime.GOOS == "darwin" {
 		systemTray.SetTemplateIcon(icons.SystrayMacTemplate)
 	}

v3/examples/systray-menu/main.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	_ "embed"
+	"github.com/wailsapp/wails/v3/pkg/events"
 	"log"
 	"runtime"
 
@@ -29,10 +30,6 @@ func main() {
 		AlwaysOnTop:   true,
 		Hidden:        true,
 		DisableResize: true,
-		ShouldClose: func(window *application.WebviewWindow) bool {
-			window.Hide()
-			return false
-		},
 		Windows: application.WindowsWindow{
 			HiddenOnTaskbar: true,
 		},
@@ -43,6 +40,11 @@ func main() {
 		},
 	})
 
+	window.RegisterHook(events.Common.WindowClosing, func(e *application.WindowEvent) {
+		window.Hide()
+		e.Cancel()
+	})
+
 	if runtime.GOOS == "darwin" {
 		systemTray.SetTemplateIcon(icons.SystrayMacTemplate)
 	}

v3/examples/window/main.go

@@ -283,31 +283,29 @@ func main() {
 	myMenu.Add("New WebviewWindow (Hides on Close one time)").
 		SetAccelerator("CmdOrCtrl+H").
 		OnClick(func(ctx *application.Context) {
-			app.NewWebviewWindowWithOptions(application.WebviewWindowOptions{
+			w := app.NewWebviewWindow()
-				// This will be called when the user clicks the close button
+
-				// on the window. It will hide the window for 5 seconds.
+			w.RegisterHook(events.Common.WindowClosing, func(e *application.WindowEvent) {
-				// If the user clicks the close button again, the window will
+				if !lo.Contains(hiddenWindows, w) {
-				// close.
+					hiddenWindows = append(hiddenWindows, w)
-				ShouldClose: func(window *application.WebviewWindow) bool {
+					go func() {
-					if !lo.Contains(hiddenWindows, window) {
+						time.Sleep(5 * time.Second)
-						hiddenWindows = append(hiddenWindows, window)
+						w.Show()
-						go func() {
+					}()
-							time.Sleep(5 * time.Second)
+					w.Hide()
-							window.Show()
+					e.Cancel()
-						}()
+				}
-						window.Hide()
+				// Remove the window from the hiddenWindows list
-						return false
+				hiddenWindows = lo.Without(hiddenWindows, w)
-					}
+			})
-					// Remove the window from the hiddenWindows list
+
-					hiddenWindows = lo.Without(hiddenWindows, window)
+			w.SetTitle("WebviewWindow "+strconv.Itoa(windowCounter)).
-					return true
-				},
-			}).
-				SetTitle("WebviewWindow "+strconv.Itoa(windowCounter)).
 				SetRelativePosition(rand.Intn(1000), rand.Intn(800)).
 				SetURL("https://wails.io").
 				Show()
+
 			windowCounter++
+
 		})
 	myMenu.Add("New WebviewWindow (Frameless)").
 		SetAccelerator("CmdOrCtrl+F").

v3/internal/commands/appimage_testfiles/main.go

@@ -60,27 +60,21 @@ func main() {
 	myMenu.Add("New WebviewWindow (Hides on Close one time)").
 		SetAccelerator("CmdOrCtrl+H").
 		OnClick(func(ctx *application.Context) {
-			app.NewWebviewWindowWithOptions(application.WebviewWindowOptions{
+			w := app.NewWebviewWindow()
-				// This will be called when the user clicks the close button
+			w.RegisterHook(events.Common.WindowClosing, func(e *application.WindowEvent) {
-				// on the window. It will hide the window for 5 seconds.
+				if !lo.Contains(hiddenWindows, w) {
-				// If the user clicks the close button again, the window will
+					hiddenWindows = append(hiddenWindows, w)
-				// close.
+					go func() {
-				ShouldClose: func(window *application.WebviewWindow) bool {
+						time.Sleep(5 * time.Second)
-					if !lo.Contains(hiddenWindows, window) {
+						w.Show()
-						hiddenWindows = append(hiddenWindows, window)
+					}()
-						go func() {
+					w.Hide()
-							time.Sleep(5 * time.Second)
+					e.Cancel()
-							window.Show()
+				}
-						}()
+				// Remove the window from the hiddenWindows list
-						window.Hide()
+				hiddenWindows = lo.Without(hiddenWindows, w)
-						return false
+			})
-					}
+			w.SetTitle("WebviewWindow "+strconv.Itoa(windowCounter)).
-					// Remove the window from the hiddenWindows list
-					hiddenWindows = lo.Without(hiddenWindows, window)
-					return true
-				},
-			}).
-				SetTitle("WebviewWindow "+strconv.Itoa(windowCounter)).
 				SetRelativePosition(rand.Intn(1000), rand.Intn(800)).
 				SetURL("https://wails.io").
 				Show()

v3/internal/runtime/desktop/@wailsio/runtime/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@wailsio/runtime",
   "type": "module",
-  "version": "3.0.0-alpha.34",
+  "version": "3.0.0-alpha.35",
   "description": "Wails Runtime",
   "types": "types/index.d.ts",
   "exports": {

v3/internal/runtime/desktop/@wailsio/runtime/src/event_types.js

@@ -19,7 +19,7 @@ export const EventTypes = {
 		WindowRestore: "windows:WindowRestore",
 		WindowMinimise: "windows:WindowMinimise",
 		WindowUnMinimise: "windows:WindowUnMinimise",
-		WindowClose: "windows:WindowClose",
+		WindowClosing: "windows:WindowClosing",
 		WindowSetFocus: "windows:WindowSetFocus",
 		WindowKillFocus: "windows:WindowKillFocus",
 		WindowDragDrop: "windows:WindowDragDrop",

v3/internal/runtime/desktop/@wailsio/runtime/types/event_types.d.ts

@@ -19,7 +19,7 @@ export declare const EventTypes: {
 		WindowRestore: string,
 		WindowMinimise: string,
 		WindowUnMinimise: string,
-		WindowClose: string,
+		WindowClosing: string,
 		WindowSetFocus: string,
 		WindowKillFocus: string,
 		WindowDragDrop: string,

v3/pkg/application/webview_window.go

@@ -162,6 +162,9 @@ type WebviewWindow struct {
 	runtimeLoaded bool
 	// pendingJS holds JS that was sent to the window before the runtime was loaded
 	pendingJS []string
+
+	// unconditionallyClose marks the window to be unconditionally closed
+	unconditionallyClose bool
 }
 
 // EmitEvent emits an event from the window
@@ -250,15 +253,10 @@ func NewWindow(options WebviewWindowOptions) *WebviewWindow {
 
 	// Listen for window closing events and de
 	result.OnWindowEvent(events.Common.WindowClosing, func(event *WindowEvent) {
-		shouldClose := true
+		result.unconditionallyClose = true
-		if result.options.ShouldClose != nil {
+		result.markAsDestroyed()
-			shouldClose = result.options.ShouldClose(result)
+		InvokeSync(result.impl.close)
-		}
+		globalApplication.deleteWindowByID(result.id)
-		if shouldClose {
-			result.markAsDestroyed()
-			InvokeSync(result.impl.close)
-			globalApplication.deleteWindowByID(result.id)
-		}
 	})
 
 	// Process keybindings
@@ -395,6 +393,7 @@ func (w *WebviewWindow) Run() {
 		return
 	}
 	w.impl = newWindowImpl(w)
+
 	InvokeSync(w.impl.run)
 }
 
@@ -991,7 +990,12 @@ func (w *WebviewWindow) ZoomOut() {
 
 // Close closes the window
 func (w *WebviewWindow) Close() {
-	// NOOP?
+	if w.impl == nil && !w.isDestroyed() {
+		return
+	}
+	InvokeAsync(func() {
+		w.emit(events.Common.WindowClosing)
+	})
 }
 
 func (w *WebviewWindow) Zoom() {
@@ -1337,3 +1341,9 @@ func (w *WebviewWindow) delete() {
 		w.impl.delete()
 	}
 }
+
+func (w *WebviewWindow) redo() {
+	if w.impl == nil && !w.isDestroyed() {
+		w.impl.redo()
+	}
+}

v3/pkg/application/webview_window_darwin.go

@@ -956,6 +956,7 @@ func (w *macosWebviewWindow) windowZoom() {
 
 func (w *macosWebviewWindow) close() {
 	C.windowClose(w.nsWindow)
+	// TODO: Check if we need to unregister the window here or not
 }
 
 func (w *macosWebviewWindow) zoomIn() {

v3/pkg/application/webview_window_options.go

@@ -128,10 +128,6 @@ type WebviewWindowOptions struct {
 	MaximiseButtonState ButtonState
 	CloseButtonState    ButtonState
 
-	// ShouldClose is called when the window is about to close.
-	// Return true to allow the window to close, or false to prevent it from closing.
-	ShouldClose func(window *WebviewWindow) bool
-
 	// If true, the window's devtools will be available (default true in builds without the `production` build tag)
 	DevToolsEnabled bool
 

v3/pkg/application/webview_window_windows.go

@@ -577,9 +577,7 @@ func (w *windowsWebviewWindow) setZoom(zoom float64) {
 }
 
 func (w *windowsWebviewWindow) close() {
-	// Unregister the window with the application
+	// Send WM_CLOSE message to trigger the same flow as clicking the X button
-	windowsApp := globalApplication.impl.(*windowsApp)
-	windowsApp.unregisterWindow(w)
 	w32.SendMessage(w.hwnd, w32.WM_CLOSE, 0, 0)
 }
 
@@ -1033,8 +1031,22 @@ func (w *windowsWebviewWindow) WndProc(msg uint32, wparam, lparam uintptr) uintp
 			}
 		}
 	case w32.WM_CLOSE:
-		w.parent.emit(events.Windows.WindowClose)
+
-		return 0
+		if w.parent.unconditionallyClose == false {
+			// We were called by `Close()` or pressing the close button on the window
+			w.parent.emit(events.Windows.WindowClosing)
+			return 0
+		}
+
+		defer func() {
+			windowsApp := globalApplication.impl.(*windowsApp)
+			windowsApp.unregisterWindow(w)
+
+		}()
+
+		// Now do the actual close
+		return w32.DefWindowProc(w.hwnd, w32.WM_CLOSE, 0, 0)
+
 	case w32.WM_KILLFOCUS:
 		if w.focusingChromium {
 			return 0

v3/pkg/events/defaults.go

@@ -4,7 +4,7 @@ import "runtime"
 
 var defaultWindowEventMapping = map[string]map[WindowEventType]WindowEventType{
 	"windows": {
-		Windows.WindowClose:        Common.WindowClosing,
+		Windows.WindowClosing:      Common.WindowClosing,
 		Windows.WindowInactive:     Common.WindowLostFocus,
 		Windows.WindowClickActive:  Common.WindowFocus,
 		Windows.WindowActive:       Common.WindowFocus,

v3/pkg/events/events.go

@@ -374,7 +374,7 @@ type windowsEvents struct {
 	WindowRestore              WindowEventType
 	WindowMinimise             WindowEventType
 	WindowUnMinimise           WindowEventType
-	WindowClose                WindowEventType
+	WindowClosing              WindowEventType
 	WindowSetFocus             WindowEventType
 	WindowKillFocus            WindowEventType
 	WindowDragDrop             WindowEventType
@@ -421,7 +421,7 @@ func newWindowsEvents() windowsEvents {
 		WindowRestore:              1175,
 		WindowMinimise:             1176,
 		WindowUnMinimise:           1177,
-		WindowClose:                1178,
+		WindowClosing:              1178,
 		WindowSetFocus:             1179,
 		WindowKillFocus:            1180,
 		WindowDragDrop:             1181,
@@ -608,7 +608,7 @@ var eventToJS = map[uint]string{
 	1175: "windows:WindowRestore",
 	1176: "windows:WindowMinimise",
 	1177: "windows:WindowUnMinimise",
-	1178: "windows:WindowClose",
+	1178: "windows:WindowClosing",
 	1179: "windows:WindowSetFocus",
 	1180: "windows:WindowKillFocus",
 	1181: "windows:WindowDragDrop",

v3/pkg/events/events.txt

@@ -152,7 +152,7 @@ windows:WindowUnFullscreen
 windows:WindowRestore
 windows:WindowMinimise
 windows:WindowUnMinimise
-windows:WindowClose
+windows:WindowClosing
 windows:WindowSetFocus
 windows:WindowKillFocus
 windows:WindowDragDrop