TagSpaces is an offline, open source, document manager with tagging support
chore: migration to tsdialogactions
Ilian Sapundshiev04f97d883c14
diff --git a/package.json b/package.jsonindex 3534b0302..0c3d01862 100644--- a/package.json+++ b/package.json@@ -234,7 +234,7 @@"uuid": "^9.0.0"},"optionalDependencies": {- "@tagspacespro/tagspacespro": "5.0.86"+ "@tagspacespro/tagspacespro": "5.0.87"},"devDependencies": {"@electron/notarize": "^2.3.2",diff --git a/src/renderer/components/dialogs/AddRemoveTagsDialog.tsx b/src/renderer/components/dialogs/AddRemoveTagsDialog.tsxindex ed9026e32..3fcaebaed 100644--- a/src/renderer/components/dialogs/AddRemoveTagsDialog.tsx+++ b/src/renderer/components/dialogs/AddRemoveTagsDialog.tsx@@ -19,7 +19,7 @@import React, { useReducer, useRef, useState } from 'react';import TsButton from '-/components/TsButton';import Paper from '@mui/material/Paper';-import DialogActions from '@mui/material/DialogActions';+import TsDialogActions from '-/components/dialogs/components/TsDialogActions';import DialogContent from '@mui/material/DialogContent';import DialogTitle from '@mui/material/DialogTitle';import List from '@mui/material/List';@@ -195,9 +195,7 @@ function AddRemoveTagsDialog(props: Props) {))}</List></DialogContent>- <DialogActions- style={fullScreen ? { padding: '10px 30px 30px 30px' } : {}}- >+ <TsDialogActions><TsButtondata-tid="cancelTagsMultipleEntries"onClick={() => onCloseDialog()}@@ -226,7 +224,7 @@ function AddRemoveTagsDialog(props: Props) {>{t('core:tagOperationAddTag')}</TsButton>- </DialogActions>+ </TsDialogActions></Dialog>);}diff --git a/src/renderer/components/dialogs/AddTagToTagGroupDialog.tsx b/src/renderer/components/dialogs/AddTagToTagGroupDialog.tsxindex e3035c00c..3108e384b 100644--- a/src/renderer/components/dialogs/AddTagToTagGroupDialog.tsx+++ b/src/renderer/components/dialogs/AddTagToTagGroupDialog.tsx@@ -19,7 +19,7 @@import React, { useState } from 'react';import { useSelector, useDispatch } from 'react-redux';import TsButton from '-/components/TsButton';-import DialogActions from '@mui/material/DialogActions';+import TsDialogActions from '-/components/dialogs/components/TsDialogActions';import DialogContent from '@mui/material/DialogContent';import DialogTitle from '@mui/material/DialogTitle';import FormControl from '@mui/material/FormControl';@@ -110,7 +110,7 @@ function AddTagToTagGroupDialog(props: Props) {</Select></FormControl></DialogContent>- <DialogActions>+ <TsDialogActions><TsButton onClick={onClose}>{t('core:cancel')}</TsButton><TsButtondisabled={tagGroup === undefined}@@ -120,7 +120,7 @@ function AddTagToTagGroupDialog(props: Props) {>{t('core:ok')}</TsButton>- </DialogActions>+ </TsDialogActions></Dialog>);}diff --git a/src/renderer/components/dialogs/ColorPickerDialog.tsx b/src/renderer/components/dialogs/ColorPickerDialog.tsxindex a4a8b5d9f..4d9d5d8f2 100644--- a/src/renderer/components/dialogs/ColorPickerDialog.tsx+++ b/src/renderer/components/dialogs/ColorPickerDialog.tsx@@ -17,8 +17,10 @@*/import React, { useState } from 'react';+import { useTheme } from '@mui/material/styles';+import useMediaQuery from '@mui/material/useMediaQuery';import TsButton from '-/components/TsButton';-import DialogActions from '@mui/material/DialogActions';+import TsDialogActions from '-/components/dialogs/components/TsDialogActions';import DialogContent from '@mui/material/DialogContent';import DialogTitle from '@mui/material/DialogTitle';import Dialog from '@mui/material/Dialog';@@ -66,6 +68,8 @@ function ColorPickerDialog(props: Props) {const { t } = useTranslation();const [color, setColor] = useState(undefined);const { open = false, onClose } = props;+ const theme = useTheme();+ const fullScreen = useMediaQuery(theme.breakpoints.down('md'));function onConfirm() {// if (color && colorHex) {@@ -79,6 +83,7 @@ function ColorPickerDialog(props: Props) {<Dialogopen={open}onClose={onClose}+ fullScreen={fullScreen}keepMountedscroll="paper"onKeyDown={(event) => {@@ -112,7 +117,7 @@ function ColorPickerDialog(props: Props) {style={{ backgroundColor: 'transparent' }}/></DialogContent>- <DialogActions>+ <TsDialogActions><TsButton data-tid="colorPickerCloseDialog" onClick={props.onClose}>{t('core:cancel')}</TsButton>@@ -123,7 +128,7 @@ function ColorPickerDialog(props: Props) {>{t('core:ok')}</TsButton>- </DialogActions>+ </TsDialogActions></Dialog>);}diff --git a/src/renderer/components/dialogs/CreateDirectoryDialog.tsx b/src/renderer/components/dialogs/CreateDirectoryDialog.tsxindex 126a27ffc..5c389570e 100644--- a/src/renderer/components/dialogs/CreateDirectoryDialog.tsx+++ b/src/renderer/components/dialogs/CreateDirectoryDialog.tsx@@ -20,7 +20,6 @@ import React, { useState, useEffect, useRef, useReducer } from 'react';import { styled, useTheme } from '@mui/material/styles';import {Dialog,- DialogActions,FormControl,DialogContent,DialogTitle,@@ -29,6 +28,7 @@ import {InputAdornment,inputBaseClasses,} from '@mui/material';+import TsDialogActions from '-/components/dialogs/components/TsDialogActions';import SetBackgroundIcon from '@mui/icons-material/OpacityOutlined';import { joinPaths } from '@tagspaces/tagspaces-common/paths';import DialogCloseButton from '-/components/dialogs/DialogCloseButton';@@ -253,7 +253,7 @@ function CreateDirectoryDialog(props: Props) {/></FormControl></DialogContent>- <DialogActions>+ <TsDialogActions><TsButton data-tid="closeCreateNewDirectory" onClick={onCancel}>{t('core:cancel')}</TsButton>@@ -266,7 +266,7 @@ function CreateDirectoryDialog(props: Props) {>{t('core:ok')}</TsButton>- </DialogActions>+ </TsDialogActions></Dialog>);}diff --git a/src/renderer/components/dialogs/CreateTagGroupDialog.tsx b/src/renderer/components/dialogs/CreateTagGroupDialog.tsxindex 44707e412..56fab73c2 100644--- a/src/renderer/components/dialogs/CreateTagGroupDialog.tsx+++ b/src/renderer/components/dialogs/CreateTagGroupDialog.tsx@@ -19,7 +19,7 @@import React, { ChangeEvent, useReducer, useRef, useState } from 'react';import { useSelector } from 'react-redux';import TsButton from '-/components/TsButton';-import DialogActions from '@mui/material/DialogActions';+import TsDialogActions from '-/components/dialogs/components/TsDialogActions';import DialogContent from '@mui/material/DialogContent';import DialogTitle from '@mui/material/DialogTitle';import FormControl from '@mui/material/FormControl';@@ -286,7 +286,7 @@ function CreateTagGroupDialog(props: Props) {)}</FormControl></DialogContent>- <DialogActions>+ <TsDialogActions><TsButton data-tid="createTagGroupCancelButton" onClick={onClose}>{t('core:cancel')}</TsButton>@@ -298,7 +298,7 @@ function CreateTagGroupDialog(props: Props) {>{t('core:ok')}</TsButton>- </DialogActions>+ </TsDialogActions></Dialog>);}diff --git a/src/renderer/components/dialogs/CreateTagsDialog.tsx b/src/renderer/components/dialogs/CreateTagsDialog.tsxindex c4303933f..cf727d754 100644--- a/src/renderer/components/dialogs/CreateTagsDialog.tsx+++ b/src/renderer/components/dialogs/CreateTagsDialog.tsx@@ -18,7 +18,7 @@import React, { useEffect, useState } from 'react';import TsButton from '-/components/TsButton';-import DialogActions from '@mui/material/DialogActions';+import TsDialogActions from '-/components/dialogs/components/TsDialogActions';import DialogContent from '@mui/material/DialogContent';import DialogTitle from '@mui/material/DialogTitle';import FormControl from '@mui/material/FormControl';@@ -103,7 +103,7 @@ function CreateTagsDialog(props: Props) {{t('core:addTagsToGroupTitle')}<DialogCloseButton testId="closeCreateTagTID" onClose={onClose} /></DialogTitle>- <DialogContent style={{ minWidth: 350, paddingTop: 10 }}>+ <DialogContent style={{ minWidth: 300, paddingTop: 10 }}><FormControl fullWidth={true} error={inputError}><TsTextFielderror={inputError}@@ -119,7 +119,7 @@ function CreateTagsDialog(props: Props) {)}</FormControl></DialogContent>- <DialogActions>+ <TsDialogActions><TsButton onClick={onClose}>{t('core:cancel')}</TsButton><TsButtondisabled={inputError}@@ -129,7 +129,7 @@ function CreateTagsDialog(props: Props) {>{t('core:ok')}</TsButton>- </DialogActions>+ </TsDialogActions></Dialog>);}diff --git a/src/renderer/components/dialogs/DownloadUrlDialog.tsx b/src/renderer/components/dialogs/DownloadUrlDialog.tsxindex f3c881ba9..e1271e345 100644--- a/src/renderer/components/dialogs/DownloadUrlDialog.tsx+++ b/src/renderer/components/dialogs/DownloadUrlDialog.tsx@@ -30,7 +30,7 @@ import TargetPath from '-/components/dialogs/components/TargetPath';import { TargetPathContextProvider } from '-/components/dialogs/hooks/TargetPathContextProvider';import { useTranslation } from 'react-i18next';import TsButton from '-/components/TsButton';-import DialogActions from '@mui/material/DialogActions';+import TsDialogActions from '-/components/dialogs/components/TsDialogActions';import AppConfig from '-/AppConfig';import { actions as AppActions, AppDispatch } from '-/reducers/app';import TsTextField from '-/components/TsTextField';@@ -200,7 +200,7 @@ function DownloadUrlDialog(props: Props) {/><TargetPath /></DialogContent>- <DialogActions>+ <TsDialogActions><TsButton onClick={onClose}>{t('core:cancel')}</TsButton><TsButtonvariant="contained"@@ -210,7 +210,7 @@ function DownloadUrlDialog(props: Props) {>{t('core:ok')}</TsButton>- </DialogActions>+ </TsDialogActions></Dialog></TargetPathContextProvider></Root>diff --git a/src/renderer/components/dialogs/EditEntryTagDialog.tsx b/src/renderer/components/dialogs/EditEntryTagDialog.tsxindex 634583211..21329dc75 100644--- a/src/renderer/components/dialogs/EditEntryTagDialog.tsx+++ b/src/renderer/components/dialogs/EditEntryTagDialog.tsx@@ -23,8 +23,10 @@ import React, {ChangeEvent,useRef,} from 'react';+import { useTheme } from '@mui/material/styles';+import useMediaQuery from '@mui/material/useMediaQuery';import TsButton from '-/components/TsButton';-import DialogActions from '@mui/material/DialogActions';+import TsDialogActions from '-/components/dialogs/components/TsDialogActions';import DialogContent from '@mui/material/DialogContent';import DialogTitle from '@mui/material/DialogTitle';import FormControl from '@mui/material/FormControl';@@ -38,8 +40,6 @@ import { isDateTimeTag } from '-/utils/dates';import { TS } from '-/tagspaces.namespace';import useValidation from '-/utils/useValidation';import DialogCloseButton from '-/components/dialogs/DialogCloseButton';-import { useTheme } from '@mui/material/styles';-import useMediaQuery from '@mui/material/useMediaQuery';import { useTranslation } from 'react-i18next';import { useTaggingActionsContext } from '-/hooks/useTaggingActionsContext';import { tagsValidation } from '-/services/utils-io';@@ -187,7 +187,7 @@ function EditEntryTagDialog(props: Props) {function renderActions() {return (- <DialogActions+ <TsDialogActionsstyle={{justifyContent: 'space-between',}}@@ -218,7 +218,7 @@ function EditEntryTagDialog(props: Props) {{t('core:ok')}</TsButton></div>- </DialogActions>+ </TsDialogActions>);}diff --git a/src/renderer/components/dialogs/EditTagDialog.tsx b/src/renderer/components/dialogs/EditTagDialog.tsxindex 74676ae36..84c055474 100644--- a/src/renderer/components/dialogs/EditTagDialog.tsx+++ b/src/renderer/components/dialogs/EditTagDialog.tsx@@ -19,7 +19,7 @@import React, { useEffect, useState } from 'react';import TsButton from '-/components/TsButton';import format from 'date-fns/format';-import DialogActions from '@mui/material/DialogActions';+import TsDialogActions from '-/components/dialogs/components/TsDialogActions';import DialogContent from '@mui/material/DialogContent';import DialogTitle from '@mui/material/DialogTitle';import FormControl from '@mui/material/FormControl';@@ -252,7 +252,7 @@ function EditTagDialog(props: Props) {)}</ListItem></DialogContent>- <DialogActions>+ <TsDialogActions><TsButton onClick={props.onClose} data-tid="closeEditTagDialog">{t('core:cancel')}</TsButton>@@ -264,7 +264,7 @@ function EditTagDialog(props: Props) {>{t('core:ok')}</TsButton>- </DialogActions>+ </TsDialogActions></Dialog>);}diff --git a/src/renderer/components/dialogs/EditTagGroupDialog.tsx b/src/renderer/components/dialogs/EditTagGroupDialog.tsxindex 1d7901b3f..cebd82e43 100644--- a/src/renderer/components/dialogs/EditTagGroupDialog.tsx+++ b/src/renderer/components/dialogs/EditTagGroupDialog.tsx@@ -18,7 +18,7 @@import React, { ChangeEvent, useEffect, useState } from 'react';import TsButton from '-/components/TsButton';-import DialogActions from '@mui/material/DialogActions';+import TsDialogActions from '-/components/dialogs/components/TsDialogActions';import DialogContent from '@mui/material/DialogContent';import DialogTitle from '@mui/material/DialogTitle';import FormControl from '@mui/material/FormControl';@@ -260,7 +260,7 @@ function EditTagGroupDialog(props: Props) {};const renderActions = () => (- <DialogActions>+ <TsDialogActions><TsButton onClick={onClose}>{t('core:cancel')}</TsButton><TsButtondisabled={disableConfirmButton()}@@ -270,7 +270,7 @@ function EditTagGroupDialog(props: Props) {>{t('core:ok')}</TsButton>- </DialogActions>+ </TsDialogActions>);// const theme = useTheme();diff --git a/src/renderer/components/dialogs/FileUploadDialog.tsx b/src/renderer/components/dialogs/FileUploadDialog.tsxindex a2863ecf8..efde0576b 100644--- a/src/renderer/components/dialogs/FileUploadDialog.tsx+++ b/src/renderer/components/dialogs/FileUploadDialog.tsx@@ -17,8 +17,10 @@*/import React, { useEffect } from 'react';+import { useTheme } from '@mui/material/styles';+import useMediaQuery from '@mui/material/useMediaQuery';import TsButton from '-/components/TsButton';-import DialogActions from '@mui/material/DialogActions';+import TsDialogActions from '-/components/dialogs/components/TsDialogActions';import DialogContent from '@mui/material/DialogContent';import DialogTitle from '@mui/material/DialogTitle';import Dialog from '@mui/material/Dialog';@@ -54,7 +56,8 @@ function FileUploadDialog(props: Props) {const { open = false, title, onClose } = props;const { t } = useTranslation();const dispatch: AppDispatch = useDispatch();-+ const theme = useTheme();+ const fullScreen = useMediaQuery(theme.breakpoints.down('md'));const { currentDirectoryPath } = useDirectoryContentContext();const { currentLocation } = useCurrentLocationContext();const progress = useSelector(getProgress);@@ -166,6 +169,7 @@ function FileUploadDialog(props: Props) {keepMountedscroll="paper"fullWidth={true}+ fullScreen={fullScreen}maxWidth="sm"aria-labelledby="draggable-dialog-title"PaperComponent={DraggablePaper}@@ -256,7 +260,7 @@ function FileUploadDialog(props: Props) {);})}</DialogContent>- <DialogActions style={{ padding: '10px 30px 30px 30px' }}>+ <TsDialogActions>{!haveProgress && (<TsButtondata-tid="uploadCloseAndClearTID"@@ -276,7 +280,7 @@ function FileUploadDialog(props: Props) {{t('core:stopAll')}</TsButton>)}- </DialogActions>+ </TsDialogActions></Dialog>);}diff --git a/src/renderer/components/dialogs/IsTruncatedConfirmDialog.tsx b/src/renderer/components/dialogs/IsTruncatedConfirmDialog.tsxindex e0647ce4f..724ecca4c 100644--- a/src/renderer/components/dialogs/IsTruncatedConfirmDialog.tsx+++ b/src/renderer/components/dialogs/IsTruncatedConfirmDialog.tsx@@ -18,7 +18,7 @@import React from 'react';import TsButton from '-/components/TsButton';-import DialogActions from '@mui/material/DialogActions';+import TsDialogActions from '-/components/dialogs/components/TsDialogActions';import DialogContent from '@mui/material/DialogContent';import DialogTitle from '@mui/material/DialogTitle';import DialogContentText from '@mui/material/DialogContentText';@@ -108,9 +108,9 @@ function IsTruncatedConfirmDialog(props: Props) {/></DialogContentText></DialogContent>- <DialogActions>+ <TsDialogActions><TsButton onClick={() => onClose()}>{t('core:continue')}</TsButton>- </DialogActions>+ </TsDialogActions></Dialog>);}diff --git a/src/renderer/components/dialogs/OpenLinkDialog.tsx b/src/renderer/components/dialogs/OpenLinkDialog.tsxindex d19406873..936ff8f35 100644--- a/src/renderer/components/dialogs/OpenLinkDialog.tsx+++ b/src/renderer/components/dialogs/OpenLinkDialog.tsx@@ -20,7 +20,7 @@ import React, { useState, useEffect } from 'react';import useMediaQuery from '@mui/material/useMediaQuery';import { useTheme } from '@mui/material/styles';import TsButton from '-/components/TsButton';-import DialogActions from '@mui/material/DialogActions';+import TsDialogActions from '-/components/dialogs/components/TsDialogActions';import DialogContent from '@mui/material/DialogContent';import DialogTitle from '@mui/material/DialogTitle';import FormControl from '@mui/material/FormControl';@@ -132,7 +132,7 @@ function OpenLinkDialog(props: Props) {/></FormControl></DialogContent>- <DialogActions>+ <TsDialogActions><TsButton data-tid="closeOpenLinkDialog" onClick={onCancel}>{t('core:cancel')}</TsButton>@@ -144,7 +144,7 @@ function OpenLinkDialog(props: Props) {>{t('core:open')}</TsButton>- </DialogActions>+ </TsDialogActions></Dialog>);}diff --git a/src/renderer/components/dialogs/RenameEntryDialog.tsx b/src/renderer/components/dialogs/RenameEntryDialog.tsxindex 36c290656..d86dadcd5 100644--- a/src/renderer/components/dialogs/RenameEntryDialog.tsx+++ b/src/renderer/components/dialogs/RenameEntryDialog.tsx@@ -17,10 +17,8 @@*/import React, { useReducer, useRef, useState } from 'react';-import { useDispatch, useSelector } from 'react-redux';import TsButton from '-/components/TsButton';-import TextField from '@mui/material/TextField';-import DialogActions from '@mui/material/DialogActions';+import TsDialogActions from '-/components/dialogs/components/TsDialogActions';import DialogContent from '@mui/material/DialogContent';import DialogTitle from '@mui/material/DialogTitle';import FormControl from '@mui/material/FormControl';@@ -190,9 +188,6 @@ function RenameEntryDialog(props: Props) {)}onChange={handleInputChange}onFocus={onInputFocus}- // updateValue={(value) => {- // name.current = value;- // }}defaultValue={name.current}data-tid="renameEntryDialogInput"/>@@ -201,7 +196,7 @@ function RenameEntryDialog(props: Props) {</FormHelperText></FormControl></DialogContent>- <DialogActions>+ <TsDialogActions><TsButton data-tid="closeRenameEntryDialog" onClick={onClose}>{t('core:cancel')}</TsButton>@@ -213,7 +208,7 @@ function RenameEntryDialog(props: Props) {>{t('core:ok')}</TsButton>- </DialogActions>+ </TsDialogActions></Dialog>);}diff --git a/src/renderer/components/dialogs/settings/MapTileServerDialog.tsx b/src/renderer/components/dialogs/settings/MapTileServerDialog.tsxindex 738d73344..69a456871 100644--- a/src/renderer/components/dialogs/settings/MapTileServerDialog.tsx+++ b/src/renderer/components/dialogs/settings/MapTileServerDialog.tsx@@ -17,9 +17,11 @@*/import React, { useRef } from 'react';+import { useTheme } from '@mui/material/styles';+import useMediaQuery from '@mui/material/useMediaQuery';import TsButton from '-/components/TsButton';import Dialog from '@mui/material/Dialog';-import DialogActions from '@mui/material/DialogActions';+import TsDialogActions from '-/components/dialogs/components/TsDialogActions';import DialogContent from '@mui/material/DialogContent';import DialogTitle from '@mui/material/DialogTitle';import TsTextField from '-/components/TsTextField';@@ -51,6 +53,8 @@ function MapTileServerDialog(props: Props) {const serverURL = useRef<string>(props.tileServer.serverURL);const serverInfo = useRef<string>(props.tileServer.serverInfo);const isDefault = useRef<boolean>(props.isDefault);+ const theme = useTheme();+ const fullScreen = useMediaQuery(theme.breakpoints.down('md'));const { setError, haveError } = useValidation();const renderTitle = () => (@@ -173,7 +177,7 @@ function MapTileServerDialog(props: Props) {);const renderActions = () => (- <DialogActions+ <TsDialogActionsstyle={{justifyContent: props.tileServer.uuid ? 'space-between' : 'flex-end',}}@@ -205,12 +209,18 @@ function MapTileServerDialog(props: Props) {{t('core:confirmSaveButton')}</TsButton></div>- </DialogActions>+ </TsDialogActions>);const { open, onClose } = props;return (- <Dialog open={open} keepMounted scroll="paper" onClose={onClose}>+ <Dialog+ open={open}+ fullScreen={fullScreen}+ keepMounted+ scroll="paper"+ onClose={onClose}+ >{renderTitle()}{renderContent()}{renderActions()}diff --git a/src/renderer/perspectives/grid/components/GridSettingsDialog.tsx b/src/renderer/perspectives/grid/components/GridSettingsDialog.tsxindex 608dcb72a..dd8a9a1d8 100644--- a/src/renderer/perspectives/grid/components/GridSettingsDialog.tsx+++ b/src/renderer/perspectives/grid/components/GridSettingsDialog.tsx@@ -19,7 +19,6 @@import React, { useEffect, useReducer } from 'react';import {Dialog,- DialogActions,DialogContent,DialogTitle,FormControl,@@ -28,11 +27,11 @@ import {Switch,Divider,MenuItem,- FormHelperText,Typography,Paper,Box,} from '@mui/material';+import TsDialogActions from '-/components/dialogs/components/TsDialogActions';import useMediaQuery from '@mui/material/useMediaQuery';import ListItemIcon from '@mui/material/ListItemIcon';import ListItemText from '@mui/material/ListItemText';@@ -348,7 +347,7 @@ function GridSettingsDialog(props: Props) {{/* <FormHelperText>{t('core:pageLimitHelp')}</FormHelperText> */}</FormControl></DialogContent>- <DialogActions style={{ justifyContent: 'space-between' }}>+ <TsDialogActions style={{ justifyContent: 'space-between' }}><TsButton data-tid="gridPerspectiveHelp" onClick={openHelpWebPage}>{t('core:help')}</TsButton>@@ -372,7 +371,7 @@ function GridSettingsDialog(props: Props) {{t('core:directorySettings')}</TsButton>)}- </DialogActions>+ </TsDialogActions></Dialog>);}