-
Notifications
You must be signed in to change notification settings - Fork 1
feat(transition | tui): add expand, collapse and fade transition animations #23
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
tharropoulos
wants to merge
4
commits into
main
Choose a base branch
from
expand-collapse-transitions
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+479
−1
Open
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
bbef60e
feat(transition | tui): add expand transition animation
tharropoulos 0ff105e
feat(transition | tui): add collapse transition animation
tharropoulos 509ea86
feat(transition | tui): add fade transition animation
tharropoulos 9219329
docs(readme): add new transitions to docs and update roadmap
tharropoulos File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,131 @@ | ||
package transitions | ||
|
||
import ( | ||
"math" | ||
"strings" | ||
"time" | ||
|
||
tea "github.com/charmbracelet/bubbletea" | ||
"github.com/charmbracelet/harmonica" | ||
charmansi "github.com/charmbracelet/x/ansi" | ||
"github.com/muesli/reflow/truncate" | ||
|
||
"github.com/museslabs/kyma/internal/skip" | ||
) | ||
|
||
type collapse struct { | ||
width int | ||
fps int | ||
spring harmonica.Spring | ||
progress float64 | ||
vel float64 | ||
animating bool | ||
direction direction | ||
} | ||
|
||
func newCollapse(fps int) collapse { | ||
const frequency = 7.0 | ||
const damping = 0.6 | ||
|
||
return collapse{ | ||
fps: fps, | ||
spring: harmonica.NewSpring(harmonica.FPS(fps), frequency, damping), | ||
} | ||
} | ||
|
||
func (t collapse) Start(width, _ int, direction direction) Transition { | ||
t.width = width | ||
t.animating = true | ||
t.progress = 0 | ||
t.vel = 0 | ||
t.direction = direction | ||
return t | ||
} | ||
|
||
func (t collapse) Animating() bool { | ||
return t.animating | ||
} | ||
|
||
func (t collapse) Update() (Transition, tea.Cmd) { | ||
targetProgress := 1.0 | ||
|
||
t.progress, t.vel = t.spring.Update(t.progress, t.vel, targetProgress) | ||
|
||
if t.progress >= 0.99 { | ||
t.animating = false | ||
t.progress = 1.0 | ||
return t, nil | ||
} | ||
|
||
return t, Animate(time.Duration(t.fps)) | ||
} | ||
|
||
func (t collapse) View(prev, next string) string { | ||
var s strings.Builder | ||
|
||
// Calculate how much should collapse from edges toward center | ||
collapseWidth := int(math.Round((1.0 - t.progress) * float64(t.width) / 2)) | ||
centerStart := t.width/2 - collapseWidth | ||
centerEnd := t.width/2 + collapseWidth | ||
|
||
prevLines := strings.Split(prev, "\n") | ||
nextLines := strings.Split(next, "\n") | ||
|
||
// Ensure slides are equal height | ||
maxLines := max(len(nextLines), len(prevLines)) | ||
|
||
for i := range maxLines { | ||
var prevLine, nextLine string | ||
|
||
if i < len(prevLines) { | ||
prevLine = prevLines[i] | ||
} | ||
if i < len(nextLines) { | ||
nextLine = nextLines[i] | ||
} | ||
|
||
var line string | ||
if collapseWidth <= 0 { | ||
// Animation complete, show next content | ||
line = truncate.String(nextLine, uint(t.width)) | ||
} else { | ||
// Build the line with collapse effect from edges toward center | ||
// Center portion: show prev content that's collapsing | ||
var center string | ||
if centerEnd > centerStart { | ||
truncatedPrev := truncate.String(prevLine, uint(centerEnd)) | ||
center = skip.String(truncatedPrev, uint(centerStart)) | ||
} | ||
|
||
// Left and right parts: show next content appearing from edges | ||
leftNext := truncate.String(nextLine, uint(centerStart)) | ||
|
||
rightNext := "" | ||
if centerEnd < t.width { | ||
rightNext = charmansi.TruncateLeft(nextLine, centerEnd, "") | ||
} | ||
|
||
line = leftNext + center + rightNext | ||
line = truncate.String(line, uint(t.width)) | ||
} | ||
|
||
s.WriteString(line) | ||
if i < maxLines-1 { | ||
s.WriteString("\n") | ||
} | ||
} | ||
|
||
return s.String() | ||
} | ||
|
||
func (t collapse) Name() string { | ||
return "collapse" | ||
} | ||
|
||
func (t collapse) Opposite() Transition { | ||
return newExpand(t.fps) | ||
} | ||
|
||
func (t collapse) Direction() direction { | ||
return t.direction | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,131 @@ | ||
package transitions | ||
|
||
import ( | ||
"math" | ||
"strings" | ||
"time" | ||
|
||
tea "github.com/charmbracelet/bubbletea" | ||
"github.com/charmbracelet/harmonica" | ||
charmansi "github.com/charmbracelet/x/ansi" | ||
"github.com/muesli/reflow/truncate" | ||
|
||
"github.com/museslabs/kyma/internal/skip" | ||
) | ||
|
||
type expand struct { | ||
width int | ||
fps int | ||
spring harmonica.Spring | ||
progress float64 | ||
vel float64 | ||
animating bool | ||
direction direction | ||
} | ||
|
||
func newExpand(fps int) expand { | ||
const frequency = 7.0 | ||
const damping = 0.6 | ||
|
||
return expand{ | ||
fps: fps, | ||
spring: harmonica.NewSpring(harmonica.FPS(fps), frequency, damping), | ||
} | ||
} | ||
|
||
func (t expand) Start(width, _ int, direction direction) Transition { | ||
t.width = width | ||
t.animating = true | ||
t.progress = 0 | ||
t.vel = 0 | ||
t.direction = direction | ||
return t | ||
} | ||
|
||
func (t expand) Animating() bool { | ||
return t.animating | ||
} | ||
|
||
func (t expand) Update() (Transition, tea.Cmd) { | ||
targetProgress := 1.0 | ||
|
||
t.progress, t.vel = t.spring.Update(t.progress, t.vel, targetProgress) | ||
|
||
if t.progress >= 0.99 { | ||
t.animating = false | ||
t.progress = 1.0 | ||
return t, nil | ||
} | ||
|
||
return t, Animate(time.Duration(t.fps)) | ||
tharropoulos marked this conversation as resolved.
Show resolved
Hide resolved
|
||
} | ||
|
||
func (t expand) View(prev, next string) string { | ||
var s strings.Builder | ||
|
||
// Calculate how much should expand from center outward | ||
expandWidth := int(math.Round(t.progress * float64(t.width) / 2)) | ||
centerStart := t.width/2 - expandWidth | ||
centerEnd := t.width/2 + expandWidth | ||
|
||
prevLines := strings.Split(prev, "\n") | ||
nextLines := strings.Split(next, "\n") | ||
|
||
// Ensure slides are equal height | ||
maxLines := max(len(nextLines), len(prevLines)) | ||
|
||
for i := range maxLines { | ||
var prevLine, nextLine string | ||
|
||
if i < len(prevLines) { | ||
prevLine = prevLines[i] | ||
} | ||
if i < len(nextLines) { | ||
nextLine = nextLines[i] | ||
} | ||
|
||
var line string | ||
if expandWidth >= t.width/2 { | ||
// Animation complete, show next content | ||
line = truncate.String(nextLine, uint(t.width)) | ||
} else { | ||
// Build the line with expand effect from center outward | ||
// Left and right parts: show prev content | ||
leftPrev := truncate.String(prevLine, uint(centerStart)) | ||
|
||
rightPrev := "" | ||
if centerEnd < t.width { | ||
rightPrev = charmansi.TruncateLeft(prevLine, centerEnd, "") | ||
} | ||
|
||
// Center portion: show next content expanding from center | ||
var center string | ||
if centerEnd > centerStart { | ||
truncatedNext := truncate.String(nextLine, uint(centerEnd)) | ||
center = skip.String(truncatedNext, uint(centerStart)) | ||
} | ||
|
||
line = leftPrev + center + rightPrev | ||
line = truncate.String(line, uint(t.width)) | ||
} | ||
|
||
s.WriteString(line) | ||
if i < maxLines-1 { | ||
s.WriteString("\n") | ||
} | ||
} | ||
|
||
return s.String() | ||
} | ||
|
||
func (t expand) Name() string { | ||
return "expand" | ||
} | ||
|
||
func (t expand) Opposite() Transition { | ||
return newCollapse(t.fps) | ||
} | ||
|
||
func (t expand) Direction() direction { | ||
return t.direction | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.