@nativescript/core 8.9.0-alpha.3 → 8.9.0-next-01-13-2025-12740325729

package/platforms/ios/src/NativeScriptMainWindow.swift

@@ -1,179 +0,0 @@
-import SwiftUI
-import NativeScriptEmbedder
-import UIKit
-
-@available(iOS 14.0, *)
-struct NativeScriptMainWindow: Scene {
-    
-    #if os(visionOS)
-    // Environment control
-    @Environment(\.openWindow) private var openWindow
-    @Environment(\.dismissWindow) private var dismissWindow
-    @Environment(\.openImmersiveSpace) private var openImmersiveSpace
-    @Environment(\.dismissImmersiveSpace) private var dismissImmersiveSpace
-    #endif
-    
-    var body: some Scene {
-        #if os(visionOS)
-        // windowStyle is only supported on visionOS
-        WindowGroup {
-            NativeScriptAppView(found: { windowScene in
-                NativeScriptEmbedder.sharedInstance().setWindowScene(windowScene)
-            }).onAppear {
-                // print("NativeScriptAppView onAppear")
-                DispatchQueue.main.async {
-                    NativeScriptEmbedder.boot()
-                }
-            }.onReceive(NotificationCenter.default
-                .publisher(for: NSNotification.Name("NativeScriptWindowOpen")), perform: { obj in
-                    let info = parseWindowInfo(obj: obj)
-                    let id = info.keys.first
-                    Task {
-                        if (info[id!]!) {
-                            await openImmersiveSpace(id: id!)
-                        } else {
-                            openWindow(id: id!)
-                        }
-                    }
-            }).onReceive(NotificationCenter.default
-                .publisher(for: NSNotification.Name("NativeScriptWindowClose")), perform: { obj in
-                    let info = parseWindowInfo(obj: obj)
-                    let id = info.keys.first
-                    Task {
-                        if (info[id!]!) {
-                            await dismissImmersiveSpace()
-                        } else {
-                            dismissWindow(id: id!)
-                        }
-                    }
-                })
-            .onOpenURL { (url) in
-                NotificationCenter.default.post(name: Notification.Name("NativeScriptOpenURL"), object: nil, userInfo: ["url": url.absoluteString ])
-            }
-        }
-        .windowStyle(.plain)
-        #else
-        WindowGroup {
-            NativeScriptAppView(found: { windowScene in
-                NativeScriptEmbedder.sharedInstance().setWindowScene(windowScene)
-            }).onAppear {
-                // print("NativeScriptAppView onAppear")
-                DispatchQueue.main.async {
-                    NativeScriptEmbedder.boot()
-                }
-                
-            }
-        }
-        #endif
-    }
-
-    init() {
-        NativeScriptViewFactory.initShared()
-        NativeScriptEmbedder.sharedInstance().setDelegate(NativeScriptViewFactory.shared)
-        NativeScriptEmbedder.setup()
-    }
-
-    #if os(visionOS)
-    func parseWindowInfo(obj: Notification, close: Bool = false) -> [String:Bool] {
-        if let userInfo = obj.userInfo {
-            var id: String = ""
-            var isImmersive = false
-            for (key, value) in userInfo {
-                let k = key as! String
-                if (k == "type") {
-                    id = value as! String
-                } else if (k == "isImmersive") {
-                    isImmersive = value as! Bool
-                }
-            }
-            return [id: isImmersive]
-            
-        }
-        return ["_": false]
-    }
-    #endif
-}
-
-@available(iOS 13.0, *)
-struct NativeScriptAppView: UIViewRepresentable {
-    /// A closure that's called when the window is found.
-    var found: ((UIWindowScene?) -> Void)
-  
-    func makeUIView(context: Context) -> UIView {
-        // print("NativeScriptAppView makeUIView")
-        var window: UIWindow? {
-            guard let scene = UIApplication.shared.connectedScenes.first,
-                  let windowSceneDelegate = scene.delegate as? UIWindowSceneDelegate,
-                  let window = windowSceneDelegate.window else {
-                return nil
-            }
-            return window
-        }
-        
-        DispatchQueue.main.async {
-            found(window?.windowScene)
-        }
-        
-        return NativeScriptViewFactory.app!.view
-    }
-    
-    func updateUIView(_ uiView: UIView, context: Context) {
-        // print("NativeScriptAppView updateUIView")
-        // could update data through the controller
-    }
-}
-
-@available(iOS 13.0, *)
-@objc public class NativeScriptViewFactory: NSObject, NativeScriptEmbedderDelegate {
-    @objc static var shared: NativeScriptViewFactory?
-    @objc static var app: NativeScriptContainerCtrl?
-    
-    // holds key/value map of views for lifecycle handling
-    @objc public var views: NSMutableDictionary?
-
-    // provided by NativeScript to coordinate view lifecycle
-    @objc public var viewCreator: ((String) -> Void)? = nil
-    @objc public var viewDestroyer: ((String) -> Void)? = nil
-
-    // get or create (if needed) NativeScript views to represent in SwiftUI
-    @objc public func getViewById(_ id: String) -> UIView {
-        let vc = views!.object(forKey: id) as? UIView
-        if (vc == nil) {
-            // create the NativeScript view
-            viewCreator!(id)
-        }
-        return views!.object(forKey: id) as! UIView
-    }
-    
-    @available(iOS 15.0, *)
-    @objc public static func getKeyWindow() -> UIWindow? {
-        return UIApplication
-            .shared
-            .connectedScenes
-            .compactMap { ($0 as? UIWindowScene)?.keyWindow }
-            .last
-    }
-
-    @objc public static func initShared() {
-        if (NativeScriptViewFactory.shared == nil) {
-            NativeScriptViewFactory.app = NativeScriptContainerCtrl()
-            NativeScriptViewFactory.shared = NativeScriptViewFactory()
-            NativeScriptViewFactory.shared!.views = NSMutableDictionary()
-        }
-    }
-    
-    public func presentNativeScriptApp(_ vc: UIViewController!) -> Any! {
-        vc.view.frame = NativeScriptViewFactory.app!.view.bounds
-        vc.view.autoresizingMask = [.flexibleWidth, .flexibleHeight]
-        NativeScriptViewFactory.app!.addChild(vc)
-        NativeScriptViewFactory.app!.view.addSubview(vc.view)
-        vc.didMove(toParent: NativeScriptViewFactory.app)
-        return NativeScriptViewFactory.app
-    }
-}
-
-// UIViewController
-@objc public class NativeScriptContainerCtrl: UIViewController {
-    // allow NativeScript to override updateData for custom handling
-    @objc public var updateData: ((_ data: NSMutableDictionary) -> Void)? = nil
-}

package/platforms/ios/src/NativeScriptUtils.h

@@ -1,16 +0,0 @@
-//
-//  NativeScriptUtils.h
-//
-//  Created by Nathan Walker on 2/02/2022.
-#include <UIKit/UIKit.h>
-
-@interface NativeScriptUtils : NSObject
-
-+(UIFont*) getSystemFont:(CGFloat)size weight:(UIFontWeight)weight italic:(BOOL)italic symbolicTraits:(UIFontDescriptorSymbolicTraits)symbolicTraits;
-+(UIFont*) createUIFont:(NSDictionary*)font;
-+(NSMutableAttributedString*)createMutableStringWithDetails:(NSDictionary*)details;
-+(NSMutableAttributedString*)createMutableStringForSpan:(NSString*)text font:(UIFont*)font color:(UIColor*)color backgroundColor:(UIColor*)backgroundColor textDecoration:(NSString*)textDecoration baselineOffset:(CGFloat)baselineOffset;
-+(UIImage*)scaleImage:(UIImage*)image width:(CGFloat)width height:(CGFloat)height scaleFactor:(CGFloat)scaleFactor;
-+(NSData*)getImageData:(UIImage*)image format:(NSString*)format quality:(CGFloat)quality;
-
-@end

package/platforms/ios/src/NativeScriptUtils.m

@@ -1,137 +0,0 @@
-#import "NativeScriptUtils.h"
-
-@implementation NativeScriptUtils
-
-+(UIFont*) getSystemFont:(CGFloat)size weight:(UIFontWeight)weight italic:(BOOL)italic symbolicTraits:(UIFontDescriptorSymbolicTraits)symbolicTraits {
-    UIFont *result = [UIFont systemFontOfSize:size weight:weight];
-    if (italic) {
-        result = [UIFont fontWithDescriptor:[result.fontDescriptor fontDescriptorWithSymbolicTraits:symbolicTraits] size:size];
-    }
-
-    return result;
-}
-+(UIFont*) createUIFont:(NSDictionary*)font {
-    UIFont *result;
-
-    CGFloat size = [[font valueForKey:@"fontSize"] floatValue];
-
-    UIFontDescriptorSymbolicTraits symbolicTraits = 0;
-    if ([[font valueForKey:@"isBold"] boolValue]) {
-        symbolicTraits = symbolicTraits | UIFontDescriptorTraitBold;
-    }
-    if ([[font valueForKey:@"isItalic"] boolValue]) {
-        symbolicTraits = symbolicTraits | UIFontDescriptorTraitItalic;
-    }
-
-    NSDictionary *fontDescriptorTraits = @{
-        UIFontSymbolicTrait : @(symbolicTraits),
-        UIFontWeightTrait : [font valueForKey:@"fontWeight"]
-    };
-
-    for (NSString *family in [NSArray arrayWithArray:[font valueForKey:@"fontFamily"]]) {
-        NSString *fontFamily = family;
-        if ([family.lowercaseString isEqualToString:@"serif"]) {
-            fontFamily = @"Times New Roman";
-        } else if ([family.lowercaseString isEqualToString:@"monospace"]) {
-            fontFamily = @"Courier New";
-        }
-
-        if (!fontFamily || [fontFamily isEqualToString:@"sans-serif"] || [fontFamily isEqualToString:@"system"]) {
-            result = [NativeScriptUtils getSystemFont:size weight:(UIFontWeight)[[font valueForKey:@"fontWeight"] floatValue] italic:[[font valueForKey:@"isItalic"] boolValue] symbolicTraits:symbolicTraits];
-            break;
-        } else {
-            UIFontDescriptor *descriptor = [UIFontDescriptor fontDescriptorWithFontAttributes:@{
-                UIFontDescriptorFamilyAttribute: fontFamily,
-                UIFontDescriptorTraitsAttribute: fontDescriptorTraits
-            }];
-
-            result = [UIFont fontWithDescriptor:descriptor size:size];
-
-            BOOL actualItalic = result.fontDescriptor.symbolicTraits & UIFontDescriptorTraitItalic;
-            if ([[font valueForKey:@"isItalic"] boolValue] && !actualItalic) {
-                #if TARGET_OS_MACCATALYST
-                #else
-                // The font we got is not actually italic so emulate that with a matrix
-                result = [UIFont fontWithDescriptor:[descriptor fontDescriptorWithMatrix:CGAffineTransformMake(1, 0, 0.2, 1, 0, 0)] size:size];
-                #endif
-            }
-
-            // Check if the resolved font has the correct font-family
-            // If not - fallback to the next font-family
-            if ([result.familyName isEqualToString:fontFamily]) {
-                break;
-            } else {
-                result = nil;
-            }
-        }
-    }
-
-    // Couldn't resolve font - fallback to the system font
-    if (result == nil) {
-        result = [NativeScriptUtils getSystemFont:size weight:(UIFontWeight)[[font valueForKey:@"fontWeight"] floatValue] italic:[[font valueForKey:@"isItalic"] boolValue] symbolicTraits:symbolicTraits];
-    }
-
-    return result;
-}
-
-+(NSMutableAttributedString*)createMutableStringWithDetails:(NSDictionary*)details {
-    NSMutableAttributedString *mas = [[NSMutableAttributedString alloc] init];
-    for (NSDictionary *detail in [NSArray arrayWithArray:[details valueForKey:@"spans"]]) {
-        NSMutableAttributedString *attrString = [NativeScriptUtils createMutableStringForSpan:[detail objectForKey:@"text"] font:[detail objectForKey:@"iosFont"] color:[detail objectForKey:@"color"] backgroundColor:[detail objectForKey:@"backgroundColor"] textDecoration:[detail objectForKey:@"textDecoration"] baselineOffset:[[detail valueForKey:@"baselineOffset"] floatValue]];
-        [mas insertAttributedString:attrString atIndex:[[detail valueForKey:@"index"] intValue]];
-    }
-    return mas;
-}
-
-+(NSMutableAttributedString*)createMutableStringForSpan:(NSString*)text font:(UIFont*)font color:(UIColor*)color backgroundColor:(UIColor*)backgroundColor textDecoration:(NSString*)textDecoration baselineOffset:(CGFloat)baselineOffset {
-    NSMutableDictionary *attrDict = [[NSMutableDictionary alloc] init];
-    attrDict[NSFontAttributeName] = font;
-
-    if (color != nil) {
-        attrDict[NSForegroundColorAttributeName] = color;
-    }
-
-    if (backgroundColor != nil) {
-        attrDict[NSBackgroundColorAttributeName] = backgroundColor;
-    }
-
-    if (textDecoration != nil) {
-        if ([textDecoration rangeOfString:@"underline"].location != NSNotFound) {
-            attrDict[NSUnderlineStyleAttributeName] = [NSNumber numberWithInt:NSUnderlineStyleSingle];
-        }
-
-        if ([textDecoration rangeOfString:@"line-through"].location != NSNotFound) {
-            attrDict[NSStrikethroughStyleAttributeName] = [NSNumber numberWithInt:NSUnderlineStyleSingle];
-        }
-    }
-
-    attrDict[NSBaselineOffsetAttributeName] = [NSNumber numberWithInt:baselineOffset];
-
-    return [[NSMutableAttributedString alloc] initWithString:text attributes:attrDict];
-
-}
-
-+(UIImage*)scaleImage:(UIImage*)image width:(CGFloat)width height:(CGFloat)height scaleFactor:(CGFloat)scaleFactor {
-    UIImage *resultImage;
-    @autoreleasepool {
-        UIGraphicsBeginImageContextWithOptions(CGSizeMake(width, height), NO, scaleFactor);
-        [image drawInRect:CGRectMake(0, 0, width, height)];
-        resultImage = UIGraphicsGetImageFromCurrentImageContext();
-        UIGraphicsEndImageContext();
-    }
-    return resultImage;
-}
-
-+(NSData*)getImageData:(UIImage*)image format:(NSString*)format quality:(CGFloat)quality {
-    NSData *data;
-    @autoreleasepool {
-        if ([format.lowercaseString isEqualToString:@"png"]) {
-            data = UIImagePNGRepresentation(image);
-        } else {
-            data = UIImageJPEGRepresentation(image, quality);
-        }
-    }
-    return data;
-}
-
-@end

package/platforms/ios/src/UIView+NativeScript.h

@@ -1,15 +0,0 @@
-//
-//  UIView+NativeScript.h
-//
-//  Created by Nathan Walker on 2/02/2022.
-#include <UIKit/UIKit.h>
-
-@interface UIView (NativeScript)
-
-- (void)nativeScriptSetTextDecorationAndTransform:(NSString*)text textDecoration:(NSString*)textDecoration letterSpacing:(CGFloat)letterSpacing lineHeight:(CGFloat)lineHeight;
-
--(void)nativeScriptSetFormattedTextDecorationAndTransform:(NSDictionary*)details letterSpacing:(CGFloat)letterSpacing lineHeight:(CGFloat)lineHeight;
-
--(void)nativeScriptSetFormattedTextStroke:(CGFloat)width color:(UIColor*)color;
-
-@end

package/platforms/ios/src/UIView+NativeScript.m

@@ -1,150 +0,0 @@
-#import <UIKit/UIKit.h>
-#import "UIView+NativeScript.h"
-#import "NativeScriptUtils.h"
-
-@implementation UIView (NativeScript)
-- (void)nativeScriptSetTextDecorationAndTransform:(NSString*)text textDecoration:(NSString*)textDecoration letterSpacing:(CGFloat)letterSpacing lineHeight:(CGFloat)lineHeight  {
-    NSMutableDictionary *attrDict = [[NSMutableDictionary alloc] init];
-    
-    if ([textDecoration rangeOfString:@"underline"].location != NSNotFound) {
-        attrDict[NSUnderlineStyleAttributeName] = [NSNumber numberWithInt:NSUnderlineStyleSingle];
-    }
-    
-    if ([textDecoration rangeOfString:@"line-through"].location != NSNotFound) {
-        attrDict[NSStrikethroughStyleAttributeName] = [NSNumber numberWithInt:NSUnderlineStyleSingle];
-    }
-    BOOL isTextType = [self isKindOfClass:[UITextField class]] || [self isKindOfClass:[UITextView class]] | [self isKindOfClass:[UILabel class]] | [self isKindOfClass:[UIButton class]];
-    
-    if (letterSpacing != 0 && isTextType && ((UITextView*)self).font != nil) {
-        NSNumber *kern = [NSNumber numberWithDouble:letterSpacing * ((UITextView*)self).font.pointSize];
-        attrDict[NSKernAttributeName] = kern;
-        if ([self isKindOfClass:[UITextField class]]) {
-            [((UITextField*)self).defaultTextAttributes setValue:kern forKey:NSKernAttributeName];
-        }
-    }
-    
-    BOOL isTextView = [self isKindOfClass:[UITextView class]];
-    if (lineHeight > 0) {
-        NSMutableParagraphStyle *paragraphStyle = [[NSMutableParagraphStyle alloc] init];
-        // Note: Avoid using lineSpacing as it will append the height as extra space
-        paragraphStyle.minimumLineHeight = lineHeight;
-        // make sure a possible previously set text alignment setting is not lost when line height is specified
-        if ([self isKindOfClass:[UIButton class]]) {
-            paragraphStyle.alignment = ((UIButton*)self).titleLabel.textAlignment;
-        } else {
-            paragraphStyle.alignment = ((UILabel*)self).textAlignment;
-        }
-        
-        if ([self isKindOfClass:[UILabel class]]) {
-            // make sure a possible previously set line break mode is not lost when line height is specified
-            paragraphStyle.lineBreakMode = ((UILabel*)self).lineBreakMode;
-        }
-        attrDict[NSParagraphStyleAttributeName] = paragraphStyle;
-    } else if (isTextView) {
-        NSMutableParagraphStyle *paragraphStyle = [[NSMutableParagraphStyle alloc] init];
-        paragraphStyle.alignment = ((UITextView*)self).textAlignment;
-        attrDict[NSParagraphStyleAttributeName] = paragraphStyle;
-    }
-    
-    if (attrDict.count > 0 || isTextView) {
-        if (isTextView && ((UITextView*)self).font) {
-            // UITextView's font seems to change inside.
-            attrDict[NSFontAttributeName] = ((UITextView*)self).font;
-        }
-        
-        NSMutableAttributedString *result = [[NSMutableAttributedString alloc] initWithString:text];
-        [result setAttributes:attrDict range:(NSRange){
-            0,
-            text.length
-        }];
-        
-        if ([self isKindOfClass:[UIButton class]]) {
-            [(UIButton*)self setAttributedTitle:result forState:UIControlStateNormal];
-        } else {
-            ((UITextView*)self).attributedText = result;
-        }
-    } else {
-        if ([self isKindOfClass:[UIButton class]]) {
-            // Clear attributedText or title won't be affected.
-            [(UIButton*)self setAttributedTitle:nil forState:UIControlStateNormal];
-            [(UIButton*)self setTitle:text forState:UIControlStateNormal];
-        } else {
-            // Clear attributedText or text won't be affected.
-            ((UILabel*)self).attributedText = nil;
-            ((UILabel*)self).text = text;
-        }
-    }
-}
-
--(void)nativeScriptSetFormattedTextDecorationAndTransform:(NSDictionary*)details letterSpacing:(CGFloat)letterSpacing lineHeight:(CGFloat)lineHeight {
-    NSMutableAttributedString *attrText = [NativeScriptUtils createMutableStringWithDetails:details];
-    if (letterSpacing != 0) {
-        NSNumber *kern = [NSNumber numberWithDouble:letterSpacing * ((UITextView*)self).font.pointSize];
-        [attrText addAttribute:NSKernAttributeName value:kern range:(NSRange){
-            0,
-            attrText.length
-        } ];
-    }
-    
-    BOOL isLabel = [self isKindOfClass:[UILabel class]];
-    if (lineHeight > 0) {
-        NSMutableParagraphStyle *paragraphStyle = [[NSMutableParagraphStyle alloc] init];
-        // Note: Avoid using lineSpacing as it will append the height as extra space
-        paragraphStyle.minimumLineHeight = lineHeight;
-        // make sure a possible previously set text alignment setting is not lost when line height is specified
-        if ([self isKindOfClass:[UIButton class]]) {
-            paragraphStyle.alignment = ((UIButton*)self).titleLabel.textAlignment;
-        } else {
-            // Paragraph alignment is also important for tappable spans as NSTextContainer takes it into account
-            paragraphStyle.alignment = ((UILabel*)self).textAlignment;
-        }
-        
-        if (isLabel) {
-            // make sure a possible previously set line break mode is not lost when line height is specified
-            paragraphStyle.lineBreakMode = ((UILabel*)self).lineBreakMode;
-        }
-        [attrText addAttribute:NSParagraphStyleAttributeName value:paragraphStyle range:(NSRange){
-            0,
-            attrText.length
-        }];
-    } else if (isLabel || [self isKindOfClass:[UITextView class]]) {
-        NSMutableParagraphStyle *paragraphStyle = [[NSMutableParagraphStyle alloc] init];
-
-        if (isLabel) {
-            // It's important to set paragraph alignment for link tap to work on multi-line spans as NSTextContainer takes it into account
-            paragraphStyle.alignment = ((UILabel*)self).textAlignment;
-        } else {
-            paragraphStyle.alignment = ((UITextView*)self).textAlignment;
-        }
-        [attrText addAttribute:NSParagraphStyleAttributeName value:paragraphStyle range:(NSRange){
-            0,
-            attrText.length
-        }];
-    }
-    
-    if ([self isKindOfClass:[UIButton class]]) {
-        [(UIButton*)self setAttributedTitle:attrText forState:UIControlStateNormal];
-    } else {
-        if (@available(iOS 13.0, *)) {
-            ((UILabel*)self).textColor = [UIColor labelColor];
-        }
-        
-        ((UILabel*)self).attributedText = attrText;
-    }
-}
-
--(void)nativeScriptSetFormattedTextStroke:(CGFloat)width color:(UIColor*)color {
-    if (width > 0) {
-        NSMutableAttributedString *attrText = [[NSMutableAttributedString alloc] initWithAttributedString:((UILabel*)self).attributedText];
-        [attrText addAttribute:NSStrokeWidthAttributeName value:[NSNumber numberWithFloat:width] range:(NSRange){
-            0,
-            attrText.length
-        }];
-        [attrText addAttribute:NSStrokeColorAttributeName value:color range:(NSRange){
-            0,
-            attrText.length
-        }];
-        ((UILabel*)self).attributedText = attrText;
-    }
-}
-@end

package/platforms/ios/src/module.modulemap

@@ -1,14 +0,0 @@
-module NativeScriptEmbedder {
-    header "NativeScriptEmbedder.h"
-    export *
-}
-
-module NativeScriptUtils {
-    header "NativeScriptUtils.h"
-    export *
-}
-
-module UIViewNativeScript {
-    header "UIView+NativeScript.h"
-    export *
-}