Merge branch 'master' into fix-collab-current-user

Author: mergify[bot]

i18n/nb-NO.properties

@@ -1211,7 +1211,7 @@ boxui.itemDetails.enterpriseOwner = Enterprise-eier
 # Warning message in the sidebar that this file will be automatically deleted on a certain date, {expiration} is the date
 boxui.itemDetails.fileExpiration = Denne filen slettes {expiration}.
 # Label for files count under item properties in the sidebar
-boxui.itemDetails.filesCountLabel = {filesCount, plural, one {# File} other {# Files}}
+boxui.itemDetails.filesCountLabel = {filesCount,plural,one{# Fil} other{# Filer}}
 # Warning message in the sidebar that this folder will be automatically deleted on a certain date, {expiration} is the date
 boxui.itemDetails.folderExpiration = Denne mappen slettes {expiration}.
 # Label for modified date under item properties in the sidebar

src/elements/common/item/ItemName.tsx

@@ -20,7 +20,15 @@ const ItemName = ({ item, onClick, onFocus, canPreview, isTouch }: ItemNameProps
     const onItemClick = (): void => onClick(item);
 
     return type === TYPE_FOLDER || (!isTouch && (type === TYPE_WEBLINK || canPreview)) ? (
-        <TextButton className="be-item-label" inheritFont onClick={onItemClick} onFocus={onItemFocus}>
+        <TextButton
+            className="be-item-label"
+            inheritFont
+            onClick={event => {
+                event.stopPropagation();
+                onItemClick();
+            }}
+            onFocus={onItemFocus}
+        >
             {name}
         </TextButton>
     ) : (