From cbba5d3c176d6d9eb171974aee95558cdb0ff648 Mon Sep 17 00:00:00 2001 From: JimmFly <447268514@qq.com> Date: Mon, 15 Apr 2024 07:39:03 +0000 Subject: [PATCH] fix(core): the page flashes when click the share button (#6557) close TOV-706 --- .../core/src/hooks/affine/use-server-config.ts | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/packages/frontend/core/src/hooks/affine/use-server-config.ts b/packages/frontend/core/src/hooks/affine/use-server-config.ts index 6203b2756e..1418894145 100644 --- a/packages/frontend/core/src/hooks/affine/use-server-config.ts +++ b/packages/frontend/core/src/hooks/affine/use-server-config.ts @@ -1,5 +1,9 @@ import type { ServerConfigQuery, ServerFeature } from '@affine/graphql'; -import { oauthProvidersQuery, serverConfigQuery } from '@affine/graphql'; +import { + getBaseUrl, + oauthProvidersQuery, + serverConfigQuery, +} from '@affine/graphql'; import type { BareFetcher, Middleware } from 'swr'; import { useQueryImmutable } from '../use-query'; @@ -60,9 +64,9 @@ export const useOAuthProviders = () => { }; export const useServerBaseUrl = () => { - const config = useServerConfig(); + const baseUrl = getBaseUrl(); - if (!config) { + if (!baseUrl) { if (environment.isDesktop) { // don't use window.location in electron return null; @@ -71,7 +75,7 @@ export const useServerBaseUrl = () => { return `${protocol}//${hostname}${port ? `:${port}` : ''}`; } - return config.baseUrl; + return baseUrl; }; export const useCredentialsRequirement = () => {