Merge pull request #733 from openkraken/fix/modify_innerHTML_getproperty

fix: innerHTML of getProperty should get String of children.
openkraken · Oct 18, 2021 · a4df354 · a4df354
2 parents cb6d4d3 + da5d4b1
commit a4df354
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/bridge/bindings/jsc/DOM/element.cc b/bridge/bindings/jsc/DOM/element.cc
@@ -312,7 +312,11 @@ JSValueRef ElementInstance::getProperty(std::string &name, JSValueRef *exception
       return JSObjectMakeArray(_hostClass->ctx, arguments.size(), arguments.data(), nullptr);
     }
     case JSElement::ElementProperty::innerHTML: {
-      return JSValueMakeString(ctx, JSStringCreateWithUTF8CString(toString().c_str()));
+      std::string s = "";
+      for (auto child: childNodes) {
+        s += static_cast<ElementInstance *>(child)->toString();
+      }
+      return JSValueMakeString(ctx, JSStringCreateWithUTF8CString(s.c_str()));
     }
   }
 

diff --git a/integration_tests/specs/dom/innerHTML.ts b/integration_tests/specs/dom/innerHTML.ts
@@ -22,7 +22,7 @@ describe('innerHTML', () => {
 
     document.body.appendChild(div);
 
-    expect(div.innerHTML).toEqual('<div style="height: 100px;width: 100px;"></div>');
+    expect(document.body.innerHTML).toEqual('<div style="height: 100px;width: 100px;"></div>');
   });
 
   it('should work width attribute when get property', async () => {
@@ -31,7 +31,7 @@ describe('innerHTML', () => {
 
     document.body.appendChild(div);
 
-    expect(div.innerHTML).toEqual('<div attr-key="attr-value" ></div>');
+    expect(document.body.innerHTML).toEqual('<div attr-key="attr-value" ></div>');
   });
 
   it('should work width attribute when get property', async () => {
@@ -40,7 +40,7 @@ describe('innerHTML', () => {
 
     document.body.appendChild(div);
 
-    expect(div.innerHTML).toEqual('<div attr-key="attr-value" ></div>');
+    expect(document.body.innerHTML).toEqual('<div attr-key="attr-value" ></div>');
   });
 
   it('set empty string should remove all children', async () => {