Skip to content

Commit a7487f1

Browse files
kimo-kkimo-k
committed
[nested-v-grid] Support identical siblings in header-trees
1 parent 80ec571 commit a7487f1

File tree

3 files changed

+56
-38
lines changed

3 files changed

+56
-38
lines changed

‎src/re_com/nested_v_grid.cljs

+46-32
Original file line numberDiff line numberDiff line change
@@ -619,22 +619,27 @@
619619
(for [i (range (count @row-paths))
620620
:let [row-path (get @row-paths i)
621621
path-ct (count row-path)
622-
end-path (some #(when (= (count %) path-ct) %) ;;TODO make this more efficient.
623-
(drop (inc i) @row-paths))
622+
end-keypath (->> @row-paths
623+
(drop (inc i))
624+
(take-while #(> (count %) path-ct))
625+
count
626+
(+ i 1)
627+
(#(get @row-keypaths %)))
624628
{:keys [branch-end? leaf?]} (meta row-path)
625629
row-path-prop (cond-> row-path (not show-root-headers?) (subvec 1))
626630
cross-size (get @safe-row-header-widths
627631
(cond-> (dec path-ct) (not show-root-headers?) dec))
628-
size (get @row-sizes i)]
632+
size (get @row-sizes i)
633+
keypath (get @row-keypaths i)]
629634
:let [props {:part ::row-header
630635
:row-path row-path-prop
631636
:path row-path-prop
632-
:keypath (get @row-keypaths i)
637+
:keypath keypath
633638
:branch-end? branch-end?
634-
:style {:grid-row-start (ngu/path->grid-line-name row-path)
639+
:style {:grid-row-start (ngu/keypath->grid-line-name keypath)
635640
:cross-size cross-size
636641
:grid-row-end (if branch-end? "span 1"
637-
(ngu/path->grid-line-name end-path))
642+
(ngu/keypath->grid-line-name end-keypath))
638643
:grid-column-start (cond-> (count row-path)
639644
branch-end? dec
640645
(not show-root-headers?) dec)
@@ -658,21 +663,26 @@
658663
(for [i (range (count @column-paths))
659664
:let [column-path (get @column-paths i)
660665
path-ct (count column-path)
661-
end-path (some #(when (= (count %) path-ct) %)
662-
(drop (inc i) @column-paths))
666+
end-keypath (->> @column-paths
667+
(drop (inc i))
668+
(take-while #(> (count %) path-ct))
669+
count
670+
(+ i 1)
671+
(#(get @column-keypaths %)))
663672
{:keys [branch-end? branch? leaf?]} (meta column-path)
664-
column-path-prop (cond-> column-path (not show-root-headers?) (subvec 1))]
673+
column-path-prop (cond-> column-path (not show-root-headers?) (subvec 1))
674+
keypath (get @column-keypaths i)]
665675
#_#_:when (not branch-end?)
666676
:let [props {:part ::column-header
667677
:column-path column-path-prop
668678
:path column-path-prop
669679
:branch-end? branch-end?
670-
:keypath (get @column-keypaths i)
671-
:style {:grid-column-start (ngu/path->grid-line-name column-path)
680+
:keypath keypath
681+
:style {:grid-column-start (ngu/keypath->grid-line-name keypath)
672682
:grid-column-end (cond
673-
end-path (ngu/path->grid-line-name end-path)
674-
leaf? "span 1"
675-
:else "-1")
683+
end-keypath (ngu/keypath->grid-line-name end-keypath)
684+
leaf? "span 1"
685+
:else "-1")
676686
:grid-row-start (cond-> (count column-path)
677687
branch-end? dec
678688
(not show-root-headers?) dec)
@@ -716,24 +726,28 @@
716726
:key [::corner-header row-index column-index]}))
717727

718728
cells
719-
(for [row-path @row-paths
720-
column-path @column-paths
721-
:let [row-meta (meta row-path)
722-
column-meta (meta column-path)]
723-
:when (and ((some-fn :leaf? :show?) row-meta)
724-
((some-fn :leaf? :show?) column-meta))
725-
:let [props {:row-path (cond-> row-path
726-
(not show-root-headers?) (subvec 1)
727-
(:branch-end? row-meta) pop)
728-
:column-path (cond-> column-path
729-
(not show-root-headers?) (subvec 1)
730-
(:branch-end? column-meta) pop)
731-
:row-meta row-meta
732-
:column-meta column-meta
733-
:style {:grid-row-start (ngu/path->grid-line-name row-path)
734-
:grid-column-start (ngu/path->grid-line-name column-path)}}
735-
props (merge props
736-
{:children [(part ::cell-label {:props props})]})]]
729+
(for [ri (range (count @row-paths))
730+
ci (range (count @column-paths))
731+
:let [row-path (nth @row-paths ri)
732+
column-path (nth @column-paths ci)
733+
row-keypath (nth @row-keypaths ri)
734+
column-keypath (nth @column-keypaths ci)
735+
row-meta (meta row-path)
736+
column-meta (meta column-path)]
737+
:when (and ((some-fn :leaf? :show?) row-meta)
738+
((some-fn :leaf? :show?) column-meta))
739+
:let [props {:row-path (cond-> row-path
740+
(not show-root-headers?) (subvec 1)
741+
(:branch-end? row-meta) pop)
742+
:column-path (cond-> column-path
743+
(not show-root-headers?) (subvec 1)
744+
(:branch-end? column-meta) pop)
745+
:row-meta row-meta
746+
:column-meta column-meta
747+
:style {:grid-row-start (ngu/keypath->grid-line-name row-keypath)
748+
:grid-column-start (ngu/keypath->grid-line-name column-keypath)}}
749+
props (merge props
750+
{:children [(part ::cell-label {:props props})]})]]
737751
(part ::cell
738752
{:part ::cell
739753
:props props

‎src/re_com/nested_v_grid/parts.cljs

+2-2
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,9 @@
7070
:height 0
7171
:margin-top (+ size offset)})
7272
(case [header-dimension size-dimension]
73-
[:column :width] {:grid-column-start (ngu/path->grid-line-name path)}
73+
[:column :width] {:grid-column-start (ngu/keypath->grid-line-name keypath)}
7474
[:column :height] {:grid-row-start (inc index)}
75-
[:row :height] {:grid-row-start (ngu/path->grid-line-name path)}
75+
[:row :height] {:grid-row-start (ngu/keypath->grid-line-name keypath)}
7676
[:row :width] {:grid-column-start (inc index)})
7777
style)}
7878
[grid-line-button

‎src/re_com/nested_v_grid/util.cljc

+8-4
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
#?@(:cljs [[re-com.util :as u]
44
goog.string])))
55

6+
(defn keypath->grid-line-name [keypath]
7+
(apply str (into ["rc"] keypath)))
8+
69
(defn path->grid-line-name [path]
710
(str "rc" (hash path)))
811

@@ -153,9 +156,10 @@
153156
:nodes-traversed @nodes-traversed}))
154157

155158
(defn grid-tokens
156-
[{:keys [header-paths sizes positions sum-size]}]
159+
[{:keys [header-paths keypaths sizes positions sum-size]}]
157160
(into ["[start]"]
158161
(loop [[path & rest-paths] header-paths
162+
[keypath & rest-keypaths] keypaths
159163
[size & rest-sizes] sizes
160164
[position
161165
& [next-position :as rest-positions]] (conj positions sum-size)
@@ -164,19 +168,19 @@
164168
(peek path)
165169
spacer? (not= next-position (+ position size))
166170
next-result (cond-> result
167-
:do (conj path)
171+
:do (conj keypath)
168172
show-above? (conj (or size 0))
169173
spacer? (conj "[spacer]"
170174
(- next-position size position)))]
171175
(if (empty? rest-sizes)
172176
(conj next-result "[end]")
173-
(recur rest-paths rest-sizes rest-positions next-result))))))
177+
(recur rest-paths rest-keypaths rest-sizes rest-positions next-result))))))
174178

175179
(defn grid-template [header-traversal]
176180
(str/replace
177181
(str/join " "
178182
(map #(cond (string? %) %
179-
(vector? %) (str "[" (path->grid-line-name %) "]")
183+
(vector? %) (str "[" (keypath->grid-line-name %) "]")
180184
(number? %) (str % "px"))
181185
(grid-tokens header-traversal)))
182186
"] [" " "))

0 commit comments

Comments
 (0)