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

This commit is contained in:
Akmal Isomadinov 2024-07-25 13:34:29 +05:00
commit aa7980ab37
3 changed files with 4 additions and 1 deletions

View File

@ -424,6 +424,7 @@ export default inject(
isRestore,
isPanelVisible,
id,
currentFolderId: currentFolderIdProp,
}: FilesSelectorProps,
) => {
const { id: selectedId, parentId, rootFolderType } = selectedFolderStore;
@ -551,7 +552,7 @@ export default inject(
getIcon,
roomsFolderId,
currentFolderId: folderId,
currentFolderId: folderId || currentFolderIdProp,
filesSettings,
};
},

View File

@ -294,6 +294,7 @@ const Sdk = ({
acceptButtonLabel={frameConfig?.acceptButtonLabel}
cancelButtonLabel={frameConfig?.cancelButtonLabel}
currentFolderId={frameConfig?.id}
openRoot={!frameConfig?.id}
descriptionText={formatsDescription[frameConfig?.filterParam] || ""}
/>
);

View File

@ -33,6 +33,7 @@ export const checkingForUnfixedSize = (
defaultColumnSize: number,
) => {
return (
item !== "24px" && // TODO: SETTINGS_SIZE is not imported
item !== `${SETTINGS_SIZE}px` &&
item !== `${defaultColumnSize}px` &&
item !== "0px"