Compare commits
12 Commits
4191302cb8
...
v0.23.0
| Author | SHA1 | Date | |
|---|---|---|---|
| 15fda48844 | |||
| ae32da77df | |||
| 297808d4cc | |||
| c2794fa0f9 | |||
| 7edd5ed1e6 | |||
| 934805e707 | |||
| cbc5022e0d | |||
| 74b32800f9 | |||
| cb13839157 | |||
| f833498b65 | |||
| 6064ddd856 | |||
| dc56261b58 |
@@ -8,7 +8,7 @@ Create a PR on Gitea, wait for CI, and squash-merge it. Push code to both remote
|
||||
5. Create a Gitea PR: `tea pr create --head <branch> --base main`. Reference related issues with `#X`. Only use `Closes #X` if the PR fully resolves the issue.
|
||||
6. Wait for CI to pass: poll Gitea CI status. If CI fails, report the failure and stop — do not merge.
|
||||
7. Once CI passes, squash-merge on Gitea: `tea pr merge <index> --style squash` with a clean, semantic commit message including the PR number. No Claude attribution lines.
|
||||
8. Update local main and push to both remotes: `git checkout main && git pull gitea main && git push origin main`.
|
||||
8. Update local main and push to both remotes. If in a worktree, `main` is checked out in the primary tree, so run from there: `cd <primary-worktree> && git pull gitea main && git push origin main` (the primary worktree path is the repo root without `.claude/worktrees/…`). If not in a worktree: `git checkout main && git pull gitea main && git push origin main`.
|
||||
9. Clean up remote branches: `git push gitea --delete <branch> && git push origin --delete <branch>`.
|
||||
10. Prune refs: `git remote prune gitea && git remote prune origin`.
|
||||
11. Report the merged PR URL.
|
||||
|
||||
18
.gitignore
vendored
18
.gitignore
vendored
@@ -37,21 +37,15 @@ go.work.sum
|
||||
# Air artifacts
|
||||
*tmp/
|
||||
|
||||
# binaries
|
||||
internal/examples/chatroom/chatroom
|
||||
internal/examples/counter/counter
|
||||
internal/examples/countercomp/countercomp
|
||||
internal/examples/greeter/greeter
|
||||
internal/examples/livereload/livereload
|
||||
internal/examples/picocss/picocss
|
||||
internal/examples/plugins/plugins
|
||||
internal/examples/realtimechart/realtimechart
|
||||
internal/examples/shakespeare/shakespeare
|
||||
internal/examples/nats-chatroom/nats-chatroom
|
||||
/nats-chatroom
|
||||
# Example binaries and data files
|
||||
internal/examples/*/[a-z]*[!.go]
|
||||
internal/examples/shakespeare/shake.db
|
||||
|
||||
# NATS data directory
|
||||
data/
|
||||
|
||||
# Standalone experiments
|
||||
nats-chatroom
|
||||
|
||||
# Claude Code worktrees
|
||||
.claude/worktrees/
|
||||
|
||||
@@ -74,14 +74,13 @@ func main() {
|
||||
- **Plugin system** — `func(v *V)` hooks for integrating CSS/JS libraries
|
||||
- **Structured logging** — zerolog with configurable levels; console output in dev, JSON in production
|
||||
- **Graceful shutdown** — listens for SIGINT/SIGTERM, drains contexts, closes pub/sub
|
||||
- **Context lifecycle** — background reaper cleans up disconnected contexts; configurable TTL
|
||||
- **HTML DSL** — the `h` package provides type-safe Go-native HTML composition
|
||||
|
||||
## Examples
|
||||
|
||||
The `internal/examples/` directory contains 14 runnable examples:
|
||||
The `internal/examples/` directory contains 19 runnable examples:
|
||||
|
||||
`chatroom` · `counter` · `countercomp` · `greeter` · `keyboard` · `livereload` · `nats-chatroom` · `pathparams` · `picocss` · `plugins` · `pubsub-crud` · `realtimechart` · `session` · `shakespeare`
|
||||
`chatroom` · `counter` · `countercomp` · `effectspike` · `greeter` · `keyboard` · `livereload` · `maplibre` · `middleware` · `nats-chatroom` · `pathparams` · `picocss` · `plugins` · `pubsub-crud` · `realtimechart` · `session` · `shakespeare` · `signup` · `spa`
|
||||
|
||||
## Experimental
|
||||
|
||||
|
||||
10
ci-check.sh
10
ci-check.sh
@@ -6,9 +6,13 @@ set -o pipefail
|
||||
ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||
cd "$ROOT"
|
||||
|
||||
echo "== CI: Format code =="
|
||||
go fmt ./...
|
||||
echo "OK: formatting complete"
|
||||
echo "== CI: Check formatting =="
|
||||
if [ -n "$(gofmt -l .)" ]; then
|
||||
echo "ERROR: files not formatted:"
|
||||
gofmt -l .
|
||||
exit 1
|
||||
fi
|
||||
echo "OK: all files formatted"
|
||||
|
||||
echo "== CI: Run go vet =="
|
||||
if ! go vet ./...; then
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
package via
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"strconv"
|
||||
"strings"
|
||||
|
||||
@@ -51,5 +50,5 @@ func (s *computedSignal) recompute() {
|
||||
}
|
||||
|
||||
func (s *computedSignal) patchValue() string {
|
||||
return fmt.Sprintf("%v", s.lastVal)
|
||||
return s.lastVal
|
||||
}
|
||||
|
||||
@@ -94,7 +94,7 @@ Available triggers:
|
||||
|--------|-------|-------|
|
||||
| `OnClick()` | `click` | |
|
||||
| `OnDblClick()` | `dblclick` | |
|
||||
| `OnChange()` | `change` | 200ms debounce |
|
||||
| `OnChange()` | `change` | |
|
||||
| `OnInput()` | `input` | No debounce |
|
||||
| `OnSubmit()` | `submit` | |
|
||||
| `OnKeyDown(key)` | `keydown` | Filtered by key name (e.g. `"Enter"`, `"Escape"`) |
|
||||
|
||||
2
h/h.go
2
h/h.go
@@ -5,7 +5,7 @@
|
||||
//
|
||||
// h.Div(
|
||||
// h.H1(h.Text("Hello, Via")),
|
||||
// h.P(h.Text("Pure Go. No tmplates.")),
|
||||
// h.P(h.Text("Pure Go. No templates.")),
|
||||
// )
|
||||
package h
|
||||
|
||||
|
||||
@@ -2,7 +2,6 @@ package main
|
||||
|
||||
import (
|
||||
"github.com/ryanhamamura/via"
|
||||
// "github.com/go-via/via-plugin-picocss/picocss"
|
||||
"github.com/ryanhamamura/via/h"
|
||||
)
|
||||
|
||||
@@ -15,9 +14,6 @@ func main() {
|
||||
DocumentTitle: "Live Reload Demo",
|
||||
DevMode: true,
|
||||
LogLevel: via.LogLevelDebug,
|
||||
Plugins: []via.Plugin{
|
||||
// picocss.Default
|
||||
},
|
||||
})
|
||||
|
||||
v.Page("/", func(c *via.Context) {
|
||||
|
||||
@@ -1,7 +1,11 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"math"
|
||||
"math/rand"
|
||||
"strconv"
|
||||
"sync"
|
||||
"time"
|
||||
|
||||
"github.com/ryanhamamura/via"
|
||||
@@ -9,6 +13,68 @@ import (
|
||||
"github.com/ryanhamamura/via/maplibre"
|
||||
)
|
||||
|
||||
type posMsg struct {
|
||||
Lng float64 `json:"lng"`
|
||||
Lat float64 `json:"lat"`
|
||||
}
|
||||
|
||||
var (
|
||||
vehicleOnce sync.Once
|
||||
vehicle struct {
|
||||
mu sync.RWMutex
|
||||
lng, lat float64
|
||||
}
|
||||
)
|
||||
|
||||
// shipState tracks a ship lerping along a loop of waypoints.
|
||||
type shipState struct {
|
||||
lng, lat float64
|
||||
waypoints [][2]float64 // [lng, lat] pairs
|
||||
wpIdx int // index of next target waypoint
|
||||
progress float64 // 0..1 toward next waypoint
|
||||
speed float64 // progress increment per tick
|
||||
}
|
||||
|
||||
func (s *shipState) tick() {
|
||||
s.progress += s.speed
|
||||
for s.progress >= 1 {
|
||||
s.progress -= 1
|
||||
s.wpIdx = (s.wpIdx + 1) % len(s.waypoints)
|
||||
}
|
||||
from := s.waypoints[(s.wpIdx-1+len(s.waypoints))%len(s.waypoints)]
|
||||
to := s.waypoints[s.wpIdx]
|
||||
s.lng = from[0] + (to[0]-from[0])*s.progress
|
||||
s.lat = from[1] + (to[1]-from[1])*s.progress
|
||||
}
|
||||
|
||||
// heading returns clockwise degrees from north (for SVG rotation).
|
||||
func (s *shipState) heading() float64 {
|
||||
from := s.waypoints[(s.wpIdx-1+len(s.waypoints))%len(s.waypoints)]
|
||||
to := s.waypoints[s.wpIdx]
|
||||
dx := to[0] - from[0]
|
||||
dy := to[1] - from[1]
|
||||
// atan2 gives angle from +X axis; convert to CW from north
|
||||
return math.Mod(math.Atan2(dx, dy)*180/math.Pi+360, 360)
|
||||
}
|
||||
|
||||
var (
|
||||
fleetOnce sync.Once
|
||||
fleet struct {
|
||||
mu sync.RWMutex
|
||||
ships [3]shipState
|
||||
}
|
||||
)
|
||||
|
||||
const shipSVG = `<svg width="48" height="28" viewBox="0 0 80 44" xmlns="http://www.w3.org/2000/svg">` +
|
||||
`<path d="M2 30 L10 42 L70 42 L78 30 Z" fill="#1b3a5c"/>` +
|
||||
`<rect x="12" y="24" width="56" height="6" rx="1" fill="#2c5f8a"/>` +
|
||||
`<rect x="18" y="14" width="46" height="10" rx="1" fill="#2c5f8a" stroke="#1b3a5c" stroke-width="0.5"/>` +
|
||||
`<rect x="8" y="12" width="9" height="12" rx="1" fill="#d5dfe8" stroke="#2c5f8a" stroke-width="0.5"/>` +
|
||||
`<rect x="9.5" y="13" width="6" height="4" rx="0.5" fill="#85c1e9"/>` +
|
||||
`<rect x="10" y="4" width="5" height="8" rx="0.5" fill="#1b3a5c"/>` +
|
||||
`<rect x="9.5" y="2" width="6" height="3" rx="0.5" fill="#c0392b"/>` +
|
||||
`</svg>`
|
||||
|
||||
func main() {
|
||||
v := via.New()
|
||||
v.Config(via.Options{
|
||||
@@ -18,6 +84,65 @@ func main() {
|
||||
Plugins: []via.Plugin{maplibre.Plugin},
|
||||
})
|
||||
|
||||
// Single goroutine moves the vehicle — all clients read the same position.
|
||||
vehicle.lng = -122.43
|
||||
vehicle.lat = 37.77
|
||||
vehicleOnce.Do(func() {
|
||||
go func() {
|
||||
for {
|
||||
time.Sleep(time.Second)
|
||||
vehicle.mu.Lock()
|
||||
vehicle.lng = -122.43 + (rand.Float64()-0.5)*0.02
|
||||
vehicle.lat = 37.77 + (rand.Float64()-0.5)*0.02
|
||||
vehicle.mu.Unlock()
|
||||
}
|
||||
}()
|
||||
})
|
||||
|
||||
// Fleet of ships following waypoint loops through SF Bay.
|
||||
fleetOnce.Do(func() {
|
||||
fleet.ships = [3]shipState{
|
||||
{ // Golden Gate → Alcatraz → Pier 39 → back out
|
||||
waypoints: [][2]float64{
|
||||
{-122.478, 37.819}, {-122.423, 37.827},
|
||||
{-122.410, 37.809}, {-122.423, 37.827},
|
||||
},
|
||||
speed: 0.03,
|
||||
},
|
||||
{ // Oakland → Treasure Island → Angel Island → loop
|
||||
waypoints: [][2]float64{
|
||||
{-122.330, 37.795}, {-122.370, 37.823},
|
||||
{-122.432, 37.860}, {-122.370, 37.823},
|
||||
},
|
||||
speed: 0.02,
|
||||
},
|
||||
{ // Sausalito → Pier 39 ferry route
|
||||
waypoints: [][2]float64{
|
||||
{-122.480, 37.859}, {-122.435, 37.840},
|
||||
{-122.410, 37.809}, {-122.435, 37.840},
|
||||
},
|
||||
speed: 0.025,
|
||||
},
|
||||
}
|
||||
// Set initial positions.
|
||||
for i := range fleet.ships {
|
||||
s := &fleet.ships[i]
|
||||
s.lng = s.waypoints[0][0]
|
||||
s.lat = s.waypoints[0][1]
|
||||
s.wpIdx = 1
|
||||
}
|
||||
go func() {
|
||||
for {
|
||||
time.Sleep(time.Second)
|
||||
fleet.mu.Lock()
|
||||
for i := range fleet.ships {
|
||||
fleet.ships[i].tick()
|
||||
}
|
||||
fleet.mu.Unlock()
|
||||
}
|
||||
}()
|
||||
})
|
||||
|
||||
v.Page("/", func(c *via.Context) {
|
||||
m := maplibre.New(c, maplibre.Options{
|
||||
Style: "https://demotiles.maplibre.org/style.json",
|
||||
@@ -45,23 +170,84 @@ func main() {
|
||||
},
|
||||
})
|
||||
|
||||
// Signal-backed marker — server pushes position updates
|
||||
// Animated container ships following waypoint routes
|
||||
shipNames := [3]string{"MSC Adriatica", "Evergreen Harmony", "Maersk Aurora"}
|
||||
type shipSignals struct{ lng, lat, rot *via.Signal }
|
||||
var ships [3]shipSignals
|
||||
|
||||
fleet.mu.RLock()
|
||||
for i, s := range fleet.ships {
|
||||
ships[i].lng = c.Signal(s.lng)
|
||||
ships[i].lat = c.Signal(s.lat)
|
||||
// SVG bow points right (east), so subtract 90° from the north-based heading.
|
||||
ships[i].rot = c.Signal(s.heading() - 90)
|
||||
m.AddMarker(fmt.Sprintf("ship-%d", i), maplibre.Marker{
|
||||
LngSignal: ships[i].lng,
|
||||
LatSignal: ships[i].lat,
|
||||
RotationSignal: ships[i].rot,
|
||||
Element: shipSVG,
|
||||
Anchor: "center",
|
||||
Popup: &maplibre.Popup{
|
||||
Content: fmt.Sprintf("<strong>%s</strong>", shipNames[i]),
|
||||
},
|
||||
})
|
||||
}
|
||||
fleet.mu.RUnlock()
|
||||
|
||||
// Custom SVG vehicle marker — reads shared Go state
|
||||
vehicleLng := c.Signal(-122.43)
|
||||
vehicleLat := c.Signal(37.77)
|
||||
|
||||
m.AddMarker("vehicle", maplibre.Marker{
|
||||
LngSignal: vehicleLng,
|
||||
LatSignal: vehicleLat,
|
||||
Color: "#9b59b6",
|
||||
Element: `<svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">` +
|
||||
`<circle cx="10" cy="10" r="9" fill="#9b59b6" stroke="#fff" stroke-width="2"/>` +
|
||||
`</svg>`,
|
||||
Anchor: "center",
|
||||
})
|
||||
|
||||
c.OnInterval(time.Second, func() {
|
||||
vehicleLng.SetValue(-122.43 + (rand.Float64()-0.5)*0.02)
|
||||
vehicleLat.SetValue(37.77 + (rand.Float64()-0.5)*0.02)
|
||||
vehicle.mu.RLock()
|
||||
lng, lat := vehicle.lng, vehicle.lat
|
||||
vehicle.mu.RUnlock()
|
||||
vehicleLng.SetValue(lng)
|
||||
vehicleLat.SetValue(lat)
|
||||
|
||||
fleet.mu.RLock()
|
||||
for i, s := range fleet.ships {
|
||||
ships[i].lng.SetValue(s.lng)
|
||||
ships[i].lat.SetValue(s.lat)
|
||||
ships[i].rot.SetValue(s.heading() - 90)
|
||||
}
|
||||
fleet.mu.RUnlock()
|
||||
|
||||
c.SyncSignals()
|
||||
})
|
||||
|
||||
// Draggable marker — user drags, signals update
|
||||
// Yellow click marker — synced across clients via PubSub
|
||||
clickLng := c.Signal(-122.4194)
|
||||
clickLat := c.Signal(37.7749)
|
||||
|
||||
m.AddMarker("clicked", maplibre.Marker{
|
||||
LngSignal: clickLng,
|
||||
LatSignal: clickLat,
|
||||
Color: "#f39c12",
|
||||
})
|
||||
|
||||
via.Subscribe(c, "map.click", func(msg posMsg) {
|
||||
clickLng.SetValue(msg.Lng)
|
||||
clickLat.SetValue(msg.Lat)
|
||||
c.SyncSignals()
|
||||
})
|
||||
|
||||
click := m.OnClick()
|
||||
handleClick := c.Action(func() {
|
||||
e := click.Data()
|
||||
via.Publish(c, "map.click", posMsg{Lng: e.LngLat.Lng, Lat: e.LngLat.Lat})
|
||||
})
|
||||
|
||||
// Blue draggable pin — synced across clients via PubSub
|
||||
pinLng := c.Signal(-122.41)
|
||||
pinLat := c.Signal(37.78)
|
||||
|
||||
@@ -72,14 +258,16 @@ func main() {
|
||||
Draggable: true,
|
||||
})
|
||||
|
||||
// Click event — click to place a marker
|
||||
click := m.OnClick()
|
||||
handleClick := c.Action(func() {
|
||||
e := click.Data()
|
||||
m.AddMarker("clicked", maplibre.Marker{
|
||||
LngLat: e.LngLat,
|
||||
Color: "#f39c12",
|
||||
via.Subscribe(c, "map.pin", func(msg posMsg) {
|
||||
pinLng.SetValue(msg.Lng)
|
||||
pinLat.SetValue(msg.Lat)
|
||||
c.SyncSignals()
|
||||
})
|
||||
|
||||
handlePinDrag := c.Action(func() {
|
||||
lng, _ := strconv.ParseFloat(pinLng.String(), 64)
|
||||
lat, _ := strconv.ParseFloat(pinLat.String(), 64)
|
||||
via.Publish(c, "map.pin", posMsg{Lng: lng, Lat: lat})
|
||||
})
|
||||
|
||||
// GeoJSON polygon source + fill layer
|
||||
@@ -111,7 +299,7 @@ func main() {
|
||||
},
|
||||
})
|
||||
|
||||
// FlyTo actions using CameraOptions
|
||||
// FlyTo actions
|
||||
zoom14 := 14.0
|
||||
flyToSF := c.Action(func() {
|
||||
m.FlyTo(maplibre.CameraOptions{
|
||||
@@ -134,6 +322,7 @@ func main() {
|
||||
h.H1(h.Text("MapLibre GL Example")),
|
||||
m.Element(
|
||||
click.Input(handleClick.OnInput()),
|
||||
h.Input(h.Type("hidden"), pinLng.Bind(), handlePinDrag.OnInput()),
|
||||
),
|
||||
h.Div(h.Attr("style", "margin-top:1rem;display:flex;gap:0.5rem;flex-wrap:wrap"),
|
||||
h.Button(h.Text("Fly to San Francisco"), flyToSF.OnClick()),
|
||||
@@ -142,6 +331,7 @@ func main() {
|
||||
h.Div(h.Attr("style", "margin-top:0.5rem;font-size:0.9rem"),
|
||||
h.P(h.Text("Zoom: "), m.Zoom.Text()),
|
||||
h.P(h.Text("Center: "), m.CenterLng.Text(), h.Text(", "), m.CenterLat.Text()),
|
||||
h.P(h.Text("Click: "), clickLng.Text(), h.Text(", "), clickLat.Text()),
|
||||
h.P(h.Text("Vehicle: "), vehicleLng.Text(), h.Text(", "), vehicleLat.Text()),
|
||||
h.P(h.Text("Draggable Pin: "), pinLng.Text(), h.Text(", "), pinLat.Text()),
|
||||
),
|
||||
|
||||
@@ -4,17 +4,12 @@ import (
|
||||
"strconv"
|
||||
|
||||
"github.com/ryanhamamura/via"
|
||||
// "github.com/go-via/via-plugin-picocss/picocss"
|
||||
. "github.com/ryanhamamura/via/h"
|
||||
)
|
||||
|
||||
func main() {
|
||||
v := via.New()
|
||||
|
||||
v.Config(via.Options{
|
||||
// Plugins: []via.Plugin{picocss.Default},
|
||||
})
|
||||
|
||||
v.Page("/counters/{counter_id}/{start_at_step}", func(c *via.Context) {
|
||||
|
||||
counterID := c.GetPathParam("counter_id")
|
||||
|
||||
Binary file not shown.
@@ -2,7 +2,6 @@ package main
|
||||
|
||||
import (
|
||||
"github.com/ryanhamamura/via"
|
||||
// "github.com/go-via/via-plugin-picocss/picocss"
|
||||
"github.com/ryanhamamura/via/h"
|
||||
)
|
||||
|
||||
@@ -13,11 +12,6 @@ func main() {
|
||||
|
||||
v.Config(via.Options{
|
||||
DocumentTitle: "Via Counter",
|
||||
// Plugin is placed here. Use picocss.WithOptions(pococss.Options) to add the plugin
|
||||
// with a different color theme or to enable a classes for a wide range of colors.
|
||||
// Plugins: []via.Plugin{
|
||||
// picocss.Default,
|
||||
// },
|
||||
})
|
||||
|
||||
v.Page("/", func(c *via.Context) {
|
||||
|
||||
@@ -6,7 +6,6 @@ import (
|
||||
"time"
|
||||
|
||||
"github.com/ryanhamamura/via"
|
||||
// "github.com/go-via/via-plugin-picocss/picocss"
|
||||
"github.com/ryanhamamura/via/h"
|
||||
)
|
||||
|
||||
@@ -16,9 +15,6 @@ func main() {
|
||||
v.Config(via.Options{
|
||||
LogLevel: via.LogLevelDebug,
|
||||
DevMode: true,
|
||||
Plugins: []via.Plugin{
|
||||
// picocss.Default,
|
||||
},
|
||||
})
|
||||
|
||||
v.AppendToHead(
|
||||
|
||||
@@ -6,9 +6,9 @@ import (
|
||||
"log"
|
||||
"time"
|
||||
|
||||
_ "github.com/mattn/go-sqlite3"
|
||||
"github.com/ryanhamamura/via"
|
||||
"github.com/ryanhamamura/via/h"
|
||||
_ "github.com/mattn/go-sqlite3"
|
||||
)
|
||||
|
||||
type DataSource interface {
|
||||
@@ -22,6 +22,9 @@ type ShakeDB struct {
|
||||
findByTextStmt *sql.Stmt
|
||||
}
|
||||
|
||||
// Prepare opens shake.db, a ~22 MB SQLite database of Shakespeare's works.
|
||||
// Download from https://github.com/nicholasgasior/gopher-fizzbuzz/raw/master/shake.db
|
||||
// and place it in this directory before running.
|
||||
func (shakeDB *ShakeDB) Prepare() {
|
||||
db, err := sql.Open("sqlite3", "shake.db")
|
||||
if err != nil {
|
||||
|
||||
Binary file not shown.
@@ -179,10 +179,33 @@ func initScript(m *Map) string {
|
||||
// markerBodyJS generates JS to add a marker, assuming `map` is in scope.
|
||||
func markerBodyJS(mapID, markerID string, mk Marker) string {
|
||||
var b strings.Builder
|
||||
|
||||
// Use a wrapper div for custom elements so MapLibre rotates the div
|
||||
// while we can independently flip the inner element to prevent inversion.
|
||||
if mk.Element != "" {
|
||||
b.WriteString(fmt.Sprintf(
|
||||
`var _mkEl=document.createElement('div');`+
|
||||
`_mkEl.style.display='inline-block';_mkEl.style.lineHeight='0';`+
|
||||
`_mkEl.innerHTML=%s;`,
|
||||
jsonStr(mk.Element)))
|
||||
}
|
||||
|
||||
opts := "{"
|
||||
if mk.Color != "" {
|
||||
if mk.Element != "" {
|
||||
opts += `element:_mkEl,`
|
||||
} else if mk.Color != "" {
|
||||
opts += fmt.Sprintf(`color:%s,`, jsonStr(mk.Color))
|
||||
}
|
||||
if mk.Anchor != "" {
|
||||
opts += fmt.Sprintf(`anchor:%s,`, jsonStr(mk.Anchor))
|
||||
}
|
||||
// When both Element and RotationSignal are set, skip initial rotation
|
||||
// in opts — we apply it post-creation with flip normalization.
|
||||
if mk.RotationSignal != nil && mk.Element == "" {
|
||||
opts += fmt.Sprintf(`rotation:%s,`, mk.RotationSignal.String())
|
||||
} else if mk.RotationSignal == nil && mk.Rotation != 0 {
|
||||
opts += fmt.Sprintf(`rotation:%s,`, formatFloat(mk.Rotation))
|
||||
}
|
||||
if mk.Draggable {
|
||||
opts += `draggable:true,`
|
||||
}
|
||||
@@ -197,6 +220,15 @@ func markerBodyJS(mapID, markerID string, mk Marker) string {
|
||||
opts, formatFloat(mk.LngLat.Lng), formatFloat(mk.LngLat.Lat)))
|
||||
}
|
||||
|
||||
// Apply initial rotation with flip normalization for custom elements.
|
||||
if mk.RotationSignal != nil && mk.Element != "" {
|
||||
b.WriteString(fmt.Sprintf(
|
||||
`var _r=%s,_f=_r>90||_r<-90;if(_f)_r=_r>0?_r-180:_r+180;`+
|
||||
`mk.setRotation(_r);`+
|
||||
`var _ch=_mkEl.firstElementChild;if(_ch&&_f)_ch.style.transform='scaleX(-1)';`,
|
||||
mk.RotationSignal.String()))
|
||||
}
|
||||
|
||||
if mk.Popup != nil {
|
||||
b.WriteString(popupConstructorJS(*mk.Popup, "pk"))
|
||||
b.WriteString(`mk.setPopup(pk);`)
|
||||
@@ -235,14 +267,31 @@ func dragendHandlerJS(mapID, markerID string, mk Marker) string {
|
||||
func markerEffectExpr(mapID, markerID string, mk Marker) string {
|
||||
// Read signals before the guard so Datastar tracks them as dependencies
|
||||
// even when the map/marker hasn't loaded yet on first evaluation.
|
||||
return fmt.Sprintf(
|
||||
`var lng=$%s,lat=$%s;`+
|
||||
var b strings.Builder
|
||||
b.WriteString(fmt.Sprintf(`var lng=$%s,lat=$%s;`, mk.LngSignal.ID(), mk.LatSignal.ID()))
|
||||
if mk.RotationSignal != nil {
|
||||
b.WriteString(fmt.Sprintf(`var rot=$%s;`, mk.RotationSignal.ID()))
|
||||
}
|
||||
b.WriteString(fmt.Sprintf(
|
||||
`var m=window.__via_maps&&window.__via_maps[%s];`+
|
||||
`if(m&&m._via_markers[%s]){`+
|
||||
`m._via_markers[%s].setLngLat([lng,lat])}`,
|
||||
mk.LngSignal.ID(), mk.LatSignal.ID(),
|
||||
jsonStr(mapID), jsonStr(markerID), jsonStr(markerID),
|
||||
)
|
||||
`if(m&&m._via_markers[%[2]s]){`+
|
||||
`m._via_markers[%[2]s].setLngLat([lng,lat])`,
|
||||
jsonStr(mapID), jsonStr(markerID)))
|
||||
if mk.RotationSignal != nil && mk.Element != "" {
|
||||
// Normalize rotation to [-90,90] and horizontally flip the inner
|
||||
// element when |rotation| > 90° to prevent upside-down markers.
|
||||
b.WriteString(fmt.Sprintf(
|
||||
`;var _mk=m._via_markers[%[1]s],_f=rot>90||rot<-90;`+
|
||||
`if(_f)rot=rot>0?rot-180:rot+180;`+
|
||||
`_mk.setRotation(rot);`+
|
||||
`var _ch=_mk.getElement().firstElementChild;`+
|
||||
`if(_ch)_ch.style.transform=_f?'scaleX(-1)':''`,
|
||||
jsonStr(markerID)))
|
||||
} else if mk.RotationSignal != nil {
|
||||
b.WriteString(fmt.Sprintf(`;m._via_markers[%s].setRotation(rot)`, jsonStr(markerID)))
|
||||
}
|
||||
b.WriteString(`}`)
|
||||
return b.String()
|
||||
}
|
||||
|
||||
// addMarkerJS generates a self-contained IIFE to add a marker post-render.
|
||||
|
||||
@@ -122,13 +122,18 @@ func (m *Map) Element(extra ...h.H) h.H {
|
||||
}
|
||||
}
|
||||
|
||||
// Hidden inputs for signal-backed marker position writeback (drag → signal)
|
||||
// Hidden inputs for signal-backed marker position/rotation writeback
|
||||
for _, me := range m.markers {
|
||||
if me.marker.LngSignal != nil && me.marker.LatSignal != nil {
|
||||
children = append(children,
|
||||
h.Input(h.Type("hidden"), me.marker.LngSignal.Bind()),
|
||||
h.Input(h.Type("hidden"), me.marker.LatSignal.Bind()),
|
||||
)
|
||||
if me.marker.RotationSignal != nil {
|
||||
children = append(children,
|
||||
h.Input(h.Type("hidden"), me.marker.RotationSignal.Bind()),
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -302,11 +302,28 @@ type Marker struct {
|
||||
Draggable bool
|
||||
Popup *Popup
|
||||
|
||||
// Element is raw HTML/SVG used as a custom marker instead of the
|
||||
// default pin. When set, Color is ignored.
|
||||
// Do not pass untrusted user input without sanitizing it first.
|
||||
Element string
|
||||
|
||||
// Anchor controls which part of the element sits at the coordinate.
|
||||
// Values: "center" (default for custom elements), "bottom" (default
|
||||
// for the pin), "top", "left", "right", "top-left", etc.
|
||||
Anchor string
|
||||
|
||||
// Rotation is clockwise degrees. Useful for directional icons (ships, vehicles).
|
||||
// Ignored when RotationSignal is set.
|
||||
Rotation float64
|
||||
|
||||
// Signal-backed position. When set, signals drive marker position reactively.
|
||||
// Initial position is read from the signal values. LngLat is ignored when signals are set.
|
||||
// If Draggable is true, drag updates write back to these signals.
|
||||
LngSignal *via.Signal
|
||||
LatSignal *via.Signal
|
||||
|
||||
// RotationSignal drives marker rotation reactively. When set, Rotation is ignored.
|
||||
RotationSignal *via.Signal
|
||||
}
|
||||
|
||||
// Popup describes a map popup.
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
package via
|
||||
|
||||
import (
|
||||
// "net/http/httptest"
|
||||
"testing"
|
||||
|
||||
"github.com/ryanhamamura/via/h"
|
||||
|
||||
65
via.go
65
via.go
@@ -439,36 +439,39 @@ func (v *V) ensureDatastarHandler() {
|
||||
})
|
||||
}
|
||||
|
||||
func loadDevModeMap(path string) map[string]string {
|
||||
m := make(map[string]string)
|
||||
file, err := os.Open(path)
|
||||
if err != nil {
|
||||
return m
|
||||
}
|
||||
defer file.Close()
|
||||
json.NewDecoder(file).Decode(&m)
|
||||
return m
|
||||
}
|
||||
|
||||
func saveDevModeMap(path string, m map[string]string) error {
|
||||
file, err := os.Create(path)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
defer file.Close()
|
||||
return json.NewEncoder(file).Encode(m)
|
||||
}
|
||||
|
||||
func (v *V) devModePersist(c *Context) {
|
||||
p := filepath.Join(".via", "devmode", "ctx.json")
|
||||
if err := os.MkdirAll(filepath.Dir(p), 0755); err != nil {
|
||||
v.logFatal("failed to create directory for devmode files: %v", err)
|
||||
}
|
||||
|
||||
// load persisted list from file, or empty list if file not found
|
||||
file, err := os.Open(p)
|
||||
ctxRegMap := make(map[string]string)
|
||||
if err == nil {
|
||||
json.NewDecoder(file).Decode(&ctxRegMap)
|
||||
}
|
||||
file.Close()
|
||||
|
||||
// add ctx to persisted list
|
||||
ctxRegMap := loadDevModeMap(p)
|
||||
if _, ok := ctxRegMap[c.id]; !ok {
|
||||
ctxRegMap[c.id] = c.route
|
||||
}
|
||||
|
||||
// write persisted list to file
|
||||
file, err = os.Create(p)
|
||||
if err != nil {
|
||||
v.logErr(c, "devmode failed to percist ctx: %v", err)
|
||||
|
||||
}
|
||||
defer file.Close()
|
||||
|
||||
encoder := json.NewEncoder(file)
|
||||
if err := encoder.Encode(ctxRegMap); err != nil {
|
||||
v.logErr(c, "devmode failed to persist ctx")
|
||||
if err := saveDevModeMap(p, ctxRegMap); err != nil {
|
||||
v.logErr(c, "devmode failed to persist ctx: %v", err)
|
||||
}
|
||||
v.logDebug(c, "devmode persisted ctx to file")
|
||||
}
|
||||
@@ -476,27 +479,11 @@ func (v *V) devModePersist(c *Context) {
|
||||
func (v *V) devModeRemovePersisted(c *Context) {
|
||||
p := filepath.Join(".via", "devmode", "ctx.json")
|
||||
|
||||
// load persisted list from file, or empty list if file not found
|
||||
file, err := os.Open(p)
|
||||
ctxRegMap := make(map[string]string)
|
||||
if err == nil {
|
||||
json.NewDecoder(file).Decode(&ctxRegMap)
|
||||
}
|
||||
file.Close()
|
||||
|
||||
ctxRegMap := loadDevModeMap(p)
|
||||
delete(ctxRegMap, c.id)
|
||||
|
||||
// write persisted list to file
|
||||
file, err = os.Create(p)
|
||||
if err != nil {
|
||||
v.logErr(c, "devmode failed to remove percisted ctx: %v", err)
|
||||
|
||||
}
|
||||
defer file.Close()
|
||||
|
||||
encoder := json.NewEncoder(file)
|
||||
if err := encoder.Encode(ctxRegMap); err != nil {
|
||||
v.logErr(c, "devmode failed to remove persisted ctx")
|
||||
if err := saveDevModeMap(p, ctxRegMap); err != nil {
|
||||
v.logErr(c, "devmode failed to remove persisted ctx: %v", err)
|
||||
}
|
||||
v.logDebug(c, "devmode removed persisted ctx from file")
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user