@bifrostui/utils 1.4.2-beta.1 → 1.4.2

package/dist/directionLocationUtil.d.ts

@@ -1,12 +1,11 @@
 /**
  * 根据元素宽高判断是否超出边界，超出边界则重新定义方向
  */
-export declare const getNewDirectionLocation: ({ rootOffset, arrowDirection, tipOffset, arrowLocation, offsetSpacing, }: {
+export declare const getNewDirectionLocation: ({ rootOffset, arrowDirection, tipOffset, arrowLocation, }: {
     rootOffset: any;
     arrowDirection: any;
     tipOffset: any;
     arrowLocation: any;
-    offsetSpacing: any;
 }) => {
     newArrowDirection: any;
     newArrowLocation: any;
@@ -14,21 +13,19 @@ export declare const getNewDirectionLocation: ({ rootOffset, arrowDirection, tip
 /**
  * 根据新的气泡位置和箭头位置 计算气泡位置以及箭头位置
  */
-export declare const getDirectionLocationStyle: ({ rootOffset, arrowDirection, tipOffset, arrowLocation, offsetSpacing, }: {
+export declare const getDirectionLocationStyle: ({ rootOffset, arrowDirection, tipOffset, arrowLocation, }: {
     rootOffset: any;
     arrowDirection: any;
     tipOffset: any;
     arrowLocation: any;
-    offsetSpacing: any;
 }) => any;
 /**
  * 获取气泡位置和箭头位置
  */
-export declare const getStylesAndLocation: ({ childrenRef, arrowDirection, arrowLocation, offsetSpacing, selector, }: {
+export declare const getStylesAndLocation: ({ childrenRef, arrowDirection, arrowLocation, selector, }: {
     childrenRef: any;
     arrowDirection: any;
     arrowLocation: any;
-    offsetSpacing: any;
     selector: any;
 }) => {
     styles: any;

package/dist/directionLocationUtil.js

@@ -33,17 +33,9 @@ const getNewDirectionLocation = ({
   rootOffset,
   arrowDirection,
   tipOffset,
-  arrowLocation,
-  offsetSpacing
+  arrowLocation
 }) => {
-  const {
-    left: cLeft,
-    right: cRight,
-    top: cTop,
-    bottom: cBottom,
-    width: cWidth,
-    height: cHeight
-  } = rootOffset;
+  const { left: cLeft, right: cRight, top: cTop, bottom: cBottom } = rootOffset;
   const { width, height } = tipOffset;
   const pgegWidth = document.documentElement.clientWidth || document.body.clientWidth;
   const pgegHeight = document.documentElement.clientHeight || document.body.clientHeight;
@@ -53,7 +45,7 @@ const getNewDirectionLocation = ({
   const isDirectionBottom = arrowDirection === "bottom";
   const isDirectionLeft = arrowDirection === "left";
   const isDirectionRight = arrowDirection === "right";
-  if (isDirectionTop && cTop - height - offsetSpacing < 0 || isDirectionBottom && cBottom + height + offsetSpacing > pgegHeight || isDirectionLeft && cLeft - width - offsetSpacing < 0 || isDirectionRight && cRight + width + offsetSpacing > pgegWidth) {
+  if (isDirectionTop && cTop - height < 0 || isDirectionBottom && cBottom + height > pgegHeight || isDirectionLeft && cLeft - width < 0 || isDirectionRight && cRight + width > pgegWidth) {
     newArrowDirection = directionCssMap[arrowDirection];
   }
   if (arrowLocation === "top" && cTop + height > pgegHeight || arrowLocation === "bottom" && cBottom - height < 0 || arrowLocation === "left" && cLeft + width > pgegWidth || arrowLocation === "right" && cRight - width < 0) {
@@ -61,15 +53,15 @@ const getNewDirectionLocation = ({
   }
   const isCenter = arrowLocation === "center";
   if (isCenter && (isDirectionTop || isDirectionBottom)) {
-    if (cLeft + (cWidth - width) / 2 + width > pgegWidth) {
+    if (cLeft + width > pgegWidth) {
       newArrowLocation = directionCssMap.left;
-    } else if (cLeft + (cWidth - width) / 2 < 0) {
+    } else if (cRight - width < 0) {
       newArrowLocation = directionCssMap.right;
     }
   } else if (isCenter && (isDirectionLeft || isDirectionRight)) {
-    if (cTop + (cHeight - height) / 2 + cHeight > pgegHeight) {
+    if (cTop + height > pgegHeight) {
       newArrowLocation = directionCssMap.top;
-    } else if (cTop + (cHeight - height) / 2 < 0) {
+    } else if (cBottom - height < 0) {
       newArrowLocation = directionCssMap.bottom;
     }
   }
@@ -82,11 +74,10 @@ const getDirectionLocationStyle = ({
   rootOffset,
   arrowDirection,
   tipOffset,
-  arrowLocation,
-  offsetSpacing
+  arrowLocation
 }) => {
   const scrollTop = window.scrollY >= 0 && window.scrollY || document.documentElement.scrollTop;
-  const scrollLeft = window.scrollX >= 0 && window.scrollX || document.documentElement.scrollLeft;
+  const scrollLeft = window.screenX >= 0 && window.screenX || document.documentElement.scrollLeft;
   const styles = {};
   const {
     width: cWidth,
@@ -98,7 +89,7 @@ const getDirectionLocationStyle = ({
   } = rootOffset;
   const { width, height } = tipOffset;
   if (arrowDirection === "top") {
-    styles.top = cTop - offsetSpacing;
+    styles.top = cTop;
     styles.transform = `translateY(-100%)`;
     switch (arrowLocation) {
       case "left":
@@ -115,7 +106,7 @@ const getDirectionLocationStyle = ({
         break;
     }
   } else if (arrowDirection === "bottom") {
-    styles.top = cBottom + offsetSpacing;
+    styles.top = cBottom;
     switch (arrowLocation) {
       case "left":
         styles.left = cLeft;
@@ -131,7 +122,7 @@ const getDirectionLocationStyle = ({
         break;
     }
   } else if (arrowDirection === "left") {
-    styles.left = cLeft - offsetSpacing;
+    styles.left = cLeft;
     styles.transform = `translateX(-100%)`;
     switch (arrowLocation) {
       case "top":
@@ -148,7 +139,7 @@ const getDirectionLocationStyle = ({
         break;
     }
   } else if (arrowDirection === "right") {
-    styles.left = cRight + offsetSpacing;
+    styles.left = cRight;
     switch (arrowLocation) {
       case "top":
         styles.top = cTop;
@@ -170,14 +161,12 @@ const getDirectionLocationStyle = ({
   if (styles.left) {
     styles.left = `${styles.left + scrollLeft}px`;
   }
-  styles.width = `${width}px`;
   return styles;
 };
 const getStylesAndLocation = ({
   childrenRef,
   arrowDirection,
   arrowLocation,
-  offsetSpacing,
   selector
 }) => {
   if (!(childrenRef == null ? void 0 : childrenRef.current)) {
@@ -195,15 +184,13 @@ const getStylesAndLocation = ({
     rootOffset,
     arrowDirection,
     tipOffset,
-    arrowLocation,
-    offsetSpacing
+    arrowLocation
   });
   const styles = getDirectionLocationStyle({
     rootOffset,
     arrowDirection: newArrowDirection,
     tipOffset,
-    arrowLocation: newArrowLocation,
-    offsetSpacing
+    arrowLocation: newArrowLocation
   });
   styles.visibility = "visible";
   return {

package/dist/getRootElement/index.miniapp.d.ts

@@ -1,3 +1,3 @@
 import type { TaroElement } from '@tarojs/runtime';
-declare const getRootElement: (rootEle?: TaroElement | (() => TaroElement)) => HTMLElement | TaroElement;
+declare const getRootElement: (rootEle?: TaroElement | (() => TaroElement)) => TaroElement | HTMLElement;
 export default getRootElement;

package/es/directionLocationUtil.d.ts

@@ -1,12 +1,11 @@
 /**
  * 根据元素宽高判断是否超出边界，超出边界则重新定义方向
  */
-export declare const getNewDirectionLocation: ({ rootOffset, arrowDirection, tipOffset, arrowLocation, offsetSpacing, }: {
+export declare const getNewDirectionLocation: ({ rootOffset, arrowDirection, tipOffset, arrowLocation, }: {
     rootOffset: any;
     arrowDirection: any;
     tipOffset: any;
     arrowLocation: any;
-    offsetSpacing: any;
 }) => {
     newArrowDirection: any;
     newArrowLocation: any;
@@ -14,21 +13,19 @@ export declare const getNewDirectionLocation: ({ rootOffset, arrowDirection, tip
 /**
  * 根据新的气泡位置和箭头位置 计算气泡位置以及箭头位置
  */
-export declare const getDirectionLocationStyle: ({ rootOffset, arrowDirection, tipOffset, arrowLocation, offsetSpacing, }: {
+export declare const getDirectionLocationStyle: ({ rootOffset, arrowDirection, tipOffset, arrowLocation, }: {
     rootOffset: any;
     arrowDirection: any;
     tipOffset: any;
     arrowLocation: any;
-    offsetSpacing: any;
 }) => any;
 /**
  * 获取气泡位置和箭头位置
  */
-export declare const getStylesAndLocation: ({ childrenRef, arrowDirection, arrowLocation, offsetSpacing, selector, }: {
+export declare const getStylesAndLocation: ({ childrenRef, arrowDirection, arrowLocation, selector, }: {
     childrenRef: any;
     arrowDirection: any;
     arrowLocation: any;
-    offsetSpacing: any;
     selector: any;
 }) => {
     styles: any;

package/es/directionLocationUtil.js

@@ -8,17 +8,9 @@ const getNewDirectionLocation = ({
   rootOffset,
   arrowDirection,
   tipOffset,
-  arrowLocation,
-  offsetSpacing
+  arrowLocation
 }) => {
-  const {
-    left: cLeft,
-    right: cRight,
-    top: cTop,
-    bottom: cBottom,
-    width: cWidth,
-    height: cHeight
-  } = rootOffset;
+  const { left: cLeft, right: cRight, top: cTop, bottom: cBottom } = rootOffset;
   const { width, height } = tipOffset;
   const pgegWidth = document.documentElement.clientWidth || document.body.clientWidth;
   const pgegHeight = document.documentElement.clientHeight || document.body.clientHeight;
@@ -28,7 +20,7 @@ const getNewDirectionLocation = ({
   const isDirectionBottom = arrowDirection === "bottom";
   const isDirectionLeft = arrowDirection === "left";
   const isDirectionRight = arrowDirection === "right";
-  if (isDirectionTop && cTop - height - offsetSpacing < 0 || isDirectionBottom && cBottom + height + offsetSpacing > pgegHeight || isDirectionLeft && cLeft - width - offsetSpacing < 0 || isDirectionRight && cRight + width + offsetSpacing > pgegWidth) {
+  if (isDirectionTop && cTop - height < 0 || isDirectionBottom && cBottom + height > pgegHeight || isDirectionLeft && cLeft - width < 0 || isDirectionRight && cRight + width > pgegWidth) {
     newArrowDirection = directionCssMap[arrowDirection];
   }
   if (arrowLocation === "top" && cTop + height > pgegHeight || arrowLocation === "bottom" && cBottom - height < 0 || arrowLocation === "left" && cLeft + width > pgegWidth || arrowLocation === "right" && cRight - width < 0) {
@@ -36,15 +28,15 @@ const getNewDirectionLocation = ({
   }
   const isCenter = arrowLocation === "center";
   if (isCenter && (isDirectionTop || isDirectionBottom)) {
-    if (cLeft + (cWidth - width) / 2 + width > pgegWidth) {
+    if (cLeft + width > pgegWidth) {
       newArrowLocation = directionCssMap.left;
-    } else if (cLeft + (cWidth - width) / 2 < 0) {
+    } else if (cRight - width < 0) {
       newArrowLocation = directionCssMap.right;
     }
   } else if (isCenter && (isDirectionLeft || isDirectionRight)) {
-    if (cTop + (cHeight - height) / 2 + cHeight > pgegHeight) {
+    if (cTop + height > pgegHeight) {
       newArrowLocation = directionCssMap.top;
-    } else if (cTop + (cHeight - height) / 2 < 0) {
+    } else if (cBottom - height < 0) {
       newArrowLocation = directionCssMap.bottom;
     }
   }
@@ -57,11 +49,10 @@ const getDirectionLocationStyle = ({
   rootOffset,
   arrowDirection,
   tipOffset,
-  arrowLocation,
-  offsetSpacing
+  arrowLocation
 }) => {
   const scrollTop = window.scrollY >= 0 && window.scrollY || document.documentElement.scrollTop;
-  const scrollLeft = window.scrollX >= 0 && window.scrollX || document.documentElement.scrollLeft;
+  const scrollLeft = window.screenX >= 0 && window.screenX || document.documentElement.scrollLeft;
   const styles = {};
   const {
     width: cWidth,
@@ -73,7 +64,7 @@ const getDirectionLocationStyle = ({
   } = rootOffset;
   const { width, height } = tipOffset;
   if (arrowDirection === "top") {
-    styles.top = cTop - offsetSpacing;
+    styles.top = cTop;
     styles.transform = `translateY(-100%)`;
     switch (arrowLocation) {
       case "left":
@@ -90,7 +81,7 @@ const getDirectionLocationStyle = ({
         break;
     }
   } else if (arrowDirection === "bottom") {
-    styles.top = cBottom + offsetSpacing;
+    styles.top = cBottom;
     switch (arrowLocation) {
       case "left":
         styles.left = cLeft;
@@ -106,7 +97,7 @@ const getDirectionLocationStyle = ({
         break;
     }
   } else if (arrowDirection === "left") {
-    styles.left = cLeft - offsetSpacing;
+    styles.left = cLeft;
     styles.transform = `translateX(-100%)`;
     switch (arrowLocation) {
       case "top":
@@ -123,7 +114,7 @@ const getDirectionLocationStyle = ({
         break;
     }
   } else if (arrowDirection === "right") {
-    styles.left = cRight + offsetSpacing;
+    styles.left = cRight;
     switch (arrowLocation) {
       case "top":
         styles.top = cTop;
@@ -145,14 +136,12 @@ const getDirectionLocationStyle = ({
   if (styles.left) {
     styles.left = `${styles.left + scrollLeft}px`;
   }
-  styles.width = `${width}px`;
   return styles;
 };
 const getStylesAndLocation = ({
   childrenRef,
   arrowDirection,
   arrowLocation,
-  offsetSpacing,
   selector
 }) => {
   if (!(childrenRef == null ? void 0 : childrenRef.current)) {
@@ -170,15 +159,13 @@ const getStylesAndLocation = ({
     rootOffset,
     arrowDirection,
     tipOffset,
-    arrowLocation,
-    offsetSpacing
+    arrowLocation
   });
   const styles = getDirectionLocationStyle({
     rootOffset,
     arrowDirection: newArrowDirection,
     tipOffset,
-    arrowLocation: newArrowLocation,
-    offsetSpacing
+    arrowLocation: newArrowLocation
   });
   styles.visibility = "visible";
   return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bifrostui/utils",
-  "version": "1.4.2-beta.1",
+  "version": "1.4.2",
   "description": "BUI React utilities for building components.",
   "main": "dist/index.js",
   "module": "es/index.js",