Merge branch 'hotfix/v2.0.1' into develop
This commit is contained in:
commit
67886ed433
@ -278,7 +278,7 @@ export const useFilesHelper = ({
|
||||
return {
|
||||
label: title,
|
||||
id: id,
|
||||
isRoom: !!roomType,
|
||||
isRoom: currentFolder?.current?.rootFolderId === id,
|
||||
roomType,
|
||||
};
|
||||
}
|
||||
|
@ -54,6 +54,7 @@ import {
|
||||
EmployeeType,
|
||||
RoomsType,
|
||||
DeviceType,
|
||||
FolderType,
|
||||
} from "@docspace/common/constants";
|
||||
|
||||
import { CategoryType } from "SRC_DIR/helpers/constants";
|
||||
@ -776,7 +777,7 @@ const SectionHeaderContent = (props) => {
|
||||
key: "create-room",
|
||||
icon: CatalogRoomsReactSvgUrl,
|
||||
onClick: onClickCreateRoom,
|
||||
disabled: isArchiveFolder || !inRoom || isPublicRoom,
|
||||
disabled: selectedFolder.rootFolderType !== FolderType.USER,
|
||||
},
|
||||
{
|
||||
id: "option_leave-room",
|
||||
|
@ -135,6 +135,7 @@ const Textarea = ({
|
||||
</Numeration>
|
||||
)}
|
||||
<StyledTextarea
|
||||
heightTextArea={textareaHeight}
|
||||
id={id}
|
||||
paddingLeftProp={paddingLeftProp}
|
||||
isJSONField={isJSONField}
|
||||
|
@ -35,6 +35,16 @@ const StyledScrollbar = styled(ClearScrollbar)`
|
||||
? props.heightTextArea + 2 + "px"
|
||||
: "91px";
|
||||
}} !important;
|
||||
|
||||
textarea {
|
||||
height: ${(props) => {
|
||||
return props.heightScale
|
||||
? "65vh"
|
||||
: props.heightTextArea
|
||||
? props.heightTextArea + "px"
|
||||
: "89px";
|
||||
}};
|
||||
}
|
||||
background-color: ${(props) =>
|
||||
props.isDisabled && props.theme.textArea.disabledColor};
|
||||
`;
|
||||
@ -71,7 +81,7 @@ const StyledTextarea = styled(ClearTextareaAutosize).attrs(
|
||||
|
||||
display: table;
|
||||
width: -webkit-fill-available;
|
||||
height: fit-content;
|
||||
|
||||
border: none;
|
||||
outline: none;
|
||||
resize: none;
|
||||
|
@ -197,12 +197,9 @@
|
||||
iframe.name = config.name;
|
||||
iframe.id = config.frameId;
|
||||
|
||||
//iframe.loading = "lazy";
|
||||
iframe.frameBorder = 0;
|
||||
iframe.allowFullscreen = true;
|
||||
iframe.setAttribute("allowfullscreen", "");
|
||||
iframe.setAttribute("allow", "autoplay");
|
||||
|
||||
//iframe.referrerpolicy = "unsafe-url";
|
||||
iframe.setAttribute("allow", "storage-access");
|
||||
|
||||
if (config.type == "mobile") {
|
||||
iframe.style.position = "fixed";
|
||||
|
Loading…
Reference in New Issue
Block a user