fixes for ios and other stuff

Author: DjDeveloperr

examples/appkit.js

@@ -100,7 +100,7 @@ export class Window extends NSWindow {
     label.editable = false;
     label.selectable = false;
     label.alignment = NSTextAlignment.center;
-    label.setTranslatesAutoresizingMaskIntoConstraints(false);
+    label.translatesAutoresizingMaskIntoConstraints = false;
     label.textColor = NSColor.colorWithSRGBRedGreenBlueAlpha(1, 1, 1, 1);
 
     label.font = NSFontManager.sharedFontManager.convertFontToHaveTrait(
@@ -118,7 +118,7 @@ export class Window extends NSWindow {
     vstack.alignment = NSLayoutAttribute.centerX;
     vstack.distribution = NSStackViewDistribution.fill;
     vstack.spacing = 40;
-    vstack.setTranslatesAutoresizingMaskIntoConstraints(false);
+    vstack.translatesAutoresizingMaskIntoConstraints = false;
 
     const imageURL = NSString.stringWithUTF8String(
       new URL("../assets/NativeScript.png", import.meta.url).pathname,

examples/split_view.js

@@ -104,7 +104,7 @@ export class SidebarViewController extends NSViewController {
     scrollView.hasHorizontalScroller = false;
     scrollView.documentView = outline;
     scrollView.drawsBackground = false;
-    scrollView.setTranslatesAutoresizingMaskIntoConstraints(false);
+    scrollView.translatesAutoresizingMaskIntoConstraints = false;
 
     this.view = scrollView;
   }
@@ -194,7 +194,7 @@ export class ContentViewController extends NSViewController {
     label.editable = false;
     label.selectable = false;
     label.alignment = 1 /* NSTextAlignmentCenter */;
-    label.setTranslatesAutoresizingMaskIntoConstraints(false);
+    label.translatesAutoresizingMaskIntoConstraints = false;
     label.textColor = NSColor.colorWithSRGBRedGreenBlueAlpha(1, 1, 1, 1);
 
     label.font = NSFontManager.sharedFontManager.convertFontToHaveTrait(
@@ -214,7 +214,7 @@ export class ContentViewController extends NSViewController {
     vstack.alignment = 9 /* NSLayoutAttributeCenterX */;
     vstack.distribution = 0 /* NSStackViewDistributionFill */;
     vstack.spacing = 40;
-    vstack.setTranslatesAutoresizingMaskIntoConstraints(false);
+    vstack.translatesAutoresizingMaskIntoConstraints = false;
 
     const imageURL = NSString.stringWithUTF8String(
       new URL("../assets/NativeScript.png", import.meta.url).pathname,

examples/view_controller.js

@@ -78,7 +78,7 @@ export class ViewController extends NSViewController {
     label.editable = false;
     label.selectable = false;
     label.alignment = NSTextAlignment.center;
-    label.setTranslatesAutoresizingMaskIntoConstraints(false);
+    label.translatesAutoresizingMaskIntoConstraints = false;
     label.textColor = NSColor.colorWithSRGBRedGreenBlueAlpha(1, 1, 1, 1);
     label.font = NSFontManager.sharedFontManager.convertFontToHaveTrait(
       NSFont.fontWithNameSize(label.font.fontName, 45),
@@ -95,7 +95,7 @@ export class ViewController extends NSViewController {
     vstack.alignment = NSLayoutAttribute.centerX;
     vstack.distribution = NSStackViewDistribution.fill;
     vstack.spacing = 40;
-    vstack.setTranslatesAutoresizingMaskIntoConstraints(false);
+    vstack.translatesAutoresizingMaskIntoConstraints = false;
 
     const imageURL = NSString.stringWithUTF8String(
       new URL("../assets/NativeScript.png", import.meta.url).pathname,
@@ -114,7 +114,7 @@ export class ViewController extends NSViewController {
     button.controlSize = NSControlSize.large;
     button.bezelStyle = NSBezelStyle.rounded;
     button.setButtonType(NSButtonType.momentaryLight);
-    button.setTranslatesAutoresizingMaskIntoConstraints(false);
+    button.translatesAutoresizingMaskIntoConstraints = false;
 
     this.button = button;
 

metadata/metadata.ios.nsmd

@@ -1,6 +1,7 @@
 #include "Closure.h"
 #include "ObjCBridgeData.h"
 #include "Util.h"
+#import <Foundation/Foundation.h>
 
 namespace objc_bridge {
 

metadata/metadata.macos.nsmd

@@ -184,6 +184,12 @@ napi_value findConstructorForObject(napi_env env, ObjCBridgeData *bridgeData,
     unregisterObject(obj);
   }
 
+  auto cls = object_getClass(obj);
+  auto mdFindByPointer = mdClassesByPointer.find(cls);
+  if (mdFindByPointer != mdClassesByPointer.end()) {
+    classOffset = mdFindByPointer->second;
+  }
+
   napi_value constructor = nullptr;
   if (classOffset != 0) {
     auto bridgedCls = getClass(env, classOffset);
@@ -202,7 +208,7 @@ napi_value findConstructorForObject(napi_env env, ObjCBridgeData *bridgeData,
 
     constructor = get_ref_value(env, proto->constructor);
   } else {
-    constructor = findConstructorForObject(env, this, obj);
+    constructor = findConstructorForObject(env, this, obj, cls);
   }
 
   if (constructor == nullptr) {

src/CustomClass.mm

@@ -63,6 +63,7 @@
   napi_value constructor, prototype;
   napi_define_class(env, name.c_str(), NAPI_AUTO_LENGTH, JS_ProtocolConstructor,
                     nullptr, 0, nullptr, &constructor);
+  napi_wrap(env, constructor, this, nullptr, nullptr, nullptr);
 
   napi_get_named_property(env, constructor, "prototype", &prototype);
 
@@ -85,8 +86,6 @@
     napi_inherits(env, constructor, protoValue);
   }
 
-  napi_wrap(env, constructor, this, nullptr, nullptr, nullptr);
-
   next = true;
 
   while (next) {