holm/bruno
1
0
Fork 0
forked from extern/bruno
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #467 from game5413/enhancement/collection-dropdown

Browse Source 
Better experience for open request or folder dropdown action
This commit is contained in:
Anoop M D 2023-10-09 06:52:13 +05:30 committed by GitHub
commit f0c3b8a877
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 53 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/index.js
View File

@ -88,30 +88,44 @@ const CollectionItem = ({ item, collection, searchText }) => {
});
const handleClick = (event) => {
if (isItemARequest(item)) {
if (itemIsOpenedInTabs(item, tabs)) {
switch (event.button) {
case 0: // left click
if (isItemARequest(item)) {
dispatch(hideHomePage());
if (itemIsOpenedInTabs(item, tabs)) {
dispatch(
focusTab({
uid: item.uid
})
);
return;
}
dispatch(
addTab({
uid: item.uid,
collectionUid: collection.uid,
requestPaneTab: getDefaultRequestPaneTab(item)
})
);
return;
}
dispatch(
focusTab({
uid: item.uid
collectionFolderClicked({
itemUid: item.uid,
collectionUid: collection.uid
})
);
} else {
dispatch(
addTab({
uid: item.uid,
collectionUid: collection.uid,
requestPaneTab: getDefaultRequestPaneTab(item)
})
);
}
dispatch(hideHomePage());
} else {
dispatch(
collectionFolderClicked({
itemUid: item.uid,
collectionUid: collection.uid
})
);
return;
case 2: // right click
const _menuDropdown = dropdownTippyRef.current;
if (_menuDropdown) {
let menuDropdownBehavior = 'show';
if (_menuDropdown.state.isShown) {
menuDropdownBehavior = 'hide';
}
_menuDropdown[menuDropdownBehavior]();
}
return;
}
};
@ -189,7 +203,7 @@ const CollectionItem = ({ item, collection, searchText }) => {
? indents.map((i) => {
return (
<div
onClick={handleClick}
onMouseUp={handleClick}
onDoubleClick={handleDoubleClick}
className="indent-block"
key={i}
@ -205,7 +219,7 @@ const CollectionItem = ({ item, collection, searchText }) => {
})
: null}
<div
onClick={handleClick}
onMouseUp={handleClick}
onDoubleClick={handleDoubleClick}
className="flex flex-grow items-center h-full overflow-hidden"
style={{

18
packages/bruno-app/src/components/Sidebar/Collections/Collection/index.js
View File

@ -64,7 +64,21 @@ const Collection = ({ collection, searchText }) => {
});
const handleClick = (event) => {
dispatch(collectionClicked(collection.uid));
const _menuDropdown = menuDropdownTippyRef.current;
switch (event.button) {
case 0: // left click
dispatch(collectionClicked(collection.uid));
return;
case 2: // right click
if (_menuDropdown) {
let menuDropdownBehavior = 'show';
if (_menuDropdown.state.isShown) {
menuDropdownBehavior = 'hide';
}
_menuDropdown[menuDropdownBehavior]();
}
return;
}
};
const handleExportClick = () => {
@ -119,7 +133,7 @@ const Collection = ({ collection, searchText }) => {
<CollectionProperties collection={collection} onClose={() => setCollectionPropertiesModal(false)} />
)}
<div className="flex py-1 collection-name items-center" ref={drop}>
<div className="flex flex-grow items-center overflow-hidden" onClick={handleClick}>
<div className="flex flex-grow items-center overflow-hidden" onMouseUp={handleClick}>
<IconChevronRight
size={16}
strokeWidth={2}