Merge branch 'dev' into feat/add-integration-from-dashboard
Integrate dev's centralized Mantine theme in @homarr/ui and reconcile modal grid work.
This commit is contained in:
132 files changed
+1248
-1084
No files matched your search
@@ -16,3 +16,9 @@ export { MaskedImage } from "./masked-image";
|
||||
export { MaskedOrNormalImage } from "./masked-or-normal-image";
|
||||
export { LanguageIcon } from "./language-icon";
|
||||
export { Link } from "./link";
|
||||
export {
|
||||
SelectGridLayout,
|
||||
selectGridCardHeight,
|
||||
selectGridCols,
|
||||
selectGridScrollMaxHeight,
|
||||
} from "../select-grid-layout";
|
||||
@@ -12,7 +12,7 @@ interface UserAvatarGroupProps {
|
||||
|
||||
export const UserAvatarGroup = ({ size, limit, users }: UserAvatarGroupProps) => {
|
||||
return (
|
||||
<TooltipGroup openDelay={300} closeDelay={300}>
|
||||
<TooltipGroup closeDelay={300}>
|
||||
<AvatarGroup>
|
||||
{users.slice(0, limit).map((user) => (
|
||||
<Tooltip key={user.name} label={user.name} withArrow>
|
||||
|
||||
@@ -2,6 +2,8 @@ import type { MantineProviderProps } from "@mantine/core";
|
||||
|
||||
import { theme } from "./theme";
|
||||
|
||||
export { theme } from "./theme";
|
||||
export { modalSizeForm, modalSizeSelect } from "./theme/modal";
|
||||
export * from "./components";
|
||||
|
||||
export const uiConfiguration = {
|
||||
|
||||
@@ -0,0 +1,42 @@
|
||||
"use client";
|
||||
|
||||
import type { KeyboardEvent, ReactNode } from "react";
|
||||
import { Input, ScrollArea, SimpleGrid, Stack } from "@mantine/core";
|
||||
import { IconSearch } from "@tabler/icons-react";
|
||||
|
||||
export const selectGridCols = { base: 2, xs: 3, sm: 4, md: 5 };
|
||||
export const selectGridCardHeight = 180;
|
||||
export const selectGridScrollMaxHeight = "70vh";
|
||||
|
||||
interface SelectGridLayoutProps {
|
||||
search: string;
|
||||
onSearchChange: (value: string) => void;
|
||||
placeholder: string;
|
||||
onSearchKeyDown?: (event: KeyboardEvent<HTMLInputElement>) => void;
|
||||
children: ReactNode;
|
||||
}
|
||||
|
||||
export const SelectGridLayout = ({
|
||||
search,
|
||||
onSearchChange,
|
||||
placeholder,
|
||||
onSearchKeyDown,
|
||||
children,
|
||||
}: SelectGridLayoutProps) => (
|
||||
<Stack>
|
||||
<Input
|
||||
value={search}
|
||||
onChange={(event) => onSearchChange(event.currentTarget.value)}
|
||||
leftSection={<IconSearch />}
|
||||
placeholder={placeholder}
|
||||
data-autofocus
|
||||
onKeyDown={onSearchKeyDown}
|
||||
/>
|
||||
|
||||
<ScrollArea.Autosize mah={selectGridScrollMaxHeight}>
|
||||
<SimpleGrid cols={selectGridCols} spacing="sm">
|
||||
{children}
|
||||
</SimpleGrid>
|
||||
</ScrollArea.Autosize>
|
||||
</Stack>
|
||||
);
|
||||
+100
-16
@@ -1,22 +1,106 @@
|
||||
import { createTheme } from "@mantine/core";
|
||||
import { createTheme, rem } from "@mantine/core";
|
||||
|
||||
import { primaryColor } from "./theme/colors/primary";
|
||||
import { secondaryColor } from "./theme/colors/secondary";
|
||||
import { modalComponent } from "./theme/modal";
|
||||
|
||||
export const theme = createTheme({
|
||||
colors: {
|
||||
primaryColor,
|
||||
secondaryColor,
|
||||
},
|
||||
primaryColor: "primaryColor",
|
||||
components: {
|
||||
Modal: {
|
||||
vars: (_theme: unknown, props: { size?: string }) => {
|
||||
if (props.size === "xxl") {
|
||||
return { root: { "--modal-size": "75rem" } };
|
||||
}
|
||||
return { root: {} };
|
||||
},
|
||||
primaryColor: "red",
|
||||
autoContrast: true,
|
||||
respectReducedMotion: true,
|
||||
cursorType: "pointer",
|
||||
|
||||
fontFamily: "Inter, system-ui, -apple-system, sans-serif",
|
||||
fontFamilyMonospace: "ui-monospace, 'Cascadia Code', 'Fira Code', monospace",
|
||||
|
||||
headings: {
|
||||
fontFamily: "Inter, system-ui, -apple-system, sans-serif",
|
||||
fontWeight: "600",
|
||||
sizes: {
|
||||
h1: { fontSize: rem(36), lineHeight: "1.1", fontWeight: "700" },
|
||||
h2: { fontSize: rem(24), lineHeight: "1.2", fontWeight: "700" },
|
||||
h3: { fontSize: rem(20), lineHeight: "1.3", fontWeight: "600" },
|
||||
h4: { fontSize: rem(16), lineHeight: "1.4", fontWeight: "600" },
|
||||
h5: { fontSize: rem(14), lineHeight: "1.5", fontWeight: "600" },
|
||||
h6: { fontSize: rem(12), lineHeight: "1.5", fontWeight: "600" },
|
||||
},
|
||||
},
|
||||
|
||||
fontSizes: {
|
||||
xs: rem(12),
|
||||
sm: rem(14),
|
||||
md: rem(16),
|
||||
lg: rem(18),
|
||||
xl: rem(20),
|
||||
},
|
||||
|
||||
spacing: {
|
||||
xs: rem(10),
|
||||
sm: rem(12),
|
||||
md: rem(16),
|
||||
lg: rem(20),
|
||||
xl: rem(32),
|
||||
},
|
||||
|
||||
radius: {
|
||||
xs: rem(4),
|
||||
sm: rem(4),
|
||||
md: rem(8),
|
||||
lg: rem(12),
|
||||
xl: rem(16),
|
||||
},
|
||||
defaultRadius: "md",
|
||||
|
||||
shadows: {
|
||||
xs: "0 1px 2px rgba(0, 0, 0, 0.04)",
|
||||
sm: "0 1px 3px rgba(0, 0, 0, 0.06)",
|
||||
md: "0 2px 8px rgba(0, 0, 0, 0.08)",
|
||||
lg: "0 4px 12px rgba(0, 0, 0, 0.10)",
|
||||
xl: "0 8px 24px rgba(0, 0, 0, 0.12)",
|
||||
},
|
||||
|
||||
components: {
|
||||
Card: {
|
||||
defaultProps: {
|
||||
withBorder: true,
|
||||
radius: "lg",
|
||||
},
|
||||
},
|
||||
Paper: {
|
||||
defaultProps: {
|
||||
withBorder: true,
|
||||
radius: "md",
|
||||
},
|
||||
},
|
||||
Button: {
|
||||
defaultProps: {
|
||||
radius: "md",
|
||||
},
|
||||
},
|
||||
ActionIcon: {
|
||||
defaultProps: {
|
||||
radius: "md",
|
||||
},
|
||||
},
|
||||
Tooltip: {
|
||||
defaultProps: {
|
||||
openDelay: 300,
|
||||
},
|
||||
},
|
||||
Menu: {
|
||||
defaultProps: {
|
||||
withArrow: true,
|
||||
},
|
||||
},
|
||||
NavLink: {
|
||||
defaultProps: {
|
||||
style: { borderRadius: 5 },
|
||||
},
|
||||
},
|
||||
LoadingOverlay: {
|
||||
defaultProps: {
|
||||
zIndex: 1000,
|
||||
overlayProps: { radius: "sm", blur: 2 },
|
||||
},
|
||||
},
|
||||
Modal: modalComponent,
|
||||
},
|
||||
});
|
||||
@@ -1,14 +0,0 @@
|
||||
import type { MantineColorsTuple } from "@mantine/core";
|
||||
|
||||
export const primaryColor: MantineColorsTuple = [
|
||||
"#eafbf0",
|
||||
"#ddefe3",
|
||||
"#bedcc7",
|
||||
"#9bc8aa",
|
||||
"#7eb892",
|
||||
"#6bad81",
|
||||
"#60a878",
|
||||
"#509265",
|
||||
"#438359",
|
||||
"#35724a",
|
||||
];
|
||||
@@ -1,14 +0,0 @@
|
||||
import type { MantineColorsTuple } from "@mantine/core";
|
||||
|
||||
export const secondaryColor: MantineColorsTuple = [
|
||||
"#e6f7ff",
|
||||
"#d9e8f6",
|
||||
"#b6cde6",
|
||||
"#90b2d4",
|
||||
"#6f9ac5",
|
||||
"#5a8bbd",
|
||||
"#4d84ba",
|
||||
"#3d71a4",
|
||||
"#326595",
|
||||
"#205885",
|
||||
];
|
||||
@@ -0,0 +1,33 @@
|
||||
import type { MantineTheme, MantineThemeComponent, ModalProps } from "@mantine/core";
|
||||
|
||||
export const modalSizeSelect = "xxl";
|
||||
export const modalSizeForm = "lg";
|
||||
|
||||
const fixedModalSizes = new Set([modalSizeSelect, modalSizeForm]);
|
||||
|
||||
const modalWidth = "min(var(--modal-size), calc(100vw - 2 * var(--mantine-spacing-md)))";
|
||||
|
||||
export const modalComponent: MantineThemeComponent = {
|
||||
vars: (_theme: MantineTheme, props: Partial<ModalProps>) => {
|
||||
if (props.size === modalSizeSelect) {
|
||||
return { root: { "--modal-size": "75rem" } };
|
||||
}
|
||||
return { root: {} };
|
||||
},
|
||||
styles: (_theme: MantineTheme, props: Partial<ModalProps>) => {
|
||||
const isFixedSize = typeof props.size === "string" && fixedModalSizes.has(props.size);
|
||||
if (!isFixedSize) {
|
||||
return {};
|
||||
}
|
||||
|
||||
return {
|
||||
content: {
|
||||
width: modalWidth,
|
||||
minWidth: modalWidth,
|
||||
},
|
||||
body: {
|
||||
width: "100%",
|
||||
},
|
||||
};
|
||||
},
|
||||
};
|
||||
Reference in new issue
Block a user