Merge pull request #54 from no23reason/features/typings-fix

Features/typings fix

Author: no23reason

index.d.ts

@@ -41,16 +41,17 @@ interface GeolocatedProps {
   positionError?: PositionError;
 }
 
-declare class ElementClass extends React.Component<GeolocatedProps, any> { }
-interface ClassDecorator {
-  <T extends (typeof ElementClass)>(component: T): T;
+type ComponentType = React.ComponentClass<GeolocatedProps> | React.StatelessComponent<GeolocatedProps>;
+
+interface ComponentDecorator {
+  <TargetClass extends ComponentType>(component: TargetClass): TargetClass;
 }
 
 /**
  * The HOC function.
  */
-export function geolocated(config?: GeolocatedConfig): ClassDecorator;
+export function geolocated(config?: GeolocatedConfig): ComponentDecorator;
 /**
  * React propTypes object.
  */
-export const geoPropTypes: React.ValidationMap<ElementClass>;
+export const geoPropTypes: React.ValidationMap<ComponentType>;

package.json

@@ -6,7 +6,8 @@
   "version": "0.0.0-semantic-release",
   "scripts": {
     "start": "webpack-dev-server",
-    "test": "jest --coverage",
+    "test": "npm run test:lint && npm run test:js && npm run test:ts",
+    "test:js": "jest --coverage",
     "test:tdd": "jest --watch",
     "test:lint": "eslint . --ext .js --ext .jsx --ignore-path .gitignore --ignore-pattern dist --ignore-pattern docs --cache",
     "test:ts": "cd tests/typescript && rimraf out && rimraf typings && typings install && tsc && rimraf out && rimraf typings",
@@ -77,7 +78,7 @@
   ],
   "license": "MIT",
   "pre-push": [
-    "test",
+    "test:js",
     "test:lint"
   ],
   "config": {

tests/typescript/index.tsx

@@ -14,6 +14,17 @@ class Demo extends React.Component<IDemoProps, {}> {
   }
 }
 
+function StatelessDemo(props: GeolocatedProps): React.ReactElement<{}> {
+  return <div>
+      latitude: {props.coords && props.coords.latitude}
+      isGeolocationAvailable: {props.isGeolocationAvailable}
+      isGeolocationEnabled: {props.isGeolocationEnabled}
+      positionError: {props.positionError}
+    </div>;
+}
+
+const StatelessDemoWrapped = geolocated()(StatelessDemo);
+
 export default geolocated({
   userDecisionTimeout: 5000,
   positionOptions: {