rage (fixed tab deletion bug)
mellobacon committed
Sep 16, 2022 at 12:32 UTC
b5833e3b55ea0bbc1203d43862a586988e39eb25
1 file changed
+17
-6
src/components/Content/Editor/Tabs.ts
+17
-6
@@ -70,21 +70,32 @@ function updateEditorVisibility() {
70
}
71
72
export function closeTab(tabid: number) {
73
- tablist.find(t => t.id === tabid).editor.$destroy();
74
- tablist = tablist.filter(t => t.id !== tabid);
73
76
- for (let i = 0; i < tablist.length - 1; i++) {
77
- if (tablist[i].id === tabid) {
78
-
74
+ /*
75
+ AHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH
76
+ if (activeid === tabid) {
77
+ for (let i = 0; i <= tablist.length - 1; i++) {
78
+ if (tablist[i].id === tabid && tablist[i + 1]) {
79
+ setActive(tablist[i + 1].id);
80
+ break;
81
+ }
82
+ else if (tablist[i].id === tabid && tablist[i - 1]) {
83
+ setActive(tablist[i - 1].id);
84
+ break;
85
+ }
86
}
87
}
81
- // TODO: Fix logic here
88
+ */
89
+
90
if (activeid >= tablist.length - 1) {
91
setActive(tabid - 1);
92
}
93
else {
94
setActive(tabid + 1);
95
}
96
+
97
+ tablist.find(t => t.id === tabid).editor.$destroy();
98
+ tablist = tablist.filter(t => t.id !== tabid);
99
tabs.set(tablist);
100
101
updateEditorVisibility();