From 6881d2449e9b0fa52c7d16af52091bf2f2620b4d Mon Sep 17 00:00:00 2001
From: hexxa <hexxa@outlook.com>
Date: Sat, 27 Nov 2021 10:59:29 +0800
Subject: [PATCH] fix(components): refine tabs component

---
 .../web/src/components/control/tabs.tsx       | 20 ++---
 src/client/web/src/components/root_frame.tsx  | 77 +++++++++++++++----
 .../visual/{colors.tsx => colors.ts}          |  2 +-
 3 files changed, 71 insertions(+), 28 deletions(-)
 rename src/client/web/src/components/visual/{colors.tsx => colors.ts} (93%)

diff --git a/src/client/web/src/components/control/tabs.tsx b/src/client/web/src/components/control/tabs.tsx
index 1abe089..87b8be8 100644
--- a/src/client/web/src/components/control/tabs.tsx
+++ b/src/client/web/src/components/control/tabs.tsx
@@ -18,7 +18,7 @@ const defaultIconProps: IconProps = {
 };
 
 export interface Props {
-  targetSwitch: string;
+  targetControl: string;
   tabIcons: Map<string, IconProps>; // option name -> icon name
   login: LoginProps;
   admin: AdminProps;
@@ -33,18 +33,18 @@ export class Tabs extends React.Component<Props, State, {}> {
     super(p);
   }
 
-  setTab = (targetSwitch: string, targetOption: string) => {
-    if (!updater().setControlOption(targetSwitch, targetOption)) {
+  setTab = (targetControl: string, targetOption: string) => {
+    if (!updater().setControlOption(targetControl, targetOption)) {
       alertMsg(this.props.msg.pkg.get("op.fail"));
     }
   };
 
   render() {
     const displaying = this.props.ui.control.controls.get(
-      this.props.targetSwitch
+      this.props.targetControl
     );
-    const options = this.props.ui.control.options.get(this.props.targetSwitch);
-    const tabs = options.map((option: string, targetSwitch: string) => {
+    const options = this.props.ui.control.options.get(this.props.targetControl);
+    const tabs = options.map((option: string, targetControl: string) => {
       const iconProps = this.props.tabIcons.has(option)
         ? this.props.tabIcons.get(option)
         : defaultIconProps;
@@ -54,9 +54,9 @@ export class Tabs extends React.Component<Props, State, {}> {
 
       return (
         <button
-          key={`${targetSwitch}-${option}`}
+          key={`${targetControl}-${option}`}
           onClick={() => {
-            this.setTab(targetSwitch, option);
+            this.setTab(targetControl, option);
           }}
           className="float"
         >
@@ -64,7 +64,7 @@ export class Tabs extends React.Component<Props, State, {}> {
             children={List([
               <span className="margin-r-s">{icon}</span>,
               <span>
-                {this.props.msg.pkg.get(`switch.${targetSwitch}.${option}`)}
+                {this.props.msg.pkg.get(`switch.${targetControl}.${option}`)}
               </span>,
             ])}
             childrenStyles={List([{ flex: "30%" }, { flex: "70%" }])}
@@ -74,7 +74,7 @@ export class Tabs extends React.Component<Props, State, {}> {
     });
 
     return (
-      <div className={`tabs control-${this.props.targetSwitch}`}>{tabs}</div>
+      <div className={`tabs control-${this.props.targetControl}`}>{tabs}</div>
     );
   }
 }
diff --git a/src/client/web/src/components/root_frame.tsx b/src/client/web/src/components/root_frame.tsx
index 1f19421..bbc8572 100644
--- a/src/client/web/src/components/root_frame.tsx
+++ b/src/client/web/src/components/root_frame.tsx
@@ -1,16 +1,20 @@
 import * as React from "react";
+import { Map } from "immutable";
 
 import { ICoreState, MsgProps, UIProps } from "./core_state";
 import { FilesPanel, FilesProps } from "./panel_files";
 import { UploadingsPanel, UploadingsProps } from "./panel_uploadings";
 import { SharingsPanel, SharingsProps } from "./panel_sharings";
+import { IconProps } from "./visual/icons";
 
+import { Tabs } from "./control/tabs";
 import { LoginProps } from "./pane_login";
 import { Panes, PanesProps } from "./panes";
 import { AdminProps } from "./pane_admin";
 import { TopBar } from "./topbar";
 import { roleVisitor } from "../client";
 
+const controlName = "panel-tabs";
 export interface Props {
   filesInfo: FilesProps;
   uploadingsInfo: UploadingsProps;
@@ -54,6 +58,11 @@ export class RootFrame extends React.Component<Props, State, {}> {
         ? "hidden"
         : "";
 
+    const displaying = this.props.ui.control.controls.get(controlName);
+    const filesPanelClass = displaying === "files" ? "" : "none";
+    const uploadingsPanelClass = displaying === "uploadings" ? "" : "none";
+    const sharingsPanelClass = displaying === "sharings" ? "" : "none";
+
     return (
       <div id="root-frame" className={`${theme} ${fontSizeClass}`}>
         <div id="bg" style={bgStyle}>
@@ -81,27 +90,61 @@ export class RootFrame extends React.Component<Props, State, {}> {
               ui={this.props.ui}
               update={this.props.update}
             /> */}
-            <FilesPanel
-              filesInfo={this.props.filesInfo}
-              msg={this.props.msg}
+
+            <Tabs
+              targetControl={controlName}
+              tabIcons={Map<string, IconProps>({
+                filesPanel: {
+                  name: "RiFolder2Fill",
+                  size: "1.6rem",
+                  color: "cyan0",
+                },
+                uploadingsPanel: {
+                  name: "RiFolder2Fill",
+                  size: "1.6rem",
+                  color: "cyan0",
+                },
+                sharingsPanel: {
+                  name: "RiFolder2Fill",
+                  size: "1.6rem",
+                  color: "cyan0",
+                },
+              })}
               login={this.props.login}
+              admin={this.props.admin}
               ui={this.props.ui}
-              update={this.props.update}
-            />
-            <UploadingsPanel
-              uploadingsInfo={this.props.uploadingsInfo}
               msg={this.props.msg}
-              login={this.props.login}
-              ui={this.props.ui}
-              update={this.props.update}
-            />
-            <SharingsPanel
-              sharingsInfo={this.props.sharingsInfo}
-              msg={this.props.msg}
-              login={this.props.login}
-              ui={this.props.ui}
-              update={this.props.update}
             />
+
+            <span className={filesPanelClass}>
+              <FilesPanel
+                filesInfo={this.props.filesInfo}
+                msg={this.props.msg}
+                login={this.props.login}
+                ui={this.props.ui}
+                update={this.props.update}
+              />
+            </span>
+
+            <span className={uploadingsPanelClass}>
+              <UploadingsPanel
+                uploadingsInfo={this.props.uploadingsInfo}
+                msg={this.props.msg}
+                login={this.props.login}
+                ui={this.props.ui}
+                update={this.props.update}
+              />
+            </span>
+
+            <span className={sharingsPanelClass}>
+              <SharingsPanel
+                sharingsInfo={this.props.sharingsInfo}
+                msg={this.props.msg}
+                login={this.props.login}
+                ui={this.props.ui}
+                update={this.props.update}
+              />
+            </span>
           </div>
 
           <div id="tail" className="container-center">
diff --git a/src/client/web/src/components/visual/colors.tsx b/src/client/web/src/components/visual/colors.ts
similarity index 93%
rename from src/client/web/src/components/visual/colors.tsx
rename to src/client/web/src/components/visual/colors.ts
index 164818b..0b8013d 100644
--- a/src/client/web/src/components/visual/colors.tsx
+++ b/src/client/web/src/components/visual/colors.ts
@@ -1,4 +1,4 @@
-import { Set, Map } from "immutable";
+import { Set } from "immutable";
 
 export const colors = Set<string>([
   "blue0",