geekinney/etaf-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

perf: flatten fixed-width table headers

Browse Source
This commit is contained in:
Kinneyzhang 2026-08-31 15:26:41 +08:00
parent a35b3dc469
commit a4181d0db1
2 changed files with 39 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
etaf-ui-table.el
View File

@ -69,21 +69,44 @@
(etaf-ui--column-value column :key)) (etaf-ui--column-value column :key))
column)))))) column))))))
(defun etaf-ui--table-fixed-header-text (columns)
"Return one fixed-width header string for COLUMNS, or nil."
(when (and columns
(cl-every
(lambda (column)
(let ((width (etaf-ui--column-value column :width)))
(and (integerp width) (> width 0))))
columns))
(mapconcat
(lambda (column)
(let* ((width (etaf-ui--column-value column :width))
(value
(etaf-ui--table-fit-text
(or (etaf-ui--column-value column :label)
(etaf-ui--column-value column :key))
column)))
(concat value
(make-string (max 0 (- width (string-width value))) ?\s))))
columns " ")))
(defun etaf-ui--table-header (columns) (defun etaf-ui--table-header (columns)
"Return a Table header row for COLUMNS." "Return a Table header row for COLUMNS."
(let ((theme (etaf-ui--style-tokens :ui-table-border))) (let ((theme (etaf-ui--style-tokens :ui-table-border))
(fixed-text (etaf-ui--table-fixed-header-text columns)))
(etaf-node (etaf-node
'row 'row
(list :class "etaf-table-header" (list :class "etaf-table-header"
:border-bottom-width 1 :border-bottom-style 'solid :border-bottom-width 1 :border-bottom-style 'solid
:border-bottom-color (plist-get theme :ui-table-border)) :border-bottom-color (plist-get theme :ui-table-border))
(if fixed-text
(list (etaf-node 'text nil (list fixed-text)))
(cl-loop for column in columns (cl-loop for column in columns
for tail on columns for tail on columns
for index from 0 for index from 0
collect collect
(etaf-ui--table-header-cell (etaf-ui--table-header-cell
column (zerop index) (cdr tail) column (zerop index) (cdr tail)
(plist-get theme :ui-table-border)))))) (plist-get theme :ui-table-border)))))))
(defun etaf-ui--table-cell (row column first-p gap-p border-color) (defun etaf-ui--table-cell (row column first-p gap-p border-color)
"Return one Label cell for ROW and COLUMN using GAP-P." "Return one Label cell for ROW and COLUMN using GAP-P."

8
tests/etaf-ui-tests.el
View File

@ -823,6 +823,14 @@
(should-not (should-not
(etaf-ui--table-fixed-row-text (etaf-ui--table-fixed-row-text
'(:name "Ada" :kind "Essay") '(:name "Ada" :kind "Essay")
'((:key :name :width 5) (:key :kind))))
(should
(equal "Name Kind "
(etaf-ui--table-fixed-header-text
'((:key :name :label "Name" :width 5)
(:key :kind :label "Kind" :width 7)))))
(should-not
(etaf-ui--table-fixed-header-text
'((:key :name :width 5) (:key :kind))))) '((:key :name :width 5) (:key :kind)))))
(ert-deftest etaf-ui-data-grid-noninteractive-rows-have-no-focus-contract () (ert-deftest etaf-ui-data-grid-noninteractive-rows-have-no-focus-contract ()