Merge branch 'release/v2.5.0' of github.com:ONLYOFFICE/DocSpace-client into release/v2.5.0

This commit is contained in:
Nikita Gopienko 2024-03-25 13:03:04 +03:00
commit 6564194e03
5 changed files with 8 additions and 8 deletions

View File

@ -114,7 +114,8 @@ const FileInputPure = ({
const { iconSize, buttonSize } = getSize(); const { iconSize, buttonSize } = getSize();
const onClickProp = fromStorage ? { onClick: rest.onClick } : {}; const onClickProp =
fromStorage && !isDisabled ? { onClick: rest.onClick } : {};
return ( return (
<Dropzone onDrop={onDrop} noClick={isDisabled || isLoading} accept={accept}> <Dropzone onDrop={onDrop} noClick={isDisabled || isLoading} accept={accept}>

View File

@ -497,7 +497,6 @@ const FilterBlock = ({
withoutBackButton: false, withoutBackButton: false,
}} }}
currentUserId={userId} currentUserId={userId}
withoutNotActivatedUsers
/> />
) : showSelector.type === FilterSelectorTypes.groups ? ( ) : showSelector.type === FilterSelectorTypes.groups ? (
<GroupsSelector <GroupsSelector

View File

@ -34,7 +34,7 @@ import MobileStartReactSvgUrl from "PUBLIC_DIR/images/mobile.star.react.svg?url"
import { MainButtonMobile } from "./MainButtonMobile"; import { MainButtonMobile } from "./MainButtonMobile";
import MobileMainButtonDocs from "./MainButtonMobile.docs.mdx"; // import MobileMainButtonDocs from "./MainButtonMobile.docs.mdx";
const meta = { const meta = {
title: "Components/MainButtonMobile", title: "Components/MainButtonMobile",
@ -42,7 +42,7 @@ const meta = {
tags: ["autodocs"], tags: ["autodocs"],
parameters: { parameters: {
docs: { docs: {
page: MobileMainButtonDocs, // page: MobileMainButtonDocs,
}, },
}, },
} satisfies Meta<typeof MainButtonMobile>; } satisfies Meta<typeof MainButtonMobile>;

View File

@ -32,7 +32,7 @@ import { InputSize, InputType, TextInput } from "../text-input";
import { PasswordInput } from "./PasswordInput"; import { PasswordInput } from "./PasswordInput";
import PasswordInputDocs from "./PasswordInput.mdx"; // import PasswordInputDocs from "./PasswordInput.mdx";
import { PasswordInputProps, TPasswordValidation } from "./PasswordInput.types"; import { PasswordInputProps, TPasswordValidation } from "./PasswordInput.types";
// const disable = { // const disable = {
@ -49,7 +49,7 @@ const meta = {
description: { description: {
component: "Paging is used to navigate med content pages", component: "Paging is used to navigate med content pages",
}, },
page: PasswordInputDocs, // page: PasswordInputDocs,
}, },
}, },
argTypes: { argTypes: {

View File

@ -30,14 +30,14 @@ import { Link } from "../link";
import { Text } from "../text"; import { Text } from "../text";
import { Tooltip } from "."; import { Tooltip } from ".";
import TooltipDocs from "./Tooltip.mdx"; // import TooltipDocs from "./Tooltip.mdx";
const meta = { const meta = {
title: "Components/Tooltip", title: "Components/Tooltip",
component: Tooltip, component: Tooltip,
parameters: { parameters: {
docs: { docs: {
page: TooltipDocs, // page: TooltipDocs,
}, },
design: { design: {
type: "figma", type: "figma",