diff --git a/tdrive/frontend/src/app/views/client/body/drive/header-path.tsx b/tdrive/frontend/src/app/views/client/body/drive/header-path.tsx index b8f9564e..7ba1afaf 100644 --- a/tdrive/frontend/src/app/views/client/body/drive/header-path.tsx +++ b/tdrive/frontend/src/app/views/client/body/drive/header-path.tsx @@ -21,7 +21,6 @@ export default ({ setParentId: (id: string) => void; }) => { const [savedPath, setSavedPath] = useState([]); - const { user } = useCurrentUser(); const history = useHistory(); const company = useRouterCompany(); useEffect(() => { @@ -38,10 +37,10 @@ export default ({ RouterServices.generateRouteFromState({ companyId: company, viewId, - dirId + dirId, }), ); - setParentId(dirId? dirId: viewId) + setParentId(dirId ? dirId : viewId); }} /> ); @@ -67,26 +66,28 @@ export const PathRender = ({ inTrash: boolean; onClick: (viewId: string, dirId: string) => void; }) => { - const pathLength = (path || []).reduce((acc, curr) => acc + curr.name.length, 0); + const parentIndex = path.findIndex(item => item.is_in_trash); + const pathToRender = parentIndex > -1 ? path.slice(parentIndex - 1) : path; + const pathLength = (pathToRender || []).reduce((acc, curr) => acc + curr.name.length, 0); return (