Skip to content

Commit 9f952cc

Browse files
authored
Merge pull request #346 from day8/missing-release
Adjust flex style, layering, borders
2 parents a40893f + bab02f3 commit 9f952cc

File tree

3 files changed

+14
-6
lines changed

3 files changed

+14
-6
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22

33
> Committed but unreleased changes are put here, at the top. Older releases are detailed chronologically below.
44
5+
## 2.22.8 (2024-10-10)
6+
7+
#### Changed
8+
9+
- `nested-grid`: Adjust flex-child style & internal layering
10+
511
## 2.22.6 (2024-10-08)
612

713
#### Fixed

src/re_com/nested_grid.cljs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1107,18 +1107,18 @@
11071107
:justify-content :end
11081108
:height 25
11091109
:background-color :white
1110-
:z-index 3}
1110+
:z-index 2}
11111111
(when sticky?
11121112
{:position :sticky
11131113
:top sticky-top}))}
11141114
[box/v-box {:align :center
11151115
:justify :center
1116-
:style {:z-index 4
1117-
:position :sticky
1116+
:style {:position :sticky
11181117
:background-color :white
11191118
:right 0
11201119
:width 25
1121-
:height 25}
1120+
:height 25
1121+
:margin-right 10}
11221122
:children [export-button]}]]
11231123
outer-grid-container [:div
11241124
(themed ::outer-grid-container
@@ -1180,7 +1180,7 @@
11801180
[:div (themed ::wrapper
11811181
{:style (merge {:flex-direction :column}
11821182
(when-not sticky?
1183-
(merge {:flex 1
1183+
(merge {:flex "0 0 auto"
11841184
:display :flex}
11851185
(when remove-empty-column-space?
11861186
{:max-width :fit-content})

src/re_com/theme/default.cljs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,13 +212,15 @@
212212
:text-align "left"
213213
:font-size "13px"
214214
:white-space "nowrap"
215-
:border-right "thin solid #ccc"
215+
:border-left "thin solid #ccc"
216216
:border-bottom "thin solid #ccc"}))
217217

218218
(defmethod main ::nested-grid/row-header-wrapper
219219
[props {{:keys [edge]} :state}]
220220
(update props :style merge
221221
row-header-wrapper-main
222+
(when (contains? edge :right)
223+
{:border-right "thin solid #aaa"})
222224
(when (contains? edge :left)
223225
{:border-left "thin solid #aaa"})
224226
(when (contains? edge :bottom)

0 commit comments

Comments
 (0)