@sheinx/hooks 3.4.4-beta.7 → 3.5.0-beta.1

package/cjs/components/use-table/use-table-virtual.d.ts

@@ -10,6 +10,7 @@ interface UseTableVirtualProps {
     disabled?: boolean;
     isRtl?: boolean;
     columns: TableFormatColumn<any>[];
+    colgroup: (number | string | undefined)[];
 }
 declare const useTableVirtual: (props: UseTableVirtualProps) => {
     scrollHeight: number;
@@ -27,6 +28,8 @@ declare const useTableVirtual: (props: UseTableVirtualProps) => {
     setRowHeight: (index: number, height: number) => void;
     getTranslate: (left?: number, top?: number) => string;
     scrollToIndex: (index: number, callback?: () => void) => void;
+    scrollColumnByLeft: (targetLeft: number) => void;
+    scrollColumnIntoView: (colKey: string | number) => void;
 };
 export default useTableVirtual;
 //# sourceMappingURL=use-table-virtual.d.ts.map

package/cjs/components/use-table/use-table-virtual.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-table-virtual.d.ts","sourceRoot":"","sources":["use-table-virtual.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAGrD,UAAU,oBAAoB;IAC5B,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;IAC3C,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;IAC1C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,EAAE,CAAC;CACnC;AACD,QAAA,MAAM,eAAe,UAAW,oBAAoB;;;;;;;oBAqLpC,MAAM;mBACP,MAAM;WACd,MAAM;gBACD,MAAM;kBACJ,OAAO;;0BAzFuB,MAAM,UAAU,MAAM;0BAxBtB,MAAM,QAAQ,MAAM;2BAqJnB,MAAM,aAAa,MAAM,IAAI;CA4FzE,CAAC;AAEF,eAAe,eAAe,CAAC"}
+{"version":3,"file":"use-table-virtual.d.ts","sourceRoot":"","sources":["use-table-virtual.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAGrD,UAAU,oBAAoB;IAC5B,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;IAC3C,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;IAC1C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,EAAE,CAAC;IAClC,QAAQ,EAAE,CAAC,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC,EAAE,CAAC;CAC3C;AACD,QAAA,MAAM,eAAe,UAAW,oBAAoB;;;;;;;oBAqLpC,MAAM;mBACP,MAAM;WACd,MAAM;gBACD,MAAM;kBACJ,OAAO;;0BAzFuB,MAAM,UAAU,MAAM;0BAxBtB,MAAM,QAAQ,MAAM;2BAqJnB,MAAM,aAAa,MAAM,IAAI;qCAoBnB,MAAM;mCAWR,MAAM,GAAG,MAAM;CAyFnE,CAAC;AAEF,eAAe,eAAe,CAAC"}

package/cjs/components/use-table/use-table-virtual.js

@@ -259,6 +259,33 @@ var useTableVirtual = function useTableVirtual(props) {
       props.scrollRef.current.scrollTop = beforeHeight;
     }
   });
+  var scrollColumnByLeft = (0, _usePersistFn.usePersistFn)(function (targetLeft) {
+    if (targetLeft < 0) return;
+    var scrollEl = props.scrollRef.current;
+    if (!scrollEl) return;
+    // scrollLeft max
+    var max = scrollEl.scrollWidth - scrollEl.clientWidth;
+    var left = Math.min(targetLeft, max);
+    if (left === scrollEl.scrollLeft) return;
+    setLeft(left);
+    scrollEl.scrollLeft = left;
+  });
+  var scrollColumnIntoView = (0, _usePersistFn.usePersistFn)(function (colKey) {
+    if (colKey === undefined) return;
+    var col = props.columns.find(function (col) {
+      return col.key === colKey;
+    });
+    if (!col || col.fixed) return;
+    var left = 0;
+    for (var i = 0, len = col.index; i < len; i++) {
+      if (props.columns[i].fixed) {
+        left = 0;
+      } else {
+        left += props.colgroup[i];
+      }
+    }
+    scrollColumnByLeft(left);
+  });
   (0, _react.useEffect)(function () {
     var scrollRefHeight = props.scrollRef.current ? props.scrollRef.current.clientHeight : 0;
     var tableRefHeight = props.innerRef.current ? props.innerRef.current.clientHeight : 0;
@@ -322,7 +349,9 @@ var useTableVirtual = function useTableVirtual(props) {
     handleScroll: handleScroll,
     setRowHeight: setRowHeight,
     getTranslate: getTranslate,
-    scrollToIndex: scrollToIndex
+    scrollToIndex: scrollToIndex,
+    scrollColumnByLeft: scrollColumnByLeft,
+    scrollColumnIntoView: scrollColumnIntoView
   };
 };
 var _default = exports.default = useTableVirtual;

package/cjs/utils/position.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"position.d.ts","sourceRoot":"","sources":["position.ts"],"names":[],"mappings":"AAiGA,eAAO,MAAM,WAAW,WACd,WAAW,GAAG,IAAI,2EAEpB,SAAS,GAAG,MAAM,GAAG,MAAM,UACzB,WAAW,gKAKpB,CAAC"}
+{"version":3,"file":"position.d.ts","sourceRoot":"","sources":["position.ts"],"names":[],"mappings":"AAkGA,eAAO,MAAM,WAAW,WACd,WAAW,GAAG,IAAI,2EAEpB,SAAS,GAAG,MAAM,GAAG,MAAM,UACzB,WAAW,gKAKpB,CAAC"}

package/cjs/utils/position.js

@@ -66,22 +66,23 @@ var getPopoverPosition = function getPopoverPosition(target) {
     var popupRect = popup === null || popup === void 0 ? void 0 : popup.getBoundingClientRect();
     if (verticalPoint > windowHeight / 2) position = 'top';else position = 'bottom';
 
+    // TODO: 暂时移除，另考虑方案
     // 如果渲染了弹出内容，则根据弹出内容宽度计算是否自动调整位置
-    if (popupRect) {
-      if ((popupRect === null || popupRect === void 0 ? void 0 : popupRect.width) / 2 > rect.left) {
-        position += '-left';
-      }
-      if ((popupRect === null || popupRect === void 0 ? void 0 : popupRect.width) / 2 > windowWidth - rect.right) {
-        position += '-right';
-      }
-    } else {
-      // 兜底计算
-      if (horizontalPoint > windowWidth * 0.6) {
-        position += '-right';
-      } else if (horizontalPoint < windowWidth * 0.4) {
-        position += '-left';
-      }
+    // if (popupRect && popupRect?.width) {
+    //   if (popupRect?.width / 2 > rect.left) {
+    //     position += '-left';
+    //   }
+    //   if (popupRect?.width / 2 > windowWidth - rect.right) {
+    //     position += '-right';
+    //   }
+    // } else {
+    // 兜底计算
+    if (horizontalPoint > windowWidth * 0.6) {
+      position += '-right';
+    } else if (horizontalPoint < windowWidth * 0.4) {
+      position += '-left';
     }
+    // }
   }
   return position;
 };

package/esm/components/use-table/use-table-virtual.d.ts

@@ -10,6 +10,7 @@ interface UseTableVirtualProps {
     disabled?: boolean;
     isRtl?: boolean;
     columns: TableFormatColumn<any>[];
+    colgroup: (number | string | undefined)[];
 }
 declare const useTableVirtual: (props: UseTableVirtualProps) => {
     scrollHeight: number;
@@ -27,6 +28,8 @@ declare const useTableVirtual: (props: UseTableVirtualProps) => {
     setRowHeight: (index: number, height: number) => void;
     getTranslate: (left?: number, top?: number) => string;
     scrollToIndex: (index: number, callback?: () => void) => void;
+    scrollColumnByLeft: (targetLeft: number) => void;
+    scrollColumnIntoView: (colKey: string | number) => void;
 };
 export default useTableVirtual;
 //# sourceMappingURL=use-table-virtual.d.ts.map

package/esm/components/use-table/use-table-virtual.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-table-virtual.d.ts","sourceRoot":"","sources":["use-table-virtual.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAGrD,UAAU,oBAAoB;IAC5B,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;IAC3C,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;IAC1C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,EAAE,CAAC;CACnC;AACD,QAAA,MAAM,eAAe,UAAW,oBAAoB;;;;;;;oBAqLpC,MAAM;mBACP,MAAM;WACd,MAAM;gBACD,MAAM;kBACJ,OAAO;;0BAzFuB,MAAM,UAAU,MAAM;0BAxBtB,MAAM,QAAQ,MAAM;2BAqJnB,MAAM,aAAa,MAAM,IAAI;CA4FzE,CAAC;AAEF,eAAe,eAAe,CAAC"}
+{"version":3,"file":"use-table-virtual.d.ts","sourceRoot":"","sources":["use-table-virtual.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAGrD,UAAU,oBAAoB;IAC5B,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;IAC3C,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;IAC1C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,EAAE,CAAC;IAClC,QAAQ,EAAE,CAAC,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC,EAAE,CAAC;CAC3C;AACD,QAAA,MAAM,eAAe,UAAW,oBAAoB;;;;;;;oBAqLpC,MAAM;mBACP,MAAM;WACd,MAAM;gBACD,MAAM;kBACJ,OAAO;;0BAzFuB,MAAM,UAAU,MAAM;0BAxBtB,MAAM,QAAQ,MAAM;2BAqJnB,MAAM,aAAa,MAAM,IAAI;qCAoBnB,MAAM;mCAWR,MAAM,GAAG,MAAM;CAyFnE,CAAC;AAEF,eAAe,eAAe,CAAC"}

package/esm/components/use-table/use-table-virtual.js

@@ -253,6 +253,33 @@ var useTableVirtual = function useTableVirtual(props) {
       props.scrollRef.current.scrollTop = beforeHeight;
     }
   });
+  var scrollColumnByLeft = usePersistFn(function (targetLeft) {
+    if (targetLeft < 0) return;
+    var scrollEl = props.scrollRef.current;
+    if (!scrollEl) return;
+    // scrollLeft max
+    var max = scrollEl.scrollWidth - scrollEl.clientWidth;
+    var left = Math.min(targetLeft, max);
+    if (left === scrollEl.scrollLeft) return;
+    setLeft(left);
+    scrollEl.scrollLeft = left;
+  });
+  var scrollColumnIntoView = usePersistFn(function (colKey) {
+    if (colKey === undefined) return;
+    var col = props.columns.find(function (col) {
+      return col.key === colKey;
+    });
+    if (!col || col.fixed) return;
+    var left = 0;
+    for (var i = 0, len = col.index; i < len; i++) {
+      if (props.columns[i].fixed) {
+        left = 0;
+      } else {
+        left += props.colgroup[i];
+      }
+    }
+    scrollColumnByLeft(left);
+  });
   useEffect(function () {
     var scrollRefHeight = props.scrollRef.current ? props.scrollRef.current.clientHeight : 0;
     var tableRefHeight = props.innerRef.current ? props.innerRef.current.clientHeight : 0;
@@ -316,7 +343,9 @@ var useTableVirtual = function useTableVirtual(props) {
     handleScroll: handleScroll,
     setRowHeight: setRowHeight,
     getTranslate: getTranslate,
-    scrollToIndex: scrollToIndex
+    scrollToIndex: scrollToIndex,
+    scrollColumnByLeft: scrollColumnByLeft,
+    scrollColumnIntoView: scrollColumnIntoView
   };
 };
 export default useTableVirtual;

package/esm/utils/position.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"position.d.ts","sourceRoot":"","sources":["position.ts"],"names":[],"mappings":"AAiGA,eAAO,MAAM,WAAW,WACd,WAAW,GAAG,IAAI,2EAEpB,SAAS,GAAG,MAAM,GAAG,MAAM,UACzB,WAAW,gKAKpB,CAAC"}
+{"version":3,"file":"position.d.ts","sourceRoot":"","sources":["position.ts"],"names":[],"mappings":"AAkGA,eAAO,MAAM,WAAW,WACd,WAAW,GAAG,IAAI,2EAEpB,SAAS,GAAG,MAAM,GAAG,MAAM,UACzB,WAAW,gKAKpB,CAAC"}

package/esm/utils/position.js

@@ -60,22 +60,23 @@ var getPopoverPosition = function getPopoverPosition(target) {
     var popupRect = popup === null || popup === void 0 ? void 0 : popup.getBoundingClientRect();
     if (verticalPoint > windowHeight / 2) position = 'top';else position = 'bottom';
 
+    // TODO: 暂时移除，另考虑方案
     // 如果渲染了弹出内容，则根据弹出内容宽度计算是否自动调整位置
-    if (popupRect) {
-      if ((popupRect === null || popupRect === void 0 ? void 0 : popupRect.width) / 2 > rect.left) {
-        position += '-left';
-      }
-      if ((popupRect === null || popupRect === void 0 ? void 0 : popupRect.width) / 2 > windowWidth - rect.right) {
-        position += '-right';
-      }
-    } else {
-      // 兜底计算
-      if (horizontalPoint > windowWidth * 0.6) {
-        position += '-right';
-      } else if (horizontalPoint < windowWidth * 0.4) {
-        position += '-left';
-      }
+    // if (popupRect && popupRect?.width) {
+    //   if (popupRect?.width / 2 > rect.left) {
+    //     position += '-left';
+    //   }
+    //   if (popupRect?.width / 2 > windowWidth - rect.right) {
+    //     position += '-right';
+    //   }
+    // } else {
+    // 兜底计算
+    if (horizontalPoint > windowWidth * 0.6) {
+      position += '-right';
+    } else if (horizontalPoint < windowWidth * 0.4) {
+      position += '-left';
     }
+    // }
   }
   return position;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sheinx/hooks",
-  "version": "3.4.4-beta.7",
+  "version": "3.5.0-beta.1",
   "description": "",
   "keywords": [],
   "license": "MIT",