Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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: 3 additions & 3 deletions frontend/src/App/Navbar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -209,9 +209,9 @@ const RouteItem: FunctionComponent<{
}
}}
></NavbarItem>
<Collapse hidden={children.length === 0} expanded={isOpen}>
{elements}
</Collapse>
{children.length > 0 && (
<Collapse in={isOpen}>{elements}</Collapse>
)}
</Stack>
);
} else {
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/App/NotificationDrawer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ const NotificationDrawer: FunctionComponent<NotificationDrawerProps> = ({
</Text>
</Group>

<Collapse expanded={!collapsedSections[status]}>
<Collapse in={!collapsedSections[status]}>
<Stack>
{grouped[status as string]
.slice()
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/components/modals/ManualSearchModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ function ManualSearchView<T extends SupportType>(props: Props<T>) {
></FontAwesomeIcon>
)}
</Text>
<Collapse expanded={open}>
<Collapse in={open}>
<>{items}</>
</Collapse>
</Stack>
Expand Down Expand Up @@ -230,7 +230,7 @@ function ManualSearchView<T extends SupportType>(props: Props<T>) {
<Divider hidden={!bSceneNameAvailable} my="xs"></Divider>
<Code hidden={!bSceneNameAvailable}>{item?.sceneName}</Code>
</Alert>
<Collapse expanded={haveResult && !results.isFetching}>
<Collapse in={haveResult && !results.isFetching}>
<PageTable
autoScroll={false}
tableStyles={{ emptyText: "No result", placeholder: 10 }}
Expand Down
5 changes: 3 additions & 2 deletions frontend/src/modules/modals/WithModal.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { createContext, FunctionComponent } from "react";
import { ContextModalProps } from "@mantine/modals";
import { ModalSettings } from "@mantine/modals";
import { ContextModalProps, openModal } from "@mantine/modals";

type ModalSettings = Parameters<typeof openModal>[0];

export type ModalComponent<P extends Record<string, unknown> = {}> =
FunctionComponent<ContextModalProps<P>> & {
Expand Down
5 changes: 3 additions & 2 deletions frontend/src/modules/modals/hooks.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import { useCallback, useContext, useMemo } from "react";
import { useModals as useMantineModals } from "@mantine/modals";
import { ModalSettings } from "@mantine/modals";
import { openModal, useModals as useMantineModals } from "@mantine/modals";
import { ModalComponent, ModalIdContext } from "./WithModal";

type ModalSettings = Parameters<typeof openModal>[0];

export function useModals() {
const { openContextModal: openMantineContextModal, ...rest } =
useMantineModals();
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/pages/Settings/components/collapse.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ const CollapseBox: FunctionComponent<Props> = ({

return (
<Collapse
expanded={open}
in={open}
pl={indent ? "md" : undefined}
transitionDuration={0}
>
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/pages/views/ItemOverview.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ const ItemOverview: FunctionComponent<Props> = (props) => {
<Grid
align="flex-start"
grow
gap="xs"
gutter="xs"
p={24}
m={0}
style={{
Expand Down
Loading