@v-c/table 0.0.3 → 1.0.0

package/dist/Table.cjs

@@ -26,6 +26,8 @@ let vue = require("vue");
 let _v_c_resize_observer = require("@v-c/resize-observer");
 _v_c_resize_observer = require_rolldown_runtime.__toESM(_v_c_resize_observer);
 let _v_c_util = require("@v-c/util");
+let _v_c_util_dist_Dom_canUseDom = require("@v-c/util/dist/Dom/canUseDom");
+_v_c_util_dist_Dom_canUseDom = require_rolldown_runtime.__toESM(_v_c_util_dist_Dom_canUseDom);
 let _v_c_util_dist_Dom_findDOMNode = require("@v-c/util/dist/Dom/findDOMNode");
 let _v_c_util_dist_getScrollBarSize = require("@v-c/util/dist/getScrollBarSize");
 let _v_c_util_dist_isEqual = require("@v-c/util/dist/isEqual");
@@ -174,11 +176,7 @@ var ImmutableTable = /* @__PURE__ */ (0, vue.defineComponent)((props, { attrs, s
 			target(scrollLeft);
 			return;
 		}
-		if (target.scrollTo) {
-			target.scrollTo({ left: scrollLeft });
-			return;
-		}
-		const element = (0, _v_c_util_dist_Dom_findDOMNode.getDOM)(target);
+		const element = target.nativeElement ? (0, _v_c_util_dist_Dom_findDOMNode.getDOM)(target.nativeElement) : (0, _v_c_util_dist_Dom_findDOMNode.getDOM)(target);
 		if (element && element.scrollLeft !== scrollLeft) {
 			element.scrollLeft = scrollLeft;
 			if (element.scrollLeft !== scrollLeft) setTimeout(() => {
@@ -265,6 +263,7 @@ var ImmutableTable = /* @__PURE__ */ (0, vue.defineComponent)((props, { attrs, s
 		else scrollbarSize.value = (0, _v_c_util_dist_getScrollBarSize.getTargetScrollBarSize)(scrollBodyContainerRef.value).width;
 	});
 	(0, vue.watchEffect)(() => {
+		if (!(0, _v_c_util_dist_Dom_canUseDom.default)()) return;
 		if (useInternalHooks.value && props.internalRefs?.body) props.internalRefs.body.value = (0, _v_c_util_dist_Dom_findDOMNode.getDOM)(scrollBodyRef.value);
 	});
 	const TableComponent = (0, vue.computed)(() => getComponent(["table"], "table"));

package/dist/Table.js

@@ -20,6 +20,7 @@ import ColumnGroup_default from "./sugar/ColumnGroup.js";
 import { Fragment, computed, createVNode, defineComponent, isVNode, mergeDefaults, mergeProps, nextTick, onMounted, reactive, ref, shallowRef, watch, watchEffect } from "vue";
 import ResizeObserver from "@v-c/resize-observer";
 import { clsx, get, warning } from "@v-c/util";
+import canUseDom from "@v-c/util/dist/Dom/canUseDom";
 import { getDOM } from "@v-c/util/dist/Dom/findDOMNode";
 import { getTargetScrollBarSize } from "@v-c/util/dist/getScrollBarSize";
 import isEqual from "@v-c/util/dist/isEqual";
@@ -166,11 +167,7 @@ var ImmutableTable = /* @__PURE__ */ defineComponent((props, { attrs, slots, exp
 			target(scrollLeft);
 			return;
 		}
-		if (target.scrollTo) {
-			target.scrollTo({ left: scrollLeft });
-			return;
-		}
-		const element = getDOM(target);
+		const element = target.nativeElement ? getDOM(target.nativeElement) : getDOM(target);
 		if (element && element.scrollLeft !== scrollLeft) {
 			element.scrollLeft = scrollLeft;
 			if (element.scrollLeft !== scrollLeft) setTimeout(() => {
@@ -257,6 +254,7 @@ var ImmutableTable = /* @__PURE__ */ defineComponent((props, { attrs, slots, exp
 		else scrollbarSize.value = getTargetScrollBarSize(scrollBodyContainerRef.value).width;
 	});
 	watchEffect(() => {
+		if (!canUseDom()) return;
 		if (useInternalHooks.value && props.internalRefs?.body) props.internalRefs.body.value = getDOM(scrollBodyRef.value);
 	});
 	const TableComponent = computed(() => getComponent(["table"], "table"));

package/dist/VirtualTable/BodyGrid.cjs

@@ -82,8 +82,13 @@ var BodyGrid = /* @__PURE__ */ (0, vue.defineComponent)({
 				if (!item) return null;
 				const rowKey = item.rowKey;
 				const getHeight = (rowSpan) => {
-					const endItem = rawData[index + rowSpan - 1];
-					if (!endItem) return 0;
+					const endItemIndex = index + rowSpan - 1;
+					const endItem = rawData[endItemIndex];
+					if (!endItem || !endItem.record) {
+						const endItemKey$1 = rawData[Math.min(endItemIndex, rawData.length - 1)].rowKey;
+						const sizeInfo$2 = getSize(rowKey, endItemKey$1);
+						return sizeInfo$2.bottom - sizeInfo$2.top;
+					}
 					const endItemKey = endItem.rowKey;
 					const sizeInfo$1 = getSize(rowKey, endItemKey);
 					return sizeInfo$1.bottom - sizeInfo$1.top;

package/dist/VirtualTable/BodyGrid.js

@@ -76,8 +76,13 @@ var BodyGrid_default = /* @__PURE__ */ defineComponent({
 				if (!item) return null;
 				const rowKey = item.rowKey;
 				const getHeight = (rowSpan) => {
-					const endItem = rawData[index + rowSpan - 1];
-					if (!endItem) return 0;
+					const endItemIndex = index + rowSpan - 1;
+					const endItem = rawData[endItemIndex];
+					if (!endItem || !endItem.record) {
+						const endItemKey$1 = rawData[Math.min(endItemIndex, rawData.length - 1)].rowKey;
+						const sizeInfo$2 = getSize(rowKey, endItemKey$1);
+						return sizeInfo$2.bottom - sizeInfo$2.top;
+					}
 					const endItemKey = endItem.rowKey;
 					const sizeInfo$1 = getSize(rowKey, endItemKey);
 					return sizeInfo$1.bottom - sizeInfo$1.top;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@v-c/table",
   "type": "module",
-  "version": "0.0.3",
+  "version": "1.0.0",
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
@@ -20,8 +20,8 @@
     "vue": "^3.0.0"
   },
   "dependencies": {
-    "@v-c/util": "^1.0.6",
-    "@v-c/resize-observer": "^1.0.3",
+    "@v-c/resize-observer": "^1.0.8",
+    "@v-c/util": "^1.0.9",
     "@v-c/virtual-list": "^1.0.5"
   },
   "publishConfig": {