From 54ae4365a344cc3c6c796a3afb6d3020f5493a6b Mon Sep 17 00:00:00 2001
From: Aman Harwara <amanharwara@protonmail.com>
Date: Mon, 15 Aug 2022 18:13:29 +0530
Subject: [PATCH] fix: selecting from "Photo Library" on iOS doesn't upload
 (#1401)

---
 .../AttachedFilesPopover.tsx                  | 44 ++++++++++++++++---
 .../ContentListView/ContentListView.tsx       | 26 ++++++++++-
 .../Controllers/FilesController.ts            |  2 +-
 3 files changed, 64 insertions(+), 8 deletions(-)

diff --git a/packages/web/src/javascripts/Components/AttachedFilesPopover/AttachedFilesPopover.tsx b/packages/web/src/javascripts/Components/AttachedFilesPopover/AttachedFilesPopover.tsx
index 07d1a0b9a..5b268c576 100644
--- a/packages/web/src/javascripts/Components/AttachedFilesPopover/AttachedFilesPopover.tsx
+++ b/packages/web/src/javascripts/Components/AttachedFilesPopover/AttachedFilesPopover.tsx
@@ -10,6 +10,7 @@ import PopoverFileItem from './PopoverFileItem'
 import { PopoverFileItemActionType } from './PopoverFileItemAction'
 import { PopoverTabs } from './PopoverTabs'
 import { FilesController } from '@/Controllers/FilesController'
+import { StreamingFileReader } from '@standardnotes/filepicker'
 
 type Props = {
   application: WebApplication
@@ -32,6 +33,8 @@ const AttachedFilesPopover: FunctionComponent<Props> = ({
   setCurrentTab,
   attachedTabDisabled,
 }) => {
+  const fileInputRef = useRef<HTMLInputElement>(null)
+
   const [searchQuery, setSearchQuery] = useState('')
   const searchInputRef = useRef<HTMLInputElement>(null)
 
@@ -42,13 +45,9 @@ const AttachedFilesPopover: FunctionComponent<Props> = ({
       ? filesList.filter((file) => file.name.toLowerCase().indexOf(searchQuery.toLowerCase()) !== -1)
       : filesList
 
-  const handleAttachFilesClick = async () => {
-    const uploadedFiles = await filesController.uploadNewFile()
-    if (!uploadedFiles) {
-      return
-    }
+  const attachFilesIfRequired = (files: FileItem[]) => {
     if (currentTab === PopoverTabs.AttachedFiles) {
-      uploadedFiles.forEach((file) => {
+      files.forEach((file) => {
         filesController
           .handleFileAction({
             type: PopoverFileItemActionType.AttachFileToNote,
@@ -59,6 +58,19 @@ const AttachedFilesPopover: FunctionComponent<Props> = ({
     }
   }
 
+  const handleAttachFilesClick = async () => {
+    if (!StreamingFileReader.available()) {
+      fileInputRef.current?.click()
+      return
+    }
+
+    const uploadedFiles = await filesController.uploadNewFile()
+    if (!uploadedFiles) {
+      return
+    }
+    attachFilesIfRequired(uploadedFiles)
+  }
+
   const previewHandler = (file: FileItem) => {
     filesController
       .handleFileAction({
@@ -161,6 +173,26 @@ const AttachedFilesPopover: FunctionComponent<Props> = ({
           </div>
         )}
       </div>
+      <input
+        type="file"
+        className="absolute top-0 left-0 opacity-0"
+        multiple
+        ref={fileInputRef}
+        onChange={async (event) => {
+          const files = event.currentTarget.files
+
+          if (!files) {
+            return
+          }
+
+          for (const file of files) {
+            const uploadedFiles = await filesController.uploadNewFile(file)
+            if (uploadedFiles) {
+              attachFilesIfRequired(uploadedFiles)
+            }
+          }
+        }}
+      />
       {filteredList.length > 0 && (
         <button
           className="flex w-full cursor-pointer items-center border-0 border-t border-solid border-border bg-transparent px-3 py-3 text-left text-sm text-text hover:bg-contrast hover:text-foreground focus:bg-info-backdrop focus:shadow-none"
diff --git a/packages/web/src/javascripts/Components/ContentListView/ContentListView.tsx b/packages/web/src/javascripts/Components/ContentListView/ContentListView.tsx
index c66bbaad8..bca369e87 100644
--- a/packages/web/src/javascripts/Components/ContentListView/ContentListView.tsx
+++ b/packages/web/src/javascripts/Components/ContentListView/ContentListView.tsx
@@ -20,6 +20,7 @@ import ContentListHeader from './Header/ContentListHeader'
 import ResponsivePaneContent from '../ResponsivePane/ResponsivePaneContent'
 import { AppPaneId } from '../ResponsivePane/AppPaneMetadata'
 import { useResponsiveAppPane } from '../ResponsivePane/ResponsivePaneProvider'
+import { StreamingFileReader } from '@standardnotes/filepicker'
 
 type Props = {
   accountMenuController: AccountMenuController
@@ -46,6 +47,7 @@ const ContentListView: FunctionComponent<Props> = ({
 }) => {
   const { toggleAppPane } = useResponsiveAppPane()
 
+  const fileInputRef = useRef<HTMLInputElement>(null)
   const itemsViewPanelRef = useRef<HTMLDivElement>(null)
 
   const {
@@ -68,7 +70,12 @@ const ContentListView: FunctionComponent<Props> = ({
 
   const addNewItem = useCallback(async () => {
     if (isFilesSmartView) {
-      void filesController.uploadNewFile()
+      if (StreamingFileReader.available()) {
+        void filesController.uploadNewFile()
+        return
+      }
+
+      fileInputRef.current?.click()
     } else {
       await createNewNote()
       toggleAppPane(AppPaneId.Editor)
@@ -179,6 +186,23 @@ const ContentListView: FunctionComponent<Props> = ({
       <ResponsivePaneContent paneId={AppPaneId.Items}>
         <div id="items-title-bar" className="section-title-bar border-b border-solid border-border">
           <div id="items-title-bar-container">
+            <input
+              type="file"
+              className="absolute top-0 left-0 opacity-0"
+              multiple
+              ref={fileInputRef}
+              onChange={(event) => {
+                const files = event.currentTarget.files
+
+                if (!files) {
+                  return
+                }
+
+                for (const file of files) {
+                  void filesController.uploadNewFile(file)
+                }
+              }}
+            />
             <ContentListHeader
               application={application}
               panelTitle={panelTitle}
diff --git a/packages/web/src/javascripts/Controllers/FilesController.ts b/packages/web/src/javascripts/Controllers/FilesController.ts
index cf989e1ff..a9a8f3ee6 100644
--- a/packages/web/src/javascripts/Controllers/FilesController.ts
+++ b/packages/web/src/javascripts/Controllers/FilesController.ts
@@ -302,7 +302,7 @@ export class FilesController extends AbstractViewController {
       const selectedFiles =
         fileOrHandle instanceof File
           ? [fileOrHandle]
-          : StreamingFileReader.available() && fileOrHandle instanceof FileSystemFileHandle
+          : shouldUseStreamingReader && fileOrHandle instanceof FileSystemFileHandle
           ? await StreamingFileReader.getFilesFromHandles([fileOrHandle])
           : await picker.selectFiles()