@douyinfe/semi-ui 2.33.1 → 2.33.2-alpha.1

package/lib/cjs/calendar/interface.d.ts

@@ -2,7 +2,7 @@
 import { strings } from '@douyinfe/semi-foundation/lib/cjs/calendar/constants';
 import type { ArrayElement } from '../_base/base';
 import type { BaseProps } from '../_base/baseComponent';
-import type { EventObject, weeekStartsOnEnum } from '@douyinfe/semi-foundation/lib/cjs/calendar/foundation';
+import type { EventObject, weekStartsOnEnum } from '@douyinfe/semi-foundation/lib/cjs/calendar/foundation';
 export interface CalendarProps extends BaseProps {
     displayValue?: Date;
     range?: Date[];
@@ -10,7 +10,7 @@ export interface CalendarProps extends BaseProps {
     events?: EventObject[];
     mode?: ArrayElement<typeof strings.MODE>;
     showCurrTime?: boolean;
-    weekStartsOn?: weeekStartsOnEnum;
+    weekStartsOn?: weekStartsOnEnum;
     scrollTop?: number;
     onClick?: (e: React.MouseEvent, value: Date) => void;
     onClose?: (e: React.MouseEvent) => void;

package/lib/cjs/form/baseForm.d.ts

@@ -138,7 +138,7 @@ declare class Form<Values extends Record<string, any> = any> extends BaseCompone
         preventScroll?: boolean;
         showRestTagsPopover?: boolean;
         restTagsPopoverProps?: import("../popover").PopoverProps;
-    } & Pick<import("../tooltip").TooltipProps, "stopPropagation" | "motion" | "getPopupContainer" | "spacing" | "mouseEnterDelay" | "autoAdjustOverflow" | "mouseLeaveDelay"> & React.RefAttributes<any> & import("./interface").CommonFieldProps, import("./interface").CommonexcludeType>> & import("./interface").SelectStatic;
+    } & Pick<import("../tooltip").TooltipProps, "stopPropagation" | "getPopupContainer" | "motion" | "spacing" | "mouseEnterDelay" | "autoAdjustOverflow" | "mouseLeaveDelay"> & React.RefAttributes<any> & import("./interface").CommonFieldProps, import("./interface").CommonexcludeType>> & import("./interface").SelectStatic;
     static Checkbox: React.ComponentType<import("utility-types").Subtract<import("./interface").CommonFieldProps, import("./interface").RadioCheckboxExcludeProps> & import("../checkbox").CheckboxProps & import("./interface").RCIncludeType>;
     static CheckboxGroup: React.ComponentType<import("utility-types").Subtract<import("../checkbox").CheckboxGroupProps, import("./interface").CommonexcludeType> & import("./interface").CommonFieldProps & React.RefAttributes<any>>;
     static Radio: React.ComponentType<import("utility-types").Subtract<import("./interface").CommonFieldProps, import("./interface").RadioCheckboxExcludeProps> & import("../radio").RadioProps & import("./interface").RCIncludeType>;

package/lib/cjs/form/field.d.ts

@@ -86,7 +86,7 @@ declare const FormSelect: import("react").ComponentType<import("utility-types").
     preventScroll?: boolean;
     showRestTagsPopover?: boolean;
     restTagsPopoverProps?: import("../popover").PopoverProps;
-} & Pick<import("../tooltip").TooltipProps, "stopPropagation" | "motion" | "getPopupContainer" | "spacing" | "mouseEnterDelay" | "autoAdjustOverflow" | "mouseLeaveDelay"> & import("react").RefAttributes<any> & import("./interface").CommonFieldProps, import("./interface").CommonexcludeType>> & import("./interface").SelectStatic;
+} & Pick<import("../tooltip").TooltipProps, "stopPropagation" | "getPopupContainer" | "motion" | "spacing" | "mouseEnterDelay" | "autoAdjustOverflow" | "mouseLeaveDelay"> & import("react").RefAttributes<any> & import("./interface").CommonFieldProps, import("./interface").CommonexcludeType>> & import("./interface").SelectStatic;
 declare const FormCheckboxGroup: import("react").ComponentType<import("utility-types").Subtract<import("../checkbox/checkboxGroup").CheckboxGroupProps, import("./interface").CommonexcludeType> & import("./interface").CommonFieldProps & import("react").RefAttributes<any>>;
 declare const FormCheckbox: import("react").ComponentType<import("utility-types").Subtract<import("./interface").CommonFieldProps, import("./interface").RadioCheckboxExcludeProps> & import("../checkbox/checkbox").CheckboxProps & import("./interface").RCIncludeType>;
 declare const FormRadioGroup: import("react").ComponentType<import("utility-types").Subtract<import("../radio/radioGroup").RadioGroupProps, import("./interface").CommonexcludeType> & import("./interface").CommonFieldProps & import("react").RefAttributes<any>>;

package/lib/cjs/modal/confirm.d.ts

@@ -145,11 +145,11 @@ export declare function withError(props: ModalReactProps): {
     size?: import("@douyinfe/semi-foundation/lib/cjs/modal/modalFoundation").Size;
     style?: React.CSSProperties;
     className?: string;
-    motion?: boolean;
     getPopupContainer?: () => HTMLElement;
     footer?: React.ReactNode;
     header?: React.ReactNode;
     direction?: any;
+    motion?: boolean;
     width?: string | number;
     height?: string | number;
     mask?: boolean;
@@ -204,10 +204,10 @@ export declare function withError(props: ModalReactProps): {
         title?: string;
         name?: string;
         value?: string | number | readonly string[];
-        onAnimationStart?: React.AnimationEventHandler<HTMLButtonElement>;
-        onAnimationEnd?: React.AnimationEventHandler<HTMLButtonElement>;
         form?: string;
         slot?: string;
+        onAnimationStart?: React.AnimationEventHandler<HTMLButtonElement>;
+        onAnimationEnd?: React.AnimationEventHandler<HTMLButtonElement>;
         hidden?: boolean;
         color?: string;
         onChange?: React.FormEventHandler<HTMLButtonElement>;

package/lib/cjs/table/Table.js

@@ -11,8 +11,6 @@ var _isFunction2 = _interopRequireDefault(require("lodash/isFunction"));
 
 var _difference2 = _interopRequireDefault(require("lodash/difference"));
 
-var _isNull2 = _interopRequireDefault(require("lodash/isNull"));
-
 var _omit2 = _interopRequireDefault(require("lodash/omit"));
 
 var _each2 = _interopRequireDefault(require("lodash/each"));
@@ -868,6 +866,8 @@ class Table extends _baseComponent.default {
 
     const queries = _foundation.default.initColumnsFilteredValueAndSorterOrder((0, _utils2.cloneDeep)(cachedflattenColumns));
 
+    const filteredSortedDataSource = this.foundation.getFilteredSortedDataSource(this.props.dataSource, queries);
+    const pageData = this.foundation.getCurrentPageData(filteredSortedDataSource, this.props.pagination, queries);
     this.state = {
       /**
        * Cached props
@@ -881,11 +881,11 @@ class Table extends _baseComponent.default {
        * State calculated based on prop
        */
       queries,
-      dataSource: [],
+      dataSource: pageData.dataSource,
       flattenData: [],
       expandedRowKeys: [...(props.expandedRowKeys || []), ...(props.defaultExpandedRowKeys || [])],
       rowSelection: props.rowSelection ? (0, _isObject2.default)(props.rowSelection) ? Object.assign({}, props.rowSelection) : {} : null,
-      pagination: props.pagination && typeof props.pagination === 'object' ? Object.assign({}, props.pagination) : props.pagination || false,
+      pagination: pageData.pagination,
 
       /**
        * Internal state
@@ -1454,12 +1454,11 @@ class Table extends _baseComponent.default {
      * TODO: After merging issue 1007, you can place it in the constructor to complete
      * The reason is that #1007 exposes the parameters required by getCurrentPageData in the constructor
      */
-
-    if ((0, _isNull2.default)(dataSource)) {
-      const pageData = this.foundation.getCurrentPageData(this.props.dataSource);
-      dataSource = pageData.dataSource;
-      pagination = pageData.pagination;
-    }
+    // if (isNull(dataSource)) {
+    //     const pageData: BasePageData<RecordType> = this.foundation.getCurrentPageData(this.props.dataSource);
+    //     dataSource = pageData.dataSource;
+    //     pagination = pageData.pagination;
+    // }
 
     const props = Object.assign(Object.assign(Object.assign({}, rest), this.state), {
       // props not in rest

package/lib/es/calendar/interface.d.ts

@@ -2,7 +2,7 @@
 import { strings } from '@douyinfe/semi-foundation/lib/es/calendar/constants';
 import type { ArrayElement } from '../_base/base';
 import type { BaseProps } from '../_base/baseComponent';
-import type { EventObject, weeekStartsOnEnum } from '@douyinfe/semi-foundation/lib/es/calendar/foundation';
+import type { EventObject, weekStartsOnEnum } from '@douyinfe/semi-foundation/lib/es/calendar/foundation';
 export interface CalendarProps extends BaseProps {
     displayValue?: Date;
     range?: Date[];
@@ -10,7 +10,7 @@ export interface CalendarProps extends BaseProps {
     events?: EventObject[];
     mode?: ArrayElement<typeof strings.MODE>;
     showCurrTime?: boolean;
-    weekStartsOn?: weeekStartsOnEnum;
+    weekStartsOn?: weekStartsOnEnum;
     scrollTop?: number;
     onClick?: (e: React.MouseEvent, value: Date) => void;
     onClose?: (e: React.MouseEvent) => void;

package/lib/es/form/baseForm.d.ts

@@ -138,7 +138,7 @@ declare class Form<Values extends Record<string, any> = any> extends BaseCompone
         preventScroll?: boolean;
         showRestTagsPopover?: boolean;
         restTagsPopoverProps?: import("../popover").PopoverProps;
-    } & Pick<import("../tooltip").TooltipProps, "stopPropagation" | "motion" | "getPopupContainer" | "spacing" | "mouseEnterDelay" | "autoAdjustOverflow" | "mouseLeaveDelay"> & React.RefAttributes<any> & import("./interface").CommonFieldProps, import("./interface").CommonexcludeType>> & import("./interface").SelectStatic;
+    } & Pick<import("../tooltip").TooltipProps, "stopPropagation" | "getPopupContainer" | "motion" | "spacing" | "mouseEnterDelay" | "autoAdjustOverflow" | "mouseLeaveDelay"> & React.RefAttributes<any> & import("./interface").CommonFieldProps, import("./interface").CommonexcludeType>> & import("./interface").SelectStatic;
     static Checkbox: React.ComponentType<import("utility-types").Subtract<import("./interface").CommonFieldProps, import("./interface").RadioCheckboxExcludeProps> & import("../checkbox").CheckboxProps & import("./interface").RCIncludeType>;
     static CheckboxGroup: React.ComponentType<import("utility-types").Subtract<import("../checkbox").CheckboxGroupProps, import("./interface").CommonexcludeType> & import("./interface").CommonFieldProps & React.RefAttributes<any>>;
     static Radio: React.ComponentType<import("utility-types").Subtract<import("./interface").CommonFieldProps, import("./interface").RadioCheckboxExcludeProps> & import("../radio").RadioProps & import("./interface").RCIncludeType>;

package/lib/es/form/field.d.ts

@@ -86,7 +86,7 @@ declare const FormSelect: import("react").ComponentType<import("utility-types").
     preventScroll?: boolean;
     showRestTagsPopover?: boolean;
     restTagsPopoverProps?: import("../popover").PopoverProps;
-} & Pick<import("../tooltip").TooltipProps, "stopPropagation" | "motion" | "getPopupContainer" | "spacing" | "mouseEnterDelay" | "autoAdjustOverflow" | "mouseLeaveDelay"> & import("react").RefAttributes<any> & import("./interface").CommonFieldProps, import("./interface").CommonexcludeType>> & import("./interface").SelectStatic;
+} & Pick<import("../tooltip").TooltipProps, "stopPropagation" | "getPopupContainer" | "motion" | "spacing" | "mouseEnterDelay" | "autoAdjustOverflow" | "mouseLeaveDelay"> & import("react").RefAttributes<any> & import("./interface").CommonFieldProps, import("./interface").CommonexcludeType>> & import("./interface").SelectStatic;
 declare const FormCheckboxGroup: import("react").ComponentType<import("utility-types").Subtract<import("../checkbox/checkboxGroup").CheckboxGroupProps, import("./interface").CommonexcludeType> & import("./interface").CommonFieldProps & import("react").RefAttributes<any>>;
 declare const FormCheckbox: import("react").ComponentType<import("utility-types").Subtract<import("./interface").CommonFieldProps, import("./interface").RadioCheckboxExcludeProps> & import("../checkbox/checkbox").CheckboxProps & import("./interface").RCIncludeType>;
 declare const FormRadioGroup: import("react").ComponentType<import("utility-types").Subtract<import("../radio/radioGroup").RadioGroupProps, import("./interface").CommonexcludeType> & import("./interface").CommonFieldProps & import("react").RefAttributes<any>>;

package/lib/es/modal/confirm.d.ts

@@ -145,11 +145,11 @@ export declare function withError(props: ModalReactProps): {
     size?: import("@douyinfe/semi-foundation/lib/es/modal/modalFoundation").Size;
     style?: React.CSSProperties;
     className?: string;
-    motion?: boolean;
     getPopupContainer?: () => HTMLElement;
     footer?: React.ReactNode;
     header?: React.ReactNode;
     direction?: any;
+    motion?: boolean;
     width?: string | number;
     height?: string | number;
     mask?: boolean;
@@ -204,10 +204,10 @@ export declare function withError(props: ModalReactProps): {
         title?: string;
         name?: string;
         value?: string | number | readonly string[];
-        onAnimationStart?: React.AnimationEventHandler<HTMLButtonElement>;
-        onAnimationEnd?: React.AnimationEventHandler<HTMLButtonElement>;
         form?: string;
         slot?: string;
+        onAnimationStart?: React.AnimationEventHandler<HTMLButtonElement>;
+        onAnimationEnd?: React.AnimationEventHandler<HTMLButtonElement>;
         hidden?: boolean;
         color?: string;
         onChange?: React.FormEventHandler<HTMLButtonElement>;

package/lib/es/table/Table.js

@@ -1,7 +1,6 @@
 import _isObject from "lodash/isObject";
 import _isFunction from "lodash/isFunction";
 import _difference from "lodash/difference";
-import _isNull from "lodash/isNull";
 import _omit from "lodash/omit";
 import _each from "lodash/each";
 import _flattenDeep from "lodash/flattenDeep";
@@ -822,6 +821,8 @@ class Table extends BaseComponent {
     const columns = this.getColumns(props.columns, props.children);
     const cachedflattenColumns = flattenColumns(columns);
     const queries = TableFoundation.initColumnsFilteredValueAndSorterOrder(cloneDeep(cachedflattenColumns));
+    const filteredSortedDataSource = this.foundation.getFilteredSortedDataSource(this.props.dataSource, queries);
+    const pageData = this.foundation.getCurrentPageData(filteredSortedDataSource, this.props.pagination, queries);
     this.state = {
       /**
        * Cached props
@@ -835,11 +836,11 @@ class Table extends BaseComponent {
        * State calculated based on prop
        */
       queries,
-      dataSource: [],
+      dataSource: pageData.dataSource,
       flattenData: [],
       expandedRowKeys: [...(props.expandedRowKeys || []), ...(props.defaultExpandedRowKeys || [])],
       rowSelection: props.rowSelection ? _isObject(props.rowSelection) ? Object.assign({}, props.rowSelection) : {} : null,
-      pagination: props.pagination && typeof props.pagination === 'object' ? Object.assign({}, props.pagination) : props.pagination || false,
+      pagination: pageData.pagination,
 
       /**
        * Internal state
@@ -1411,12 +1412,11 @@ class Table extends BaseComponent {
      * TODO: After merging issue 1007, you can place it in the constructor to complete
      * The reason is that #1007 exposes the parameters required by getCurrentPageData in the constructor
      */
-
-    if (_isNull(dataSource)) {
-      const pageData = this.foundation.getCurrentPageData(this.props.dataSource);
-      dataSource = pageData.dataSource;
-      pagination = pageData.pagination;
-    }
+    // if (isNull(dataSource)) {
+    //     const pageData: BasePageData<RecordType> = this.foundation.getCurrentPageData(this.props.dataSource);
+    //     dataSource = pageData.dataSource;
+    //     pagination = pageData.pagination;
+    // }
 
     const props = Object.assign(Object.assign(Object.assign({}, rest), this.state), {
       // props not in rest

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@douyinfe/semi-ui",
-    "version": "2.33.1",
+    "version": "2.33.2-alpha.1",
     "description": "",
     "main": "lib/cjs/index.js",
     "module": "lib/es/index.js",
@@ -17,12 +17,12 @@
         "lib/*"
     ],
     "dependencies": {
-        "@douyinfe/semi-animation": "2.33.1",
-        "@douyinfe/semi-animation-react": "2.33.1",
-        "@douyinfe/semi-foundation": "2.33.1",
-        "@douyinfe/semi-icons": "2.33.1",
-        "@douyinfe/semi-illustrations": "2.33.1",
-        "@douyinfe/semi-theme-default": "2.33.1",
+        "@douyinfe/semi-animation": "2.33.2-alpha.1",
+        "@douyinfe/semi-animation-react": "2.33.2-alpha.1",
+        "@douyinfe/semi-foundation": "2.33.2-alpha.1",
+        "@douyinfe/semi-icons": "2.33.2-alpha.1",
+        "@douyinfe/semi-illustrations": "2.33.2-alpha.1",
+        "@douyinfe/semi-theme-default": "2.33.2-alpha.1",
         "async-validator": "^3.5.0",
         "classnames": "^2.2.6",
         "copy-text-to-clipboard": "^2.1.1",
@@ -69,7 +69,7 @@
     ],
     "author": "",
     "license": "MIT",
-    "gitHead": "1810821764823ef746b7a88aae299d12a31cca5d",
+    "gitHead": "2deb728849055607d3d4019fecd2eee522b74f52",
     "devDependencies": {
         "@babel/plugin-proposal-decorators": "^7.15.8",
         "@babel/plugin-transform-runtime": "^7.15.8",