Merge branch 'main' of github.com:reearth/reearth-visualizer into fea…

…t/preset-layer
reearth · Sep 30, 2024 · 87b4b74 · 87b4b74
2 parents af10d68 + 8a11282
commit 87b4b74
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 2 deletions.
diff --git a/...features/Editor/Map/InspectorPanel/LayerInspector/FeatureInspector/CustomPropertField.tsx b/...features/Editor/Map/InspectorPanel/LayerInspector/FeatureInspector/CustomPropertField.tsx
@@ -51,6 +51,7 @@ export const FieldComponent = ({ field, setFields }: Props) => {
       key={field?.id}
       title={field?.title}
       value={field.value as string}
+      resizable="height"
       onBlur={handleChange}
     />
   ) : field?.type === "Asset" ? (

diff --git a/web/src/beta/features/ProjectSettings/innerPages/GeneralSettings/index.tsx b/web/src/beta/features/ProjectSettings/innerPages/GeneralSettings/index.tsx
@@ -88,6 +88,7 @@ const GeneralSettings: FC<Props> = ({
               <TextareaField
                 title={t("Description")}
                 value={localDescription}
+                resizable="height"
                 onChange={setLocalDescription}
               />
               <SettingsRow>

diff --git a/web/src/beta/features/ProjectSettings/innerPages/PublicSettings/PublicSettingsDetail.tsx b/web/src/beta/features/ProjectSettings/innerPages/PublicSettings/PublicSettingsDetail.tsx
@@ -118,6 +118,7 @@ const PublicSettingsDetail: React.FC<Props> = ({
           <TextAreaField
             title={t("Description")}
             value={localPublicInfo.publicDescription ?? ""}
+            resizable="height"
             onChange={(publicDescription: string) => {
               setLocalPublicInfo((s) => ({ ...s, publicDescription }));
             }}

diff --git a/web/src/beta/lib/reearth-ui/components/TextArea/index.tsx b/web/src/beta/lib/reearth-ui/components/TextArea/index.tsx
@@ -18,7 +18,7 @@ export const TextArea: FC<TextAreaProps> = ({
   value,
   placeholder,
   resizable,
-  rows = 3,
+  rows = 5,
   disabled,
   counter,
   maxLength,
@@ -109,7 +109,7 @@ const StyledTextArea = styled.textarea<{
   border: "none",
   background: theme.bg[1],
   resize: resizable === "height" ? "vertical" : "none",
-  overflow: resizable === "height" ? "scroll" : "auto",
+  overflow: "auto",
   flex: 1,
   color:
     disabled && appearance !== "readonly"

diff --git a/web/src/beta/ui/fields/Properties/ProprtyField.tsx b/web/src/beta/ui/fields/Properties/ProprtyField.tsx
@@ -97,6 +97,7 @@ const PropertyField: FC<Props> = ({
           <TextareaField
             key={schema.id}
             title={schema.name}
+            resizable="height"
             value={(value as string) ?? ""}
             description={schema.description}
             onBlur={handleChange}