fix remove tab bug

This commit is contained in:
PhilReact 2024-11-11 14:48:50 +02:00
parent 79543644a0
commit 4d561b050b
4 changed files with 10 additions and 8 deletions

View File

@ -259,6 +259,7 @@ export const AppsDesktop = ({ mode, setMode, show , myName, goToHome, setDesktop
} else { } else {
setSelectedTab(copyTabs[0]); setSelectedTab(copyTabs[0]);
} }
console.log('copyTabs', copyTabs)
setTabs(copyTabs); setTabs(copyTabs);
setSelectedTab(copyTabs[0]); setSelectedTab(copyTabs[0]);
setTimeout(() => { setTimeout(() => {

View File

@ -131,10 +131,10 @@ export const AppsDevMode = ({ mode, setMode, show , myName, goToHome, setDesktop
useEffect(() => { useEffect(() => {
subscribeToEvent("setSelectedTab", setSelectedTabFunc); subscribeToEvent("setSelectedTabDevMode", setSelectedTabFunc);
return () => { return () => {
unsubscribeFromEvent("setSelectedTab", setSelectedTabFunc); unsubscribeFromEvent("setSelectedTabDevMode", setSelectedTabFunc);
}; };
}, [tabs, isNewTabWindow]); }, [tabs, isNewTabWindow]);
@ -149,7 +149,7 @@ export const AppsDevMode = ({ mode, setMode, show , myName, goToHome, setDesktop
setTabs(copyTabs); setTabs(copyTabs);
setSelectedTab(copyTabs[0]); setSelectedTab(copyTabs[0]);
setTimeout(() => { setTimeout(() => {
executeEvent("setTabsToNav", { executeEvent("appsDevModeSetTabsToNav", {
data: { data: {
tabs: copyTabs, tabs: copyTabs,
selectedTab: copyTabs[0], selectedTab: copyTabs[0],
@ -159,10 +159,10 @@ export const AppsDevMode = ({ mode, setMode, show , myName, goToHome, setDesktop
}; };
useEffect(() => { useEffect(() => {
subscribeToEvent("removeTab", removeTabFunc); subscribeToEvent("removeTabDevMode", removeTabFunc);
return () => { return () => {
unsubscribeFromEvent("removeTab", removeTabFunc); unsubscribeFromEvent("removeTabDevMode", removeTabFunc);
}; };
}, [tabs]); }, [tabs]);

View File

@ -10,12 +10,12 @@ export const AppsDevModeTabComponent = ({isSelected, app}) => {
return ( return (
<ButtonBase onClick={()=> { <ButtonBase onClick={()=> {
if(isSelected){ if(isSelected){
executeEvent('removeTab', { executeEvent('removeTabDevMode', {
data: app data: app
}) })
return return
} }
executeEvent('setSelectedTab', { executeEvent('setSelectedTabDevMode', {
data: app, data: app,
isDevMode: true isDevMode: true
}) })

View File

@ -117,7 +117,6 @@ export const AppsNavBarDesktop = () => {
const setTabsToNav = (e) => { const setTabsToNav = (e) => {
const { tabs, selectedTab, isNewTabWindow } = e.detail?.data; const { tabs, selectedTab, isNewTabWindow } = e.detail?.data;
setTabs([...tabs]); setTabs([...tabs]);
setSelectedTab(!selectedTab ? null : { ...selectedTab }); setSelectedTab(!selectedTab ? null : { ...selectedTab });
setIsNewTabWindow(isNewTabWindow); setIsNewTabWindow(isNewTabWindow);
@ -137,6 +136,8 @@ export const AppsNavBarDesktop = () => {
(item) => (item) =>
item?.name === selectedTab?.name && item?.service === selectedTab?.service item?.name === selectedTab?.name && item?.service === selectedTab?.service
); );
console.log('tabs', tabs)
return ( return (
<AppsNavBarParent <AppsNavBarParent
sx={{ sx={{