Merge branch 'master' of https://github.com/Naturalclar/react-native-segmented-control into chore/addMissingTypes

Author: Naturalclar

.circleci/config.yml

@@ -77,6 +77,10 @@ aliases:
 #   name: Jest Unit Tests
 #   command: yarn test:jest
 
+  - &tsc
+    name: TypeScript type check
+    command: yarn tsc
+
 # -------------------------
 #          JOBS
 # -------------------------
@@ -117,6 +121,13 @@ jobs:
   #       at: ~/react-native-segmented-control
   #   - run: *jest
 
+  tsc:
+    <<: *linux_defaults
+    steps:
+      - attach_workspace:
+          at: ~/react-native-segmented-control
+      - run: *tsc
+
   android-compile:
     <<: *android_defaults
     steps:
@@ -175,6 +186,9 @@ workflows:
       # - jest:
       #     requires:
       #     - linux-checkout
+      - tsc:
+          requires:
+            - linux-checkout
       - android-compile:
           requires:
             - linux-checkout

ios/RCTSegmentedControl.h ios/RNCSegmentedControl.hios/RCTSegmentedControl.h renamed to ios/RNCSegmentedControl.h

@@ -9,7 +9,7 @@
 
 #import <React/RCTComponent.h>
 
-@interface RCTSegmentedControl : UISegmentedControl
+@interface RNCSegmentedControl : UISegmentedControl
 
 @property (nonatomic, copy) NSArray<NSString *> *values;
 @property (nonatomic, assign) NSInteger selectedIndex;

ios/RCTSegmentedControl.m ios/RNCSegmentedControl.mios/RCTSegmentedControl.m renamed to ios/RNCSegmentedControl.m

@@ -5,13 +5,13 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#import "RCTSegmentedControl.h"
+#import "RNCSegmentedControl.h"
 
 #import "RCTConvert.h"
 #import "RCTEventDispatcher.h"
 #import "UIView+React.h"
 
-@implementation RCTSegmentedControl
+@implementation RNCSegmentedControl
 
 - (instancetype)initWithFrame:(CGRect)frame
 {

…gmentedControl.xcodeproj/project.pbxproj …gmentedControl.xcodeproj/project.pbxprojios/RCTSegmentedControl.xcodeproj/project.pbxproj renamed to ios/RNCSegmentedControl.xcodeproj/project.pbxproj ios/RCTSegmentedControl.xcodeproj/project.pbxproj renamed to ios/RNCSegmentedControl.xcodeproj/project.pbxproj

@@ -7,7 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		B3E7B58A1CC2AC0600A0062D /* RCTSegmentedControl.m in Sources */ = {isa = PBXBuildFile; fileRef = B3E7B5891CC2AC0600A0062D /* RCTSegmentedControl.m */; };
+		B3E7B58A1CC2AC0600A0062D /* RNCSegmentedControl.m in Sources */ = {isa = PBXBuildFile; fileRef = B3E7B5891CC2AC0600A0062D /* RNCSegmentedControl.m */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -23,9 +23,9 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
-		134814201AA4EA6300B7C361 /* libRCTSegmentedControl.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRCTSegmentedControl.a; sourceTree = BUILT_PRODUCTS_DIR; };
-		B3E7B5881CC2AC0600A0062D /* RCTSegmentedControl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTSegmentedControl.h; sourceTree = "<group>"; };
-		B3E7B5891CC2AC0600A0062D /* RCTSegmentedControl.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTSegmentedControl.m; sourceTree = "<group>"; };
+		134814201AA4EA6300B7C361 /* libRNCSegmentedControl.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRNCSegmentedControl.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		B3E7B5881CC2AC0600A0062D /* RNCSegmentedControl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RNCSegmentedControl.h; sourceTree = "<group>"; };
+		B3E7B5891CC2AC0600A0062D /* RNCSegmentedControl.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNCSegmentedControl.m; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -42,26 +42,26 @@
 		134814211AA4EA7D00B7C361 /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				134814201AA4EA6300B7C361 /* libRCTSegmentedControl.a */,
+				134814201AA4EA6300B7C361 /* libRNCSegmentedControl.a */,
 			);
 			name = Products;
 			sourceTree = "<group>";
 		};
 		58B511D21A9E6C8500147676 = {
 			isa = PBXGroup;
 			children = (
-				B3E7B5881CC2AC0600A0062D /* RCTSegmentedControl.h */,
-				B3E7B5891CC2AC0600A0062D /* RCTSegmentedControl.m */,
+				B3E7B5881CC2AC0600A0062D /* RNCSegmentedControl.h */,
+				B3E7B5891CC2AC0600A0062D /* RNCSegmentedControl.m */,
 				134814211AA4EA7D00B7C361 /* Products */,
 			);
 			sourceTree = "<group>";
 		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
-		58B511DA1A9E6C8500147676 /* RCTSegmentedControl */ = {
+		58B511DA1A9E6C8500147676 /* RNCSegmentedControl */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 58B511EF1A9E6C8500147676 /* Build configuration list for PBXNativeTarget "RCTSegmentedControl" */;
+			buildConfigurationList = 58B511EF1A9E6C8500147676 /* Build configuration list for PBXNativeTarget "RNCSegmentedControl" */;
 			buildPhases = (
 				58B511D71A9E6C8500147676 /* Sources */,
 				58B511D81A9E6C8500147676 /* Frameworks */,
@@ -71,9 +71,9 @@
 			);
 			dependencies = (
 			);
-			name = RCTSegmentedControl;
+			name = RNCSegmentedControl;
 			productName = RCTDataManager;
-			productReference = 134814201AA4EA6300B7C361 /* libRCTSegmentedControl.a */;
+			productReference = 134814201AA4EA6300B7C361 /* libRNCSegmentedControl.a */;
 			productType = "com.apple.product-type.library.static";
 		};
 /* End PBXNativeTarget section */
@@ -90,7 +90,7 @@
 					};
 				};
 			};
-			buildConfigurationList = 58B511D61A9E6C8500147676 /* Build configuration list for PBXProject "RCTSegmentedControl" */;
+			buildConfigurationList = 58B511D61A9E6C8500147676 /* Build configuration list for PBXProject "RNCSegmentedControl" */;
 			compatibilityVersion = "Xcode 3.2";
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
@@ -102,7 +102,7 @@
 			projectDirPath = "";
 			projectRoot = "";
 			targets = (
-				58B511DA1A9E6C8500147676 /* RCTSegmentedControl */,
+				58B511DA1A9E6C8500147676 /* RNCSegmentedControl */,
 			);
 		};
 /* End PBXProject section */
@@ -112,7 +112,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				B3E7B58A1CC2AC0600A0062D /* RCTSegmentedControl.m in Sources */,
+				B3E7B58A1CC2AC0600A0062D /* RNCSegmentedControl.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -235,7 +235,7 @@
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
-		58B511D61A9E6C8500147676 /* Build configuration list for PBXProject "RCTSegmentedControl" */ = {
+		58B511D61A9E6C8500147676 /* Build configuration list for PBXProject "RNCSegmentedControl" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				58B511ED1A9E6C8500147676 /* Debug */,
@@ -244,7 +244,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		58B511EF1A9E6C8500147676 /* Build configuration list for PBXNativeTarget "RCTSegmentedControl" */ = {
+		58B511EF1A9E6C8500147676 /* Build configuration list for PBXNativeTarget "RNCSegmentedControl" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				58B511F01A9E6C8500147676 /* Debug */,

ios/RCTSegmentedControlManager.h ios/RNCSegmentedControlManager.hios/RCTSegmentedControlManager.h renamed to ios/RNCSegmentedControlManager.h

@@ -7,6 +7,6 @@
 
 #import <React/RCTViewManager.h>
 
-@interface RCTSegmentedControlManager : RCTViewManager
+@interface RNCSegmentedControlManager : RCTViewManager
 
 @end

ios/RCTSegmentedControlManager.m ios/RNCSegmentedControlManager.mios/RCTSegmentedControlManager.m renamed to ios/RNCSegmentedControlManager.m

@@ -5,19 +5,19 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#import "RCTSegmentedControlManager.h"
+#import "RNCSegmentedControlManager.h"
 
 #import "RCTBridge.h"
 #import "RCTConvert.h"
-#import "RCTSegmentedControl.h"
+#import "RNCSegmentedControl.h"
 
-@implementation RCTSegmentedControlManager
+@implementation RNCSegmentedControlManager
 
 RCT_EXPORT_MODULE()
 
 - (UIView *)view
 {
-  return [RCTSegmentedControl new];
+  return [RNCSegmentedControl new];
 }
 
 RCT_EXPORT_VIEW_PROPERTY(values, NSArray<NSString *>)

js/RCTSegmentedControlNativeComponent.js js/RNCSegmentedControlNativeComponent.jsjs/RCTSegmentedControlNativeComponent.js renamed to js/RNCSegmentedControlNativeComponent.js

@@ -75,5 +75,5 @@ type NativeSegmentedControlIOS = Class<
 >;
 
 module.exports = ((requireNativeComponent(
-  'RCTSegmentedControl',
+  'RNCSegmentedControl',
 ): any): NativeSegmentedControlIOS);

js/SegmentedControlIOS.ios.js

@@ -16,7 +16,7 @@ import {StyleSheet} from 'react-native';
 import type {SyntheticEvent} from 'CoreEventTypes';
 import type {ViewProps} from 'ViewPropTypes';
 
-import RCTSegmentedControlNativeComponent from './RCTSegmentedControlNativeComponent';
+import RNCSegmentedControlNativeComponent from './RNCSegmentedControlNativeComponent';
 
 type Event = SyntheticEvent<
   $ReadOnly<{|
@@ -63,7 +63,7 @@ type SegmentedControlIOSProps = $ReadOnly<{|
 
 type Props = $ReadOnly<{|
   ...SegmentedControlIOSProps,
-  forwardedRef: ?React.Ref<typeof RCTSegmentedControlNativeComponent>,
+  forwardedRef: ?React.Ref<typeof RNCSegmentedControlNativeComponent>,
 |}>;
 
 /**
@@ -102,7 +102,7 @@ class SegmentedControlIOS extends React.Component<Props> {
   render() {
     const {forwardedRef, ...props} = this.props;
     return (
-      <RCTSegmentedControlNativeComponent
+      <RNCSegmentedControlNativeComponent
         {...props}
         ref={forwardedRef}
         style={[styles.segmentedControl, this.props.style]}
@@ -122,7 +122,7 @@ const styles = StyleSheet.create({
 const SegmentedControlIOSWithRef = React.forwardRef(
   (
     props: SegmentedControlIOSProps,
-    forwardedRef: ?React.Ref<typeof RCTSegmentedControlNativeComponent>,
+    forwardedRef: ?React.Ref<typeof RNCSegmentedControlNativeComponent>,
   ) => {
     return <SegmentedControlIOS {...props} forwardedRef={forwardedRef} />;
   },

package.json

@@ -8,7 +8,8 @@
     "start": "node node_modules/react-native/local-cli/cli.js start",
     "test": "yarn flow && yarn lint",
     "flow": "flow",
-    "lint": "eslint ."
+    "lint": "eslint .",
+    "tsc": "tsc --noEmit"
   },
   "peerDependencies": {
     "react": "^16.0",

tsconfig.json

@@ -0,0 +1,11 @@
+{
+  "compilerOptions": {
+    "target": "es5" /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019' or 'ESNEXT'. */,
+    "module": "commonjs" /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */,
+    "lib": ["es6"],
+    "jsx": "react" /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */,
+    /* Strict Type-Checking Options */
+    "strict": true /* Enable all strict type-checking options. */,
+    "esModuleInterop": true /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
+  }
+}