From ad5fa8b528fbd23d55af017fd33b5385840d37ca Mon Sep 17 00:00:00 2001
From: nina992 <nouralali992@gmail.com>
Date: Thu, 31 Aug 2023 12:06:36 +0300
Subject: [PATCH] merge-with-main2

---
 .../beta/components/fields/PropertyFields/index.tsx   | 11 +++++++++++
 .../features/Editor/StoryPanel/ActionPanel/index.tsx  |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/web/src/beta/components/fields/PropertyFields/index.tsx b/web/src/beta/components/fields/PropertyFields/index.tsx
index 7be829a1c8..e2580fa16f 100644
--- a/web/src/beta/components/fields/PropertyFields/index.tsx
+++ b/web/src/beta/components/fields/PropertyFields/index.tsx
@@ -2,6 +2,7 @@ import TextInput from "@reearth/beta/components/fields/TextInput";
 import { type Item } from "@reearth/services/api/propertyApi/utils";
 
 import ColorField from "../ColorField";
+import SpacingInput, { SpacingValues } from "../SpacingInput";
 import ToggleField from "../ToggleField";
 
 import useHooks from "./hooks";
@@ -42,6 +43,16 @@ const PropertyFields: React.FC<Props> = ({ propertyId, item }) => {
               onChange={handlePropertyValueUpdate(item.schemaGroup, propertyId, sf.id, sf.type)}
             />
           )
+        ) : sf.type === "spacing" ? (
+          <SpacingInput
+            key={sf.id}
+            name={sf.name}
+            value={(value as SpacingValues) ?? ""}
+            description={sf.description}
+            min={sf.min}
+            max={sf.max}
+            onChange={handlePropertyValueUpdate(item.schemaGroup, propertyId, sf.id, sf.type)}
+          />
         ) : sf.type == "bool" ? (
           <ToggleField
             key={sf.id}
diff --git a/web/src/beta/features/Editor/StoryPanel/ActionPanel/index.tsx b/web/src/beta/features/Editor/StoryPanel/ActionPanel/index.tsx
index 9a068ebbdd..fe6716c005 100644
--- a/web/src/beta/features/Editor/StoryPanel/ActionPanel/index.tsx
+++ b/web/src/beta/features/Editor/StoryPanel/ActionPanel/index.tsx
@@ -191,7 +191,7 @@ const SettingsHeading = styled.div`
 `;
 
 const SettingsContent = styled.div`
-  height: 100px;
+  min-height: 134px;
   width: 200px;
   padding: 8px;
   box-sizing: border-box;