shineout 3.9.1-beta.6 → 3.9.1-beta.7

package/cjs/index.js

@@ -522,5 +522,5 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 // 此文件由脚本自动生成，请勿直接修改。
 // This file was generated automatically by a script. Please do not modify it directly.
 var _default = exports.default = {
-  version: '3.9.1-beta.6'
+  version: '3.9.1-beta.7'
 };

package/dist/shineout.js

@@ -12400,7 +12400,7 @@ var handleStyle = function handleStyle(style) {
 };
 /* harmony default export */ var jss_style_handleStyle = (handleStyle);
 ;// CONCATENATED MODULE: ../shineout-style/src/version.ts
-/* harmony default export */ var version = ('3.9.1-beta.6');
+/* harmony default export */ var version = ('3.9.1-beta.7');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -50157,11 +50157,12 @@ var useModalConfig = function useModalConfig() {
 var addModalInstance = function addModalInstance(instanceId) {
   modal_content_state.mutate.instanceIds.push(instanceId);
 };
-var addModalCascadeConfig = function addModalCascadeConfig(props) {
+var addModalCascadeConfig = function addModalCascadeConfig(options) {
   modal_content_state.mutate.cascadeConfigs.push({
-    cascade: props.cascade,
-    cascadeWidth: props.cascadeWidth,
-    instanceId: props.instanceId
+    cascade: options.cascade,
+    cascadeWidth: options.cascadeWidth,
+    instanceId: options.instanceId,
+    position: options.position
   });
 };
 var removeModalInstance = function removeModalInstance(instanceId) {
@@ -50264,6 +50265,7 @@ var Modal = function Modal(props) {
       addModalInstance(context.instanceId);
       addModalCascadeConfig({
         instanceId: context.instanceId,
+        position: props.position,
         cascade: !!props.cascade && !!isPositionX,
         cascadeWidth: typeof_default()(props.cascade) === 'object' ? props.cascade.width || 180 : 180
       });
@@ -50272,7 +50274,7 @@ var Modal = function Modal(props) {
       removeModalInstance(context.instanceId);
       removeModalCascadeConfig(context.instanceId);
     }
-  }, [visible, animation, config.instanceIds]);
+  }, [visible, props.position, animation, config.instanceIds]);
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(handleMaskVisible, [visible]);
   var updateOrigin = function updateOrigin() {
     // 更新transform-origin
@@ -50487,18 +50489,19 @@ var Modal = function Modal(props) {
       })]
     });
   };
-  if (!context.renderEd && !visible) return null;
-  context.renderEd = true;
   var cascadeStyle = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useMemo)(function () {
     if (!props.cascade) return;
-    var idx = config.instanceIds.findIndex(function (id) {
-      return id === context.instanceId;
-    });
     var instance = 0;
     var curCascadeConfig = config.cascadeConfigs.find(function (c) {
       return c.instanceId === context.instanceId;
     });
-    if (curCascadeConfig && idx < config.cascadeConfigs.length - 1) {
+    var samePositionConfigs = config.cascadeConfigs.filter(function (c) {
+      return c.position === (curCascadeConfig === null || curCascadeConfig === void 0 ? void 0 : curCascadeConfig.position);
+    });
+    var currentIndex = samePositionConfigs.findIndex(function (c) {
+      return c.instanceId === context.instanceId;
+    });
+    if (curCascadeConfig && currentIndex < samePositionConfigs.length - 1) {
       instance = curCascadeConfig.cascadeWidth;
     }
     return {
@@ -50506,6 +50509,8 @@ var Modal = function Modal(props) {
       transition: instance ? 'transform 0.3s ease 0.05s' : 'transform 0.2s ease'
     };
   }, [config.cascadeConfigs, config.instanceIds]);
+  if (!context.renderEd && !visible) return null;
+  context.renderEd = true;
   var panelStyle = objectSpread2_default()(objectSpread2_default()({
     transformOrigin: origin,
     top: props.fullScreen ? undefined : top
@@ -74418,7 +74423,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.9.1-beta.6'
+  version: '3.9.1-beta.7'
 });
 }();
 /******/ 	return __webpack_exports__;