Skip to content

chore(frontend): bump mantine #9694

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.

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

Draft
wants to merge 26 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
845e2f7
bump mantine
matmair Mar 11, 2025
11e273b
fix lock
matmair Mar 11, 2025
954d883
fix carousel settings
matmair Mar 11, 2025
83333a4
allow selection of boolean items
matmair Mar 12, 2025
f7504a8
Merge branch 'master' into chore(frontend)--bump-mantine
matmair Mar 12, 2025
2f85aea
make loader selectable
matmair Mar 12, 2025
5137288
Merge branch 'chore(frontend)--bump-mantine' of https://github.com/ma…
matmair Mar 12, 2025
93796ea
Merge branch 'master' into chore(frontend)--bump-mantine
matmair Mar 16, 2025
6bec28e
Merge branch 'master' of https://github.com/inventree/InvenTree into …
matmair May 21, 2025
bed93c1
bump to release version
matmair May 21, 2025
322ebe6
Merge branch 'master' into chore(frontend)--bump-mantine
matmair Jun 4, 2025
e3a1d3c
Merge branch 'master' into chore(frontend)--bump-mantine
matmair Jun 5, 2025
9f6714f
Merge branch 'master' into chore(frontend)--bump-mantine
matmair Jun 9, 2025
bcd4003
fix test
matmair Jun 9, 2025
1d29f5c
Merge branch 'master' into chore(frontend)--bump-mantine
matmair Jun 10, 2025
8d01fb8
fix select
matmair Jun 11, 2025
ad8b289
fix style
matmair Jun 11, 2025
8e453a8
bump playwright
matmair Jun 11, 2025
e012f10
Merge branch 'master' into chore(frontend)--bump-mantine
matmair Jun 11, 2025
a6d4e53
Merge branch 'master' into chore(frontend)--bump-mantine
matmair Jun 12, 2025
a99af38
bump deps
matmair Jun 12, 2025
d89cd18
Merge branch 'master' into chore(frontend)--bump-mantine
matmair Jun 15, 2025
c84366e
Merge branch 'master' of https://github.com/inventree/InvenTree into …
matmair Jun 19, 2025
9c7f3ca
fix resolution
matmair Jun 19, 2025
de2aa92
fix resolution again
matmair Jun 19, 2025
610b2c5
Merge branch 'master' into chore(frontend)--bump-mantine
matmair Jun 20, 2025
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
38 changes: 20 additions & 18 deletions src/frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,35 +59,36 @@
"@fullcalendar/react": "^6.1.15",
"@lingui/core": "^5.3.0",
"@lingui/react": "^5.3.0",
"@mantine/carousel": "^7.16.0",
"@mantine/charts": "^7.16.0",
"@mantine/core": "^7.16.0",
"@mantine/dates": "^7.16.0",
"@mantine/dropzone": "^7.16.0",
"@mantine/form": "^7.16.0",
"@mantine/hooks": "^7.16.0",
"@mantine/modals": "^7.16.0",
"@mantine/notifications": "^7.16.0",
"@mantine/spotlight": "^7.16.0",
"@mantine/vanilla-extract": "^7.16.0",
"@mantine/carousel": "^8.0.1",
"@mantine/charts": "^8.0.1",
"@mantine/core": "^8.0.1",
"@mantine/dates": "^8.0.1",
"@mantine/dropzone": "^8.0.1",
"@mantine/form": "^8.0.1",
"@mantine/hooks": "^8.0.1",
"@mantine/modals": "^8.0.1",
"@mantine/notifications": "^8.0.1",
"@mantine/spotlight": "^8.0.1",
"@mantine/vanilla-extract": "^8.0.1",
"@messageformat/date-skeleton": "^1.1.0",
"@sentry/react": "^8.43.0",
"@tabler/icons-react": "^3.17.0",
"@tanstack/react-query": "^5.56.2",
"@uiw/codemirror-theme-vscode": "4.23.7",
"@uiw/react-codemirror": "4.23.7",
"@uiw/react-split": "^5.9.3",
"@vanilla-extract/css": "^1.17.1",
"@vanilla-extract/css": "^1.17.2",
"axios": "^1.8.4",
"clsx": "^2.1.1",
"codemirror": "6.0.1",
"dayjs": "^1.11.13",
"dompurify": "^3.2.4",
"easymde": "^2.18.0",
"embla-carousel-react": "^8.5.2",
"embla-carousel": ">=8.0.0",
"embla-carousel-react": "^8.6.0",
"fuse.js": "^7.0.0",
"html5-qrcode": "^2.3.8",
"mantine-contextmenu": "^7.15.3",
"mantine-contextmenu": "^7.17.1",
"mantine-datatable": "^7.17.1",
"qrcode": "^1.5.4",
"react": "^18.3.1",
Expand All @@ -99,8 +100,8 @@
"react-select": "^5.9.0",
"react-simplemde-editor": "^5.2.0",
"react-window": "1.8.10",
"recharts": "^2.15.0",
"styled-components": "^6.1.14",
"recharts": "^2.15.3",
"styled-components": "^6.1.18",
"zustand": "^5.0.3"
},
"devDependencies": {
Expand All @@ -120,7 +121,7 @@
"@types/react-grid-layout": "^1.3.5",
"@types/react-router-dom": "^5.3.3",
"@types/react-window": "^1.8.8",
"@vanilla-extract/vite-plugin": "^5.0.1",
"@vanilla-extract/vite-plugin": "^5.0.2",
"@vitejs/plugin-react": "^4.3.4",
"babel-plugin-macros": "^3.1.0",
"nyc": "^17.1.0",
Expand All @@ -132,5 +133,6 @@
"vite-plugin-babel-macros": "^1.0.6",
"vite-plugin-dts": "^4.5.3",
"vite-plugin-istanbul": "^6.0.2"
}
},
"resolutions": { "@types/react": "^18", "@types/react-dom": "^18" }
}
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,7 @@ export default function BarcodeCameraInput({
<Expand>
<Select
leftSection={<IconCamera />}
leftSectionPointerEvents={'inherit'}
value={cameraValue}
onChange={setCameraValue}
data={cameras.map((device) => {
Expand Down
1 change: 1 addition & 0 deletions src/frontend/src/components/forms/fields/ChoiceField.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ export function ChoiceField({
required={definition.required}
disabled={definition.disabled}
leftSection={definition.icon}
leftSectionPointerEvents={'inherit'}
comboboxProps={{ withinPortal: true }}
searchable
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,11 @@ export function GettingStartedCarousel({
<Carousel
slideSize={{ base: '100%', sm: '50%', md: '33.333333%' }}
slideGap={{ base: 0, sm: 'md' }}
slidesToScroll={3}
align='start'
loop
emblaOptions={{
slidesToScroll: 3,
align: 'start',
loop: true
}}
>
{slides}
</Carousel>
Expand Down
4 changes: 4 additions & 0 deletions src/frontend/src/components/panels/PanelGroup.css.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,7 @@ export const selectedPanelTab = style({
}
}
});

export const selectedPanelTabLabel = style({
textAlign: 'left'
});
5 changes: 4 additions & 1 deletion src/frontend/src/components/panels/PanelGroup.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,10 @@ function BasePanelGroup({
orientation='vertical'
keepMounted={false}
aria-label={`panel-group-${pageKey}`}
classNames={{ tab: classes.selectedPanelTab }}
classNames={{
tab: classes.selectedPanelTab,
tabLabel: classes.selectedPanelTabLabel
}}
>
<Tabs.List justify='left' aria-label={`panel-tabs-${pageKey}`}>
{groupedPanels.map((group) => (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,7 @@ export function UserTheme({ height }: Readonly<{ height: number }>) {
<Table.Td>
<Group justify='left'>
<Select
searchable
aria-label='Loader Type Selector'
data={[
{ value: 'bars', label: t`Bars` },
Expand Down
2 changes: 1 addition & 1 deletion src/frontend/src/tables/FilterSelectDrawer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ function FilterElement({
return (
<Select
data={valueOptions}
searchable={filterProps.type == 'choice'}
searchable={true}
label={t`Value`}
placeholder={t`Select filter value`}
onChange={(value: string | null) => onValueChange(value)}
Expand Down
3 changes: 3 additions & 0 deletions src/frontend/src/tables/part/ParametricPartTableFilters.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ function BooleanParameterFilter(props: ParameterFilterProps) {
onChange={(val) => props.setFilter(props.template.pk, val ?? '', '=')}
placeholder={t`Select a choice`}
rightSection={<ClearFilterButton props={props} />}
rightSectionPointerEvents={'inherit'}
/>
);
}
Expand All @@ -97,6 +98,7 @@ function ChoiceParameterFilter(props: ParameterFilterProps) {
placeholder={t`Select a choice`}
searchable
rightSection={<ClearFilterButton props={props} />}
rightSectionPointerEvents={'inherit'}
/>
);
}
Expand Down Expand Up @@ -166,6 +168,7 @@ function GenericFilterRow({
rightSection={
readonly && <ClearFilterButton props={props} operator={op} />
}
rightSectionPointerEvents={'inherit'}
/>
</Group>
);
Expand Down
Loading
Loading