@sheinx/base 3.9.1-beta.6 → 3.9.1-beta.7

package/cjs/modal/modal-content.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"modal-content.d.ts","sourceRoot":"","sources":["modal-content.tsx"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAgF9D,QAAA,MAAM,KAAK,UAAW,iBAAiB,mDAiatC,CAAC;AAEF,eAAe,KAAK,CAAC"}
+{"version":3,"file":"modal-content.d.ts","sourceRoot":"","sources":["modal-content.tsx"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAkF9D,QAAA,MAAM,KAAK,UAAW,iBAAiB,mDAmatC,CAAC;AAEF,eAAe,KAAK,CAAC"}

package/cjs/modal/modal-content.js

@@ -40,11 +40,12 @@ var useModalConfig = function useModalConfig() {
 var addModalInstance = function addModalInstance(instanceId) {
   state.mutate.instanceIds.push(instanceId);
 };
-var addModalCascadeConfig = function addModalCascadeConfig(props) {
+var addModalCascadeConfig = function addModalCascadeConfig(options) {
   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) {
@@ -147,6 +148,7 @@ var Modal = function Modal(props) {
       addModalInstance(context.instanceId);
       addModalCascadeConfig({
         instanceId: context.instanceId,
+        position: props.position,
         cascade: !!props.cascade && !!isPositionX,
         cascadeWidth: _typeof(props.cascade) === 'object' ? props.cascade.width || 180 : 180
       });
@@ -155,7 +157,7 @@ var Modal = function Modal(props) {
       removeModalInstance(context.instanceId);
       removeModalCascadeConfig(context.instanceId);
     }
-  }, [visible, animation, config.instanceIds]);
+  }, [visible, props.position, animation, config.instanceIds]);
   (0, _react.useEffect)(handleMaskVisible, [visible]);
   var updateOrigin = function updateOrigin() {
     // 更新transform-origin
@@ -370,18 +372,19 @@ var Modal = function Modal(props) {
       })]
     });
   };
-  if (!context.renderEd && !visible) return null;
-  context.renderEd = true;
   var cascadeStyle = (0, _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 {
@@ -389,6 +392,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 = _objectSpread(_objectSpread({
     transformOrigin: origin,
     top: props.fullScreen ? undefined : top

package/esm/modal/modal-content.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"modal-content.d.ts","sourceRoot":"","sources":["modal-content.tsx"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAgF9D,QAAA,MAAM,KAAK,UAAW,iBAAiB,mDAiatC,CAAC;AAEF,eAAe,KAAK,CAAC"}
+{"version":3,"file":"modal-content.d.ts","sourceRoot":"","sources":["modal-content.tsx"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAkF9D,QAAA,MAAM,KAAK,UAAW,iBAAiB,mDAmatC,CAAC;AAEF,eAAe,KAAK,CAAC"}

package/esm/modal/modal-content.js

@@ -34,11 +34,12 @@ var useModalConfig = function useModalConfig() {
 var addModalInstance = function addModalInstance(instanceId) {
   state.mutate.instanceIds.push(instanceId);
 };
-var addModalCascadeConfig = function addModalCascadeConfig(props) {
+var addModalCascadeConfig = function addModalCascadeConfig(options) {
   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) {
@@ -141,6 +142,7 @@ var Modal = function Modal(props) {
       addModalInstance(context.instanceId);
       addModalCascadeConfig({
         instanceId: context.instanceId,
+        position: props.position,
         cascade: !!props.cascade && !!isPositionX,
         cascadeWidth: _typeof(props.cascade) === 'object' ? props.cascade.width || 180 : 180
       });
@@ -149,7 +151,7 @@ var Modal = function Modal(props) {
       removeModalInstance(context.instanceId);
       removeModalCascadeConfig(context.instanceId);
     }
-  }, [visible, animation, config.instanceIds]);
+  }, [visible, props.position, animation, config.instanceIds]);
   useEffect(handleMaskVisible, [visible]);
   var updateOrigin = function updateOrigin() {
     // 更新transform-origin
@@ -364,18 +366,19 @@ var Modal = function Modal(props) {
       })]
     });
   };
-  if (!context.renderEd && !visible) return null;
-  context.renderEd = true;
   var cascadeStyle = 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 {
@@ -383,6 +386,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 = _objectSpread(_objectSpread({
     transformOrigin: origin,
     top: props.fullScreen ? undefined : top

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sheinx/base",
-  "version": "3.9.1-beta.6",
+  "version": "3.9.1-beta.7",
   "description": "",
   "keywords": [],
   "license": "MIT",
@@ -10,7 +10,7 @@
   "module": "./esm/index.js",
   "typings": "./cjs/index.d.ts",
   "dependencies": {
-    "@sheinx/hooks": "3.9.1-beta.6",
+    "@sheinx/hooks": "3.9.1-beta.7",
     "immer": "^10.0.0",
     "classnames": "^2.0.0",
     "@shined/reactive": "^0.3.3"