plain-design 1.0.0-beta.91 → 1.0.0-beta.92

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "plain-design",
-  "version": "1.0.0-beta.91",
+  "version": "1.0.0-beta.92",
   "description": "",
   "main": "dist/plain-design.min.js",
   "module": "dist/plain-design.commonjs.min.js",

package/src/packages/components/usePopup/refresh/MaxMinTopLeft.ts

@@ -0,0 +1,38 @@
+import {iPopupRefreshBuildParams} from "../utils/popup.utils";
+
+export function MaxMinTopLeft(
+  {
+    top,
+    left,
+    buildParams,
+    option,
+  }: {
+    top: number,
+    left: number,
+    buildParams: iPopupRefreshBuildParams,
+    option: {
+      maxTop?: number | ((buildParams: iPopupRefreshBuildParams) => number),
+      minTop?: number | ((buildParams: iPopupRefreshBuildParams) => number),
+      maxLeft?: number | ((buildParams: iPopupRefreshBuildParams) => number),
+      minLeft?: number | ((buildParams: iPopupRefreshBuildParams) => number),
+    }
+  }
+): { top: number, left: number } {
+  if (option.maxTop != null) {
+    const maxTop = typeof option.maxTop === "function" ? option.maxTop(buildParams) : option.maxTop;
+    if (top > maxTop) {top = maxTop;}
+  }
+  if (option.minTop != null) {
+    const minTop = typeof option.minTop === "function" ? option.minTop(buildParams) : option.minTop;
+    if (top < minTop) {top = minTop;}
+  }
+  if (option.maxLeft != null) {
+    const maxLeft = typeof option.maxLeft === "function" ? option.maxLeft(buildParams) : option.maxLeft;
+    if (left > maxLeft) {left = maxLeft;}
+  }
+  if (option.minLeft != null) {
+    const minLeft = typeof option.minLeft === "function" ? option.minLeft(buildParams) : option.minLeft;
+    if (left < minLeft) {left = minLeft;}
+  }
+  return { top, left };
+}

package/src/packages/components/usePopup/refresh/calcPosition.ts

@@ -1,5 +1,6 @@
 import {iPopupRefreshBuildParams} from "../utils/popup.utils";
 import {handleDirection} from "../utils/handleDirection";
+import {MaxMinTopLeft} from "./MaxMinTopLeft";
 
 /**
  * 计算popup根节点定位信息
@@ -83,22 +84,5 @@ export function calcPosition(
     if (left > maxLeft) {left = maxLeft;}
   }
 
-  if (option.maxTop != null) {
-    const maxTop = typeof option.maxTop === "function" ? option.maxTop(buildParams) : option.maxTop;
-    if (top! > maxTop) {top = maxTop;}
-  }
-  if (option.minTop != null) {
-    const minTop = typeof option.minTop === "function" ? option.minTop(buildParams) : option.minTop;
-    if (top! < minTop) {top = minTop;}
-  }
-  if (option.maxLeft != null) {
-    const maxLeft = typeof option.maxLeft === "function" ? option.maxLeft(buildParams) : option.maxLeft;
-    if (left! > maxLeft) {left = maxLeft;}
-  }
-  if (option.minLeft != null) {
-    const minLeft = typeof option.minLeft === "function" ? option.minLeft(buildParams) : option.minLeft;
-    if (left! < minLeft) {left = minLeft;}
-  }
-
-  return { top: top!, left: left! };
+  return MaxMinTopLeft({ top: top!, left: left!, buildParams, option, });
 }

package/src/packages/components/usePopup/refresh/refreshPopup.ts

@@ -5,6 +5,7 @@ import {calcPosition} from "./calcPosition";
 import {applyPosition} from "./applyPosition";
 import {refreshArrow} from "./refreshArrow";
 import {getRects} from "../utils/getRects";
+import {MaxMinTopLeft} from "./MaxMinTopLeft";
 
 /**
  * 刷新popup定位
@@ -64,7 +65,8 @@ export function refreshPopup(params: iPopupRefreshParams) {
     buildParams.rects = getRects(refs);
     refreshArrow(buildParams);
   } else {
-    const { top, left, height, width } = rects.alignReference;
+    const { top: _top, left: _left, height, width } = rects.alignReference;
+    const { top, left } = MaxMinTopLeft({ top: _top!, left: _left!, buildParams, option, });
     Object.assign(refs.popupEl.style, {
       ...params.transformLocation ? { transform: `translate3d(${left}px,${top}px,0)` } : { top: `${top}px`, left: `${left}px`, },
       height: `${height}px`,