Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: refactor text input component #677

Merged
merged 3 commits into from
Sep 11, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion web/src/beta/components/fields/PropertyFields/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import NumberField from "@reearth/beta/components/fields/NumberField";
import SelectField from "@reearth/beta/components/fields/SelectField";
import SliderField from "@reearth/beta/components/fields/SliderField";
import SpacingInput, { SpacingValues } from "@reearth/beta/components/fields/SpacingInput";
import TextInput from "@reearth/beta/components/fields/TextInput";
import TextInput from "@reearth/beta/components/fields/TextField";
import ToggleField from "@reearth/beta/components/fields/ToggleField";
import { type Item } from "@reearth/services/api/propertyApi/utils";

Expand Down
26 changes: 26 additions & 0 deletions web/src/beta/components/fields/TextField/index.stories.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
import { Meta, StoryObj } from "@storybook/react";

import TextField, { Props } from "./index";

const meta: Meta<Props> = {
component: TextField,
};

export default meta;
type Story = StoryObj<typeof TextField>;

export const Default: Story = {
args: {
name: "Text input field",
value: "Text field",
description: "The text input description",
},
};

export const WithPlaceholder: Story = {
args: {
placeholder: "Text Input",
name: "Text input field",
description: "The text input description",
},
};
29 changes: 29 additions & 0 deletions web/src/beta/components/fields/TextField/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
import TextInput from "@reearth/beta/components/fields/common/TextInput";

import Property from "..";

export type Props = {
name?: string;
description?: string;
value?: string;
placeholder?: string;
timeout?: number;
onChange?: (text: string) => void;
};

const TextField: React.FC<Props> = ({
name,
description,
value,
placeholder,
timeout,
onChange,
}) => {
return (
<Property name={name} description={description}>
<TextInput value={value} placeholder={placeholder} onChange={onChange} timeout={timeout} />
</Property>
);
};

export default TextField;
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
import { Meta, StoryObj } from "@storybook/react";

import TextInput, { Props } from "./index";

const meta: Meta<Props> = {
component: TextInput,
};

export default meta;
type Story = StoryObj<typeof TextInput>;

export const Default: Story = {
args: {
value: "Text Input",
},
};

export const WithPlaceholder: Story = {
args: {
placeholder: "Text Input",
},
};
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,14 @@ import { useCallback, useEffect, useRef, useState } from "react";

import { styled } from "@reearth/services/theme";

import Property from "..";

type Props = {
name?: string;
description?: string;
export type Props = {
value?: string;
placeholder?: string;
timeout?: number;
onChange?: (text: string) => void;
};

const TextInput: React.FC<Props> = ({ name, description, value, timeout = 1000, onChange }) => {
const TextField: React.FC<Props> = ({ value, placeholder, timeout = 1000, onChange }) => {
nina992 marked this conversation as resolved.
Show resolved Hide resolved
const [currentValue, setCurrentValue] = useState(value ?? "");
const timeoutRef = useRef<NodeJS.Timeout>();

Expand Down Expand Up @@ -50,18 +47,17 @@ const TextInput: React.FC<Props> = ({ name, description, value, timeout = 1000,
);

return (
<Property name={name} description={description}>
<StyledInput
value={currentValue ?? ""}
onChange={handleChange}
onBlur={handleBlur}
onKeyDown={handleKeyDown}
/>
</Property>
<StyledInput
value={currentValue ?? ""}
placeholder={placeholder}
onChange={handleChange}
onBlur={handleBlur}
onKeyDown={handleKeyDown}
/>
);
};

export default TextInput;
export default TextField;

const StyledInput = styled.input`
outline: none;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import TextInput from "@reearth/beta/components/fields/TextInput";
import TextInput from "@reearth/beta/components/fields/TextField";
import SidePanelSectionField from "@reearth/beta/components/SidePanelSectionField";
import { WidgetAreaPadding, WidgetAreaState } from "@reearth/services/state";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { useCallback, useState, useMemo } from "react";

import Button from "@reearth/beta/components/Button";
import Collapse from "@reearth/beta/components/Collapse";
import TextInput from "@reearth/beta/components/fields/TextInput";
import TextInput from "@reearth/beta/components/fields/TextField";
import Modal from "@reearth/beta/components/Modal";
import Text from "@reearth/beta/components/Text";
import { useT } from "@reearth/services/i18n";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from "react";

import Button from "@reearth/beta/components/Button";
import TextInput from "@reearth/beta/components/fields/TextInput";
import TextInput from "@reearth/beta/components/fields/TextField";
import { Icons } from "@reearth/beta/components/Icon";
import Loading from "@reearth/beta/components/Loading";
import Modal from "@reearth/beta/components/Modal";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { useCallback, useState } from "react";

import Button from "@reearth/beta/components/Button";
import Collapse from "@reearth/beta/components/Collapse";
import TextInput from "@reearth/beta/components/fields/TextInput";
import TextInput from "@reearth/beta/components/fields/TextField";
import { useT } from "@reearth/services/i18n";

import { SettingsFields, ButtonWrapper } from "../common";
Expand Down
Loading