Merge branch 'release/v2.6.0' of github.com:ONLYOFFICE/DocSpace-client into release/v2.6.0
This commit is contained in:
commit
aa7980ab37
@ -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,
|
||||
};
|
||||
},
|
||||
|
@ -294,6 +294,7 @@ const Sdk = ({
|
||||
acceptButtonLabel={frameConfig?.acceptButtonLabel}
|
||||
cancelButtonLabel={frameConfig?.cancelButtonLabel}
|
||||
currentFolderId={frameConfig?.id}
|
||||
openRoot={!frameConfig?.id}
|
||||
descriptionText={formatsDescription[frameConfig?.filterParam] || ""}
|
||||
/>
|
||||
);
|
||||
|
@ -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"
|
||||
|
Loading…
Reference in New Issue
Block a user