Skip to content

Commit a04f04c

Browse files
authored
fix minor layout (#338)
* fix grab * fix Menu.Divider * fix action * fix hover color * fix fullscreen border
1 parent 9bc36b8 commit a04f04c

9 files changed

Lines changed: 13 additions & 12 deletions

packages/mantine-react-table/src/components/head/MRT_TableHeadCell.module.css

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010
background-clip: padding-box;
1111
font-weight: bold;
1212
overflow: visible;
13-
padding: calc(var(--mrt-table-head-cell-padding) * 1px);
14-
padding-bottom: calc(var(--mrt-table-head-cell-padding) * 2 / 3 * 1px);
1513
position: relative;
1614
transition: padding 150ms ease-in-out;
1715
vertical-align: top;

packages/mantine-react-table/src/components/head/MRT_TableHeadCell.tsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ export const MRT_TableHeadCell = <TData extends MRT_RowData>({
5555
refs: { tableHeadCellRefs },
5656
setHoveredColumn,
5757
} = table;
58-
const { columnSizingInfo, density, draggingColumn, grouping, hoveredColumn } =
58+
const { columnSizingInfo, draggingColumn, grouping, hoveredColumn } =
5959
getState();
6060
const { column } = header;
6161
const { columnDef } = column;
@@ -165,8 +165,6 @@ export const MRT_TableHeadCell = <TData extends MRT_RowData>({
165165
isColumnPinned === 'right'
166166
? `${column.getAfter(isColumnPinned)}`
167167
: undefined,
168-
'--mrt-table-head-cell-padding':
169-
density === 'xl' ? '23' : density === 'md' ? '16' : '10',
170168
}}
171169
align={
172170
columnDefType === 'group'

packages/mantine-react-table/src/components/head/MRT_TableHeadCellFilterLabel.module.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
var(--mantine-color-gray-1),
77
var(--mantine-color-dark-6)
88
);
9+
--ai-hover-color: var(--mantine-color-bright);
910
color: var(--mantine-color-bright);
1011
&[data-active] {
1112
color: var(--mantine-primary-color-filled);

packages/mantine-react-table/src/components/head/MRT_TableHeadCellSortLabel.module.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
var(--mantine-color-gray-1),
77
var(--mantine-color-dark-6)
88
);
9+
--ai-hover-color: var(--mantine-color-bright);
910
color: var(--mantine-color-bright);
1011
&[data-sorted] {
1112
color: var(--mantine-primary-color-filled);

packages/mantine-react-table/src/components/menus/MRT_ShowHideColumnsMenu.module.css

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22
max-height: calc(80vh - 100px);
33
overflow-y: auto;
44
.content {
5-
padding: 8px;
6-
gap: 8px;
5+
padding-top: rem(4px);
6+
padding-bottom: rem(4px);
7+
gap: rem(8px);
78
justify-content: space-between;
89
}
910
}

packages/mantine-react-table/src/components/menus/MRT_ShowHideColumnsMenu.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import clsx from 'clsx';
22
import classes from './MRT_ShowHideColumnsMenu.module.css';
33
import { useMemo, useState } from 'react';
4-
import { Button, Divider, Flex, Menu } from '@mantine/core';
4+
import { Button, Flex, Menu } from '@mantine/core';
55
import { MRT_ShowHideColumnsMenuItems } from './MRT_ShowHideColumnsMenuItems';
66
import {
77
type MRT_Column,
@@ -113,7 +113,7 @@ export const MRT_ShowHideColumnsMenu = <TData extends MRT_RowData>({
113113
</Button>
114114
)}
115115
</Flex>
116-
<Divider />
116+
<Menu.Divider />
117117
{allColumns.map((column, index) => (
118118
<MRT_ShowHideColumnsMenuItems
119119
allColumns={allColumns}

packages/mantine-react-table/src/components/menus/MRT_ShowHideColumnsMenuItems.module.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
gap: rem(8px);
2323
}
2424
.grab {
25-
width: rem(22px);
25+
width: rem(28px);
2626
}
2727
.pin {
2828
width: rem(70px);

packages/mantine-react-table/src/components/table/MRT_TablePaper.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,8 @@ export const MRT_TablePaper = <TData extends MRT_RowData>({
5656
...parseFromValuesOrFunc(tablePaperProps?.style, theme),
5757
...(isFullScreen
5858
? {
59+
border: 0,
60+
borderRadius: 0,
5961
bottom: 0,
6062
height: '100vh',
6163
left: 0,

packages/mantine-react-table/stories/features/ColumnActions.stories.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Divider, Menu } from '@mantine/core';
1+
import { Menu } from '@mantine/core';
22
import { type MRT_ColumnDef, MantineReactTable } from '../../src';
33
import { faker } from '@faker-js/faker';
44
import { type Meta } from '@storybook/react';
@@ -166,7 +166,7 @@ export const CustomColumnActionsPerColumn = () => (
166166
renderColumnActionsMenuItems: ({ internalColumnMenuItems }) => (
167167
<>
168168
{internalColumnMenuItems}
169-
<Divider />
169+
<Menu.Divider />
170170
<Menu.Item>Item 1</Menu.Item>
171171
<Menu.Item>Item 2</Menu.Item>
172172
</>

0 commit comments

Comments
 (0)