mirror/insomnia
1
0
Fork 0
mirror of https://github.com/Kong/insomnia.git synced 2026-08-04 11:52:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix toggle issues

Browse Source
This commit is contained in:
Kent Wang
2026-05-20 17:50:56 +08:00
parent fdc7eb3283
commit ccb0adb1df
2 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
packages/insomnia/src/ui/components/sidebar/project-navigation-sidebar/project-navigation-sidebar.tsx
View File

@@ -549,7 +549,11 @@ export const ProjectNavigationSidebar = ({ storageRules, konnectSyncEnabled }: P
if (!projectNavigationSidebarFilter) {
const expandedIds = expandedProjectAndWorkspaceIds || [];
const newExpandedIds = Array.from(new Set([...expandedIds, ...projectOrWorkspaceIds]));
setExpandedProjectAndWorkspaceIds(newExpandedIds);
// Avoid updating state if there is no change in expanded ids to prevent unnecessary re-render
const hasNewIds = newExpandedIds.some(id => !expandedIds.includes(id));
if (hasNewIds) {
setExpandedProjectAndWorkspaceIds(newExpandedIds);
}
}
},
[expandedProjectAndWorkspaceIds, projectNavigationSidebarFilter, setExpandedProjectAndWorkspaceIds],
@@ -568,7 +572,7 @@ export const ProjectNavigationSidebar = ({ storageRules, konnectSyncEnabled }: P
const requestGroupMetas = await Promise.all(
requestGroupIds.map(requestGroupId => services.requestGroupMeta.getByParentId(requestGroupId)),
);
// Update the collapsed state of the toggled request groups.
const nextStates = requestGroupIds.map((requestGroupId, index) => {
const requestGroupMeta = requestGroupMetas[index];
return {
@@ -582,7 +586,7 @@ export const ProjectNavigationSidebar = ({ storageRules, konnectSyncEnabled }: P
services.requestGroupMeta.updateOrCreateForParentId(requestGroupId, { collapsed }),
),
);
// Update the collapsed state in the cache.
cachedCollectionChildrenAndMetaRef.current.forEach(workspaceData => {
workspaceData.requestGroupMetas.forEach(requestGroupMeta => {
const nextState = nextStates.find(({ requestGroupId }) => requestGroupId === requestGroupMeta.parentId);
@@ -652,7 +656,13 @@ export const ProjectNavigationSidebar = ({ storageRules, konnectSyncEnabled }: P
} else if (matchedToggledChild) {
return {
...item,
hidden: matchedToggledChild.parentIsCollapsed,
hidden:
matchedToggledChild.parentIsCollapsed ||
// If the parent folder is toggled to be expanded, the empty folder node should still be hidden if its parent request group is collapsed.
cachedCollectionChildrenAndMetaRef.current
.get(workspace._id)
?.requestGroupMetas.find(rgm => rgm.parentId === matchedToggledChild.id)?.collapsed ||
false,
};
}
}

6
packages/insomnia/src/ui/components/sidebar/project-navigation-sidebar/use-project-navigation-sidebar-navigation.ts
View File

@@ -85,10 +85,10 @@ export const useProjectNavigationSidebarNavigation = ({
!models.workspace.isWorkspace(resources.resource) &&
models.workspace.isCollection(resources.workspace)
) {
const requestGroupIds = (await database.withAncestors(resources.resource))
const requestGroups = (await database.withAncestors(resources.resource, [models.requestGroup.type]))
.reverse()
.filter(models.requestGroup.isRequestGroup)
.map(requestGroup => requestGroup._id);
.filter(models.requestGroup.isRequestGroup);
const requestGroupIds = requestGroups.map(requestGroup => requestGroup._id);
if (cancelled) {
return;