Skip to content
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.

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

feat: migrate theme popover to v9 #3442

Merged
merged 9 commits into from
Dec 11, 2024
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { lazy } from 'react';

export const popups = new Map<string, any>([
['share-query', lazy(() => import('../../../query-runner/query-input/share-query/ShareQuery'))],
['theme-chooser', lazy(() => import('../../../main-header/settings/ThemeChooser'))],
['theme-chooser', lazy(() => import('../../../main-header/settings/ThemeChooserV9'))],
['preview-collection', lazy(() => import('../../../sidebar/resource-explorer/collection/PreviewCollection'))],
['full-permissions', lazy(() => import('../../../query-runner/request/permissions/Permissions.Full'))]
]);
Expand Down
3 changes: 2 additions & 1 deletion src/app/views/main-header/settings/SettingsV9.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ const SettingsV9 = ()=>{
const toggleThemeChooserDialogState = () => {
showThemeChooser({
settings: {
title: translateMessage('Change theme')
title: translateMessage('Change theme'),
width: 'xl'
}
});
telemetry.trackEvent(eventTypes.BUTTON_CLICK_EVENT, {
Expand Down
116 changes: 116 additions & 0 deletions src/app/views/main-header/settings/ThemeChooserV9.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,116 @@
import React, { useEffect } from 'react';
import { makeStyles, RadioGroup, Radio} from '@fluentui/react-components';
import { useAppDispatch, useAppSelector } from '../../../../store';
import { componentNames, eventTypes, telemetry } from '../../../../telemetry';
import { PopupsComponent } from '../../../services/context/popups-context';
import { changeTheme } from '../../../services/slices/theme.slice';
import { loadGETheme } from '../../../../themes';
import { translateMessage } from '../../../utils/translate-messages';
import { BrightnessHighRegular, WeatherMoonFilled, CircleHalfFillFilled } from '@fluentui/react-icons';

const availableThemes = [
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since you've added system theme support, make it an option and probably the default selected.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's the default selected ln70-75

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I meant on the popup
image

{
key: 'light',
displayName: 'Web Light',
icon: <BrightnessHighRegular />
},
{
key: 'dark',
displayName: 'Web Dark',
icon: <WeatherMoonFilled />
},
{
key: 'high-contrast',
displayName: 'Teams High Contrast',
icon: <CircleHalfFillFilled />
}
];

const useIconOptionStyles = makeStyles({
root: {
display: 'flex',
alignItems: 'center'
},
icon: {
fontSize: '30px'
},
radio: {
'&:checked ~ .fui-Radio__indicator::after': {
borderRadius: '50%'
}
}

});

const useLabelStyles = makeStyles({
root: {
display: 'flex',
textAlign: 'center'
},
container: {
display: 'block',
alignItems: 'center',
justifyContent: 'center'
}
});

const getSystemTheme = (): string => {
if (window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches) {
return 'dark';
}
return 'light';
};

const ThemeChooserV9: React.FC<PopupsComponent<null>> = () => {
const dispatch = useAppDispatch();
const appTheme = useAppSelector(state=> state.theme);
const iconOptionStyles = useIconOptionStyles();
const labelStyles = useLabelStyles();

useEffect(() => {
// Load the theme from local storage or use the system theme as the default
const savedTheme = localStorage.getItem('appTheme') ?? getSystemTheme();
dispatch(changeTheme(savedTheme));
loadGETheme(savedTheme); // Remove when cleaning up
}, [dispatch]);


const handleChangeTheme = (selectedTheme: { key: string; displayName: string; icon: JSX.Element }) => {
const newTheme: string = selectedTheme.key;
// Save the selected theme to local storage
localStorage.setItem('appTheme', newTheme);
// Applies the theme to the Fluent UI components
dispatch(changeTheme(newTheme));
loadGETheme(newTheme); //Remove when cleaning up
telemetry.trackEvent(eventTypes.BUTTON_CLICK_EVENT, {
ComponentName: componentNames.SELECT_THEME_BUTTON,
SelectedTheme: newTheme.replace('-', ' ').toSentenceCase()
});
};
return (
<RadioGroup layout="horizontal" aria-labelledby='theme-chooser'
value={availableThemes.find(theme => theme.key === appTheme)?.displayName}
>
{availableThemes.map((theme) => (
<div key={theme.key} className={iconOptionStyles.root}>
<Radio
value={theme.key}
checked={appTheme === theme.key}
className={iconOptionStyles.radio}
label={{
className: labelStyles.root,
children: (
<div className={labelStyles.container}>
<span className={iconOptionStyles.icon}>{theme.icon}</span> {translateMessage(theme.displayName)}
</div>
)
}}
onClick={() => handleChangeTheme(theme)}>
</Radio>
</div>
))}
</RadioGroup>
);
}

export default ThemeChooserV9
Loading