Skip to content

Commit 6777220

Browse files
committed
bug fix
1 parent 8eefa46 commit 6777220

File tree

5 files changed

+6
-20
lines changed

5 files changed

+6
-20
lines changed

src/renderer/App.tsx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,11 @@ import { Input,
2020
Container,
2121
Spacer
2222
} from '@chakra-ui/react';
23-
import { useEffect,useState, useCon } from 'react';
23+
2424
import { MemoryRouter as Router, Routes, Route } from 'react-router-dom';
25-
import icon from '../../assets/icon.svg';
2625
import './App.css';
27-
import BrowserCollapse from './components/BrowserCollapse';
2826
import List from './components/List';
2927
import Searchbar from './components/Searchbar';
30-
import Webview from './components/Webview';
3128
import {SearchContextProvider } from './context/SearchContext';
3229
import { TabContextProvider } from './context/TabContext';
3330

src/renderer/components/BrowserCollapse.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ const BrowserCollapse = ({ name, tabUrl, tabId, onOpen, index }) => {
6060
return (
6161
<AccordionItem border="none" >
6262
<h2>
63-
<AccordionButton _expanded={{ bg: '#03c9d7', color: 'white' }} onClick={()=> onOpen(index)} >
63+
<AccordionButton _expanded={{ bg: '#03c9d7', color: 'white' }} onClick={(e)=> {onOpen(e,index)}} >
6464
<IconButton
6565
backgroundColor="#32363e"
6666
_hover={{ bg: '#32363e' }}

src/renderer/components/List.tsx

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,13 @@ const List = () => {
1313
setTabIndex
1414
} = useContext(TabContext);
1515

16-
const onOpen = (index) => {
17-
16+
const onOpen = (e,index) => {
17+
e.preventDefault();
1818
if(currentTabIndex == index) {
1919
setTabIndex(null)
2020
}else{
2121
setTabIndex(index)
2222
}
23-
24-
console.log(tabs);
2523
}
2624

2725

src/renderer/components/Searchbar.tsx

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,20 +22,16 @@ const Searchbar = ({}) => {
2222

2323
const onClose = () => setModal(!isModalOpen);
2424

25-
const { url, setUrl, keyword, setKeyword, onChange, search, searchEngine } =
25+
const { url, setUrl, keyword, setKeyword,tabs,closeTab, onChange, search, searchEngine } =
2626
useContext(SearchContext);
2727

28-
const { nexTab,setTabIndex } = useContext(TabContext);
28+
const { nexTab,setTabIndex,currentTabIndex } = useContext(TabContext);
2929

3030
const handleSetSearchEngineShortcut = useCallback((event) => {
3131
if (event.ctrlKey && (event.key === 'E' || event.key === 'e')) {
3232
onClose();
3333
}
34-
3534
nexTab(event);
36-
37-
38-
3935
});
4036

4137
useEffect(() => {

src/renderer/context/TabContext.tsx

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,6 @@ export const TabContextProvider = (props) => {
2222
setTabIndex(Number(event.key) - 1);
2323

2424
}
25-
26-
if (event.altKey && (event.key === 'X' || event.key === 'x')) {
27-
console.log('tab id', tabs);
28-
//closeTab(tabs)
29-
}
3025
};
3126

3227
return (

0 commit comments

Comments
 (0)