Bladeren bron

relocate context.tsx

Yuki Takei 1 jaar geleden
bovenliggende
commit
5429facac0
2 gewijzigde bestanden met toevoegingen van 8 en 9 verwijderingen
  1. 5 5
      apps/app/src/stores-universal/context.tsx
  2. 3 4
      apps/app/src/stores-universal/use-context-swr.tsx

+ 5 - 5
apps/app/src/stores/context.tsx → apps/app/src/stores-universal/context.tsx

@@ -1,5 +1,6 @@
 import { AcceptedUploadFileType } from '@growi/core';
 import type { ColorScheme, IUserHasId } from '@growi/core';
+import { useSWRStatic } from '@growi/core/dist/swr';
 import type { SWRResponse } from 'swr';
 import useSWR from 'swr';
 import useSWRImmutable from 'swr/immutable';
@@ -10,7 +11,6 @@ import type { RendererConfig } from '~/interfaces/services/renderer';
 import type { TargetAndAncestors } from '../interfaces/page-listing-results';
 
 import { useContextSWR } from './use-context-swr';
-import { useStaticSWR } from './use-static-swr';
 
 
 type Nullable<T> = T | null;
@@ -173,7 +173,7 @@ export const useIsDefaultLogo = (initialData?: boolean): SWRResponse<boolean, Er
 };
 
 export const useIsCustomizedLogoUploaded = (initialData?: boolean): SWRResponse<boolean, Error> => {
-  return useStaticSWR('isCustomizedLogoUploaded', initialData);
+  return useSWRStatic('isCustomizedLogoUploaded', initialData);
 };
 
 export const useForcedColorScheme = (initialData?: ColorScheme): SWRResponse<ColorScheme, Error> => {
@@ -181,15 +181,15 @@ export const useForcedColorScheme = (initialData?: ColorScheme): SWRResponse<Col
 };
 
 export const useGrowiCloudUri = (initialData?: string): SWRResponse<string, Error> => {
-  return useStaticSWR('growiCloudUri', initialData);
+  return useContextSWR('growiCloudUri', initialData);
 };
 
 export const useGrowiAppIdForGrowiCloud = (initialData?: number): SWRResponse<number, Error> => {
-  return useStaticSWR('growiAppIdForGrowiCloud', initialData);
+  return useContextSWR('growiAppIdForGrowiCloud', initialData);
 };
 
 export const useIsContainerFluid = (initialData?: boolean): SWRResponse<boolean, Error> => {
-  return useStaticSWR('isContainerFluid', initialData);
+  return useContextSWR('isContainerFluid', initialData);
 };
 
 /** **********************************************************

+ 3 - 4
apps/app/src/stores/use-context-swr.tsx → apps/app/src/stores-universal/use-context-swr.tsx

@@ -1,11 +1,10 @@
 import assert from 'assert';
 
-import {
+import { useSWRStatic } from '@growi/core/dist/swr';
+import type {
   Key, SWRConfiguration, SWRResponse,
 } from 'swr';
 
-import { useStaticSWR } from './use-static-swr';
-
 
 export function useContextSWR<Data, Error>(key: Key): SWRResponse<Data, Error>;
 export function useContextSWR<Data, Error>(key: Key, data: Data | undefined): SWRResponse<Data, Error>;
@@ -21,7 +20,7 @@ export function useContextSWR<Data, Error>(
 
   assert.notStrictEqual(configuration?.fetcher, null, 'useContextSWR does not support \'configuration.fetcher\'');
 
-  const swrResponse = useStaticSWR(key, data, configuration);
+  const swrResponse = useSWRStatic(key, data, configuration);
 
   // overwrite mutate
   const result = Object.assign(swrResponse, { mutate: () => { throw Error('mutate can not be used in context') } });