Skip to content

Commit

Permalink
fix horizontal scrollbar showing with resizing
Browse files Browse the repository at this point in the history
  • Loading branch information
@KevinVandy
KevinVandy committed Dec 13, 2023
1 parent e6531fc commit 950bb0b
Show file tree
Hide file tree
Showing 34 changed files with 2,165 additions and 1,729 deletions.
8 changes: 4 additions & 4 deletions apps/material-react-table-docs/components/mdx/ComparisonTable.tsx
View file
Expand Up @@ -20,10 +20,10 @@ const columns: MRT_ColumnDef<(typeof data)[0]>[] = [
cell.getValue() === 'Material React Table'
? theme.palette.primary.main
: cell.getValue() === 'Mantine React Table'
? theme.palette.secondary.light
: cell.getValue() === 'TanStack Table (React Table)'
? theme.palette.error.main
: theme.palette.text.primary,
? theme.palette.secondary.light
: cell.getValue() === 'TanStack Table (React Table)'
? theme.palette.error.main
: theme.palette.text.primary,
fontWeight: 'bold',
textDecoration: 'none',
'&:hover': {
Expand Down
8 changes: 4 additions & 4 deletions apps/material-react-table-docs/components/mdx/InstallCommand.tsx
View file
Expand Up @@ -35,10 +35,10 @@ export const InstallCommand = ({
{tab === 'npm'
? `npm i ${packagesString}`
: tab === 'pnpm'
? `pnpm add ${packagesString}`
: tab === 'yarn'
? `yarn add ${packagesString}`
: `bun add ${packagesString}`}
? `pnpm add ${packagesString}`
: tab === 'yarn'
? `yarn add ${packagesString}`
: `bun add ${packagesString}`}
</SampleCodeSnippet>
</>
);
Expand Down
4 changes: 2 additions & 2 deletions apps/material-react-table-docs/components/mdx/SampleCodeSnippet.tsx
View file
Expand Up @@ -114,8 +114,8 @@ export const SampleCodeSnippet = (props: Props) => {
color: line[0].content.startsWith('-')
? theme.palette.error.main
: line[0].content.startsWith('+')
? theme.palette.success.main
: undefined,
? theme.palette.success.main
: undefined,
}}
>
{line.map((token, key) => (
Expand Down
24 changes: 12 additions & 12 deletions apps/material-react-table-docs/components/mdx/SourceCodeSnippet.tsx
View file
Expand Up @@ -103,10 +103,10 @@ export const SourceCodeSnippet = ({
(codeTab === 'ts'
? typeScriptCode
: codeTab === 'js'
? javaScriptCode
: codeTab === 'legacy'
? legacyCode
: apiCode) ?? '',
? javaScriptCode
: codeTab === 'legacy'
? legacyCode
: apiCode) ?? '',
);
setIsCopied(true);
setTimeout(() => setIsCopied(false), 3000);
Expand Down Expand Up @@ -193,10 +193,10 @@ export const SourceCodeSnippet = ({
codeTab === 'ts'
? 'TS.tsx'
: codeTab === 'js'
? 'JS.js'
: codeTab === 'legacy'
? 'Props.tsx'
: 'API.ts'
? 'JS.js'
: codeTab === 'legacy'
? 'Props.tsx'
: 'API.ts'
}`}
onClick={() => plausible('open-on-github')}
rel="noopener"
Expand Down Expand Up @@ -398,10 +398,10 @@ export const SourceCodeSnippet = ({
(codeTab === 'ts'
? typeScriptCode
: codeTab === 'js'
? javaScriptCode
: codeTab === 'legacy'
? legacyCode
: apiCode) ?? ''
? javaScriptCode
: codeTab === 'legacy'
? legacyCode
: apiCode) ?? ''
}
language={codeTab !== 'js' ? 'tsx' : 'jsx'}
theme={
Expand Down
8 changes: 4 additions & 4 deletions apps/material-react-table-docs/components/navigation/Footer.tsx
View file
Expand Up @@ -36,10 +36,10 @@ export const Footer = () => {
['/'].includes(pathname)
? 'index.tsx'
: ['/docs', '/docs/api', '/docs/examples', '/docs/guides'].includes(
pathname,
)
? '/index.mdx'
: '.mdx'
pathname,
)
? '/index.mdx'
: '.mdx'
}`}
onClick={() => plausible('edit-on-github')}
rel="noopener"
Expand Down
8 changes: 4 additions & 4 deletions apps/material-react-table-docs/components/navigation/MiniNav.tsx
View file
Expand Up @@ -53,10 +53,10 @@ export const MiniNav = () => {
heading.localName === 'h3'
? '1rem'
: heading.localName === 'h4'
? '2rem'
: heading.localName === 'h5'
? '3rem'
: 0,
? '2rem'
: heading.localName === 'h5'
? '3rem'
: 0,
}}
>
<Link
Expand Down
16 changes: 8 additions & 8 deletions apps/material-react-table-docs/components/navigation/SidebarItems.tsx
View file
Expand Up @@ -57,18 +57,18 @@ export const SideBarItems = ({
? theme.palette.secondary.light
: theme.palette.secondary.dark
: !items
? theme.palette.mode === 'dark'
? theme.palette.primary.main
: theme.palette.primary.dark
: depth === 1
? theme.palette.text.primary
: theme.palette.text.secondary,
? theme.palette.mode === 'dark'
? theme.palette.primary.main
: theme.palette.primary.dark
: depth === 1
? theme.palette.text.primary
: theme.palette.text.secondary,
fontSize:
!items && !isSelectedParent
? '0.9rem'
: depth === 1
? '1.25rem'
: '1rem',
? '1.25rem'
: '1rem',
fontWeight: isSelectedParent ? 'bold' : 'normal',
height: items ? '2.5rem' : '2rem',
lineHeight: depth === 0 && !items ? '1.25rem' : '0.75rem',
Expand Down
4 changes: 2 additions & 2 deletions apps/material-react-table-docs/components/navigation/TableOfContentsList.tsx
View file
Expand Up @@ -84,8 +84,8 @@ const TableOfContentsList = ({
...(item.secondaryItems
? item.secondaryItems
: item.items
? item.items
: []),
? item.items
: []),
]}
/>
)}
Expand Down
8 changes: 4 additions & 4 deletions apps/material-react-table-docs/components/prop-tables/TableOptionsTable.tsx
View file
Expand Up @@ -98,10 +98,10 @@ const TableOptionsTable = ({ onlyOptions }: Props) => {
row.original.source === 'MRT'
? 'text.primary'
: row.original.source === 'Material UI'
? 'primary.main'
: row.original.source === 'TanStack Table'
? 'secondary.main'
: undefined
? 'primary.main'
: row.original.source === 'TanStack Table'
? 'secondary.main'
: undefined
}
target={
cell.getValue<string>().startsWith('http')
Expand Down
4 changes: 2 additions & 2 deletions apps/material-react-table-docs/examples/advanced/sandbox/src/JS.js
View file
Expand Up @@ -84,8 +84,8 @@ const Example = () => {
cell.getValue() < 50_000
? theme.palette.error.dark
: cell.getValue() >= 50_000 && cell.getValue() < 75_000
? theme.palette.warning.dark
: theme.palette.success.dark,
? theme.palette.warning.dark
: theme.palette.success.dark,
borderRadius: '0.25rem',
color: '#fff',
maxWidth: '9ch',
Expand Down
6 changes: 3 additions & 3 deletions apps/material-react-table-docs/examples/advanced/sandbox/src/Legacy.tsx
View file
Expand Up @@ -95,9 +95,9 @@ const Example = () => {
cell.getValue<number>() < 50_000
? theme.palette.error.dark
: cell.getValue<number>() >= 50_000 &&
cell.getValue<number>() < 75_000
? theme.palette.warning.dark
: theme.palette.success.dark,
cell.getValue<number>() < 75_000
? theme.palette.warning.dark
: theme.palette.success.dark,
borderRadius: '0.25rem',
color: '#fff',
maxWidth: '9ch',
Expand Down
6 changes: 3 additions & 3 deletions apps/material-react-table-docs/examples/advanced/sandbox/src/TS.tsx
View file
Expand Up @@ -96,9 +96,9 @@ const Example = () => {
cell.getValue<number>() < 50_000
? theme.palette.error.dark
: cell.getValue<number>() >= 50_000 &&
cell.getValue<number>() < 75_000
? theme.palette.warning.dark
: theme.palette.success.dark,
cell.getValue<number>() < 75_000
? theme.palette.warning.dark
: theme.palette.success.dark,
borderRadius: '0.25rem',
color: '#fff',
maxWidth: '9ch',
Expand Down
26 changes: 13 additions & 13 deletions apps/material-react-table-docs/package.json
View file
Expand Up @@ -22,34 +22,34 @@
"@fortawesome/react-fontawesome": "^0.2.0",
"@mdx-js/loader": "^3.0.0",
"@mdx-js/react": "^3.0.0",
"@mui/icons-material": "^5.14.19",
"@mui/material": "^5.14.20",
"@mui/x-date-pickers": "^6.18.3",
"@next/mdx": "^14.0.3",
"@tanstack/react-query": "^5.12.2",
"@mui/icons-material": "^5.15.0",
"@mui/material": "^5.15.0",
"@mui/x-date-pickers": "^6.18.4",
"@next/mdx": "^14.0.4",
"@tanstack/react-query": "^5.13.4",
"@types/mdx": "^2.0.10",
"dayjs": "^1.11.10",
"export-to-csv": "^1.2.1",
"jspdf": "^2.5.1",
"jspdf-autotable": "^3.8.0",
"jspdf-autotable": "^3.8.1",
"material-react-table": "workspace:*",
"next": "14.0.3",
"next": "14.0.4",
"next-sitemap": "^4.2.3",
"prism-react-renderer": "^2.3.0",
"react": "18.2.0",
"react-dom": "18.2.0"
},
"devDependencies": {
"@tanstack/eslint-plugin-query": "^5.12.1",
"@types/node": "^20.10.3",
"@types/react": "^18.2.42",
"@types/node": "^20.10.4",
"@types/react": "^18.2.45",
"@types/react-dom": "^18.2.17",
"@typescript-eslint/eslint-plugin": "^6.13.2",
"@typescript-eslint/parser": "^6.13.2",
"@typescript-eslint/eslint-plugin": "^6.14.0",
"@typescript-eslint/parser": "^6.14.0",
"eslint": "8.55.0",
"eslint-config-next": "14.0.3",
"eslint-config-next": "14.0.4",
"next-plausible": "^3.12.0",
"raw-loader": "^4.0.2",
"typescript": "5.3.2"
"typescript": "5.3.3"
}
}
6 changes: 3 additions & 3 deletions apps/test-cra/package.json
View file
Expand Up @@ -5,9 +5,9 @@
"dependencies": {
"@emotion/react": "^11.11.1",
"@emotion/styled": "^11.11.0",
"@mui/icons-material": "^5.14.19",
"@mui/material": "^5.14.20",
"@mui/x-date-pickers": "^6.18.3",
"@mui/icons-material": "^5.15.0",
"@mui/material": "^5.15.0",
"@mui/x-date-pickers": "^6.18.4",
"@testing-library/jest-dom": "^6.1.5",
"@testing-library/react": "^14.1.2",
"@testing-library/user-event": "^14.5.1",
Expand Down
10 changes: 5 additions & 5 deletions apps/test-remix/package.json
View file
Expand Up @@ -12,9 +12,9 @@
"dependencies": {
"@emotion/react": "^11.11.1",
"@emotion/styled": "^11.11.0",
"@mui/icons-material": "^5.14.19",
"@mui/material": "^5.14.20",
"@mui/x-date-pickers": "^6.18.3",
"@mui/icons-material": "^5.15.0",
"@mui/material": "^5.15.0",
"@mui/x-date-pickers": "^6.18.4",
"@remix-run/css-bundle": "^2.3.1",
"@remix-run/node": "^2.3.1",
"@remix-run/react": "^2.3.1",
Expand All @@ -27,10 +27,10 @@
"devDependencies": {
"@remix-run/dev": "^2.3.1",
"@remix-run/eslint-config": "^2.3.1",
"@types/react": "^18.2.42",
"@types/react": "^18.2.45",
"@types/react-dom": "^18.2.17",
"eslint": "^8.55.0",
"typescript": "^5.3.2"
"typescript": "^5.3.3"
},
"engines": {
"node": ">=18.0.0"
Expand Down
16 changes: 8 additions & 8 deletions apps/test-vite/package.json
View file
Expand Up @@ -12,23 +12,23 @@
"dependencies": {
"@emotion/react": "^11.11.1",
"@emotion/styled": "^11.11.0",
"@mui/icons-material": "^5.14.19",
"@mui/material": "^5.14.20",
"@mui/x-date-pickers": "^6.18.3",
"@mui/icons-material": "^5.15.0",
"@mui/material": "^5.15.0",
"@mui/x-date-pickers": "^6.18.4",
"material-react-table": "workspace:*",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
"devDependencies": {
"@types/react": "^18.2.42",
"@types/react": "^18.2.45",
"@types/react-dom": "^18.2.17",
"@typescript-eslint/eslint-plugin": "^6.13.2",
"@typescript-eslint/parser": "^6.13.2",
"@typescript-eslint/eslint-plugin": "^6.14.0",
"@typescript-eslint/parser": "^6.14.0",
"@vitejs/plugin-react": "^4.2.1",
"eslint": "^8.55.0",
"eslint-plugin-react-hooks": "^4.6.0",
"eslint-plugin-react-refresh": "^0.4.5",
"typescript": "^5.3.2",
"vite": "^5.0.5"
"typescript": "^5.3.3",
"vite": "^5.0.8"
}
}
4 changes: 2 additions & 2 deletions package.json
View file
Expand Up @@ -25,8 +25,8 @@
"storybook:dev": "turbo run storybook"
},
"devDependencies": {
"prettier": "^3.1.0",
"turbo": "^1.10.16"
"prettier": "^3.1.1",
"turbo": "^1.11.2"
},
"engines": {
"node": ">=14.0.0"
Expand Down

1 comment on commit 950bb0b

@vercel
Copy link

@vercel vercel bot commented on 950bb0b Dec 13, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

material-react-table-storybook – ./

material-react-table-storybook.vercel.app
material-react-table-storybook-kevinvandy-s-team.vercel.app
material-react-table-storybook-git-v2-kevinvandy-s-team.vercel.app
www.material-react-table.dev
material-react-table.dev

Please sign in to comment.