Skip to content

TagSpaces is an offline, open source, document manager with tagging support

chore: disabling fullscreen for resolve conflicts dialog

Ilian Sapundshiev135c2d1815ce
diff --git a/src/renderer/components/dialogs/ResolveConflictDialog.tsx b/src/renderer/components/dialogs/ResolveConflictDialog.tsx
index 0b6e17ed5..985cbae03 100644
--- a/src/renderer/components/dialogs/ResolveConflictDialog.tsx
+++ b/src/renderer/components/dialogs/ResolveConflictDialog.tsx
@@ -26,14 +26,12 @@ import Dialog from '@mui/material/Dialog';
import DialogCloseButton from '-/components/dialogs/DialogCloseButton';
import useMediaQuery from '@mui/material/useMediaQuery';
import { useTheme } from '@mui/material/styles';
-import { OpenedEntry } from '-/reducers/app';
import {
extractContainingDirectoryPath,
extractFileExtension,
extractFileName,
} from '@tagspaces/tagspaces-common/paths';
import PlatformFacade from '-/services/platform-facade';
-import AppConfig from '-/AppConfig';
import { useTranslation } from 'react-i18next';
import { useOpenedEntryContext } from '-/hooks/useOpenedEntryContext';
@@ -64,7 +62,6 @@ function ResolveConflictDialog(props: Props) {
<Dialog
open={open}
onClose={onClose}
- fullScreen={fullScreen}
keepMounted
scroll="paper"
aria-labelledby="draggable-dialog-title"
diff --git a/tsconfig.json b/tsconfig.json
index b546911fc..db7878f3a 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -21,14 +21,14 @@
"baseUrl": "./",
"paths": {
"-/*": ["src/renderer/*"],
- "assets/*": ["assets/*"]
- }
+ "assets/*": ["assets/*"],
+ },
},
"include": [
"src/renderer/**/*.ts",
"src/renderer/**/*.tsx",
"tagspacespro/**/*.ts",
- "tagspacespro/**/*.tsx"
+ "tagspacespro/**/*.tsx",
],
- "exclude": ["test", "release/build", "release/app/dist", ".erb/dll"]
+ "exclude": ["test", "release/build", "release/app/dist", ".erb/dll"],
}