clean up

Author: bnjm

components/lib/createArComponent.js

@@ -20,11 +20,7 @@ import {
   scale,
   transition,
 } from './propTypes';
-import {
-  processColor,
-  processColorInMaterial,
-  processMaterialPropertyContents,
-} from './parseMaterial';
+import { processColor, processMaterialPropertyContents } from './parseMaterial';
 import generateId from './generateId';
 
 const { ARGeosManager } = NativeModules;
@@ -73,11 +69,11 @@ export default (mountConfig, propTypes = {}, nonUpdateablePropKeys = []) => {
   // any custom props (material, shape, ...)
   const nonNodePropKeys = keys(propTypes);
 
-  const processColors = props => {
+  const parseMaterials = props => {
     const material = props.material || {};
 
     if (props.color) {
-      material.color = props.color;
+      material.diffuse = { ...material.diffuse, color: props.color };
     }
 
     return {
@@ -93,7 +89,7 @@ export default (mountConfig, propTypes = {}, nonUpdateablePropKeys = []) => {
 
   const getNonNodeProps = props => ({
     ...pick(props, nonNodePropKeys),
-    ...processColors(props),
+    ...parseMaterials(props),
   });
 
   const mountFunc =
@@ -169,7 +165,7 @@ export default (mountConfig, propTypes = {}, nonUpdateablePropKeys = []) => {
             ...this.props.transition,
             ...props.transition,
           },
-          ...processColors(pick(props, changedKeys)),
+          ...parseMaterials(pick(props, changedKeys)),
         };
 
         if (DEBUG) console.log('update node', propsToupdate);

components/lib/parseMaterial.js

@@ -9,39 +9,21 @@ const materialPropertiesWithMaps = [
   'specular',
 ];
 
-/* eslint import/prefer-default-export: 0 */
-export function processColorInMaterial(material) {
-  if (!material) {
-    return material;
-  }
-
-  if (!material.diffuse && !material.color) {
-    return material;
-  }
-
-  return {
-    ...material,
-    diffuse: processColor(material.diffuse || material.color),
-  };
-}
-
 export function processMaterialPropertyContents(material) {
   const propsToUpdate = intersection(
     Object.keys(material),
     materialPropertiesWithMaps,
   );
   // legacy support for old diffuse.color
   const color =
-    typeof material.diffuse === 'string' || material.color
-      ? material.diffuse || material.color
-      : undefined;
+    typeof material.diffuse === 'string' ? material.diffuse : undefined;
 
   return propsToUpdate.reduce(
     (prev, curr) => ({
       ...prev,
       [curr]: {
         ...prev[curr],
-        color: color ? processColor(color) : processColor(prev[curr].color),
+        color: processColor(color || prev[curr].color),
       },
     }),
     material,