Merge branch 'hotfix/v2.6.1' of github.com:ONLYOFFICE/DocSpace-client into hotfix/v2.6.1

This commit is contained in:
Ilya Oleshko 2024-08-16 16:28:40 +03:00
commit c83a2aa076
3 changed files with 3 additions and 8 deletions

View File

@ -270,12 +270,12 @@ export default function withFileActions(WrappedFileItem) {
isRecentTab,
canDrag,
} = this.props;
const { access, id } = item;
const { id, security } = item;
const isDragging =
!isDisabledDropItem &&
isFolder &&
access < 2 &&
security?.MoveTo &&
!isTrashFolder &&
!isPrivacy;

View File

@ -88,7 +88,7 @@ const TabsCommon = (props) => {
const getCurrentTabId = () => {
const path = location.pathname;
const currentTab = data.find((item) => path.includes(item.id));
return currentTab !== -1 && data.length ? currentTab.id : data[0].id;
return currentTab && data.length ? currentTab.id : data[0].id;
};
const currentTabId = getCurrentTabId();

View File

@ -233,11 +233,6 @@ class TableHeaderComponent extends React.Component<
const defaultSize = columns[activeColumnIndex - 1].defaultSize;
if (!Array.isArray(clearSize)) {
console.log("addNewColumns clearSize", clearSize);
return true;
}
const indexOfMaxSize = clearSize.findLastIndex((s) => s === maxSize);
const addedColumn = 1;