fix: Update dependencies

cozy · Dec 20, 2021 · 34373cf · 34373cf
1 parent db30b49
commit 34373cf
Show file tree

Hide file tree

Showing 6 changed files with 321 additions and 31 deletions.
diff --git a/package.json b/package.json
@@ -61,15 +61,15 @@
     "@material-ui/styles": "4.11.4",
     "classnames": "2.3.1",
     "cozy-bar": "7.16.0",
-    "cozy-client": "^24.9.1",
+    "cozy-client": "^27.6.5",
     "cozy-device-helper": "1.12.0",
     "cozy-doctypes": "1.82.2",
     "cozy-editor-core": "134.0.3",
     "cozy-flags": "2.7.2",
     "cozy-realtime": "3.13.0",
     "cozy-scripts": "eslint7",
     "cozy-sharing": "^3.12.2",
-    "cozy-ui": "^51.12.0",
+    "cozy-ui": "^58.4.0",
     "eslint-config-cozy-app": "1.6.0",
     "lodash": "^4.17.15",
     "prop-types": "15.7.2",

diff --git a/src/components/notes/EditorCorner.jsx b/src/components/notes/EditorCorner.jsx
@@ -7,13 +7,22 @@ import { useI18n } from 'cozy-ui/transpiled/react/I18n'
 
 import SharingWidget from 'components/notes/sharing'
 
+// https://mui.com/components/tooltips/#custom-child-element
+const ForwardedIcon = React.forwardRef(function ForwardedIcon(props, ref) {
+  return (
+    <div ref={ref}>
+      <Icon {...props} />
+    </div>
+  )
+})
+
 const EditorCorner = ({ doc, isPublic, isReadOnly, title }) => {
   const { t } = useI18n()
   if (!isPublic) return <SharingWidget file={doc.file} title={title} />
   else if (isReadOnly) {
     return (
       <Tooltip title={t('Notes.Editor.read_only')}>
-        <Icon icon="lock" color="var(--primaryTextColor)" />
+        <ForwardedIcon icon="lock" color="var(--primaryTextColor)" />
       </Tooltip>
     )
   } else return null

diff --git a/src/components/notes/EditorCorner.spec.jsx b/src/components/notes/EditorCorner.spec.jsx
@@ -38,10 +38,9 @@ describe('EditorCorner', () => {
       <WithStyles(ForwardRef(Tooltip))
         title="This note is in read-only mode."
       >
-        <Icon
+        <ForwardRef(ForwardedIcon)
           color="var(--primaryTextColor)"
           icon="lock"
-          spin={false}
         />
       </WithStyles(ForwardRef(Tooltip))>
     `)

diff --git a/src/components/notes/editor.jsx b/src/components/notes/editor.jsx
@@ -109,11 +109,13 @@ export default function Editor(props) {
           headerMenu={
             <HeaderMenu
               backFromEditing={
-                <BackFromEditing
-                  returnUrl={returnUrl}
-                  file={doc.file}
-                  requestToLeave={requestToLeave}
-                />
+                returnUrl ? (
+                  <BackFromEditing
+                    returnUrl={returnUrl}
+                    file={doc.file}
+                    requestToLeave={requestToLeave}
+                  />
+                ) : null
               }
               editorCorner={
                 <EditorCorner
@@ -151,5 +153,5 @@ Editor.propTypes = {
   noteId: PropTypes.string.isRequired,
   readOnly: PropTypes.bool.isRequired,
   userName: PropTypes.string,
-  returnUrl: PropTypes.string
+  returnUrl: PropTypes.oneOfType([PropTypes.string, PropTypes.bool]).isRequired
 }
diff --git a/src/targets/browser/index.jsx b/src/targets/browser/index.jsx
@@ -110,7 +110,7 @@ export const initApp = () => {
 
   const shareCode = getPublicSharecode()
   const token = shareCode || data.token
-  const isPublic = shareCode || !token || token == ''
+  const isPublic = Boolean(shareCode || !token || token == '')
 
   // initialize the client to interact with the cozy stack
   const client = new CozyClient({