Skip to content

Theme loading related fixes #6326

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
merged 1 commit into from
Sep 2, 2025
Merged

Theme loading related fixes #6326

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
40 changes: 22 additions & 18 deletions libs/remix-ui/top-bar/src/lib/remix-ui-topbar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,27 @@ export function RemixUiTopbar () {
}
}, [global.fs.browser.workspaces, global.fs.browser.workspaces.length])

useEffect(() => {
plugin.on('theme', 'themeChanged', (theme) => {
setCurrentTheme(theme)
})
return () => {
plugin.off('theme', 'themeChanged')
}
}, [])

useEffect(() => {
async function loadCurrentTheme() {
try {
const ct = await plugin.call('theme', 'currentTheme')
setCurrentTheme(ct)
} catch (error) {
console.error("Error fetching current theme:", error)
}
}
loadCurrentTheme()
}, []);

const subItems = useMemo(() => {
return [
{ label: 'Rename', onClick: renameCurrentWorkspace, icon: 'far fa-edit' },
Expand Down Expand Up @@ -284,20 +305,6 @@ export function RemixUiTopbar () {
)
}

const getCurrentTheme = async () => {
const theme = await plugin.call('theme', 'currentTheme')
return theme
}

useEffect(() => {
plugin.on('theme', 'themeChanged', (theme) => {
setCurrentTheme(theme)
})
return () => {
plugin.off('theme', 'themeChanged')
}
}, [])

const renameModalMessage = (workspaceName?: string) => {
return (
<div className='d-flex flex-column'>
Expand Down Expand Up @@ -332,8 +339,7 @@ export function RemixUiTopbar () {
)
}

const checkIfLightTheme = (themeName: string) =>
themeName.includes('dark') || themeName.includes('black') || themeName.includes('hackerOwl') ? false : true
const checkIfLightTheme = (themeName: string) => themeName.includes('dark') ? false : true

const IsGitRepoDropDownMenuItem = (props: { isGitRepo: boolean, mName: string}) => {
return (
Expand Down Expand Up @@ -536,8 +542,6 @@ export function RemixUiTopbar () {
fontSize: '0.8rem'
}}
onClick={async () => {
const theme = await getCurrentTheme()
setCurrentTheme(theme)
setShowTheme(!showTheme)
}}
>
Expand Down