fix attr vs prop

grottohub · Mar 11, 2021 · 95fa517 · 95fa517
1 parent cb05f4d
commit 95fa517
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 25 deletions.
diff --git a/core/blueprints.js b/core/blueprints.js
@@ -6,17 +6,23 @@ export let blueprints;
 
     const createElement = function createElementFromBlueprint(blueprint, content) {
       let element = document.createElement(blueprint.tag);
-      allBlueprints[blueprint.attr.blueprint] = blueprint;
+      allBlueprints[blueprint.props.blueprint] = blueprint;
 
-      Object.keys(blueprint.attr).forEach(attribute => {
-        element[attribute] = blueprint.attr[attribute];
+      Object.keys(blueprint.props).forEach(prop => {
+        element[prop] = blueprint.props[prop];
       });
 
+      if (blueprint.attr) {
+        Object.keys(blueprint.attr).forEach(attribute => {
+          element.setAttribute(attribute, blueprint.attr[attribute]);
+        });
+      }
+
       // console.log(blueprint.content);
       // console.log(content);
       if (blueprint.content) {
         content.forEach((data, idx) => {
-          let blueprintName = blueprint.attr.blueprint;
+          let blueprintName = blueprint.props.blueprint;
 
           if (typeof data === "string") {
             element[blueprint.content[idx]] = data;

diff --git a/dist/core.js b/dist/core.js
@@ -52,29 +52,35 @@ let _ui;
 
       const createElement = function createElementFromBlueprint(blueprint, content) {
         let element = document.createElement(blueprint.tag);
-        allBlueprints[blueprint.attr.blueprint] = blueprint;
-
+        allBlueprints[blueprint.props.blueprint] = blueprint;
+
+      Object.keys(blueprint.props).forEach(prop => {
+        element[prop] = blueprint.props[prop];
+      });
+
+      if (blueprint.attr) {
         Object.keys(blueprint.attr).forEach(attribute => {
-          element[attribute] = blueprint.attr[attribute];
+          element.setAttribute(attribute, blueprint.attr[attribute]);
         });
-
-        // console.log(blueprint.content);
-        // console.log(content);
-        if (blueprint.content) {
-          content.forEach((data, idx) => {
-            let blueprintName = blueprint.attr.blueprint;
-
-            if (typeof data === "string") {
-              element[blueprint.content[idx]] = data;
-            } 
-
-            else if (data[blueprintName]) {
-              data[blueprintName].forEach((childData, idx) => {
-                element[blueprint.content[idx]] = childData;
-              });
-            }
-          });
-        }
+      }
+
+      // console.log(blueprint.content);
+      // console.log(content);
+      if (blueprint.content) {
+        content.forEach((data, idx) => {
+          let blueprintName = blueprint.props.blueprint;
+
+          if (typeof data === "string") {
+            element[blueprint.content[idx]] = data;
+          } 
+
+          else if (data[blueprintName]) {
+            data[blueprintName].forEach((childData, idx) => {
+              element[blueprint.content[idx]] = childData;
+            });
+          }
+        });
+      }
 
         element.classList.add(...blueprint.classes);