Skip to content

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

chore: refactoring overflow scrolling

Ilian Sapundshiev8491b706dcee
diff --git a/app/assets/images/logo-next.png b/app/assets/images/logo-next.png
new file mode 100755
index 000000000..2e5be6c2c
Binary files /dev/null and b/app/assets/images/logo-next.png differ
diff --git a/app/assets/scrollbars.css b/app/assets/scrollbars.css
index 8c5589e7c..fed5d22ea 100644
--- a/app/assets/scrollbars.css
+++ b/app/assets/scrollbars.css
@@ -4,25 +4,24 @@
}
::-webkit-scrollbar {
- width: 0;
+ width: 8px;
height: 0;
-webkit-transform: scaleX(10);
background-color: transparent;
}
-:hover::-webkit-scrollbar {
- width: 8px;
- height: 10px;
-}
-
::-webkit-scrollbar-track,
::-webkit-scrollbar-corner {
background: none;
}
+:hover::-webkit-scrollbar-thumb {
+ background-color: #787f8b;
+}
+
::-webkit-scrollbar-thumb {
border-radius: 5px;
- background-color: #787f8b;
+ background-color: transparent;
border: none;
box-shadow: none !important;
}
diff --git a/app/components/DirectoryListView.tsx b/app/components/DirectoryListView.tsx
index ed7834450..887574fa7 100644
--- a/app/components/DirectoryListView.tsx
+++ b/app/components/DirectoryListView.tsx
@@ -174,8 +174,7 @@ function DirectoryListView(props: Props) {
style={{
borderRadius: 5,
maxHeight: 300,
- // @ts-ignore
- overflowY: AppConfig.isFirefox ? 'auto' : 'overlay'
+ overflowY: 'auto'
}}
>
{getFolderContent()}
diff --git a/app/components/EditDescription.tsx b/app/components/EditDescription.tsx
index 87d87c613..95234b164 100644
--- a/app/components/EditDescription.tsx
+++ b/app/components/EditDescription.tsx
@@ -105,8 +105,7 @@ function EditDescription(props: Props) {
minHeight: 50,
maxHeight: noDescription && !editMode ? 100 : 250,
width: 'calc(100% - 8px)',
- // @ts-ignore
- overflowY: AppConfig.isFirefox ? 'auto' : 'overlay'
+ overflowY: 'auto'
}}
>
{noDescription && !editMode ? (
diff --git a/app/components/EntryContainer.tsx b/app/components/EntryContainer.tsx
index 10a80f4b3..613a31ad1 100644
--- a/app/components/EntryContainer.tsx
+++ b/app/components/EntryContainer.tsx
@@ -136,7 +136,7 @@ const styles: any = (theme: any) => ({
flex: '1 1',
display: 'flex',
alignItems: 'baseline',
- overflowX: AppConfig.isFirefox ? 'auto' : 'overlay',
+ overflowX: 'auto',
overflowY: 'hidden',
paddingRight: 100
},
diff --git a/app/components/EntryProperties.tsx b/app/components/EntryProperties.tsx
index e43fb6678..68858cddd 100644
--- a/app/components/EntryProperties.tsx
+++ b/app/components/EntryProperties.tsx
@@ -114,7 +114,7 @@ const BgndImgChooserDialog =
const styles: any = (theme: any) => ({
entryProperties: {
- overflowY: AppConfig.isFirefox ? 'auto' : 'overlay',
+ overflowY: 'auto',
overflowX: 'hidden',
flexGrow: 1,
padding: 7,
diff --git a/app/components/FolderContainer.tsx b/app/components/FolderContainer.tsx
index 92d2c7747..73768a75f 100644
--- a/app/components/FolderContainer.tsx
+++ b/app/components/FolderContainer.tsx
@@ -513,8 +513,7 @@ function FolderContainer(props: Props) {
display: 'flex',
overflowY: 'hidden',
alignItems: 'center',
- // @ts-ignore
- overflowX: AppConfig.isFirefox ? 'auto' : 'overlay'
+ overflowX: 'auto'
}}
>
<IconButton
diff --git a/app/components/HelpFeedbackPanel.tsx b/app/components/HelpFeedbackPanel.tsx
index 55c0a24a0..b8bb8508f 100644
--- a/app/components/HelpFeedbackPanel.tsx
+++ b/app/components/HelpFeedbackPanel.tsx
@@ -91,8 +91,7 @@ function HelpFeedbackPanel(props: Props) {
aria-label="main help area"
style={{
height: 'calc(100% - ' + reduceHeightBy + 'px)',
- // @ts-ignore
- overflowY: AppConfig.isFirefox ? 'auto' : 'overlay'
+ overflowY: 'auto'
}}
>
<ListItem
diff --git a/app/components/LocationManager.tsx b/app/components/LocationManager.tsx
index e86006010..9583cade0 100644
--- a/app/components/LocationManager.tsx
+++ b/app/components/LocationManager.tsx
@@ -180,8 +180,7 @@ function LocationManager(props: Props) {
style={{
height: 'calc(100% - ' + reduceHeightBy + 'px)',
borderRadius: 5,
- // @ts-ignore
- overflowY: AppConfig.isFirefox ? 'auto' : 'overlay'
+ overflowY: 'auto'
}}
>
<DragDropContext onDragEnd={onDragEnd}>
diff --git a/app/components/Revisions.tsx b/app/components/Revisions.tsx
index 4c2f43a97..bb667bfdd 100644
--- a/app/components/Revisions.tsx
+++ b/app/components/Revisions.tsx
@@ -173,8 +173,7 @@ function Revisions(props: Props) {
component={Paper}
sx={{
maxHeight: '100%',
- // @ts-ignore
- overflowY: AppConfig.isFirefox ? 'auto' : 'overlay'
+ overflowY: 'auto'
}}
>
<Table
diff --git a/app/components/SearchInline.css.tsx b/app/components/SearchInline.css.tsx
index fb382ef21..b619eb57f 100644
--- a/app/components/SearchInline.css.tsx
+++ b/app/components/SearchInline.css.tsx
@@ -35,8 +35,6 @@ export const styles = (theme: any) => {
locationListArea: {
paddingTop: 0,
marginTop: 0
- // @ts-ignore
- // overflowY: AppConfig.isFirefox ? 'auto' : 'overlay'
},
listItem: {
paddingLeft: 0,
diff --git a/app/components/SearchPopover.tsx b/app/components/SearchPopover.tsx
index 4f121af42..05dd8856a 100644
--- a/app/components/SearchPopover.tsx
+++ b/app/components/SearchPopover.tsx
@@ -564,8 +564,8 @@ function SearchPopover(props: Props) {
height: 'calc(100% - 90px)',
maxHeight: 'calc(100% - 90px)',
overflowX: 'hidden',
- // @ts-ignore
- overflowY: AppConfig.isFirefox ? 'auto' : 'overlay'
+ overflowY: 'auto',
+ scrollbarGutter: 'stable'
}}
data-tid="searchAdvancedTID"
>
diff --git a/app/components/SidePanels.css.tsx b/app/components/SidePanels.css.tsx
index d8711023e..2d99af443 100644
--- a/app/components/SidePanels.css.tsx
+++ b/app/components/SidePanels.css.tsx
@@ -36,7 +36,7 @@ export default (theme: any) =>
locationListArea: {
paddingTop: 0,
marginTop: 0,
- overflowY: AppConfig.isFirefox ? 'auto' : 'overlay'
+ overflowY: 'auto'
},
listItem: {
paddingLeft: 0,
diff --git a/app/components/StoredSearches.tsx b/app/components/StoredSearches.tsx
index 404c814c7..61e0cf80e 100644
--- a/app/components/StoredSearches.tsx
+++ b/app/components/StoredSearches.tsx
@@ -220,8 +220,7 @@ function StoredSearches(props: Props) {
paddingTop: 0,
marginTop: 0,
height: 'calc(100% - ' + reduceHeightBy + 'px)',
- // @ts-ignore
- overflowY: AppConfig.isFirefox ? 'auto' : 'overlay'
+ overflowY: 'auto'
}}
>
<Grid container direction="row">
diff --git a/app/components/TagLibrary.tsx b/app/components/TagLibrary.tsx
index 954047ce5..d1c0bf0e6 100644
--- a/app/components/TagLibrary.tsx
+++ b/app/components/TagLibrary.tsx
@@ -604,8 +604,7 @@ function TagLibrary(props: Props) {
marginTop: 0,
borderRadius: 5,
height: 'calc(100% - ' + reduceHeightBy + 'px)',
- // @ts-ignore
- overflowY: AppConfig.isFirefox ? 'auto' : 'overlay'
+ overflowY: 'auto'
}}
data-tid="tagLibraryTagGroupList"
>
diff --git a/app/components/dialogs/AddRemoveTagsDialog.tsx b/app/components/dialogs/AddRemoveTagsDialog.tsx
index 3c96bed41..de743dceb 100644
--- a/app/components/dialogs/AddRemoveTagsDialog.tsx
+++ b/app/components/dialogs/AddRemoveTagsDialog.tsx
@@ -129,8 +129,7 @@ function AddRemoveTagsDialog(props: Props) {
style={{
minHeight: 330,
paddingTop: 10,
- // @ts-ignore
- overflowY: AppConfig.isFirefox ? 'auto' : 'overlay',
+ overflowY: 'auto',
overflowX: 'hidden'
}}
>
diff --git a/app/components/dialogs/CreateEditLocationDialog.tsx b/app/components/dialogs/CreateEditLocationDialog.tsx
index 53c697c5f..f3b60dd11 100644
--- a/app/components/dialogs/CreateEditLocationDialog.tsx
+++ b/app/components/dialogs/CreateEditLocationDialog.tsx
@@ -537,7 +537,7 @@ function CreateEditLocationDialog(props: Props) {
</DialogTitle>
<DialogContent
style={{
- overflow: AppConfig.isFirefox ? 'auto' : 'overlay',
+ overflow: 'auto',
minHeight: 200,
padding: 8
}}
diff --git a/app/components/dialogs/EditEntryTagDialog.tsx b/app/components/dialogs/EditEntryTagDialog.tsx
index 94c333631..e85d068a0 100644
--- a/app/components/dialogs/EditEntryTagDialog.tsx
+++ b/app/components/dialogs/EditEntryTagDialog.tsx
@@ -148,7 +148,7 @@ function EditEntryTagDialog(props: Props) {
data-tid="editEntryTagDialog"
className={props.classes.root}
style={{
- overflow: AppConfig.isFirefox ? 'auto' : 'overlay'
+ overflow: 'auto'
}}
>
<FormControl fullWidth={true} error={haveError('tag')}>
diff --git a/app/components/dialogs/ImportExportTagGroupsDialog.tsx b/app/components/dialogs/ImportExportTagGroupsDialog.tsx
index fac75c900..31e31dc84 100644
--- a/app/components/dialogs/ImportExportTagGroupsDialog.tsx
+++ b/app/components/dialogs/ImportExportTagGroupsDialog.tsx
@@ -41,7 +41,7 @@ const styles: any = {
root: {
width: 400,
height: '100%',
- overflowY: AppConfig.isFirefox ? 'auto' : 'overlay',
+ overflowY: 'auto',
marginBottom: 30
}
};
diff --git a/app/components/dialogs/KeyboardDialog.tsx b/app/components/dialogs/KeyboardDialog.tsx
index a46b62342..eb87554fe 100644
--- a/app/components/dialogs/KeyboardDialog.tsx
+++ b/app/components/dialogs/KeyboardDialog.tsx
@@ -72,7 +72,7 @@ function KeyboardDialog(props: Props) {
data-tid="keyboardShortCutsDialog"
style={{
minWidth: 350,
- overflow: AppConfig.isFirefox ? 'auto' : 'overlay'
+ overflow: 'auto'
}}
>
<List dense={false}>
diff --git a/app/components/dialogs/LicenseDialog.tsx b/app/components/dialogs/LicenseDialog.tsx
index 1cce0a94d..69c3bc093 100644
--- a/app/components/dialogs/LicenseDialog.tsx
+++ b/app/components/dialogs/LicenseDialog.tsx
@@ -74,7 +74,7 @@ function LicenseDialog(props: Props) {
// inputRef={ref => {
// licenseElement = ref;
// }}
- style={{ overflow: AppConfig.isFirefox ? 'auto' : 'overlay' }}
+ style={{ overflow: 'auto' }}
>
<pre style={{ whiteSpace: 'pre-wrap', userSelect: 'text' }}>
{Pro ? Pro.EULAContent : LicenseContent}
diff --git a/app/components/dialogs/LinkGeneratorDialog.tsx b/app/components/dialogs/LinkGeneratorDialog.tsx
index 09e63bb9f..fe6228052 100644
--- a/app/components/dialogs/LinkGeneratorDialog.tsx
+++ b/app/components/dialogs/LinkGeneratorDialog.tsx
@@ -94,9 +94,7 @@ function LinkGeneratorDialog(props: Props) {
{i18n.t('core:generateDownloadLink')}{' '}
<DialogCloseButton testId="closeLinkGeneratorTID" onClose={onClose} />
</DialogTitle>
- <DialogContent
- style={{ overflow: AppConfig.isFirefox ? 'auto' : 'overlay' }}
- >
+ <DialogContent style={{ overflow: 'auto' }}>
<TextField
style={{ marginTop: 8 }}
select
diff --git a/app/components/dialogs/MoveOrCopyFilesDialog.tsx b/app/components/dialogs/MoveOrCopyFilesDialog.tsx
index 3aa6c71e2..3a11f6197 100644
--- a/app/components/dialogs/MoveOrCopyFilesDialog.tsx
+++ b/app/components/dialogs/MoveOrCopyFilesDialog.tsx
@@ -74,8 +74,7 @@ function MoveOrCopyFilesDialog(props: Props) {
<DialogContent
style={{
overflowX: 'hidden',
- // @ts-ignore
- overflowY: AppConfig.isFirefox ? 'auto' : 'overlay'
+ overflowY: 'auto'
}}
>
<Typography variant="subtitle2">{i18n.t('selectedFiles')}</Typography>
diff --git a/app/components/dialogs/OnboardingDialog.tsx b/app/components/dialogs/OnboardingDialog.tsx
index 81ad9a46c..62615d48f 100644
--- a/app/components/dialogs/OnboardingDialog.tsx
+++ b/app/components/dialogs/OnboardingDialog.tsx
@@ -101,8 +101,7 @@ function OnboardingDialog(props: Props) {
<DialogContent
style={{
marginTop: 20,
- // @ts-ignore
- overflowY: AppConfig.isFirefox ? 'auto' : 'overlay'
+ overflowY: 'auto'
}}
>
<SwipeableViews
diff --git a/app/components/dialogs/ProTeaserDialog.tsx b/app/components/dialogs/ProTeaserDialog.tsx
index 81b08c4be..44fc6aa4e 100644
--- a/app/components/dialogs/ProTeaserDialog.tsx
+++ b/app/components/dialogs/ProTeaserDialog.tsx
@@ -197,8 +197,7 @@ function ProTeaserDialog(props: Props) {
<DialogContent
style={{
paddingBottom: 0,
- // @ts-ignore
- overflowY: AppConfig.isFirefox ? 'auto' : 'overlay'
+ overflowY: 'auto'
}}
>
<SwipeableViews
diff --git a/app/components/dialogs/ResolveConflictDialog.tsx b/app/components/dialogs/ResolveConflictDialog.tsx
index 468469349..be4e8e4bc 100644
--- a/app/components/dialogs/ResolveConflictDialog.tsx
+++ b/app/components/dialogs/ResolveConflictDialog.tsx
@@ -73,7 +73,7 @@ function ResolveConflictDialog(props: Props) {
</DialogTitle>
<DialogContent
style={{
- overflow: AppConfig.isFirefox ? 'auto' : 'overlay',
+ overflow: 'auto',
minWidth: 400
}}
>
diff --git a/app/components/dialogs/settings/SettingsDialog.tsx b/app/components/dialogs/settings/SettingsDialog.tsx
index 62d6465cd..7066c90b4 100644
--- a/app/components/dialogs/settings/SettingsDialog.tsx
+++ b/app/components/dialogs/settings/SettingsDialog.tsx
@@ -44,7 +44,7 @@ import SettingsExtensions from '-/components/dialogs/settings/SettingsExtensions
const styles: any = () => ({
mainContent: {
- overflowY: AppConfig.isFirefox ? 'auto' : 'overlay'
+ overflowY: 'auto'
}
});
diff --git a/app/components/dialogs/settings/SettingsFileTypes.tsx b/app/components/dialogs/settings/SettingsFileTypes.tsx
index fce8fe2f1..354b4dd6c 100644
--- a/app/components/dialogs/settings/SettingsFileTypes.tsx
+++ b/app/components/dialogs/settings/SettingsFileTypes.tsx
@@ -513,8 +513,7 @@ function SettingsFileTypes(props: Props) {
style={{
overflowX: 'hidden',
height: 'calc(100% - 30px)',
- // @ts-ignore
- overflowY: AppConfig.isFirefox ? 'auto' : 'overlay'
+ overflowY: 'auto'
}}
data={items.current}
components={VirtuosoTableComponents}
diff --git a/app/perspectives/grid-perspective/components/GridPagination.tsx b/app/perspectives/grid-perspective/components/GridPagination.tsx
index 12c200ba6..6c24e3e03 100644
--- a/app/perspectives/grid-perspective/components/GridPagination.tsx
+++ b/app/perspectives/grid-perspective/components/GridPagination.tsx
@@ -413,8 +413,7 @@ function GridPagination(props: Props) {
}
style={{
height: '100%',
- // @ts-ignore
- overflowY: AppConfig.isFirefox ? 'auto' : 'overlay',
+ overflowY: 'auto',
backgroundImage: 'url("' + folderBgndPath.current + '")',
backgroundSize: 'cover',
backgroundRepeat: 'no-repeat'
diff --git a/app/perspectives/grid-perspective/components/styles.css.tsx b/app/perspectives/grid-perspective/components/styles.css.tsx
index b4bcb3d38..005d1be36 100644
--- a/app/perspectives/grid-perspective/components/styles.css.tsx
+++ b/app/perspectives/grid-perspective/components/styles.css.tsx
@@ -102,7 +102,7 @@ export default (theme: any): any => ({
textAlign: 'center'
},
gridSizeDate: {
- overflow: AppConfig.isFirefox ? 'auto' : 'overlay',
+ overflow: 'auto',
whiteSpace: 'nowrap',
marginRight: 5,
marginLeft: 'auto',
@@ -135,6 +135,6 @@ export default (theme: any): any => ({
backdropFilter: 'blur(5px)',
// borderBottom: '1px solid ' + theme.palette.divider,
width: 'calc(100% - 10px)',
- overflowX: AppConfig.isFirefox ? 'auto' : 'overlay'
+ overflowX: 'auto'
}
});