From 7d4072f911c30c527dda157cbff99073c9619649 Mon Sep 17 00:00:00 2001 From: Blazej Kustra Date: Thu, 19 Oct 2023 10:54:08 +0200 Subject: [PATCH 1/3] Rename files --- src/components/SafeArea/{index.ios.js => index.ios.tsx} | 0 src/components/SafeArea/{index.js => index.tsx} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename src/components/SafeArea/{index.ios.js => index.ios.tsx} (100%) rename src/components/SafeArea/{index.js => index.tsx} (100%) diff --git a/src/components/SafeArea/index.ios.js b/src/components/SafeArea/index.ios.tsx similarity index 100% rename from src/components/SafeArea/index.ios.js rename to src/components/SafeArea/index.ios.tsx diff --git a/src/components/SafeArea/index.js b/src/components/SafeArea/index.tsx similarity index 100% rename from src/components/SafeArea/index.js rename to src/components/SafeArea/index.tsx From 548896df9aa23c055527c91af133dac10c404309 Mon Sep 17 00:00:00 2001 From: Blazej Kustra Date: Thu, 19 Oct 2023 10:56:01 +0200 Subject: [PATCH 2/3] [TS migration] Migrate 'SafeArea' component to TypeScript --- src/components/SafeArea/index.ios.tsx | 10 +++------- src/components/SafeArea/index.tsx | 4 +++- src/components/SafeArea/types.ts | 5 +++++ 3 files changed, 11 insertions(+), 8 deletions(-) create mode 100644 src/components/SafeArea/types.ts diff --git a/src/components/SafeArea/index.ios.tsx b/src/components/SafeArea/index.ios.tsx index ba9b1f01e298..1bbdf223e3c0 100644 --- a/src/components/SafeArea/index.ios.tsx +++ b/src/components/SafeArea/index.ios.tsx @@ -1,23 +1,19 @@ import React from 'react'; import {SafeAreaView} from 'react-native-safe-area-context'; -import PropTypes from 'prop-types'; import styles from '../../styles/styles'; +import SafeAreaProps from './types'; -function SafeArea(props) { +function SafeArea({children}: SafeAreaProps) { return ( - {props.children} + {children} ); } -SafeArea.propTypes = { - /** App content */ - children: PropTypes.node.isRequired, -}; SafeArea.displayName = 'SafeArea'; export default SafeArea; diff --git a/src/components/SafeArea/index.tsx b/src/components/SafeArea/index.tsx index e68fd1c402ce..94090ef48642 100644 --- a/src/components/SafeArea/index.tsx +++ b/src/components/SafeArea/index.tsx @@ -1 +1,3 @@ -export default ({children}) => children; +import SafeAreaProps from './types'; + +export default ({children}: SafeAreaProps) => children; diff --git a/src/components/SafeArea/types.ts b/src/components/SafeArea/types.ts new file mode 100644 index 000000000000..98ad9f0143bd --- /dev/null +++ b/src/components/SafeArea/types.ts @@ -0,0 +1,5 @@ +import ChildrenProps from '../../types/utils/ChildrenProps'; + +type SafeAreaProps = ChildrenProps; + +export default SafeAreaProps; From a468b573d09fbb2fd24b2222bcc4fd257d4f08cb Mon Sep 17 00:00:00 2001 From: Blazej Kustra Date: Mon, 30 Oct 2023 10:19:01 +0100 Subject: [PATCH 3/3] Fix import --- src/components/SafeArea/types.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/SafeArea/types.ts b/src/components/SafeArea/types.ts index 98ad9f0143bd..89faea46ab71 100644 --- a/src/components/SafeArea/types.ts +++ b/src/components/SafeArea/types.ts @@ -1,4 +1,4 @@ -import ChildrenProps from '../../types/utils/ChildrenProps'; +import ChildrenProps from '@src/types/utils/ChildrenProps'; type SafeAreaProps = ChildrenProps;