@douyinfe/semi-ui 2.38.3-alpha.2-patch-2395 → 2.38.3-alpha.2-patch-3006

package/dist/umd/semi-ui.js

@@ -44222,6 +44222,7 @@ var collapsible = __webpack_require__("v967");
 
 
 
+
 class Collapsible extends BaseComponent {
   constructor(props) {
     super(props);
@@ -44245,7 +44246,8 @@ class Collapsible extends BaseComponent {
       domInRenderTree: false,
       domHeight: 0,
       visible: this.props.isOpen,
-      isTransitioning: false
+      isTransitioning: false,
+      cacheIsOpen: this.props.isOpen
     };
     this.foundation = new collapsible_foundation(this.adapter);
   }
@@ -44281,6 +44283,20 @@ class Collapsible extends BaseComponent {
       }
     });
   }
+  static getDerivedStateFromProps(props, prevState) {
+    const newState = {};
+    const isOpenChanged = props.isOpen !== prevState.cacheIsOpen;
+    if (isOpenChanged) {
+      if (props.isOpen || !props.motion) {
+        newState.visible = props.isOpen;
+      }
+    }
+    if (props.motion && isOpenChanged) {
+      newState.isTransitioning = true;
+    }
+    newState.cacheIsOpen = props.isOpen;
+    return newState;
+  }
   componentDidMount() {
     super.componentDidMount();
     this.resizeObserver = new ResizeObserver(this.handleResize);
@@ -44292,22 +44308,14 @@ class Collapsible extends BaseComponent {
     }
   }
   componentDidUpdate(prevProps, prevState, snapshot) {
-    const changedPropKeys = Object.keys(this.props).filter(key => !isEqual_default()(this.props[key], prevProps[key]));
-    const changedStateKeys = Object.keys(this.state).filter(key => !isEqual_default()(this.state[key], prevState[key]));
+    const changedPropKeys = Object.keys(pick_default()(this.props, ['reCalcKey'])).filter(key => !isEqual_default()(this.props[key], prevProps[key]));
+    const changedStateKeys = Object.keys(pick_default()(this.state, ['domInRenderTree'])).filter(key => !isEqual_default()(this.state[key], prevState[key]));
     if (changedPropKeys.includes("reCalcKey")) {
       this.foundation.updateDOMHeight(this.domRef.current.scrollHeight);
     }
     if (changedStateKeys.includes("domInRenderTree") && this.state.domInRenderTree) {
       this.foundation.updateDOMHeight(this.domRef.current.scrollHeight);
     }
-    if (changedPropKeys.includes("isOpen")) {
-      if (this.props.isOpen || !this.props.motion) {
-        this.foundation.updateVisible(this.props.isOpen);
-      }
-    }
-    if (this.props.motion && prevProps.isOpen !== this.props.isOpen) {
-      this.foundation.updateIsTransitioning(true);
-    }
   }
   componentWillUnmount() {
     super.componentWillUnmount();
@@ -57141,21 +57149,20 @@ class ModalContent extends BaseComponent {
     this.foundation.destroy();
   }
   render() {
-    var _a;
-    const _b = this.props,
+    const _a = this.props,
       {
         maskClosable,
         className,
         getPopupContainer,
         maskFixed,
         getContainerContext
-      } = _b,
-      rest = ModalContent_rest(_b, ["maskClosable", "className", "getPopupContainer", "maskFixed", "getContainerContext"]);
+      } = _a,
+      rest = ModalContent_rest(_a, ["maskClosable", "className", "getPopupContainer", "maskFixed", "getContainerContext"]);
     const {
       direction
     } = this.context;
     const classList = classnames_default()(className, {
-      [`${modal_constants_cssClasses.DIALOG}-popup`]: getPopupContainer && getPopupContainer() !== ((_a = globalThis === null || globalThis === void 0 ? void 0 : globalThis.document) === null || _a === void 0 ? void 0 : _a.body) && !maskFixed,
+      [`${modal_constants_cssClasses.DIALOG}-popup`]: getPopupContainer && !maskFixed,
       [`${modal_constants_cssClasses.DIALOG}-fixed`]: maskFixed,
       [`${modal_constants_cssClasses.DIALOG}-rtl`]: direction === 'rtl'
     });
@@ -57556,8 +57563,7 @@ class Modal extends BaseComponent {
     //     return <ModalContent {...restProps} footer={renderFooter} onClose={this.handleCancel}/>;
     // };
     this.renderDialog = () => {
-      var _a;
-      let _b = this.props,
+      let _a = this.props,
         {
           footer,
           className,
@@ -57568,15 +57574,15 @@ class Modal extends BaseComponent {
           zIndex,
           getPopupContainer,
           visible
-        } = _b,
-        restProps = Modal_rest(_b, ["footer", "className", "motion", "maskStyle", "keepDOM", "style", "zIndex", "getPopupContainer", "visible"]);
+        } = _a,
+        restProps = Modal_rest(_a, ["footer", "className", "motion", "maskStyle", "keepDOM", "style", "zIndex", "getPopupContainer", "visible"]);
       let style = styleFromProps;
       const maskStyle = maskStyleFromProps;
       const renderFooter = 'footer' in this.props ? footer : this.renderFooter();
       let wrapperStyle = {
         zIndex
       };
-      if (getPopupContainer && getPopupContainer() !== ((_a = globalThis === null || globalThis === void 0 ? void 0 : globalThis.document) === null || _a === void 0 ? void 0 : _a.body)) {
+      if (getPopupContainer) {
         wrapperStyle = {
           zIndex,
           position: 'static'
@@ -57647,22 +57653,20 @@ class Modal extends BaseComponent {
     return Object.assign(Object.assign({}, super.adapter), {
       getProps: () => this.props,
       disabledBodyScroll: () => {
-        var _a;
         const {
           getPopupContainer
         } = this.props;
         this.bodyOverflow = document.body.style.overflow || '';
-        if ((!getPopupContainer || getPopupContainer() === ((_a = globalThis === null || globalThis === void 0 ? void 0 : globalThis.document) === null || _a === void 0 ? void 0 : _a.body)) && this.bodyOverflow !== 'hidden') {
+        if (!getPopupContainer && this.bodyOverflow !== 'hidden') {
           document.body.style.overflow = 'hidden';
           document.body.style.width = `calc(${this.originBodyWidth || '100%'} - ${this.scrollBarWidth}px)`;
         }
       },
       enabledBodyScroll: () => {
-        var _a;
         const {
           getPopupContainer
         } = this.props;
-        if ((!getPopupContainer || getPopupContainer() === ((_a = globalThis === null || globalThis === void 0 ? void 0 : globalThis.document) === null || _a === void 0 ? void 0 : _a.body)) && this.bodyOverflow !== null && this.bodyOverflow !== 'hidden') {
+        if (!getPopupContainer && this.bodyOverflow !== 'hidden') {
           document.body.style.overflow = this.bodyOverflow;
           document.body.style.width = this.originBodyWidth;
         }