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

Merge branch 'develop' into feature/templates

Browse Source
This commit is contained in:
Nikita Gopienko 2024-04-24 14:34:21 +03:00
commit 9a94909537
11 changed files with 57 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -920,7 +920,6 @@ export default inject(
const isFolder = selectedFolderStore.isFolder;
const { isAdmin, isOwner, isRoomAdmin } = userStore.user;
console.log(userStore.user);
const { isGracePeriod } = currentTariffStatusStore;
const { setOformFromFolderId, oformsFilter } = oformsStore;

30
packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/TagInput/TagDropdown.js
View File

@ -134,24 +134,20 @@ const TagDropdown = ({
const dropdownItems = calcualateDisplayedDropdownItems();
return (
<StyledDropDownWrapper
ref={dropdownRef}
className="dropdown-content-wrapper"
onMouseDown={preventDefault}
<StyledDropDown
className="dropdown-content"
open={open}
forwardedRef={dropdownRef}
maxHeight={dropdownMaxHeight}
showDisabledItems={false}
hasItems={!!dropdownItems.length}
clickOutsideAction={onClickOutside}
withBackdrop={false}
isDefaultMode={false}
manualY="54px"
>
<StyledDropDown
className="dropdown-content"
open={open}
forwardedRef={dropdownRef}
maxHeight={dropdownMaxHeight}
showDisabledItems={false}
hasItems={!!dropdownItems.length}
clickOutsideAction={onClickOutside}
withBackdrop={false}
>
{dropdownItems}
</StyledDropDown>
</StyledDropDownWrapper>
{dropdownItems}
</StyledDropDown>
);
};

2
packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/TagInput/index.js
View File

@ -33,6 +33,8 @@ import InputParam from "../Params/InputParam";
import TagDropdown from "./TagDropdown";
const StyledTagInput = styled.div`
position: relative;
.set_room_params-tag_input {
&-label_wrapper {
&-label {

5
packages/client/src/pages/Home/Section/Body/TableView/sub-components/RoomCell.js
View File

@ -44,13 +44,14 @@ const RoomCell = ({ sideColor, item }) => {
setIsTooltipLoading(true);
try {
const folderPath = await getFolderPath(originId);
if (folderPath[0].id === CategoryType.Shared) folderPath.shift();
if (folderPath[0].id === CategoryType.SharedRoom) folderPath.shift();
setPath(folderPath);
} catch (e) {
console.error(e);
setPath([{ id: 0, title: originRoomTitle || originTitle }]);
} finally {
setIsTooltipLoading(false);
}
setIsTooltipLoading(false);
};
const canVisibleTitle = originRoomTitle || originTitle;

11
packages/client/src/store/FilesStore.js
View File

@ -3997,12 +3997,12 @@ class FilesStore {
});
};
//Duplicate of countTilesInRow, used to update the number of tiles in a row after the window is resized.
//Used to update the number of tiles in a row after the window is resized.
getCountTilesInRow = () => {
const isDesktopView = isDesktop();
const isMobileView = isMobile();
const tileGap = isDesktopView ? 16 : 14;
const minTileWidth = 216 + tileGap;
const body = document.getElementById("section");
const elem = document.getElementsByClassName("section-wrapper-content")[0];
let containerWidth = 0;
@ -4017,10 +4017,11 @@ class FilesStore {
elemPadding.split("px")[3];
}
const sectionPadding = body?.offsetWidth - containerWidth - tileGap + 1;
const sectionWidth = body ? body.offsetWidth - sectionPadding : 0;
containerWidth += tileGap;
if (!isMobileView) containerWidth -= 1;
if (!isDesktopView) containerWidth += 3; //tablet tile margin -3px (TileContainer.js)
return Math.floor(sectionWidth / minTileWidth);
return Math.floor(containerWidth / minTileWidth);
};
setInvitationLinks = async (roomId, title, access, linkId) => {

10
packages/client/src/store/HotkeyStore.js
View File

@ -694,15 +694,7 @@ class HotkeyStore {
};
get countTilesInRow() {
const isDesktopView = isDesktop();
const tileGap = isDesktopView ? 16 : 14;
const minTileWidth = 216 + tileGap;
const sectionPadding = isDesktopView ? 24 : 16;
const body = document.getElementById("section");
const sectionWidth = body ? body.offsetWidth - sectionPadding : 0;
return Math.floor(sectionWidth / minTileWidth);
return this.filesStore.getCountTilesInRow();
}
get division() {

1
packages/shared/api/files/index.ts
View File

@ -137,7 +137,6 @@ export async function getFolderPath(folderId: number) {
};
const res = (await request(options)) as TGetFolderPath;
return res;
}

3
packages/shared/components/room-icon/index.tsx
View File

@ -79,7 +79,8 @@ const StyledIcon = styled.div<{
.room-icon_badge {
position: absolute;
margin: 24px 0 0 24px;
margin-block: 24px 0;
margin-inline: 24px 0;
.room-icon-button {
width: 12px;

15
packages/shared/components/selector/Selector.tsx
View File

@ -28,6 +28,8 @@
import React from "react";
import { ButtonKeys } from "../../enums";
import { Header } from "./sub-components/Header";
import { Body } from "./sub-components/Body";
import { Footer } from "./sub-components/Footer";
@ -383,6 +385,19 @@ const Selector = ({
setFooterVisible(isEqual);
}, [selectedItems, newSelectedItems]);
React.useEffect(() => {
const onKeyboardAction = (e: KeyboardEvent) => {
if (e.key === ButtonKeys.esc) {
onCancel?.();
}
};
window.addEventListener("keydown", onKeyboardAction);
return () => {
window.removeEventListener("keydown", onKeyboardAction);
};
}, [onCancel]);
React.useLayoutEffect(() => {
if (items) {
if (

14
packages/shared/components/tooltip/Tooltip.tsx
View File

@ -116,6 +116,20 @@ const Tooltip = React.forwardRef<TooltipRefProps, TooltipProps>(
flip({
crossAxis: false,
fallbackAxisSideDirection,
fallbackPlacements: [
"right",
"bottom",
"left",
"top",
"top-start",
"top-end",
"right-start",
"right-end",
"bottom-start",
"bottom-end",
"left-start",
"left-end",
],
}),
shift(),
]}

2
packages/shared/enums/index.ts
View File

@ -455,7 +455,7 @@ export const enum ParseErrorTypes {
export const enum ButtonKeys {
enter = "enter",
esc = "esc",
esc = "Escape",
tab = "Tab",
}