amis-ui 2.5.1 → 2.5.2

package/lib/components/DateRangePicker.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.5.1
+ * amis-ui v2.5.2
  * Copyright 2018-2022 fex
  */
 
@@ -963,7 +963,7 @@ var DateRangePicker = /** @class */ (function (_super) {
         if (endDate && currentDate.isSame(endDate, 'day')) {
             props.className += ' rdtActive rdtEndDay';
         }
-        var _b = this.getDisabledElementProps(currentDate), className = _b.className, others = tslib.__rest(_b, ["className"]);
+        var _b = this.getDisabledElementProps(currentDate, 'day'), className = _b.className, others = tslib.__rest(_b, ["className"]);
         props.className += className;
         return (React__default["default"].createElement("td", tslib.__assign({}, omit__default["default"](props, ['todayActiveStyle']), others),
             React__default["default"].createElement("span", null, currentDate.date())));
@@ -980,7 +980,7 @@ var DateRangePicker = /** @class */ (function (_super) {
             currentDate.isBetween(startDate, endDate, 'month', '[]')) {
             props.className += ' rdtBetween';
         }
-        var _b = this.getDisabledElementProps(currentDate), className = _b.className, others = tslib.__rest(_b, ["className"]);
+        var _b = this.getDisabledElementProps(currentDate, 'month'), className = _b.className, others = tslib.__rest(_b, ["className"]);
         props.className += className;
         return (React__default["default"].createElement("td", tslib.__assign({}, props, others),
             React__default["default"].createElement("span", null, monthStrFixedLength)));
@@ -993,7 +993,7 @@ var DateRangePicker = /** @class */ (function (_super) {
             currentDate.isBetween(startDate, endDate, 'quarter', '[]')) {
             props.className += ' rdtBetween';
         }
-        var _b = this.getDisabledElementProps(currentDate), className = _b.className, others = tslib.__rest(_b, ["className"]);
+        var _b = this.getDisabledElementProps(currentDate, 'quarter'), className = _b.className, others = tslib.__rest(_b, ["className"]);
         props.className += className;
         return (React__default["default"].createElement("td", tslib.__assign({}, props, others),
             React__default["default"].createElement("span", null,
@@ -1008,7 +1008,7 @@ var DateRangePicker = /** @class */ (function (_super) {
             currentDate.isBetween(startDate, endDate, 'year', '[]')) {
             props.className += ' rdtBetween';
         }
-        var _b = this.getDisabledElementProps(currentDate), className = _b.className, others = tslib.__rest(_b, ["className"]);
+        var _b = this.getDisabledElementProps(currentDate, 'year'), className = _b.className, others = tslib.__rest(_b, ["className"]);
         props.className += className;
         return (React__default["default"].createElement("td", tslib.__assign({}, props, others),
             React__default["default"].createElement("span", null, year)));
@@ -1055,10 +1055,11 @@ var DateRangePicker = /** @class */ (function (_super) {
                         'is-disabled': isConfirmBtnDisbaled
                     }), onClick: this.confirm }, __('confirm'))))));
     };
-    DateRangePicker.prototype.getDisabledElementProps = function (currentDate) {
+    DateRangePicker.prototype.getDisabledElementProps = function (currentDate, granularity) {
         var _a = this.state; _a.endDateOpenedFirst; var endDate = _a.endDate, startDate = _a.startDate, editState = _a.editState;
-        var afterEndDate = editState === 'start' && currentDate > endDate;
-        var beforeStartDate = editState === 'end' && currentDate < startDate;
+        var afterEndDate = editState === 'start' && currentDate.isAfter(endDate, granularity);
+        var beforeStartDate = editState === 'end' &&
+            !currentDate.isSameOrAfter(startDate, granularity);
         if (afterEndDate || beforeStartDate) {
             return {
                 className: ' is-disabled',

package/lib/components/Drawer.d.ts

@@ -58,15 +58,15 @@ export declare class Drawer extends React.Component<DrawerProps, DrawerState> {
     render(): JSX.Element;
 }
 declare const _default: {
-    new (props: Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "disabled" | "height" | "width" | "show" | "bodyClassName" | "onHide" | "closeOnEsc" | "closeOnOutside" | "resizable" | "onExited" | "onEntered"> & Partial<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "size" | "container" | "showCloseButton" | "overlay" | "position">> & Partial<Pick<Pick<DrawerProps, "size" | "container" | "showCloseButton" | "overlay" | "position">, never>> & import("packages/amis-core/lib/theme").ThemeOutterProps): {
+    new (props: Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "disabled" | "onHide" | "closeOnEsc" | "width" | "height" | "closeOnOutside" | "show" | "onExited" | "onEntered" | "bodyClassName" | "resizable"> & Partial<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "showCloseButton" | "size" | "overlay" | "container" | "position">> & Partial<Pick<Pick<DrawerProps, "showCloseButton" | "size" | "overlay" | "container" | "position">, never>> & import("packages/amis-core/lib/theme").ThemeOutterProps): {
         ref: any;
         childRef(ref: any): void;
         getWrappedInstance(): any;
         render(): JSX.Element;
         context: any;
-        setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "disabled" | "height" | "width" | "show" | "bodyClassName" | "onHide" | "closeOnEsc" | "closeOnOutside" | "resizable" | "onExited" | "onEntered"> & Partial<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "size" | "container" | "showCloseButton" | "overlay" | "position">> & Partial<Pick<Pick<DrawerProps, "size" | "container" | "showCloseButton" | "overlay" | "position">, never>> & import("packages/amis-core/lib/theme").ThemeOutterProps>) => {} | Pick<{}, K> | null) | Pick<{}, K> | null, callback?: (() => void) | undefined): void;
+        setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "disabled" | "onHide" | "closeOnEsc" | "width" | "height" | "closeOnOutside" | "show" | "onExited" | "onEntered" | "bodyClassName" | "resizable"> & Partial<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "showCloseButton" | "size" | "overlay" | "container" | "position">> & Partial<Pick<Pick<DrawerProps, "showCloseButton" | "size" | "overlay" | "container" | "position">, never>> & import("packages/amis-core/lib/theme").ThemeOutterProps>) => {} | Pick<{}, K> | null) | Pick<{}, K> | null, callback?: (() => void) | undefined): void;
         forceUpdate(callback?: (() => void) | undefined): void;
-        readonly props: Readonly<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "disabled" | "height" | "width" | "show" | "bodyClassName" | "onHide" | "closeOnEsc" | "closeOnOutside" | "resizable" | "onExited" | "onEntered"> & Partial<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "size" | "container" | "showCloseButton" | "overlay" | "position">> & Partial<Pick<Pick<DrawerProps, "size" | "container" | "showCloseButton" | "overlay" | "position">, never>> & import("packages/amis-core/lib/theme").ThemeOutterProps> & Readonly<{
+        readonly props: Readonly<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "disabled" | "onHide" | "closeOnEsc" | "width" | "height" | "closeOnOutside" | "show" | "onExited" | "onEntered" | "bodyClassName" | "resizable"> & Partial<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "showCloseButton" | "size" | "overlay" | "container" | "position">> & Partial<Pick<Pick<DrawerProps, "showCloseButton" | "size" | "overlay" | "container" | "position">, never>> & import("packages/amis-core/lib/theme").ThemeOutterProps> & Readonly<{
             children?: React.ReactNode;
         }>;
         state: Readonly<{}>;
@@ -74,17 +74,17 @@ declare const _default: {
             [key: string]: React.ReactInstance;
         };
         componentDidMount?(): void;
-        shouldComponentUpdate?(nextProps: Readonly<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "disabled" | "height" | "width" | "show" | "bodyClassName" | "onHide" | "closeOnEsc" | "closeOnOutside" | "resizable" | "onExited" | "onEntered"> & Partial<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "size" | "container" | "showCloseButton" | "overlay" | "position">> & Partial<Pick<Pick<DrawerProps, "size" | "container" | "showCloseButton" | "overlay" | "position">, never>> & import("packages/amis-core/lib/theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): boolean;
+        shouldComponentUpdate?(nextProps: Readonly<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "disabled" | "onHide" | "closeOnEsc" | "width" | "height" | "closeOnOutside" | "show" | "onExited" | "onEntered" | "bodyClassName" | "resizable"> & Partial<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "showCloseButton" | "size" | "overlay" | "container" | "position">> & Partial<Pick<Pick<DrawerProps, "showCloseButton" | "size" | "overlay" | "container" | "position">, never>> & import("packages/amis-core/lib/theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): boolean;
         componentWillUnmount?(): void;
         componentDidCatch?(error: Error, errorInfo: React.ErrorInfo): void;
-        getSnapshotBeforeUpdate?(prevProps: Readonly<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "disabled" | "height" | "width" | "show" | "bodyClassName" | "onHide" | "closeOnEsc" | "closeOnOutside" | "resizable" | "onExited" | "onEntered"> & Partial<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "size" | "container" | "showCloseButton" | "overlay" | "position">> & Partial<Pick<Pick<DrawerProps, "size" | "container" | "showCloseButton" | "overlay" | "position">, never>> & import("packages/amis-core/lib/theme").ThemeOutterProps>, prevState: Readonly<{}>): any;
-        componentDidUpdate?(prevProps: Readonly<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "disabled" | "height" | "width" | "show" | "bodyClassName" | "onHide" | "closeOnEsc" | "closeOnOutside" | "resizable" | "onExited" | "onEntered"> & Partial<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "size" | "container" | "showCloseButton" | "overlay" | "position">> & Partial<Pick<Pick<DrawerProps, "size" | "container" | "showCloseButton" | "overlay" | "position">, never>> & import("packages/amis-core/lib/theme").ThemeOutterProps>, prevState: Readonly<{}>, snapshot?: any): void;
+        getSnapshotBeforeUpdate?(prevProps: Readonly<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "disabled" | "onHide" | "closeOnEsc" | "width" | "height" | "closeOnOutside" | "show" | "onExited" | "onEntered" | "bodyClassName" | "resizable"> & Partial<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "showCloseButton" | "size" | "overlay" | "container" | "position">> & Partial<Pick<Pick<DrawerProps, "showCloseButton" | "size" | "overlay" | "container" | "position">, never>> & import("packages/amis-core/lib/theme").ThemeOutterProps>, prevState: Readonly<{}>): any;
+        componentDidUpdate?(prevProps: Readonly<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "disabled" | "onHide" | "closeOnEsc" | "width" | "height" | "closeOnOutside" | "show" | "onExited" | "onEntered" | "bodyClassName" | "resizable"> & Partial<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "showCloseButton" | "size" | "overlay" | "container" | "position">> & Partial<Pick<Pick<DrawerProps, "showCloseButton" | "size" | "overlay" | "container" | "position">, never>> & import("packages/amis-core/lib/theme").ThemeOutterProps>, prevState: Readonly<{}>, snapshot?: any): void;
         componentWillMount?(): void;
         UNSAFE_componentWillMount?(): void;
-        componentWillReceiveProps?(nextProps: Readonly<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "disabled" | "height" | "width" | "show" | "bodyClassName" | "onHide" | "closeOnEsc" | "closeOnOutside" | "resizable" | "onExited" | "onEntered"> & Partial<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "size" | "container" | "showCloseButton" | "overlay" | "position">> & Partial<Pick<Pick<DrawerProps, "size" | "container" | "showCloseButton" | "overlay" | "position">, never>> & import("packages/amis-core/lib/theme").ThemeOutterProps>, nextContext: any): void;
-        UNSAFE_componentWillReceiveProps?(nextProps: Readonly<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "disabled" | "height" | "width" | "show" | "bodyClassName" | "onHide" | "closeOnEsc" | "closeOnOutside" | "resizable" | "onExited" | "onEntered"> & Partial<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "size" | "container" | "showCloseButton" | "overlay" | "position">> & Partial<Pick<Pick<DrawerProps, "size" | "container" | "showCloseButton" | "overlay" | "position">, never>> & import("packages/amis-core/lib/theme").ThemeOutterProps>, nextContext: any): void;
-        componentWillUpdate?(nextProps: Readonly<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "disabled" | "height" | "width" | "show" | "bodyClassName" | "onHide" | "closeOnEsc" | "closeOnOutside" | "resizable" | "onExited" | "onEntered"> & Partial<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "size" | "container" | "showCloseButton" | "overlay" | "position">> & Partial<Pick<Pick<DrawerProps, "size" | "container" | "showCloseButton" | "overlay" | "position">, never>> & import("packages/amis-core/lib/theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): void;
-        UNSAFE_componentWillUpdate?(nextProps: Readonly<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "disabled" | "height" | "width" | "show" | "bodyClassName" | "onHide" | "closeOnEsc" | "closeOnOutside" | "resizable" | "onExited" | "onEntered"> & Partial<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "size" | "container" | "showCloseButton" | "overlay" | "position">> & Partial<Pick<Pick<DrawerProps, "size" | "container" | "showCloseButton" | "overlay" | "position">, never>> & import("packages/amis-core/lib/theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): void;
+        componentWillReceiveProps?(nextProps: Readonly<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "disabled" | "onHide" | "closeOnEsc" | "width" | "height" | "closeOnOutside" | "show" | "onExited" | "onEntered" | "bodyClassName" | "resizable"> & Partial<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "showCloseButton" | "size" | "overlay" | "container" | "position">> & Partial<Pick<Pick<DrawerProps, "showCloseButton" | "size" | "overlay" | "container" | "position">, never>> & import("packages/amis-core/lib/theme").ThemeOutterProps>, nextContext: any): void;
+        UNSAFE_componentWillReceiveProps?(nextProps: Readonly<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "disabled" | "onHide" | "closeOnEsc" | "width" | "height" | "closeOnOutside" | "show" | "onExited" | "onEntered" | "bodyClassName" | "resizable"> & Partial<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "showCloseButton" | "size" | "overlay" | "container" | "position">> & Partial<Pick<Pick<DrawerProps, "showCloseButton" | "size" | "overlay" | "container" | "position">, never>> & import("packages/amis-core/lib/theme").ThemeOutterProps>, nextContext: any): void;
+        componentWillUpdate?(nextProps: Readonly<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "disabled" | "onHide" | "closeOnEsc" | "width" | "height" | "closeOnOutside" | "show" | "onExited" | "onEntered" | "bodyClassName" | "resizable"> & Partial<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "showCloseButton" | "size" | "overlay" | "container" | "position">> & Partial<Pick<Pick<DrawerProps, "showCloseButton" | "size" | "overlay" | "container" | "position">, never>> & import("packages/amis-core/lib/theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): void;
+        UNSAFE_componentWillUpdate?(nextProps: Readonly<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "disabled" | "onHide" | "closeOnEsc" | "width" | "height" | "closeOnOutside" | "show" | "onExited" | "onEntered" | "bodyClassName" | "resizable"> & Partial<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "showCloseButton" | "size" | "overlay" | "container" | "position">> & Partial<Pick<Pick<DrawerProps, "showCloseButton" | "size" | "overlay" | "container" | "position">, never>> & import("packages/amis-core/lib/theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): void;
     };
     displayName: string;
     contextType: React.Context<string>;

package/lib/components/Drawer.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.5.1
+ * amis-ui v2.5.2
  * Copyright 2018-2022 fex
  */