Addressing #157

Author: daveshanley

tui/v2/tree.go

@@ -69,10 +69,24 @@ func (t *treeModel) rebuild() {
 		return
 	}
 	t.entries = make([]treeEntry, 0, 64)
+	rootChanges := getNodeChanges(t.root)
 	children := t.root.Children
-	for i, child := range children {
-		isLast := i == len(children)-1
-		t.flattenNode(child, 0, isLast, nil)
+	totalItems := len(rootChanges) + len(children)
+	idx := 0
+
+	for _, change := range rootChanges {
+		idx++
+		t.entries = append(t.entries, treeEntry{
+			node:   t.root,
+			change: change,
+			depth:  0,
+			isLast: idx == totalItems,
+		})
+	}
+
+	for _, child := range children {
+		idx++
+		t.flattenNode(child, 0, idx == totalItems, nil)
 	}
 	// Clamp cursor
 	if t.cursor >= len(t.entries) {

tui/v2/tree_test.go

@@ -89,6 +89,36 @@ func makeTestTree() *v3.Node {
 	return root
 }
 
+func makeRootChangeTree() *v3.Node {
+	openapiChange := &whatChangedModel.Change{
+		ChangeType: whatChangedModel.Modified,
+		Property:   "openapi",
+		Original:   "3.0.0",
+		New:        "3.1.0",
+		Breaking:   true,
+	}
+	infoChange := &whatChangedModel.Change{
+		ChangeType: whatChangedModel.Modified,
+		Property:   "version",
+		Original:   "1.0",
+		New:        "2.0",
+	}
+
+	infoNode := &v3.Node{
+		Label: "Info",
+		Type:  "Info",
+	}
+	infoNode.AppendChange(&mockChanged{changes: []*whatChangedModel.Change{infoChange}})
+
+	root := &v3.Node{
+		Label:    "Document",
+		Type:     "Document",
+		Children: []*v3.Node{infoNode},
+	}
+	root.AppendChange(&mockChanged{changes: []*whatChangedModel.Change{openapiChange}})
+	return root
+}
+
 func TestFlattenNodeTree_AllExpanded(t *testing.T) {
 	root := makeTestTree()
 	tm := newTreeModel(root, 20)
@@ -130,6 +160,29 @@ func TestCursorStartsOnFirstLeaf(t *testing.T) {
 	assert.Equal(t, "deprecated", entry.change.Property)
 }
 
+func TestFlattenNodeTree_IncludesRootOwnedLeaves(t *testing.T) {
+	root := makeRootChangeTree()
+	tm := newTreeModel(root, 20)
+
+	require.Len(t, tm.entries, 3)
+	require.NotNil(t, tm.entries[0].change)
+	assert.Equal(t, "openapi", tm.entries[0].change.Property)
+	assert.Equal(t, "Info", tm.entries[1].node.Label)
+	require.NotNil(t, tm.entries[2].change)
+	assert.Equal(t, "version", tm.entries[2].change.Property)
+}
+
+func TestCursorStartsOnRootOwnedLeaf(t *testing.T) {
+	root := makeRootChangeTree()
+	tm := newTreeModel(root, 20)
+
+	require.Equal(t, 0, tm.cursor)
+	entry := tm.selectedEntry()
+	require.NotNil(t, entry)
+	require.NotNil(t, entry.change)
+	assert.Equal(t, "openapi", entry.change.Property)
+}
+
 func TestMoveDown_SkipsBranchNodes(t *testing.T) {
 	root := makeTestTree()
 	tm := newTreeModel(root, 20)