From ce8c51f8d3c26723c134e23002e7f5195f7b8c68 Mon Sep 17 00:00:00 2001
From: Georgios Giannoutsos Barkas <contact@nuc.gr>
Date: Fri, 13 Oct 2017 16:14:21 +0200
Subject: [PATCH 1/4] Accept React attributes on custom components

---
 src/renderers/dom/fiber/ReactDOMFiberComponent.js           | 6 +++++-
 .../dom/shared/__tests__/DOMPropertyOperations-test.js      | 6 ++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/renderers/dom/fiber/ReactDOMFiberComponent.js b/src/renderers/dom/fiber/ReactDOMFiberComponent.js
index a98800329222b..c444505bd964d 100644
--- a/src/renderers/dom/fiber/ReactDOMFiberComponent.js
+++ b/src/renderers/dom/fiber/ReactDOMFiberComponent.js
@@ -298,7 +298,11 @@ function setInitialDOMProperties(
         ensureListeningTo(rootContainerElement, propKey);
       }
     } else if (isCustomComponentTag) {
-      DOMPropertyOperations.setValueForAttribute(domElement, propKey, nextProp);
+      if ((DOMProperty.getPropertyInfo(propKey))) {
+        DOMPropertyOperations.setValueForProperty(domElement, propKey, nextProp);
+      } else {
+        DOMPropertyOperations.setValueForAttribute(domElement, propKey, nextProp);
+      }
     } else if (nextProp != null) {
       // If we're updating to null or undefined, we should remove the property
       // from the DOM node instead of inadvertently setting to a string. This
diff --git a/src/renderers/dom/shared/__tests__/DOMPropertyOperations-test.js b/src/renderers/dom/shared/__tests__/DOMPropertyOperations-test.js
index 7f544506a5f35..9c28023f2670e 100644
--- a/src/renderers/dom/shared/__tests__/DOMPropertyOperations-test.js
+++ b/src/renderers/dom/shared/__tests__/DOMPropertyOperations-test.js
@@ -113,6 +113,12 @@ describe('DOMPropertyOperations', () => {
       ReactDOM.render(<div hidden={false} />, container);
       expect(container.firstChild.hasAttribute('hidden')).toBe(false);
     });
+
+    it('should set the className to a custom component with a dash on its name', () => {
+      var container = document.createElement('div');
+      ReactDOM.render(<amp-img htmlFor="haha" className="just-a-class" />, container);
+      expect(container.firstChild.getAttribute('class')).toEqual('just-a-class');
+    });
   });
 
   describe('value mutation method', function() {

From 30146162fdb9b6f757c3d2461557ee29d17d84a3 Mon Sep 17 00:00:00 2001
From: Georgios Giannoutsos Barkas <contact@nuc.gr>
Date: Fri, 13 Oct 2017 16:24:21 +0200
Subject: [PATCH 2/4] Remove unused prop

---
 .../dom/shared/__tests__/DOMPropertyOperations-test.js          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/renderers/dom/shared/__tests__/DOMPropertyOperations-test.js b/src/renderers/dom/shared/__tests__/DOMPropertyOperations-test.js
index 9c28023f2670e..a5d1e20124071 100644
--- a/src/renderers/dom/shared/__tests__/DOMPropertyOperations-test.js
+++ b/src/renderers/dom/shared/__tests__/DOMPropertyOperations-test.js
@@ -116,7 +116,7 @@ describe('DOMPropertyOperations', () => {
 
     it('should set the className to a custom component with a dash on its name', () => {
       var container = document.createElement('div');
-      ReactDOM.render(<amp-img htmlFor="haha" className="just-a-class" />, container);
+      ReactDOM.render(<amp-img className="just-a-class" />, container);
       expect(container.firstChild.getAttribute('class')).toEqual('just-a-class');
     });
   });

From 3f41210e36867262f3ec31915b3b98736367d93b Mon Sep 17 00:00:00 2001
From: Georgios Giannoutsos Barkas <contact@nuc.gr>
Date: Fri, 13 Oct 2017 16:27:08 +0200
Subject: [PATCH 3/4] Add test case which works without the fix

---
 .../dom/shared/__tests__/DOMPropertyOperations-test.js      | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/renderers/dom/shared/__tests__/DOMPropertyOperations-test.js b/src/renderers/dom/shared/__tests__/DOMPropertyOperations-test.js
index a5d1e20124071..87ad4a280891f 100644
--- a/src/renderers/dom/shared/__tests__/DOMPropertyOperations-test.js
+++ b/src/renderers/dom/shared/__tests__/DOMPropertyOperations-test.js
@@ -114,6 +114,12 @@ describe('DOMPropertyOperations', () => {
       expect(container.firstChild.hasAttribute('hidden')).toBe(false);
     });
 
+    it('should set the className to a custom component', () => {
+      var container = document.createElement('div');
+      ReactDOM.render(<amp className="just-a-class" />, container);
+      expect(container.firstChild.getAttribute('class')).toEqual('just-a-class');
+    });
+
     it('should set the className to a custom component with a dash on its name', () => {
       var container = document.createElement('div');
       ReactDOM.render(<amp-img className="just-a-class" />, container);

From 492517dbc36ed49bb914d23292e1d6ea3427f757 Mon Sep 17 00:00:00 2001
From: Georgios Giannoutsos Barkas <contact@nuc.gr>
Date: Fri, 13 Oct 2017 16:33:43 +0200
Subject: [PATCH 4/4] Comment out the fix for now

---
 src/renderers/dom/fiber/ReactDOMFiberComponent.js | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/renderers/dom/fiber/ReactDOMFiberComponent.js b/src/renderers/dom/fiber/ReactDOMFiberComponent.js
index c444505bd964d..137bba92d5aba 100644
--- a/src/renderers/dom/fiber/ReactDOMFiberComponent.js
+++ b/src/renderers/dom/fiber/ReactDOMFiberComponent.js
@@ -298,11 +298,15 @@ function setInitialDOMProperties(
         ensureListeningTo(rootContainerElement, propKey);
       }
     } else if (isCustomComponentTag) {
-      if ((DOMProperty.getPropertyInfo(propKey))) {
-        DOMPropertyOperations.setValueForProperty(domElement, propKey, nextProp);
-      } else {
-        DOMPropertyOperations.setValueForAttribute(domElement, propKey, nextProp);
-      }
+      /* Suggested fix?
+       *
+       * if ((DOMProperty.getPropertyInfo(propKey))) {
+       *   DOMPropertyOperations.setValueForProperty(domElement, propKey, nextProp);
+       * } else {
+       *   DOMPropertyOperations.setValueForAttribute(domElement, propKey, nextProp);
+       * }
+      */
+      DOMPropertyOperations.setValueForAttribute(domElement, propKey, nextProp);
     } else if (nextProp != null) {
       // If we're updating to null or undefined, we should remove the property
       // from the DOM node instead of inadvertently setting to a string. This