feat: Update table example ✨

Author: kdheepak

examples/table.jl

@@ -8,27 +8,25 @@ using Random
 end
 
 function TUI.view(m::Model)
-  cells = [
-    TUI.Cell(; content = "Hello", style = TUI.Crayon(; foreground = :black, background = :white)),
-    TUI.Cell(; content = "World", style = TUI.Crayon(; foreground = :black, background = :white)),
-  ]
+  data = [TUI.Datum(; content = "Hello"), TUI.Datum(; content = "World"), TUI.Datum(; content = "FSFDS")]
   header = TUI.Row(;
-    cells = [
-      TUI.Cell(; content = "Column1", style = TUI.Crayon(; foreground = :black, background = :white)),
-      TUI.Cell(; content = "Column2", style = TUI.Crayon(; foreground = :black, background = :white)),
+    data = [
+      TUI.Datum(; content = "Column1", style = TUI.Crayon(; foreground = :black, background = :white)),
+      TUI.Datum(; content = "Column2", style = TUI.Crayon(; foreground = :black, background = :white)),
+      TUI.Datum(; content = "Column3", style = TUI.Crayon(; foreground = :black, background = :white)),
     ],
   )
   rows = [
-    TUI.Row(; cells),
-    TUI.Row(; cells),
-    TUI.Row(; cells),
-    TUI.Row(; cells),
-    TUI.Row(; cells),
-    TUI.Row(; cells),
-    TUI.Row(; cells),
-    TUI.Row(; cells),
+    TUI.Row(; data),
+    TUI.Row(; data),
+    TUI.Row(; data),
+    TUI.Row(; data),
+    TUI.Row(; data),
+    TUI.Row(; data),
+    TUI.Row(; data),
+    TUI.Row(; data),
   ]
-  widths = [TUI.Auto(50), TUI.Auto(50)]
+  widths = [TUI.Percent(33), TUI.Percent(33), TUI.Percent(33)]
   TUI.Table(; rows, widths, header)
 end
 

src/buffer.jl

@@ -1,6 +1,6 @@
 
-@kwdef struct Cell{T}
-  content::T
+@kwdef struct Cell
+  content::Char
   style::Crayons.Crayon = Crayon()
 end
 
@@ -39,17 +39,12 @@ function set(buffer::Buffer, area::Rect, style::Crayons.Crayon)
   end
 end
 
-function set(buffer::Buffer, area::Rect, cell::Cell{Char})
+function set(buffer::Buffer, area::Rect, cell::Cell)
   for j in area.y:area.height, i in area.x:area.width
     set(buffer, i, j, cell)
   end
 end
 
-function set(buf::Buffer, area::Rect, cell::Cell)
-  set(buf, area, cell.style)
-  set(buf, left(area), top(area), Base.split(cell.content, '\n'))
-end
-
 function set(buffer::Buffer, col::Integer, row::Integer, style::Crayons.Crayon)
   row = min(row, Base.size(buffer.content, 1))
   col = min(col, Base.size(buffer.content, 2))
@@ -91,7 +86,7 @@ function set(buffer::Buffer, col::Integer, row::Integer, c::Char, style::Crayons
   set(buffer, col, row, Cell(c, style))
 end
 
-function set(buffer::Buffer, col::Integer, row::Integer, c::Cell{Char})
+function set(buffer::Buffer, col::Integer, row::Integer, c::Cell)
   row = min(row, Base.size(buffer.content, 1))
   col = min(col, Base.size(buffer.content, 2))
   buffer.content[row, col] = c

src/widgets/table.jl

@@ -1,5 +1,10 @@
+@kwdef struct Datum
+  content::String = ""
+  style::Crayon = Crayon()
+end
+
 @kwdef struct Row
-  cells::Vector{Cell}
+  data::Vector{Datum}
   height::Int = 3
   bottom_margin::Int = 0
 end
@@ -117,13 +122,13 @@ function render_row(
   highlight_symbol::Union{Nothing,String} = nothing,
 )
   x_offset = x
-  for (i, cell) in enumerate(row.cells)
+  for (i, datum) in enumerate(row.data)
     # Highlight if row is selected and highlight symbol is provided
     if is_selected && !isnothing(highlight_symbol)
-      set(buf, x_offset, y, highlight_symbol, cell.style)
+      set(buf, x_offset, y, highlight_symbol)
       x_offset += width(highlight_symbol)
     end
-    set(buf, Rect(; x = x_offset, y = y, width = column_widths[i], height = row.height), cell)
+    set(buf, x_offset, y, datum.content, datum.style)
     x_offset += column_widths[i]
   end
 end