fix: Modals titles nested headers and header nested buttons errors (#2019)

This commit is contained in:
SeDemal
2024-04-20 18:43:46 +02:00
committed by GitHub
parent fdbb8d8b35
commit 7dffe393ab
12 changed files with 77 additions and 111 deletions

View File

@@ -169,11 +169,7 @@ const CitySelectModal = ({ opened, closeModal, query, onCitySelected }: CitySele
if (isError === true)
return (
<Modal
title={
<Title order={4}>
{t('modal.title')} - {query}
</Title>
}
title={t('modal.title') + ' - ' + query}
size="xl"
opened={opened}
onClose={closeModal}
@@ -193,11 +189,7 @@ const CitySelectModal = ({ opened, closeModal, query, onCitySelected }: CitySele
return (
<Modal
title={
<Title order={4}>
{t('modal.title')} - {query}
</Title>
}
title={t('modal.title') + ' - ' + query}
size="xl"
opened={opened}
onClose={closeModal}

View File

@@ -1,4 +1,3 @@
import { Title } from '@mantine/core';
import { useTranslation } from 'next-i18next';
import { openContextModalGeneric } from '~/tools/mantineModalManagerExtensions';
import { IWidget } from '~/widgets/widgets';
@@ -38,7 +37,7 @@ export const WidgetsMenu = ({ integration, widget }: WidgetsMenuProps) => {
const handleDeleteClick = () => {
openContextModalGeneric<WidgetsRemoveModalInnerProps>({
modal: 'integrationRemove',
title: <Title order={4}>{t('common:remove')}</Title>,
title: t('common:remove'),
innerProps: {
widgetId: widget.id,
widgetType: integration,

View File

@@ -98,10 +98,10 @@ export const DashboardCategory = ({ category }: DashboardCategoryProps) => {
>
<Accordion.Item value={category.name}>
<Box sx={{ display: 'flex', alignItems: 'center' }}>
<Accordion.Control icon={isEditMode && <CategoryEditMenu category={category} />}>
<Accordion.Control>
<Title order={3}>{category.name}</Title>
</Accordion.Control>
{!isEditMode && (
{!isEditMode ? (
<Menu withArrow withinPortal>
<Menu.Target>
<ActionIcon variant="light" mr="md">
@@ -114,7 +114,7 @@ export const DashboardCategory = ({ category }: DashboardCategoryProps) => {
</Menu.Item>
</Menu.Dropdown>
</Menu>
)}
) : <CategoryEditMenu category={category} />}
</Box>
<Accordion.Panel>
<div