Skip to content

Commit a48c80b

Browse files
sawkasawka
committed
remove vdom.UseAtom
1 parent 2300333 commit a48c80b

8 files changed

Lines changed: 69 additions & 96 deletions

File tree

‎tsunami/comp/rootelem.go‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import (
1414
"unicode"
1515

1616
"github.com/google/uuid"
17+
"github.com/outrigdev/goid"
1718
"github.com/wavetermdev/waveterm/tsunami/rpctypes"
1819
"github.com/wavetermdev/waveterm/tsunami/util"
1920
"github.com/wavetermdev/waveterm/tsunami/vdom"
@@ -25,6 +26,7 @@ const ChildrenPropKey = "children"
2526
// is set ONLY when we're in the render function of a component
2627
// used for hooks, and automatic dependency tracking
2728
var globalVC *VDomContextImpl
29+
var globalRenderGoId uint64
2830

2931
type RenderOpts struct {
3032
Resync bool
@@ -443,13 +445,19 @@ func callCFunc(cfunc any, ctx context.Context, props map[string]any) any {
443445

444446
func withGlobalCtx[T any](vc *VDomContextImpl, fn func() T) T {
445447
globalVC = vc
448+
globalRenderGoId = goid.Get()
446449
defer func() {
447450
globalVC = nil
451+
globalRenderGoId = 0
448452
}()
449453
return fn()
450454
}
451455

452456
func GetGlobalContext() *VDomContextImpl {
457+
gid := goid.Get()
458+
if gid != globalRenderGoId {
459+
return nil
460+
}
453461
return globalVC
454462
}
455463

‎tsunami/demo/cpuchart/app.go‎

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ var StatsPanel = app.DefineComponent("StatsPanel",
7777
if lastPoint.CPUUsage != nil {
7878
currentUsage = *lastPoint.CPUUsage
7979
}
80-
80+
8181
// Calculate average and max from non-nil values
8282
total := 0.0
8383
for _, point := range props.Data {
@@ -145,12 +145,8 @@ var App = app.DefineComponent("App",
145145
func(ctx context.Context, _ struct{}) any {
146146
vdom.UseSetAppTitle(ctx, "CPU Usage Monitor")
147147

148-
// Global state using atoms
149-
cpuData, setCpuData, setCpuDataFn := vdom.UseAtom[[]CPUDataPoint](ctx, cpuDataAtom)
150-
dataPointCount, _, _ := vdom.UseAtom[int](ctx, dataPointCountAtom)
151-
152148
// Local state for forcing re-renders
153-
_, _, setTickerFn := vdom.UseState[int](ctx, 0)
149+
_, _, setTickerFn := vdom.UseState(ctx, 0)
154150

155151
// Timer effect for continuous CPU data collection
156152
vdom.UseEffect(ctx, func() func() {
@@ -164,11 +160,11 @@ var App = app.DefineComponent("App",
164160
return
165161
case <-ticker.C:
166162
// Collect new CPU data point and shift the data window
167-
setCpuDataFn(func(currentData []CPUDataPoint) []CPUDataPoint {
163+
cpuDataAtom.SetFn(func(currentData []CPUDataPoint) []CPUDataPoint {
168164
newPoint := generateCPUDataPoint()
169165
// Read current config inside the loop to get live updates
170166
currentDataPointCount := dataPointCountAtom.Get()
171-
167+
172168
// Ensure we have the right size array
173169
if len(currentData) != currentDataPointCount {
174170
// Resize array if config changed
@@ -217,7 +213,7 @@ var App = app.DefineComponent("App",
217213
Timestamp: "",
218214
}
219215
}
220-
setCpuData(initialData)
216+
cpuDataAtom.Set(initialData)
221217
}
222218

223219
return vdom.H("div", map[string]any{
@@ -263,7 +259,7 @@ var App = app.DefineComponent("App",
263259
}, "Live Monitoring"),
264260
vdom.H("span", map[string]any{
265261
"className": "text-sm text-gray-500 ml-2",
266-
}, "(", len(cpuData), "/", dataPointCount, " data points)"),
262+
}, "(", len(cpuDataAtom.Get()), "/", dataPointCountAtom.Get(), " data points)"),
267263
),
268264
),
269265
),
@@ -272,7 +268,7 @@ var App = app.DefineComponent("App",
272268
StatsPanel(struct {
273269
Data []CPUDataPoint `json:"data"`
274270
}{
275-
Data: cpuData,
271+
Data: cpuDataAtom.Get(),
276272
}),
277273

278274
// Main chart
@@ -290,8 +286,8 @@ var App = app.DefineComponent("App",
290286
"height": "100%",
291287
},
292288
vdom.H("recharts:LineChart", map[string]any{
293-
"data": cpuData,
294-
"isAnimationActive": false,
289+
"data": cpuDataAtom.Get(),
290+
"isAnimationActive": false,
295291
},
296292
vdom.H("recharts:CartesianGrid", map[string]any{
297293
"strokeDasharray": "3 3",
@@ -319,13 +315,13 @@ var App = app.DefineComponent("App",
319315
},
320316
}),
321317
vdom.H("recharts:Line", map[string]any{
322-
"type": "monotone",
323-
"dataKey": "cpuUsage",
324-
"stroke": "#3B82F6",
325-
"strokeWidth": 2,
326-
"dot": false,
327-
"name": "CPU Usage (%)",
328-
"isAnimationActive": false,
318+
"type": "monotone",
319+
"dataKey": "cpuUsage",
320+
"stroke": "#3B82F6",
321+
"strokeWidth": 2,
322+
"dot": false,
323+
"name": "CPU Usage (%)",
324+
"isAnimationActive": false,
329325
}),
330326
),
331327
),

‎tsunami/demo/githubaction/app.go‎

Lines changed: 30 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -223,37 +223,27 @@ var WorkflowRunItem = app.DefineComponent("WorkflowRunItem",
223223
var App = app.DefineComponent("App",
224224
func(ctx context.Context, _ struct{}) any {
225225
vdom.UseSetAppTitle(ctx, "GitHub Actions Monitor")
226-
227-
workflowRuns, setWorkflowRuns, _ := vdom.UseAtom[[]WorkflowRun](ctx, workflowRunsAtom)
228-
lastError, setLastError, _ := vdom.UseAtom[string](ctx, lastErrorAtom)
229-
isLoading, setIsLoading, _ := vdom.UseAtom[bool](ctx, isLoadingAtom)
230-
lastRefreshTime, setLastRefreshTime, _ := vdom.UseAtom[time.Time](ctx, lastRefreshTimeAtom)
231-
pollInterval, _, _ := vdom.UseAtom[int](ctx, pollIntervalAtom)
232-
repository, _, _ := vdom.UseAtom[string](ctx, repositoryAtom)
233-
workflow, _, _ := vdom.UseAtom[string](ctx, workflowAtom)
234-
maxWorkflowRuns, _, _ := vdom.UseAtom[int](ctx, maxWorkflowRunsAtom)
235-
236-
_, _, setTickerFn := vdom.UseState[int](ctx, 0)
226+
_, _, setTickerFn := vdom.UseState(ctx, 0)
237227

238228
vdom.UseEffect(ctx, func() func() {
239-
ticker := time.NewTicker(time.Duration(pollInterval) * time.Second)
229+
ticker := time.NewTicker(time.Duration(pollIntervalAtom.Get()) * time.Second)
240230
done := make(chan bool)
241231

242232
fetchData := func() {
243233
currentMaxRuns := maxWorkflowRunsAtom.Get()
244-
runs, err := fetchWorkflowRuns(repository, workflow, currentMaxRuns)
234+
runs, err := fetchWorkflowRuns(repositoryAtom.Get(), workflowAtom.Get(), currentMaxRuns)
245235
if err != nil {
246236
log.Printf("Error fetching workflow runs: %v", err)
247-
setLastError(err.Error())
237+
lastErrorAtom.Set(err.Error())
248238
} else {
249239
sort.Slice(runs, func(i, j int) bool {
250240
return runs[i].CreatedAt.After(runs[j].CreatedAt)
251241
})
252-
setWorkflowRuns(runs)
253-
setLastError("")
242+
workflowRunsAtom.Set(runs)
243+
lastErrorAtom.Set("")
254244
}
255-
setLastRefreshTime(time.Now())
256-
setIsLoading(false)
245+
lastRefreshTimeAtom.Set(time.Now())
246+
isLoadingAtom.Set(false)
257247
}
258248

259249
fetchData()
@@ -275,29 +265,38 @@ var App = app.DefineComponent("App",
275265
ticker.Stop()
276266
close(done)
277267
}
278-
}, []any{pollInterval})
268+
}, []any{pollIntervalAtom.Get()})
279269

280270
handleRefresh := func() {
281-
setIsLoading(true)
271+
isLoadingAtom.Set(true)
282272
go func() {
283273
currentMaxRuns := maxWorkflowRunsAtom.Get()
284-
runs, err := fetchWorkflowRuns(repository, workflow, currentMaxRuns)
274+
runs, err := fetchWorkflowRuns(repositoryAtom.Get(), workflowAtom.Get(), currentMaxRuns)
285275
if err != nil {
286276
log.Printf("Error fetching workflow runs: %v", err)
287-
setLastError(err.Error())
277+
lastErrorAtom.Set(err.Error())
288278
} else {
289279
sort.Slice(runs, func(i, j int) bool {
290280
return runs[i].CreatedAt.After(runs[j].CreatedAt)
291281
})
292-
setWorkflowRuns(runs)
293-
setLastError("")
282+
workflowRunsAtom.Set(runs)
283+
lastErrorAtom.Set("")
294284
}
295-
setLastRefreshTime(time.Now())
296-
setIsLoading(false)
285+
lastRefreshTimeAtom.Set(time.Now())
286+
isLoadingAtom.Set(false)
297287
app.SendAsyncInitiation()
298288
}()
299289
}
300290

291+
workflowRuns := workflowRunsAtom.Get()
292+
lastError := lastErrorAtom.Get()
293+
isLoading := isLoadingAtom.Get()
294+
lastRefreshTime := lastRefreshTimeAtom.Get()
295+
pollInterval := pollIntervalAtom.Get()
296+
repository := repositoryAtom.Get()
297+
workflow := workflowAtom.Get()
298+
maxWorkflowRuns := maxWorkflowRunsAtom.Get()
299+
301300
return vdom.H("div", map[string]any{
302301
"className": "min-h-screen bg-gray-900 text-white p-6",
303302
},
@@ -312,7 +311,7 @@ var App = app.DefineComponent("App",
312311
}, "GitHub Actions Monitor"),
313312
vdom.H("p", map[string]any{
314313
"className": "text-gray-400",
315-
}, "Monitoring ", repository, " ", workflow, " workflow"),
314+
}, "Monitoring ", repositoryAtom.Get(), " ", workflowAtom.Get(), " workflow"),
316315
),
317316

318317
vdom.H("div", map[string]any{
@@ -327,11 +326,11 @@ var App = app.DefineComponent("App",
327326
vdom.H("button", map[string]any{
328327
"className": vdom.Classes(
329328
"px-4 py-2 rounded-md text-sm font-medium transition-colors cursor-pointer",
330-
vdom.IfElse(isLoading, "bg-gray-600 text-gray-400", "bg-blue-600 hover:bg-blue-700 text-white"),
329+
vdom.IfElse(isLoadingAtom.Get(), "bg-gray-600 text-gray-400", "bg-blue-600 hover:bg-blue-700 text-white"),
331330
),
332-
"onClick": vdom.If(!isLoading, handleRefresh),
333-
"disabled": isLoading,
334-
}, vdom.IfElse(isLoading, "Refreshing...", "Refresh")),
331+
"onClick": vdom.If(!isLoadingAtom.Get(), handleRefresh),
332+
"disabled": isLoadingAtom.Get(),
333+
}, vdom.IfElse(isLoadingAtom.Get(), "Refreshing...", "Refresh")),
335334

336335
vdom.H("div", map[string]any{
337336
"className": "flex items-center gap-2",

‎tsunami/demo/recharts/app.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -206,10 +206,10 @@ var App = app.DefineComponent("App",
206206
func(ctx context.Context, _ struct{}) any {
207207
vdom.UseSetAppTitle(ctx, "Recharts Demo")
208208

209-
// Global state using atoms
210-
chartData, setChartData, setChartDataFn := vdom.UseAtom[[]DataPoint](ctx, chartDataAtom)
211-
chartType, setChartType, _ := vdom.UseAtom[string](ctx, chartTypeAtom)
212-
isAnimating, setIsAnimating, _ := vdom.UseAtom[bool](ctx, isAnimatingAtom)
209+
// Get atom values once at the top
210+
chartData := chartDataAtom.Get()
211+
chartType := chartTypeAtom.Get()
212+
isAnimating := isAnimatingAtom.Get()
213213

214214
// Local state for timer
215215
_, _, setTickerFn := vdom.UseState[int](ctx, 0)
@@ -230,7 +230,7 @@ var App = app.DefineComponent("App",
230230
return
231231
case <-ticker.C:
232232
// Add new data point and keep only last 20 points
233-
setChartDataFn(func(currentData []DataPoint) []DataPoint {
233+
chartDataAtom.SetFn(func(currentData []DataPoint) []DataPoint {
234234
newData := append(currentData, generateNewDataPoint(currentData))
235235
if len(newData) > 20 {
236236
newData = newData[1:]
@@ -251,16 +251,16 @@ var App = app.DefineComponent("App",
251251
}, []any{isAnimating})
252252

253253
handleStartStop := func() {
254-
setIsAnimating(!isAnimating)
254+
isAnimatingAtom.Set(!isAnimating)
255255
}
256256

257257
handleReset := func() {
258-
setChartData(generateInitialData())
259-
setIsAnimating(false)
258+
chartDataAtom.Set(generateInitialData())
259+
isAnimatingAtom.Set(false)
260260
}
261261

262262
handleChartTypeChange := func(newType string) {
263-
setChartType(newType)
263+
chartTypeAtom.Set(newType)
264264
}
265265

266266
return vdom.H("div", map[string]any{

‎tsunami/demo/tsunamiconfig/app.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -257,8 +257,8 @@ var App = app.DefineComponent("App",
257257
func(ctx context.Context, _ any) any {
258258
vdom.UseSetAppTitle(ctx, "Tsunami Config Manager")
259259

260-
// Use UseConfig for the URL input so it persists
261-
urlInput, setURLInput, _ := vdom.UseAtom[string](ctx, serverURLAtom)
260+
// Get atom value once at the top
261+
urlInput := serverURLAtom.Get()
262262
jsonContent, setJSONContent, _ := vdom.UseState(ctx, "")
263263
errorMessage, setErrorMessage, _ := vdom.UseState(ctx, "")
264264
successMessage, setSuccessMessage, _ := vdom.UseState(ctx, "")
@@ -342,7 +342,7 @@ var App = app.DefineComponent("App",
342342

343343
URLInput(URLInputProps{
344344
Value: urlInput,
345-
OnChange: setURLInput,
345+
OnChange: serverURLAtom.Set,
346346
OnSubmit: fetchConfigData,
347347
IsLoading: isLoading,
348348
}),

‎tsunami/go.mod‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ go 1.24.6
44

55
require (
66
github.com/google/uuid v1.6.0
7+
github.com/outrigdev/goid v0.3.0
78
github.com/spf13/cobra v1.10.1
89
golang.org/x/mod v0.27.0
910
)

‎tsunami/go.sum‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
33
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
44
github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
55
github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
6+
github.com/outrigdev/goid v0.3.0 h1:t/otQD3EXc45cLtQVPUnNgEyRaTQA4cPeu3qVcrsIws=
7+
github.com/outrigdev/goid v0.3.0/go.mod h1:hEH7f27ypN/GHWt/7gvkRoFYR0LZizfUBIAbak4neVE=
68
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
79
github.com/spf13/cobra v1.10.1 h1:lJeBwCfmrnXthfAupyUTzJ/J4Nc1RsHC/mSRU2dll/s=
810
github.com/spf13/cobra v1.10.1/go.mod h1:7SmJGaTHFVBY0jW4NXGluQoLvhqFQM+6XSKD+P4XaB0=

‎tsunami/vdom/vdom.go‎

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99
"reflect"
1010
"strings"
1111

12-
"github.com/wavetermdev/waveterm/tsunami/util"
1312
"github.com/wavetermdev/waveterm/tsunami/vdomctx"
1413
)
1514

@@ -182,38 +181,6 @@ func UseState[T any](ctx context.Context, initialVal T) (T, func(T), func(func(T
182181
return rtnVal, typedSetVal, typedSetFuncVal
183182
}
184183

185-
func useAtom[T any](ctx context.Context, hookName string, atomName string) (T, func(T), func(func(T) T)) {
186-
rc := vdomctx.GetRenderContext(ctx)
187-
if rc == nil {
188-
panic(hookName + " must be called within a component (no context)")
189-
}
190-
val, setVal, setFn := rc.UseAtom(ctx, atomName)
191-
192-
// Adapt the "any" values to type "T"
193-
atomVal := util.GetTypedAtomValue[T](val, atomName)
194-
195-
typedSetVal := func(newVal T) {
196-
setVal(newVal)
197-
}
198-
199-
typedSetFuncVal := func(updateFunc func(T) T) {
200-
setFn(func(oldVal any) any {
201-
typedOldVal := util.GetTypedAtomValue[T](oldVal, atomName)
202-
return updateFunc(typedOldVal)
203-
})
204-
}
205-
206-
return atomVal, typedSetVal, typedSetFuncVal
207-
}
208-
209-
// UseAtom provides access to atom values using an Atom interface.
210-
// It returns the current atom value, a setter function, and an updater function.
211-
// Setting a new value causes a re-render of all components using this atom.
212-
// This hook must be called within a component context.
213-
func UseAtom[T any](ctx context.Context, atom Atom) (T, func(T), func(func(T) T)) {
214-
return useAtom[T](ctx, "UseAtom", atom.AtomName())
215-
}
216-
217184
// UseVDomRef provides a reference to a DOM element in the VDOM tree.
218185
// It returns a VDomRef that can be attached to elements for direct DOM access.
219186
// The ref will not be current on the first render - refs are set and become

0 commit comments

Comments
 (0)