refactor(web): dependency management (#2386)

packages/web/src/javascripts/Components/FileView/FileView.tsx

@@ -5,16 +5,16 @@ import FileViewWithoutProtection from './FileViewWithoutProtection'
 import { FileViewProps } from './FileViewProps'
 import { ApplicationEvent } from '@standardnotes/snjs'
 
-const FileView = ({ application, viewControllerManager, file }: FileViewProps) => {
+const FileView = ({ application, file }: FileViewProps) => {
   const [shouldShowProtectedOverlay, setShouldShowProtectedOverlay] = useState(false)
 
   useEffect(() => {
-    viewControllerManager.filesController.setShowProtectedOverlay(!application.isAuthorizedToRenderItem(file))
-  }, [application, file, viewControllerManager.filesController])
+    application.filesController.setShowProtectedOverlay(!application.isAuthorizedToRenderItem(file))
+  }, [application, file, application.filesController])
 
   useEffect(() => {
-    setShouldShowProtectedOverlay(viewControllerManager.filesController.showProtectedOverlay)
-  }, [viewControllerManager.filesController.showProtectedOverlay])
+    setShouldShowProtectedOverlay(application.filesController.showProtectedOverlay)
+  }, [application.filesController.showProtectedOverlay])
 
   const dismissProtectedOverlay = useCallback(async () => {
     let showFileContents = true
@@ -48,7 +48,7 @@ const FileView = ({ application, viewControllerManager, file }: FileViewProps) =
       itemType={'file'}
     />
   ) : (
-    <FileViewWithoutProtection application={application} viewControllerManager={viewControllerManager} file={file} />
+    <FileViewWithoutProtection application={application} file={file} />
   )
 }
 

packages/web/src/javascripts/Components/FileView/FileViewProps.tsx

@@ -1,9 +1,7 @@
 import { WebApplication } from '@/Application/WebApplication'
-import { ViewControllerManager } from '@/Controllers/ViewControllerManager'
 import { FileItem } from '@standardnotes/snjs'
 
 export type FileViewProps = {
   application: WebApplication
-  viewControllerManager: ViewControllerManager
   file: FileItem
 }

packages/web/src/javascripts/Components/FileView/FileViewWithoutProtection.tsx

@@ -15,7 +15,7 @@ import RoundIconButton from '../Button/RoundIconButton'
 const SyncTimeoutNoDebounceMs = 100
 const SyncTimeoutDebounceMs = 350
 
-const FileViewWithoutProtection = ({ application, viewControllerManager, file }: FileViewProps) => {
+const FileViewWithoutProtection = ({ application, file }: FileViewProps) => {
   const syncTimeoutRef = useRef<number>()
   const fileInfoButtonRef = useRef<HTMLButtonElement>(null)
 
@@ -30,7 +30,7 @@ const FileViewWithoutProtection = ({ application, viewControllerManager, file }:
         clearTimeout(syncTimeoutRef.current)
       }
 
-      const shouldNotDebounce = application.noAccount()
+      const shouldNotDebounce = application.sessions.isSignedOut()
       const syncDebounceMs = shouldNotDebounce ? SyncTimeoutNoDebounceMs : SyncTimeoutDebounceMs
 
       syncTimeoutRef.current = window.setTimeout(async () => {
@@ -52,7 +52,7 @@ const FileViewWithoutProtection = ({ application, viewControllerManager, file }:
       addDragTarget(target, {
         tooltipText: 'Drop your files to upload and link them to the current file',
         async callback(uploadedFile) {
-          await viewControllerManager.linkingController.linkItems(uploadedFile, file)
+          await application.linkingController.linkItems(uploadedFile, file)
         },
       })
     }
@@ -62,7 +62,7 @@ const FileViewWithoutProtection = ({ application, viewControllerManager, file }:
         removeDragTarget(target)
       }
     }
-  }, [addDragTarget, file, removeDragTarget, viewControllerManager.linkingController])
+  }, [addDragTarget, file, removeDragTarget, application.linkingController])
 
   return (
     <div className="sn-component section editor" aria-label="File" ref={fileDragTargetRef}>
@@ -89,11 +89,7 @@ const FileViewWithoutProtection = ({ application, viewControllerManager, file }:
               </div>
             </div>
             <div className="flex items-center gap-3">
-              <LinkedItemsButton
-                filesController={viewControllerManager.filesController}
-                linkingController={viewControllerManager.linkingController}
-                featuresController={viewControllerManager.featuresController}
-              />
+              <LinkedItemsButton linkingController={application.linkingController} />
               <RoundIconButton
                 label="File information panel"
                 onClick={toggleFileInfoPanel}
@@ -110,16 +106,11 @@ const FileViewWithoutProtection = ({ application, viewControllerManager, file }:
               >
                 <FilePreviewInfoPanel file={file} />
               </Popover>
-              <FileOptionsPanel
-                filesController={viewControllerManager.filesController}
-                selectionController={viewControllerManager.selectionController}
-                linkingController={viewControllerManager.linkingController}
-                navigationController={viewControllerManager.navigationController}
-              />
+              <FileOptionsPanel itemListController={application.itemListController} />
             </div>
           </div>
           <div className="hidden md:flex">
-            <LinkedItemBubblesContainer item={file} linkingController={viewControllerManager.linkingController} />
+            <LinkedItemBubblesContainer item={file} linkingController={application.linkingController} />
           </div>
         </div>
       </div>