Merge branch 'master' of github.com:Sam618/react-keep-alive

README.md

 # React Keep Alive
+Package will allow components to maintain their status, to avoid repeated re-rendering.
 
-Writing.
+## TODO
+- MAX
+- wrappedComponent
+- document
+- test
+
+## Installation
+React Keep Alive requires React 16.3 or later.
+
+To use React Keep Alive with your React app:
+
+```bash
+npm install --save react-keep-alive
+```
+
+## Changelog
+Changes are tracked in the [CHANGELOG.md](https://github.com/Sam618/react-keep-alive/blob/master/CHANGELOG.md).
+
+
+## License
+React Keep Alive is available under the [MIT](https://github.com/Sam618/react-keep-alive/blob/master/LICENSE) License.

src/utils/bindLifecycle.tsx

@@ -6,6 +6,14 @@ import withIdentificationContextConsumer from './withIdentificationContextConsum
 import getDisplayName from './getDisplayName';
 
 export default function bindLifecycle<P = any>(Component: React.ComponentType<P>) {
+  const {
+    WrappedComponent,
+    wrappedComponent,
+  } = Component;
+  if (WrappedComponent || wrappedComponent) {
+    Component = WrappedComponent || wrappedComponent;
+  }
+  
   const {
     componentDidMount = noop,
     componentDidUpdate = noop,
@@ -82,7 +90,7 @@ export default function bindLifecycle<P = any>(Component: React.ComponentType<P>
     );
   };
 
-  const NewComponent = withIdentificationContextConsumer(
+  const BindLifecycleHOC = withIdentificationContextConsumer(
     ({
       forwardRef,
       _identificationContextProps: {
@@ -109,12 +117,14 @@ export default function bindLifecycle<P = any>(Component: React.ComponentType<P>
         : null
     ),
   );
+  const BindLifecycle = React.forwardRef((props, ref) => (
+    <BindLifecycleHOC {...props} forwardRef={ref} />
+  ));
 
-  NewComponent.displayName = `bindLifecycle(${getDisplayName(Component)})`;
+  BindLifecycle.WrappedComponent = Component;
+  BindLifecycle.displayName = `bindLifecycle(${getDisplayName(Component)})`;
   return hoistNonReactStatics(
-    React.forwardRef((props, ref) => (
-      <NewComponent {...props} forwardRef={ref} />
-    )),
+    BindLifecycle,
     Component,
   );
 }

src/utils/keepAlive.tsx

@@ -56,6 +56,14 @@ export default function keepAliveDecorator({
   forwardRef = false,
 }: IOptions = {}) {
   return (Component: React.ComponentType<IComponentProps>) => {
+    const {
+      WrappedComponent,
+      wrappedComponent,
+    } = Component;
+    if (WrappedComponent || wrappedComponent) {
+      Component = WrappedComponent || wrappedComponent;
+    }
+    
     const {
       componentDidMount = noop,
       componentDidUpdate = noop,
@@ -335,8 +343,6 @@ export default function keepAliveDecorator({
     }
 
     class ListenUpperKeepAliveContainer extends React.Component<IListenUpperKeepAliveContainerProps, IListenUpperKeepAliveContainerState> {
-      public static displayName = `${keepAliveDisplayName}(${displayName})`;
-
       private combinedKeepAlive: boolean;
 
       public state = {
@@ -460,15 +466,18 @@ export default function keepAliveDecorator({
       withIdentificationContextConsumer(ListenUpperKeepAliveContainer)
     );
 
-    let NewComponent: React.ComponentType<IKeepAliveDecorativeComponentProps> = ListenUpperKeepAliveContainerHOC;
+    let KeepAlive: React.ComponentType<IKeepAliveDecorativeComponentProps> = ListenUpperKeepAliveContainerHOC;
     if (forwardRef) {
-      NewComponent = React.forwardRef((props, ref) => (
+      KeepAlive = React.forwardRef((props, ref) => (
         <ListenUpperKeepAliveContainerHOC
           {...props}
           forwardedRef={ref}
         />
       ));
     }
-    return hoistNonReactStatics(NewComponent, Component);
+
+    KeepAlive.WrappedComponent = Component;
+    KeepAlive.displayName = `${keepAliveDisplayName}(${displayName})`;
+    return hoistNonReactStatics(KeepAlive, Component);
   };
 }

src/utils/withIdentificationContextConsumer.tsx

@@ -18,7 +18,7 @@ export interface IIdentificationContextComponentProps {
 export default function withIdentificationContextConsumer<P = any>(Component: React.ComponentType<IIdentificationContextComponentProps & P>) {
   const NewComponent = (props: P) => (
     <IdentificationContext.Consumer>
-      {(contextProps: IIdentificationContextProps) => <Component _identificationContextProps={contextProps || {}} {...props} />}
+      {(contextProps: IIdentificationContextProps) => <Component _identificationContextProps={contextProps} {...props} />}
     </IdentificationContext.Consumer>
   );
 

src/utils/withKeepAliveContextConsumer.tsx

@@ -12,7 +12,7 @@ export interface IKeepAliveContextComponentProps {
 export default function withKeepAliveContextConsumer<P = any>(Component: React.ComponentType<IKeepAliveContextComponentProps & P>) {
   const NewComponent = (props: P) => (
     <KeepAliveContext.Consumer>
-      {(contextProps: IKeepAliveContextProps) => <Component _keepAliveContextProps={contextProps || {}} {...props} />}
+      {(contextProps: IKeepAliveContextProps) => <Component _keepAliveContextProps={contextProps} {...props} />}
     </KeepAliveContext.Consumer>
   );