Skip to content

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

chore: upgrade MUI Material UI 7.3.9 -> 9.0.1 (#2440)

Ilianf5b375366dac
diff --git a/package-lock.json b/package-lock.json
index 9e9eab3dc..5a13dcb66 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,15 +11,16 @@
"license": "AGPL-3.0",
"dependencies": {
"@aws-amplify/ui-react": "1.2.26",
+ "@emotion/react": "11.14.0",
"@emotion/styled": "11.14.1",
"@milkdown/crepe": "7.19.2",
"@milkdown/kit": "7.19.2",
"@milkdown/react": "7.19.2",
- "@mui/icons-material": "7.3.9",
- "@mui/lab": "7.0.1-beta.21",
- "@mui/material": "7.3.9",
- "@mui/x-data-grid": "8.24.0",
- "@mui/x-date-pickers": "8.24.0",
+ "@mui/icons-material": "9.0.1",
+ "@mui/lab": "9.0.0-beta.3",
+ "@mui/material": "9.0.1",
+ "@mui/x-data-grid": "9.0.4",
+ "@mui/x-date-pickers": "9.0.4",
"@tagspaces/tagspaces-common": "4.7.2",
"@tagspaces/tagspaces-common-aws3": "4.7.2",
"@tagspaces/tagspaces-common-cordova": "4.7.2",
@@ -13166,7 +13167,6 @@
"resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.14.0.tgz",
"integrity": "sha512-O000MLDBDdk/EohJPFUqvnp4qnHeYkVP5B0xEG0D/L7cOKP9kefu2DXn8dj74cQfsEzUqh+sr1RzFqiL1o+PpA==",
"license": "MIT",
- "peer": true,
"dependencies": {
"@babel/runtime": "^7.18.3",
"@emotion/babel-plugin": "^11.13.5",
@@ -15162,9 +15162,9 @@
}
},
"node_modules/@mui/core-downloads-tracker": {
- "version": "7.3.9",
- "resolved": "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-7.3.9.tgz",
- "integrity": "sha512-MOkOCTfbMJwLshlBCKJ59V2F/uaLYfmKnN76kksj6jlGUVdI25A9Hzs08m+zjBRdLv+sK7Rqdsefe8X7h/6PCw==",
+ "version": "9.0.1",
+ "resolved": "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-9.0.1.tgz",
+ "integrity": "sha512-GzamIIhZ1bH77dq7eKaeyRgJdkypsxin4jBFq2EMs4lBWRR0LFO1CSVMsoebn/VvjcNrnrOrjy48MkrkQUK2iw==",
"license": "MIT",
"funding": {
"type": "opencollective",
@@ -15172,12 +15172,12 @@
}
},
"node_modules/@mui/icons-material": {
- "version": "7.3.9",
- "resolved": "https://registry.npmjs.org/@mui/icons-material/-/icons-material-7.3.9.tgz",
- "integrity": "sha512-BT+zPJXss8Hg/oEMRmHl17Q97bPACG4ufFSfGEdhiE96jOyR5Dz1ty7ZWt1fVGR0y1p+sSgEwQT/MNZQmoWDCw==",
+ "version": "9.0.1",
+ "resolved": "https://registry.npmjs.org/@mui/icons-material/-/icons-material-9.0.1.tgz",
+ "integrity": "sha512-5PRpQjVLTNLyV/2J9J53Yz4R0tVbodG0BQDN2zQI1QBG1OPYM25ar+4N20eyFOfJT6zKglLzsnU70+zdVLaTkw==",
"license": "MIT",
"dependencies": {
- "@babel/runtime": "^7.28.6"
+ "@babel/runtime": "^7.29.2"
},
"engines": {
"node": ">=14.0.0"
@@ -15187,7 +15187,7 @@
"url": "https://opencollective.com/mui-org"
},
"peerDependencies": {
- "@mui/material": "^7.3.9",
+ "@mui/material": "^9.0.1",
"@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0",
"react": "^17.0.0 || ^18.0.0 || ^19.0.0"
},
@@ -15198,15 +15198,15 @@
}
},
"node_modules/@mui/lab": {
- "version": "7.0.1-beta.21",
- "resolved": "https://registry.npmjs.org/@mui/lab/-/lab-7.0.1-beta.21.tgz",
- "integrity": "sha512-9IWTUJsV1Jjv6Rc4Yybj75TmalXBnluwJPJG1Q0ZeU+HvaoIaQybzqv8B3MvXLan94gLzV80XVwQAVel35A81A==",
+ "version": "9.0.0-beta.3",
+ "resolved": "https://registry.npmjs.org/@mui/lab/-/lab-9.0.0-beta.3.tgz",
+ "integrity": "sha512-V824ch6JKO14QWcsbzqzyrxQpNKfnbq84NchzEH1e5ry5B4l0n+i8TmJwJWwxjMH0yxyE4tKorywGHu4oKRBlA==",
"license": "MIT",
"dependencies": {
- "@babel/runtime": "^7.28.4",
- "@mui/system": "^7.3.7",
- "@mui/types": "^7.4.10",
- "@mui/utils": "^7.3.7",
+ "@babel/runtime": "^7.29.2",
+ "@mui/system": "^9.0.1",
+ "@mui/types": "^9.0.0",
+ "@mui/utils": "^9.0.1",
"clsx": "^2.1.1",
"prop-types": "^15.8.1"
},
@@ -15220,8 +15220,8 @@
"peerDependencies": {
"@emotion/react": "^11.5.0",
"@emotion/styled": "^11.3.0",
- "@mui/material": "^7.3.7",
- "@mui/material-pigment-css": "^7.3.7",
+ "@mui/material": "^9.0.1",
+ "@mui/material-pigment-css": "^9.0.1",
"@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0",
"react": "^17.0.0 || ^18.0.0 || ^19.0.0",
"react-dom": "^17.0.0 || ^18.0.0 || ^19.0.0"
@@ -15241,23 +15241,53 @@
}
}
},
+ "node_modules/@mui/lab/node_modules/@mui/utils": {
+ "version": "9.0.1",
+ "resolved": "https://registry.npmjs.org/@mui/utils/-/utils-9.0.1.tgz",
+ "integrity": "sha512-f3UO3jNN1pYg5zxqXC81Bvv8hx5ACcYc0387382ZI7M5ono1heIwHYLrKsz85myguWdeVKPRZGmDdynWUBjK2g==",
+ "license": "MIT",
+ "dependencies": {
+ "@babel/runtime": "^7.29.2",
+ "@mui/types": "^9.0.0",
+ "@types/prop-types": "^15.7.15",
+ "clsx": "^2.1.1",
+ "prop-types": "^15.8.1",
+ "react-is": "^19.2.4"
+ },
+ "engines": {
+ "node": ">=14.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/mui-org"
+ },
+ "peerDependencies": {
+ "@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0",
+ "react": "^17.0.0 || ^18.0.0 || ^19.0.0"
+ },
+ "peerDependenciesMeta": {
+ "@types/react": {
+ "optional": true
+ }
+ }
+ },
"node_modules/@mui/material": {
- "version": "7.3.9",
- "resolved": "https://registry.npmjs.org/@mui/material/-/material-7.3.9.tgz",
- "integrity": "sha512-I8yO3t4T0y7bvDiR1qhIN6iBWZOTBfVOnmLlM7K6h3dx5YX2a7rnkuXzc2UkZaqhxY9NgTnEbdPlokR1RxCNRQ==",
+ "version": "9.0.1",
+ "resolved": "https://registry.npmjs.org/@mui/material/-/material-9.0.1.tgz",
+ "integrity": "sha512-voyCpeUxcSWLN7KPZuq0pGCIt726T9K6kiVM3XUcywZDAlZSarLHaUxJVQpospbjjOzN53hwyjo8s6KoWl6utw==",
"license": "MIT",
"dependencies": {
- "@babel/runtime": "^7.28.6",
- "@mui/core-downloads-tracker": "^7.3.9",
- "@mui/system": "^7.3.9",
- "@mui/types": "^7.4.12",
- "@mui/utils": "^7.3.9",
+ "@babel/runtime": "^7.29.2",
+ "@mui/core-downloads-tracker": "^9.0.1",
+ "@mui/system": "^9.0.1",
+ "@mui/types": "^9.0.0",
+ "@mui/utils": "^9.0.1",
"@popperjs/core": "^2.11.8",
"@types/react-transition-group": "^4.4.12",
"clsx": "^2.1.1",
"csstype": "^3.2.3",
"prop-types": "^15.8.1",
- "react-is": "^19.2.3",
+ "react-is": "^19.2.4",
"react-transition-group": "^4.4.5"
},
"engines": {
@@ -15270,7 +15300,7 @@
"peerDependencies": {
"@emotion/react": "^11.5.0",
"@emotion/styled": "^11.3.0",
- "@mui/material-pigment-css": "^7.3.9",
+ "@mui/material-pigment-css": "^9.0.1",
"@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0",
"react": "^17.0.0 || ^18.0.0 || ^19.0.0",
"react-dom": "^17.0.0 || ^18.0.0 || ^19.0.0"
@@ -15290,14 +15320,44 @@
}
}
},
+ "node_modules/@mui/material/node_modules/@mui/utils": {
+ "version": "9.0.1",
+ "resolved": "https://registry.npmjs.org/@mui/utils/-/utils-9.0.1.tgz",
+ "integrity": "sha512-f3UO3jNN1pYg5zxqXC81Bvv8hx5ACcYc0387382ZI7M5ono1heIwHYLrKsz85myguWdeVKPRZGmDdynWUBjK2g==",
+ "license": "MIT",
+ "dependencies": {
+ "@babel/runtime": "^7.29.2",
+ "@mui/types": "^9.0.0",
+ "@types/prop-types": "^15.7.15",
+ "clsx": "^2.1.1",
+ "prop-types": "^15.8.1",
+ "react-is": "^19.2.4"
+ },
+ "engines": {
+ "node": ">=14.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/mui-org"
+ },
+ "peerDependencies": {
+ "@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0",
+ "react": "^17.0.0 || ^18.0.0 || ^19.0.0"
+ },
+ "peerDependenciesMeta": {
+ "@types/react": {
+ "optional": true
+ }
+ }
+ },
"node_modules/@mui/private-theming": {
- "version": "7.3.9",
- "resolved": "https://registry.npmjs.org/@mui/private-theming/-/private-theming-7.3.9.tgz",
- "integrity": "sha512-ErIyRQvsiQEq7Yvcvfw9UDHngaqjMy9P3JDPnRAaKG5qhpl2C4tX/W1S4zJvpu+feihmZJStjIyvnv6KDbIrlw==",
+ "version": "9.0.1",
+ "resolved": "https://registry.npmjs.org/@mui/private-theming/-/private-theming-9.0.1.tgz",
+ "integrity": "sha512-pSIGq4Yw749KHEwlkYZWVERgHgwJELP6ODtBNUfV8V4oIb5H+h7IQDFXuk/b2oQccODK1enJAtiEzlgLZmq+8g==",
"license": "MIT",
"dependencies": {
- "@babel/runtime": "^7.28.6",
- "@mui/utils": "^7.3.9",
+ "@babel/runtime": "^7.29.2",
+ "@mui/utils": "^9.0.1",
"prop-types": "^15.8.1"
},
"engines": {
@@ -15317,13 +15377,43 @@
}
}
},
+ "node_modules/@mui/private-theming/node_modules/@mui/utils": {
+ "version": "9.0.1",
+ "resolved": "https://registry.npmjs.org/@mui/utils/-/utils-9.0.1.tgz",
+ "integrity": "sha512-f3UO3jNN1pYg5zxqXC81Bvv8hx5ACcYc0387382ZI7M5ono1heIwHYLrKsz85myguWdeVKPRZGmDdynWUBjK2g==",
+ "license": "MIT",
+ "dependencies": {
+ "@babel/runtime": "^7.29.2",
+ "@mui/types": "^9.0.0",
+ "@types/prop-types": "^15.7.15",
+ "clsx": "^2.1.1",
+ "prop-types": "^15.8.1",
+ "react-is": "^19.2.4"
+ },
+ "engines": {
+ "node": ">=14.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/mui-org"
+ },
+ "peerDependencies": {
+ "@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0",
+ "react": "^17.0.0 || ^18.0.0 || ^19.0.0"
+ },
+ "peerDependenciesMeta": {
+ "@types/react": {
+ "optional": true
+ }
+ }
+ },
"node_modules/@mui/styled-engine": {
- "version": "7.3.9",
- "resolved": "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-7.3.9.tgz",
- "integrity": "sha512-JqujWt5bX4okjUPGpVof/7pvgClqh7HvIbsIBIOOlCh2u3wG/Bwp4+E1bc1dXSwkrkp9WUAoNdI5HEC+5HKvMw==",
+ "version": "9.0.0",
+ "resolved": "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-9.0.0.tgz",
+ "integrity": "sha512-9RLGdX4Jg0aQPRuvqh/OLzYSPlgd5zyEw5/1HIRfdavSiOd03WtUaGZH9/w1RoTYuRKwpgy0hpIFaMHIqPVIWg==",
"license": "MIT",
"dependencies": {
- "@babel/runtime": "^7.28.6",
+ "@babel/runtime": "^7.29.2",
"@emotion/cache": "^11.14.0",
"@emotion/serialize": "^1.3.3",
"@emotion/sheet": "^1.4.0",
@@ -15352,16 +15442,16 @@
}
},
"node_modules/@mui/system": {
- "version": "7.3.9",
- "resolved": "https://registry.npmjs.org/@mui/system/-/system-7.3.9.tgz",
- "integrity": "sha512-aL1q9am8XpRrSabv9qWf5RHhJICJql34wnrc1nz0MuOglPRYF/liN+c8VqZdTvUn9qg+ZjRVbKf4sJVFfIDtmg==",
+ "version": "9.0.1",
+ "resolved": "https://registry.npmjs.org/@mui/system/-/system-9.0.1.tgz",
+ "integrity": "sha512-WvlioaLxk6ewUIOfh0StxUvOPDS1mCfzaulcudsL1brZNXuh0N9FMk7RpH7ImJKjEz412SEy/V/yvqmtxbqxCQ==",
"license": "MIT",
"dependencies": {
- "@babel/runtime": "^7.28.6",
- "@mui/private-theming": "^7.3.9",
- "@mui/styled-engine": "^7.3.9",
- "@mui/types": "^7.4.12",
- "@mui/utils": "^7.3.9",
+ "@babel/runtime": "^7.29.2",
+ "@mui/private-theming": "^9.0.1",
+ "@mui/styled-engine": "^9.0.0",
+ "@mui/types": "^9.0.0",
+ "@mui/utils": "^9.0.1",
"clsx": "^2.1.1",
"csstype": "^3.2.3",
"prop-types": "^15.8.1"
@@ -15391,13 +15481,43 @@
}
}
},
+ "node_modules/@mui/system/node_modules/@mui/utils": {
+ "version": "9.0.1",
+ "resolved": "https://registry.npmjs.org/@mui/utils/-/utils-9.0.1.tgz",
+ "integrity": "sha512-f3UO3jNN1pYg5zxqXC81Bvv8hx5ACcYc0387382ZI7M5ono1heIwHYLrKsz85myguWdeVKPRZGmDdynWUBjK2g==",
+ "license": "MIT",
+ "dependencies": {
+ "@babel/runtime": "^7.29.2",
+ "@mui/types": "^9.0.0",
+ "@types/prop-types": "^15.7.15",
+ "clsx": "^2.1.1",
+ "prop-types": "^15.8.1",
+ "react-is": "^19.2.4"
+ },
+ "engines": {
+ "node": ">=14.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/mui-org"
+ },
+ "peerDependencies": {
+ "@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0",
+ "react": "^17.0.0 || ^18.0.0 || ^19.0.0"
+ },
+ "peerDependenciesMeta": {
+ "@types/react": {
+ "optional": true
+ }
+ }
+ },
"node_modules/@mui/types": {
- "version": "7.4.12",
- "resolved": "https://registry.npmjs.org/@mui/types/-/types-7.4.12.tgz",
- "integrity": "sha512-iKNAF2u9PzSIj40CjvKJWxFXJo122jXVdrmdh0hMYd+FR+NuJMkr/L88XwWLCRiJ5P1j+uyac25+Kp6YC4hu6w==",
+ "version": "9.0.0",
+ "resolved": "https://registry.npmjs.org/@mui/types/-/types-9.0.0.tgz",
+ "integrity": "sha512-i1cuFCAWN44b3AJWO7mh7tuh1sqbQSeVr/94oG0TX5uXivac8XalgE4/6fQZcmGZigzbQ35IXxj/4jLpRIBYZg==",
"license": "MIT",
"dependencies": {
- "@babel/runtime": "^7.28.6"
+ "@babel/runtime": "^7.29.2"
},
"peerDependencies": {
"@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0"
@@ -15409,17 +15529,17 @@
}
},
"node_modules/@mui/utils": {
- "version": "7.3.9",
- "resolved": "https://registry.npmjs.org/@mui/utils/-/utils-7.3.9.tgz",
- "integrity": "sha512-U6SdZaGbfb65fqTsH3V5oJdFj9uYwyLE2WVuNvmbggTSDBb8QHrFsqY8BN3taK9t3yJ8/BPHD/kNvLNyjwM7Yw==",
+ "version": "9.0.0",
+ "resolved": "https://registry.npmjs.org/@mui/utils/-/utils-9.0.0.tgz",
+ "integrity": "sha512-bQcqyg/gjULUqTuyUjSAFr6LQGLvtkNtDbJerAtoUn9kGZ0hg5QJiN1PLHMLbeFpe3te1831uq7GFl2ITokGdg==",
"license": "MIT",
"dependencies": {
- "@babel/runtime": "^7.28.6",
- "@mui/types": "^7.4.12",
+ "@babel/runtime": "^7.29.2",
+ "@mui/types": "^9.0.0",
"@types/prop-types": "^15.7.15",
"clsx": "^2.1.1",
"prop-types": "^15.8.1",
- "react-is": "^19.2.3"
+ "react-is": "^19.2.4"
},
"engines": {
"node": ">=14.0.0"
@@ -15439,15 +15559,15 @@
}
},
"node_modules/@mui/x-data-grid": {
- "version": "8.24.0",
- "resolved": "https://registry.npmjs.org/@mui/x-data-grid/-/x-data-grid-8.24.0.tgz",
- "integrity": "sha512-OCTrskRlxwJZ+vYWbgQnQPXWNMA/nY/RIkoESjbCG38N9fJicVCdyjszjcQn9V1NQH4fwkMlIN+DVU6zzbqJxQ==",
+ "version": "9.0.4",
+ "resolved": "https://registry.npmjs.org/@mui/x-data-grid/-/x-data-grid-9.0.4.tgz",
+ "integrity": "sha512-XhjewU6EGFPXDhVJ48ILA7PXYdGVbIwvy6g3SYkm7yMygb/ScA6k+Uac2zi09OMxJDCK8nRiuhj+ONY4uZZIYQ==",
"license": "MIT",
"dependencies": {
- "@babel/runtime": "^7.28.4",
- "@mui/utils": "^7.3.5",
- "@mui/x-internals": "8.24.0",
- "@mui/x-virtualizer": "0.3.1",
+ "@babel/runtime": "^7.29.2",
+ "@mui/utils": "9.0.0",
+ "@mui/x-internals": "^9.0.4",
+ "@mui/x-virtualizer": "9.0.0-alpha.2",
"clsx": "^2.1.1",
"prop-types": "^15.8.1",
"use-sync-external-store": "^1.6.0"
@@ -15462,8 +15582,8 @@
"peerDependencies": {
"@emotion/react": "^11.9.0",
"@emotion/styled": "^11.8.1",
- "@mui/material": "^5.15.14 || ^6.0.0 || ^7.0.0",
- "@mui/system": "^5.15.14 || ^6.0.0 || ^7.0.0",
+ "@mui/material": "^7.3.0 || ^9.0.0",
+ "@mui/system": "^7.3.0 || ^9.0.0",
"react": "^17.0.0 || ^18.0.0 || ^19.0.0",
"react-dom": "^17.0.0 || ^18.0.0 || ^19.0.0"
},
@@ -15477,14 +15597,14 @@
}
},
"node_modules/@mui/x-date-pickers": {
- "version": "8.24.0",
- "resolved": "https://registry.npmjs.org/@mui/x-date-pickers/-/x-date-pickers-8.24.0.tgz",
- "integrity": "sha512-wxh/BuL3OGcMa1Z90mcBgew7v0VW2M044bCOIpypu8cJeOv8mEcxRl/JE/e9xFyPq4/C1B1gXtf2j6tpYIM1lQ==",
+ "version": "9.0.4",
+ "resolved": "https://registry.npmjs.org/@mui/x-date-pickers/-/x-date-pickers-9.0.4.tgz",
+ "integrity": "sha512-Zq4ZUYyqFtv9BjAyYOkUEiAykdAJnvFoPY8gaARXWleyX8QY5ztY5I1yD3iS6R+k/QFWNOef07VYU7nKFdRrYA==",
"license": "MIT",
"dependencies": {
- "@babel/runtime": "^7.28.4",
- "@mui/utils": "^7.3.5",
- "@mui/x-internals": "8.24.0",
+ "@babel/runtime": "^7.29.2",
+ "@mui/utils": "9.0.0",
+ "@mui/x-internals": "^9.0.4",
"@types/react-transition-group": "^4.4.12",
"clsx": "^2.1.1",
"prop-types": "^15.8.1",
@@ -15500,8 +15620,8 @@
"peerDependencies": {
"@emotion/react": "^11.9.0",
"@emotion/styled": "^11.8.1",
- "@mui/material": "^5.15.14 || ^6.0.0 || ^7.0.0",
- "@mui/system": "^5.15.14 || ^6.0.0 || ^7.0.0",
+ "@mui/material": "^7.3.0 || ^9.0.0",
+ "@mui/system": "^7.3.0 || ^9.0.0",
"date-fns": "^2.25.0 || ^3.2.0 || ^4.0.0",
"date-fns-jalali": "^2.13.0-0 || ^3.2.0-0 || ^4.0.0-0",
"dayjs": "^1.10.7",
@@ -15543,13 +15663,13 @@
}
},
"node_modules/@mui/x-internals": {
- "version": "8.24.0",
- "resolved": "https://registry.npmjs.org/@mui/x-internals/-/x-internals-8.24.0.tgz",
- "integrity": "sha512-tHPk8eUcuwvhNsAc4zcia8y+issjC+bLGssrQQSdLLeLIf9ewFbcwAURNTSnNhreyj/4RJOemVrSxKXpjkdVvQ==",
+ "version": "9.0.4",
+ "resolved": "https://registry.npmjs.org/@mui/x-internals/-/x-internals-9.0.4.tgz",
+ "integrity": "sha512-I84xcPZOEmN29syfAjgsv25kpW7GX9+F7n2xXKEX5C7VdyXITbAW2RomwXt3guud4KwGhkAGuGDPK7Wi20EoCg==",
"license": "MIT",
"dependencies": {
- "@babel/runtime": "^7.28.4",
- "@mui/utils": "^7.3.5",
+ "@babel/runtime": "^7.29.2",
+ "@mui/utils": "9.0.0",
"reselect": "^5.1.1",
"use-sync-external-store": "^1.6.0"
},
@@ -15565,14 +15685,14 @@
}
},
"node_modules/@mui/x-virtualizer": {
- "version": "0.3.1",
- "resolved": "https://registry.npmjs.org/@mui/x-virtualizer/-/x-virtualizer-0.3.1.tgz",
- "integrity": "sha512-MhQ7U/zmSofBxeCRMiolhZWJ80RUJMFFMRqeehJu5GqscnudiVcplZb0eNsAkz9IjnJTyrjyLS0PY+kn78enOw==",
+ "version": "9.0.0-alpha.2",
+ "resolved": "https://registry.npmjs.org/@mui/x-virtualizer/-/x-virtualizer-9.0.0-alpha.2.tgz",
+ "integrity": "sha512-L/7I81NzdQ6a+iu74bkOyVILbwVdAEeCMQLDdmBS77lXVmSZSn3E664oQVdE8uoiSjbOuF0U2LGyM7wH9Ae/nA==",
"license": "MIT",
"dependencies": {
- "@babel/runtime": "^7.28.4",
- "@mui/utils": "^7.3.5",
- "@mui/x-internals": "8.24.0"
+ "@babel/runtime": "^7.29.2",
+ "@mui/utils": "9.0.0",
+ "@mui/x-internals": "^9.0.4"
},
"engines": {
"node": ">=14.0.0"
diff --git a/package.json b/package.json
index 08189f7d1..83ed25289 100644
--- a/package.json
+++ b/package.json
@@ -169,15 +169,16 @@
"browserslist": [],
"dependencies": {
"@aws-amplify/ui-react": "1.2.26",
+ "@emotion/react": "11.14.0",
"@emotion/styled": "11.14.1",
"@milkdown/crepe": "7.19.2",
"@milkdown/kit": "7.19.2",
"@milkdown/react": "7.19.2",
- "@mui/icons-material": "7.3.9",
- "@mui/lab": "7.0.1-beta.21",
- "@mui/material": "7.3.9",
- "@mui/x-data-grid": "8.24.0",
- "@mui/x-date-pickers": "8.24.0",
+ "@mui/icons-material": "9.0.1",
+ "@mui/lab": "9.0.0-beta.3",
+ "@mui/material": "9.0.1",
+ "@mui/x-data-grid": "9.0.4",
+ "@mui/x-date-pickers": "9.0.4",
"@tagspaces/tagspaces-common": "4.7.2",
"@tagspaces/tagspaces-common-aws3": "4.7.2",
"@tagspaces/tagspaces-common-cordova": "4.7.2",
@@ -241,7 +242,7 @@
"zod-to-json-schema": "3.25.1"
},
"optionalDependencies": {
- "@tagspacespro/tagspacespro": "5.0.239"
+ "@tagspacespro/tagspacespro": "5.0.240"
},
"devDependencies": {
"@electron/rebuild": "4.0.3",
diff --git a/src/renderer/components/CommonIcons.tsx b/src/renderer/components/CommonIcons.tsx
index e87eeb27f..0feb30215 100644
--- a/src/renderer/components/CommonIcons.tsx
+++ b/src/renderer/components/CommonIcons.tsx
@@ -49,7 +49,7 @@ export const MarkdownFileIcon = (props) => (
<MarkdownRawIcon sx={{ transform: 'scaleX(-1)' }} {...props} />
);
-export { default as WorkspacesIcon } from '@mui/icons-material/WorkspacesOutline';
+export { default as WorkspacesIcon } from '@mui/icons-material/WorkspacesOutlined';
export const NavigateToFolderIcon = (props) => (
<KeyboardReturnIcon {...props} />
@@ -87,7 +87,7 @@ export { default as CreateFileIcon } from '@mui/icons-material/AddCircleOutlineO
export { default as AddIcon } from '@mui/icons-material/AddCircleOutlineOutlined';
-export { default as LocalLocationIcon } from '@mui/icons-material/WorkOutline';
+export { default as LocalLocationIcon } from '@mui/icons-material/WorkOutlineOutlined';
export { default as CloudLocationIcon } from '@mui/icons-material/CloudQueue';
@@ -117,7 +117,7 @@ export { default as BookmarkIcon } from '@mui/icons-material/BookmarkBorder';
export { default as BookIcon } from '@mui/icons-material/MenuBook';
-export { default as EmailIcon } from '@mui/icons-material/MailOutline';
+export { default as EmailIcon } from '@mui/icons-material/MailOutlined';
export { default as DateIcon } from '@mui/icons-material/DateRange';
@@ -334,7 +334,7 @@ export { default as ChatIcon } from '@mui/icons-material/Chat';
export { default as ZoomInIcon } from '@mui/icons-material/ControlPoint';
-export { default as ZoomOutIcon } from '@mui/icons-material/RemoveCircleOutline';
+export { default as ZoomOutIcon } from '@mui/icons-material/RemoveCircleOutlineOutlined';
export { default as ZoomLevelIcon } from '@mui/icons-material/Loupe';
diff --git a/src/renderer/components/EditSearchQuery.tsx b/src/renderer/components/EditSearchQuery.tsx
index c3ffb8aa1..7347415a4 100644
--- a/src/renderer/components/EditSearchQuery.tsx
+++ b/src/renderer/components/EditSearchQuery.tsx
@@ -210,10 +210,20 @@ function EditSearchQuery(props: Props) {
<TooltipTS
title={
<>
- <Typography variant="subtitle1" color="inherit">
+ <Typography
+ variant="subtitle1"
+ sx={{
+ color: 'inherit',
+ }}
+ >
Tips for the extended search
</Typography>
- <Typography variant="subtitle2" color="inherit">
+ <Typography
+ variant="subtitle2"
+ sx={{
+ color: 'inherit',
+ }}
+ >
💡 <b>{'sun'}</b> - will match entries having the word
sun but also san or sum in the name
<br />
@@ -631,7 +641,12 @@ function EditSearchQuery(props: Props) {
<FormControl>
<TooltipTS title={t('enterTimePeriodTooltip')}>
<LocalizationProvider dateAdapter={AdapterDateFns}>
- <Box position="relative" display="inline-flex">
+ <Box
+ sx={{
+ position: 'relative',
+ display: 'inline-flex',
+ }}
+ >
<div style={{ maxWidth: 180 }}>
<FormHelperText sx={{ marginLeft: 0, marginTop: 0 }}>
{t('core:enterTagTimePeriodFrom')}
diff --git a/src/renderer/components/EntryContainerButtons.tsx b/src/renderer/components/EntryContainerButtons.tsx
index 8d1c6fa0b..eaf40b6c0 100644
--- a/src/renderer/components/EntryContainerButtons.tsx
+++ b/src/renderer/components/EntryContainerButtons.tsx
@@ -24,9 +24,10 @@ import { useFilePropertiesContext } from '-/hooks/useFilePropertiesContext';
import { useIOActionsContext } from '-/hooks/useIOActionsContext';
import { useNotificationContext } from '-/hooks/useNotificationContext';
import { useOpenedEntryContext } from '-/hooks/useOpenedEntryContext';
+import TsSwitch from '-/components/TsSwitch';
import { Pro } from '-/pro';
import { isDesktopMode, isRevisionsEnabled } from '-/reducers/settings';
-import { Box, ButtonGroup, Switch, Tooltip } from '@mui/material';
+import { Box, ButtonGroup, Tooltip } from '@mui/material';
import React from 'react';
import { useTranslation } from 'react-i18next';
import { useSelector } from 'react-redux';
@@ -77,7 +78,7 @@ function EntryContainerButtons(props: EntryContainerButtonsProps) {
}
>
<span>
- <Switch
+ <TsSwitch
data-tid="autoSaveTID"
checked={openedEntry.meta && openedEntry.meta.autoSave}
onChange={toggleAutoSave}
diff --git a/src/renderer/components/FolderContainer.tsx b/src/renderer/components/FolderContainer.tsx
index c31b61f9e..b76aae2b8 100644
--- a/src/renderer/components/FolderContainer.tsx
+++ b/src/renderer/components/FolderContainer.tsx
@@ -240,17 +240,24 @@ function FolderContainer({ toggleDrawer, drawerOpened, hidden }: Props) {
// Memoized CircularProgress with label
const CircularProgressWithLabel = useCallback(
(prop: { value: number }) => (
- <Box position="relative" display="inline-flex">
+ <Box
+ sx={{
+ position: 'relative',
+ display: 'inline-flex',
+ }}
+ >
<CircularProgress size={24} variant="determinate" {...prop} />
<Box
- top={0}
- left={0}
- bottom={0}
- right={0}
- position="absolute"
- display="flex"
- alignItems="center"
- justifyContent="center"
+ sx={{
+ top: 0,
+ left: 0,
+ bottom: 0,
+ right: 0,
+ position: 'absolute',
+ display: 'flex',
+ alignItems: 'center',
+ justifyContent: 'center',
+ }}
>
<Typography
variant="caption"
diff --git a/src/renderer/components/LinksTab.tsx b/src/renderer/components/LinksTab.tsx
index f5c442e42..4841862ec 100644
--- a/src/renderer/components/LinksTab.tsx
+++ b/src/renderer/components/LinksTab.tsx
@@ -209,7 +209,11 @@ function LinksTab(props: Props) {
const listView = (
<>
- <Box display="block">
+ <Box
+ sx={{
+ display: 'block',
+ }}
+ >
{links.current && links.current.length > 0 && (
<>
<Typography variant="body2">
@@ -224,7 +228,11 @@ function LinksTab(props: Props) {
</>
)}
</Box>
- <Box display="block">
+ <Box
+ sx={{
+ display: 'block',
+ }}
+ >
<Typography variant="body2">
<b>{t('core:incomingLinks')}</b> (
{t('from content and description of other files and folders')})
diff --git a/src/renderer/components/SearchAutocomplete.tsx b/src/renderer/components/SearchAutocomplete.tsx
index a1998aa08..9853dc037 100644
--- a/src/renderer/components/SearchAutocomplete.tsx
+++ b/src/renderer/components/SearchAutocomplete.tsx
@@ -62,7 +62,7 @@ import { dataTidFormat } from '-/services/test';
import { removePrefix } from '-/services/utils-io';
import { TS } from '-/tagspaces.namespace';
import useFirstRender from '-/utils/useFirstRender';
-import HelpOutlineIcon from '@mui/icons-material/HelpOutline';
+import HelpOutlineIcon from '@mui/icons-material/HelpOutlined';
import AdvancedSearchIcon from '@mui/icons-material/TuneOutlined';
import { Autocomplete, Box } from '@mui/material';
import { useTheme } from '@mui/material/styles';
@@ -1503,7 +1503,7 @@ function SearchAutocomplete(props: Props) {
}
return filteredOptions;
}}
- renderTags={(value) =>
+ renderValue={(value) =>
value.map((option, index: number) => {
const action = actionValues.current.find(
(a) => a.fullName === option || a.label === option,
@@ -1667,13 +1667,13 @@ function SearchAutocomplete(props: Props) {
onKeyDown={onKeyDownHandler}
disableClearable={true}
renderInput={(params) => {
- if (params.InputProps.endAdornment) {
- params.InputProps.endAdornment = [
- params.InputProps.endAdornment,
+ if (params.slotProps.input.endAdornment) {
+ params.slotProps.input.endAdornment = [
+ params.slotProps.input.endAdornment,
endAdornment,
];
} else {
- params.InputProps.endAdornment = [endAdornment];
+ params.slotProps.input.endAdornment = [endAdornment];
}
return (
<TsTextField
diff --git a/src/renderer/components/SearchPopover.tsx b/src/renderer/components/SearchPopover.tsx
index f21018451..73f79a4c5 100644
--- a/src/renderer/components/SearchPopover.tsx
+++ b/src/renderer/components/SearchPopover.tsx
@@ -135,10 +135,12 @@ function SearchPopover(props: Props) {
<Grid
container
spacing={2}
- sx={{ marginBottom: '15px' }}
direction="row"
- justifyContent="center"
- alignItems="flex-end"
+ sx={{
+ justifyContent: 'center',
+ alignItems: 'flex-end',
+ marginBottom: '15px',
+ }}
>
<Grid size={9}>
<TooltipTS title={t('storedSearchQueriesTooltip')}>
diff --git a/src/renderer/components/TagGroupTitleDnD.tsx b/src/renderer/components/TagGroupTitleDnD.tsx
index 2ce775864..4e99760be 100644
--- a/src/renderer/components/TagGroupTitleDnD.tsx
+++ b/src/renderer/components/TagGroupTitleDnD.tsx
@@ -180,9 +180,12 @@ function TagGroupTitleDnD(props: Props) {
<Grid
container
direction="row"
- alignItems="stretch"
- alignContent="center"
- sx={{ flexWrap: 'nowrap', cursor: 'grab' }}
+ sx={{
+ alignItems: 'stretch',
+ alignContent: 'center',
+ flexWrap: 'nowrap',
+ cursor: 'grab',
+ }}
>
<Grid size={2} sx={{ maxWidth: 40 }}>
<TsIconButton
diff --git a/src/renderer/components/TagsSelect.tsx b/src/renderer/components/TagsSelect.tsx
index 16cabc8f1..0a07546ee 100644
--- a/src/renderer/components/TagsSelect.tsx
+++ b/src/renderer/components/TagsSelect.tsx
@@ -218,47 +218,59 @@ function TagsSelect(props: Props) {
value={tags}
onChange={handleTagChange}
onInputChange={handleInputChange}
- renderTags={(value: readonly TS.Tag[], getTagProps) =>
- value.map((option: TS.Tag, index: number) => (
- <TagContainer
- key={selectedEntry?.path + option + index}
- tag={option}
- tagMode={tagMode}
- handleTagMenu={handleTagMenu}
- handleRemoveTag={handleRemoveTag}
- />
- ))
+ renderValue={(values) =>
+ (values as Array<TS.Tag | string>).flatMap((value, index) => {
+ // freeSolo + autoSelect can briefly surface the raw typed string
+ // here before onChange (createOption) replaces it with a Tag.
+ // Guard against rendering TagContainer with a string `tag`.
+ if (typeof value === 'string') return [];
+ return [
+ <TagContainer
+ key={(selectedEntry?.path ?? '') + value.id + index}
+ tag={value}
+ tagMode={tagMode}
+ handleTagMenu={handleTagMenu}
+ handleRemoveTag={handleRemoveTag}
+ />,
+ ];
+ })
}
renderOption={(props, option) => (
<Box component="li" {...props}>
<TagContainer tag={option} tagMode={tagMode} />
</Box>
)}
- renderInput={(params) => (
- <>
- <TsTextField
- {...params}
- label={label}
- placeholder={placeholderText}
- autoFocus={autoFocus}
- error={tagsError.current}
- sx={{ marginTop: 0, marginBottom: 0, whiteSpace: 'nowrap' }}
- slotProps={{
- input: {
- ...params.InputProps,
- endAdornment: generateButton && (
- <InputAdornment position="end">
- <AiGenTagsButton variant="text" />
- </InputAdornment>
- ),
- },
- }}
- />
- {tagsError.current && (
- <FormHelperText>{t('core:tagTitleHelper')}</FormHelperText>
- )}
- </>
- )}
+ renderInput={(params) => {
+ // Append the AI gen button to MUI's default endAdornment instead of
+ // replacing it — overriding slotProps wholesale would drop
+ // params.slotProps.htmlInput (which carries the onKeyDown that
+ // commits freeSolo values on Enter).
+ if (generateButton) {
+ params.slotProps.input.endAdornment = (
+ <>
+ {params.slotProps.input.endAdornment}
+ <InputAdornment position="end">
+ <AiGenTagsButton variant="text" />
+ </InputAdornment>
+ </>
+ );
+ }
+ return (
+ <>
+ <TsTextField
+ {...params}
+ label={label}
+ placeholder={placeholderText}
+ autoFocus={autoFocus}
+ error={tagsError.current}
+ sx={{ marginTop: 0, marginBottom: 0, whiteSpace: 'nowrap' }}
+ />
+ {tagsError.current && (
+ <FormHelperText>{t('core:tagTitleHelper')}</FormHelperText>
+ )}
+ </>
+ );
+ }}
/>
{selectedEntry && (
<EntryTagMenu
diff --git a/src/renderer/components/TsSwitch.tsx b/src/renderer/components/TsSwitch.tsx
new file mode 100644
index 000000000..7901427a6
--- /dev/null
+++ b/src/renderer/components/TsSwitch.tsx
@@ -0,0 +1,93 @@
+/**
+ * TagSpaces - universal file and folder organizer
+ * Copyright (C) 2025-present TagSpaces GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License (version 3) as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+import TooltipTS from '-/components/Tooltip';
+import Switch, { SwitchProps } from '@mui/material/Switch';
+import { styled } from '@mui/material/styles';
+
+export type TsSwitchProps = SwitchProps & {
+ tooltip?: string;
+};
+
+const IOSSwitch = styled((props: SwitchProps) => (
+ <Switch focusVisibleClassName=".Mui-focusVisible" disableRipple {...props} />
+))(({ theme }) => ({
+ width: 42,
+ height: 26,
+ padding: 0,
+ margin: '6px 4px',
+ '& .MuiSwitch-switchBase': {
+ padding: 0,
+ margin: 2,
+ transitionDuration: '300ms',
+ '&.Mui-checked': {
+ transform: 'translateX(16px)',
+ color: '#fff',
+ '& + .MuiSwitch-track': {
+ backgroundColor: theme.palette.primary.main,
+ opacity: 1,
+ border: 0,
+ },
+ '&.Mui-disabled + .MuiSwitch-track': {
+ opacity: 0.5,
+ },
+ },
+ '&.Mui-focusVisible .MuiSwitch-thumb': {
+ color: theme.palette.primary.light,
+ border: '6px solid #fff',
+ },
+ '&.Mui-disabled .MuiSwitch-thumb': {
+ color: theme.palette.grey[100],
+ ...theme.applyStyles('dark', {
+ color: theme.palette.grey[600],
+ }),
+ },
+ '&.Mui-disabled + .MuiSwitch-track': {
+ opacity: 0.7,
+ ...theme.applyStyles('dark', {
+ opacity: 0.3,
+ }),
+ },
+ },
+ '& .MuiSwitch-thumb': {
+ boxSizing: 'border-box',
+ width: 22,
+ height: 22,
+ },
+ '& .MuiSwitch-track': {
+ boxSizing: 'border-box',
+ borderRadius: 26 / 2,
+ backgroundColor: '#E9E9EA',
+ opacity: 1,
+ transition: theme.transitions.create(['background-color'], {
+ duration: 500,
+ }),
+ ...theme.applyStyles('dark', {
+ backgroundColor: '#39393D',
+ border: `1px solid ${theme.palette.divider}`,
+ }),
+ },
+}));
+
+function TsSwitch(props: TsSwitchProps) {
+ const { tooltip, ...rest } = props;
+ const sw = <IOSSwitch {...rest} />;
+ return tooltip ? <TooltipTS title={tooltip}>{sw}</TooltipTS> : sw;
+}
+
+export default TsSwitch;
diff --git a/src/renderer/components/chat/ChatView.tsx b/src/renderer/components/chat/ChatView.tsx
index c4a2c4b42..a343a8da2 100644
--- a/src/renderer/components/chat/ChatView.tsx
+++ b/src/renderer/components/chat/ChatView.tsx
@@ -434,9 +434,9 @@ function ChatView() {
<Grid
container
spacing={1}
- direction="column"
wrap="nowrap"
sx={{
+ flexDirection: 'column',
height: '100%',
overflow: 'hidden',
}}
@@ -498,14 +498,16 @@ function ChatView() {
</MilkdownProvider>
</Grid>
{/* Images and chat input */}
- <Grid container spacing={1} direction="column">
+ <Grid container spacing={1} sx={{ flexDirection: 'column' }}>
{images.length > 0 && (
<Grid>
{images.map((image, index) => (
<Box
key={image.uuid}
- position="relative"
- sx={{ float: 'right' }}
+ sx={{
+ position: 'relative',
+ float: 'right',
+ }}
>
<img
src={
@@ -716,7 +718,6 @@ function ChatView() {
</Grid>
</Grid>
</Grid>
-
{/* Edit/Create Prompt Dialog */}
<PromptEditDialog
open={dialogOpen}
@@ -729,7 +730,6 @@ function ChatView() {
onClose={handleCloseDialog}
onDelete={handleOpenDeleteConfirm}
/>
-
{/* Delete Confirmation Dialog */}
<ConfirmDialog
open={deleteConfirmOpen}
diff --git a/src/renderer/components/dialogs/CreateEditLocationDialog.tsx b/src/renderer/components/dialogs/CreateEditLocationDialog.tsx
index 9c348e336..9750803bf 100644
--- a/src/renderer/components/dialogs/CreateEditLocationDialog.tsx
+++ b/src/renderer/components/dialogs/CreateEditLocationDialog.tsx
@@ -66,7 +66,7 @@ import ListItem from '@mui/material/ListItem';
import ListItemIcon from '@mui/material/ListItemIcon';
import ListItemText from '@mui/material/ListItemText';
import Paper from '@mui/material/Paper';
-import Switch from '@mui/material/Switch';
+import TsSwitch from '-/components/TsSwitch';
import ToggleButtonGroup from '@mui/material/ToggleButtonGroup';
import Typography from '@mui/material/Typography';
import { useTheme } from '@mui/material/styles';
@@ -722,7 +722,7 @@ function CreateEditLocationDialog(props: Props) {
labelPlacement="start"
sx={{ justifyContent: 'space-between', marginLeft: 0 }}
control={
- <Switch
+ <TsSwitch
data-tid="locationIsDefault"
name="isDefault"
checked={isDefault}
@@ -737,7 +737,7 @@ function CreateEditLocationDialog(props: Props) {
labelPlacement="start"
sx={{ justifyContent: 'space-between', marginLeft: 0 }}
control={
- <Switch
+ <TsSwitch
disabled={!Pro}
data-tid="changeFullTextIndex"
name="fullTextIndex"
@@ -796,7 +796,7 @@ function CreateEditLocationDialog(props: Props) {
labelPlacement="start"
sx={{ justifyContent: 'space-between', marginLeft: 0 }}
control={
- <Switch
+ <TsSwitch
disabled={!Pro}
data-tid="extractLinksTID"
name="extractLinks"
@@ -818,7 +818,7 @@ function CreateEditLocationDialog(props: Props) {
labelPlacement="start"
sx={{ justifyContent: 'space-between', marginLeft: 0 }}
control={
- <Switch
+ <TsSwitch
// disabled={!Pro}
data-tid="reloadOnFocusTID"
name="reloadOnFocus"
@@ -858,7 +858,7 @@ function CreateEditLocationDialog(props: Props) {
labelPlacement="start"
sx={{ justifyContent: 'space-between', marginLeft: 0 }}
control={
- <Switch
+ <TsSwitch
disabled={!Pro}
data-tid="changeReadOnlyMode"
name="isReadOnly"
@@ -885,7 +885,7 @@ function CreateEditLocationDialog(props: Props) {
labelPlacement="start"
sx={{ justifyContent: 'space-between', marginLeft: 0 }}
control={
- <Switch
+ <TsSwitch
data-tid="changeWatchForChanges"
name="watchForChanges"
checked={watchForChanges}
@@ -906,7 +906,7 @@ function CreateEditLocationDialog(props: Props) {
labelPlacement="start"
sx={{ justifyContent: 'space-between', marginLeft: 0 }}
control={
- <Switch
+ <TsSwitch
data-tid="locationSettingsGenThumbsTID"
name="locationSettingsGenThumbs"
checked={disableThumbnailGeneration}
@@ -921,7 +921,7 @@ function CreateEditLocationDialog(props: Props) {
labelPlacement="start"
sx={{ justifyContent: 'space-between', marginLeft: 0 }}
control={
- <Switch
+ <TsSwitch
disabled={!Pro}
data-tid="disableIndexingTID"
name="disableIndexing"
diff --git a/src/renderer/components/dialogs/EditTagGroupDialog.tsx b/src/renderer/components/dialogs/EditTagGroupDialog.tsx
index 34b3af4d7..a0db3b194 100644
--- a/src/renderer/components/dialogs/EditTagGroupDialog.tsx
+++ b/src/renderer/components/dialogs/EditTagGroupDialog.tsx
@@ -43,7 +43,7 @@ import FormHelperText from '@mui/material/FormHelperText';
import ListItem from '@mui/material/ListItem';
import ListItemText from '@mui/material/ListItemText';
import MenuItem from '@mui/material/MenuItem';
-import Switch from '@mui/material/Switch';
+import TsSwitch from '-/components/TsSwitch';
import React, { ChangeEvent, useContext, useEffect, useState } from 'react';
import { useTranslation } from 'react-i18next';
import { useSelector } from 'react-redux';
@@ -325,7 +325,7 @@ function EditTagGroupDialog(props: Props) {
</ListItem>
<ListItem sx={{ paddingLeft: 0, paddingRight: 0 }}>
<ListItemText primary={t('core:colorChangesToAllTags')} />
- <Switch
+ <TsSwitch
data-tid="editTagGroupSwitch"
onClick={() => setApplyChanges(!applyChanges)}
checked={applyChanges}
diff --git a/src/renderer/components/dialogs/FileUploadDialog.tsx b/src/renderer/components/dialogs/FileUploadDialog.tsx
index 744e7bdd1..bcd0ee02c 100644
--- a/src/renderer/components/dialogs/FileUploadDialog.tsx
+++ b/src/renderer/components/dialogs/FileUploadDialog.tsx
@@ -83,11 +83,25 @@ function FileUploadDialog(props: Props) {
function LinearProgressWithLabel(prop) {
return (
- <Box display="flex" alignItems="center">
- <Box width="100%" mr={1}>
+ <Box
+ sx={{
+ display: 'flex',
+ alignItems: 'center',
+ }}
+ >
+ <Box
+ sx={{
+ width: '100%',
+ mr: 1,
+ }}
+ >
<LinearProgress variant="determinate" {...prop} />
</Box>
- <Box minWidth={35}>
+ <Box
+ sx={{
+ minWidth: 35,
+ }}
+ >
<Typography variant="body2">{`${prop.value}%`}</Typography>
</Box>
</Box>
@@ -218,8 +232,10 @@ function FileUploadDialog(props: Props) {
<Grid
key={path}
container
- justifyContent="center"
- alignItems="center"
+ sx={{
+ justifyContent: 'center',
+ alignItems: 'center',
+ }}
>
<Grid
size={{ xs: 10 }}
diff --git a/src/renderer/components/dialogs/ImportMacTagDialog.tsx b/src/renderer/components/dialogs/ImportMacTagDialog.tsx
index 74989e26b..8f573fb7d 100644
--- a/src/renderer/components/dialogs/ImportMacTagDialog.tsx
+++ b/src/renderer/components/dialogs/ImportMacTagDialog.tsx
@@ -24,9 +24,10 @@ import { useProgressDialogContext } from '-/components/dialogs/hooks/useProgress
import { useCurrentLocationContext } from '-/hooks/useCurrentLocationContext';
import { useNotificationContext } from '-/hooks/useNotificationContext';
import { useTaggingActionsContext } from '-/hooks/useTaggingActionsContext';
+import TsSwitch from '-/components/TsSwitch';
import { Pro } from '-/pro';
import { readMacOSTags } from '-/services/utils-io';
-import { Box, Switch } from '@mui/material';
+import { Box } from '@mui/material';
import Dialog from '@mui/material/Dialog';
import DialogContent from '@mui/material/DialogContent';
import DialogTitle from '@mui/material/DialogTitle';
@@ -132,7 +133,7 @@ Do you want to continue?`)
<FormControlLabel
labelPlacement="start"
control={
- <Switch
+ <TsSwitch
data-tid="importTagsRecursiveTID"
checked={recursive.current}
onChange={toggleRecursive}
diff --git a/src/renderer/components/dialogs/LicenseDialog.tsx b/src/renderer/components/dialogs/LicenseDialog.tsx
index 97fe7ccc9..80ef09f99 100644
--- a/src/renderer/components/dialogs/LicenseDialog.tsx
+++ b/src/renderer/components/dialogs/LicenseDialog.tsx
@@ -60,9 +60,11 @@ function LicenseDialog(props: Props) {
return (
<Dialog
open={open}
- onClose={onClose}
+ onClose={(_event, reason) => {
+ if (reason === 'escapeKeyDown') return;
+ onClose();
+ }}
keepMounted
- disableEscapeKeyDown
fullScreen={smallScreen}
scroll="paper"
>
diff --git a/src/renderer/components/dialogs/MapTileServerDialog.tsx b/src/renderer/components/dialogs/MapTileServerDialog.tsx
index dfb719ab9..98c7d0f78 100644
--- a/src/renderer/components/dialogs/MapTileServerDialog.tsx
+++ b/src/renderer/components/dialogs/MapTileServerDialog.tsx
@@ -37,7 +37,7 @@ import ListItem from '@mui/material/ListItem';
import ListItemText from '@mui/material/ListItemText';
import Paper from '@mui/material/Paper';
import Stack from '@mui/material/Stack';
-import Switch from '@mui/material/Switch';
+import TsSwitch from '-/components/TsSwitch';
import { useTheme } from '@mui/material/styles';
import useMediaQuery from '@mui/material/useMediaQuery';
import Links from 'assets/links';
@@ -183,7 +183,7 @@ function MapTileServerDialog(props: Props) {
</FormControl>
<ListItem sx={{ paddingLeft: 0, paddingRight: 0 }}>
<ListItemText primary={t('core:serverIsDefaultHelp')} />
- <Switch
+ <TsSwitch
data-tid="serverIsDefaultTID"
onClick={() => {
isDefault.current = !isDefault.current;
diff --git a/src/renderer/components/dialogs/OnboardingDialog.tsx b/src/renderer/components/dialogs/OnboardingDialog.tsx
index 78f12a901..ce4831984 100644
--- a/src/renderer/components/dialogs/OnboardingDialog.tsx
+++ b/src/renderer/components/dialogs/OnboardingDialog.tsx
@@ -53,7 +53,7 @@ import ListItem from '@mui/material/ListItem';
import ListItemIcon from '@mui/material/ListItemIcon';
import ListItemText from '@mui/material/ListItemText';
import MenuItem from '@mui/material/MenuItem';
-import Switch from '@mui/material/Switch';
+import TsSwitch from '-/components/TsSwitch';
import Typography from '@mui/material/Typography';
import { useTheme } from '@mui/material/styles';
import useMediaQuery from '@mui/material/useMediaQuery';
@@ -355,7 +355,9 @@ function OnboardingDialog(props: Props) {
keepMounted
fullScreen={smallScreen}
scroll="paper"
- PaperProps={{ sx: { minHeight: smallScreen ? undefined : 560 } }}
+ slotProps={{
+ paper: { sx: { minHeight: smallScreen ? undefined : 560 } },
+ }}
>
<TsDialogTitle
dialogTitle={''}
@@ -563,14 +565,17 @@ function OnboardingDialog(props: Props) {
<ListItemText
primary={row.name}
secondary={row.path}
- primaryTypographyProps={{ variant: 'body2' }}
- secondaryTypographyProps={{
- variant: 'caption',
- sx: {
- overflow: 'hidden',
- textOverflow: 'ellipsis',
- whiteSpace: 'nowrap',
- display: 'block',
+ slotProps={{
+ primary: { variant: 'body2' },
+
+ secondary: {
+ variant: 'caption',
+ sx: {
+ overflow: 'hidden',
+ textOverflow: 'ellipsis',
+ whiteSpace: 'nowrap',
+ display: 'block',
+ },
},
}}
/>
@@ -707,8 +712,9 @@ function OnboardingDialog(props: Props) {
don't fire pointer events). */}
<span>
<FormControlLabel
+ labelPlacement="start"
control={
- <Switch
+ <TsSwitch
data-tid="onboardingCheckForUpdatesTID"
disabled={checkForUpdatesExternallyConfigured}
checked={
diff --git a/src/renderer/components/dialogs/components/SettingsAI.tsx b/src/renderer/components/dialogs/components/SettingsAI.tsx
index aa2c67630..509276c83 100644
--- a/src/renderer/components/dialogs/components/SettingsAI.tsx
+++ b/src/renderer/components/dialogs/components/SettingsAI.tsx
@@ -29,6 +29,7 @@ import TsButton from '-/components/TsButton';
import TsIconButton from '-/components/TsIconButton';
import TsMenuList from '-/components/TsMenuList';
import TsSelect from '-/components/TsSelect';
+import TsSwitch from '-/components/TsSwitch';
import TsTextField from '-/components/TsTextField';
import { AIProvider, AIProviders } from '-/components/chat/ChatTypes';
import SelectChatModel from '-/components/chat/SelectChatModel';
@@ -54,7 +55,6 @@ import {
MenuItem,
Paper,
Popper,
- Switch,
} from '@mui/material';
import Box from '@mui/material/Box';
import FormControlLabel from '@mui/material/FormControlLabel';
@@ -500,7 +500,7 @@ function SettingsAI(props: Props) {
labelPlacement="start"
sx={{ justifyContent: 'space-between', marginLeft: 0 }}
control={
- <Switch
+ <TsSwitch
data-tid="locationIsDefault"
name="isDefault"
checked={provider.enable}
diff --git a/src/renderer/components/dialogs/components/SettingsAdvanced.tsx b/src/renderer/components/dialogs/components/SettingsAdvanced.tsx
index 43c2f2020..8e64bb330 100644
--- a/src/renderer/components/dialogs/components/SettingsAdvanced.tsx
+++ b/src/renderer/components/dialogs/components/SettingsAdvanced.tsx
@@ -50,7 +50,7 @@ import List from '@mui/material/List';
import ListItem from '@mui/material/ListItem';
import ListItemText from '@mui/material/ListItemText';
import MenuItem from '@mui/material/MenuItem';
-import Switch from '@mui/material/Switch';
+import TsSwitch from '-/components/TsSwitch';
import { useContext, useEffect, useReducer, useRef, useState } from 'react';
import { useTranslation } from 'react-i18next';
import { useDispatch, useSelector } from 'react-redux';
@@ -383,7 +383,7 @@ function SettingsAdvanced(props: Props) {
}
>
<ListItemText primary={t('core:hideProFeatures')} />
- <Switch
+ <TsSwitch
data-tid="settingsHideProFeatures"
disabled={AppConfig.ExtHideProFeatures !== undefined}
onClick={() =>
@@ -406,7 +406,7 @@ function SettingsAdvanced(props: Props) {
</>
}
/>
- <Switch
+ <TsSwitch
data-tid="settingsEnableDevMode"
disabled={AppConfig?.ExtDevMode === true}
onClick={() => setDevMode(!devMode)}
diff --git a/src/renderer/components/dialogs/components/SettingsExtensions.tsx b/src/renderer/components/dialogs/components/SettingsExtensions.tsx
index 1f082fbb3..304e3e631 100644
--- a/src/renderer/components/dialogs/components/SettingsExtensions.tsx
+++ b/src/renderer/components/dialogs/components/SettingsExtensions.tsx
@@ -34,7 +34,7 @@ import { Accordion, AccordionDetails, AccordionSummary } from '@mui/material';
import Box from '@mui/material/Box';
import List from '@mui/material/List';
import ListItem from '@mui/material/ListItem';
-import Switch from '@mui/material/Switch';
+import TsSwitch from '-/components/TsSwitch';
import Typography from '@mui/material/Typography';
import { ChangeEvent, useRef } from 'react';
import { useTranslation } from 'react-i18next';
@@ -180,7 +180,7 @@ function SettingsExtensions() {
<ListItem key={ext.extensionId} disablePadding>
{ext.extensionName}{' '}
<small style={{ marginLeft: 5 }}>v{ext.version}</small>
- <Switch
+ <TsSwitch
data-tid="enableExtensionTID"
name="enableExtension"
checked={ext.extensionEnabled}
diff --git a/src/renderer/components/dialogs/components/SettingsGeneral.tsx b/src/renderer/components/dialogs/components/SettingsGeneral.tsx
index ac1f689db..c5dd2aaf6 100644
--- a/src/renderer/components/dialogs/components/SettingsGeneral.tsx
+++ b/src/renderer/components/dialogs/components/SettingsGeneral.tsx
@@ -26,6 +26,7 @@ import TransparentBackground from '-/components/TransparentBackground';
import TsButton from '-/components/TsButton';
import TsIconButton from '-/components/TsIconButton';
import TsSelect from '-/components/TsSelect';
+import TsSwitch from '-/components/TsSwitch';
import TsTextField from '-/components/TsTextField';
import TsToggleButton from '-/components/TsToggleButton';
import ColorPickerDialog from '-/components/dialogs/ColorPickerDialog';
@@ -52,7 +53,6 @@ import List from '@mui/material/List';
import ListItem from '@mui/material/ListItem';
import ListItemText from '@mui/material/ListItemText';
import MenuItem from '@mui/material/MenuItem';
-import Switch from '@mui/material/Switch';
import ToggleButtonGroup from '@mui/material/ToggleButtonGroup';
import Typography from '@mui/material/Typography';
import {
@@ -475,7 +475,7 @@ function SettingsGeneral() {
when the Switch is disabled (disabled controls don't
fire pointer events). */}
<span>
- <Switch
+ <TsSwitch
disabled={
AppConfig.ExtCheckForUpdatesOnStartup !== undefined
}
@@ -510,7 +510,7 @@ function SettingsGeneral() {
</>
}
/>
- <Switch
+ <TsSwitch
data-tid="reorderTagsTID"
onClick={() =>
dispatch(SettingsActions.reorderTags(!settings.reorderTags))
@@ -525,7 +525,7 @@ function SettingsGeneral() {
jsx: (
<ListItem>
<ListItemText primary={t('core:addTagsToLibrary')} />
- <Switch
+ <TsSwitch
data-tid="settingsSetAddTagsToLibrary"
onClick={() =>
dispatch(
@@ -550,7 +550,7 @@ function SettingsGeneral() {
}
>
<ListItemText primary={t('core:useOnlyTagsFromTagLibrary')} />
- <Switch
+ <TsSwitch
disabled={AppConfig.ExtUseOnlyTagsFromTagLibrary !== undefined}
data-tid="useOnlyTagsFromTagLibraryTID"
onClick={() =>
@@ -574,7 +574,7 @@ function SettingsGeneral() {
jsx: (
<ListItem>
<ListItemText primary={t('core:useGenerateThumbnails')} />
- <Switch
+ <TsSwitch
disabled={AppConfig.ExtUseGenerateThumbnails !== undefined}
data-tid="settingsUseGenerateThumbnails"
onClick={() =>
@@ -605,7 +605,7 @@ function SettingsGeneral() {
</>
}
/>
- <Switch
+ <TsSwitch
data-tid="settingsAutoSaveDescriptionTID"
disabled={!Pro}
onClick={() =>
@@ -705,7 +705,7 @@ function SettingsGeneral() {
</Typography>
}
/>
- <Switch
+ <TsSwitch
data-tid="settingsSetUseTrashCan"
onClick={() =>
dispatch(
@@ -722,7 +722,7 @@ function SettingsGeneral() {
jsx: (
<ListItem>
<ListItemText primary={t('core:showUnixHiddenFiles')} />
- <Switch
+ <TsSwitch
data-tid="settingsSetShowUnixHiddenEntries"
onClick={() => {
dispatch(SettingsActions.toggleShowUnixHiddenEntries());
@@ -753,7 +753,7 @@ function SettingsGeneral() {
jsx: (
<ListItem>
<ListItemText primary={t('enableMobileMode')} />
- <Switch
+ <TsSwitch
data-tid="settingsSetDesktopMode"
disabled={!(typeof AppConfig.ExtDisplayMode === 'undefined')}
onClick={() => setDesktopMode(!settings.desktopMode)}
@@ -790,7 +790,7 @@ function SettingsGeneral() {
)}
</TooltipTS>
)}
- <Switch
+ <TsSwitch
data-tid="settingsEnableWS"
disabled={!AppConfig.isElectron}
onClick={() => setEnableWS(!settings.enableWS)}
@@ -804,7 +804,7 @@ function SettingsGeneral() {
jsx: (
<ListItem>
<ListItemText primary={t('warningOpeningFilesExternally')} />
- <Switch
+ <TsSwitch
data-tid="warningOpeningFilesExternally"
onClick={() =>
setWarningOpeningFilesExternally(
@@ -968,7 +968,7 @@ function SettingsGeneral() {
</>
}
/>
- <Switch
+ <TsSwitch
data-tid="setRevisionsEnabledTID"
disabled={!Pro}
onClick={() =>
@@ -998,7 +998,7 @@ function SettingsGeneral() {
</>
}
/>
- <Switch
+ <TsSwitch
data-tid="saveTagInLocationTID"
disabled={!Pro || AppConfig.ExtUseLocationTags !== undefined}
onClick={() => {
diff --git a/src/renderer/components/dialogs/components/SettingsKeyBindings.tsx b/src/renderer/components/dialogs/components/SettingsKeyBindings.tsx
index d146cb376..2d7a5acbb 100644
--- a/src/renderer/components/dialogs/components/SettingsKeyBindings.tsx
+++ b/src/renderer/components/dialogs/components/SettingsKeyBindings.tsx
@@ -30,7 +30,7 @@ import { setGlobalShortcuts } from '-/services/utils-io';
import Box from '@mui/material/Box';
import ListItem from '@mui/material/ListItem';
import ListItemText from '@mui/material/ListItemText';
-import Switch from '@mui/material/Switch';
+import TsSwitch from '-/components/TsSwitch';
import Typography from '@mui/material/Typography';
import { isStr } from '@tagspaces/tagspaces-common/misc';
import { useTranslation } from 'react-i18next';
@@ -78,7 +78,7 @@ function SettingsKeyBindings() {
</>
}
/>
- <Switch
+ <TsSwitch
onClick={() => {
setGlobalKeyBinding(!globalKeyBindingEnabled);
}}
diff --git a/src/renderer/components/dialogs/components/SettingsPerspectives.tsx b/src/renderer/components/dialogs/components/SettingsPerspectives.tsx
index 205d00499..011487959 100644
--- a/src/renderer/components/dialogs/components/SettingsPerspectives.tsx
+++ b/src/renderer/components/dialogs/components/SettingsPerspectives.tsx
@@ -37,7 +37,7 @@ import List from '@mui/material/List';
import ListItem from '@mui/material/ListItem';
import ListItemIcon from '@mui/material/ListItemIcon';
import ListItemText from '@mui/material/ListItemText';
-import Switch from '@mui/material/Switch';
+import TsSwitch from '-/components/TsSwitch';
import Typography from '@mui/material/Typography';
import { ChangeEvent } from 'react';
import { useTranslation } from 'react-i18next';
@@ -116,7 +116,7 @@ function SettingsPerspectives() {
const proLocked = perspective.pro === true && !hasPro;
const disabled = proLocked || configLocked;
const switchControl = (
- <Switch
+ <TsSwitch
data-tid={'enablePerspective_' + perspective.id}
checked={enabled}
disabled={disabled}
diff --git a/src/renderer/components/dialogs/components/WebdavForm.tsx b/src/renderer/components/dialogs/components/WebdavForm.tsx
index 210a31d36..57a33f971 100644
--- a/src/renderer/components/dialogs/components/WebdavForm.tsx
+++ b/src/renderer/components/dialogs/components/WebdavForm.tsx
@@ -74,7 +74,7 @@ function WebdavForm(props: Props) {
};
return (
- <Grid container direction="column" spacing={1}>
+ <Grid container spacing={1} sx={{ flexDirection: 'column' }}>
<Grid>
<FormControl fullWidth={true} error={errorTextName}>
<TextField
diff --git a/src/renderer/components/menus/MenuKeyBinding.tsx b/src/renderer/components/menus/MenuKeyBinding.tsx
index 8de9f5f5f..a80ff942a 100644
--- a/src/renderer/components/menus/MenuKeyBinding.tsx
+++ b/src/renderer/components/menus/MenuKeyBinding.tsx
@@ -28,8 +28,10 @@ function MenuKeyBinding(props: Props) {
return (
<Typography
variant="body2"
- color="text.secondary"
- sx={{ textTransform: 'uppercase' }}
+ sx={{
+ color: 'text.secondary',
+ textTransform: 'uppercase',
+ }}
>
{adjustKeyBinding(keyBinding)}
</Typography>
diff --git a/src/renderer/components/menus/SavedSearchesMenu.tsx b/src/renderer/components/menus/SavedSearchesMenu.tsx
index f0743ad40..e37f3f60f 100644
--- a/src/renderer/components/menus/SavedSearchesMenu.tsx
+++ b/src/renderer/components/menus/SavedSearchesMenu.tsx
@@ -59,38 +59,40 @@ function SavedSearchesMenu(props: Props) {
open={open}
onClose={onClose}
id="search-menu"
- MenuListProps={{
- 'aria-labelledby': 'basic-button',
- }}
// onClick={() => setOpenSavedSearches(null)}
- PaperProps={{
- elevation: 0,
- sx: {
- overflow: 'visible',
- filter: 'drop-shadow(0px 2px 8px rgba(0,0,0,0.32))',
- mt: 1.5,
- '& .MuiAvatar-root': {
- width: 32,
- height: 32,
- ml: -0.5,
- mr: 1,
- },
- '&:before': {
- content: '""',
- display: 'block',
- position: 'absolute',
- top: 0,
- right: 14,
- width: 10,
- height: 10,
- bgcolor: 'background.paper',
- transform: 'translateY(-50%) rotate(45deg)',
- zIndex: 0,
+ transformOrigin={{ horizontal: 'right', vertical: 'top' }}
+ anchorOrigin={{ horizontal: 'right', vertical: 'bottom' }}
+ slotProps={{
+ list: {
+ 'aria-labelledby': 'basic-button',
+ },
+ paper: {
+ elevation: 0,
+ sx: {
+ overflow: 'visible',
+ filter: 'drop-shadow(0px 2px 8px rgba(0,0,0,0.32))',
+ mt: 1.5,
+ '& .MuiAvatar-root': {
+ width: 32,
+ height: 32,
+ ml: -0.5,
+ mr: 1,
+ },
+ '&:before': {
+ content: '""',
+ display: 'block',
+ position: 'absolute',
+ top: 0,
+ right: 14,
+ width: 10,
+ height: 10,
+ bgcolor: 'background.paper',
+ transform: 'translateY(-50%) rotate(45deg)',
+ zIndex: 0,
+ },
},
},
}}
- transformOrigin={{ horizontal: 'right', vertical: 'top' }}
- anchorOrigin={{ horizontal: 'right', vertical: 'bottom' }}
>
{menuItems}
</Menu>
diff --git a/src/renderer/perspectives/grid/components/GridCell.tsx b/src/renderer/perspectives/grid/components/GridCell.tsx
index 90e92deac..e60d7433d 100644
--- a/src/renderer/perspectives/grid/components/GridCell.tsx
+++ b/src/renderer/perspectives/grid/components/GridCell.tsx
@@ -538,7 +538,6 @@ function GridCell(props: Props) {
</Box>
)}
</Box>
-
<CardContent sx={{ padding: '1px 5px 0px 5px', flexGrow: 1 }}>
<Typography
title={fsEntry.name}
@@ -556,9 +555,9 @@ function GridCell(props: Props) {
title={description}
data-tid="gridCellDescription"
variant="caption"
- display="block"
gutterBottom
sx={{
+ display: 'block',
lineHeight: '12px',
paddingRight: '4px',
overflowX: 'clip',
diff --git a/src/renderer/perspectives/grid/components/GridSettingsDialog.tsx b/src/renderer/perspectives/grid/components/GridSettingsDialog.tsx
index c00ca9bff..ea5d07d5c 100644
--- a/src/renderer/perspectives/grid/components/GridSettingsDialog.tsx
+++ b/src/renderer/perspectives/grid/components/GridSettingsDialog.tsx
@@ -24,6 +24,7 @@ import TsSelect from '-/components/TsSelect';
import ZoomComponent from '-/components/ZoomComponent';
import TsDialogActions from '-/components/dialogs/components/TsDialogActions';
import TsDialogTitle from '-/components/dialogs/components/TsDialogTitle';
+import TsSwitch from '-/components/TsSwitch';
import { usePerspectiveSettingsContext } from '-/hooks/usePerspectiveSettingsContext';
import { useSortedDirContext } from '-/perspectives/grid/hooks/useSortedDirContext';
import { Pro } from '-/pro';
@@ -40,9 +41,9 @@ import {
FormControl,
FormControlLabel,
FormGroup,
+ ListItemButton,
MenuItem,
Paper,
- Switch,
Typography,
} from '@mui/material';
import ListItemIcon from '@mui/material/ListItemIcon';
@@ -174,11 +175,19 @@ function GridSettingsDialog(props: Props) {
<ZoomComponent preview={true} />
</Box>
<Divider sx={{ marginTop: '8px', marginBottom: '8px' }} />
- <FormGroup>
+ <FormGroup
+ sx={{
+ '& .MuiFormControlLabel-root': {
+ marginLeft: 0,
+ marginRight: 0,
+ justifyContent: 'space-between',
+ },
+ }}
+ >
<FormControlLabel
- // labelPlacement="start"
+ labelPlacement="start"
control={
- <Switch
+ <TsSwitch
data-tid="gridPerspectiveToggleShowDirectories"
defaultChecked={showDirectories}
onChange={() => {
@@ -190,9 +199,9 @@ function GridSettingsDialog(props: Props) {
label={t('core:showHideDirectories')}
/>
<FormControlLabel
- // labelPlacement="start"
+ labelPlacement="start"
control={
- <Switch
+ <TsSwitch
data-tid="gridPerspectiveToggleShowTags"
defaultChecked={showTags}
onChange={() => {
@@ -204,9 +213,9 @@ function GridSettingsDialog(props: Props) {
label={t('core:showTags')}
/>
<FormControlLabel
- // labelPlacement="start"
+ labelPlacement="start"
control={
- <Switch
+ <TsSwitch
data-tid="gridPerspectiveToggleShowEntriesDescription"
defaultChecked={showEntriesDescription}
onChange={() => {
@@ -221,8 +230,9 @@ function GridSettingsDialog(props: Props) {
/>
<Divider sx={{ marginTop: '8px', marginBottom: '8px' }} />
<FormControlLabel
+ labelPlacement="start"
control={
- <Switch
+ <TsSwitch
data-tid="gridPerspectiveToggleShowDetails"
defaultChecked={showDetails}
onChange={() => {
@@ -235,8 +245,9 @@ function GridSettingsDialog(props: Props) {
/>
{showDescription != undefined && (
<FormControlLabel
+ labelPlacement="start"
control={
- <Switch
+ <TsSwitch
data-tid="gridPerspectiveToggleShowDescription"
defaultChecked={showDescription}
onChange={() => {
@@ -250,7 +261,7 @@ function GridSettingsDialog(props: Props) {
)}
</FormGroup>
<Divider sx={{ marginTop: '8px', marginBottom: '8px' }} />
- <MenuItem
+ <ListItemButton
data-tid="gridPerspectiveToggleThumbnailsMode"
title={t('core:toggleThumbnailModeTitle')}
aria-label={t('core:toggleThumbnailMode')}
@@ -269,9 +280,9 @@ function GridSettingsDialog(props: Props) {
)}
</ListItemIcon>
<ListItemText primary={t('core:toggleThumbnailMode')} />
- </MenuItem>
+ </ListItemButton>
<Divider sx={{ marginTop: '8px', marginBottom: '8px' }} />
- <MenuItem
+ <ListItemButton
data-tid="sortByMenuTID"
title={t('core:sortBy')}
aria-label={t('core:sortBy')}
@@ -288,9 +299,9 @@ function GridSettingsDialog(props: Props) {
</>
}
/>
- </MenuItem>
+ </ListItemButton>
<Divider />
- <MenuItem
+ <ListItemButton
data-tid="gridPerspectiveSingleClickOpenInternally"
title={t('core:singleClickOpenInternally')}
aria-label={t('core:singleClickOpenInternally')}
@@ -307,8 +318,8 @@ function GridSettingsDialog(props: Props) {
)}
</ListItemIcon>
<ListItemText primary={t('core:singleClickOpenInternally')} />
- </MenuItem>
- <MenuItem
+ </ListItemButton>
+ <ListItemButton
data-tid="gridPerspectiveSingleClickOpenExternally"
title={t('core:singleClickOpenExternally')}
aria-label={t('core:singleClickOpenExternally')}
@@ -325,8 +336,8 @@ function GridSettingsDialog(props: Props) {
)}
</ListItemIcon>
<ListItemText primary={t('core:singleClickOpenExternally')} />
- </MenuItem>
- <MenuItem
+ </ListItemButton>
+ <ListItemButton
data-tid="gridPerspectiveSingleClickSelects"
title={t('core:singleClickSelects')}
aria-label={t('core:singleClickSelects')}
@@ -343,7 +354,7 @@ function GridSettingsDialog(props: Props) {
)}
</ListItemIcon>
<ListItemText primary={t('core:singleClickSelects')} />
- </MenuItem>
+ </ListItemButton>
<Divider />
<FormControl fullWidth={true}>
<TsSelect
diff --git a/tests/e2e/hook.js b/tests/e2e/hook.js
index 3f326f1be..521a7fe36 100644
--- a/tests/e2e/hook.js
+++ b/tests/e2e/hook.js
@@ -1,4 +1,5 @@
/* Copyright (c) 2016-present - TagSpaces GmbH. All rights reserved. */
+import fs from 'fs';
import fse from 'fs-extra';
import os from 'os';
import pathLib from 'path';
@@ -346,9 +347,16 @@ export async function testDataRefresh(isS3, testDataDir) {
'file-structure',
'supported-filestypes',
);
- //let newPath = pathLib.join(testDataDir, pathLib.basename(src));
- //console.log('newPath:'+testDataDir);
- await fse.copy(src, testDataDir); //, { overwrite: true });
+ // Use Node's native recursive copy (not fs-extra's), since fs-extra's
+ // copy() does a non-recursive fs.mkdir(dest) per directory and races with
+ // the running Electron app's indexer recreating the .ts metafolder between
+ // our rm and copy — producing intermittent EEXIST mkdir '.ts' failures.
+ // fs.cp with { recursive: true, force: true } is idempotent w.r.t. existing
+ // destination dirs and overwrites files, so the race is harmless.
+ await fs.promises.cp(src, testDataDir, {
+ recursive: true,
+ force: true,
+ });
}
}