chore: add remaining props to plugin settings extensions (#312)

add lang and theme to plugin extensions
reearth · Sep 7, 2022 · 893d32f · 893d32f
1 parent 3574f06
commit 893d32f
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/src/components/molecules/Settings/Project/Plugin/PluginSection/index.tsx b/src/components/molecules/Settings/Project/Plugin/PluginSection/index.tsx
@@ -26,6 +26,8 @@ export type Props = {
     library: Extension<"plugin-library">[] | undefined;
     installed: Extension<"plugin-installed">[] | undefined;
   };
+  currentTheme?: "light" | "dark";
+  currentLang?: string;
   accessToken?: string;
   onInstallByMarketplace: (pluginId: string) => void;
   onInstallFromPublicRepo: (repoUrl: string) => void;
@@ -48,6 +50,8 @@ const PluginSection: React.FC<Props> = ({
   marketplacePluginIds,
   personalPlugins,
   extensions,
+  currentTheme,
+  currentLang,
   accessToken,
   onInstallByMarketplace,
   onInstallByUploadingZipFile,
@@ -81,6 +85,8 @@ const PluginSection: React.FC<Props> = ({
                   <ext.component
                     key={ext.id}
                     selectedPluginId={queriedPluginId}
+                    theme={currentTheme}
+                    lang={currentLang}
                     accessToken={accessToken}
                     onInstall={onInstallByMarketplace}
                     onUninstall={uninstallPlugin}
@@ -95,6 +101,8 @@ const PluginSection: React.FC<Props> = ({
                   <ext.component
                     key={ext.id}
                     installedPlugins={marketplacePluginIds}
+                    theme={currentTheme}
+                    lang={currentLang}
                     accessToken={accessToken}
                     onInstall={onInstallByMarketplace}
                     onUninstall={uninstallPlugin}

diff --git a/src/components/organisms/Settings/Project/Plugin/hooks.ts b/src/components/organisms/Settings/Project/Plugin/hooks.ts
@@ -10,13 +10,13 @@ import {
   useUploadPluginMutation,
 } from "@reearth/gql/graphql-client-api";
 import { useLang, useT } from "@reearth/i18n";
-import { useTeam, useProject, useNotification } from "@reearth/state";
+import { useProject, useNotification, useCurrentTheme } from "@reearth/state";
 
 export default (projectId: string) => {
   const t = useT();
   const locale = useLang();
+  const [currentTheme] = useCurrentTheme();
   const client = useApolloClient();
-  const [currentTeam] = useTeam();
   const [currentProject] = useProject();
   const [, setNotification] = useNotification();
   const { getAccessToken } = useAuth();
@@ -175,8 +175,9 @@ export default (projectId: string) => {
 
   const loading = sceneLoading;
   return {
-    currentTeam,
     currentProject,
+    currentTheme,
+    currentLang: locale,
     loading,
     marketplacePluginIds,
     personalPlugins,

diff --git a/src/components/organisms/Settings/Project/Plugin/index.tsx b/src/components/organisms/Settings/Project/Plugin/index.tsx
@@ -18,9 +18,11 @@ const Plugin: React.FC<Props> = ({ projectId }) => {
   const t = useT();
   const {
     currentProject,
+    currentTheme,
+    currentLang,
+    loading,
     marketplacePluginIds,
     personalPlugins,
-    loading,
     extensions,
     accessToken,
     handleInstallByMarketplace,
@@ -38,6 +40,8 @@ const Plugin: React.FC<Props> = ({ projectId }) => {
           marketplacePluginIds={marketplacePluginIds}
           personalPlugins={personalPlugins}
           extensions={extensions}
+          currentTheme={currentTheme}
+          currentLang={currentLang}
           accessToken={accessToken}
           onInstallByMarketplace={handleInstallByMarketplace}
           onInstallByUploadingZipFile={handleInstallByUploadingZipFile}