Merge pull request #9 from mattpodraza/feat/eval-and-on-doc-create-scripts

Author: mattpodraza

examples/advanced/main.go

@@ -15,11 +15,12 @@ func main() {
 		webview2.WithDevtools(false),
 		webview2.WithURL("https://golang.org"),
 	)
-
 	if err != nil {
 		log.Fatalf("Failed to create webview2: %v", err)
 	}
 
+	wv.Browser().ExecuteScript("alert('Hello from webview!');")
+
 	if err := wv.Run(); err != nil {
 		log.Fatalf("Failed while running webview: %v", err)
 	}

pkg/webview2/browser.go

@@ -36,6 +36,10 @@ type browser struct {
 	controllerCompleted int32
 }
 
+func (wv *WebView) Browser() *browser {
+	return wv.browser
+}
+
 func (b *browser) embed(wv *WebView) error {
 	b.hwnd = wv.window.handle
 
@@ -125,7 +129,7 @@ func (b *browser) resize() error {
 	return nil
 }
 
-func (b *browser) navigate(url string) error {
+func (b *browser) Navigate(url string) error {
 	_, _, err := syscall.Syscall(
 		b.view.VTBL.Navigate, 3,
 		uintptr(unsafe.Pointer(b.view)),
@@ -140,6 +144,36 @@ func (b *browser) navigate(url string) error {
 	return nil
 }
 
+func (b *browser) AddScriptToExecuteOnDocumentCreated(script string) error {
+	_, _, err := syscall.Syscall(
+		b.view.VTBL.AddScriptToExecuteOnDocumentCreated, 3,
+		uintptr(unsafe.Pointer(b.view)),
+		uintptr(unsafe.Pointer(windows.StringToUTF16Ptr(script))),
+		0,
+	)
+
+	if !errors.Is(err, errOK) {
+		return err
+	}
+
+	return nil
+}
+
+func (b *browser) ExecuteScript(script string) error {
+	_, _, err := syscall.Syscall(
+		b.view.VTBL.ExecuteScript, 3,
+		uintptr(unsafe.Pointer(b.view)),
+		uintptr(unsafe.Pointer(windows.StringToUTF16Ptr(script))),
+		0,
+	)
+
+	if !errors.Is(err, errOK) {
+		return err
+	}
+
+	return nil
+}
+
 func (b *browser) saveSetting(setter uintptr, enabled bool) error {
 	var flag uintptr = 0
 

pkg/webview2/webview.go

@@ -82,7 +82,7 @@ func New(options ...Option) (*WebView, error) {
 		return nil, fmt.Errorf("failed to initialize the window: %w", err)
 	}
 
-	if err := wv.browser.navigate(wv.browser.config.initialURL); err != nil {
+	if err := wv.browser.Navigate(wv.browser.config.initialURL); err != nil {
 		return nil, fmt.Errorf("failed at the initial navigation: %w", err)
 	}
 
@@ -146,23 +146,23 @@ func (wv *WebView) createWindow() error {
 }
 
 func (wv *WebView) initializeWindow() error {
-	if err := wv.window.setTitle(wv.window.config.title); err != nil {
+	if err := wv.window.SetTitle(wv.window.config.title); err != nil {
 		return fmt.Errorf("failed to set the window title: %w", err)
 	}
 
-	if err := wv.window.setSize(wv.window.config.width, wv.window.config.height); err != nil {
+	if err := wv.window.SetSize(wv.window.config.width, wv.window.config.height); err != nil {
 		return fmt.Errorf("failed to set the window size: %w", err)
 	}
 
-	if err := wv.window.center(); err != nil {
+	if err := wv.window.Center(); err != nil {
 		return fmt.Errorf("failed to center the window: %w", err)
 	}
 
-	if err := wv.window.show(); err != nil {
+	if err := wv.window.Show(); err != nil {
 		return fmt.Errorf("failed to show the window: %w", err)
 	}
 
-	if err := wv.window.focus(); err != nil {
+	if err := wv.window.Focus(); err != nil {
 		return fmt.Errorf("failed to set focus: %w", err)
 	}
 

pkg/webview2/window.go

@@ -19,19 +19,23 @@ type window struct {
 	handle windows.Handle
 }
 
-func (w *window) focus() error {
+func (wv *WebView) Window() *window {
+	return wv.window
+}
+
+func (w *window) Focus() error {
 	return user32.SetFocus(w.handle)
 }
 
-func (w *window) show() error {
+func (w *window) Show() error {
 	return user32.ShowWindow(w.handle, user32.SW_SHOW)
 }
 
-func (w *window) setTitle(title string) error {
+func (w *window) SetTitle(title string) error {
 	return user32.SetWindowTextW(w.handle, title)
 }
 
-func (w *window) center() error {
+func (w *window) Center() error {
 	sx, err := user32.GetSystemMetrics(user32.SystemMetricsCxScreen)
 	if err != nil {
 		return fmt.Errorf("failed to get the horizontal screen size: %w", err)
@@ -72,7 +76,7 @@ func (w *window) center() error {
 	return nil
 }
 
-func (w *window) setSize(width, height int32) error {
+func (w *window) SetSize(width, height int32) error {
 	rect := user32.Rect{
 		Left:   0,
 		Top:    0,