@octopus-community/react-native 1.0.3 → 1.0.5

package/ios/OctopusEventManager.swift

@@ -2,16 +2,16 @@ import React
 import Octopus
 
 class OctopusEventManager {
-  private weak var eventEmitter: RCTEventEmitter?
+  private weak var bridge: RCTBridge?
   private var hasListeners = false
   
-  init(eventEmitter: RCTEventEmitter) {
-    self.eventEmitter = eventEmitter
+  init(bridge: RCTBridge?) {
+    self.bridge = bridge
   }
   
   func emitLoginRequired() {
     if hasListeners {
-      eventEmitter?.sendEvent(withName: "loginRequired", body: nil)
+      bridge?.eventDispatcher().sendAppEvent(withName: "loginRequired", body: nil)
     }
   }
   
@@ -19,14 +19,14 @@ class OctopusEventManager {
     if hasListeners {
       let fieldToEdit = ProfileFieldMapper.toReactNativeString(profileField)
       let eventBody = ["fieldToEdit": fieldToEdit]
-      eventEmitter?.sendEvent(withName: "editUser", body: eventBody)
+      bridge?.eventDispatcher().sendAppEvent(withName: "editUser", body: eventBody)
     }
   }
   
   func emitUserTokenRequest(requestId: String) {
     if hasListeners {
       let eventBody = ["requestId": requestId]
-      eventEmitter?.sendEvent(withName: "userTokenRequest", body: eventBody)
+      bridge?.eventDispatcher().sendAppEvent(withName: "userTokenRequest", body: eventBody)
     }
   }
   
@@ -37,8 +37,4 @@ class OctopusEventManager {
   func stopObserving() {
     hasListeners = false
   }
-  
-  func supportedEvents() -> [String] {
-    return ["loginRequired", "editUser", "userTokenRequest"]
-  }
 }

package/ios/OctopusReactNativeSdk-Bridging-Header.h

@@ -1,3 +1,2 @@
 #import <React/RCTBridgeModule.h>
 #import <React/RCTViewManager.h>
-#import <React/RCTEventEmitter.h>

package/ios/OctopusReactNativeSdk.mm

@@ -1,7 +1,6 @@
 #import <React/RCTBridgeModule.h>
-#import <React/RCTEventEmitter.h>
 
-@interface RCT_EXTERN_MODULE(OctopusReactNativeSdk, RCTEventEmitter)
+@interface RCT_EXTERN_MODULE(OctopusReactNativeSdk, NSObject)
 
 RCT_EXTERN_METHOD(initialize:(NSDictionary *)options
                   withResolver:(RCTPromiseResolveBlock)resolve
@@ -37,6 +36,10 @@ RCT_EXTERN_METHOD(updateTheme:(NSDictionary *)themeOptions
                   withResolver:(RCTPromiseResolveBlock)resolve
                   withRejecter:(RCTPromiseRejectBlock)reject)
 
+RCT_EXTERN_METHOD(addListener:(NSString *)eventName)
+
+RCT_EXTERN_METHOD(removeListeners:(NSInteger)count)
+
 + (BOOL)requiresMainQueueSetup
 {
   return NO;

package/ios/OctopusReactNativeSdk.swift

@@ -2,20 +2,33 @@ import Octopus
 import OctopusUI
 import SwiftUI
 import UIKit
+import React
 
 @objc(OctopusReactNativeSdk)
-class OctopusReactNativeSdk: RCTEventEmitter {
+class OctopusReactNativeSdk: NSObject, RCTBridgeModule {
 
   // MARK: - Properties
 
   private var octopusSDK: OctopusSDK?
   private lazy var uiManager = OctopusUIManager()
-  private lazy var eventManager = OctopusEventManager(eventEmitter: self)
+  private lazy var eventManager = OctopusEventManager(bridge: bridge)
   private let sdkInitializer = OctopusSDKInitializer()
   private var ssoAuthenticator: OctopusSSOAuthenticator?
   private var theme: OctopusTheme?
   private var logoSource: [String: Any]?
   private var fontConfiguration: [String: Any]?
+  
+  // MARK: - RCTBridgeModule
+  
+  @objc var bridge: RCTBridge!
+  
+  @objc static func moduleName() -> String! {
+    return "OctopusReactNativeSdk"
+  }
+  
+  @objc static func requiresMainQueueSetup() -> Bool {
+    return false
+  }
 
   // MARK: - Initialization
 
@@ -151,22 +164,19 @@ class OctopusReactNativeSdk: RCTEventEmitter {
     octopusSDK = nil
   }
 
-  @objc override func invalidate() {
+  @objc func invalidate() {
     cleanup()
-    super.invalidate()
   }
-
-  // MARK: - RCTEventEmitter overrides
-
-  @objc override func supportedEvents() -> [String]! {
-    return eventManager.supportedEvents()
-  }
-
-  @objc override func startObserving() {
+  
+  // MARK: - Event Listener Support for NativeEventEmitter
+  
+  @objc func addListener(_ eventName: String) {
+    // Start observing when listeners are added
     eventManager.startObserving()
   }
-
-  @objc override func stopObserving() {
+  
+  @objc func removeListeners(_ count: Int) {
+    // Stop observing when listeners are removed
     eventManager.stopObserving()
   }
 }

package/ios/OctopusUIManager.swift

@@ -89,18 +89,43 @@ class OctopusUIManager {
       }.resume()
     } else {
       // Local file path (from Image.resolveAssetSource)
-      if let image = UIImage(contentsOfFile: uri) {
+      if let image = loadImageFromLocalPath(uri) {
         completion(image)
       } else {
-        // Fallback: try to load from bundle using the filename
-        let filename = (uri as NSString).lastPathComponent
-        let nameWithoutExtension = (filename as NSString).deletingPathExtension
-        let image = UIImage(named: nameWithoutExtension)
-        completion(image)
+        completion(nil)
       }
     }
   }
 
+  private func loadImageFromLocalPath(_ path: String) -> UIImage? {
+    // Handle absolute file URLs (file://) first
+    if path.hasPrefix("file://"), let url = URL(string: path),
+       let image = UIImage(contentsOfFile: url.path) {
+        return image
+    }
+
+    // Try raw absolute path next
+    if path.hasPrefix("/"), FileManager.default.fileExists(atPath: path),
+      let image = UIImage(contentsOfFile: path) {
+      return image
+    }
+
+    // For React Native bundled assets the path is relative (e.g. assets/assets/logo.png)
+    let nsPath = path as NSString
+    let directory = nsPath.deletingLastPathComponent
+    let filename = nsPath.lastPathComponent
+    let nameWithoutExtension = (filename as NSString).deletingPathExtension
+    let fileExtension = (filename as NSString).pathExtension
+
+    if let bundlePath = Bundle.main.path(forResource: nameWithoutExtension, ofType: fileExtension.isEmpty ? nil : fileExtension, inDirectory: directory.isEmpty ? nil : directory) ,
+      let image = UIImage(contentsOfFile: bundlePath) {
+        return image
+    }
+
+    // Final fallback: let UIKit try to resolve it by name (works for assets catalog entries)
+    return UIImage(named: nameWithoutExtension)
+  }
+
   func closeUI() throws {
     guard let presentedVC = presentedViewController else {
       throw NSError(domain: "CLOSE_UI_ERROR", code: 0, userInfo: [NSLocalizedDescriptionKey: "No UI is currently presented"])

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@octopus-community/react-native",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "description": "React Native module for the Octopus Community SDK",
   "source": "./src/index.ts",
   "main": "./lib/module/index.js",
@@ -67,7 +67,7 @@
     "@evilmartians/lefthook": "^1.5.0",
     "@react-native/eslint-config": "^0.78.0",
     "@types/jest": "^29.5.5",
-    "@types/react": "^19.0.0",
+    "@types/react": "^19.1.0",
     "commitlint": "^19.6.1",
     "del-cli": "^5.1.0",
     "eslint": "^9.22.0",
@@ -75,8 +75,8 @@
     "eslint-plugin-prettier": "^5.2.3",
     "jest": "^29.7.0",
     "prettier": "^3.0.3",
-    "react": "19.0.0",
-    "react-native": "0.78.2",
+    "react": "19.1.0",
+    "react-native": "^0.81.4",
     "react-native-builder-bob": "^0.40.12",
     "turbo": "^1.10.7",
     "typedoc": "^0.28.7",