wip: go 1.18

Signed-off-by: Carlos Alexandro Becker <[email protected]>

.github/workflows/build.yml

@@ -4,7 +4,7 @@ jobs:
   test:
     strategy:
       matrix:
-        go-version: [^1]
+        go-version: [1.18.x, ^1]
         os: [ubuntu-latest, macos-latest, windows-latest]
     runs-on: ${{ matrix.os }}
     env:

clamp.go

@@ -0,0 +1,22 @@
+package huh
+
+func min(a, b int) int {
+	if a < b {
+		return a
+	}
+	return b
+}
+
+func max(a, b int) int {
+	if a > b {
+		return a
+	}
+	return b
+}
+
+func clamp(n, low, high int) int {
+	if low > high {
+		low, high = high, low
+	}
+	return min(high, max(low, n))
+}

go.mod

@@ -2,12 +2,13 @@ module github.com/charmbracelet/huh
 
 go 1.21
 
+toolchain go1.21.4
+
 require (
 	github.com/charmbracelet/bubbles v0.16.1
 	github.com/charmbracelet/bubbletea v0.24.2
 	github.com/charmbracelet/glamour v0.6.0
 	github.com/charmbracelet/lipgloss v0.9.1
-	github.com/charmbracelet/x/exp/ordered v0.0.0-20231025135604-4a717d4fb812
 )
 
 require (

go.sum

@@ -15,8 +15,6 @@ github.com/charmbracelet/glamour v0.6.0 h1:wi8fse3Y7nfcabbbDuwolqTqMQPMnVPeZhDM2
 github.com/charmbracelet/glamour v0.6.0/go.mod h1:taqWV4swIMMbWALc0m7AfE9JkPSU8om2538k9ITBxOc=
 github.com/charmbracelet/lipgloss v0.9.1 h1:PNyd3jvaJbg4jRHKWXnCj1akQm4rh8dbEzN1p/u1KWg=
 github.com/charmbracelet/lipgloss v0.9.1/go.mod h1:1mPmG4cxScwUQALAAnacHaigiiHB9Pmr+v1VEawJl6I=
-github.com/charmbracelet/x/exp/ordered v0.0.0-20231025135604-4a717d4fb812 h1:wBbf9mGJyRlIxn7t4Ri0Ig+HLt6Cv6PC4P3AoBj6jwU=
-github.com/charmbracelet/x/exp/ordered v0.0.0-20231025135604-4a717d4fb812/go.mod h1:aoG4bThKYIOnyB55r202eHqo6TkN7ZXV+cu4Do3eoBQ=
 github.com/containerd/console v1.0.4-0.20230313162750-1ae8d489ac81 h1:q2hJAaP1k2wIvVRd/hEHD7lacgqrCPS+k8g1MndzfWY=
 github.com/containerd/console v1.0.4-0.20230313162750-1ae8d489ac81/go.mod h1:YynlIjWYF8myEu6sdkwKIvGQq+cOckRm6So2avqoYAk=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=

group.go

@@ -6,7 +6,6 @@ import (
 	"github.com/charmbracelet/bubbles/help"
 	"github.com/charmbracelet/bubbles/paginator"
 	tea "github.com/charmbracelet/bubbletea"
-	"github.com/charmbracelet/x/exp/ordered"
 )
 
 // Group is a collection of fields that are displayed together with a page of
@@ -171,7 +170,7 @@ func (g *Group) setCurrent(current int) tea.Cmd {
 	cmd = g.fields[g.paginator.Page].Blur()
 	cmds = append(cmds, cmd)
 
-	g.paginator.Page = ordered.Clamp(current, 0, len(g.fields)-1)
+	g.paginator.Page = clamp(current, 0, len(g.fields)-1)
 
 	cmd = g.fields[g.paginator.Page].Focus()
 	cmds = append(cmds, cmd)