Browse Source

chore:backup

代强 3 years ago
parent
commit
c28b913479

+ 0 - 12
packages/semi-foundation/datePicker/foundation.ts

@@ -1213,18 +1213,6 @@ export default class DatePickerFoundation extends BaseFoundation<DatePickerAdapt
         return isSomeDateDisabled;
         return isSomeDateDisabled;
     }
     }
 
 
-    getMergedMotion = (motion: any) => {
-        const mergedMotion = typeof motion === 'undefined' || motion ? {
-            ...motion,
-            didEnter: () => {
-                this._adapter.setMotionEnd(true);
-            },
-            didLeave: () => {
-                this._adapter.setMotionEnd(false);
-            }
-        } : false;
-        return mergedMotion;
-    };
 
 
     /**
     /**
      * Format locale date
      * Format locale date

+ 2 - 2
packages/semi-ui/datePicker/datePicker.tsx

@@ -754,14 +754,13 @@ export default class DatePicker extends BaseComponent<DatePickerProps, DatePicke
             autoAdjustOverflow,
             autoAdjustOverflow,
             spacing,
             spacing,
         } = this.props;
         } = this.props;
-        const mergedMotion = this.foundation.getMergedMotion(motion);
         return (
         return (
             <Popover
             <Popover
                 getPopupContainer={getPopupContainer}
                 getPopupContainer={getPopupContainer}
                 // wrapWhenSpecial={false}
                 // wrapWhenSpecial={false}
                 autoAdjustOverflow={autoAdjustOverflow}
                 autoAdjustOverflow={autoAdjustOverflow}
                 zIndex={zIndex}
                 zIndex={zIndex}
-                motion={mergedMotion}
+                motion={motion}
                 content={this.renderPanel(locale, localeCode, dateFnsLocale)}
                 content={this.renderPanel(locale, localeCode, dateFnsLocale)}
                 trigger="custom"
                 trigger="custom"
                 position={position}
                 position={position}
@@ -769,6 +768,7 @@ export default class DatePicker extends BaseComponent<DatePickerProps, DatePicke
                 stopPropagation={stopPropagation}
                 stopPropagation={stopPropagation}
                 spacing={spacing}
                 spacing={spacing}
                 onVisibleChange={this.handlePanelVisibleChange}
                 onVisibleChange={this.handlePanelVisibleChange}
+                afterClose={()=>this.setState({ motionEnd: true }, ()=>this.setState({ motionEnd: false }))}
             >
             >
                 {children}
                 {children}
             </Popover>
             </Popover>

+ 2 - 1
packages/semi-ui/popover/index.tsx

@@ -46,7 +46,8 @@ export interface PopoverProps extends BaseProps {
     returnFocusOnClose?: TooltipProps['returnFocusOnClose'];
     returnFocusOnClose?: TooltipProps['returnFocusOnClose'];
     onEscKeyDown?: TooltipProps['onEscKeyDown'];
     onEscKeyDown?: TooltipProps['onEscKeyDown'];
     clickToHide?:TooltipProps['clickToHide'];
     clickToHide?:TooltipProps['clickToHide'];
-    disableFocusListener?: boolean
+    disableFocusListener?: boolean;
+    afterClose?:()=>void
 }
 }
 
 
 export interface PopoverState {
 export interface PopoverState {

+ 2 - 1
packages/semi-ui/timePicker/TimePicker.tsx

@@ -196,6 +196,7 @@ export default class TimePicker extends BaseComponent<TimePickerProps, TimePicke
         onKeyDown: noop,
         onKeyDown: noop,
         size: 'default' as const,
         size: 'default' as const,
         type: strings.DEFAULT_TYPE,
         type: strings.DEFAULT_TYPE,
+        motion: true,
         ...PanelShapeDefaults,
         ...PanelShapeDefaults,
         // format: strings.DEFAULT_FORMAT,
         // format: strings.DEFAULT_FORMAT,
         // open and value controlled
         // open and value controlled
@@ -506,7 +507,7 @@ export default class TimePicker extends BaseComponent<TimePickerProps, TimePicke
         if (useCustomTrigger) {
         if (useCustomTrigger) {
             outerProps.onClick = this.openPanel;
             outerProps.onClick = this.openPanel;
         }
         }
-
+        console.log("===>", disabled?false:open, motion);
         return (
         return (
             <div
             <div
                 ref={this.setTimePickerRef}
                 ref={this.setTimePickerRef}