enqueue parent to updates

maxence-charriere · Apr 20, 2021 · d67b8cd · d67b8cd
1 parent 261e381
commit d67b8cd
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 25 deletions.
diff --git a/pkg/app/engine.go b/pkg/app/engine.go
@@ -275,37 +275,63 @@ func (e *engine) start(ctx context.Context) {
 }
 
 func (e *engine) scheduleComponentUpdate(n UI) {
-	var compo Composer
-	var depth int
+	// var compo Composer
+	// var depth int
+
+	// for {
+	// 	if c, isCompo := n.(Composer); isCompo {
+	// 		if _, isScheduled := e.updates[c]; isScheduled {
+	// 			return
+	// 		}
+
+	// 		if compo == nil {
+	// 			compo = c
+	// 		} else {
+	// 			e.scheduleComponentUpdate(c)
+	// 		}
+	// 	}
+
+	// 	parent := n.parent()
+	// 	if parent == nil {
+	// 		break
+	// 	}
+
+	// 	if compo != nil {
+	// 		depth++
+	// 	}
+	// 	n = parent
+	// }
+
+	// if compo == nil {
+	// 	return
+	// }
+
+	// e.updates[compo] = struct{}{}
+	// e.updateQueue = append(e.updateQueue, updateDescriptor{
+	// 	compo:    compo,
+	// 	priority: depth + 1,
+	// })
+
+	priority := 1
 
 	for {
-		if c, isCompo := n.(Composer); compo == nil && isCompo {
-			if _, isScheduled := e.updates[c]; isScheduled {
-				return
+		if c, isCompo := n.(Composer); isCompo {
+			if _, isScheduled := e.updates[c]; !isScheduled {
+				e.updates[c] = struct{}{}
+				e.updateQueue = append(e.updateQueue, updateDescriptor{
+					compo:    c,
+					priority: priority,
+				})
 			}
-			compo = c
 		}
 
 		parent := n.parent()
 		if parent == nil {
-			break
-		}
-
-		if compo != nil {
-			depth++
+			return
 		}
 		n = parent
+		priority++
 	}
-
-	if compo == nil {
-		return
-	}
-
-	e.updates[compo] = struct{}{}
-	e.updateQueue = append(e.updateQueue, updateDescriptor{
-		compo:    compo,
-		priority: depth + 1,
-	})
 }
 
 func (e *engine) updateComponents() {
@@ -314,7 +340,7 @@ func (e *engine) updateComponents() {
 	}
 
 	sort.Slice(e.updateQueue, func(a, b int) bool {
-		return e.updateQueue[a].priority < e.updateQueue[b].priority
+		return e.updateQueue[a].priority > e.updateQueue[b].priority
 	})
 
 	for _, ud := range e.updateQueue {

diff --git a/pkg/app/engine_test.go b/pkg/app/engine_test.go
@@ -40,7 +40,7 @@ func TestEngineScheduleComponentUpdate(t *testing.T) {
 	require.Equal(t, struct{}{}, e.updates[h])
 	require.Equal(t, updateDescriptor{
 		compo:    h,
-		priority: 2,
+		priority: 1,
 	}, e.updateQueue[0])
 
 	e.scheduleComponentUpdate(h)
@@ -67,11 +67,11 @@ func TestEngineScheduleNestedComponentUpdate(t *testing.T) {
 	require.Equal(t, struct{}{}, e.updates[h])
 	require.Equal(t, updateDescriptor{
 		compo:    h,
-		priority: 3,
+		priority: 1,
 	}, e.updateQueue[0])
 }
 
-func TestEngineUpdateCoponents(t *testing.T) {
+func TestEngineUpdateComponents(t *testing.T) {
 	e := engine{}
 	e.init()