@sdcx/overlay 0.5.0 → 1.0.0

package/package.json

@@ -1,66 +1,52 @@
 {
-  "name": "@sdcx/overlay",
-  "description": "A react-native Overlay component.",
-  "version": "0.5.0",
-  "main": "./lib/index.js",
-  "typings": "./lib/index.d.ts",
-  "react-native": "src/index",
-  "nativePackage": true,
-  "files": [
-    "src",
-    "lib",
-    "android",
-    "ios",
-    "RNOverlay.podspec",
-    "!android/build",
-    "!ios/build",
-    "!**/__tests__"
-  ],
-  "repository": "https://github.com/sdcxtech/react-native-troika",
-  "homepage": "https://github.com/sdcxtech/react-native-troika/tree/master/packages/overlay#readme",
-  "author": "sdcx",
-  "license": "MIT",
-  "keywords": [
-    "react-native",
-    "overlay"
-  ],
-  "scripts": {
-    "build": "rm -rf ./lib && tsc -p tsconfig.build.json",
-    "prepare": "npm run build",
-    "tsc": "tsc",
-    "test": "jest",
-    "lint": "eslint . --fix --ext .js,.jsx,.ts,.tsx"
-  },
-  "peerDependencies": {
-    "react": ">=16.8",
-    "react-native": ">=0.60"
-  },
-  "devDependencies": {
-    "@babel/core": "^7.13.10",
-    "@babel/runtime": "^7.13.10",
-    "@react-native-community/eslint-config": "^3.0.0",
-    "@types/jest": "^27.0.1",
-    "@types/react": "^17.0.2",
-    "@types/react-native": "^0.67.0",
-    "@types/react-test-renderer": "17.0.2",
-    "babel-jest": "^27.0.6",
-    "jest": "^27.0.6",
-    "metro-react-native-babel-preset": "^0.66.2",
-    "react": "17.0.2",
-    "react-native": "^0.67.4",
-    "react-test-renderer": "17.0.2",
-    "eslint": "^7.32.0",
-    "typescript": "^4.6.4"
-  },
-  "jest": {
-    "preset": "react-native",
-    "moduleFileExtensions": [
-      "ts",
-      "tsx",
-      "js",
-      "jsx",
-      "json",
-      "node"
-    ]
-  }
+	"name": "@sdcx/overlay",
+	"description": "A react-native Overlay component.",
+	"version": "1.0.0",
+	"main": "./dist/index.js",
+	"typings": "./dist/index.d.ts",
+	"react-native": "src/index",
+	"nativePackage": true,
+	"files": [
+		"src",
+		"dist",
+		"android",
+		"ios",
+		"RNOverlay.podspec",
+		"!android/build",
+		"!ios/build",
+		"!**/__tests__"
+	],
+	"repository": "https://github.com/sdcxtech/react-native-troika",
+	"homepage": "https://github.com/sdcxtech/react-native-troika/tree/master/packages/overlay#readme",
+	"author": "sdcx",
+	"license": "MIT",
+	"keywords": [
+		"react-native",
+		"overlay"
+	],
+	"scripts": {
+		"build": "rm -rf ./dist && tsc -p tsconfig.json",
+		"prepare": "npm run build",
+		"tsc": "tsc",
+		"test": "jest",
+		"lint": "eslint . --fix --ext .js,.jsx,.ts,.tsx"
+	},
+	"codegenConfig": {
+		"name": "overlay",
+		"type": "modules",
+		"jsSrcsDir": "src",
+		"android": {
+			"javaPackageName": "com.reactnative.overlay"
+		},
+		"ios": {
+			"modulesProvider": {
+				"OverlayHost": "RNOverlayModule"
+			}
+		}
+	},
+	"peerDependencies": {
+		"react": ">=16.8",
+		"react-native": ">=0.60"
+	},
+	"devDependencies": {}
 }

package/src/NativeOverlay.ts

@@ -0,0 +1,14 @@
+import type { TurboModule, CodegenTypes } from 'react-native';
+import { TurboModuleRegistry } from 'react-native';
+
+export interface OverlayOptions {
+	overlayId: CodegenTypes.Int32;
+	passThroughTouches?: boolean;
+}
+
+export interface Spec extends TurboModule {
+	show(moduleName: string, options: OverlayOptions): void;
+	hide(moduleName: string, overlayId: CodegenTypes.Int32): void;
+}
+
+export default TurboModuleRegistry.getEnforcing<Spec>('OverlayHost');

package/src/index.ts

@@ -1,29 +1,18 @@
-import { Insets, NativeModule, NativeModules } from 'react-native'
-
-export interface OverlayOptions {
-  id: number
-  passThroughTouches?: boolean
-}
+import { type Insets } from 'react-native';
+import NativeOverlay, { type OverlayOptions } from './NativeOverlay';
 
 export interface OverlayProps extends OverlayOptions {
-  insets: Insets
+	insets: Insets;
 }
 
-interface OverlayInterface extends NativeModule {
-  show(moduleName: string, options: OverlayOptions): void
-  hide(moduleName: string, id: number): void
-}
-
-const OverlayHost: OverlayInterface = NativeModules.OverlayHost
-
 function show(moduleName: string, options: OverlayOptions) {
-  OverlayHost.show(moduleName, options)
+	NativeOverlay.show(moduleName, options);
 }
 
 function hide(moduleName: string, id: number) {
-  OverlayHost.hide(moduleName, id)
+	NativeOverlay.hide(moduleName, id);
 }
 
-const Overlay = { show, hide }
+const Overlay = { show, hide };
 
-export { Overlay }
+export { Overlay };

package/ios/Overlay/RNOverlay.m

@@ -1,60 +0,0 @@
-#import "RNOverlay.h"
-
-#import <React/RCTRootView.h>
-
-@interface RNOverlay ()
-
-@property(nonatomic, weak) UIWindow *keyWindow;
-@property(nonatomic, strong) RCTRootView *rootView;
-@property(nonatomic, copy) NSString *moduleName;
-@property(nonatomic, weak) RCTBridge *bridge;
-
-@end
-
-@implementation RNOverlay
-
-- (instancetype)initWithModuleName:(NSString *)moduleName bridge:(RCTBridge *)bridge {
-    if (self = [super init]) {
-        _moduleName = moduleName;
-        _bridge = bridge;
-    }
-    return self;
-}
-
-- (void)show:(NSDictionary *)props options:(NSDictionary *)options {
-    BOOL passThroughTouches = [options[@"passThroughTouches"] boolValue];
-    
-    RCTRootView *rctView = [self createReactRootView:props];
-    rctView.passThroughTouches = passThroughTouches;
-    rctView.frame = [UIScreen mainScreen].bounds;
-
-    self.rootView = rctView;
-    
-    UIWindow *keyWindow = [UIApplication sharedApplication].keyWindow;
-    [keyWindow addSubview:rctView];
-}
-
-- (void)hide {
-    if (self.rootView) {
-        [self.rootView removeFromSuperview];
-        self.rootView = nil;
-    }
-}
-
-- (void)update {
-    UIWindow *keyWindow = [UIApplication sharedApplication].keyWindow;
-    if (keyWindow != self.keyWindow) {
-        [self.rootView removeFromSuperview];
-        [keyWindow addSubview:self.rootView];
-        self.keyWindow = keyWindow;
-    }
-}
-
-- (RCTRootView *)createReactRootView:(NSDictionary *)props {
-    RCTRootView *reactView = [[RCTRootView alloc] initWithBridge:self.bridge moduleName:self.moduleName initialProperties:props];
-    reactView.backgroundColor = UIColor.clearColor;
-
-    return reactView;
-}
-
-@end

package/ios/Overlay/RNOverlayModule.m

@@ -1,89 +0,0 @@
-#import "RNOverlayModule.h"
-#import "RNOverlay.h"
-
-#import <React/RCTLog.h>
-#import <React/RCTBridge.h>
-
-
-NSString* genKey(NSString* moduleName, NSNumber* id) {
-    return [NSString stringWithFormat:@"%@-%@", moduleName, id];
-}
-
-
-@interface RNOverlayModule ()
-
-@property(nonatomic, strong) NSMutableDictionary *overlays;
-
-@end
-
-@implementation RNOverlayModule
-
-@synthesize bridge;
-
-- (instancetype)init {
-    if (self = [super init]) {
-        _overlays = [[NSMutableDictionary alloc] init];
-    }
-    return self;
-}
-
-- (void)handleReload {
-    for (NSString *key in self.overlays) {
-        RNOverlay *overlay = self.overlays[key];
-        [overlay hide];
-    }
-    [self.overlays removeAllObjects];
-}
-
-- (void)invalidate {
-    [self handleReload];
-}
-
-+ (BOOL)requiresMainQueueSetup {
-    return YES;
-}
-
-- (dispatch_queue_t)methodQueue {
-    return dispatch_get_main_queue();
-}
-
-RCT_EXPORT_MODULE(OverlayHost)
-
-
-RCT_EXPORT_METHOD(show:(NSString *)moduleName options:(NSDictionary *)options) {
-    NSString* key = genKey(moduleName, options[@"id"]);
-    RNOverlay *overlay = self.overlays[key];
-    if (overlay != nil) {
-        [overlay update];
-        return;
-    }
-    
-    overlay = [[RNOverlay alloc] initWithModuleName:moduleName bridge:self.bridge];
-    self.overlays[key] = overlay;
-    
-    UIWindow *window = RCTKeyWindow();
-    UIEdgeInsets safeAreaInsets = window.safeAreaInsets;
-    NSDictionary* insets = @{
-      @"top" : @(safeAreaInsets.top),
-      @"right" : @(safeAreaInsets.right),
-      @"bottom" : @(safeAreaInsets.bottom),
-      @"left" : @(safeAreaInsets.left),
-    };
-    
-    NSMutableDictionary *props = [options mutableCopy];
-    [props setObject:insets forKey:@"insets"];
-    [overlay show:props options:options];
-}
-
-RCT_EXPORT_METHOD(hide:(NSString *)moduleName id:(nonnull NSNumber *)id) {
-    NSString* key = genKey(moduleName, id);
-    RNOverlay *overlay = self.overlays[key];
-    if (!overlay) {
-        return;
-    }
-    [self.overlays removeObjectForKey:key];
-    [overlay hide];
-}
-
-
-@end

package/lib/index.js

@@ -1,10 +0,0 @@
-import { NativeModules } from 'react-native';
-const OverlayHost = NativeModules.OverlayHost;
-function show(moduleName, options) {
-    OverlayHost.show(moduleName, options);
-}
-function hide(moduleName, id) {
-    OverlayHost.hide(moduleName, id);
-}
-const Overlay = { show, hide };
-export { Overlay };