@douyinfe/semi-ui 2.32.0-beta.0 → 2.32.0

package/lib/cjs/modal/Modal.js

@@ -163,10 +163,7 @@ class Modal extends _baseComponent.default {
         this._haveRendered = true;
       }
 
-      return /*#__PURE__*/_react.default.createElement(_portal.default, {
-        style: wrapperStyle,
-        getPopupContainer: getPopupContainer
-      }, /*#__PURE__*/_react.default.createElement(_cssAnimation.default, {
+      return /*#__PURE__*/_react.default.createElement(_cssAnimation.default, {
         motion: this.props.motion,
         animationState: visible ? 'enter' : 'leave',
         startClassName: visible ? `${_constants.cssClasses.DIALOG}-content-animate-show` : `${_constants.cssClasses.DIALOG}-content-animate-hide`,
@@ -190,7 +187,10 @@ class Modal extends _baseComponent.default {
             animationClassName: maskAnimationClassName,
             animationEventsNeedBind: maskAnimationEventsNeedBind
           } = _ref2;
-          return shouldRender ? /*#__PURE__*/_react.default.createElement(_ModalContent.default, Object.assign({}, restProps, {
+          return shouldRender ? /*#__PURE__*/_react.default.createElement(_portal.default, {
+            style: wrapperStyle,
+            getPopupContainer: getPopupContainer
+          }, " ", /*#__PURE__*/_react.default.createElement(_ModalContent.default, Object.assign({}, restProps, {
             contentExtraProps: animationEventsNeedBind,
             maskExtraProps: maskAnimationEventsNeedBind,
             isFullScreen: this.state.isFullScreen,
@@ -203,9 +203,9 @@ class Modal extends _baseComponent.default {
             ref: this.modalRef,
             footer: renderFooter,
             onClose: this.handleCancel
-          })) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null);
+          }))) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null);
         });
-      }));
+      });
     };
 
     this.state = {

package/lib/cjs/table/Table.js

@@ -1174,13 +1174,13 @@ class Table extends _baseComponent.default {
     if (props.columns && props.columns !== state.cachedColumns) {
       const newFlattenColumns = (0, _utils.flattenColumns)(props.columns);
       willUpdateStates.flattenColumns = newFlattenColumns;
-      willUpdateStates.queries = (0, _utils.mergeColumns)(state.queries, newFlattenColumns, null, false);
+      willUpdateStates.queries = (0, _utils2.mergeColumns)(state.queries, newFlattenColumns, null, false);
       willUpdateStates.cachedColumns = props.columns;
       willUpdateStates.cachedChildren = null;
     } else if (props.children && props.children !== state.cachedChildren) {
       const newNestedColumns = (0, _getColumns.default)(props.children);
       const newFlattenColumns = (0, _utils.flattenColumns)(newNestedColumns);
-      const columns = (0, _utils.mergeColumns)(state.queries, newFlattenColumns, null, false);
+      const columns = (0, _utils2.mergeColumns)(state.queries, newFlattenColumns, null, false);
       willUpdateStates.flattenColumns = newFlattenColumns;
       willUpdateStates.queries = [...columns];
       willUpdateStates.cachedColumns = [...newNestedColumns];

package/lib/es/modal/Modal.js

@@ -135,10 +135,7 @@ class Modal extends BaseComponent {
         this._haveRendered = true;
       }
 
-      return /*#__PURE__*/React.createElement(Portal, {
-        style: wrapperStyle,
-        getPopupContainer: getPopupContainer
-      }, /*#__PURE__*/React.createElement(CSSAnimation, {
+      return /*#__PURE__*/React.createElement(CSSAnimation, {
         motion: this.props.motion,
         animationState: visible ? 'enter' : 'leave',
         startClassName: visible ? `${cssClasses.DIALOG}-content-animate-show` : `${cssClasses.DIALOG}-content-animate-hide`,
@@ -162,7 +159,10 @@ class Modal extends BaseComponent {
             animationClassName: maskAnimationClassName,
             animationEventsNeedBind: maskAnimationEventsNeedBind
           } = _ref2;
-          return shouldRender ? /*#__PURE__*/React.createElement(ModalContent, Object.assign({}, restProps, {
+          return shouldRender ? /*#__PURE__*/React.createElement(Portal, {
+            style: wrapperStyle,
+            getPopupContainer: getPopupContainer
+          }, " ", /*#__PURE__*/React.createElement(ModalContent, Object.assign({}, restProps, {
             contentExtraProps: animationEventsNeedBind,
             maskExtraProps: maskAnimationEventsNeedBind,
             isFullScreen: this.state.isFullScreen,
@@ -175,9 +175,9 @@ class Modal extends BaseComponent {
             ref: this.modalRef,
             footer: renderFooter,
             onClose: this.handleCancel
-          })) : /*#__PURE__*/React.createElement(React.Fragment, null);
+          }))) : /*#__PURE__*/React.createElement(React.Fragment, null);
         });
-      }));
+      });
     };
 
     this.state = {

package/lib/es/table/Table.js

@@ -45,7 +45,7 @@ var __rest = this && this.__rest || function (s, e) {
 import React, { createRef, isValidElement } from 'react';
 import PropTypes from 'prop-types';
 import classnames from 'classnames';
-import { mergeQueries, equalWith, mergeColumns, assignColumnKeys, flattenColumns, getAllDisabledRowKeys } from '@douyinfe/semi-foundation/lib/es/table/utils';
+import { mergeQueries, equalWith, assignColumnKeys, flattenColumns, getAllDisabledRowKeys } from '@douyinfe/semi-foundation/lib/es/table/utils';
 import Store from '@douyinfe/semi-foundation/lib/es/utils/Store';
 import TableFoundation from '@douyinfe/semi-foundation/lib/es/table/foundation';
 import { strings, cssClasses, numbers } from '@douyinfe/semi-foundation/lib/es/table/constants';
@@ -64,7 +64,7 @@ import ColumnSorter from './ColumnSorter';
 import ExpandedIcon from './CustomExpandIcon';
 import HeadTable from './HeadTable';
 import BodyTable from './Body';
-import { logger, cloneDeep, mergeComponents } from './utils';
+import { logger, cloneDeep, mergeComponents, mergeColumns } from './utils';
 
 class Table extends BaseComponent {
   constructor(props, context) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@douyinfe/semi-ui",
-    "version": "2.32.0-beta.0",
+    "version": "2.32.0",
     "description": "",
     "main": "lib/cjs/index.js",
     "module": "lib/es/index.js",
@@ -17,17 +17,17 @@
         "lib/*"
     ],
     "dependencies": {
-        "@douyinfe/semi-animation": "2.32.0-beta.0",
-        "@douyinfe/semi-animation-react": "2.32.0-beta.0",
-        "@douyinfe/semi-foundation": "2.32.0-beta.0",
-        "@douyinfe/semi-icons": "2.32.0-beta.0",
-        "@douyinfe/semi-illustrations": "2.32.0-beta.0",
-        "@douyinfe/semi-theme-default": "2.32.0-beta.0",
+        "@douyinfe/semi-animation": "2.32.0",
+        "@douyinfe/semi-animation-react": "2.32.0",
+        "@douyinfe/semi-foundation": "2.32.0",
+        "@douyinfe/semi-icons": "2.32.0",
+        "@douyinfe/semi-illustrations": "2.32.0",
+        "@douyinfe/semi-theme-default": "2.32.0",
         "async-validator": "^3.5.0",
         "classnames": "^2.2.6",
         "copy-text-to-clipboard": "^2.1.1",
-        "date-fns": "^2.9.0",
-        "date-fns-tz": "^1.0.10",
+        "date-fns": "^2.29.3",
+        "date-fns-tz": "^1.3.8",
         "lodash": "^4.17.21",
         "prop-types": "^15.7.2",
         "react-resizable": "^1.8.0",
@@ -69,7 +69,7 @@
     ],
     "author": "",
     "license": "MIT",
-    "gitHead": "335f8c47c40373ee1464c841581130e62b62b1d5",
+    "gitHead": "6cf04209adcb1c3ab8d24ba7aec0025394d82d49",
     "devDependencies": {
         "@babel/plugin-proposal-decorators": "^7.15.8",
         "@babel/plugin-transform-runtime": "^7.15.8",