From 30f586d9b87f2f923832946aa65c6571c4f90604 Mon Sep 17 00:00:00 2001 From: Artur Drobinskiy Date: Tue, 11 Jan 2022 01:19:12 +0700 Subject: [PATCH 1/2] #363 support react-native --- packages/utils/src/RenderIndicator.tsx | 5 ++++- packages/utils/src/getRandomId.ts | 2 +- packages/utils/src/isReactNative.ts | 5 +++++ 3 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 packages/utils/src/isReactNative.ts diff --git a/packages/utils/src/RenderIndicator.tsx b/packages/utils/src/RenderIndicator.tsx index e69c6920f..4a0af0bb8 100644 --- a/packages/utils/src/RenderIndicator.tsx +++ b/packages/utils/src/RenderIndicator.tsx @@ -1,5 +1,8 @@ import React from 'react'; -import ReactDOM from 'react-dom'; + +import { isReactNative } from './isReactNative'; + +const ReactDOM = !isReactNative ? require('react-dom') : null; export const RenderIndicator: React.FC = ({ style, parentDom }) => { const indicator = ( diff --git a/packages/utils/src/getRandomId.ts b/packages/utils/src/getRandomId.ts index bf92081ff..121e842df 100644 --- a/packages/utils/src/getRandomId.ts +++ b/packages/utils/src/getRandomId.ts @@ -1,4 +1,4 @@ -import { nanoid } from 'nanoid'; +import { nanoid } from 'nanoid/non-secure'; // By default nanoid generate an ID with 21 characters. To reduce the footprint, we default to 10 characters. // We have a higher probability for collisions, though diff --git a/packages/utils/src/isReactNative.ts b/packages/utils/src/isReactNative.ts new file mode 100644 index 000000000..77e59ef07 --- /dev/null +++ b/packages/utils/src/isReactNative.ts @@ -0,0 +1,5 @@ +export const isReactNative = + typeof window !== 'undefined' && + window.navigator && + window.navigator.product && + window.navigator.product === 'ReactNative'; From 0c403876892df10555065abdb17bf65480bbc75c Mon Sep 17 00:00:00 2001 From: Artur Drobinskiy Date: Sat, 29 Jan 2022 23:55:18 +0700 Subject: [PATCH 2/2] revert --- packages/utils/src/RenderIndicator.tsx | 5 +---- packages/utils/src/isReactNative.ts | 5 ----- 2 files changed, 1 insertion(+), 9 deletions(-) delete mode 100644 packages/utils/src/isReactNative.ts diff --git a/packages/utils/src/RenderIndicator.tsx b/packages/utils/src/RenderIndicator.tsx index 4a0af0bb8..e69c6920f 100644 --- a/packages/utils/src/RenderIndicator.tsx +++ b/packages/utils/src/RenderIndicator.tsx @@ -1,8 +1,5 @@ import React from 'react'; - -import { isReactNative } from './isReactNative'; - -const ReactDOM = !isReactNative ? require('react-dom') : null; +import ReactDOM from 'react-dom'; export const RenderIndicator: React.FC = ({ style, parentDom }) => { const indicator = ( diff --git a/packages/utils/src/isReactNative.ts b/packages/utils/src/isReactNative.ts deleted file mode 100644 index 77e59ef07..000000000 --- a/packages/utils/src/isReactNative.ts +++ /dev/null @@ -1,5 +0,0 @@ -export const isReactNative = - typeof window !== 'undefined' && - window.navigator && - window.navigator.product && - window.navigator.product === 'ReactNative';