gromer

gromer is a framework and cli to build multipage web apps in golang using htmx and alpinejs.

a70839b6 — pyros2097

remove more stuff

Files changed (8) hide show

app.go CHANGED Viewed

@@ -1,19 +1,9 @@
 package app
-import (
-	"strings"
-)
 var (
 	staticResourcesURL string
 )
-// KeepBodyClean prevents third-party Javascript libraries to add nodes to the
-// body element.
-func KeepBodyClean() (close func()) {
-	return keepBodyClean()
-}
 // Reload reloads the current page.
 func Reload() {
 	dispatch(func() {
@@ -29,26 +19,6 @@ func Run(r RenderFunc) {
 	run(r)
 }
-// StaticResource makes a static resource path point to the right
-// location whether the root directory is remote or not.
-//
-// Static resources are resources located in the web directory.
-//
-// This call is used internally to resolve paths within Cite, Data, Href, Src,
-// and SrcSet. Paths already resolved are skipped.
-func StaticResource(path string) string {
-	if !strings.HasPrefix(path, "/web/") &&
-		!strings.HasPrefix(path, "web/") {
-		return path
-	}
-	if !strings.HasPrefix(path, "/") {
-		path = "/" + path
-	}
-	return staticResourcesURL + path
-}
 // Window returns the JavaScript "window" object.
 func Window() BrowserWindow {
 	return window

app_nowasm.go CHANGED Viewed

@@ -15,10 +15,6 @@ func getenv(k string) string {
 	return os.Getenv(k)
 }
-func keepBodyClean() func() {
-	panic("wasm required")
-}
 func navigate(u *url.URL, updateHistory bool) error {
 	panic("wasm required")
 }

app_wasm.go CHANGED Viewed

@@ -90,11 +90,3 @@ func isFragmentNavigation(u *url.URL) bool {
 func reload() {
 	Window().Get("location").Call("reload")
 }
-func keepBodyClean() func() {
-	close := Window().Call("goappKeepBodyClean")
-	return func() {
-		close.Invoke()
-	}
-}

element.go CHANGED Viewed

@@ -10,8 +10,6 @@ import (
 type elem struct {
 	attrs       map[string]string
 	body        []UI
-	ctx         context.Context
-	ctxCancel   func()
 	events      map[string]eventHandler
 	jsvalue     Value
 	parentElem  UI
@@ -29,8 +27,7 @@ func (e *elem) JSValue() Value {
 }
 func (e *elem) Mounted() bool {
-	return e.ctx != nil && e.ctx.Err() == nil &&
-		e.self() != nil &&
+	return e.self() != nil &&
 		e.jsvalue != nil
 }
@@ -46,10 +43,6 @@ func (e *elem) setSelf(n UI) {
 	e.this = n
 }
-func (e *elem) context() context.Context {
-	return e.ctx
-}
 func (e *elem) attributes() map[string]string {
 	return e.attrs
 }
@@ -78,8 +71,6 @@ func (e *elem) mount() error {
 			Tag("kind", e.Kind())
 	}
-	e.ctx, e.ctxCancel = context.WithCancel(context.Background())
 	v := Window().Get("document").Call("createElement", e.tag)
 	if !v.Truthy() {
 		return errors.New("mounting ui element failed").
@@ -118,7 +109,6 @@ func (e *elem) dismount() {
 		e.delJsEventHandler(k, v)
 	}
-	e.ctxCancel()
 	e.jsvalue = nil
 }

html.go CHANGED Viewed

@@ -80,7 +80,7 @@ func mergeAttributes(parent *elem, uis ...UI) {
 					parent.setAttr("class", c.classes)
 				}
 			case OnClickAttribute:
-				parent.setEventHandler("click", func(ctx Context, e Event) {
+				parent.setEventHandler("click", func(e Event) {
 					c.cb()
 				})
 			}

node.go CHANGED Viewed

@@ -1,7 +1,6 @@
 package app
 import (
-	"context"
 	"fmt"
 	"io"
 	"reflect"
@@ -24,7 +23,6 @@ type UI interface {
 	name() string
 	self() UI
 	setSelf(UI)
-	context() context.Context
 	attributes() map[string]string
 	eventHandlers() map[string]eventHandler
 	parent() UI
@@ -127,7 +125,7 @@ func FilterUIElems(uis ...UI) []UI {
 // EventHandler represents a function that can handle HTML events. They are
 // always called on the UI goroutine.
-type EventHandler func(ctx Context, e Event)
+type EventHandler func(e Event)
 type eventHandler struct {
 	event   string
@@ -146,19 +144,11 @@ func makeJsEventHandler(src UI, h EventHandler) Func {
 			if !src.Mounted() {
 				return
 			}
-			ctx := Context{
-				Context: src.context(),
-				Src:     src,
-				JSSrc:   src.JSValue(),
-			}
-			event := Event{
+			e := Event{
 				Value: args[0],
 			}
-			trackMousePosition(event)
+			trackMousePosition(e)
-			h(ctx, event)
+			h(e)
 		})
 		return nil

node_test.go CHANGED Viewed

@@ -118,7 +118,6 @@ func testMounted(t *testing.T, n UI) {
 	switch n.Kind() {
 	case HTML, Component:
-		require.NoError(t, n.context().Err())
 		require.NotNil(t, n.self())
 	}
@@ -134,7 +133,6 @@ func testDismounted(t *testing.T, n UI) {
 	switch n.Kind() {
 	case HTML, Component:
-		require.Error(t, n.context().Err())
 		require.Nil(t, n.self())
 	}

utils.go CHANGED Viewed

@@ -1,7 +1,6 @@
 package app
 import (
-	"context"
 	"io"
 	"unsafe"
 )
@@ -11,14 +10,7 @@ var (
 	uiChan              = make(chan func(), 512)
 )
-// Context represents a context that is tied to a UI element. It is canceled
-// when the element is dismounted.
-//
-// It implements the context.Context interface.
-//  https://golang.org/pkg/context/#Context
 type Context struct {
-	context.Context
 	// The UI element tied to the context.
 	Src UI