IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #348 from ONLYOFFICE/bugfix/upload-folder-in-mobile

Browse Source 
Fixed Bug 67431 – Mobile. Folder is not selected when selecting Folder Upload
This commit is contained in:
Alexey Safronov 2024-04-17 11:38:57 +04:00 committed by GitHub
commit de2db91de5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 31 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
packages/client/src/components/Article/MainButton/index.js
View File

@ -62,6 +62,7 @@ import styled, { css } from "styled-components";
import { resendInvitesAgain } from "@docspace/shared/api/people";
import { getCorrectFourValuesStyle } from "@docspace/shared/utils";
import { ArticleButtonLoader } from "@docspace/shared/skeletons/article";
import { isDesktop } from "@docspace/shared/utils";
const StyledButton = styled(Button)`
font-weight: 700;
@ -470,25 +471,36 @@ const ArticleMainButtonContent = (props) => {
},
];
const uploadActions = [
{
id: "actions_upload-files",
className: "main-button_drop-down",
icon: ActionsUploadReactSvgUrl,
label: t("UploadFiles"),
onClick: onUploadFileClick,
key: "upload-files",
},
{
id: "actions_upload-folders",
className: "main-button_drop-down",
icon: ActionsUploadReactSvgUrl,
label: t("UploadFolder"),
disabled: isPrivacy,
onClick: onUploadFolderClick,
key: "upload-folder",
},
];
const uploadActions = isDesktop()
? [
{
id: "actions_upload-files",
className: "main-button_drop-down",
icon: ActionsUploadReactSvgUrl,
label: t("UploadFiles"),
onClick: onUploadFileClick,
key: "upload-files",
},
{
id: "actions_upload-folders",
className: "main-button_drop-down",
icon: ActionsUploadReactSvgUrl,
label: t("UploadFolder"),
disabled: isPrivacy,
onClick: onUploadFolderClick,
key: "upload-folder",
},
]
: [
{
id: "actions_upload-files",
className: "main-button_drop-down",
icon: ActionsUploadReactSvgUrl,
label: t("UploadFiles"),
onClick: onUploadFileClick,
key: "upload-files",
},
];
if (pluginItems.length > 0) {
// menuModel.push({