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

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

Browse Source
This commit is contained in:
Tatiana Lopaeva 2023-11-03 15:02:41 +03:00
commit da03fe0e13
7 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/client/src/components/dialogs/DownloadDialog/DownloadRow.js
View File

@ -5,6 +5,7 @@ import Text from "@docspace/components/text";
import Checkbox from "@docspace/components/checkbox";
import LinkWithDropdown from "@docspace/components/link-with-dropdown";
import DropDownItem from "@docspace/components/drop-down-item";
import { isMobile } from "@docspace/components/utils/device";
const DownloadRow = (props) => {
const {
@ -76,10 +77,10 @@ const DownloadRow = (props) => {
containerMinWidth="fit-content"
data={dropdownItems}
directionX="left"
directionY="bottom"
directionY={isMobile() ? "both" : "bottom"}
fontSize="13px"
fontWeight={600}
hasScroll={true}
hasScroll={isMobile()}
withExpander
>
{file.format || t("OriginalFormat")}

1
packages/client/src/components/panels/StyledPanels.js
View File

@ -125,7 +125,6 @@ const StyledVersionHistoryPanel = styled.div`
}
.version-history-panel-header {
margin-bottom: 12px;
height: 53px;
${(props) =>
props.theme.interfaceDirection === "rtl"

2
packages/client/src/store/AccountsContextOptionsStore.js
View File

@ -14,7 +14,7 @@ import RefreshReactSvgUrl from "PUBLIC_DIR/images/refresh.react.svg?url";
import InviteAgainReactSvgUrl from "PUBLIC_DIR/images/invite.again.react.svg?url";
import ChangeToEmployeeReactSvgUrl from "PUBLIC_DIR/images/change.to.employee.react.svg?url";
import DeleteReactSvgUrl from "PUBLIC_DIR/images/delete.react.svg?url";
import InfoReactSvgUrl from "PUBLIC_DIR/images/info.react.svg?url";
import InfoReactSvgUrl from "PUBLIC_DIR/images/info.outline.react.svg?url";
import ReassignDataReactSvgUrl from "PUBLIC_DIR/images/reassign.data.svg?url";
import { makeAutoObservable } from "mobx";
import toastr from "@docspace/components/toast/toastr";

8
packages/client/src/store/PeopleStore.js
View File

@ -1,4 +1,4 @@
import InfoReactSvgUrl from "PUBLIC_DIR/images/info.react.svg?url";
import InfoReactSvgUrl from "PUBLIC_DIR/images/info.outline.react.svg?url";
import EnableReactSvgUrl from "PUBLIC_DIR/images/enable.react.svg?url";
import DisableReactSvgUrl from "PUBLIC_DIR/images/disable.react.svg?url";
import ChangeToEmployeeReactSvgUrl from "PUBLIC_DIR/images/change.to.employee.react.svg?url";
@ -82,7 +82,6 @@ class PeopleStore {
this.isInit = true;
//this.authStore.settingsStore.setModuleInfo(config.homepage, config.id);
};
reset = () => {
@ -250,7 +249,10 @@ class PeopleStore {
id: "menu-info",
key: "info",
label: t("Common:Info"),
disabled: isVisible || !(isTablet() || isMobile() || !isDesktop()),
disabled:
isVisible ||
!(isTablet() || isMobile() || !isDesktop()) ||
selection.length > 1,
onClick: (item) => this.onOpenInfoPanel(item),
iconUrl: InfoReactSvgUrl,
},

6
packages/components/link-with-dropdown/index.js
View File

@ -110,8 +110,8 @@ class LinkWithDropdown extends React.Component {
...rest
} = this.props;
const showScroll =
hasScroll && isMobileOnly && this.state.orientation === 90;
const showScroll = hasScroll && isMobileOnly;
const scrollHeight = this.state.orientation === 90 ? 100 : 250;
const dropDownItem = data.map((item) => (
<DropDownItem
@ -183,7 +183,7 @@ class LinkWithDropdown extends React.Component {
<Scrollbar
className="scroll-drop-down-item"
style={{
height: 108,
height: scrollHeight,
}}
>
{dropDownItem}

2
packages/components/selector/sub-components/Body/index.tsx
View File

@ -22,7 +22,7 @@ const HEADER_HEIGHT = 54;
const BREAD_CRUMBS_HEIGHT = 38;
const SEARCH_HEIGHT = 44;
const BODY_DESCRIPTION_TEXT_HEIGHT = 32;
const SELECT_ALL_HEIGHT = 73;
const SELECT_ALL_HEIGHT = 61;
const FOOTER_HEIGHT = 73;
const FOOTER_WITH_NEW_NAME_HEIGHT = 145;
const FOOTER_WITH_CHECKBOX_HEIGHT = 181;

2
packages/components/selector/sub-components/SelectAll/StyledSelectAll.ts
View File

@ -18,8 +18,6 @@ const StyledSelectAll = styled.div`
padding: 8px 16px 20px;
margin-bottom: 12px;
.select-all_avatar {
min-width: 32px;
}