Merge branch 'master' into zendeskhelp

.goreleaser.yml

@@ -7,6 +7,7 @@ builds:
     goos:
       - darwin
       - linux
+      - windows
     goarch:
       - 386
       - amd64

CHANGELOG.md

@@ -5,6 +5,7 @@
 ### ⚡️ Added
 
 * DataDog module is now scrollable and interactive, by [@Seanstoppable](https://github.com/Seanstoppable)
+* Focusable hot key numbers are now assigned in a stable order, [#435](https://github.com/wtfutil/wtf/issues/435) by [@Seanstoppable](https://github.com/Seanstoppable)
 
 ## v0.9.2
 

wtf/focus_tracker.go

@@ -1,6 +1,8 @@
 package wtf
 
 import (
+	"sort"
+
 	"github.com/olebedev/config"
 	"github.com/rivo/tview"
 )
@@ -177,6 +179,17 @@ func (tracker *FocusTracker) focusables() []Wtfable {
 		}
 	}
 
+	// Sort for deterministic ordering
+	sort.SliceStable(focusable[:], func(i, j int) bool {
+		if focusable[i].Top() < focusable[j].Top() {
+			return true
+		}
+		if focusable[i].Top() == focusable[j].Top() {
+			return focusable[i].Left() < focusable[j].Left()
+		}
+		return false
+	})
+
 	return focusable
 }