Simplify updateEntity function (#751)

aframevr · Aug 29, 2024 · 528d92a · 528d92a
1 parent 2669b8b
commit 528d92a
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 28 deletions.
diff --git a/src/components/components/PropertyRow.js b/src/components/components/PropertyRow.js
@@ -56,14 +56,13 @@ export default class PropertyRow extends React.Component {
       entity: props.entity,
       isSingle: props.isSingle,
       name: props.name,
-      // Wrap updateEntity for tracking.
       onChange: function (name, value) {
-        var propertyName = props.componentname;
-        if (!props.isSingle) {
-          propertyName += '.' + props.name;
-        }
-
-        updateEntity.apply(this, [props.entity, propertyName, value]);
+        updateEntity(
+          props.entity,
+          props.componentname,
+          !props.isSingle ? props.name : '',
+          value
+        );
       },
       value: value
     };

diff --git a/src/lib/entity.js b/src/lib/entity.js
@@ -5,39 +5,30 @@ import { equal } from './utils';
  * Update a component.
  *
  * @param {Element} entity - Entity to modify.
- * @param {string} propertyName - component or component.property
- * @param {string|number} value - New value.
+ * @param {string} component - component name
+ * @param {string} property - property name, use empty string if component is single property or if value is an object
+ * @param {string|number|object} value - New value.
  */
-export function updateEntity(entity, propertyName, value) {
-  var splitName;
-
-  if (propertyName.indexOf('.') !== -1) {
-    // Multi-prop
-    splitName = propertyName.split('.');
-
+export function updateEntity(entity, component, property, value) {
+  if (property) {
     if (value === null || value === undefined) {
       // Remove property.
-      entity.removeAttribute(splitName[0], splitName[1]);
+      entity.removeAttribute(component, property);
     } else {
       // Set property.
-      entity.setAttribute(splitName[0], splitName[1], value);
+      entity.setAttribute(component, property, value);
     }
   } else {
     if (value === null || value === undefined) {
-      // Remove property.
-      entity.removeAttribute(propertyName);
+      // Remove component.
+      entity.removeAttribute(component);
     } else {
-      // Set property.
-      entity.setAttribute(propertyName, value);
+      // Set component.
+      entity.setAttribute(component, value);
     }
   }
 
-  Events.emit('entityupdate', {
-    component: splitName ? splitName[0] : propertyName,
-    entity: entity,
-    property: splitName ? splitName[1] : '',
-    value: value
-  });
+  Events.emit('entityupdate', { entity, component, property, value });
 }
 
 /**