Skip to content

chore: end fixed zIndex should smaller than start #1249

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

Merged
zombieJ merged 1 commit into from
Mar 11, 2025
Merged

chore: end fixed zIndex should smaller than start #1249

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions src/utils/fixUtil.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,12 @@ export function getCellFixedInfo(
if (fixStart !== null) {
fixedStartShadow = !columns[colEnd + 1] || !isFixedStart(columns[colEnd + 1]);
zIndex = columns.length * 2 - colStart; // Fix start always overlay fix end
zIndexReverse = colStart;
zIndexReverse = columns.length + colStart;
}
if (fixEnd !== null) {
fixedEndShadow = !columns[colStart - 1] || !isFixedEnd(columns[colStart - 1]);
zIndex = colEnd;
zIndexReverse = columns.length * 2 - colEnd; // Fix end always overlay fix start
zIndexReverse = columns.length - colEnd; // Fix end always overlay fix start
}

// Check if scrollLeft will show the shadow
Expand Down
24 changes: 12 additions & 12 deletions tests/__snapshots__/ExpandRow.spec.jsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,12 +461,12 @@ exports[`Table.Expand > renders fixed column correctly > work 1`] = `
<tr>
<th
class="rc-table-cell rc-table-row-expand-icon-cell rc-table-cell-fix rc-table-cell-fix-start"
style="inset-inline-start: 0; --z-offset: 8; --z-offset-reverse: 0;"
style="inset-inline-start: 0; --z-offset: 8; --z-offset-reverse: 4;"
/>
<th
class="rc-table-cell rc-table-cell-fix rc-table-cell-fix-start rc-table-cell-fix-start-shadow"
scope="col"
style="inset-inline-start: 0; --z-offset: 7; --z-offset-reverse: 1;"
style="inset-inline-start: 0; --z-offset: 7; --z-offset-reverse: 5;"
>
Name
</th>
Expand All @@ -479,7 +479,7 @@ exports[`Table.Expand > renders fixed column correctly > work 1`] = `
<th
class="rc-table-cell rc-table-cell-fix rc-table-cell-fix-end rc-table-cell-fix-end-shadow"
scope="col"
style="inset-inline-end: 0; --z-offset: 3; --z-offset-reverse: 5;"
style="inset-inline-end: 0; --z-offset: 3; --z-offset-reverse: 1;"
>
Gender
</th>
Expand Down Expand Up @@ -536,15 +536,15 @@ exports[`Table.Expand > renders fixed column correctly > work 1`] = `
>
<td
class="rc-table-cell rc-table-row-expand-icon-cell rc-table-cell-fix rc-table-cell-fix-start"
style="inset-inline-start: 0; --z-offset: 8; --z-offset-reverse: 0;"
style="inset-inline-start: 0; --z-offset: 8; --z-offset-reverse: 4;"
>
<span
class="rc-table-row-expand-icon rc-table-row-expanded"
/>
</td>
<td
class="rc-table-cell rc-table-cell-fix rc-table-cell-fix-start rc-table-cell-fix-start-shadow"
style="inset-inline-start: 0; --z-offset: 7; --z-offset-reverse: 1;"
style="inset-inline-start: 0; --z-offset: 7; --z-offset-reverse: 5;"
>
Lucy
</td>
Expand All @@ -555,7 +555,7 @@ exports[`Table.Expand > renders fixed column correctly > work 1`] = `
</td>
<td
class="rc-table-cell rc-table-cell-fix rc-table-cell-fix-end rc-table-cell-fix-end-shadow"
style="inset-inline-end: 0; --z-offset: 3; --z-offset-reverse: 5;"
style="inset-inline-end: 0; --z-offset: 3; --z-offset-reverse: 1;"
>
F
</td>
Expand Down Expand Up @@ -583,15 +583,15 @@ exports[`Table.Expand > renders fixed column correctly > work 1`] = `
>
<td
class="rc-table-cell rc-table-row-expand-icon-cell rc-table-cell-fix rc-table-cell-fix-start"
style="inset-inline-start: 0; --z-offset: 8; --z-offset-reverse: 0;"
style="inset-inline-start: 0; --z-offset: 8; --z-offset-reverse: 4;"
>
<span
class="rc-table-row-expand-icon rc-table-row-expanded"
/>
</td>
<td
class="rc-table-cell rc-table-cell-fix rc-table-cell-fix-start rc-table-cell-fix-start-shadow"
style="inset-inline-start: 0; --z-offset: 7; --z-offset-reverse: 1;"
style="inset-inline-start: 0; --z-offset: 7; --z-offset-reverse: 5;"
>
Jack
</td>
Expand All @@ -602,7 +602,7 @@ exports[`Table.Expand > renders fixed column correctly > work 1`] = `
</td>
<td
class="rc-table-cell rc-table-cell-fix rc-table-cell-fix-end rc-table-cell-fix-end-shadow"
style="inset-inline-end: 0; --z-offset: 3; --z-offset-reverse: 5;"
style="inset-inline-end: 0; --z-offset: 3; --z-offset-reverse: 1;"
>
M
</td>
Expand Down Expand Up @@ -1072,7 +1072,7 @@ exports[`Table.Expand > work in expandable fix 2`] = `
</th>
<th
class="rc-table-cell rc-table-row-expand-icon-cell rc-table-cell-fix rc-table-cell-fix-start rc-table-cell-fix-start-shadow"
style="inset-inline-start: 0; --z-offset: 5; --z-offset-reverse: 3;"
style="inset-inline-start: 0; --z-offset: 5; --z-offset-reverse: 7;"
/>
</tr>
</thead>
Expand Down Expand Up @@ -1142,7 +1142,7 @@ exports[`Table.Expand > work in expandable fix 2`] = `
</td>
<td
class="rc-table-cell rc-table-row-expand-icon-cell rc-table-cell-fix rc-table-cell-fix-start rc-table-cell-fix-start-shadow"
style="inset-inline-start: 0; --z-offset: 5; --z-offset-reverse: 3;"
style="inset-inline-start: 0; --z-offset: 5; --z-offset-reverse: 7;"
>
<span
class="rc-table-row-expand-icon rc-table-row-collapsed"
Expand Down Expand Up @@ -1170,7 +1170,7 @@ exports[`Table.Expand > work in expandable fix 2`] = `
</td>
<td
class="rc-table-cell rc-table-row-expand-icon-cell rc-table-cell-fix rc-table-cell-fix-start rc-table-cell-fix-start-shadow"
style="inset-inline-start: 0; --z-offset: 5; --z-offset-reverse: 3;"
style="inset-inline-start: 0; --z-offset: 5; --z-offset-reverse: 7;"
>
<span
class="rc-table-row-expand-icon rc-table-row-collapsed"
Expand Down
Loading