feat: add displayName to forwardRef

Author: jquense

package.json

@@ -16,11 +16,15 @@
     "testonly": "jest",
     "test:types": "dtslint types",
     "build:es": "babel src -d lib/es --env-name esm --ignore **/__tests__ ",
-    "build:lib": "babel src -d lib --ignore **/__tests__ --delete-dir-on-start ",
-    "build": "npm run build:lib && npm run build:es && cpy types/*.d.ts lib && cpy types/*.d.ts lib/es",
+    "build:lib":
+      "babel src -d lib --ignore **/__tests__ --delete-dir-on-start ",
+    "build":
+      "npm run build:lib && npm run build:es && cpy types/*.d.ts lib && cpy types/*.d.ts lib/es",
     "prepublishOnly": "yarn run build",
-    "lint": "eslint . && prettier --list-different --ignore-path .eslintignore '**/*.{json,css,md}'",
-    "format": "eslint . --fix && prettier --write --ignore-path .eslintignore '**/*.{json,css,md}'",
+    "lint":
+      "eslint . && prettier --list-different --ignore-path .eslintignore '**/*.{json,css,md}'",
+    "format":
+      "eslint . --fix && prettier --write --ignore-path .eslintignore '**/*.{json,css,md}'",
     "precommit": "lint-staged"
   },
   "publishConfig": {
@@ -32,25 +36,18 @@
     "trailingComma": "all"
   },
   "lint-staged": {
-    "*.js": [
-      "eslint --fix",
-      "git add"
-    ],
+    "*.js": ["eslint --fix", "git add"],
     "*.{json,css,md}": [
       "prettier --write --ignore-path .eslintignore",
       "git add"
     ]
   },
   "jest": {
     "testEnvironment": "jsdom",
-    "setupFiles": [
-      "<rootDir>/test/index.js"
-    ]
+    "setupFiles": ["<rootDir>/test/index.js"]
   },
   "release": {
-    "extends": [
-      "@4c/semantic-release-config"
-    ],
+    "extends": ["@4c/semantic-release-config"],
     "pkgRoot": "lib"
   },
   "devDependencies": {

src/forwardRef.js

@@ -10,17 +10,15 @@ export default function forwardRef(
   } = {},
 ) {
   const render = (props, ref) => renderFn(props, ref);
-  render.displayName = displayName;
 
-  if (React.forwardRef || !allowFallback)
-    return Object.assign(React.forwardRef(render), {
+  return Object.assign(
+    React.forwardRef || !allowFallback
+      ? React.forwardRef(render)
+      : props => render(props, null),
+    {
+      displayName,
       propTypes,
       defaultProps,
-    });
-
-  return Object.assign(props => render(props, null), {
-    displayName,
-    propTypes,
-    defaultProps,
-  });
+    },
+  );
 }

test/forwardRef.test.js

@@ -10,6 +10,6 @@ describe('forwardRef', () => {
       return null;
     });
 
-    expect(mount(<Foo />).find('ForwardRef(Foo)')).toHaveLength(1);
+    expect(mount(<Foo />).find('Foo')).toHaveLength(1);
   });
 });

test/mapContextToProps.test.js

@@ -122,7 +122,7 @@ describe('mapContextToProps', () => {
       'div',
     );
 
-    expect(Mapper.render.displayName).toEqual('ContextTransform(div)');
+    expect(Mapper.displayName).toEqual('ContextTransform(div)');
   });
 
   it('should add custom displayName', () => {
@@ -135,7 +135,7 @@ describe('mapContextToProps', () => {
       'div',
     );
 
-    expect(Mapper.render.displayName).toEqual('WithIntl');
+    expect(Mapper.displayName).toEqual('WithIntl');
   });
 
   it('should not warn about Contexts', () => {

types/mapContextToProps.d.ts

@@ -3,13 +3,15 @@
 declare module 'react-context-toolbox/mapContextToProps' {
   import * as React from 'react';
 
-  type ElementType = React.ComponentType<any> | keyof JSX.IntrinsicElements;
-
   type Omit<T, U> = Pick<T, Exclude<keyof T, keyof U>>;
 
   type GetProps<C> = C extends React.ComponentType<infer P> ? P : never;
 
-  interface ContextInjectedComponent<TComponent, TInjectedProps, TExtraProps>
+  export interface ContextInjectedComponent<
+    TComponent,
+    TInjectedProps,
+    TExtraProps
+  >
     extends React.ForwardRefExoticComponent<
         Omit<GetProps<TComponent>, TInjectedProps> & TExtraProps
       > {}

types/tslint.json

@@ -1,23 +1,7 @@
 {
   "extends": "dtslint/dtslint.json",
   "rules": {
-    "array-type": false,
-    "semicolon": false,
-    "whitespace": [
-      true,
-      "check-branch",
-      "check-decl",
-      "check-operator",
-      "check-module",
-      "check-rest-spread",
-      "check-type",
-      "check-typecast",
-      "check-type-operator",
-      "check-preblock"
-    ],
-
-    "no-unnecessary-generics": false,
-    "no-unnecessary-class": false,
-    "no-single-declare-module": false
+    "no-single-declare-module": false,
+    "strict-export-declare-modifiers": false
   }
 }