Recode label picker & object picker & toggle input with text field component

source/Component/ObjectPicker/ObjectPicker.scss

@@ -1,86 +1,31 @@
 @import "../Theme/Theme.scss";
 
-$line-min-height: 26px;
+$line-min-height: 24px;
 
-div.object-picker-root {
-	width: 100%;
-	display: flex;
-	min-height: $line-min-height;
-	padding: 5px 0;
+div.object-picker {
 
-    div.input-intro {
-		width: 50%;
-		height: 100%;
-		max-width: 220px;
-        min-height: $line-min-height;
-		display: flex;
-		align-items: center;
-        padding-right: 5px;
-        box-sizing: border-box;
-	}
-
-    div.root-content {
-        width: 50%;
+    div.value-view {
+        width: 100%;
         height: 100%;
-        max-width: 180px;
         min-height: $line-min-height;
-        border-radius: 3px;
-        overflow: hidden;
         display: flex;
-        cursor: pointer;
+        align-items: center;
+        white-space: nowrap;
+        word-break: keep-all;
+        text-overflow: ellipsis;
+        overflow: hidden;
 
-        div.value-view {
-            width: 100%;
-            height: 100%;
-            min-height: $line-min-height;
-            display: flex;
-            align-items: center;
-            white-space: nowrap;
-            word-break: keep-all;
-            text-overflow: ellipsis;
-            overflow: hidden;
-
-            span {
-                display: block;
-            }
-        }
-
-        div.list-button {
-            width: $line-min-height;
-            height: $line-min-height;
-            flex-shrink: 0;
-            display: flex;
-            justify-content: center;
-            align-items: center;
+        span {
+            display: block;
         }
     }
-}
 
-div.dark.object-picker-root {
-
-	div.root-content {
-		background-color: $lt-bg-color-lvl3-dark;
-		color: $lt-font-color-normal-dark;
-	}
-
-	div.root-content:hover {
-		background-color: $lt-bg-color-lvl2-dark;
-	}
-}
-
-div.light.object-picker-root {
-
-	div.root-content {
-		background-color: $lt-bg-color-lvl3-light;
-		color: $lt-font-color-normal-light;
-	}
-
-	div.root-content:hover {
-		background-color: $lt-bg-color-lvl2-light;
-	}
-}
-
-div.combo-picker-root {
-    width: 300px;
-    height: 340px;
+    div.list-button {
+        width: $line-min-height;
+        height: $line-min-height;
+        flex-shrink: 0;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+    }
 }

source/Component/ObjectPicker/ObjectPicker.tsx

@@ -2,19 +2,17 @@ import { Component, createRef, ReactNode } from "react";
 import { Label } from "@Model/Label";
 import { Group } from "@Model/Group";
 import { Range } from "@Model/Range";
+import { TextField, ITextFieldProps } from "../TextField/TextField";
 import { useStatusWithEvent, IMixinStatusProps } from "@Context/Status";
-import { FontLevel, Theme } from "@Component/Theme/Theme";
 import { PickerList, IDisplayItem } from "../PickerList/PickerList";
-import { AllI18nKeys, Localization } from "@Component/Localization/Localization";
+import { Localization } from "@Component/Localization/Localization";
 import { Icon } from "@fluentui/react";
 import CtrlObject from "@Model/CtrlObject";
 import "./ObjectPicker.scss";
 
 type IObjectType = Label | Group | Range | CtrlObject;
 
-interface IObjectPickerProps {
-    keyI18n: AllI18nKeys;
-    infoI18n?: AllI18nKeys;
+interface IObjectPickerProps extends ITextFieldProps {
     type: Array<"L" | "G" | "R">;
     value?: IObjectType;
     valueChange?: (value: IObjectType) => any;
@@ -109,31 +107,28 @@ class ObjectPicker extends Component<IObjectPickerProps & IMixinStatusProps, IOb
         }
 
         return <>
-            <Theme className="object-picker-root" fontLevel={FontLevel.normal}>
-                <div className="input-intro">
-                    <Localization i18nKey={this.props.keyI18n}/>
+            <TextField
+                {...this.props}
+                className="object-picker"
+                keyI18n={this.props.keyI18n}
+                targetRef={this.pickerTarget}
+                onClick={() => {
+                    this.setState({
+                        isPickerVisible: true
+                    })
+                }}
+            >
+                <div className="list-button">
+                    <Icon iconName={icon}/>
                 </div>
-                <div
-                    className="root-content"
-                    ref={this.pickerTarget}
-                    onClick={() => {
-                        this.setState({
-                            isPickerVisible: true
-                        })
-                    }}
-                >
-                    <div className="list-button">
-                        <Icon iconName={icon}/>
-                    </div>
-                    <div className="value-view">
-                        {   
-                            name ? 
-                                <span>{name}</span> :
-                                <Localization i18nKey="Input.Error.Select"/>
-                        }
-                    </div>
+                <div className="value-view">
+                    {   
+                        name ? 
+                            <span>{name}</span> :
+                            <Localization i18nKey="Input.Error.Select"/>
+                    }
                 </div>
-            </Theme>
+            </TextField>
 
             {this.state.isPickerVisible ?  this.renderPicker(): null}
         </>