From 08f76c91357dda89168c8a6acc5581dadeaae635 Mon Sep 17 00:00:00 2001 From: Kevin Vandy Date: Mon, 20 Mar 2023 00:04:43 -0500 Subject: [PATCH] release v1.9.0 textOverflow ellipsis improvements row cell hover refactor new multi-sort badge number fixes #403 - not empty and empty filters switch not re-rendering fixes #415 - sort arrow cutoff in non-left alignment fixes #419 - resize handle padding fixes #421 - row action menu click propagation issue new Serbian locales --- .../example-groups/LocaleExamples.tsx | 24 +++- .../localization-i18n-fa/sandbox/src/JS.js | 7 +- .../localization-i18n-fa/sandbox/src/TS.tsx | 5 +- .../localization-i18n-sr-Cyrl-RS/index.tsx | 18 +++ .../sandbox/.gitignore | 5 + .../sandbox/README.md | 6 + .../sandbox/index.html | 13 +++ .../sandbox/package.json | 27 +++++ .../sandbox/src/JS.js | 62 ++++++++++ .../sandbox/src/TS.tsx | 62 ++++++++++ .../sandbox/src/main.tsx | 9 ++ .../sandbox/src/makeData.ts | 23 ++++ .../sandbox/src/vite.env.d.ts | 1 + .../sandbox/tsconfig.json | 31 +++++ .../sandbox/tsconfig.node.json | 8 ++ .../sandbox/vite.config.js | 7 ++ .../localization-i18n-sr-Latn-RS/index.tsx | 18 +++ .../sandbox/.gitignore | 5 + .../sandbox/README.md | 6 + .../sandbox/index.html | 13 +++ .../sandbox/package.json | 27 +++++ .../sandbox/src/JS.js | 62 ++++++++++ .../sandbox/src/TS.tsx | 62 ++++++++++ .../sandbox/src/main.tsx | 9 ++ .../sandbox/src/makeData.ts | 23 ++++ .../sandbox/src/vite.env.d.ts | 1 + .../sandbox/tsconfig.json | 31 +++++ .../sandbox/tsconfig.node.json | 8 ++ .../sandbox/vite.config.js | 7 ++ apps/material-react-table-docs/package.json | 2 +- .../pages/changelog.mdx | 10 ++ .../pages/docs/guides/localization.mdx | 2 +- .../stories/features/ClickToCopy.stories.tsx | 11 ++ .../stories/features/Filtering.stories.tsx | 37 ++++++ .../fixed-bugs/click-propogation.stories.tsx | 72 ++++++++++++ .../stories/styling/Alignment.stories.tsx | 14 +++ package.json | 2 +- packages/material-react-table/package.json | 2 +- .../material-react-table/rollup.config.mjs | 2 + .../src/body/MRT_TableBodyCell.tsx | 23 ++-- .../src/body/MRT_TableBodyRow.tsx | 5 +- .../src/head/MRT_TableHeadCell.tsx | 4 + .../head/MRT_TableHeadCellResizeHandle.tsx | 2 +- .../src/head/MRT_TableHeadCellSortLabel.tsx | 52 +++++---- .../src/menus/MRT_FilterOptionMenu.tsx | 4 +- .../src/menus/MRT_RowActionMenu.tsx | 1 + .../menus/MRT_ShowHideColumnsMenuItems.tsx | 3 +- pnpm-lock.yaml | 106 +++++++++--------- 48 files changed, 825 insertions(+), 109 deletions(-) create mode 100644 apps/material-react-table-docs/examples/localization-i18n-sr-Cyrl-RS/index.tsx create mode 100644 apps/material-react-table-docs/examples/localization-i18n-sr-Cyrl-RS/sandbox/.gitignore create mode 100644 apps/material-react-table-docs/examples/localization-i18n-sr-Cyrl-RS/sandbox/README.md create mode 100644 apps/material-react-table-docs/examples/localization-i18n-sr-Cyrl-RS/sandbox/index.html create mode 100644 apps/material-react-table-docs/examples/localization-i18n-sr-Cyrl-RS/sandbox/package.json create mode 100644 apps/material-react-table-docs/examples/localization-i18n-sr-Cyrl-RS/sandbox/src/JS.js create mode 100644 apps/material-react-table-docs/examples/localization-i18n-sr-Cyrl-RS/sandbox/src/TS.tsx create mode 100644 apps/material-react-table-docs/examples/localization-i18n-sr-Cyrl-RS/sandbox/src/main.tsx create mode 100644 apps/material-react-table-docs/examples/localization-i18n-sr-Cyrl-RS/sandbox/src/makeData.ts create mode 100644 apps/material-react-table-docs/examples/localization-i18n-sr-Cyrl-RS/sandbox/src/vite.env.d.ts create mode 100644 apps/material-react-table-docs/examples/localization-i18n-sr-Cyrl-RS/sandbox/tsconfig.json create mode 100644 apps/material-react-table-docs/examples/localization-i18n-sr-Cyrl-RS/sandbox/tsconfig.node.json create mode 100644 apps/material-react-table-docs/examples/localization-i18n-sr-Cyrl-RS/sandbox/vite.config.js create mode 100644 apps/material-react-table-docs/examples/localization-i18n-sr-Latn-RS/index.tsx create mode 100644 apps/material-react-table-docs/examples/localization-i18n-sr-Latn-RS/sandbox/.gitignore create mode 100644 apps/material-react-table-docs/examples/localization-i18n-sr-Latn-RS/sandbox/README.md create mode 100644 apps/material-react-table-docs/examples/localization-i18n-sr-Latn-RS/sandbox/index.html create mode 100644 apps/material-react-table-docs/examples/localization-i18n-sr-Latn-RS/sandbox/package.json create mode 100644 apps/material-react-table-docs/examples/localization-i18n-sr-Latn-RS/sandbox/src/JS.js create mode 100644 apps/material-react-table-docs/examples/localization-i18n-sr-Latn-RS/sandbox/src/TS.tsx create mode 100644 apps/material-react-table-docs/examples/localization-i18n-sr-Latn-RS/sandbox/src/main.tsx create mode 100644 apps/material-react-table-docs/examples/localization-i18n-sr-Latn-RS/sandbox/src/makeData.ts create mode 100644 apps/material-react-table-docs/examples/localization-i18n-sr-Latn-RS/sandbox/src/vite.env.d.ts create mode 100644 apps/material-react-table-docs/examples/localization-i18n-sr-Latn-RS/sandbox/tsconfig.json create mode 100644 apps/material-react-table-docs/examples/localization-i18n-sr-Latn-RS/sandbox/tsconfig.node.json create mode 100644 apps/material-react-table-docs/examples/localization-i18n-sr-Latn-RS/sandbox/vite.config.js create mode 100644 apps/material-react-table-storybook/stories/fixed-bugs/click-propogation.stories.tsx diff --git a/apps/material-react-table-docs/example-groups/LocaleExamples.tsx b/apps/material-react-table-docs/example-groups/LocaleExamples.tsx index 29d9d26a5..2ddb8e84b 100644 --- a/apps/material-react-table-docs/example-groups/LocaleExamples.tsx +++ b/apps/material-react-table-docs/example-groups/LocaleExamples.tsx @@ -51,6 +51,18 @@ const RO_Table = dynamic(() => import('../examples/localization-i18n-ro'), { const RU_Table = dynamic(() => import('../examples/localization-i18n-ru'), { suspense: true, }); +const SR_Cyrl_RS_Table = dynamic( + () => import('../examples/localization-i18n-sr-Cyrl-RS'), + { + suspense: true, + }, +); +const SR_Latn_RS_Table = dynamic( + () => import('../examples/localization-i18n-sr-Latn-RS'), + { + suspense: true, + }, +); const SV_Table = dynamic(() => import('../examples/localization-i18n-sv'), { suspense: true, }); @@ -92,12 +104,14 @@ const supportedLocales = [ 'pt-BR', 'ro', 'ru', + 'sr-Cyrl-RS', + 'sr-Latn-RS', 'sv', 'tr', 'uk', 'vi', - 'zh-hans', - 'zh-hant', + 'zh-Hans', + 'zh-Hant', ]; const LocaleExamples = () => { @@ -143,12 +157,14 @@ const LocaleExamples = () => { {currentLocale === 'pt-BR' && } {currentLocale === 'ro' && } {currentLocale === 'ru' && } + {currentLocale === 'sr-Cyrl-RS' && } + {currentLocale === 'sr-Latn-RS' && } {currentLocale === 'sv' && } {currentLocale === 'tr' && } {currentLocale === 'uk' && } {currentLocale === 'vi' && } - {currentLocale === 'zh-hans' && } - {currentLocale === 'zh-hant' && } + {currentLocale === 'zh-Hans' && } + {currentLocale === 'zh-Hant' && } diff --git a/apps/material-react-table-docs/examples/localization-i18n-fa/sandbox/src/JS.js b/apps/material-react-table-docs/examples/localization-i18n-fa/sandbox/src/JS.js index daea9f1c1..1e236296b 100644 --- a/apps/material-react-table-docs/examples/localization-i18n-fa/sandbox/src/JS.js +++ b/apps/material-react-table-docs/examples/localization-i18n-fa/sandbox/src/JS.js @@ -7,7 +7,7 @@ import MaterialReactTable, { MRT_ColumnDef } from 'material-react-table'; import { MRT_Localization_FA } from 'material-react-table/locales/fa'; //mock data -import { data, Person } from './makeData'; +import { data } from './makeData'; const columns = [ //column definitions... @@ -33,6 +33,7 @@ const Example = () => { columns={columns} data={data} enableColumnFilterModes + enableColumnResizing enableColumnOrdering enableEditing enablePinning @@ -54,7 +55,9 @@ const ExampleWithThemeProvider = () => { return ( //Setting Material UI locale as best practice to result in better accessibility - +
+ +
); }; diff --git a/apps/material-react-table-docs/examples/localization-i18n-fa/sandbox/src/TS.tsx b/apps/material-react-table-docs/examples/localization-i18n-fa/sandbox/src/TS.tsx index a3cb7659f..f6b936870 100644 --- a/apps/material-react-table-docs/examples/localization-i18n-fa/sandbox/src/TS.tsx +++ b/apps/material-react-table-docs/examples/localization-i18n-fa/sandbox/src/TS.tsx @@ -34,6 +34,7 @@ const Example = () => { data={data} enableColumnFilterModes enableColumnOrdering + enableColumnResizing enableEditing enablePinning enableRowActions @@ -55,7 +56,9 @@ const ExampleWithThemeProvider = () => { return ( //Setting Material UI locale as best practice to result in better accessibility - +
+ +
); }; diff --git a/apps/material-react-table-docs/examples/localization-i18n-sr-Cyrl-RS/index.tsx b/apps/material-react-table-docs/examples/localization-i18n-sr-Cyrl-RS/index.tsx new file mode 100644 index 000000000..3465f74a4 --- /dev/null +++ b/apps/material-react-table-docs/examples/localization-i18n-sr-Cyrl-RS/index.tsx @@ -0,0 +1,18 @@ +import React from 'react'; +import { SourceCodeSnippet } from '../../components/mdx/SourceCodeSnippet'; +import Example from './sandbox/src/TS'; +const JS = require('!!raw-loader!./sandbox/src/JS.js').default; +const TS = require('!!raw-loader!./sandbox/src/TS.tsx').default; + +const ExampleTable = () => { + return ( + + ); +}; + +export default ExampleTable; diff --git a/apps/material-react-table-docs/examples/localization-i18n-sr-Cyrl-RS/sandbox/.gitignore b/apps/material-react-table-docs/examples/localization-i18n-sr-Cyrl-RS/sandbox/.gitignore new file mode 100644 index 000000000..d451ff16c --- /dev/null +++ b/apps/material-react-table-docs/examples/localization-i18n-sr-Cyrl-RS/sandbox/.gitignore @@ -0,0 +1,5 @@ +node_modules +.DS_Store +dist +dist-ssr +*.local diff --git a/apps/material-react-table-docs/examples/localization-i18n-sr-Cyrl-RS/sandbox/README.md b/apps/material-react-table-docs/examples/localization-i18n-sr-Cyrl-RS/sandbox/README.md new file mode 100644 index 000000000..b168d3c4b --- /dev/null +++ b/apps/material-react-table-docs/examples/localization-i18n-sr-Cyrl-RS/sandbox/README.md @@ -0,0 +1,6 @@ +# Example + +To run this example: + +- `npm install` or `yarn` +- `npm run start` or `yarn start` diff --git a/apps/material-react-table-docs/examples/localization-i18n-sr-Cyrl-RS/sandbox/index.html b/apps/material-react-table-docs/examples/localization-i18n-sr-Cyrl-RS/sandbox/index.html new file mode 100644 index 000000000..67a5a5845 --- /dev/null +++ b/apps/material-react-table-docs/examples/localization-i18n-sr-Cyrl-RS/sandbox/index.html @@ -0,0 +1,13 @@ + + + + + + Material React Table Example + + + +
+ + + diff --git a/apps/material-react-table-docs/examples/localization-i18n-sr-Cyrl-RS/sandbox/package.json b/apps/material-react-table-docs/examples/localization-i18n-sr-Cyrl-RS/sandbox/package.json new file mode 100644 index 000000000..b596ab84a --- /dev/null +++ b/apps/material-react-table-docs/examples/localization-i18n-sr-Cyrl-RS/sandbox/package.json @@ -0,0 +1,27 @@ +{ + "name": "material-react-table-example-localization-i18n-sr-cryl-rs", + "version": "0.0.0", + "private": true, + "scripts": { + "dev": "vite --port 3001", + "build": "vite build", + "serve": "vite preview", + "start": "vite" + }, + "dependencies": { + "@emotion/react": "^11.10.5", + "@emotion/styled": "^11.10.5", + "@mui/icons-material": "^5.11.0", + "@mui/material": "^5.11.4", + "material-react-table": "latest", + "react": "^18.2.0", + "react-dom": "^18.2.0" + }, + "devDependencies": { + "@types/react": "^18.0.26", + "@types/react-dom": "^18.0.10", + "@vitejs/plugin-react": "^3.0.1", + "typescript": "^4.9.4", + "vite": "^4.0.4" + } +} diff --git a/apps/material-react-table-docs/examples/localization-i18n-sr-Cyrl-RS/sandbox/src/JS.js b/apps/material-react-table-docs/examples/localization-i18n-sr-Cyrl-RS/sandbox/src/JS.js new file mode 100644 index 000000000..9fe289502 --- /dev/null +++ b/apps/material-react-table-docs/examples/localization-i18n-sr-Cyrl-RS/sandbox/src/JS.js @@ -0,0 +1,62 @@ +import React from 'react'; + +//Import Material React Table and its Types +import MaterialReactTable from 'material-react-table'; + +//Import Material React Table Translations +import { MRT_Localization_SR_CYRL_RS } from 'material-react-table/locales/sr-Cyrl-RS'; + +//mock data +import { data } from './makeData'; + +const columns = [ + //column definitions... + { + accessorKey: 'firstName', + header: 'Име', + }, + { + accessorKey: 'lastName', + header: 'Презиме', + enableClickToCopy: true, + }, + { + accessorKey: 'age', + header: 'Старост', + }, + //end +]; + +const Example = () => { + return ( + + ); +}; + +//App.tsx or similar +import { createTheme, ThemeProvider, useTheme } from '@mui/material'; +import { srRS } from '@mui/material/locale'; + +const ExampleWithThemeProvider = () => { + const theme = useTheme(); //replace with your theme/createTheme + return ( + //Setting Material UI locale as best practice to result in better accessibility + + + + ); +}; + +export default ExampleWithThemeProvider; diff --git a/apps/material-react-table-docs/examples/localization-i18n-sr-Cyrl-RS/sandbox/src/TS.tsx b/apps/material-react-table-docs/examples/localization-i18n-sr-Cyrl-RS/sandbox/src/TS.tsx new file mode 100644 index 000000000..e64660399 --- /dev/null +++ b/apps/material-react-table-docs/examples/localization-i18n-sr-Cyrl-RS/sandbox/src/TS.tsx @@ -0,0 +1,62 @@ +import React from 'react'; + +//Import Material React Table and its Types +import MaterialReactTable, { MRT_ColumnDef } from 'material-react-table'; + +//Import Material React Table Translations +import { MRT_Localization_SR_CYRL_RS } from 'material-react-table/locales/sr-Cyrl-RS'; + +//mock data +import { data, Person } from './makeData'; + +const columns: MRT_ColumnDef[] = [ + //column definitions... + { + accessorKey: 'firstName', + header: 'Име', + }, + { + accessorKey: 'lastName', + header: 'Презиме', + enableClickToCopy: true, + }, + { + accessorKey: 'age', + header: 'Старост', + }, + //end +]; + +const Example = () => { + return ( + + ); +}; + +//App.tsx or similar +import { createTheme, ThemeProvider, useTheme } from '@mui/material'; +import { srRS } from '@mui/material/locale'; + +const ExampleWithThemeProvider = () => { + const theme = useTheme(); //replace with your theme/createTheme + return ( + //Setting Material UI locale as best practice to result in better accessibility + + + + ); +}; + +export default ExampleWithThemeProvider; diff --git a/apps/material-react-table-docs/examples/localization-i18n-sr-Cyrl-RS/sandbox/src/main.tsx b/apps/material-react-table-docs/examples/localization-i18n-sr-Cyrl-RS/sandbox/src/main.tsx new file mode 100644 index 000000000..ae00547ba --- /dev/null +++ b/apps/material-react-table-docs/examples/localization-i18n-sr-Cyrl-RS/sandbox/src/main.tsx @@ -0,0 +1,9 @@ +import React from 'react'; +import ReactDOM from 'react-dom/client'; +import Example from './TS'; + +ReactDOM.createRoot(document.getElementById('root') as HTMLElement).render( + + + , +); diff --git a/apps/material-react-table-docs/examples/localization-i18n-sr-Cyrl-RS/sandbox/src/makeData.ts b/apps/material-react-table-docs/examples/localization-i18n-sr-Cyrl-RS/sandbox/src/makeData.ts new file mode 100644 index 000000000..5bb2fb1ac --- /dev/null +++ b/apps/material-react-table-docs/examples/localization-i18n-sr-Cyrl-RS/sandbox/src/makeData.ts @@ -0,0 +1,23 @@ +export type Person = { + firstName: string; + lastName: string; + age: number; +}; + +export const data: Person[] = [ + { + firstName: 'Kevin', + lastName: 'Vandy', + age: 26, + }, + { + firstName: 'Theodore', + lastName: 'Browne', + age: 28, + }, + { + firstName: 'Tanner', + lastName: 'Linsley', + age: 33, + }, +]; diff --git a/apps/material-react-table-docs/examples/localization-i18n-sr-Cyrl-RS/sandbox/src/vite.env.d.ts b/apps/material-react-table-docs/examples/localization-i18n-sr-Cyrl-RS/sandbox/src/vite.env.d.ts new file mode 100644 index 000000000..11f02fe2a --- /dev/null +++ b/apps/material-react-table-docs/examples/localization-i18n-sr-Cyrl-RS/sandbox/src/vite.env.d.ts @@ -0,0 +1 @@ +/// diff --git a/apps/material-react-table-docs/examples/localization-i18n-sr-Cyrl-RS/sandbox/tsconfig.json b/apps/material-react-table-docs/examples/localization-i18n-sr-Cyrl-RS/sandbox/tsconfig.json new file mode 100644 index 000000000..05c4d41a9 --- /dev/null +++ b/apps/material-react-table-docs/examples/localization-i18n-sr-Cyrl-RS/sandbox/tsconfig.json @@ -0,0 +1,31 @@ +{ + "compilerOptions": { + "target": "ESNext", + "useDefineForClassFields": true, + "lib": [ + "DOM", + "DOM.Iterable", + "ESNext" + ], + "allowJs": true, + "skipLibCheck": true, + "esModuleInterop": false, + "allowSyntheticDefaultImports": true, + "strict": true, + "forceConsistentCasingInFileNames": true, + "module": "ESNext", + "moduleResolution": "Node", + "resolveJsonModule": true, + "isolatedModules": true, + "noEmit": true, + "jsx": "react-jsx" + }, + "include": [ + "src" + ], + "references": [ + { + "path": "./tsconfig.node.json" + } + ] +} \ No newline at end of file diff --git a/apps/material-react-table-docs/examples/localization-i18n-sr-Cyrl-RS/sandbox/tsconfig.node.json b/apps/material-react-table-docs/examples/localization-i18n-sr-Cyrl-RS/sandbox/tsconfig.node.json new file mode 100644 index 000000000..65dbdb96a --- /dev/null +++ b/apps/material-react-table-docs/examples/localization-i18n-sr-Cyrl-RS/sandbox/tsconfig.node.json @@ -0,0 +1,8 @@ +{ + "compilerOptions": { + "composite": true, + "module": "ESNext", + "moduleResolution": "Node" + }, + "include": ["vite.config.ts"] +} diff --git a/apps/material-react-table-docs/examples/localization-i18n-sr-Cyrl-RS/sandbox/vite.config.js b/apps/material-react-table-docs/examples/localization-i18n-sr-Cyrl-RS/sandbox/vite.config.js new file mode 100644 index 000000000..627a31962 --- /dev/null +++ b/apps/material-react-table-docs/examples/localization-i18n-sr-Cyrl-RS/sandbox/vite.config.js @@ -0,0 +1,7 @@ +import { defineConfig } from 'vite'; +import react from '@vitejs/plugin-react'; + +// https://vitejs.dev/config/ +export default defineConfig({ + plugins: [react()], +}); diff --git a/apps/material-react-table-docs/examples/localization-i18n-sr-Latn-RS/index.tsx b/apps/material-react-table-docs/examples/localization-i18n-sr-Latn-RS/index.tsx new file mode 100644 index 000000000..c224cdde8 --- /dev/null +++ b/apps/material-react-table-docs/examples/localization-i18n-sr-Latn-RS/index.tsx @@ -0,0 +1,18 @@ +import React from 'react'; +import { SourceCodeSnippet } from '../../components/mdx/SourceCodeSnippet'; +import Example from './sandbox/src/TS'; +const JS = require('!!raw-loader!./sandbox/src/JS.js').default; +const TS = require('!!raw-loader!./sandbox/src/TS.tsx').default; + +const ExampleTable = () => { + return ( + + ); +}; + +export default ExampleTable; diff --git a/apps/material-react-table-docs/examples/localization-i18n-sr-Latn-RS/sandbox/.gitignore b/apps/material-react-table-docs/examples/localization-i18n-sr-Latn-RS/sandbox/.gitignore new file mode 100644 index 000000000..d451ff16c --- /dev/null +++ b/apps/material-react-table-docs/examples/localization-i18n-sr-Latn-RS/sandbox/.gitignore @@ -0,0 +1,5 @@ +node_modules +.DS_Store +dist +dist-ssr +*.local diff --git a/apps/material-react-table-docs/examples/localization-i18n-sr-Latn-RS/sandbox/README.md b/apps/material-react-table-docs/examples/localization-i18n-sr-Latn-RS/sandbox/README.md new file mode 100644 index 000000000..b168d3c4b --- /dev/null +++ b/apps/material-react-table-docs/examples/localization-i18n-sr-Latn-RS/sandbox/README.md @@ -0,0 +1,6 @@ +# Example + +To run this example: + +- `npm install` or `yarn` +- `npm run start` or `yarn start` diff --git a/apps/material-react-table-docs/examples/localization-i18n-sr-Latn-RS/sandbox/index.html b/apps/material-react-table-docs/examples/localization-i18n-sr-Latn-RS/sandbox/index.html new file mode 100644 index 000000000..67a5a5845 --- /dev/null +++ b/apps/material-react-table-docs/examples/localization-i18n-sr-Latn-RS/sandbox/index.html @@ -0,0 +1,13 @@ + + + + + + Material React Table Example + + + +
+ + + diff --git a/apps/material-react-table-docs/examples/localization-i18n-sr-Latn-RS/sandbox/package.json b/apps/material-react-table-docs/examples/localization-i18n-sr-Latn-RS/sandbox/package.json new file mode 100644 index 000000000..f4cee3f9e --- /dev/null +++ b/apps/material-react-table-docs/examples/localization-i18n-sr-Latn-RS/sandbox/package.json @@ -0,0 +1,27 @@ +{ + "name": "material-react-table-example-localization-i18n-sr-latn-rs", + "version": "0.0.0", + "private": true, + "scripts": { + "dev": "vite --port 3001", + "build": "vite build", + "serve": "vite preview", + "start": "vite" + }, + "dependencies": { + "@emotion/react": "^11.10.5", + "@emotion/styled": "^11.10.5", + "@mui/icons-material": "^5.11.0", + "@mui/material": "^5.11.4", + "material-react-table": "latest", + "react": "^18.2.0", + "react-dom": "^18.2.0" + }, + "devDependencies": { + "@types/react": "^18.0.26", + "@types/react-dom": "^18.0.10", + "@vitejs/plugin-react": "^3.0.1", + "typescript": "^4.9.4", + "vite": "^4.0.4" + } +} diff --git a/apps/material-react-table-docs/examples/localization-i18n-sr-Latn-RS/sandbox/src/JS.js b/apps/material-react-table-docs/examples/localization-i18n-sr-Latn-RS/sandbox/src/JS.js new file mode 100644 index 000000000..f84e6d7d2 --- /dev/null +++ b/apps/material-react-table-docs/examples/localization-i18n-sr-Latn-RS/sandbox/src/JS.js @@ -0,0 +1,62 @@ +import React from 'react'; + +//Import Material React Table and its Types +import MaterialReactTable from 'material-react-table'; + +//Import Material React Table Translations +import { MRT_Localization_SR_LATN_RS } from 'material-react-table/locales/sr-Latn-RS'; + +//mock data +import { data } from './makeData'; + +const columns = [ + //column definitions... + { + accessorKey: 'firstName', + header: 'Име', + }, + { + accessorKey: 'lastName', + header: 'Презиме', + enableClickToCopy: true, + }, + { + accessorKey: 'age', + header: 'Старост', + }, + //end +]; + +const Example = () => { + return ( + + ); +}; + +//App.tsx or similar +import { createTheme, ThemeProvider, useTheme } from '@mui/material'; +import { srRS } from '@mui/material/locale'; + +const ExampleWithThemeProvider = () => { + const theme = useTheme(); //replace with your theme/createTheme + return ( + //Setting Material UI locale as best practice to result in better accessibility + + + + ); +}; + +export default ExampleWithThemeProvider; diff --git a/apps/material-react-table-docs/examples/localization-i18n-sr-Latn-RS/sandbox/src/TS.tsx b/apps/material-react-table-docs/examples/localization-i18n-sr-Latn-RS/sandbox/src/TS.tsx new file mode 100644 index 000000000..f1cd71d68 --- /dev/null +++ b/apps/material-react-table-docs/examples/localization-i18n-sr-Latn-RS/sandbox/src/TS.tsx @@ -0,0 +1,62 @@ +import React from 'react'; + +//Import Material React Table and its Types +import MaterialReactTable, { MRT_ColumnDef } from 'material-react-table'; + +//Import Material React Table Translations +import { MRT_Localization_SR_LATN_RS } from 'material-react-table/locales/sr-Latn-RS'; + +//mock data +import { data, Person } from './makeData'; + +const columns: MRT_ColumnDef[] = [ + //column definitions... + { + accessorKey: 'firstName', + header: 'Име', + }, + { + accessorKey: 'lastName', + header: 'Презиме', + enableClickToCopy: true, + }, + { + accessorKey: 'age', + header: 'Старост', + }, + //end +]; + +const Example = () => { + return ( + + ); +}; + +//App.tsx or similar +import { createTheme, ThemeProvider, useTheme } from '@mui/material'; +import { srRS } from '@mui/material/locale'; + +const ExampleWithThemeProvider = () => { + const theme = useTheme(); //replace with your theme/createTheme + return ( + //Setting Material UI locale as best practice to result in better accessibility + + + + ); +}; + +export default ExampleWithThemeProvider; diff --git a/apps/material-react-table-docs/examples/localization-i18n-sr-Latn-RS/sandbox/src/main.tsx b/apps/material-react-table-docs/examples/localization-i18n-sr-Latn-RS/sandbox/src/main.tsx new file mode 100644 index 000000000..ae00547ba --- /dev/null +++ b/apps/material-react-table-docs/examples/localization-i18n-sr-Latn-RS/sandbox/src/main.tsx @@ -0,0 +1,9 @@ +import React from 'react'; +import ReactDOM from 'react-dom/client'; +import Example from './TS'; + +ReactDOM.createRoot(document.getElementById('root') as HTMLElement).render( + + + , +); diff --git a/apps/material-react-table-docs/examples/localization-i18n-sr-Latn-RS/sandbox/src/makeData.ts b/apps/material-react-table-docs/examples/localization-i18n-sr-Latn-RS/sandbox/src/makeData.ts new file mode 100644 index 000000000..5bb2fb1ac --- /dev/null +++ b/apps/material-react-table-docs/examples/localization-i18n-sr-Latn-RS/sandbox/src/makeData.ts @@ -0,0 +1,23 @@ +export type Person = { + firstName: string; + lastName: string; + age: number; +}; + +export const data: Person[] = [ + { + firstName: 'Kevin', + lastName: 'Vandy', + age: 26, + }, + { + firstName: 'Theodore', + lastName: 'Browne', + age: 28, + }, + { + firstName: 'Tanner', + lastName: 'Linsley', + age: 33, + }, +]; diff --git a/apps/material-react-table-docs/examples/localization-i18n-sr-Latn-RS/sandbox/src/vite.env.d.ts b/apps/material-react-table-docs/examples/localization-i18n-sr-Latn-RS/sandbox/src/vite.env.d.ts new file mode 100644 index 000000000..11f02fe2a --- /dev/null +++ b/apps/material-react-table-docs/examples/localization-i18n-sr-Latn-RS/sandbox/src/vite.env.d.ts @@ -0,0 +1 @@ +/// diff --git a/apps/material-react-table-docs/examples/localization-i18n-sr-Latn-RS/sandbox/tsconfig.json b/apps/material-react-table-docs/examples/localization-i18n-sr-Latn-RS/sandbox/tsconfig.json new file mode 100644 index 000000000..05c4d41a9 --- /dev/null +++ b/apps/material-react-table-docs/examples/localization-i18n-sr-Latn-RS/sandbox/tsconfig.json @@ -0,0 +1,31 @@ +{ + "compilerOptions": { + "target": "ESNext", + "useDefineForClassFields": true, + "lib": [ + "DOM", + "DOM.Iterable", + "ESNext" + ], + "allowJs": true, + "skipLibCheck": true, + "esModuleInterop": false, + "allowSyntheticDefaultImports": true, + "strict": true, + "forceConsistentCasingInFileNames": true, + "module": "ESNext", + "moduleResolution": "Node", + "resolveJsonModule": true, + "isolatedModules": true, + "noEmit": true, + "jsx": "react-jsx" + }, + "include": [ + "src" + ], + "references": [ + { + "path": "./tsconfig.node.json" + } + ] +} \ No newline at end of file diff --git a/apps/material-react-table-docs/examples/localization-i18n-sr-Latn-RS/sandbox/tsconfig.node.json b/apps/material-react-table-docs/examples/localization-i18n-sr-Latn-RS/sandbox/tsconfig.node.json new file mode 100644 index 000000000..65dbdb96a --- /dev/null +++ b/apps/material-react-table-docs/examples/localization-i18n-sr-Latn-RS/sandbox/tsconfig.node.json @@ -0,0 +1,8 @@ +{ + "compilerOptions": { + "composite": true, + "module": "ESNext", + "moduleResolution": "Node" + }, + "include": ["vite.config.ts"] +} diff --git a/apps/material-react-table-docs/examples/localization-i18n-sr-Latn-RS/sandbox/vite.config.js b/apps/material-react-table-docs/examples/localization-i18n-sr-Latn-RS/sandbox/vite.config.js new file mode 100644 index 000000000..627a31962 --- /dev/null +++ b/apps/material-react-table-docs/examples/localization-i18n-sr-Latn-RS/sandbox/vite.config.js @@ -0,0 +1,7 @@ +import { defineConfig } from 'vite'; +import react from '@vitejs/plugin-react'; + +// https://vitejs.dev/config/ +export default defineConfig({ + plugins: [react()], +}); diff --git a/apps/material-react-table-docs/package.json b/apps/material-react-table-docs/package.json index 4c7ab1322..636edc6cf 100644 --- a/apps/material-react-table-docs/package.json +++ b/apps/material-react-table-docs/package.json @@ -30,7 +30,7 @@ "dayjs": "^1.11.7", "export-to-csv": "^0.2.1", "material-react-table": "workspace:*", - "next": "13.1.0", + "next": "13.1.6", "next-sitemap": "^3.1.54", "prism-react-renderer": "^1.3.5", "react": "18.2.0", diff --git a/apps/material-react-table-docs/pages/changelog.mdx b/apps/material-react-table-docs/pages/changelog.mdx index eca06f18a..167b80082 100644 --- a/apps/material-react-table-docs/pages/changelog.mdx +++ b/apps/material-react-table-docs/pages/changelog.mdx @@ -12,6 +12,16 @@ import Head from 'next/head'; ### Version 1 (Latest) +#### v1.9.0 (2023-03-19) + +- added new multi-sort badge number to sort label +- added new Serbian locales +- improved textOverflow ellipsis +- fixed not empty and empty filters switch not re-rendering +- fixed sort arrow cutoff in non-left alignment +- fixed row action menu click propagation issue +- refactored row cell hover + #### v1.8.5 (2023-03-09) - Used more comprehensive regex to create css vars for column resizing from column ids/accessorKeys diff --git a/apps/material-react-table-docs/pages/docs/guides/localization.mdx b/apps/material-react-table-docs/pages/docs/guides/localization.mdx index 0e49a7dd6..109f8f3e9 100644 --- a/apps/material-react-table-docs/pages/docs/guides/localization.mdx +++ b/apps/material-react-table-docs/pages/docs/guides/localization.mdx @@ -22,7 +22,7 @@ Material React Table has full support for localization (i18n). Some locales are The following locales are included and can be imported from `'material-react-table/locales/'`: -`cs`, `da`, `de`, `en`, `es`, `fa`, `fr`, `it`, `nl`, `ja`, `pl`, `pt`, `pt-BR`, `ro`, `ru`, `sv`, `tr`, `uk`, `vi`, `zh-Hans`, `zh-Hant` +`cs`, `da`, `de`, `en`, `es`, `fa`, `fr`, `it`, `nl`, `ja`, `pl`, `pt`, `pt-BR`, `ro`, `ru`, `sr-Cryl-RS`, `sr-Latn-RS`, `sv`, `tr`, `uk`, `vi`, `zh-Hans`, `zh-Hant` > If your language is not yet supported, please consider making a PR to add it to the library! See [here on GitHub](https://github.com/KevinVandy/material-react-table/tree/main/packages/material-react-table/src/_locales). diff --git a/apps/material-react-table-storybook/stories/features/ClickToCopy.stories.tsx b/apps/material-react-table-storybook/stories/features/ClickToCopy.stories.tsx index 394abea62..cc90504c1 100644 --- a/apps/material-react-table-storybook/stories/features/ClickToCopy.stories.tsx +++ b/apps/material-react-table-storybook/stories/features/ClickToCopy.stories.tsx @@ -54,6 +54,17 @@ export const ClickToCopyEnabled: Story = () => ( ); +export const ClickToCopyEnabledWithColumnResizing: Story< + MaterialReactTableProps +> = () => ( + +); + export const ClickToCopyEnabledPerColumn: Story< MaterialReactTableProps > = () => ( diff --git a/apps/material-react-table-storybook/stories/features/Filtering.stories.tsx b/apps/material-react-table-storybook/stories/features/Filtering.stories.tsx index 94535656c..87c693ce2 100644 --- a/apps/material-react-table-storybook/stories/features/Filtering.stories.tsx +++ b/apps/material-react-table-storybook/stories/features/Filtering.stories.tsx @@ -190,6 +190,43 @@ export const FilteringChangeModeEnabled: Story< /> ); +export const FilteringChangeModeEnabledHidden: Story< + MaterialReactTableProps +> = () => ( + +); + export const DisableSomeFilterTypesForCertainColumns: Story< MaterialReactTableProps > = () => ( diff --git a/apps/material-react-table-storybook/stories/fixed-bugs/click-propogation.stories.tsx b/apps/material-react-table-storybook/stories/fixed-bugs/click-propogation.stories.tsx new file mode 100644 index 000000000..459c30f83 --- /dev/null +++ b/apps/material-react-table-storybook/stories/fixed-bugs/click-propogation.stories.tsx @@ -0,0 +1,72 @@ +import React from 'react'; +import { Meta, Story } from '@storybook/react'; +import MaterialReactTable, { + MaterialReactTableProps, + MRT_ColumnDef, +} from 'material-react-table'; +import { faker } from '@faker-js/faker'; +import { MenuItem } from '@mui/material'; + +const meta: Meta = { + title: 'Fixed Bugs/Click Propogation', +}; + +export default meta; + +type Person = { + firstName: string; + lastName: string; + address: string; + city: string; + state: string; +}; + +const columns: MRT_ColumnDef[] = [ + { + accessorKey: 'firstName', + header: 'First Name', + }, + { + accessorKey: 'lastName', + header: 'Last Name', + }, + { + accessorKey: 'address', + header: 'Address', + }, + { + accessorKey: 'city', + header: 'City', + }, + { + accessorKey: 'state', + header: 'State', + }, +]; + +const data = [...Array(6)].map(() => ({ + firstName: faker.name.firstName(), + lastName: faker.name.lastName(), + address: faker.address.streetAddress(), + city: faker.address.city(), + state: faker.address.state(), +})); + +export const RowClickAndRowActions: Story = () => { + return ( + [ + event.stopPropagation()}>Test, + ]} + muiTableBodyRowProps={{ + onClick: () => { + alert('row click'); + }, + }} + /> + ); +}; diff --git a/apps/material-react-table-storybook/stories/styling/Alignment.stories.tsx b/apps/material-react-table-storybook/stories/styling/Alignment.stories.tsx index c3600c532..9dfb0fd79 100644 --- a/apps/material-react-table-storybook/stories/styling/Alignment.stories.tsx +++ b/apps/material-react-table-storybook/stories/styling/Alignment.stories.tsx @@ -52,6 +52,20 @@ export const DefaultLeft: Story = () => ( ); +export const RightCells: Story = () => ( + +); + export const CenterCells: Story = () => ( =14.0.0" diff --git a/packages/material-react-table/package.json b/packages/material-react-table/package.json index 74d4cdf34..1f2d92c56 100644 --- a/packages/material-react-table/package.json +++ b/packages/material-react-table/package.json @@ -1,5 +1,5 @@ { - "version": "1.8.5", + "version": "1.9.0", "license": "MIT", "name": "material-react-table", "description": "A fully featured Material UI V5 implementation of TanStack React Table V8, written from the ground up in TypeScript.", diff --git a/packages/material-react-table/rollup.config.mjs b/packages/material-react-table/rollup.config.mjs index e84fbfdc6..eda4317b8 100644 --- a/packages/material-react-table/rollup.config.mjs +++ b/packages/material-react-table/rollup.config.mjs @@ -21,6 +21,8 @@ const supportedLocales = [ 'pt-BR', 'ro', 'ru', + 'sr-Cyrl-RS', + 'sr-Latn-RS', 'sv', 'tr', 'uk', diff --git a/packages/material-react-table/src/body/MRT_TableBodyCell.tsx b/packages/material-react-table/src/body/MRT_TableBodyCell.tsx index 57488bd50..b99b468bb 100644 --- a/packages/material-react-table/src/body/MRT_TableBodyCell.tsx +++ b/packages/material-react-table/src/body/MRT_TableBodyCell.tsx @@ -9,7 +9,7 @@ import React, { } from 'react'; import Skeleton from '@mui/material/Skeleton'; import TableCell from '@mui/material/TableCell'; -import { darken, lighten, useTheme } from '@mui/material/styles'; +import { useTheme } from '@mui/material/styles'; import { MRT_EditCellTextField } from '../inputs/MRT_EditCellTextField'; import { MRT_CopyButton } from '../buttons/MRT_CopyButton'; import { MRT_TableBodyRowGrabHandle } from './MRT_TableBodyRowGrabHandle'; @@ -24,7 +24,6 @@ import type { MRT_Cell, MRT_TableInstance } from '..'; interface Props { cell: MRT_Cell; - enableHover?: boolean; measureElement?: (element: HTMLTableCellElement) => void; numRows: number; rowIndex: number; @@ -35,7 +34,6 @@ interface Props { export const MRT_TableBodyCell = ({ cell, - enableHover, measureElement, numRows, rowIndex, @@ -237,14 +235,11 @@ export const MRT_TableBodyCell = ({ zIndex: draggingColumn?.id === column.id ? 2 : column.getIsPinned() ? 1 : 0, '&:hover': { - backgroundColor: - enableHover && - isEditable && - ['table', 'cell'].includes(editingMode ?? '') - ? theme.palette.mode === 'dark' - ? `${lighten(theme.palette.background.default, 0.2)} !important` - : `${darken(theme.palette.background.default, 0.1)} !important` - : undefined, + outline: ['table', 'cell'].includes(editingMode ?? '') + ? `1px solid ${theme.palette.text.secondary}` + : undefined, + outlineOffset: '-1px', + textOverflow: 'clip', }, ...getCommonCellStyles({ column, @@ -296,10 +291,10 @@ export const MRT_TableBodyCell = ({ ) : ( )} + {cell.getIsGrouped() && !columnDef.GroupedCell && ( + <> ({row.subRows?.length}) + )} - {cell.getIsGrouped() && !columnDef.GroupedCell && ( - <> ({row.subRows?.length}) - )} ); }; diff --git a/packages/material-react-table/src/body/MRT_TableBodyRow.tsx b/packages/material-react-table/src/body/MRT_TableBodyRow.tsx index 44ce5ece7..ad2c2a352 100644 --- a/packages/material-react-table/src/body/MRT_TableBodyRow.tsx +++ b/packages/material-react-table/src/body/MRT_TableBodyRow.tsx @@ -32,7 +32,6 @@ export const MRT_TableBodyRow = ({ virtualRow, }: Props) => { const { - getIsSomeColumnsPinned, getState, options: { enableRowOrdering, @@ -63,7 +62,6 @@ export const MRT_TableBodyRow = ({ <> { @@ -87,7 +85,7 @@ export const MRT_TableBodyRow = ({ width: '100%', '&:hover td': { backgroundColor: - tableRowProps?.hover !== false && getIsSomeColumnsPinned() + tableRowProps?.hover !== false ? theme.palette.mode === 'dark' ? `${lighten(theme.palette.background.default, 0.12)}` : `${darken(theme.palette.background.default, 0.05)}` @@ -107,7 +105,6 @@ export const MRT_TableBodyRow = ({ : (cellOrVirtualCell as MRT_Cell); const props = { cell, - enableHover: tableRowProps?.hover !== false, key: cell.id, measureElement: columnVirtualizer?.measureElement, numRows, diff --git a/packages/material-react-table/src/head/MRT_TableHeadCell.tsx b/packages/material-react-table/src/head/MRT_TableHeadCell.tsx index be00cb32a..eeff5e120 100644 --- a/packages/material-react-table/src/head/MRT_TableHeadCell.tsx +++ b/packages/material-react-table/src/head/MRT_TableHeadCell.tsx @@ -213,10 +213,14 @@ export const MRT_TableHeadCell = ({ header, table }: Props) => { diff --git a/packages/material-react-table/src/head/MRT_TableHeadCellResizeHandle.tsx b/packages/material-react-table/src/head/MRT_TableHeadCellResizeHandle.tsx index e8660a1b9..af08c355e 100644 --- a/packages/material-react-table/src/head/MRT_TableHeadCellResizeHandle.tsx +++ b/packages/material-react-table/src/head/MRT_TableHeadCellResizeHandle.tsx @@ -31,7 +31,7 @@ export const MRT_TableHeadCellResizeHandle = ({ header, table }: Props) => { onTouchStart={header.getResizeHandler()} sx={(theme) => ({ cursor: 'col-resize', - mr: density === 'compact' ? '-0.5rem' : '-1rem', + mr: density === 'compact' ? '-0.75rem' : '-1rem', position: 'absolute', right: '1px', px: '4px', diff --git a/packages/material-react-table/src/head/MRT_TableHeadCellSortLabel.tsx b/packages/material-react-table/src/head/MRT_TableHeadCellSortLabel.tsx index 770e5e474..f3124a863 100644 --- a/packages/material-react-table/src/head/MRT_TableHeadCellSortLabel.tsx +++ b/packages/material-react-table/src/head/MRT_TableHeadCellSortLabel.tsx @@ -1,4 +1,5 @@ import React from 'react'; +import Badge from '@mui/material/Badge'; import TableSortLabel from '@mui/material/TableSortLabel'; import Tooltip from '@mui/material/Tooltip'; import { MRT_Header, MRT_TableInstance } from '..'; @@ -16,6 +17,7 @@ export const MRT_TableHeadCellSortLabel = ({ tableCellProps, }: Props) => { const { + getState, options: { icons: { ArrowDownwardIcon }, localization, @@ -23,6 +25,7 @@ export const MRT_TableHeadCellSortLabel = ({ } = table; const { column } = header; const { columnDef } = column; + const { sorting } = getState(); const sortTooltip = column.getIsSorted() ? column.getIsSorted() === 'desc' @@ -32,28 +35,33 @@ export const MRT_TableHeadCellSortLabel = ({ return ( - { - e.stopPropagation(); - header.column.getToggleSortingHandler()?.(e); - }} - /> + 1 ? column.getSortIndex() + 1 : 0} + overlap="circular" + > + { + e.stopPropagation(); + header.column.getToggleSortingHandler()?.(e); + }} + /> + ); }; diff --git a/packages/material-react-table/src/menus/MRT_FilterOptionMenu.tsx b/packages/material-react-table/src/menus/MRT_FilterOptionMenu.tsx index 2de9fc32b..b87b89849 100644 --- a/packages/material-react-table/src/menus/MRT_FilterOptionMenu.tsx +++ b/packages/material-react-table/src/menus/MRT_FilterOptionMenu.tsx @@ -156,9 +156,7 @@ export const MRT_FilterOptionMenu = = {}>({ [header.id]: option, })); if (['empty', 'notEmpty'].includes(option as string)) { - if (currentFilterValue !== ' ') { - column.setFilterValue(' '); - } + column.setFilterValue(' '); } else if ( columnDef?.filterVariant === 'multi-select' || ['arrIncludesSome', 'arrIncludesAll', 'arrIncludes'].includes( diff --git a/packages/material-react-table/src/menus/MRT_RowActionMenu.tsx b/packages/material-react-table/src/menus/MRT_RowActionMenu.tsx index d7bcb6f65..8d296fa78 100644 --- a/packages/material-react-table/src/menus/MRT_RowActionMenu.tsx +++ b/packages/material-react-table/src/menus/MRT_RowActionMenu.tsx @@ -39,6 +39,7 @@ export const MRT_RowActionMenu = ({ event.stopPropagation()} onClose={() => setAnchorEl(null)} MenuListProps={{ dense: density === 'compact', diff --git a/packages/material-react-table/src/menus/MRT_ShowHideColumnsMenuItems.tsx b/packages/material-react-table/src/menus/MRT_ShowHideColumnsMenuItems.tsx index d7760b8f0..585dd2237 100644 --- a/packages/material-react-table/src/menus/MRT_ShowHideColumnsMenuItems.tsx +++ b/packages/material-react-table/src/menus/MRT_ShowHideColumnsMenuItems.tsx @@ -98,8 +98,9 @@ export const MRT_ShowHideColumnsMenuItems = < justifyContent: 'flex-start', my: 0, opacity: isDragging ? 0.5 : 1, + outlineOffset: '-2px', outline: isDragging - ? `1px dashed ${theme.palette.divider}` + ? `2px dashed ${theme.palette.divider}` : hoveredColumn?.id === column.id ? `2px dashed ${theme.palette.primary.main}` : 'none', diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 79a680613..086ca48e8 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -5,7 +5,7 @@ importers: .: specifiers: prettier: ^2.8.4 - turbo: ^1.8.3 + turbo: ^1.7.4 devDependencies: prettier: 2.8.4 turbo: 1.8.3 @@ -35,7 +35,7 @@ importers: eslint-config-next: 13.2.1 export-to-csv: ^0.2.1 material-react-table: workspace:* - next: 13.1.0 + next: 13.1.6 next-plausible: ^3.7.2 next-sitemap: ^3.1.54 prism-react-renderer: ^1.3.5 @@ -62,8 +62,8 @@ importers: dayjs: 1.11.7 export-to-csv: 0.2.1 material-react-table: link:../../packages/material-react-table - next: 13.1.0_biqbaboplfbrettd7655fr4n2y - next-sitemap: 3.1.54_next@13.1.0 + next: 13.1.6_biqbaboplfbrettd7655fr4n2y + next-sitemap: 3.1.54_next@13.1.6 prism-react-renderer: 1.3.5_react@18.2.0 react: 18.2.0 react-dom: 18.2.0_react@18.2.0 @@ -73,7 +73,7 @@ importers: '@types/react-dom': 18.0.11 eslint: 8.35.0 eslint-config-next: 13.2.1_ycpbpc6yetojsgtrx3mwntkhsu - next-plausible: 3.7.2_s75y6mxmikaw2mhqmuko6w7njm + next-plausible: 3.7.2_3vryta7zmbcsw4rrqf4axjqggm raw-loader: 4.0.2 typescript: 4.9.5 @@ -2819,8 +2819,8 @@ packages: rifm: 0.12.1_react@18.2.0 dev: false - /@next/env/13.1.0: - resolution: {integrity: sha512-6iNixFzCndH+Bl4FetQzOMjxCJqg8fs0LAlZviig1K6mIjOWH2m2oPcHcOg1Ta5VCe7Bx5KG1Hs+NrWDUkBt9A==} + /@next/env/13.1.6: + resolution: {integrity: sha512-s+W9Fdqh5MFk6ECrbnVmmAOwxKQuhGMT7xXHrkYIBMBcTiOqNWhv5KbJIboKR5STXxNXl32hllnvKaffzFaWQg==} /@next/eslint-plugin-next/13.2.1: resolution: {integrity: sha512-r0i5rcO6SMAZtqiGarUVMr3k256X0R0j6pEkKg4PxqUW+hG0qgMxRVAJsuoRG5OBFkCOlSfWZJ0mP9fQdCcyNg==} @@ -2844,104 +2844,104 @@ packages: source-map: 0.7.4 dev: false - /@next/swc-android-arm-eabi/13.1.0: - resolution: {integrity: sha512-ANBZZRjZBV+Sii11ZVxbxSvfIi6dZwu4w+XnJBDmz+0/wtAigpjYWyMkuWZ/RCD7INdusOlU4EgJ99WzWGIDjA==} + /@next/swc-android-arm-eabi/13.1.6: + resolution: {integrity: sha512-F3/6Z8LH/pGlPzR1AcjPFxx35mPqjE5xZcf+IL+KgbW9tMkp7CYi1y7qKrEWU7W4AumxX/8OINnDQWLiwLasLQ==} engines: {node: '>= 10'} cpu: [arm] os: [android] requiresBuild: true optional: true - /@next/swc-android-arm64/13.1.0: - resolution: {integrity: sha512-nPwbkS3aZjCIe61wztgjXjIeylijOP8uGtDGjjJVUF3B/5GLVx3ngZu6tjPTMEgaLM0u//HuGK+aZolWUQWE4g==} + /@next/swc-android-arm64/13.1.6: + resolution: {integrity: sha512-cMwQjnB8vrYkWyK/H0Rf2c2pKIH4RGjpKUDvbjVAit6SbwPDpmaijLio0LWFV3/tOnY6kvzbL62lndVA0mkYpw==} engines: {node: '>= 10'} cpu: [arm64] os: [android] requiresBuild: true optional: true - /@next/swc-darwin-arm64/13.1.0: - resolution: {integrity: sha512-0hUydiAW18jK2uGPnZRdnRQtdB/3ZoPo84A6zH7MJHxAWw9lzVsv3kMg9kgVBBlrivzqdNN8rdgA+eYNxzXU9w==} + /@next/swc-darwin-arm64/13.1.6: + resolution: {integrity: sha512-KKRQH4DDE4kONXCvFMNBZGDb499Hs+xcFAwvj+rfSUssIDrZOlyfJNy55rH5t2Qxed1e4K80KEJgsxKQN1/fyw==} engines: {node: '>= 10'} cpu: [arm64] os: [darwin] requiresBuild: true optional: true - /@next/swc-darwin-x64/13.1.0: - resolution: {integrity: sha512-3S3iQqJIysklj0Q9gnanuYMzF8H9p+fUVhvSHxVVLcKH4HsE8EGddNkXsaOyznL1kC6vGKw7h6uz1ojaXEafCA==} + /@next/swc-darwin-x64/13.1.6: + resolution: {integrity: sha512-/uOky5PaZDoaU99ohjtNcDTJ6ks/gZ5ykTQDvNZDjIoCxFe3+t06bxsTPY6tAO6uEAw5f6vVFX5H5KLwhrkZCA==} engines: {node: '>= 10'} cpu: [x64] os: [darwin] requiresBuild: true optional: true - /@next/swc-freebsd-x64/13.1.0: - resolution: {integrity: sha512-wAgzwm/em48GIuWq3OYr0BpncMy7c+UA3hsyX+xKh/vb/sOIpQly7JTa+GNdk17s7kprhMfsgzPG3da36NLpkA==} + /@next/swc-freebsd-x64/13.1.6: + resolution: {integrity: sha512-qaEALZeV7to6weSXk3Br80wtFQ7cFTpos/q+m9XVRFggu+8Ib895XhMWdJBzew6aaOcMvYR6KQ6JmHA2/eMzWw==} engines: {node: '>= 10'} cpu: [x64] os: [freebsd] requiresBuild: true optional: true - /@next/swc-linux-arm-gnueabihf/13.1.0: - resolution: {integrity: sha512-Cr2hzL7ad+4nj9KrR1Cz1RDcsWa61X6I7gc6PToRYIY4gL480Sijq19xo7dlXQPnr1viVzbNiNnNXZASHv7uvw==} + /@next/swc-linux-arm-gnueabihf/13.1.6: + resolution: {integrity: sha512-OybkbC58A1wJ+JrJSOjGDvZzrVEQA4sprJejGqMwiZyLqhr9Eo8FXF0y6HL+m1CPCpPhXEHz/2xKoYsl16kNqw==} engines: {node: '>= 10'} cpu: [arm] os: [linux] requiresBuild: true optional: true - /@next/swc-linux-arm64-gnu/13.1.0: - resolution: {integrity: sha512-EjCIKfeZB9h72evL2yGNwBvE5Im96Zn7o2zxImlvCiUYb/xXDqn4hzhck035BSP3g3sGDLfijFTE1wKRyXIk4w==} + /@next/swc-linux-arm64-gnu/13.1.6: + resolution: {integrity: sha512-yCH+yDr7/4FDuWv6+GiYrPI9kcTAO3y48UmaIbrKy8ZJpi7RehJe3vIBRUmLrLaNDH3rY1rwoHi471NvR5J5NQ==} engines: {node: '>= 10'} cpu: [arm64] os: [linux] requiresBuild: true optional: true - /@next/swc-linux-arm64-musl/13.1.0: - resolution: {integrity: sha512-WAsZtCtPXlz/7/bnW9ryw856xEun+c6xSwZwbcvrMxtcSiW3z0LD91Nsj3AkexsjRtBjeEpNeVtDExqF2VKKSA==} + /@next/swc-linux-arm64-musl/13.1.6: + resolution: {integrity: sha512-ECagB8LGX25P9Mrmlc7Q/TQBb9rGScxHbv/kLqqIWs2fIXy6Y/EiBBiM72NTwuXUFCNrWR4sjUPSooVBJJ3ESQ==} engines: {node: '>= 10'} cpu: [arm64] os: [linux] requiresBuild: true optional: true - /@next/swc-linux-x64-gnu/13.1.0: - resolution: {integrity: sha512-Tjd5gieI3X9vPce5yF+GsQxOl0jwUkyOrTR1g5PQr+bT/9Qos/yPL48H1L5ayEp0hxgLVPW7skGal7lVnAoVEQ==} + /@next/swc-linux-x64-gnu/13.1.6: + resolution: {integrity: sha512-GT5w2mruk90V/I5g6ScuueE7fqj/d8Bui2qxdw6lFxmuTgMeol5rnzAv4uAoVQgClOUO/MULilzlODg9Ib3Y4Q==} engines: {node: '>= 10'} cpu: [x64] os: [linux] requiresBuild: true optional: true - /@next/swc-linux-x64-musl/13.1.0: - resolution: {integrity: sha512-H9UMEQv40e9pkgdX4mCms0dDf2dimmZ6WXhDTWF/yIh9icgcsHaP73BJ9IFlgvh80wLiUgWZ3LAX4vXnXzidmg==} + /@next/swc-linux-x64-musl/13.1.6: + resolution: {integrity: sha512-keFD6KvwOPzmat4TCnlnuxJCQepPN+8j3Nw876FtULxo8005Y9Ghcl7ACcR8GoiKoddAq8gxNBrpjoxjQRHeAQ==} engines: {node: '>= 10'} cpu: [x64] os: [linux] requiresBuild: true optional: true - /@next/swc-win32-arm64-msvc/13.1.0: - resolution: {integrity: sha512-LFFIKjW/cPl4wvG8HF/6oYPJZ+Jy32G3FUflC8UW1Od6W9yOSEvadhk9fMyDZN4cgsNOcVc3uVSMpcuuCpbDGw==} + /@next/swc-win32-arm64-msvc/13.1.6: + resolution: {integrity: sha512-OwertslIiGQluFvHyRDzBCIB07qJjqabAmINlXUYt7/sY7Q7QPE8xVi5beBxX/rxTGPIbtyIe3faBE6Z2KywhQ==} engines: {node: '>= 10'} cpu: [arm64] os: [win32] requiresBuild: true optional: true - /@next/swc-win32-ia32-msvc/13.1.0: - resolution: {integrity: sha512-MBLaoHZSenMdxhB3Ww1VNEhjyPT3uLjzAi5Ygk48LLLbOGu5KxQolhINRrqGuJWqJRNWSJ9JSFBfJrZwQzrUew==} + /@next/swc-win32-ia32-msvc/13.1.6: + resolution: {integrity: sha512-g8zowiuP8FxUR9zslPmlju7qYbs2XBtTLVSxVikPtUDQedhcls39uKYLvOOd1JZg0ehyhopobRoH1q+MHlIN/w==} engines: {node: '>= 10'} cpu: [ia32] os: [win32] requiresBuild: true optional: true - /@next/swc-win32-x64-msvc/13.1.0: - resolution: {integrity: sha512-fFTfIQvnmpbKoyh4v3ezlGqtERlgc2Sx8qJwPuYqoVi0V08wCx9wp2Iq1CINxP3UMHkEeNX7gYpDOd+9Cw9EiQ==} + /@next/swc-win32-x64-msvc/13.1.6: + resolution: {integrity: sha512-Ls2OL9hi3YlJKGNdKv8k3X/lLgc3VmLG3a/DeTkAd+lAituJp8ZHmRmm9f9SL84fT3CotlzcgbdaCDfFwFA6bA==} engines: {node: '>= 10'} cpu: [x64] os: [win32] @@ -11227,19 +11227,19 @@ packages: resolution: {integrity: sha512-FlZ7oN9ICt+fbcJ4ag2IsALIcalfE/E16ttdSA8peBiHJI+oEKdOcafqDnUbeUe5NwWGn/m9zZGO9qrAGzfesg==} dev: true - /next-plausible/3.7.2_s75y6mxmikaw2mhqmuko6w7njm: + /next-plausible/3.7.2_3vryta7zmbcsw4rrqf4axjqggm: resolution: {integrity: sha512-9PqFiVtD1kZO5gHFYTcgilHhg2WhMzD6I4NK/RUh9DGavD1N11IhNAvyGLFmvB3f4FtHC9IoAsauYDtQBt+riA==} peerDependencies: next: ^11.1.0 || ^12.0.0 || ^13.0.0 react: ^16.8.0 || ^17.0.0 || ^18.0.0 react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 dependencies: - next: 13.1.0_biqbaboplfbrettd7655fr4n2y + next: 13.1.6_biqbaboplfbrettd7655fr4n2y react: 18.2.0 react-dom: 18.2.0_react@18.2.0 dev: true - /next-sitemap/3.1.54_next@13.1.0: + /next-sitemap/3.1.54_next@13.1.6: resolution: {integrity: sha512-/uzk8hjHU5o6ZelzkLt/LJw9MyFhRiz9VKIst9EhZfF1C/Bw4OCGzLmA+8ImUnTzSxFyuiWr6P1sjFJxKBhjAA==} engines: {node: '>=14.18'} hasBin: true @@ -11249,11 +11249,11 @@ packages: dependencies: '@corex/deepmerge': 4.0.37 minimist: 1.2.8 - next: 13.1.0_biqbaboplfbrettd7655fr4n2y + next: 13.1.6_biqbaboplfbrettd7655fr4n2y dev: false - /next/13.1.0_biqbaboplfbrettd7655fr4n2y: - resolution: {integrity: sha512-lQMZH1V94L5IL/WaihQkTYabSY73aqgrkGPJB5uz+2O3ES4I3losV/maXLY7l7x5e+oNyE9N81upNQ8uRsR5/A==} + /next/13.1.6_biqbaboplfbrettd7655fr4n2y: + resolution: {integrity: sha512-hHlbhKPj9pW+Cymvfzc15lvhaOZ54l+8sXDXJWm3OBNBzgrVj6hwGPmqqsXg40xO1Leq+kXpllzRPuncpC0Phw==} engines: {node: '>=14.6.0'} hasBin: true peerDependencies: @@ -11270,7 +11270,7 @@ packages: sass: optional: true dependencies: - '@next/env': 13.1.0 + '@next/env': 13.1.6 '@swc/helpers': 0.4.14 caniuse-lite: 1.0.30001458 postcss: 8.4.14 @@ -11278,19 +11278,19 @@ packages: react-dom: 18.2.0_react@18.2.0 styled-jsx: 5.1.1_react@18.2.0 optionalDependencies: - '@next/swc-android-arm-eabi': 13.1.0 - '@next/swc-android-arm64': 13.1.0 - '@next/swc-darwin-arm64': 13.1.0 - '@next/swc-darwin-x64': 13.1.0 - '@next/swc-freebsd-x64': 13.1.0 - '@next/swc-linux-arm-gnueabihf': 13.1.0 - '@next/swc-linux-arm64-gnu': 13.1.0 - '@next/swc-linux-arm64-musl': 13.1.0 - '@next/swc-linux-x64-gnu': 13.1.0 - '@next/swc-linux-x64-musl': 13.1.0 - '@next/swc-win32-arm64-msvc': 13.1.0 - '@next/swc-win32-ia32-msvc': 13.1.0 - '@next/swc-win32-x64-msvc': 13.1.0 + '@next/swc-android-arm-eabi': 13.1.6 + '@next/swc-android-arm64': 13.1.6 + '@next/swc-darwin-arm64': 13.1.6 + '@next/swc-darwin-x64': 13.1.6 + '@next/swc-freebsd-x64': 13.1.6 + '@next/swc-linux-arm-gnueabihf': 13.1.6 + '@next/swc-linux-arm64-gnu': 13.1.6 + '@next/swc-linux-arm64-musl': 13.1.6 + '@next/swc-linux-x64-gnu': 13.1.6 + '@next/swc-linux-x64-musl': 13.1.6 + '@next/swc-win32-arm64-msvc': 13.1.6 + '@next/swc-win32-ia32-msvc': 13.1.6 + '@next/swc-win32-x64-msvc': 13.1.6 transitivePeerDependencies: - '@babel/core' - babel-plugin-macros