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

package/QmsPlugin.podspec

@@ -6,7 +6,12 @@ Pod::Spec.new do |s|
   s.name         = "QmsPlugin"
   s.version      = package["version"]
   s.summary      = package["description"]
-  s.homepage     = package["homepage"]
+  homepage = package["homepage"]
+  if homepage.nil? || homepage.empty?
+    repo_url = package.dig("repository", "url")
+    homepage = repo_url ? repo_url.sub(/\Agit\+/, "") : "https://example.com"
+  end
+  s.homepage     = homepage
   s.license      = package["license"]
   s.authors      = package["author"]
   s.platforms    = { :ios => "12.4" }

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.5"
+    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
@@ -95,3 +131,48 @@ RCT_EXPORT_VIEW_PROPERTY(ClientCode, NSString)
 RCT_EXPORT_VIEW_PROPERTY(user_token, NSString)
 
 @end
+
+#import <React/RCTEventEmitter.h>
+#import <React/RCTBridgeModule.h>
+
+@interface QmsDashboardEmitter : RCTEventEmitter <RCTBridgeModule>
+@end
+
+@implementation QmsDashboardEmitter
+
+RCT_EXPORT_MODULE();
+
++ (id)allocWithZone:(NSZone *)zone {
+    static QmsDashboardEmitter *sharedInstance = nil;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        sharedInstance = [super allocWithZone:zone];
+    });
+    return sharedInstance;
+}
+
+- (instancetype)init {
+    if (self = [super init]) {
+        // Listen for the framework notification
+        [[NSNotificationCenter defaultCenter] addObserver:self
+                                                 selector:@selector(handleDashboardClose:)
+                                                     name:@"QmsDashboardDidCloseNotification"
+                                                   object:nil];
+    }
+    return self;
+}
+
+- (NSArray<NSString *> *)supportedEvents {
+    return @[@"onClose"];
+}
+
+- (void)handleDashboardClose:(NSNotification *)note {
+    // Send event to JS
+    [self sendEventWithName:@"onClose" body:note.userInfo];
+}
+
+- (void)dealloc {
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
+}
+
+@end

package/ios/QmsPluginFramework.xcframework/ios-arm64/QmsPluginFramework.framework/_CodeSignature/CodeResources

@@ -6,7 +6,7 @@
 	<dict>
 		<key>Assets.car</key>
 		<data>
-		4/wVNoFd+WcEg7nmH9Hm5v1nm7s=
+		tiDJHgS+Mbu43+C6GiuoJR1rE/s=
 		</data>
 		<key>Headers/QmsPlugin.h</key>
 		<data>
@@ -31,7 +31,7 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			zhv68b8E95A9988/pvXA0JKzn5/KsdixWe45ATxfW3g=
+			NzmSax3a+FRy3d2BvvftoEyaWVf17BzGCiO9/CkeCM8=
 			</data>
 		</dict>
 		<key>Headers/QmsPlugin.h</key>

package/ios/QmsPluginFramework.xcframework/ios-arm64_x86_64-simulator/QmsPluginFramework.framework/_CodeSignature/CodeResources

@@ -6,7 +6,7 @@
 	<dict>
 		<key>Assets.car</key>
 		<data>
-		4/wVNoFd+WcEg7nmH9Hm5v1nm7s=
+		tiDJHgS+Mbu43+C6GiuoJR1rE/s=
 		</data>
 		<key>Headers/QmsPlugin.h</key>
 		<data>
@@ -31,7 +31,7 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			zhv68b8E95A9988/pvXA0JKzn5/KsdixWe45ATxfW3g=
+			NzmSax3a+FRy3d2BvvftoEyaWVf17BzGCiO9/CkeCM8=
 			</data>
 		</dict>
 		<key>Headers/QmsPlugin.h</key>

package/lib/module/QmsDashboardView.ios.js

@@ -1,12 +1,13 @@
 "use strict";
 
-import React from 'react';
-import { requireNativeComponent } from 'react-native';
+import React, { useEffect } from 'react';
+import { NativeEventEmitter, NativeModules, requireNativeComponent } from 'react-native';
 import { jsx as _jsx } from "react/jsx-runtime";
 // Make sure your iOS native view manager is exported as "QmsDashboardView"
 const NativeQmsDashboardView = requireNativeComponent('QmsDashboardView');
 export const QmsDashboardView = props => {
   const {
+    onClose,
     clientID,
     clientCode,
     ClientID,
@@ -20,6 +21,14 @@ export const QmsDashboardView = props => {
   const resolvedClientID = clientID ?? ClientID ?? '';
   const resolvedClientCode = clientCode ?? ClientCode ?? '';
   const resolvedToken = user_token ?? token ?? userToken ?? '';
+  useEffect(() => {
+    if (!onClose) return;
+    const nativeEmitterModule = NativeModules.QmsDashboardEmitter;
+    if (!nativeEmitterModule) return;
+    const emitter = new NativeEventEmitter(nativeEmitterModule);
+    const subscription = emitter.addListener('onClose', onClose);
+    return () => subscription.remove();
+  }, [onClose]);
   return /*#__PURE__*/_jsx(NativeQmsDashboardView, {
     ...rest,
     ClientID: resolvedClientID,

package/lib/module/QmsDashboardView.ios.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","requireNativeComponent","jsx","_jsx","NativeQmsDashboardView","QmsDashboardView","props","clientID","clientCode","ClientID","ClientCode","user_token","userToken","token","rest","resolvedClientID","resolvedClientCode","resolvedToken"],"sourceRoot":"../../src","sources":["QmsDashboardView.ios.tsx"],"mappings":";;AAAA,OAAOA,KAAK,MAAM,OAAO;AACzB,SAASC,sBAAsB,QAAQ,cAAc;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAGtD;AACA,MAAMC,sBAAsB,GAC1BH,sBAAsB,CAAwB,kBAAkB,CAAC;AAEnE,OAAO,MAAMI,gBAAiD,GAAIC,KAAK,IAAK;EAC1E,MAAM;IACJC,QAAQ;IACRC,UAAU;IACVC,QAAQ;IACRC,UAAU;IACVC,UAAU;IACVC,SAAS;IACTC,KAAK;IACL;IACA,GAAGC;EACL,CAAC,GAAGR,KAAK;EAET,MAAMS,gBAAgB,GAAGR,QAAQ,IAAIE,QAAQ,IAAI,EAAE;EACnD,MAAMO,kBAAkB,GAAGR,UAAU,IAAIE,UAAU,IAAI,EAAE;EACzD,MAAMO,aAAa,GAAGN,UAAU,IAAIE,KAAK,IAAID,SAAS,IAAI,EAAE;EAE5D,oBACET,IAAA,CAACC,sBAAsB;IAAA,GACjBU,IAAI;IACRL,QAAQ,EAAEM,gBAAiB;IAC3BL,UAAU,EAAEM,kBAAmB;IAC/BL,UAAU,EAAEM;EAAc,CAC3B,CAAC;AAEN,CAAC","ignoreList":[]}
+{"version":3,"names":["React","useEffect","NativeEventEmitter","NativeModules","requireNativeComponent","jsx","_jsx","NativeQmsDashboardView","QmsDashboardView","props","onClose","clientID","clientCode","ClientID","ClientCode","user_token","userToken","token","rest","resolvedClientID","resolvedClientCode","resolvedToken","nativeEmitterModule","QmsDashboardEmitter","emitter","subscription","addListener","remove"],"sourceRoot":"../../src","sources":["QmsDashboardView.ios.tsx"],"mappings":";;AAAA,OAAOA,KAAK,IAAIC,SAAS,QAAQ,OAAO;AACxC,SACEC,kBAAkB,EAClBC,aAAa,EACbC,sBAAsB,QACjB,cAAc;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAGtB;AACA,MAAMC,sBAAsB,GAC1BH,sBAAsB,CAAwB,kBAAkB,CAAC;AAEnE,OAAO,MAAMI,gBAAiD,GAAIC,KAAK,IAAK;EAC1E,MAAM;IACJC,OAAO;IACPC,QAAQ;IACRC,UAAU;IACVC,QAAQ;IACRC,UAAU;IACVC,UAAU;IACVC,SAAS;IACTC,KAAK;IACL;IACA,GAAGC;EACL,CAAC,GAAGT,KAAK;EAET,MAAMU,gBAAgB,GAAGR,QAAQ,IAAIE,QAAQ,IAAI,EAAE;EACnD,MAAMO,kBAAkB,GAAGR,UAAU,IAAIE,UAAU,IAAI,EAAE;EACzD,MAAMO,aAAa,GAAGN,UAAU,IAAIE,KAAK,IAAID,SAAS,IAAI,EAAE;EAE5Df,SAAS,CAAC,MAAM;IACd,IAAI,CAACS,OAAO,EAAE;IACd,MAAMY,mBAAmB,GAAGnB,aAAa,CAACoB,mBAAmB;IAC7D,IAAI,CAACD,mBAAmB,EAAE;IAC1B,MAAME,OAAO,GAAG,IAAItB,kBAAkB,CAACoB,mBAAmB,CAAC;IAC3D,MAAMG,YAAY,GAAGD,OAAO,CAACE,WAAW,CAAC,SAAS,EAAEhB,OAAO,CAAC;IAC5D,OAAO,MAAMe,YAAY,CAACE,MAAM,CAAC,CAAC;EACpC,CAAC,EAAE,CAACjB,OAAO,CAAC,CAAC;EAEb,oBACEJ,IAAA,CAACC,sBAAsB;IAAA,GACjBW,IAAI;IACRL,QAAQ,EAAEM,gBAAiB;IAC3BL,UAAU,EAAEM,kBAAmB;IAC/BL,UAAU,EAAEM;EAAc,CAC3B,CAAC;AAEN,CAAC","ignoreList":[]}

package/lib/typescript/src/QmsDashboardView.ios.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"QmsDashboardView.ios.d.ts","sourceRoot":"","sources":["../../../src/QmsDashboardView.ios.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AAMtE,eAAO,MAAM,gBAAgB,EAAE,KAAK,CAAC,EAAE,CAAC,qBAAqB,CAyB5D,CAAC"}
+{"version":3,"file":"QmsDashboardView.ios.d.ts","sourceRoot":"","sources":["../../../src/QmsDashboardView.ios.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAoB,MAAM,OAAO,CAAC;AAMzC,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AAMtE,eAAO,MAAM,gBAAgB,EAAE,KAAK,CAAC,EAAE,CAAC,qBAAqB,CAmC5D,CAAC"}

package/package.json

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

package/src/QmsDashboardView.ios.tsx

@@ -1,5 +1,9 @@
-import React from 'react';
-import { requireNativeComponent } from 'react-native';
+import React, { useEffect } from 'react';
+import {
+  NativeEventEmitter,
+  NativeModules,
+  requireNativeComponent,
+} from 'react-native';
 import type { QmsDashboardViewProps } from './QmsDashboardView.types';
 
 // Make sure your iOS native view manager is exported as "QmsDashboardView"
@@ -8,6 +12,7 @@ const NativeQmsDashboardView =
 
 export const QmsDashboardView: React.FC<QmsDashboardViewProps> = (props) => {
   const {
+    onClose,
     clientID,
     clientCode,
     ClientID,
@@ -23,6 +28,15 @@ export const QmsDashboardView: React.FC<QmsDashboardViewProps> = (props) => {
   const resolvedClientCode = clientCode ?? ClientCode ?? '';
   const resolvedToken = user_token ?? token ?? userToken ?? '';
 
+  useEffect(() => {
+    if (!onClose) return;
+    const nativeEmitterModule = NativeModules.QmsDashboardEmitter;
+    if (!nativeEmitterModule) return;
+    const emitter = new NativeEventEmitter(nativeEmitterModule);
+    const subscription = emitter.addListener('onClose', onClose);
+    return () => subscription.remove();
+  }, [onClose]);
+
   return (
     <NativeQmsDashboardView
       {...rest}