Editor: get color scheme

This commit is contained in:
Viktor Fomin 2023-04-25 20:49:09 +03:00
parent 887d985ec4
commit 14fcd1d739
3 changed files with 19 additions and 4 deletions

View File

@ -24,11 +24,18 @@ import PresentationIcoUrl from "PUBLIC_DIR/images/presentation.ico";
import SpreadSheetIcoUrl from "PUBLIC_DIR/images/spreadsheet.ico";
import TextIcoUrl from "PUBLIC_DIR/images/text.ico";
const App = ({ initialLanguage, initialI18nStoreASC, setTheme, ...rest }) => {
const App = ({
initialLanguage,
initialI18nStoreASC,
setTheme,
getAppearanceTheme,
currentColorScheme,
...rest
}) => {
const [isInitialized, isErrorLoading] = useMfScripts();
useSSR(initialI18nStoreASC, initialLanguage);
//console.log(rest);
console.log(rest);
useEffect(() => {
let icon = "";
@ -80,6 +87,8 @@ const App = ({ initialLanguage, initialI18nStoreASC, setTheme, ...rest }) => {
if (isRetina() && getCookie("is_retina") == null) {
setCookie("is_retina", true, { path: "/" });
}
getAppearanceTheme();
}, []);
const onError = () => {
@ -100,6 +109,7 @@ const App = ({ initialLanguage, initialI18nStoreASC, setTheme, ...rest }) => {
mfFailed={isErrorLoading}
isDesktopEditor={isDesktopEditor}
initDesktop={initDesktop}
currentColorScheme={currentColorScheme}
{...rest}
/>
</ErrorBoundary>
@ -108,9 +118,11 @@ const App = ({ initialLanguage, initialI18nStoreASC, setTheme, ...rest }) => {
const AppWrapper = inject(({ auth }) => {
const { settingsStore } = auth;
const { setTheme } = settingsStore;
const { setTheme, getAppearanceTheme, currentColorScheme } = settingsStore;
return {
setTheme,
getAppearanceTheme,
currentColorScheme,
};
})(observer(App));

View File

@ -22,6 +22,7 @@ const DeepLink = ({
userEmail,
setIsShowDeepLink,
userTheme,
currentColorScheme,
}) => {
const { t } = useTranslation(["DeepLink", "Common"]);
@ -97,7 +98,7 @@ const DeepLink = ({
fontSize="13px"
fontWeight="600"
isHovered
color="#316DAA"
color={currentColorScheme?.main?.accent}
onClick={onStayBrowserClick}
>
{t("StayInBrowser")}

View File

@ -99,6 +99,7 @@ function Editor({
url,
filesSettings,
logoUrls,
currentColorScheme,
}) {
const [isShowDeepLink, setIsShowDeepLink] = useState(false);
@ -773,6 +774,7 @@ function Editor({
userEmail={user.email}
setIsShowDeepLink={setIsShowDeepLink}
userTheme={user.theme}
currentColorScheme={currentColorScheme}
/>
);