From 2854881e17bb8668eb60c4d06e0836f3cc304725 Mon Sep 17 00:00:00 2001
From: Elliot <key.draw@gmail.com>
Date: Sun, 26 Jun 2022 11:47:20 -0400
Subject: [PATCH] Add support for passing scalars to vector props (#228)

Co-authored-by: Andrew Prifer <AndrewPrifer@users.noreply.github.com>
---
 .../src/main/editableFactoryConfigUtils.ts    | 47 +++++++++++++++----
 1 file changed, 38 insertions(+), 9 deletions(-)

diff --git a/packages/r3f/src/main/editableFactoryConfigUtils.ts b/packages/r3f/src/main/editableFactoryConfigUtils.ts
index da47a34..48962e6 100644
--- a/packages/r3f/src/main/editableFactoryConfigUtils.ts
+++ b/packages/r3f/src/main/editableFactoryConfigUtils.ts
@@ -31,6 +31,14 @@ type Vector3 = {
   z: number
 }
 
+function isNumber(value: any) {
+  return typeof value === 'number' && isFinite(value)
+}
+
+function isVectorObject(value: any) {
+  return (['x', 'y', 'z'] as const).every((axis) => isNumber(value[axis]))
+}
+
 export const createVector = (components?: [number, number, number]) => {
   return components
     ? {x: components[0], y: components[1], z: components[2]}
@@ -47,16 +55,37 @@ export const createVectorPropConfig = (
   {nudgeMultiplier = 0.01} = {},
 ): PropConfig<Vector3> => ({
   parse: (props) => {
-    const vector = props[key]
-      ? Array.isArray(props[key])
-        ? createVector(props[key] as any)
-        : {
-            x: props[key].x,
-            y: props[key].y,
-            z: props[key].z,
-          }
-      : defaultValue
+    const propValue = props[key]
+    // if prop exists
+    const vector = !propValue
+      ? defaultValue
+      : // if prop is an array
+      Array.isArray(propValue)
+      ? createVector(propValue as any)
+      : // if prop is a scalar
+      isNumber(propValue)
+      ? {
+          x: propValue,
+          y: propValue,
+          z: propValue,
+        }
+      : // if prop is a threejs Vector3
+      isVectorObject(propValue)
+      ? {
+          x: propValue.x,
+          y: propValue.y,
+          z: propValue.z,
+        }
+      : // show a warning and return defaultValue
+        (console.warn(
+          `Couldn't parse prop %c${key}={${JSON.stringify(
+            propValue,
+          )}}%c, falling back to default value.`,
+          'background: black; color: white',
+        ),
+        defaultValue)
     ;(['x', 'y', 'z'] as const).forEach((axis) => {
+      // e.g. r3f also accepts prop keys like "scale-x"
       if (props[`${key}-${axis}` as any])
         vector[axis] = props[`${key}-${axis}` as any]
     })