Skip to content
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.

Sign up for GitHub

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

feat: add support for multiple columns #320

Closed
wants to merge 1 commit into from
Closed

feat: add support for multiple columns #320

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 16 additions & 8 deletions internal/model/model.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import (
"github.com/charmbracelet/bubbles/viewport"
tea "github.com/charmbracelet/bubbletea"
"github.com/charmbracelet/glamour"
"github.com/charmbracelet/lipgloss"
"github.com/maaslalani/slides/internal/code"
"github.com/maaslalani/slides/internal/meta"
"github.com/maaslalani/slides/styles"
Expand All @@ -30,7 +31,8 @@ var (
)

const (
delimiter = "\n---\n"
delimiter = "\n---\n"
colDelimiter = "\n-|-\n"
)

// Model represents the model of this presentation, which contains all the
Expand Down Expand Up @@ -204,15 +206,21 @@ func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
// View renders the current slide in the presentation and the status bar which
// contains the author, date, and pagination information.
func (m Model) View() string {
r, _ := glamour.NewTermRenderer(m.Theme, glamour.WithWordWrap(m.viewport.Width))
slide := m.Slides[m.Page]
slide = code.HideComments(slide)
slide, err := r.Render(slide)
slide = strings.ReplaceAll(slide, "\t", tabSpaces)
slide += m.VirtualText
if err != nil {
slide = fmt.Sprintf("Error: Could not render markdown! (%v)", err)
cols := strings.Split(slide, colDelimiter)

for i := 0; i < len(cols); i++ {
r, _ := glamour.NewTermRenderer(m.Theme, glamour.WithWordWrap(m.viewport.Width/len(cols)))
cols[i] = code.HideComments(cols[i])
var err error
cols[i], err = r.Render(cols[i])
cols[i] = strings.ReplaceAll(cols[i], "\t", tabSpaces)
if err != nil {
cols[i] = "Error: Could not render markdown! (" + err.Error() + ")"
}
}
slide = lipgloss.JoinHorizontal(lipgloss.Top, cols...)
slide = lipgloss.JoinVertical(lipgloss.Center, slide, m.VirtualText)
slide = styles.Slide.Render(slide)

var left string
Expand Down