fix: fix HostClass instanceof

openkraken · Jul 29, 2021 · c72a1b0 · c72a1b0
1 parent 1a4cf54
commit c72a1b0
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/bridge/bindings/jsc/DOM/element.cc b/bridge/bindings/jsc/DOM/element.cc
@@ -16,6 +16,7 @@ using namespace foundation;
 void bindElement(std::unique_ptr<JSContext> &context) {
   auto element = JSElement::instance(context.get());
   JSC_GLOBAL_SET_PROPERTY(context, "Element", element->classObject);
+  JSC_GLOBAL_SET_PROPERTY(context, "HTMLElement", element->classObject);
 }
 
 std::vector<JSStringRef> &JSElementAttributes::getAttributePropertyNames() {

diff --git a/bridge/bindings/jsc/host_class.cc b/bridge/bindings/jsc/host_class.cc
@@ -61,10 +61,10 @@ bool HostClass::proxyHasInstance(JSContextRef ctx, JSObjectRef constructor, JSVa
 
   JSObjectRef instanceObject = JSValueToObject(ctx, possibleInstance, exception);
   auto constructorHostClass = static_cast<HostClass *>(JSObjectGetPrivate(constructor));
-  auto instanceHostClass = static_cast<HostClass *>(JSObjectGetPrivate(instanceObject));
+  auto instanceHostClass = static_cast<Instance *>(JSObjectGetPrivate(instanceObject));
 
   if (constructorHostClass == nullptr || instanceHostClass == nullptr) return false;
-  return constructorHostClass == instanceHostClass;
+  return instanceHostClass->prototype<HostClass>() == constructorHostClass;
 }
 
 JSObjectRef HostClass::proxyCallAsConstructor(JSContextRef ctx, JSObjectRef constructor, size_t argumentCount,

diff --git a/integration_tests/specs/dom/elements/div.ts b/integration_tests/specs/dom/elements/div.ts
@@ -9,4 +9,11 @@ describe('Tags div', () => {
 
     await snapshot();
   });
+
+  it('instanceof HTMLElement', () => {
+    let div = document.createElement('div');
+    expect(div instanceof Element).toBe(true);
+    expect(div instanceof HTMLElement).toBe(true);
+
+  });
 });