fix: forceRender not work (#256)

react-component · Apr 28, 2021 · 748c301 · 748c301
1 parent eac2f8f
commit 748c301
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 0 deletions.
diff --git a/src/Popup/PopupInner.tsx b/src/Popup/PopupInner.tsx
@@ -28,6 +28,8 @@ export interface PopupInnerProps {
   // Motion
   motion: CSSMotionProps;
   destroyPopupOnHide?: boolean;
+  forceRender?: boolean;
+
   // Legacy Motion
   animation: AnimationType;
   transitionName: TransitionNameType;
@@ -67,6 +69,7 @@ const PopupInner = React.forwardRef<PopupInnerRef, PopupInnerProps>(
 
       stretch,
       destroyPopupOnHide,
+      forceRender,
 
       align,
       point,
@@ -194,6 +197,7 @@ const PopupInner = React.forwardRef<PopupInnerRef, PopupInnerProps>(
         onAppearPrepare={onShowPrepare}
         onEnterPrepare={onShowPrepare}
         removeOnLeave={destroyPopupOnHide}
+        forceRender={forceRender}
       >
         {({ className: motionClassName, style: motionStyle }, motionRef) => {
           const mergedClassName = classNames(

diff --git a/src/Popup/index.tsx b/src/Popup/index.tsx
@@ -38,6 +38,7 @@ export interface PopupProps {
   // Motion
   motion: CSSMotionProps;
   maskMotion: CSSMotionProps;
+  forceRender?: boolean;
 
   // Legacy
   animation: AnimationType;

diff --git a/src/index.tsx b/src/index.tsx
@@ -510,6 +510,7 @@ export function generateTrigger(
         stretch,
         alignPoint,
         mobile,
+        forceRender,
       } = this.props;
       const { popupVisible, point } = this.state;
 
@@ -550,6 +551,7 @@ export function generateTrigger(
           ref={this.popupRef}
           motion={popupMotion}
           mobile={mobile}
+          forceRender={forceRender}
         >
           {typeof popup === 'function' ? popup() : popup}
         </Popup>

diff --git a/tests/basic.test.jsx b/tests/basic.test.jsx
@@ -275,6 +275,7 @@ describe('Trigger.Basic', () => {
           <span>Hey!</span>
         </Trigger>,
       );
+
       expect(wrapper.instance().getPopupDomNode()).toBeFalsy();
     });
-Original file line number
+Diff line change
@@ Expand Up / @@ -275,6 +275,7 @@ describe('Trigger.Basic', () => { @@
               <span>Hey!</span>
             </Trigger>,
           );
           expect(wrapper.instance().getPopupDomNode()).toBeFalsy();
         });
@@ Expand Down @@