From 97486818d899d6cda0fc95b69bd6db01f468903e Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Sat, 3 Aug 2024 15:47:42 +0530
Subject: [PATCH] [web] Use pointer media query to approximate mobile device
 detection

---
 .../components/Upload/UploadTypeSelector.tsx  | 31 ++++++++++++++++---
 .../src/utils/common/deviceDetection.ts       | 16 ----------
 2 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/web/apps/photos/src/components/Upload/UploadTypeSelector.tsx b/web/apps/photos/src/components/Upload/UploadTypeSelector.tsx
index c3b4d38452..3e18a7fe48 100644
--- a/web/apps/photos/src/components/Upload/UploadTypeSelector.tsx
+++ b/web/apps/photos/src/components/Upload/UploadTypeSelector.tsx
@@ -8,10 +8,16 @@ import ChevronRight from "@mui/icons-material/ChevronRight";
 import GoogleIcon from "@mui/icons-material/Google";
 import { default as FileUploadIcon } from "@mui/icons-material/ImageOutlined";
 import { default as FolderUploadIcon } from "@mui/icons-material/PermMediaOutlined";
-import { Box, Dialog, Link, Stack, Typography } from "@mui/material";
+import {
+    Box,
+    Dialog,
+    Link,
+    Stack,
+    Typography,
+    useMediaQuery,
+} from "@mui/material";
 import { t } from "i18next";
-import React, { useContext, useEffect, useRef, useState } from "react";
-import { isMobileOrTable } from "utils/common/deviceDetection";
+import React, { useContext, useEffect, useState } from "react";
 import { PublicCollectionGalleryContext } from "utils/publicCollectionGallery";
 
 export type UploadTypeSelectorIntent = "upload" | "import" | "collect";
@@ -49,12 +55,27 @@ export const UploadTypeSelector: React.FC<UploadTypeSelectorProps> = ({
         PublicCollectionGalleryContext,
     );
 
-    const directlyShowUploadFiles = useRef(isMobileOrTable());
+    // Directly show the file selector on mobile devices.
+    //
+    // [Note: Heuristic isMobileOrTablet check using pointer media query]
+    //
+    // The absence of fine-resolution pointing device can be taken a quick and
+    // proxy for detecting if the user is using a mobile or tablet.
+    //
+    // This is of course not going to work in all scenarios (e.g. someone
+    // connecting their mice to their tablet), but ad-hoc user agent checks are
+    // not problem free either. This media query should be accurate enough for
+    // cases where false positives will degrade gracefully.
+    //
+    // See: https://github.com/mui/mui-x/issues/10039
+    const directlyShowUploadFiles = useMediaQuery(
+        "(hover: none) and (pointer: coarse)",
+    );
 
     useEffect(() => {
         if (
             open &&
-            directlyShowUploadFiles.current &&
+            directlyShowUploadFiles &&
             publicCollectionGalleryContext.accessedThroughSharedURL
         ) {
             uploadFiles();
diff --git a/web/apps/photos/src/utils/common/deviceDetection.ts b/web/apps/photos/src/utils/common/deviceDetection.ts
index 7ce55bba7d..280a6176e5 100644
--- a/web/apps/photos/src/utils/common/deviceDetection.ts
+++ b/web/apps/photos/src/utils/common/deviceDetection.ts
@@ -51,19 +51,3 @@ export const getDeviceOS = () => {
 
     return OS.UNKNOWN;
 };
-
-export const isMobileOrTable = () => {
-    let check = false;
-    (function (a) {
-        if (
-            /(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino|android|ipad|playbook|silk/i.test(
-                a,
-            ) ||
-            /1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw-(n|u)|c55\/|capi|ccwa|cdm-|cell|chtm|cldc|cmd-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc-s|devi|dica|dmob|do(c|p)o|ds(12|-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(-|_)|g1 u|g560|gene|gf-5|g-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd-(m|p|t)|hei-|hi(pt|ta)|hp( i|ip)|hs-c|ht(c(-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i-(20|go|ma)|i230|iac( |-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|-[a-w])|libw|lynx|m1-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|-([1-8]|c))|phil|pire|pl(ay|uc)|pn-2|po(ck|rt|se)|prox|psio|pt-g|qa-a|qc(07|12|21|32|60|-[2-7]|i-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h-|oo|p-)|sdk\/|se(c(-|0|1)|47|mc|nd|ri)|sgh-|shar|sie(-|m)|sk-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h-|v-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl-|tdg-|tel(i|m)|tim-|t-mo|to(pl|sh)|ts(70|m-|m3|m5)|tx-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas-|your|zeto|zte-/i.test(
-                a.substr(0, 4),
-            )
-        )
-            check = true;
-    })(navigator.userAgent || navigator.vendor || window.opera);
-    return check;
-};