Skip to content

Commit 16b614e

Browse files
committed
fix: type error with NSTextView conforming to NSView, and improve macos sdk types performance in IDE by allowing importing individual frameworks
1 parent 3e508b6 commit 16b614e

File tree

221 files changed

+439493
-30
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

221 files changed

+439493
-30
lines changed

examples/appkit.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,10 @@ export class Window extends NSWindow {
8383

8484
label.stringValue = "Hello, macOS";
8585

86-
label.isBezeled = false;
86+
label.bezeled = false;
8787
label.drawsBackground = false;
88-
label.isEditable = false;
89-
label.isSelectable = false;
88+
label.editable = false;
89+
label.selectable = false;
9090
label.alignment = NSTextAlignment.Center;
9191
label.translatesAutoresizingMaskIntoConstraints = false;
9292
label.textColor = NSColor.colorWithSRGBRedGreenBlueAlpha(1, 1, 1, 1);
@@ -124,10 +124,10 @@ export class Window extends NSWindow {
124124

125125
vstack.centerXAnchor.constraintEqualToAnchor(
126126
this.contentView.centerXAnchor,
127-
).isActive = true;
127+
).active = true;
128128
vstack.centerYAnchor.constraintEqualToAnchor(
129129
this.contentView.centerYAnchor,
130-
).isActive = true;
130+
).active = true;
131131

132132
return this;
133133
}

examples/gamecontroller.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
// @ts-check
22

33
import "@nativescript/macos-node-api";
4+
import "@nativescript/macos-node-api/GameController";
5+
import "@nativescript/macos-node-api/CoreFoundation";
46

57
objc.import("GameController");
68

examples/menubar.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ export class ApplicationDelegate extends NSObject {
4545
* @param {NSView} sender
4646
*/
4747
buttonClicked(sender) {
48-
if (this.popover.isShown) {
48+
if (this.popover.shown) {
4949
this.popover.performClose(sender);
5050
} else {
5151
this.popover.showRelativeToRectOfViewPreferredEdge(
@@ -88,10 +88,10 @@ export class ViewController extends NSViewController {
8888

8989
imageView.centerXAnchor.constraintEqualToAnchor(
9090
this.view.centerXAnchor
91-
).isActive = true;
91+
).active = true;
9292
imageView.centerYAnchor.constraintEqualToAnchor(
9393
this.view.centerYAnchor
94-
).isActive = true;
94+
).active = true;
9595
}
9696
}
9797

examples/metal_compute.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// @ts-check
22

3-
import "../index.js";
3+
import "@nativescript/macos-node-api";
4+
import "@nativescript/macos-node-api/Metal";
45

56
objc.import("Metal");
67

examples/metal_graphics.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
// https://developer.apple.com/documentation/metal/using_a_render_pipeline_to_render_primitives?language=objc
22

33
import "@nativescript/macos-node-api";
4+
import "@nativescript/macos-node-api/Metal";
5+
import "@nativescript/macos-node-api/MetalKit";
46

57
objc.import("Metal");
68
objc.import("MetalKit");

examples/mlcompute.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// @ts-check
22

33
import "@nativescript/macos-node-api";
4+
import "@nativescript/macos-node-api/MLCompute";
45

56
objc.import("MLCompute");
67

examples/split_view.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -148,10 +148,10 @@ export class SidebarViewController extends NSViewController {
148148
)
149149
: NSImageView.new();
150150

151-
text.isBordered = false;
151+
text.bordered = false;
152152
text.drawsBackground = false;
153153
text.stringValue = item.title;
154-
text.isEditable = false;
154+
text.editable = false;
155155

156156
const view = NSTableCellView.new();
157157

@@ -257,10 +257,10 @@ export class ContentViewController extends NSViewController {
257257

258258
label.stringValue = "Hello, macOS";
259259

260-
label.isBezeled = false;
260+
label.bezeled = false;
261261
label.drawsBackground = false;
262-
label.isEditable = false;
263-
label.isSelectable = false;
262+
label.editable = false;
263+
label.selectable = false;
264264
label.alignment = NSTextAlignment.Center;
265265
label.translatesAutoresizingMaskIntoConstraints = false;
266266
label.textColor = NSColor.colorWithSRGBRedGreenBlueAlpha(1, 1, 1, 1);
@@ -300,10 +300,10 @@ export class ContentViewController extends NSViewController {
300300

301301
vstack.centerXAnchor.constraintEqualToAnchor(
302302
view.centerXAnchor,
303-
).isActive = true;
303+
).active = true;
304304
vstack.centerYAnchor.constraintEqualToAnchor(
305305
view.centerYAnchor,
306-
).isActive = true;
306+
).active = true;
307307

308308
this.view = view;
309309
}

examples/spritekit.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
// @ts-check
22

33
import "@nativescript/macos-node-api";
4+
import "@nativescript/macos-node-api/SpriteKit";
5+
import "@nativescript/macos-node-api/GameController";
6+
import "@nativescript/macos-node-api/CoreFoundation";
7+
import "@nativescript/macos-node-api/CoreGraphics";
48

59
objc.import("SpriteKit");
610
objc.import("GameController");

examples/textview.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ export class ViewController extends NSViewController {
9292
NSAutoresizingMaskOptions.WidthSizable |
9393
NSAutoresizingMaskOptions.HeightSizable;
9494

95-
// @tts-expect-error textView types are not fully compatible with NSView
9695
this.view.addSubview(textView);
9796
}
9897
}

examples/webview.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// @ts-check
22

33
import "@nativescript/macos-node-api";
4+
import "@nativescript/macos-node-api/WebKit";
45

56
objc.import("WebKit");
67

0 commit comments

Comments
 (0)