MrKBear/living-together
2
2
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add group details gen & recode input with text field component #22

Merged
MrKBear merged 8 commits from dev-mrkbear into master 2022-03-16 12:50:40 +08:00
Conversation 0 Commits 8 Files Changed 23 +81 -222
4 changed files with 81 additions and 222 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 0e79c09691 - Show all commits

99
source/Component/ColorInput/ColorInput.scss
View File

@ -1,89 +1,32 @@
@import "../Theme/Theme.scss";
$line-min-height: 24px;
$line-min-height: 26px;
div.color-input {
div.color-input-root {
width: 100%;
display: flex;
min-height: $line-min-height;
padding: 5px 0;
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%;
height: 100%;
max-width: 180px;
min-height: $line-min-height;
border-radius: 3px;
overflow: hidden;
div.color-view {
width: $line-min-height;
max-width: $line-min-height;
display: flex;
justify-content: center;
align-items: center;
div.color-view {
width: $line-min-height;
max-width: $line-min-height;
display: flex;
justify-content: center;
align-items: center;
div.color-box {
width: 12px;
height: 12px;
border-radius: 3px;
}
}
div.value-view {
width: 100%;
height: 100%;
min-height: $line-min-height;
display: flex;
align-items: center;
div.text-box {
padding-left: 1px;
}
}
div.error-box {
display: flex;
align-items: center;
padding-left: 8px;
div.color-box {
width: 12px;
height: 12px;
border-radius: 3px;
}
}
}
div.dark.color-input-root {
div.value-view {
width: 100%;
height: 100%;
min-height: $line-min-height;
display: flex;
align-items: center;
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.color-input-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.text-box {
padding-left: 1px;
}
}
}
div.color-picker-root {

55
source/Component/ColorInput/ColorInput.tsx
View File

@ -1,16 +1,11 @@
import { Component, createRef, ReactNode } from "react";
import { FontLevel, Theme } from "@Component/Theme/Theme";
import { TextField, ITextFieldProps } from "@Component/TextField/TextField";
import { Callout, ColorPicker, DirectionalHint } from "@fluentui/react";
import { AllI18nKeys, Localization } from "@Component/Localization/Localization";
import "./ColorInput.scss";
interface IColorInputProps {
keyI18n: AllI18nKeys;
infoI18n?: AllI18nKeys;
interface IColorInputProps extends ITextFieldProps {
value?: number[];
normal?: boolean;
disable?: boolean;
disableI18n?: AllI18nKeys;
valueChange?: (color: number[]) => any;
}
@ -65,16 +60,6 @@ class ColorInput extends Component<IColorInputProps, IColorInputState> {
</Callout>
}
private renderErrorInput() {
return <div className="error-box">
{
this.props.disableI18n ?
<Localization i18nKey={this.props.disableI18n}/> :
<span>{this.props.value}</span>
}
</div>;
}
private renderColorInput() {
return <>
<div className="color-view">
@ -104,29 +89,21 @@ class ColorInput extends Component<IColorInputProps, IColorInputState> {
public render(): ReactNode {
return <>
<Theme className="color-input-root" fontLevel={FontLevel.normal}>
<div className="input-intro">
<Localization i18nKey={this.props.keyI18n}/>
</div>
<div
className="root-content"
ref={this.pickerTarget}
style={{
cursor: this.props.disable ? "not-allowed" : "pointer"
}}
onClick={() => {
this.setState({
isPickerVisible: !this.props.disable
})
}}
>
{ this.props.disable ? null : this.renderColorInput() }
{ this.props.disable ? this.renderErrorInput() : null }
</div>
</Theme>
<TextField
{...this.props}
className="color-input"
keyI18n={this.props.keyI18n}
targetRef={this.pickerTarget}
onClick={() => {
this.setState({
isPickerVisible: !this.props.disableI18n
})
}}
>
{ this.renderColorInput() }
</TextField>
{this.state.isPickerVisible ? this.renderPicker(): null}
</>
</>;
}
}

97
source/Component/ComboInput/ComboInput.scss
View File

@ -1,87 +1,32 @@
@import "../Theme/Theme.scss";
$line-min-height: 26px;
$line-min-height: 24px;
div.combo-input-root {
width: 100%;
display: flex;
min-height: $line-min-height;
padding: 5px 0;
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.combo-input {
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;
padding-left: 8px;
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;
padding-left: 8px;
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.combo-input-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.combo-input-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;
}
}

52
source/Component/ComboInput/ComboInput.tsx
View File

@ -1,13 +1,10 @@
import { Component, createRef, ReactNode } from "react";
import { FontLevel, Theme } from "@Component/Theme/Theme";
import { PickerList, IDisplayItem } from "../PickerList/PickerList";
import { AllI18nKeys, Localization } from "@Component/Localization/Localization";
import { TextField, ITextFieldProps } from "../TextField/TextField";
import { Icon } from "@fluentui/react";
import { Localization } from "@Component/Localization/Localization";
import "./ComboInput.scss";
interface IComboInputProps {
keyI18n: AllI18nKeys;
infoI18n?: AllI18nKeys;
interface IComboInputProps extends ITextFieldProps {
allOption?: IDisplayItem[];
value?: IDisplayItem;
valueChange?: (value: IDisplayItem) => any;
@ -53,31 +50,28 @@ class ComboInput extends Component<IComboInputProps, IComboInputState> {
public render(): ReactNode {
return <>
<Theme className="combo-input-root" fontLevel={FontLevel.normal}>
<div className="input-intro">
<Localization i18nKey={this.props.keyI18n}/>
<TextField
{...this.props}
targetRef={this.pickerTarget}
className="combo-input"
keyI18n={this.props.keyI18n}
onClick={() => {
this.setState({
isPickerVisible: true
})
}}
>
<div className="value-view">
{
this.props.value ?
<Localization i18nKey={this.props.value.nameKey}/> :
null
}
</div>
<div
className="root-content"
ref={this.pickerTarget}
onClick={() => {
this.setState({
isPickerVisible: true
})
}}
>
<div className="value-view">
{
this.props.value ?
<Localization i18nKey={this.props.value.nameKey}/> :
null
}
</div>
<div className="list-button">
<Icon iconName="ChevronDownMed"/>
</div>
<div className="list-button">
<Icon iconName="ChevronDownMed"/>
</div>
</Theme>
</TextField>
{this.state.isPickerVisible ? this.renderPicker(): null}
</>