From f3384503d1a8f8b40e11b7557378af3f6ca20a84 Mon Sep 17 00:00:00 2001 From: kdastan Date: Thu, 27 Sep 2018 08:15:17 +0600 Subject: [PATCH 1/3] refactor(inspector): update props types --- Libraries/Inspector/InspectorOverlay.js | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/Libraries/Inspector/InspectorOverlay.js b/Libraries/Inspector/InspectorOverlay.js index c583cb7bb02a..1af5b71d26ef 100644 --- a/Libraries/Inspector/InspectorOverlay.js +++ b/Libraries/Inspector/InspectorOverlay.js @@ -12,7 +12,6 @@ const Dimensions = require('Dimensions'); const ElementBox = require('ElementBox'); -const PropTypes = require('prop-types'); const React = require('React'); const StyleSheet = require('StyleSheet'); const UIManager = require('UIManager'); @@ -22,23 +21,16 @@ type EventLike = { nativeEvent: Object, }; -class InspectorOverlay extends React.Component<{ - inspected?: { - frame?: Object, - style?: any, +type Props = $ReadOnly<{| + inspected?: ?{ + frame?: ?Object, + style?: ?StyleSheet.Styles, }, - inspectedViewTag?: number, - onTouchViewTag: (tag: number, frame: Object, pointerY: number) => void, -}> { - static propTypes = { - inspected: PropTypes.shape({ - frame: PropTypes.object, - style: PropTypes.any, - }), - inspectedViewTag: PropTypes.number, - onTouchViewTag: PropTypes.func.isRequired, - }; + inspectedViewTag?: ?number, + onTouchViewTag: (tag: number, frame: Object, pointerY: number) => mixed, +|}>; +class InspectorOverlay extends React.Component { findViewForTouchEvent = (e: EventLike) => { const {locationX, locationY} = e.nativeEvent.touches[0]; UIManager.findSubviewIn( From 1ed393a5d691b795fb6b6249460c2ec610c7ba7b Mon Sep 17 00:00:00 2001 From: kdastan Date: Thu, 27 Sep 2018 08:51:28 +0600 Subject: [PATCH 2/3] fix: update style prop type --- Libraries/Inspector/InspectorOverlay.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Libraries/Inspector/InspectorOverlay.js b/Libraries/Inspector/InspectorOverlay.js index 1af5b71d26ef..b956360055e0 100644 --- a/Libraries/Inspector/InspectorOverlay.js +++ b/Libraries/Inspector/InspectorOverlay.js @@ -17,6 +17,8 @@ const StyleSheet = require('StyleSheet'); const UIManager = require('UIManager'); const View = require('View'); +import type {ViewStyleProp} from 'StyleSheet'; + type EventLike = { nativeEvent: Object, }; @@ -24,7 +26,7 @@ type EventLike = { type Props = $ReadOnly<{| inspected?: ?{ frame?: ?Object, - style?: ?StyleSheet.Styles, + style?: ?ViewStyleProp, }, inspectedViewTag?: ?number, onTouchViewTag: (tag: number, frame: Object, pointerY: number) => mixed, From 302fe6862d03f3ae2e51914eede1d939d12d0580 Mon Sep 17 00:00:00 2001 From: kdastan Date: Thu, 27 Sep 2018 11:10:26 +0600 Subject: [PATCH 3/3] feat: created inspected type --- Libraries/Inspector/InspectorOverlay.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Libraries/Inspector/InspectorOverlay.js b/Libraries/Inspector/InspectorOverlay.js index b956360055e0..79e2156111c1 100644 --- a/Libraries/Inspector/InspectorOverlay.js +++ b/Libraries/Inspector/InspectorOverlay.js @@ -23,11 +23,13 @@ type EventLike = { nativeEvent: Object, }; +type Inspected = $ReadOnly<{| + frame?: Object, + style?: ViewStyleProp, +|}>; + type Props = $ReadOnly<{| - inspected?: ?{ - frame?: ?Object, - style?: ?ViewStyleProp, - }, + inspected?: Inspected, inspectedViewTag?: ?number, onTouchViewTag: (tag: number, frame: Object, pointerY: number) => mixed, |}>;