From d1d37c85164d077f5daeaa4d1b209ea6b3f330fd Mon Sep 17 00:00:00 2001
From: schroda <50052685+schroda@users.noreply.github.com>
Date: Tue, 3 Sep 2024 17:15:47 +0200
Subject: [PATCH] Update mui dependencies
---
package.json | 4 +-
src/components/ExtensionCard.tsx | 22 ++-
src/components/MigrateDialog.tsx | 8 +-
src/components/MigrationCard.tsx | 7 +-
src/components/SourceCard.tsx | 22 ++-
src/components/atoms/CustomIconButton.tsx | 10 +-
src/components/atoms/Metadata.tsx | 8 +-
src/components/atoms/PasswordTextField.tsx | 26 +--
src/components/atoms/SearchTextField.tsx | 20 +--
src/components/chapter/ChapterCard.tsx | 7 +-
src/components/manga/MangaGridCard.tsx | 8 +-
src/components/manga/MangaListCard.tsx | 8 +-
src/components/molecules/ConfirmDialog.tsx | 6 +-
.../molecules/DownloadStateIndicator.tsx | 8 +-
src/components/navbar/DefaultNavBar.tsx | 10 +-
src/components/navbar/ReaderNavBar.tsx | 9 +-
.../navbar/action/CategorySelect.tsx | 9 +-
src/components/settings/DateSetting.tsx | 9 +-
.../settings/MutableListSetting.tsx | 15 +-
src/components/settings/NumberSetting.tsx | 17 +-
src/components/settings/SelectSetting.tsx | 7 +-
.../webUI/WebUIUpdateIntervalSetting.tsx | 2 +-
src/components/source/SourceOptions.tsx | 4 +-
src/components/tracker/TrackerActiveCard.tsx | 14 +-
src/components/tracker/TrackerMangaCard.tsx | 16 +-
src/components/tracker/TrackerSearch.tsx | 10 +-
.../tracker/TrackerUntrackedCard.tsx | 7 +-
src/components/util/Progress.tsx | 6 +-
src/components/util/SpinnerImage.tsx | 19 ++-
.../util/VersionUpdateInfoDialog.tsx | 8 +-
src/screens/DownloadQueue.tsx | 7 +-
src/screens/Extensions.tsx | 9 +-
src/screens/Manga.tsx | 7 +-
src/screens/settings/About.tsx | 6 +-
src/screens/settings/Backup.tsx | 8 +-
src/screens/settings/DownloadSettings.tsx | 4 +-
yarn.lock | 148 ++++++++----------
37 files changed, 349 insertions(+), 166 deletions(-)
diff --git a/package.json b/package.json
index 27654cef..b89ac90f 100644
--- a/package.json
+++ b/package.json
@@ -36,8 +36,8 @@
"@emotion/styled": "11.13.0",
"@fontsource/roboto": "5.0.14",
"@loadable/component": "5.16.4",
- "@mui/icons-material": "5.16.6",
- "@mui/material": "5.16.6",
+ "@mui/icons-material": "^6.0.2",
+ "@mui/material": "^6.0.2",
"@mui/x-date-pickers": "7.15.0",
"apollo-upload-client": "17.0.0",
"dayjs": "1.11.13",
diff --git a/src/components/ExtensionCard.tsx b/src/components/ExtensionCard.tsx
index d38f9acf..be827b73 100644
--- a/src/components/ExtensionCard.tsx
+++ b/src/components/ExtensionCard.tsx
@@ -194,16 +194,32 @@ export function ExtensionCard(props: IProps) {
{name}
-
+
{langPress} {versionName}
{isNsfw && (
-
+
{' 18+'}
)}
{showSourceRepo && (
-
+
{repo}
)}
diff --git a/src/components/MigrateDialog.tsx b/src/components/MigrateDialog.tsx
index 2375552b..0c7f28fd 100644
--- a/src/components/MigrateDialog.tsx
+++ b/src/components/MigrateDialog.tsx
@@ -100,7 +100,13 @@ export const MigrateDialog = ({ mangaIdToMigrateTo, onClose }: { mangaIdToMigrat
-
+
diff --git a/src/components/MigrationCard.tsx b/src/components/MigrationCard.tsx
index 8afea981..8400f76e 100644
--- a/src/components/MigrationCard.tsx
+++ b/src/components/MigrationCard.tsx
@@ -57,7 +57,12 @@ export const MigrationCard = ({ id, name, lang, iconUrl, mangaCount }: TMigratab
{name}
-
+
{translateExtensionLanguage(lang)}
diff --git a/src/components/SourceCard.tsx b/src/components/SourceCard.tsx
index 9f1131e6..75939ff3 100644
--- a/src/components/SourceCard.tsx
+++ b/src/components/SourceCard.tsx
@@ -97,15 +97,31 @@ export const SourceCard: React.FC = (props: IProps) => {
{name}
{id !== '0' && (
-
+
{translateExtensionLanguage(lang)}
{isNsfw && (
-
+
{' 18+'}
)}
{showSourceRepo && (
-
+
{repo}
)}
diff --git a/src/components/atoms/CustomIconButton.tsx b/src/components/atoms/CustomIconButton.tsx
index 89cf83ac..054fd6a6 100644
--- a/src/components/atoms/CustomIconButton.tsx
+++ b/src/components/atoms/CustomIconButton.tsx
@@ -16,7 +16,15 @@ export const CustomIconButton = forwardRef(
ref: ForwardedRef,
) => (
diff --git a/src/components/atoms/Metadata.tsx b/src/components/atoms/Metadata.tsx
index 7e0eeb2e..c02456ac 100644
--- a/src/components/atoms/Metadata.tsx
+++ b/src/components/atoms/Metadata.tsx
@@ -26,7 +26,13 @@ export const Metadata = ({
{...stackProps}
sx={{ flexDirection: 'row', columnGap: 1, flexWrap: 'wrap', alignItems: 'baseline', ...stackProps?.sx }}
>
-
+
{title}
{value}
diff --git a/src/components/atoms/PasswordTextField.tsx b/src/components/atoms/PasswordTextField.tsx
index 9947034f..129f4441 100644
--- a/src/components/atoms/PasswordTextField.tsx
+++ b/src/components/atoms/PasswordTextField.tsx
@@ -26,18 +26,20 @@ export const PasswordTextField = (props: TextFieldProps) => {
name="password"
label={t('global.label.password')}
type={showPassword ? 'text' : 'password'}
- InputProps={{
- endAdornment: (
-
-
- {showPassword ? : }
-
-
- ),
+ slotProps={{
+ input: {
+ endAdornment: (
+
+
+ {showPassword ? : }
+
+
+ ),
+ },
}}
{...props}
/>
diff --git a/src/components/atoms/SearchTextField.tsx b/src/components/atoms/SearchTextField.tsx
index 37310b48..4f034976 100644
--- a/src/components/atoms/SearchTextField.tsx
+++ b/src/components/atoms/SearchTextField.tsx
@@ -14,15 +14,17 @@ import CancelIcon from '@mui/icons-material/Cancel';
export const SearchTextField = ({ onCancel, ...textFieldProps }: TextFieldProps & { onCancel: () => void }) => (
- onCancel()}>
-
-
-
- ),
+ slotProps={{
+ input: {
+ ...textFieldProps.InputProps,
+ endAdornment: textFieldProps.InputProps?.endAdornment ?? (
+
+ onCancel()}>
+
+
+
+ ),
+ },
}}
/>
);
diff --git a/src/components/chapter/ChapterCard.tsx b/src/components/chapter/ChapterCard.tsx
index 1755fd32..b5eda427 100644
--- a/src/components/chapter/ChapterCard.tsx
+++ b/src/components/chapter/ChapterCard.tsx
@@ -120,7 +120,12 @@ export const ChapterCard: React.FC = (props: IProps) => {
'&:last-child': { pb: 1.5 },
}}
>
-
+
theme.spacing(1),
left: (theme) => theme.spacing(1),
@@ -153,9 +153,9 @@ export const MangaGridCard = ({
)}
-
+
{mangaBadges}
{continueReadingButton}
{actions.extra.show && (