@convep_mobilogy/react-native-qms-plugin 0.9.1 → 0.9.2

package/android/build.gradle

@@ -75,7 +75,7 @@ dependencies {
     implementation "com.facebook.react:react-android"
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     implementation 'com.facebook.react:react-native:+' 
-    implementation "com.convep.qms:qms-plugin:1.9.8"
+    implementation "com.convep.qms:qms-plugin:1.9.15"
     implementation 'androidx.appcompat:appcompat:1.6.1'
 
     implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0'

package/ios/QmsPlugin/QmsDashboardViewManager.mm

@@ -6,43 +6,75 @@
 @interface QmsDashboardView : UIView
 @property (nonatomic, strong) UIViewController *dashboardVC;
 @property (nonatomic, assign) BOOL didSetupVC;
-// New props
+
 @property (nonatomic, copy) NSString *ClientID;
 @property (nonatomic, copy) NSString *ClientCode;
 @property (nonatomic, copy) NSString *user_token;
+
+@property (nonatomic, copy) RCTDirectEventBlock onClose;
 @end
 
 @implementation QmsDashboardView
 
 - (instancetype)initWithFrame:(CGRect)frame {
   if (self = [super initWithFrame:frame]) {
-    _dashboardVC = [QmsPluginUI makeViewController];
+    _dashboardVC = [QmsPluginUI makeViewController];   
     _didSetupVC = NO;
     _dashboardVC.view.backgroundColor = [UIColor whiteColor];
+
+    // Listen for native dashboard close notification
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(handleDashboardClose:)
+                                                 name:@"QmsDashboardDidCloseNotification"
+                                               object:nil];
   }
   return self;
 }
 
 - (void)didMoveToWindow {
-  [super didMoveToWindow];
-  if (self.window && !_didSetupVC) {
-    UIViewController *parentVC = [UIApplication sharedApplication].keyWindow.rootViewController;
-    if (parentVC) {
-      [parentVC addChildViewController:_dashboardVC];
-      _dashboardVC.view.frame = parentVC.view.bounds;
-      _dashboardVC.view.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
-      [parentVC.view addSubview:_dashboardVC.view];
-      [_dashboardVC didMoveToParentViewController:parentVC];
-      _didSetupVC = YES;
-      
-      // Forward props once the VC is added
-      [self forwardPropsToVC];
+    [super didMoveToWindow];
+    if (self.window && !_didSetupVC) {
+        UIViewController *parentVC = [UIApplication sharedApplication].keyWindow.rootViewController;
+        if (parentVC) {
+
+            // 1️⃣ create VC with props
+            _dashboardVC = [QmsPluginUI makeViewController];
+
+            [parentVC addChildViewController:_dashboardVC];
+            _dashboardVC.view.frame = parentVC.view.bounds;
+            _dashboardVC.view.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
+            [parentVC.view addSubview:_dashboardVC.view];
+            [_dashboardVC didMoveToParentViewController:parentVC];
+            _didSetupVC = YES;
+
+            // 2️⃣ forward props again if needed
+            [self forwardPropsToVC];
+        }
     }
-  }
 }
 
-#pragma mark - Prop Setters
+- (void)handleDashboardClose:(NSNotification *)note {
+    // 1️⃣ Notify JS
+    if (self.onClose) {
+        self.onClose(@{});
+    }
+
+    // 2️⃣ Clean up the native view controller
+    [self cleanupDashboard];
+}
 
+- (void)cleanupDashboard {
+    if (!_dashboardVC) return;
+
+    [_dashboardVC willMoveToParentViewController:nil];
+    [_dashboardVC.view removeFromSuperview];
+    [_dashboardVC removeFromParentViewController];
+
+    _dashboardVC = nil;
+    _didSetupVC = NO;
+}
+
+#pragma mark - Prop Setters
 - (void)setClientID:(NSString *)ClientID {
     _ClientID = [ClientID copy];
     [self forwardProp:@"ClientID" value:_ClientID];
@@ -59,7 +91,6 @@
 }
 
 #pragma mark - Forward Props via KVC
-
 - (void)forwardProp:(NSString *)key value:(NSString *)value {
     if (_dashboardVC && [_dashboardVC respondsToSelector:NSSelectorFromString(key)]) {
         @try {
@@ -76,6 +107,11 @@
     [self forwardProp:@"user_token" value:_user_token];
 }
 
+- (void)removeFromSuperview {
+    [self cleanupDashboard];
+    [super removeFromSuperview];
+}
+
 @end
 
 @interface QmsDashboardViewManager : RCTViewManager

package/ios/QmsPlugin/QmsPluginBridge.mm

@@ -69,6 +69,7 @@ RCT_EXPORT_MODULE()
   });
 }
 
+
 // TurboModule boilerplate
 - (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
     (const facebook::react::ObjCTurboModule::InitParams &)params

package/ios/QmsPluginFramework.xcframework/Info.plist

@@ -8,32 +8,32 @@
 			<key>BinaryPath</key>
 			<string>QmsPluginFramework.framework/QmsPluginFramework</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
 			<string>QmsPluginFramework.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
 			<string>QmsPluginFramework.framework/QmsPluginFramework</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>ios-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>QmsPluginFramework.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@convep_mobilogy/react-native-qms-plugin",
-  "version": "0.9.1",
+  "version": "0.9.2",
   "description": "To handle defect managment",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",