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

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/client/src/components/FilesSelector/index.tsx
View File

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

1
packages/client/src/pages/Sdk/index.js
View File

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

1
packages/shared/components/table/Table.utils.ts
View File

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