@momo-kits/qrcode 0.150.2-beta.5 → 0.150.2-beta.test.5

package/Qrcode.podspec

@@ -3,19 +3,31 @@ require "json"
 package = JSON.parse(File.read(File.join(__dir__, "package.json")))
 
 Pod::Spec.new do |s|
-  s.name         = "Qrcode"
-  s.version      = package["version"]
-  s.summary      = package["description"]
-  s.homepage     = package["homepage"]
-  s.license      = package["license"]
-  s.authors      = package["author"]
+  s.name            = "Qrcode"
+  s.version         = package["version"]
+  s.summary         = package["description"]
+  s.description     = package["description"]
+  s.homepage        = package["homepage"]
+  s.license         = package["license"]
+  s.platforms       = { :ios => "11.0" }
+  s.author          = package["author"]
+  s.source          = { :git => package["repository"]["url"], :tag => "#{s.version}" }
 
-  s.platforms    = { :ios => min_ios_version_supported }
-  s.source       = { :git => "https://www.npmjs.com/.git", :tag => "#{s.version}" }
+  s.source_files    = "ios/**/*.{h,m,mm,swift}"
+  s.requires_arc    = true
 
-  s.source_files = "ios/**/*.{h,m,mm,cpp}"
-  s.private_header_files = "ios/**/*.h"
+  s.dependency "React-Core"
 
-
-  install_modules_dependencies(s)
+  # Use install_modules_dependencies helper to install the dependencies if React Native version >=0.71.0.
+  # See https://github.com/facebook/react-native/blob/febf6b7f33fdb4904669f99d795eba4c0f95d7bf/scripts/cocoapods/new_architecture.rb#L79.
+  if respond_to?(:install_modules_dependencies, true)
+    install_modules_dependencies(s)
+  else
+    s.dependency "React-RCTFabric", "~> 0.72.0" # This dependency is managed by React Native.
+    s.dependency "React-Codegen", "~> 0.72.0"
+    s.dependency "RCT-Folly", "~> 2021.07.22.00"
+    s.dependency "RCTRequired", "~> 0.72.0"
+    s.dependency "RCTTypeSafety", "~> 0.72.0"
+    s.dependency "ReactCommon", "~> 0.72.0"
+  end
 end

package/ios/RCTQRCode.h

@@ -4,7 +4,6 @@
 NS_ASSUME_NONNULL_BEGIN
 
 @interface RCTQRCode : RCTViewComponentView
-
 @end
 
 NS_ASSUME_NONNULL_END

package/ios/RCTQRCode.mm

@@ -1,12 +1,13 @@
 #import "RCTQRCode.h"
-#import <react/renderer/components/QrcodeViewSpec/ComponentDescriptors.h>
-#import <react/renderer/components/QrcodeViewSpec/Props.h>
-#import <react/renderer/components/QrcodeViewSpec/RCTComponentViewHelpers.h>
-#import <react/renderer/components/QrcodeViewSpec/EventEmitters.h>
-#import "QRCodeView.h"
-#import <React/RCTLog.h>
+
+#import <react/renderer/components/QrcodeViewManager/ComponentDescriptors.h>
+#import <react/renderer/components/QrcodeViewManager/EventEmitters.h>
+#import <react/renderer/components/QrcodeViewManager/Props.h>
+#import <react/renderer/components/QrcodeViewManager/RCTComponentViewHelpers.h>
 
 #import "RCTFabricComponentsPlugins.h"
+#import <React/RCTConversions.h>
+#import <CoreImage/CoreImage.h>
 
 using namespace facebook::react;
 
@@ -14,53 +15,92 @@ using namespace facebook::react;
 @end
 
 @implementation RCTQRCode {
-  QRCodeView *_qrView;
+    UIImageView *_qrImageView;
 }
 
-- (instancetype)init
++ (ComponentDescriptorProvider)componentDescriptorProvider
 {
-  if (self = [super init]) {
-    // Create and embed your existing UIImageView-based QRCodeView
-    _qrView = [QRCodeView new];
-    [self addSubview:_qrView];
-  }
-  return self;
+    return concreteComponentDescriptorProvider<RCTQRCodeComponentDescriptor>();
 }
 
-- (void)updateProps:(Props::Shared const &)props
-           oldProps:(Props::Shared const &)oldProps
+- (instancetype)initWithFrame:(CGRect)frame
 {
-  // Pull in the generated Props struct
-  const auto &qrProps = *std::static_pointer_cast<RCTQRCodeProps const>(props);
+    if (self = [super initWithFrame:frame]) {
+        static const auto defaultProps = std::make_shared<const RCTQRCodeProps>();
+        _props = defaultProps;
 
-  // Apply to your view
-  if (!qrProps.code.empty()) {
-      NSString *nsCode = [NSString stringWithUTF8String:qrProps.code.c_str()];
-      _qrView.code = nsCode;
+        _qrImageView = [[UIImageView alloc] init];
+        _qrImageView.contentMode = UIViewContentModeScaleAspectFit;
+        [self addSubview:_qrImageView];
     }
-  _qrView.ratio = qrProps.ratio;
-  _qrView.size  = qrProps.size;
-  NSLog(@"[QRCodeView] setCode: %@", _qrView.code);
 
-  [super updateProps:props oldProps:oldProps];
+    return self;
 }
 
-- (void)layoutSubviews
+- (void)updateProps:(Props::Shared const &)props oldProps:(Props::Shared const &)oldProps
 {
-  [super layoutSubviews];
-  // Make the QR image fill the host view
-  _qrView.frame = self.bounds;
+    const auto &oldViewProps = *std::static_pointer_cast<RCTQRCodeProps const>(_props);
+    const auto &newViewProps = *std::static_pointer_cast<RCTQRCodeProps const>(props);
+
+    if (oldViewProps.code != newViewProps.code ||
+        oldViewProps.size != newViewProps.size ||
+        oldViewProps.ratio != newViewProps.ratio) {
+        [self generateQRCode];
+    }
+
+    [super updateProps:props oldProps:oldProps];
 }
 
-+ (ComponentDescriptorProvider)componentDescriptorProvider
+- (void)layoutSubviews
 {
-  // Hook up to the C++ ComponentDescriptor generated by Codegen
-  return concreteComponentDescriptorProvider<RCTQRCodeComponentDescriptor>();
+    [super layoutSubviews];
+    _qrImageView.frame = self.bounds;
 }
 
-@end
+- (void)generateQRCode
+{
+    const auto &props = *std::static_pointer_cast<RCTQRCodeProps const>(_props);
+
+    NSString *code = RCTNSStringFromString(props.code);
+    CGFloat size = props.size;
+    CGFloat ratio = props.ratio.value_or(1.0);
+
+    if (!code || code.length == 0) {
+        _qrImageView.image = nil;
+        return;
+    }
+
+    // Generate QR Code
+    CIFilter *filter = [CIFilter filterWithName:@"CIQRCodeGenerator"];
+    [filter setDefaults];
+
+    NSData *data = [code dataUsingEncoding:NSUTF8StringEncoding];
+    [filter setValue:data forKey:@"inputMessage"];
+
+    CIImage *ciImage = [filter outputImage];
+
+    if (!ciImage) {
+        _qrImageView.image = nil;
+        return;
+    }
 
-Class<RCTRCTQRCodeViewProtocol> RCTQRCodeCls(void)
+    // Scale the image
+    CGFloat scaleX = size * ratio / ciImage.extent.size.width;
+    CGFloat scaleY = size * ratio / ciImage.extent.size.height;
+    CIImage *scaledImage = [ciImage imageByApplyingTransform:CGAffineTransformMakeScale(scaleX, scaleY)];
+
+    // Convert to UIImage
+    CIContext *context = [CIContext context];
+    CGImageRef cgImage = [context createCGImage:scaledImage fromRect:scaledImage.extent];
+    UIImage *qrImage = [UIImage imageWithCGImage:cgImage];
+    CGImageRelease(cgImage);
+
+    _qrImageView.image = qrImage;
+}
+
+Class<RCTComponentViewProtocol> RCTQRCodeCls(void)
 {
-  return RCTQRCode.class;
+    return RCTQRCode.class;
 }
+
+@end

package/ios/RCTQRCodeManager.mm

@@ -1,15 +1,31 @@
 #import <React/RCTViewManager.h>
-#import <UIKit/UIKit.h>
-#import "QRCodeView.h"
+#import <React/RCTUIManager.h>
+#import "RCTFabricComponentsPlugins.h"
 
-@implementation RCTQRCodeManager: RCTViewManager
-RCT_EXPORT_VIEW_PROPERTY(code, NSString);
-RCT_EXPORT_VIEW_PROPERTY(ratio, CGFloat);
-RCT_EXPORT_VIEW_PROPERTY(size, NSInteger);
+@interface RCTQRCodeManager : RCTViewManager
+@end
+
+@implementation RCTQRCodeManager
 
 RCT_EXPORT_MODULE(RCTQRCode)
-- (UIView*)view {
-  QRCodeView* view = [[QRCodeView alloc] init];
-  return view;
+
+- (UIView *)view
+{
+  return [RCTQRCodeCls() new];
+}
+
+@end
+
+Class<RCTComponentViewProtocol> RCTQRCodeCls(void);
+
+@interface RCTQRCodeManager (Fabric) <RCTFabricViewManager>
+@end
+
+@implementation RCTQRCodeManager (Fabric)
+
+- (Class<RCTComponentViewProtocol>)componentViewClass
+{
+  return RCTQRCodeCls();
 }
+
 @end

package/lib/module/RCTQRCodeNativeComponent.ts

@@ -1,14 +1,11 @@
-// @ts-nocheck
-
-import type { HostComponent, ViewProps, Float, Int32 } from 'react-native';
-import { codegenNativeComponent } from 'react-native';
+import type { ViewProps } from 'react-native';
+import type { Double, Int32 } from 'react-native/Libraries/Types/CodegenTypes';
+import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
 
 export interface QRCodeNativeComponentProps extends ViewProps {
-  code?: string;
-  ratio?: Float;
-  size?: Int32;
+  code: string;
+  size: Int32;
+  ratio?: Double;
 }
 
-export default codegenNativeComponent<QRCodeNativeComponentProps>(
-  'RCTQRCode'
-) as HostComponent<QRCodeNativeComponentProps>;
+export default codegenNativeComponent<QRCodeNativeComponentProps>('RCTQRCode');

package/lib/typescript/src/RCTQRCodeNativeComponent.d.ts

@@ -1,9 +1,10 @@
-import type { HostComponent, ViewProps, Float, Int32 } from 'react-native';
+import type { ViewProps } from 'react-native';
+import type { Double, Int32 } from 'react-native/Libraries/Types/CodegenTypes';
 export interface QRCodeNativeComponentProps extends ViewProps {
-    code?: string;
-    ratio?: Float;
-    size?: Int32;
+    code: string;
+    size: Int32;
+    ratio?: Double;
 }
-declare const _default: HostComponent<QRCodeNativeComponentProps>;
+declare const _default: import("react-native/Libraries/Utilities/codegenNativeComponent").NativeComponentType<QRCodeNativeComponentProps>;
 export default _default;
 //# sourceMappingURL=RCTQRCodeNativeComponent.d.ts.map

package/lib/typescript/src/RCTQRCodeNativeComponent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RCTQRCodeNativeComponent.d.ts","sourceRoot":"","sources":["../../../src/RCTQRCodeNativeComponent.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,SAAS,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAG3E,MAAM,WAAW,0BAA2B,SAAQ,SAAS;IAC3D,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,IAAI,CAAC,EAAE,KAAK,CAAC;CACd;wBAII,aAAa,CAAC,0BAA0B,CAAC;AAF9C,wBAE+C"}
+{"version":3,"file":"RCTQRCodeNativeComponent.d.ts","sourceRoot":"","sources":["../../../src/RCTQRCodeNativeComponent.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,2CAA2C,CAAC;AAG/E,MAAM,WAAW,0BAA2B,SAAQ,SAAS;IAC3D,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,KAAK,CAAC;IACZ,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;;AAED,wBAA+E"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@momo-kits/qrcode",
-    "version": "0.150.2-beta.5",
+    "version": "0.150.2-beta.test.5",
     "description": "A simple and customizable QR code generator component for React Native apps.",
     "main": "./lib/module/index.js",
     "types": "./lib/typescript/src/index.d.ts",

package/src/RCTQRCodeNativeComponent.ts

@@ -1,14 +1,11 @@
-// @ts-nocheck
-
-import type { HostComponent, ViewProps, Float, Int32 } from 'react-native';
-import { codegenNativeComponent } from 'react-native';
+import type { ViewProps } from 'react-native';
+import type { Double, Int32 } from 'react-native/Libraries/Types/CodegenTypes';
+import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
 
 export interface QRCodeNativeComponentProps extends ViewProps {
-  code?: string;
-  ratio?: Float;
-  size?: Int32;
+  code: string;
+  size: Int32;
+  ratio?: Double;
 }
 
-export default codegenNativeComponent<QRCodeNativeComponentProps>(
-  'RCTQRCode'
-) as HostComponent<QRCodeNativeComponentProps>;
+export default codegenNativeComponent<QRCodeNativeComponentProps>('RCTQRCode');