@zhenliang/sheet 0.1.18 → 0.1.19

package/dist/core/sheet/index.js

@@ -90,16 +90,17 @@ var Sheet = function Sheet(props) {
           var rowHeight = getRowHeight(container);
           var firstRowCell = container.querySelector("td.cell[data-col='".concat(start === null || start === void 0 ? void 0 : start.col, "']"));
           var colPosition = firstRowCell ? firstRowCell.offsetLeft - firstRowCell.clientWidth : 0;
-          var scrollHeight = (actual - 1) * rowHeight;
+          var scrollHeight = actual * rowHeight;
           (_sheetWrapperRef$curr = sheetWrapperRef.current) === null || _sheetWrapperRef$curr === void 0 ? void 0 : _sheetWrapperRef$curr.scrollTo(isNumber(row) ? 0 : colPosition, scrollHeight);
 
-          // to do 最后一行的有bug
-          if (isNil(row) && start.row === data.length - 1) {
-            setTimeout(function () {
-              var _sheetWrapperRef$curr2, _sheetWrapperRef$curr3, _sheetWrapperRef$curr4;
-              console.log(scrollHeight, (_sheetWrapperRef$curr2 = sheetWrapperRef.current) === null || _sheetWrapperRef$curr2 === void 0 ? void 0 : _sheetWrapperRef$curr2.scrollHeight);
-              (_sheetWrapperRef$curr3 = sheetWrapperRef.current) === null || _sheetWrapperRef$curr3 === void 0 ? void 0 : _sheetWrapperRef$curr3.scrollTo(isNumber(row) ? 0 : colPosition, ((_sheetWrapperRef$curr4 = sheetWrapperRef.current) === null || _sheetWrapperRef$curr4 === void 0 ? void 0 : _sheetWrapperRef$curr4.scrollHeight) || scrollHeight);
-            }, 500);
+          // 最后一行的bug暂时用 scroll end 事件来处理
+          if (isNil(row) && start.row === data.length - 1 && sheetWrapperRef.current) {
+            var handleScrollEnd = function handleScrollEnd() {
+              var _sheetWrapperRef$curr2, _sheetWrapperRef$curr3;
+              (_sheetWrapperRef$curr2 = sheetWrapperRef.current) === null || _sheetWrapperRef$curr2 === void 0 ? void 0 : _sheetWrapperRef$curr2.scrollTo(isNumber(row) ? 0 : colPosition, scrollHeight);
+              (_sheetWrapperRef$curr3 = sheetWrapperRef.current) === null || _sheetWrapperRef$curr3 === void 0 ? void 0 : _sheetWrapperRef$curr3.removeEventListener('scrollend', handleScrollEnd);
+            };
+            sheetWrapperRef.current.addEventListener('scrollend', handleScrollEnd);
           }
         });
       },
@@ -157,9 +158,9 @@ var Sheet = function Sheet(props) {
   useEffect(function () {
     if (!state.editing && state.start) {
       setTimeout(function () {
-        var _sheetWrapperRef$curr5;
+        var _sheetWrapperRef$curr4;
         // 表格获取焦点 + 接收keyboard event
-        (_sheetWrapperRef$curr5 = sheetWrapperRef.current) === null || _sheetWrapperRef$curr5 === void 0 ? void 0 : _sheetWrapperRef$curr5.focus({
+        (_sheetWrapperRef$curr4 = sheetWrapperRef.current) === null || _sheetWrapperRef$curr4 === void 0 ? void 0 : _sheetWrapperRef$curr4.focus({
           preventScroll: true
         });
       }, 1);

package/dist/core/sheet/useMouseEvent.js

@@ -276,7 +276,7 @@ export var useMouseEvent = function useMouseEvent(dispatch, elementRef) {
     }
     e.preventDefault();
     var currentCell = findParentTd(e.target);
-    if (currentCell.classList.contains('read-only')) {
+    if (!(currentCell !== null && currentCell !== void 0 && currentCell.classList) || currentCell.classList.contains('read-only')) {
       // 只读
       return;
     }

package/dist/core/sheet/useSelectVisible.js

@@ -23,7 +23,11 @@ export var useSelectVisible = function useSelectVisible(sheetWrapper, start) {
         return;
       }
       var startCell = (_sheetWrapper$current = sheetWrapper.current) === null || _sheetWrapper$current === void 0 ? void 0 : _sheetWrapper$current.querySelector("td.cell[data-row='".concat(start.row, "']"));
-      if (!startCell) return false;
+      if (!startCell) {
+        // 找不到说明已经不在可视区域了
+        setStartVisible(false);
+        return;
+      }
       var _ref = ((_sheetWrapper$current2 = sheetWrapper.current) === null || _sheetWrapper$current2 === void 0 ? void 0 : _sheetWrapper$current2.getBoundingClientRect()) || {},
         _ref$top = _ref.top,
         top = _ref$top === void 0 ? 0 : _ref$top,

package/dist/core/sheet/useVirtualList.js

@@ -29,7 +29,11 @@ export var useVirtualList = function useVirtualList(elementRef) {
   var virtualRef = useRef();
   var groupConfigRef = useRef(groupConfig);
   useEffect(function () {
+    var _elementRef$current;
     groupConfigRef.current = groupConfig;
+    (_elementRef$current = elementRef.current) === null || _elementRef$current === void 0 ? void 0 : _elementRef$current.scrollBy({
+      top: 1
+    });
   }, [groupConfig]);
   useEffect(function () {
     if (!elementRef.current) return;
@@ -59,8 +63,8 @@ export var useVirtualList = function useVirtualList(elementRef) {
       }
       var actualStart = rowToCountRow(start, groupConfigRef.current, data.length);
       var actualEnd = rowToCountRow(end, groupConfigRef.current, data.length);
-      var maxEnd = rowToActualRow(data.length, groupConfigRef.current);
-      var invisibleTop = rowToActualRow(actualStart, groupConfigRef.current);
+      var maxEnd = rowToActualRow(data.length, groupConfigRef.current, data.length);
+      var invisibleTop = rowToActualRow(actualStart, groupConfigRef.current, data.length);
       var invisibleBottom = maxEnd > end ? maxEnd - end : 0;
       var updateVirtualConfig = {
         virtualStart: actualStart,
@@ -78,8 +82,8 @@ export var useVirtualList = function useVirtualList(elementRef) {
     handleScroll();
     elementRef.current.addEventListener('scroll', handleScroll);
     return function () {
-      var _elementRef$current;
-      (_elementRef$current = elementRef.current) === null || _elementRef$current === void 0 ? void 0 : _elementRef$current.removeEventListener('scroll', handleScroll);
+      var _elementRef$current2;
+      (_elementRef$current2 = elementRef.current) === null || _elementRef$current2 === void 0 ? void 0 : _elementRef$current2.removeEventListener('scroll', handleScroll);
     };
   }, [elementRef.current, data.length]);
   if (!virtualized) {

package/dist/core/util.js

@@ -387,7 +387,7 @@ export var changeGroupConfig = function changeGroupConfig(rowGroupConfig, change
   });
 };
 export var rowToActualRow = function rowToActualRow(row, groupConfig) {
-  var max = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 1000;
+  var max = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 10000;
   var groupMap = groupConfigToGroupMap(groupConfig);
   if (!groupMap.size || row < 0) return row;
   var openCount = 0;
@@ -396,20 +396,13 @@ export var rowToActualRow = function rowToActualRow(row, groupConfig) {
     if (groupMap.has(i) && !((_groupMap$get9 = groupMap.get(i)) !== null && _groupMap$get9 !== void 0 && _groupMap$get9.isOpen) && !((_groupMap$get10 = groupMap.get(i)) !== null && _groupMap$get10 !== void 0 && _groupMap$get10.isStart)) {
       continue;
     } else {
-      openCount++;
       if (i >= row) {
         break;
       }
+      openCount++;
     }
   }
   return openCount;
-  // 减法的做法 有bug
-  groupMap.forEach(function (item, index) {
-    if (index <= row && !(item !== null && item !== void 0 && item.isOpen) && !(item !== null && item !== void 0 && item.isStart)) {
-      row--;
-    }
-  });
-  return row;
 };
 export var rowToCountRow = function rowToCountRow(row, groupConfig, max) {
   var groupMap = groupConfigToGroupMap(groupConfig);

package/dist/hooks/useEventBus.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import EventEmitter from 'events';
 declare const useEventBus: () => EventEmitter;
 export { useEventBus };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhenliang/sheet",
-  "version": "0.1.18",
+  "version": "0.1.19",
   "description": "A react library developed with dumi",
   "license": "MIT",
   "module": "dist/index.js",