react-native-toast-message 2.2.0 → 3.0.0-beta.1

package/ios/SafeAreaModule.h

@@ -0,0 +1,5 @@
+#import <React/RCTBridgeModule.h>
+
+@interface RNSafeAreaModule : NSObject <RCTBridgeModule>
+
+@end

package/ios/SafeAreaModule.mm

@@ -0,0 +1,27 @@
+#import <React/RCTBridgeModule.h>
+#import <React/RCTEventEmitter.h>
+@interface SafeAreaModule : NSObject <RCTBridgeModule>
+@end
+
+@implementation SafeAreaModule
+RCT_EXPORT_MODULE();
+
+RCT_EXPORT_METHOD(getSafeAreaInsets:(RCTResponseSenderBlock)callback) {
+    UIViewController *rootViewController = [UIApplication sharedApplication].keyWindow.rootViewController;
+    UIEdgeInsets safeAreaInsets = UIEdgeInsetsZero;
+
+    if (@available(iOS 11.0, *)) {
+        safeAreaInsets = rootViewController.view.safeAreaInsets;
+    }
+
+    NSDictionary *result = @{
+        @"top": @(safeAreaInsets.top),
+        @"bottom": @(safeAreaInsets.bottom),
+        @"left": @(safeAreaInsets.left),
+        @"right": @(safeAreaInsets.right)
+    };
+
+    callback(@[[NSNull null], result]);
+}
+
+@end

package/lib/src/hooks/index.d.ts

@@ -3,3 +3,4 @@ export * from './useSlideAnimation';
 export * from './useTimeout';
 export * from './usePanResponder';
 export * from './useKeyboard';
+export * from './useSafeArea';

package/lib/src/hooks/index.js

@@ -3,3 +3,4 @@ export * from './useSlideAnimation';
 export * from './useTimeout';
 export * from './usePanResponder';
 export * from './useKeyboard';
+export * from './useSafeArea';

package/lib/src/hooks/useSafeArea.d.ts

@@ -0,0 +1,10 @@
+declare type TSafeArea = {
+    top: number;
+    bottom: number;
+    left: number;
+    right: number;
+};
+export declare const useSafeArea: () => {
+    safeAreaInsets: TSafeArea | null;
+};
+export {};

package/lib/src/hooks/useSafeArea.js

@@ -0,0 +1,25 @@
+import { NativeModules, StatusBar } from 'react-native';
+import { useEffect, useState } from "react";
+import { isIOS } from "../utils/platform";
+import { SCREEN_HEIGHT, WINDOW_HEIGHT } from "../utils/dimension";
+export const useSafeArea = () => {
+    const [safeAreaInsets, setSafeAreaInsets] = useState(null);
+    useEffect(() => {
+        if (isIOS()) {
+            NativeModules?.SafeAreaModule?.getSafeAreaInsets((error, result) => {
+                if (error) {
+                    console.error(error);
+                }
+                else {
+                    setSafeAreaInsets(result);
+                }
+            });
+        }
+        else {
+            const statusBarHeight = StatusBar.currentHeight ?? 0;
+            const bottomInset = SCREEN_HEIGHT - WINDOW_HEIGHT - statusBarHeight;
+            setSafeAreaInsets({ top: statusBarHeight, bottom: bottomInset, left: 0, right: 0 });
+        }
+    }, []);
+    return { safeAreaInsets };
+};

package/lib/src/useToast.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import { useLogger } from './contexts';
-import { useTimeout } from './hooks';
+import { useSafeArea, useTimeout } from './hooks';
 import { noop } from './utils/func';
 import { mergeIfDefined } from './utils/obj';
 export const DEFAULT_DATA = {
@@ -27,6 +27,7 @@ export function useToast({ defaultOptions }) {
     const { log } = useLogger();
     const [isVisible, setIsVisible] = React.useState(false);
     const [data, setData] = React.useState(DEFAULT_DATA);
+    const { safeAreaInsets } = useSafeArea();
     const initialOptions = mergeIfDefined(DEFAULT_OPTIONS, defaultOptions);
     const [options, setOptions] = React.useState(initialOptions);
     const onAutoHide = React.useCallback(() => {
@@ -43,7 +44,9 @@ export function useToast({ defaultOptions }) {
     }, [clearTimer, log, options]);
     const show = React.useCallback((params) => {
         log(`Showing with params: ${JSON.stringify(params)}`);
-        const { text1 = DEFAULT_DATA.text1, text2 = DEFAULT_DATA.text2, type = initialOptions.type, text1Style = initialOptions.text1Style, text2Style = initialOptions.text2Style, position = initialOptions.position, autoHide = initialOptions.autoHide, visibilityTime = initialOptions.visibilityTime, topOffset = initialOptions.topOffset, bottomOffset = initialOptions.bottomOffset, keyboardOffset = initialOptions.keyboardOffset, onShow = initialOptions.onShow, onHide = initialOptions.onHide, onPress = initialOptions.onPress, swipeable = initialOptions.swipeable, props = initialOptions.props } = params;
+        const topOffset = safeAreaInsets && safeAreaInsets.top > 0 ? safeAreaInsets.top : initialOptions.topOffset;
+        const bottomOffset = safeAreaInsets && safeAreaInsets.bottom > 0 ? safeAreaInsets.bottom : initialOptions.bottomOffset;
+        const { text1 = DEFAULT_DATA.text1, text2 = DEFAULT_DATA.text2, type = initialOptions.type, text1Style = initialOptions.text1Style, text2Style = initialOptions.text2Style, position = initialOptions.position, autoHide = initialOptions.autoHide, visibilityTime = initialOptions.visibilityTime, keyboardOffset = initialOptions.keyboardOffset, onShow = initialOptions.onShow, onHide = initialOptions.onHide, onPress = initialOptions.onPress, swipeable = initialOptions.swipeable, props = initialOptions.props } = params;
         setData({
             text1,
             text2

package/lib/src/utils/dimension.d.ts

@@ -0,0 +1,2 @@
+export declare const WINDOW_HEIGHT: number;
+export declare const SCREEN_HEIGHT: number;

package/lib/src/utils/dimension.js

@@ -0,0 +1,3 @@
+import { Dimensions } from "react-native";
+export const { height: WINDOW_HEIGHT } = Dimensions.get('window');
+export const { height: SCREEN_HEIGHT } = Dimensions.get('screen');

package/package.json

@@ -1,11 +1,13 @@
 {
   "name": "react-native-toast-message",
-  "version": "2.2.0",
+  "version": "3.0.0-beta.1",
   "description": "Toast message component for React Native",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "files": [
-    "/lib"
+    "/lib",
+    "ios",
+    "*.podspec"
   ],
   "repository": {
     "type": "git",

package/react-native-toast-message.podspec

@@ -0,0 +1,41 @@
+require "json"
+
+package = JSON.parse(File.read(File.join(__dir__, "package.json")))
+folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
+
+Pod::Spec.new do |s|
+  s.name         = "react-native-toast-message"
+  s.version      = package["version"]
+  s.summary      = package["description"]
+  s.homepage     = "https://github.com/calintamas/react-native-toast-message"
+  s.license      = package["license"]
+  s.authors      = package["author"]
+
+  s.platforms    = { :ios => "9.0" }
+  s.source       = { :git => "https://github.com/calintamas/react-native-toast-message.git", :tag => "#{s.version}" }
+
+  s.source_files = "ios/**/*.{h,m,mm,swift}"
+
+  # 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-Core"
+
+  # Don't install the dependencies when we run `pod install` in the old architecture.
+  if ENV['RCT_NEW_ARCH_ENABLED'] == '1' then
+    s.compiler_flags = folly_compiler_flags + " -DRCT_NEW_ARCH_ENABLED=1"
+    s.pod_target_xcconfig    = {
+        "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\"",
+        "OTHER_CPLUSPLUSFLAGS" => "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1",
+        "CLANG_CXX_LANGUAGE_STANDARD" => "c++17"
+    }
+    s.dependency "React-Codegen"
+    s.dependency "RCT-Folly"
+    s.dependency "RCTRequired"
+    s.dependency "RCTTypeSafety"
+    s.dependency "ReactCommon/turbomodule/core"
+   end
+  end
+end