bugfix

Author: Moebits

components/BulkContainer.tsx

@@ -11,8 +11,7 @@ const BulkContainer: React.FunctionComponent<BulkProps> = (props: BulkProps) =>
         const jsxArray = []
         const height = 1000 / props.files.length > 100 ? 1000 / props.files.length : 100
         for (let i = 0; i < props.files.length; i++) {
-            // @ts-ignore
-            jsxArray.push(<img className="bulk-img" src={props.files[i]} style={{"max-height": `${height}px`, width: "auto"}}/>)
+            jsxArray.push(<img className="bulk-img" src={props.files[i]} style={{maxHeight: `${height}px`, width: "auto"}}/>)
         }
         return jsxArray
     }

components/PhotoViewer.tsx

@@ -94,7 +94,7 @@ const PhotoViewer: React.FunctionComponent = (props) => {
     useEffect(() => {
         const getOpenedFile = async () => {
             const file = await ipcRenderer.invoke("get-opened-file")
-            if (file && imageExtensions.includes(path.extname(file))) {
+            if (file && imageExtensions.includes(path.extname(file).toLowerCase())) {
                 upload (file)
             }
         }
@@ -425,14 +425,14 @@ const PhotoViewer: React.FunctionComponent = (props) => {
         if (typeof files === "string") files = [files]
         if (!files) files = await ipcRenderer.invoke("select-file") as string[]
         if (!files) return
-        files = files.filter((f) => imageExtensions.includes(path.extname(f)))
+        files = files.filter((f) => imageExtensions.includes(path.extname(f).toLowerCase()))
         if (files.length > 1) {
             setBulkFiles(files)
             setBulk(true)
             return ipcRenderer.invoke("update-original-images", files)
         }
         const file = files[0]
-        if (!imageExtensions.includes(path.extname(file))) return
+        if (!imageExtensions.includes(path.extname(file).toLowerCase())) return
         let newImg = file
         if (path.extname(file) === ".tiff") {
             newImg = await ipcRenderer.invoke("tiff-to-png", file)
@@ -650,7 +650,7 @@ const PhotoViewer: React.FunctionComponent = (props) => {
         const directory = await ipcRenderer.invoke("select-directory")
         if (!directory) return
         let files = fs.readdirSync(directory)
-        files = files.filter((f) => imageExtensions.includes(path.extname(f))).map((f) => `${path.dirname(directory)}/${f}`)
+        files = files.filter((f) => imageExtensions.includes(path.extname(f).toLowerCase())).map((f) => `${path.dirname(directory)}/${f}`)
         if (!files.length) return
         setBulkFiles(files)
         setBulk(true)

components/TitleBar.tsx

@@ -80,10 +80,11 @@ const TitleBar: React.FunctionComponent = (props) => {
     useEffect(() => {
         ipcRenderer.invoke("check-for-updates", true)
         const initTheme = async () => {
-            const savedTheme = await ipcRenderer.invoke("get-theme")
-            changeTheme(savedTheme)
             const savedTransparency = await ipcRenderer.invoke("get-transparency")
-            changeTransparency(String(savedTransparency) === "true")
+            const transparentValue = String(savedTransparency) === "true"
+            changeTransparency(transparentValue)
+            const savedTheme = await ipcRenderer.invoke("get-theme")
+            changeTheme(savedTheme, transparentValue)
         }
         initTheme()
         const triggerAcceptAction = (event: any, action: string) => {
@@ -152,14 +153,15 @@ const TitleBar: React.FunctionComponent = (props) => {
         ipcRenderer.invoke("trigger-paste")
     }
 
-    const changeTheme = (value?: string) => {
+    const changeTheme = (value?: string, transparentValue?: boolean) => {
         let condition = value !== undefined ? value === "dark" : theme === "light"
+        let transVal = transparentValue !== undefined ? transparentValue : transparency
         if (condition) {
-            functions.updateTheme("dark", transparency)
+            functions.updateTheme("dark", transVal)
             setTheme("dark")
             ipcRenderer.invoke("save-theme", "dark")
         } else {
-            functions.updateTheme("light", transparency)
+            functions.updateTheme("light", transVal)
             setTheme("light")
             ipcRenderer.invoke("save-theme", "light")
         }

structures/functions.ts

@@ -124,7 +124,7 @@ export default class Functions {
     public static getSortedFiles = async (dir: string) => {
         const files = await fs.promises.readdir(dir)
         return files
-            .filter((f) => imageExtensions.includes(path.extname(f)))
+            .filter((f) => imageExtensions.includes(path.extname(f).toLowerCase()))
             .map(fileName => ({
                 name: fileName,
                 time: fs.statSync(`${dir}/${fileName}`).mtime.getTime(),