scandit-react-native-datacapture-id 8.2.1 → 8.3.0

package/package.json

@@ -1,20 +1,18 @@
 {
   "name": "scandit-react-native-datacapture-id",
-  "version": "8.2.1",
+  "version": "8.3.0",
   "description": "Scandit Data Capture SDK for React Native",
   "homepage": "https://github.com/Scandit/scandit-react-native-datacapture-id",
   "main": "dist/index.js",
   "types": "dist/dts/index.d.ts",
   "flow": "dist/index.js.flow",
   "scripts": {
+    "build": "rollup -c ../../rollup.config.js --bundleConfigAsCjs",
+    "generate-flow": "flowgen dist/dts/index.d.ts -o dist/index.js.flow",
     "jest": "jest",
     "coverage": "jest --coverage --passWithNoTests",
     "test": "pnpm run lint",
-    "lint": "eslint --debug ts",
-    "build": "pnpm run rollup && pnpm run generate-flow",
-    "rollup": "rollup -c rollup.config.js --bundleConfigAsCjs",
-    "generate-flow": "flowgen dist/dts/index.d.ts -o dist/index.js.flow",
-    "start": "pnpm build -- --watch"
+    "lint": "eslint ts"
   },
   "keywords": [
     "scandit",
@@ -46,14 +44,29 @@
     "flowgen": "^1.21.0",
     "jest": "^29.7.0",
     "rollup": "3.29.2",
-    "rollup-plugin-modify": "3.0.0",
     "ts-jest": "^29.3.3",
     "typescript": "4.9.5"
   },
   "dependencies": {
-    "scandit-datacapture-frameworks-core": "8.2.1",
-    "scandit-datacapture-frameworks-id": "8.2.1",
-    "scandit-react-native-datacapture-core": "8.2.1"
+    "scandit-datacapture-frameworks-core": "8.3.0",
+    "scandit-datacapture-frameworks-id": "8.3.0",
+    "scandit-react-native-datacapture-core": "8.3.0"
   },
-  "packageManager": "pnpm@10.15.0"
+  "packageManager": "pnpm@10.15.0",
+  "codegenConfig": {
+    "name": "ScanditReactNativeDatacaptureIdSpec",
+    "type": "modules",
+    "jsSrcsDir": "specs",
+    "outputDir": {
+      "ios": "ios/generated",
+      "android": "android/generated"
+    },
+    "includesGeneratedCode": true,
+    "android": {
+      "javaPackageName": "com.scandit.datacapture.reactnative.id"
+    },
+    "ios": {
+      "unstableRequiresMainQueueSetup": true
+    }
+  }
 }

package/react-native.config.js

@@ -0,0 +1,12 @@
+/**
+ * @type {import('@react-native-community/cli-types').Config}
+ */
+module.exports = {
+  dependency: {
+    platforms: {
+      android: {
+        cmakeListsPath: 'generated/jni/CMakeLists.txt',
+      },
+    },
+  },
+};

package/scandit-react-native-datacapture-id.podspec

@@ -3,23 +3,6 @@ require "json"
 package = JSON.parse(File.read(File.join(__dir__, "package.json")))
 version = package["version"]
 
-# Helper to detect React Native version
-rn_version_gte = lambda do |min_version|
-  begin
-    rn_package_path = File.join(__dir__, "..", "react-native", "package.json")
-    unless File.exist?(rn_package_path)
-      # Try node_modules path for samples/apps
-      rn_package_path = File.join(__dir__, "..", "..", "node_modules", "react-native", "package.json")
-    end
-    return false unless File.exist?(rn_package_path)
-
-    rn_package = JSON.parse(File.read(rn_package_path))
-    rn_version = rn_package["version"]
-    Gem::Version.new(rn_version) >= Gem::Version.new(min_version)
-  rescue
-    false
-  end
-end
 
 Pod::Spec.new do |s|
   s.name                    = package["name"]
@@ -31,29 +14,33 @@ Pod::Spec.new do |s|
   s.platforms               = { :ios => "15.0" }
   s.source                  = { :git => package["homepage"] + ".git", :tag => "#{s.version}" }
   s.swift_version           = '5.0'
-  s.source_files            = "ios/Sources/**/*.{h,m,swift}"
   s.requires_arc            = true
   s.module_name             = "ScanditDataCaptureId"
   s.header_dir              = "ScanditDataCaptureId"
 
-  s.dependency "React-Core"
   s.dependency "scandit-react-native-datacapture-core", "= #{version}"
-  s.dependency "scandit-datacapture-frameworks-id", '= 8.2.1'
+  s.dependency "scandit-datacapture-frameworks-id", '= 8.3.0'
 
-  # New Architecture specific dependencies and compiler flags
-  if ENV['RCT_NEW_ARCH_ENABLED'] == '1'
-    s.dependency "React-RCTAppDelegate"
+  is_new_arch_enabled = ENV['RCT_NEW_ARCH_ENABLED'] == '1'
 
-    swift_flags = ['-DRCT_NEW_ARCH_ENABLED']
-    # RCTReactNativeFactory was introduced in RN 0.78
-    if rn_version_gte.call("0.78.0")
-      swift_flags << '-DRCT_REACT_NATIVE_FACTORY_AVAILABLE'
-    end
+  if is_new_arch_enabled
+    s.source_files          = "ios/Sources/**/*.{h,m,mm,swift}", "ios/generated/**/*.{h,m,mm,cpp}"
+    s.private_header_files  = "ios/generated/**/*.h"
+    s.exclude_files         = "ios/Sources/OldArch/**/*"
+    s.dependency "React-RCTAppDelegate"
 
     s.pod_target_xcconfig = {
-      'OTHER_SWIFT_FLAGS' => swift_flags.join(' ')
+      'OTHER_SWIFT_FLAGS' => '-DRCT_NEW_ARCH_ENABLED',
+      'HEADER_SEARCH_PATHS' => '"$(PODS_TARGET_SRCROOT)/ios/generated"'
     }
+  else
+    s.source_files          = "ios/Sources/**/*.{h,m,mm,swift}"
+    s.exclude_files         = "ios/Sources/NewArch/**/*"
   end
 
-  install_modules_dependencies(s)
+  if respond_to?(:install_modules_dependencies, true)
+    install_modules_dependencies(s)
+  else
+    s.dependency "React-Core"
+  end
 end

package/specs/NativeScanditDataCaptureId.ts

@@ -0,0 +1,29 @@
+import {TurboModule, TurboModuleRegistry} from 'react-native';
+import type {EventEmitter} from 'react-native/Libraries/Types/CodegenTypes';
+
+/**
+ * Unified event payload for all Scandit events.
+ * Events are filtered by name on the JS side.
+ */
+export type ScanditEventPayload = {
+  name: string;
+  data: string;
+  viewId?: number;
+  modeId?: number;
+};
+
+export interface Spec extends TurboModule {
+  // Events - unified event emitter for all ID events
+  readonly onScanditEvent: EventEmitter<ScanditEventPayload>;
+
+  readonly getConstants: () => {
+    // eslint-disable-next-line @typescript-eslint/no-wrapper-object-types
+    Defaults: Object;
+  };
+
+  // Single entry point for all ID operations - use Object so codegen produces NSDictionary on iOS
+  // eslint-disable-next-line @typescript-eslint/no-wrapper-object-types
+  executeId(data: Object): Promise<void>;
+}
+
+export default TurboModuleRegistry.getEnforcing<Spec>('ScanditDataCaptureId');

package/ios/Sources/ScanditDataCaptureId.m

@@ -1,9 +0,0 @@
-#import "ScanditDataCaptureId.h"
-#import <React/RCTEventEmitter.h>
-
-@interface RCT_EXTERN_MODULE (ScanditDataCaptureId, RCTEventEmitter)
-RCT_EXTERN_METHOD(executeId
-                  : (NSDictionary *)data resolve
-                  : (RCTPromiseResolveBlock)resolve reject
-                  : (RCTPromiseRejectBlock)reject)
-@end