react-native-ios-translate-sheet 1.0.1 → 1.1.0

package/ios/IOSTranslateSheet-Bridging-Header.h

@@ -0,0 +1,4 @@
+#import <React/RCTBridgeModule.h>
+#import <React/RCTViewManager.h>
+#import <React/RCTEventEmitter.h>
+#import <React/RCTComponent.h>

package/ios/IOSTranslateSheet.swift

@@ -2,25 +2,25 @@ import SwiftUI
 import Translation
 
 class Props: ObservableObject {
-  @Published var text: String = ""
-  @Published var isPresented: Bool = false
-  @Published var onHide: () -> Void = {}
-  @Published var opacity: Double = 0.0
+    @Published var text: String = ""
+    @Published var isPresented: Bool = false
+    @Published var onHide: () -> Void = {}
+    @Published var opacity: Double = 0.0
 }
 
 struct IOSTranslateSheet: View {
-  @ObservedObject var props: Props
-  
-  var body: some View {
-    if #available(iOS 17.4, *) {
-        Color.clear
-            .frame(maxWidth: .infinity, maxHeight: .infinity)
-            .translationPresentation(isPresented: $props.isPresented, text: props.text)
-            .onChange(of: props.isPresented) { oldValue, newValue in
-                if oldValue == true && newValue == false {
-                    props.onHide()
+    @ObservedObject var props: Props
+    
+    var body: some View {
+        if #available(iOS 17.4, *) {
+            Color.clear
+                .frame(maxWidth: .infinity, maxHeight: .infinity)
+                .translationPresentation(isPresented: $props.isPresented, text: props.text)
+                .onChange(of: props.isPresented) { oldValue, newValue in
+                    if oldValue == true && newValue == false {
+                        props.onHide()
+                    }
                 }
-            }
+        }
     }
-  }
 }

package/ios/IOSTranslateSheetProvider.swift

@@ -2,71 +2,74 @@ import UIKit
 import React
 import SwiftUI
 
-@objc public class IOSTranslateSheetProvider: UIView {
-  private var props = Props()
-  private var hostingController: UIHostingController<IOSTranslateSheet>?
-
-  @objc public var text: String = "" {
-    didSet {
-      props.text = text
+extension UIView {
+    func pinEdges(to view: UIView) {
+        translatesAutoresizingMaskIntoConstraints = false
+        NSLayoutConstraint.activate([
+            leadingAnchor.constraint(equalTo: view.leadingAnchor),
+            trailingAnchor.constraint(equalTo: view.trailingAnchor),
+            topAnchor.constraint(equalTo: view.topAnchor),
+            bottomAnchor.constraint(equalTo: view.bottomAnchor)
+        ])
     }
-  }
+}
 
-  @objc public var isPresented: Bool = false {
-    didSet {
-      props.isPresented = isPresented
-      hostingController?.view.isHidden = !isPresented
-    }
-  }
+public typealias RCTBubblingEventBlock = @convention(block) (_ body: [AnyHashable: Any]?) -> Void
 
-  @objc public var opacity: Double = 0.0 {
-    didSet {
-      props.opacity = opacity
+@objc public class IOSTranslateSheetProvider: UIView {
+    private var props = Props()
+    private var hostingController: UIHostingController<IOSTranslateSheet>?
+    
+    @objc public var text: String = "" {
+        didSet {
+            props.text = text
+        }
     }
-  }
-
-  @objc public var onHideCallback: (() -> Void)?
-  
-  public override func layoutSubviews() {
-      super.layoutSubviews()
-      setupView()
+    
+    @objc public var isPresented: Bool = false {
+        didSet {
+            props.isPresented = isPresented
+            hostingController?.view.isHidden = !isPresented
+        }
     }
-  
-  private func setupView() {
-    if self.hostingController != nil {
-      return
+    
+    @objc public var opacity: Double = 0.0 {
+        didSet {
+            props.opacity = opacity
+        }
     }
-
-    props.onHide = { [weak self] in
-      self?.onHideCallback?()
-      self?.hostingController?.view.isHidden = true
+    
+    @objc public var onHide: RCTBubblingEventBlock? {
+        didSet {
+            props.onHide = { [weak self] in
+                self?.onHide?([:])
+            }
+        }
     }
     
-    self.hostingController = UIHostingController(
-      rootView: IOSTranslateSheet(
-        props: props
-      )
-    )
+    public override func layoutSubviews() {
+        super.layoutSubviews()
+        setupView()
+    }
     
-    if let hostingController = self.hostingController {
-      hostingController.view.isHidden = !isPresented
-      hostingController.view.backgroundColor = UIColor(white: 0.0, alpha: opacity)
-
-      addSubview(hostingController.view)
-      hostingController.view.translatesAutoresizingMaskIntoConstraints = false
-      hostingController.view.pinEdges(to: self)
-      reactAddController(toClosestParent: hostingController)
+    private func setupView() {
+        if self.hostingController != nil {
+            return
+        }
+        
+        self.hostingController = UIHostingController(
+            rootView: IOSTranslateSheet(
+                props: props
+            )
+        )
+        
+        if let hostingController = self.hostingController {
+            hostingController.view.isHidden = !isPresented
+            hostingController.view.backgroundColor = UIColor(white: 0.0, alpha: opacity)
+            
+            addSubview(hostingController.view)
+            hostingController.view.pinEdges(to: self)
+            reactAddController(toClosestParent: hostingController)
+        }
     }
-  }
-}
-
-extension UIView {
-  func pinEdges(to other: UIView) {
-    NSLayoutConstraint.activate([
-      leadingAnchor.constraint(equalTo: other.leadingAnchor),
-      trailingAnchor.constraint(equalTo: other.trailingAnchor),
-      topAnchor.constraint(equalTo: other.topAnchor),
-      bottomAnchor.constraint(equalTo: other.bottomAnchor)
-    ])
-  }
 }

package/ios/IOSTranslateSheetView.h

@@ -1,18 +1,11 @@
-#ifdef __cplusplus
-
+#ifdef RCT_NEW_ARCH_ENABLED
 #import <React/RCTViewComponentView.h>
 #import <UIKit/UIKit.h>
 
-#ifndef IOSTranslateSheetViewNativeComponent_h
-#define IOSTranslateSheetViewNativeComponent_h
-
 NS_ASSUME_NONNULL_BEGIN
 
 @interface IOSTranslateSheetView : RCTViewComponentView
 @end
 
 NS_ASSUME_NONNULL_END
-
-#endif /* IOSTranslateSheetViewNativeComponent_h */
-
-#endif /* __cplusplus */
+#endif

package/ios/IOSTranslateSheetView.mm

@@ -1,11 +1,7 @@
+#ifdef RCT_NEW_ARCH_ENABLED
 #import "IOSTranslateSheetView.h"
-
-#import "generated/RNIOSTranslateSheetViewSpec/ComponentDescriptors.h"
-#import "generated/RNIOSTranslateSheetViewSpec/EventEmitters.h"
-#import "generated/RNIOSTranslateSheetViewSpec/Props.h"
-#import "generated/RNIOSTranslateSheetViewSpec/RCTComponentViewHelpers.h"
-
-#import "RCTFabricComponentsPlugins.h"
+#import <React/RCTConvert.h>
+#import <React/RCTFabricComponentsPlugins.h>
 
 #if __has_include("IOSTranslateSheet/IOSTranslateSheet-Swift.h")
 #import "IOSTranslateSheet/IOSTranslateSheet-Swift.h"
@@ -13,14 +9,18 @@
 #import "IOSTranslateSheet-Swift.h"
 #endif
 
+#import "generated/RNIOSTranslateSheetViewSpec/ComponentDescriptors.h"
+#import "generated/RNIOSTranslateSheetViewSpec/EventEmitters.h"
+#import "generated/RNIOSTranslateSheetViewSpec/Props.h"
+#import "generated/RNIOSTranslateSheetViewSpec/RCTComponentViewHelpers.h"
+
 using namespace facebook::react;
 
 @interface IOSTranslateSheetView () <RCTIOSTranslateSheetViewViewProtocol>
-
 @end
 
 @implementation IOSTranslateSheetView {
-    IOSTranslateSheetProvider * _view;
+    IOSTranslateSheetProvider *_view;
 }
 
 + (ComponentDescriptorProvider)componentDescriptorProvider
@@ -30,54 +30,47 @@ using namespace facebook::react;
 
 - (instancetype)initWithFrame:(CGRect)frame
 {
-  if (self = [super initWithFrame:frame]) {
-    static const auto defaultProps = std::make_shared<const IOSTranslateSheetViewProps>();
-    _props = defaultProps;
-
-    _view = [[IOSTranslateSheetProvider alloc] init];
-    
-    __weak __typeof(self) weakSelf = self;
-    _view.onHideCallback = ^{
-        __strong __typeof(weakSelf) strongSelf = weakSelf;
-        if (strongSelf) {
-            // Emit the onHide event
-            if (strongSelf->_eventEmitter) {
+    if (self = [super initWithFrame:frame]) {
+        static const auto defaultProps = std::make_shared<const IOSTranslateSheetViewProps>();
+        _props = defaultProps;
+        _view = [[IOSTranslateSheetProvider alloc] init];
+        
+        __weak __typeof__(self) weakSelf = self;
+        _view.onHide = ^(NSDictionary *_) {
+            __typeof__(self) strongSelf = weakSelf;
+            if (strongSelf && strongSelf->_eventEmitter) {
                 std::dynamic_pointer_cast<const IOSTranslateSheetViewEventEmitter>(strongSelf->_eventEmitter)
                     ->onHide({});
             }
-        }
-    };
-
-    self.contentView = _view;
-  }
-
-  return self;
+        };
+        
+        self.contentView = _view;
+    }
+    return self;
 }
 
 - (void)updateProps:(Props::Shared const &)props oldProps:(Props::Shared const &)oldProps
 {
-    const auto &oldViewProps = *std::static_pointer_cast<IOSTranslateSheetViewProps const>(_props);
-    const auto &newViewProps = *std::static_pointer_cast<IOSTranslateSheetViewProps const>(props);
+    const auto &oldViewProps = *std::static_pointer_cast<const IOSTranslateSheetViewProps>(_props);
+    const auto &newViewProps = *std::static_pointer_cast<const IOSTranslateSheetViewProps>(props);
 
     if (oldViewProps.text != newViewProps.text) {
-        NSString *text = [[NSString alloc] initWithUTF8String: newViewProps.text.c_str()];
-        [_view setText:text];
+        _view.text = [[NSString alloc] initWithUTF8String:newViewProps.text.c_str()];
     }
-    
     if (oldViewProps.isPresented != newViewProps.isPresented) {
-        [_view setIsPresented:newViewProps.isPresented];
+        _view.isPresented = newViewProps.isPresented;
     }
-
     if (oldViewProps.opacity != newViewProps.opacity) {
-        [_view setOpacity:newViewProps.opacity];
+        _view.opacity = newViewProps.opacity;
     }
 
     [super updateProps:props oldProps:oldProps];
 }
 
+@end
+
 Class<RCTComponentViewProtocol> IOSTranslateSheetViewCls(void)
 {
     return IOSTranslateSheetView.class;
 }
-
-@end
+#endif

package/ios/IOSTranslateSheetViewManager.mm

@@ -1,7 +1,14 @@
 #import <React/RCTViewManager.h>
 #import <React/RCTUIManager.h>
+#import <React/RCTComponent.h>
 #import "RCTBridge.h"
 
+#ifdef RCT_NEW_ARCH_ENABLED
+#import <React/RCTConvert.h>
+#import <ReactCommon/RCTTurboModule.h>
+#import "RCTFabricComponentsPlugins.h"
+#endif
+
 #if __has_include("IOSTranslateSheet/IOSTranslateSheet-Swift.h")
 #import "IOSTranslateSheet/IOSTranslateSheet-Swift.h"
 #else
@@ -15,11 +22,22 @@
 
 RCT_EXPORT_MODULE(IOSTranslateSheetView)
 
-- (IOSTranslateSheetProvider *)view
+- (UIView *)view
 {
-  return [[IOSTranslateSheetProvider alloc] init];
+    IOSTranslateSheetProvider *view = [[IOSTranslateSheetProvider alloc] init];
+    return view;
 }
 
-RCT_EXPORT_VIEW_PROPERTY(color, NSString)
+RCT_EXPORT_VIEW_PROPERTY(text, NSString)
+RCT_EXPORT_VIEW_PROPERTY(isPresented, BOOL)
+RCT_EXPORT_VIEW_PROPERTY(opacity, double)
+RCT_EXPORT_VIEW_PROPERTY(onHide, RCTDirectEventBlock)
 
-@end
+#ifdef RCT_NEW_ARCH_ENABLED
++ (BOOL)requiresMainQueueSetup
+{
+    return YES;
+}
+#endif
+
+@end

package/lib/commonjs/IOSTranslateSheetViewNativeComponent.js.map

@@ -1 +1 @@
-{"version":3,"names":["_codegenNativeComponent","_interopRequireDefault","require","e","__esModule","default","_default","exports","codegenNativeComponent"],"sourceRoot":"../../src","sources":["IOSTranslateSheetViewNativeComponent.ts"],"mappings":";;;;;;AAKA,IAAAA,uBAAA,GAAAC,sBAAA,CAAAC,OAAA;AAA6F,SAAAD,uBAAAE,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAAA,IAAAG,QAAA,GAAAC,OAAA,CAAAF,OAAA,GAS9E,IAAAG,+BAAsB,EACnC,uBACF,CAAC","ignoreList":[]}
+{"version":3,"names":["_codegenNativeComponent","_interopRequireDefault","require","e","__esModule","default","_default","exports","codegenNativeComponent"],"sourceRoot":"../../src","sources":["IOSTranslateSheetViewNativeComponent.ts"],"mappings":";;;;;;AAMA,IAAAA,uBAAA,GAAAC,sBAAA,CAAAC,OAAA;AAA6F,SAAAD,uBAAAE,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAAA,IAAAG,QAAA,GAAAC,OAAA,CAAAF,OAAA,GAS9E,IAAAG,+BAAsB,EACnC,uBACF,CAAC","ignoreList":[]}

package/lib/module/IOSTranslateSheetViewNativeComponent.js.map

@@ -1 +1 @@
-{"version":3,"names":["codegenNativeComponent"],"sourceRoot":"../../src","sources":["IOSTranslateSheetViewNativeComponent.ts"],"mappings":";;AAKA,OAAOA,sBAAsB,MAAM,yDAAyD;AAS5F,eAAeA,sBAAsB,CACnC,uBACF,CAAC","ignoreList":[]}
+{"version":3,"names":["codegenNativeComponent"],"sourceRoot":"../../src","sources":["IOSTranslateSheetViewNativeComponent.ts"],"mappings":";;AAMA,OAAOA,sBAAsB,MAAM,yDAAyD;AAS5F,eAAeA,sBAAsB,CACnC,uBACF,CAAC","ignoreList":[]}

package/lib/typescript/IOSTranslateSheetViewNativeComponent.d.ts

@@ -1,11 +1,11 @@
-import type { HostComponent, ViewProps } from "react-native";
-import type { DirectEventHandler, Float } from "react-native/Libraries/Types/CodegenTypes";
+import type { ViewProps } from "react-native";
+import type { DirectEventHandler, Float, WithDefault } from "react-native/Libraries/Types/CodegenTypes";
 export interface IOSTranslateSheetProps extends ViewProps {
     text: string;
     isPresented: boolean;
-    onHide: DirectEventHandler<null>;
-    opacity?: Float;
+    onHide?: DirectEventHandler<null>;
+    opacity?: WithDefault<Float, 0.0>;
 }
-declare const _default: HostComponent<IOSTranslateSheetProps>;
+declare const _default: import("react-native/Libraries/Utilities/codegenNativeComponent").NativeComponentType<IOSTranslateSheetProps>;
 export default _default;
 //# sourceMappingURL=IOSTranslateSheetViewNativeComponent.d.ts.map

package/lib/typescript/IOSTranslateSheetViewNativeComponent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"IOSTranslateSheetViewNativeComponent.d.ts","sourceRoot":"","sources":["../../src/IOSTranslateSheetViewNativeComponent.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC7D,OAAO,KAAK,EACV,kBAAkB,EAClB,KAAK,EACN,MAAM,2CAA2C,CAAC;AAGnD,MAAM,WAAW,sBAAuB,SAAQ,SAAS;IACvD,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,OAAO,CAAC;IACrB,MAAM,EAAE,kBAAkB,CAAC,IAAI,CAAC,CAAC;IACjC,OAAO,CAAC,EAAE,KAAK,CAAC;CACjB;wBAII,aAAa,CAAC,sBAAsB,CAAC;AAF1C,wBAE2C"}
+{"version":3,"file":"IOSTranslateSheetViewNativeComponent.d.ts","sourceRoot":"","sources":["../../src/IOSTranslateSheetViewNativeComponent.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,KAAK,EACV,kBAAkB,EAClB,KAAK,EACL,WAAW,EACZ,MAAM,2CAA2C,CAAC;AAGnD,MAAM,WAAW,sBAAuB,SAAQ,SAAS;IACvD,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,OAAO,CAAC;IACrB,MAAM,CAAC,EAAE,kBAAkB,CAAC,IAAI,CAAC,CAAC;IAClC,OAAO,CAAC,EAAE,WAAW,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;CACnC;;AAED,wBAEE"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-ios-translate-sheet",
-  "version": "1.0.1",
+  "version": "1.1.0",
   "description": "SwiftUI Translate Sheet on React Native",
   "source": "./src/index.tsx",
   "main": "lib/commonjs/index.js",

package/src/IOSTranslateSheetViewNativeComponent.ts

@@ -1,17 +1,18 @@
-import type { HostComponent, ViewProps } from "react-native";
+import type { ViewProps } from "react-native";
 import type {
   DirectEventHandler,
   Float,
+  WithDefault,
 } from "react-native/Libraries/Types/CodegenTypes";
 import codegenNativeComponent from "react-native/Libraries/Utilities/codegenNativeComponent";
 
 export interface IOSTranslateSheetProps extends ViewProps {
   text: string;
   isPresented: boolean;
-  onHide: DirectEventHandler<null>;
-  opacity?: Float;
+  onHide?: DirectEventHandler<null>;
+  opacity?: WithDefault<Float, 0.0>;
 }
 
 export default codegenNativeComponent<IOSTranslateSheetProps>(
   "IOSTranslateSheetView",
-) as HostComponent<IOSTranslateSheetProps>;
+);