Read-write actions on public view

package.json

@@ -115,7 +115,7 @@
     "cozy-scripts": "1.13.2",
     "cozy-sharing": "1.9.1",
     "cozy-stack-client": "13.5.2",
-    "cozy-ui": "35.9.0",
+    "cozy-ui": "35.17.0",
     "date-fns": "1.30.1",
     "diacritics": "1.3.0",
     "fastclick": "1.0.6",

src/drive/web/modules/drive/Toolbar/components/ScanWrapper.jsx

@@ -60,66 +60,69 @@ const ScanMenuItem = translate()(({ status, onClick, t, online }) => {
 class ScanWrapper extends Component {
   render() {
     const { displayedFolder, stopMediaBackup, startMediaBackup } = this.props
+    // The ActionMenu needs to stay open during the scan, so we prevent the click event from bubbling
     return (
       <MuiCozyTheme>
-        <Scanner
-          dirId={displayedFolder.id} //Pour savoir où uploader
-          pluginConfig={{
-            sourceType: 1 // Camera
-          }}
-          generateName={() => {
-            const date = new Date()
-            //We had to replace : by - since the Cordova File plugin doesn't support : in the filename
-            //https://github.com/apache/cordova-plugin-file/issues/289#issuecomment-477954331
-            return `Scan_${date.toISOString().replace(/:/g, '-')}.jpg`
-          }}
-          onConflict={'rename'}
-          //We need to cancel the MediaBackup before doing the upload since the scanned file will be
-          //inserted we don't know where in the queue resulting in a non uploaded file if the queue is
-          //big enough
-          onBeforeUpload={() => stopMediaBackup()}
-          onFinish={() => {
-            const tracker = getTracker()
-            if (tracker) {
-              tracker.push(['trackEvent', 'Drive', 'Scanner', 'Finished'])
-            }
-            startMediaBackup()
-          }}
-        >
-          {({ status, error, startScanner, filename, onClear, online }) => {
-            if (error || !filename) {
+        <div onClick={e => e.stopPropagation()}>
+          <Scanner
+            dirId={displayedFolder.id} //Pour savoir où uploader
+            pluginConfig={{
+              sourceType: 1 // Camera
+            }}
+            generateName={() => {
+              const date = new Date()
+              //We had to replace : by - since the Cordova File plugin doesn't support : in the filename
+              //https://github.com/apache/cordova-plugin-file/issues/289#issuecomment-477954331
+              return `Scan_${date.toISOString().replace(/:/g, '-')}.jpg`
+            }}
+            onConflict={'rename'}
+            //We need to cancel the MediaBackup before doing the upload since the scanned file will be
+            //inserted we don't know where in the queue resulting in a non uploaded file if the queue is
+            //big enough
+            onBeforeUpload={() => stopMediaBackup()}
+            onFinish={() => {
+              const tracker = getTracker()
+              if (tracker) {
+                tracker.push(['trackEvent', 'Drive', 'Scanner', 'Finished'])
+              }
+              startMediaBackup()
+            }}
+          >
+            {({ status, error, startScanner, filename, onClear, online }) => {
+              if (error || !filename) {
+                return (
+                  <ScanMenuItem
+                    status={status}
+                    onClick={startScanner}
+                    online={online}
+                  />
+                )
+              }
               return (
-                <ScanMenuItem
-                  status={status}
-                  onClick={startScanner}
-                  online={online}
-                />
+                <>
+                  <ScanMenuItem
+                    status={status}
+                    onClick={startScanner}
+                    online={online}
+                  />
+                  <PortaledQueue
+                    file={{
+                      file: {
+                        name: filename,
+                        isDirectory: false,
+                        status
+                      }
+                    }}
+                    successCount={status === SCANNER_DONE ? 1 : 0}
+                    doneCount={1}
+                    key={filename}
+                    onClear={onClear}
+                  />
+                </>
               )
-            }
-            return (
-              <>
-                <ScanMenuItem
-                  status={status}
-                  onClick={startScanner}
-                  online={online}
-                />
-                <PortaledQueue
-                  file={{
-                    file: {
-                      name: filename,
-                      isDirectory: false,
-                      status
-                    }
-                  }}
-                  successCount={status === SCANNER_DONE ? 1 : 0}
-                  doneCount={1}
-                  key={filename}
-                  onClear={onClear}
-                />
-              </>
-            )
-          }}
-        </Scanner>
+            }}
+          </Scanner>
+        </div>
       </MuiCozyTheme>
     )
   }

src/drive/web/modules/drive/Toolbar/components/UploadItem.jsx

@@ -18,8 +18,13 @@ const UploadItem = ({ t, isDisabled, onUpload }) => (
     onChange={onUpload}
     data-test-id="upload-btn"
     value={[]}
+    // FileInput needs to stay rendered until the onChange event, so we prevent the event from bubbling
+    onClick={e => e.stopPropagation()}
   >
-    <ActionMenuItem left={<Icon icon="upload" />}>
+    <ActionMenuItem
+      left={<Icon icon="upload" />}
+      onClick={e => e.stopPropagation()}
+    >
       {t('toolbar.menu_upload')}
     </ActionMenuItem>
   </FileInput>

src/drive/web/modules/trash/Toolbar.jsx

@@ -45,6 +45,7 @@ const Toolbar = ({
           placement="bottom-end"
           anchorElRef={anchorRef}
           onClose={closeMenu}
+          autoclose
         >
           <ActionMenuItem
             onClick={() => emptyTrash()}

yarn.lock

@@ -5393,10 +5393,10 @@ cozy-ui@22.3.1:
     react-pdf "^4.0.5"
     react-select "2.2.0"
 
-cozy-ui@35.9.0:
-  version "35.9.0"
-  resolved "https://registry.yarnpkg.com/cozy-ui/-/cozy-ui-35.9.0.tgz#03db32bf49d812cfadca097e3e8157d2632b34c8"
-  integrity sha512-/XSyzDV4tTkKgovrdVtw5YoeO9yniv7xHBUImtYHi0+XszKEuVz3V0sHhG1d9WdTdRguUScYF8W+j3/mBbPiWw==
+cozy-ui@35.17.0:
+  version "35.17.0"
+  resolved "https://registry.yarnpkg.com/cozy-ui/-/cozy-ui-35.17.0.tgz#b91caf07f7c2ba9fd8588fa38b7a360d81fb69c8"
+  integrity sha512-qtlDgd3zGpjldpwcvqJBRcxtvUMWd1WjT9NrvPyw2jCy5LjpPwHY1SSBtzsi0ZlqH6QSU73Wh1VG7p16akrzOg==
   dependencies:
     "@babel/runtime" "^7.3.4"
     body-scroll-lock "^2.5.8"