Always allow direction input within ValueSelect

chrismaltby · Apr 10, 2024 · 7679a9b · 7679a9b
1 parent 9485de3
commit 7679a9b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 24 deletions.
diff --git a/src/components/forms/ValueSelect.tsx b/src/components/forms/ValueSelect.tsx
@@ -214,7 +214,6 @@ interface ValueSelectProps {
   onChange: (newValue: ScriptValue | undefined) => void;
   innerValue?: boolean;
   fixedType?: boolean;
-  includeDirection?: boolean;
   placeholder?: string;
   min?: number;
   max?: number;
@@ -228,7 +227,6 @@ const ValueSelect = ({
   onChange,
   innerValue,
   fixedType,
-  includeDirection,
   placeholder,
   min,
   max,
@@ -374,24 +372,6 @@ const ValueSelect = ({
 
   const menu = useMemo(
     () => [
-      ...(includeDirection && !isValueFn
-        ? [
-            <MenuItem
-              key="direction"
-              onClick={() => {
-                onChange({
-                  type: "direction",
-                  value: "left",
-                });
-              }}
-            >
-              <MenuItemIcon>
-                {value.type === "direction" ? <CheckIcon /> : <BlankIcon />}
-              </MenuItemIcon>
-              {l10n("FIELD_DIRECTION")}
-            </MenuItem>,
-          ]
-        : []),
       ...(!isValueFn
         ? [
             <MenuItem key="number" onClick={setNumber}>
@@ -440,6 +420,20 @@ const ValueSelect = ({
               </MenuItemIcon>
               {l10n("FIELD_EXPRESSION")}
             </MenuItem>,
+            <MenuItem
+            key="direction"
+            onClick={() => {
+              onChange({
+                type: "direction",
+                value: "left",
+              });
+            }}
+          >
+            <MenuItemIcon>
+              {value.type === "direction" ? <CheckIcon /> : <BlankIcon />}
+            </MenuItemIcon>
+            {l10n("FIELD_DIRECTION")}
+          </MenuItem>,            
             <MenuDivider key="divider" />,
           ]
         : []),
@@ -495,7 +489,6 @@ const ValueSelect = ({
     [
       context.type,
       editorType,
-      includeDirection,
       isValueFn,
       onChange,
       setNumber,

diff --git a/src/components/script/ScriptEventFormInput.tsx b/src/components/script/ScriptEventFormInput.tsx
@@ -367,9 +367,6 @@ const ScriptEventFormInput = ({
           isValueScript ? value : isDefaultScript ? defaultValue : undefined
         }
         onChange={onChangeField}
-        includeDirection={
-          isDefaultScript ? defaultValue.type === "direction" : false
-        }
         min={field.min}
         max={field.max}
         step={field.step}