Mirrored_Repos/InvenTree
1
0
Fork 0
mirror of https://github.com/inventree/InvenTree synced 2024-08-30 18:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Pinned action column (#5880)

Browse Source 
* Update mantine-datatable package

* use new pinLastColumn property
This commit is contained in:
Oliver 2023-11-08 08:30:05 +11:00 committed by GitHub
parent 5d05137630
commit 907343c5db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/frontend/package.json
View File

@ -35,7 +35,7 @@
"easymde": "^2.18.0",
"embla-carousel-react": "^7.1.0",
"html5-qrcode": "^2.3.8",
"mantine-datatable": "^6.0.0",
"mantine-datatable": "^6.0.5",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-grid-layout": "^1.4.2",

10
src/frontend/src/components/tables/InvenTreeTable.tsx
View File

@ -161,15 +161,6 @@ export function InvenTreeTable({
hidden: false,
switchable: false,
width: 50,
cellsStyle: {
position: 'sticky',
right: 0,
// TODO: Use the theme color to set the background color
backgroundColor: '#FFF',
// TODO: Use the scroll area callbacks to determine if we need to display a "shadow"
borderLeft: '1px solid #DDD',
padding: '3px'
},
render: function (record: any) {
return (
<RowActions
@ -520,6 +511,7 @@ export function InvenTreeTable({
striped
highlightOnHover
loaderVariant="dots"
pinLastColumn={tableProps.rowActions != undefined}
idAccessor={tableProps.idAccessor}
minHeight={300}
totalRecords={recordCount}

2
src/frontend/src/components/tables/RowActions.tsx
View File

@ -100,7 +100,7 @@ export function RowActions({
onChange={setOpened}
>
<Menu.Target>
<Tooltip label={title || t`Actions`}>
<Tooltip withinPortal={true} label={title || t`Actions`}>
<ActionIcon
onClick={openMenu}
disabled={disabled}

8
src/frontend/yarn.lock
View File

@ -2219,10 +2219,10 @@ lru-cache@^5.1.1:
dependencies:
yallist "^3.0.2"
mantine-datatable@^6.0.0:
version "6.0.0"
resolved "https://registry.yarnpkg.com/mantine-datatable/-/mantine-datatable-6.0.0.tgz#e402f8461b30b7f833546212297d1242481bc267"
integrity sha512-fj2GFpZ30B30zaQFIsFlmUzRbK3hoiLaZXGaquDqK0jbIzsxlIDbLjgTvI9KJ8f1Gk+bE0lXc4yRBsmvg6DCnA==
mantine-datatable@^6.0.5:
version "6.0.5"
resolved "https://registry.yarnpkg.com/mantine-datatable/-/mantine-datatable-6.0.5.tgz#e8e6e781de44233bd40c26cd7400186fce15f7a0"
integrity sha512-TMDz7zkpDUkK2qlSn5pA+EuwHAVogDyPWNbs702M5f5mmHjjtC6q20U+4f09kYU+uZzrJ3E9wDA2Y1+bxXl/ew==
marked@^4.1.0:
version "4.3.0"