Skip to content
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

Jump to bottom

add modules to FilterOptionsMenu, ShowHideColumnsMenu and remove isSubMenu from ShowHideColumnsMenu #152

Merged
merged 2 commits into from
Sep 29, 2023
Merged

add modules to FilterOptionsMenu, ShowHideColumnsMenu and remove isSubMenu from ShowHideColumnsMenu #152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
472bafd
add module to FilterOptionsMenu
naughton Sep 29, 2023
51cb686
remove inline styles from MRT_EditRowModal
naughton Sep 29, 2023
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
6 changes: 6 additions & 0 deletions packages/mantine-react-table/src/menus/MRT_FilterOptionMenu.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
.symbol {
font-size: var(--mantine-font-size-xl);
text-align: center;
width: 2ch;
transform: translateY(-0.1em);
}
26 changes: 5 additions & 21 deletions packages/mantine-react-table/src/menus/MRT_FilterOptionMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Fragment, useMemo } from 'react';
import { Flex, Menu } from '@mantine/core';
import { Menu } from '@mantine/core';
import {
type MRT_FilterOption,
type MRT_Header,
Expand All @@ -8,6 +8,8 @@ import {
type MRT_TableInstance,
} from '../types';

import classes from './MRT_FilterOptionMenu.module.css';

export const mrtFilterOptions = (
localization: MRT_Localization,
): MRT_InternalFilterOption[] => [
Expand Down Expand Up @@ -246,28 +248,10 @@ export const MRT_FilterOptionMenu = <TData extends Record<string, any> = {}>({
handleSelectFilterMode(option as MRT_FilterOption)
}
color={option === filterOption ? 'blue' : undefined}
style={
{
// TODO: move to module
// '& > .mantine-Menu-itemLabel': {
// display: 'flex',
// flexWrap: 'nowrap',
// gap: '1ch',
// },
}
}
value={option}
leftSection={<span className={classes.symbol}>{symbol}</span>}
>
<Flex
style={{
fontSize: '20px',
transform: 'translateY(-2px)',
width: '2ch',
}}
>
{symbol}
</Flex>
<Flex align="center">{label}</Flex>
{label}
</Menu.Item>
{divider && <Menu.Divider />}
</Fragment>
Expand Down
9 changes: 9 additions & 0 deletions packages/mantine-react-table/src/menus/MRT_ShowHideColumnsMenu.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
.root {
max-height: calc(80vh - 100px);
overflow-y: auto;
.content {
padding: 8px;
gap: 8px;
justify-content: space-between;
}
}
28 changes: 9 additions & 19 deletions packages/mantine-react-table/src/menus/MRT_ShowHideColumnsMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,20 @@
import clsx from 'clsx';
import { useMemo, useState } from 'react';
import { Button, Divider, Flex, Menu } from '@mantine/core';

import { MRT_ShowHideColumnsMenuItems } from './MRT_ShowHideColumnsMenuItems';
import { getDefaultColumnOrderIds } from '../column.utils';
import { type MRT_Column, type MRT_TableInstance } from '../types';

import classes from './MRT_ShowHideColumnsMenu.module.css';

interface Props<TData extends Record<string, any> = {}> {
isSubMenu?: boolean;
table: MRT_TableInstance<TData>;
}

export const MRT_ShowHideColumnsMenu = <
TData extends Record<string, any> = {},
>({
isSubMenu,
table,
}: Props<TData>) => {
const {
Expand Down Expand Up @@ -70,20 +72,9 @@ export const MRT_ShowHideColumnsMenu = <
);

return (
<Menu.Dropdown
style={{
maxHeight: 'calc(80vh - 100px)',
overflowY: 'auto',
}}
>
<Flex
style={{
justifyContent: isSubMenu ? 'center' : 'space-between',
padding: '8px',
gap: '8px',
}}
>
{!isSubMenu && enableHiding && (
<Menu.Dropdown className={clsx('mrt-show-hide-columns-menu', classes.root)}>
<Flex className={clsx(classes.content)}>
{enableHiding && (
<Button
disabled={!getIsSomeColumnsVisible()}
onClick={hideAllColumns}
Expand All @@ -92,7 +83,7 @@ export const MRT_ShowHideColumnsMenu = <
{localization.hideAll}
</Button>
)}
{!isSubMenu && enableColumnOrdering && (
{enableColumnOrdering && (
<Button
onClick={() =>
table.setColumnOrder(
Expand All @@ -104,7 +95,7 @@ export const MRT_ShowHideColumnsMenu = <
{localization.resetOrder}
</Button>
)}
{!isSubMenu && enablePinning && (
{enablePinning && (
<Button
disabled={!getIsSomeColumnsPinned()}
onClick={() => table.resetColumnPinning(true)}
Expand All @@ -129,7 +120,6 @@ export const MRT_ShowHideColumnsMenu = <
allColumns={allColumns}
column={column}
hoveredColumn={hoveredColumn}
isSubMenu={isSubMenu}
key={`${index}-${column.id}`}
setHoveredColumn={setHoveredColumn}
table={table}
Expand Down
11 changes: 3 additions & 8 deletions packages/mantine-react-table/src/menus/MRT_ShowHideColumnsMenuItems.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ interface Props<TData extends Record<string, any> = {}> {
allColumns: MRT_Column<TData>[];
column: MRT_Column<TData>;
hoveredColumn: MRT_Column<TData> | null;
isSubMenu?: boolean;
setHoveredColumn: Dispatch<SetStateAction<MRT_Column<TData> | null>>;
table: MRT_TableInstance<TData>;
}
Expand All @@ -38,7 +37,6 @@ export const MRT_ShowHideColumnsMenuItems = <
hoveredColumn,
setHoveredColumn,
column,
isSubMenu,
table,
}: Props<TData>) => {
const theme = useMantineTheme();
Expand Down Expand Up @@ -112,8 +110,7 @@ export const MRT_ShowHideColumnsMenuItems = <
)}
>
<Box className={classes.menu}>
{!isSubMenu &&
columnDefType !== 'group' &&
{columnDefType !== 'group' &&
enableColumnOrdering &&
!allColumns.some(
(col) => col.columnDef.columnDefType === 'group',
Expand All @@ -127,8 +124,7 @@ export const MRT_ShowHideColumnsMenuItems = <
) : (
<Box className={classes.grab} />
))}
{!isSubMenu &&
enablePinning &&
{enablePinning &&
(column.getCanPin() ? (
<MRT_ColumnPinningButtons column={column} table={table} />
) : (
Expand All @@ -142,7 +138,7 @@ export const MRT_ShowHideColumnsMenuItems = <
>
<Switch
checked={switchChecked}
disabled={(isSubMenu && switchChecked) || !column.getCanHide()}
disabled={!column.getCanHide()}
label={columnDef.header}
onChange={() => handleToggleColumnHidden(column)}
className={classes.switch}
Expand All @@ -158,7 +154,6 @@ export const MRT_ShowHideColumnsMenuItems = <
allColumns={allColumns}
column={c}
hoveredColumn={hoveredColumn}
isSubMenu={isSubMenu}
key={`${i}-${c.id}`}
setHoveredColumn={setHoveredColumn}
table={table}
Expand Down
10 changes: 2 additions & 8 deletions packages/mantine-react-table/src/modals/MRT_EditRowModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,17 +75,11 @@ export const MRT_EditRowModal = <TData extends Record<string, any> = {}>({
})) ?? (
<>
<form onSubmit={(e) => e.preventDefault()}>
<Stack
style={{
gap: '24px',
paddingTop: '16px',
width: '100%',
}}
>
<Stack gap="lg" pt={16} pb={24}>
{internalEditComponents}
</Stack>
</form>
<Flex style={{ paddingTop: '24px', justifyContent: 'flex-end' }}>
<Flex justify="flex-end">
<MRT_EditActionButtons row={row} table={table} variant="text" />
</Flex>
</>
Expand Down
Loading