From f92afc94098e1802cb08334d443be14d6980597e Mon Sep 17 00:00:00 2001
From: cuibo <cuibo@gaoding.com>
Date: Fri, 3 Mar 2023 16:55:27 +0800
Subject: [PATCH 1/2] feat: add overflow.lockedPoints

---
 examples/simple.html | 14 +++++++
 examples/simple.js   |  8 +++-
 src/align/align.js   | 88 ++++++++++++++++++++++++--------------------
 3 files changed, 70 insertions(+), 40 deletions(-)
diff --git a/examples/simple.html b/examples/simple.html
index e69de29..00f4de1 100644
--- a/examples/simple.html
+++ b/examples/simple.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Document</title>
+</head>
+<body>
+    <div id="__react-content" />
+
+    <script src="./simple.js" module></script>
+</body>
+</html>
\ No newline at end of file
diff --git a/examples/simple.js b/examples/simple.js
index b6bf82a..f561a90 100644
--- a/examples/simple.js
+++ b/examples/simple.js
@@ -23,6 +23,7 @@ function align() {
     overflow: {
       adjustX: $id('adjustX').checked,
       adjustY: $id('adjustY').checked,
+      lockedPoints: $id('lockedPoints').checked,
     },
     useCssRight: $id('useCssRight').checked,
     useCssBottom: $id('useCssBottom').checked,
@@ -78,6 +79,11 @@ const div = (
         <input type="checkbox" id="adjustY" />
       </label>
       &nbsp;
+      <label>
+        lockedPoints:
+        <input type="checkbox" id="lockedPoints" />
+      </label>
+      &nbsp;
       <label>
         useCssBottom:
         <input type="checkbox" id="useCssBottom" />
@@ -131,7 +137,7 @@ const div = (
           style={{
             background: 'red',
             width: 80,
-            height: 80,
+            height: 370,
             left: 0,
             top: 0,
             position: 'absolute',
diff --git a/src/align/align.js b/src/align/align.js
index aa995c6..d806bc3 100644
--- a/src/align/align.js
+++ b/src/align/align.js
@@ -115,27 +115,32 @@ function doAlign(el, tgtRegion, align, isTgtRegionVisible) {
     if (overflow.adjustX) {
       // 如果横向不能放下
       if (isFailX(elFuturePos, elRegion, visibleRect)) {
-        // 对齐位置反下
-        const newPoints = flip(points, /[lr]/gi, {
-          l: 'r',
-          r: 'l',
-        });
-        // 偏移量也反下
-        const newOffset = flipOffset(offset, 0);
-        const newTargetOffset = flipOffset(targetOffset, 0);
-        const newElFuturePos = getElFuturePos(
-          elRegion,
-          tgtRegion,
-          newPoints,
-          newOffset,
-          newTargetOffset,
-        );
+        // 不锁定对齐点的话将会做对齐镜像操作
+        if (!overflow.lockedPoints) {
+          // 对齐位置反下
+          const newPoints = flip(points, /[lr]/gi, {
+            l: 'r',
+            r: 'l',
+          });
+          // 偏移量也反下
+          const newOffset = flipOffset(offset, 0);
+          const newTargetOffset = flipOffset(targetOffset, 0);
+          const newElFuturePos = getElFuturePos(
+            elRegion,
+            tgtRegion,
+            newPoints,
+            newOffset,
+            newTargetOffset,
+          );
 
-        if (!isCompleteFailX(newElFuturePos, elRegion, visibleRect)) {
+          if (!isCompleteFailX(newElFuturePos, elRegion, visibleRect)) {
+            fail = 1;
+            points = newPoints;
+            offset = newOffset;
+            targetOffset = newTargetOffset;
+          }
+        } else {
           fail = 1;
-          points = newPoints;
-          offset = newOffset;
-          targetOffset = newTargetOffset;
         }
       }
     }
@@ -143,27 +148,32 @@ function doAlign(el, tgtRegion, align, isTgtRegionVisible) {
     if (overflow.adjustY) {
       // 如果纵向不能放下
       if (isFailY(elFuturePos, elRegion, visibleRect)) {
-        // 对齐位置反下
-        const newPoints = flip(points, /[tb]/gi, {
-          t: 'b',
-          b: 't',
-        });
-        // 偏移量也反下
-        const newOffset = flipOffset(offset, 1);
-        const newTargetOffset = flipOffset(targetOffset, 1);
-        const newElFuturePos = getElFuturePos(
-          elRegion,
-          tgtRegion,
-          newPoints,
-          newOffset,
-          newTargetOffset,
-        );
+        // 不锁定对齐点的话将会做对齐镜像操作
+        if (!overflow.lockedPoints) {
+          // 对齐位置反下
+          const newPoints = flip(points, /[tb]/gi, {
+            t: 'b',
+            b: 't',
+          });
+          // 偏移量也反下
+          const newOffset = flipOffset(offset, 1);
+          const newTargetOffset = flipOffset(targetOffset, 1);
+          const newElFuturePos = getElFuturePos(
+            elRegion,
+            tgtRegion,
+            newPoints,
+            newOffset,
+            newTargetOffset,
+          );
 
-        if (!isCompleteFailY(newElFuturePos, elRegion, visibleRect)) {
+          if (!isCompleteFailY(newElFuturePos, elRegion, visibleRect)) {
+            fail = 1;
+            points = newPoints;
+            offset = newOffset;
+            targetOffset = newTargetOffset;
+          }
+        } else {
           fail = 1;
-          points = newPoints;
-          offset = newOffset;
-          targetOffset = newTargetOffset;
         }
       }
     }
@@ -183,7 +193,7 @@ function doAlign(el, tgtRegion, align, isTgtRegionVisible) {
     const isStillFailY = isFailY(elFuturePos, elRegion, visibleRect);
     // 检查反下后的位置是否可以放下了，如果仍然放不下：
     // 1. 复原修改过的定位参数
-    if (isStillFailX || isStillFailY) {
+    if ((isStillFailX || isStillFailY) && !overflow.lockedPoints) {
       let newPoints = points;
 
       // 重置对应部分的翻转逻辑

From cb0ec8f98528c6332d8df899eb1e6ad773af73bc Mon Sep 17 00:00:00 2001
From: cuibo <cuibo@gaoding.com>
Date: Fri, 3 Mar 2023 16:56:26 +0800
Subject: [PATCH 2/2] feat: update demo height

---
 examples/simple.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/simple.js b/examples/simple.js
index f561a90..c94b94b 100644
--- a/examples/simple.js
+++ b/examples/simple.js
@@ -137,7 +137,7 @@ const div = (
           style={{
             background: 'red',
             width: 80,
-            height: 370,
+            height: 360,
             left: 0,
             top: 0,
             position: 'absolute',
