Skip to content

feat: closing-functionality implemented #87

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
invisal merged 4 commits into from
Aug 1, 2023
Merged

feat: closing-functionality implemented #87

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c4082a8
#64 - closing-functionality implemented
dglalperen Aug 1, 2023
9bbf08a
removed comments and fixed issues
dglalperen Aug 1, 2023
dc39c30
last changes
dglalperen Aug 1, 2023
556c3e7
fix: select current tab when close to the right if selected tab was o…
invisal Aug 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
80 changes: 53 additions & 27 deletions src/renderer/screens/DatabaseScreen/MainView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,53 +37,79 @@ export default function MainView() {
}
};

const onTabClosed = useCallback(
(closedTab: WindowTabItem) => {
// Close current tab will select other available tab
if (closedTab.key === selectedTab) {
const closedTabIndex = tabs.findIndex(
(tab) => closedTab.key === tab.key
);

const nextTabKey =
closedTabIndex + 1 >= tabs.length
? tabs[closedTabIndex - 1].key
: tabs[closedTabIndex + 1].key;

setSelectedTab(nextTabKey);
}

setTabs((prev) => prev.filter((tab) => tab.key !== closedTab.key));
},
[setSelectedTab, setTabs, selectedTab, tabs]
);

const { handleContextMenu } = useContextMenu(
(additionalData?: WindowTabItem) => {
console.log('additional data', additionalData);

return [
{
text: 'Close',
Comment thread
invisal marked this conversation as resolved.
disabled: tabs.length === 1,
onClick: () => {
// not be implemented
if (additionalData) {
onTabClosed(additionalData);
}
},
},
{
text: 'Close Others',
disabled: tabs.length === 1,
onClick: () => {
// not be implemented
if (additionalData) {
setTabs(tabs.filter((tab) => tab.key === additionalData.key));
setSelectedTab(additionalData.key);
}
},
},
{
text: 'Close to the Right',
Comment thread
invisal marked this conversation as resolved.
disabled:
tabs.findIndex((tab) => tab.key === additionalData?.key) >=
tabs.length - 1,
onClick: () => {
// not be implemented
},
},
];
},
[]
);
if (additionalData) {
const index = tabs.findIndex(
(tab) => tab.key === additionalData.key
);

const onTabClosed = useCallback(
(closedTab: WindowTabItem) => {
// Close current tab will select other available tab
if (closedTab.key === selectedTab) {
const closedTabIndex = tabs.findIndex(
(tab) => closedTab.key === tab.key
);
const selectedIndex = tabs.findIndex(
(tab) => tab.key === selectedTab
);

const nextTabKey =
closedTabIndex + 1 >= tabs.length
? tabs[closedTabIndex - 1].key
: tabs[closedTabIndex + 1].key;

setSelectedTab(nextTabKey);
}
if (selectedIndex > index) {
setSelectedTab(additionalData.key);
}

setTabs((prev) => prev.filter((tab) => tab.key !== closedTab.key));
// if tab is found
if (index !== -1) {
const newTabs = tabs.slice(0, index + 1);
setTabs(newTabs);
}
}
},
},
];
},
[setSelectedTab, setTabs, selectedTab, tabs]
[tabs, onTabClosed, setTabs, setSelectedTab, selectedTab]
);

return (
Expand Down