Skip to content

Feat/protable shadow #475

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

Open
awxxxxxx wants to merge 4 commits into
base: v2
Choose a base branch
from
Open

Feat/protable shadow #475

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
79b8aee
feat(ProTable): update pin style shadow
awxxxxxx Feb 12, 2025
4ef5a23
fix(ProTable): pin dark style
awxxxxxx Feb 12, 2025
9fef875
fix(ProTable): shadow overflow
awxxxxxx Feb 12, 2025
25ae090
Revert "fix(ProTable): shadow overflow"
awxxxxxx Feb 13, 2025
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
108 changes: 106 additions & 2 deletions packages/uikit/src/biz/Table/ProTable/helpers.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { isFunction } from 'lodash-es'
import { type MRT_TableOptions, type MRT_RowData, useMantineReactTable, MRT_TableInstance } from 'mantine-react-table'

import { IconSwitchVertical02, IconArrowUp, IconArrowDown } from '../../../icons/index.js'
import { type BoxProps, useMantineTheme } from '../../../primitive/index.js'
import { type BoxProps, useComputedColorScheme, useMantineTheme } from '../../../primitive/index.js'
import { mergeSxList } from '../../../utils/index.js'

import { ProTableExtraProps, ProTableOptions } from './types.js'
Expand Down Expand Up @@ -67,6 +67,9 @@ export function mergeProTableProps<T extends Record<string, any>>(props: ProTabl
} = props

const theme = useMantineTheme()
const colorScheme = useComputedColorScheme()
const isDark = colorScheme === 'dark'

const mPaperProps = mergeMProps<NonNullable<MRT_TableOptions<T>['mantinePaperProps']>>(
{
shadow: 'none',
Expand Down Expand Up @@ -162,6 +165,36 @@ export function mergeProTableProps<T extends Record<string, any>>(props: ProTabl
},
'.mrt-table-head-cell-resize-handle': {
marginRight: -7
},
'&[data-column-pinned]': {
'&::before': {
pointerEvents: 'none',
content: '""',
height: '100%',
position: 'absolute',
top: 0,
width: 6,
zIndex: -2
},

"&[data-column-pinned='left']": {
'&[data-last-left-pinned]': {
boxShadow: 'none !important',
'&::before': {
left: '100%',
boxShadow: `6px 0px 6px -6px ${boxShadowColor} inset`
}
}
},
"&[data-column-pinned='right']": {
'&[data-first-right-pinned]': {
boxShadow: 'none !important',
'&::before': {
right: '100%',
boxShadow: `-6px 0px 6px -6px ${boxShadowColor} inset`
}
}
}
}
}
}
Expand All @@ -173,6 +206,10 @@ export function mergeProTableProps<T extends Record<string, any>>(props: ProTabl
}
}, mantineTableBodyCellProps)

// see https://github.com/KevinVandy/mantine-react-table/blob/33cda81122d62fd8064af9d51ccf7f7b7250c4bc/packages/mantine-react-table/src/components/body/MRT_TableBodyRow.module.css#L53-L99

const boxShadowColor = `color-mix(in srgb, var(${isDark ? '--mantine-color-dark-outline' : '--mantine-color-gray-outline'}), transparent 50%)`

const mTableBodyRowProps = mergeMProps<NonNullable<MRT_TableOptions<T>['mantineTableBodyRowProps']>>(() => {
return {
sx: {
Expand All @@ -187,6 +224,40 @@ export function mergeProTableProps<T extends Record<string, any>>(props: ProTabl
},
'&:not([data-selected], [data-row-pinned]) td[data-column-pinned]::before': {
backgroundColor: 'transparent'
},
'&[data-hover]': {
'&:hover': {
'td[data-column-pinned]': {
backgroundColor: 'var(--mrt-row-hover-background-color)'
}
}
},
td: {
'&[data-column-pinned]': {
"&[data-column-pinned='left']": {
'&[data-last-left-pinned]': {
overflow: 'visible',
'&::before': {
pointerEvents: 'none',
left: '100%',
width: 6,
boxShadow: `6px 0px 6px -6px ${boxShadowColor} inset !important`
}
}
},
"&[data-column-pinned='right']": {
'&[data-first-right-pinned]': {
overflow: 'visible',
'&::before': {
pointerEvents: 'none',
width: 6,
left: 'unset',
right: '100%',
boxShadow: `-6px 0px 6px -6px ${boxShadowColor} inset !important`
}
}
}
}
}
}
}
Expand Down Expand Up @@ -224,7 +295,40 @@ export function mergeProTableProps<T extends Record<string, any>>(props: ProTabl

const mTableFooterCellProps = mergeMProps<NonNullable<MRT_TableOptions<T>['mantineTableFooterCellProps']>>(
{
p: 8
p: 8,
sx: {
'&[data-column-pinned]': {
'&::before': {
pointerEvents: 'none',
content: '""',
height: '100%',
position: 'absolute',
top: 0,
width: 6
},

"&[data-column-pinned='left']": {
'&[data-last-left-pinned]': {
boxShadow: 'none',
zIndex: 2,
'&::before': {
top: 0,
left: '100%',
boxShadow: `6px 0px 6px -6px ${boxShadowColor} inset`
}
}
},
"&[data-column-pinned='right']": {
'&[data-first-right-pinned]': {
boxShadow: 'none',
'&::before': {
right: '100%',
boxShadow: `-6px 0px 6px -6px ${boxShadowColor} inset`
}
}
}
}
}
},
mantineTableFooterCellProps
)
Expand Down
2 changes: 1 addition & 1 deletion stories/uikit/biz/ProTable.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ export const Primary: Story = {
},
state: {
columnVisibility: {},
columnPinning: { left: ['position'] }
columnPinning: { left: [], right: ['mass'] }
},
enablePagination: true,
rowCount: 0,
Expand Down