TagSpaces is an offline, open source, document manager with tagging support
chore: moving the remove filetype button to a separate column
Ilian Sapundshievda8182519ea2
diff --git a/src/renderer/components/dialogs/components/SettingsFileTypes.tsx b/src/renderer/components/dialogs/components/SettingsFileTypes.tsxindex 8a2ad3094..490abf9ce 100644--- a/src/renderer/components/dialogs/components/SettingsFileTypes.tsx+++ b/src/renderer/components/dialogs/components/SettingsFileTypes.tsx@@ -59,14 +59,21 @@ function SettingsFileTypes() {const { extensions } = useExtensionsContext();const { openConfirmDialog } = useNotificationContext();const supportedFileTypes = useSelector(getSupportedFileTypes);- const items = useRef<Array<TS.FileTypes>>([...supportedFileTypes]);++ // Helper function to create deep copies of file types to break refs to frozen Redux objects+ const deepCopyFileTypes = (fileTypes: Array<TS.FileTypes>) =>+ fileTypes.map((ft) => ({ ...ft }));+ const items = useRef<Array<TS.FileTypes>>(+ deepCopyFileTypes(supportedFileTypes),+ );const selectedItem = useRef<TS.FileTypes>(undefined);const isValidationInProgress = useRef<boolean>(false);+ const dataGridRef = useRef(null);const [isColorPickerVisible, setColorPickerVisible] =useState<boolean>(false);- const [rows, setRows] = useState<Array<TS.FileTypes>>([- ...supportedFileTypes,- ]);+ const [rows, setRows] = useState<Array<TS.FileTypes>>(+ deepCopyFileTypes(supportedFileTypes),+ );const [filterValue, setFilterValue] = useState<string>('');const [ignored, forceUpdate] = useReducer((x) => x + 1, 0, undefined);@@ -78,8 +85,8 @@ function SettingsFileTypes() {useEffect(() => {if (!firstRender) {- items.current = [...supportedFileTypes];- setRows([...supportedFileTypes]);+ items.current = deepCopyFileTypes(supportedFileTypes);+ setRows(deepCopyFileTypes(supportedFileTypes));isValidationInProgress.current = false;}}, [supportedFileTypes, firstRender]);@@ -211,6 +218,24 @@ function SettingsFileTypes() {sortable: false,filterable: false,},+ {+ field: 'actions',+ headerName: '',+ width: 80,+ renderCell: (params) => (+ <TsIconButton+ tooltip={t('removeFileType', { itemType: params.row.type })}+ sx={{ marginTop: '-10px' }}+ data-tid="settingsFileTypes_remove_"+ onClick={() => onRemoveItem(params.row)}+ size="small"+ >+ <RemoveIcon />+ </TsIconButton>+ ),+ sortable: false,+ filterable: false,+ },];const onAddFileType = () => {@@ -223,6 +248,17 @@ function SettingsFileTypes() {};items.current = [defaultFileTypeObject, ...items.current];setRows([...items.current]);+ // Scroll to top after adding+ setTimeout(() => {+ if (dataGridRef.current) {+ const virtualScroller = dataGridRef.current.querySelector(+ '.MuiDataGrid-virtualScroller',+ );+ if (virtualScroller) {+ virtualScroller.scrollTop = 0;+ }+ }+ }, 0);};const onRemoveItem = (item) => {@@ -300,17 +336,6 @@ function SettingsFileTypes() {</TransparentBackground></InputAdornment>),- endAdornment: (- <InputAdornment position="end">- <TsIconButton- tooltip={t('removeFileType', { itemType: item.type })}- data-tid="settingsFileTypes_remove_"- onClick={() => onRemoveItem(item)}- >- <RemoveIcon />- </TsIconButton>- </InputAdornment>- ),},}}/>@@ -468,6 +493,7 @@ function SettingsFileTypes() {</Box><div style={{ height: 'calc(100% - 50px)', width: '100%' }}><DataGrid+ ref={dataGridRef}rows={getFilteredRows()}columns={dataGridColumns}getRowId={(row) => row.id || row.type}diff --git a/src/renderer/reducers/settings.ts b/src/renderer/reducers/settings.tsindex 8ef193e72..24e621897 100644--- a/src/renderer/reducers/settings.ts+++ b/src/renderer/reducers/settings.ts@@ -1060,9 +1060,7 @@ export const getKeyBindings = (state: any) => state.settings.keyBindings;export const getKeyBindingObject = (state: any) =>generateKeyBindingObject(state.settings.keyBindings);export const getSupportedFileTypes = (state: any) =>- state.settings.supportedFileTypes.sort((a, b) =>- a.type > b.type ? 1 : a.type < b.type ? -1 : 0,- );+ state.settings.supportedFileTypes;export const getExtensionsFound = (state: any) =>state.settings.extensionsFound;export const getTagColor = (state: any) => state.settings.tagBackgroundColor;