@sheinx/hooks 3.9.8-beta.11 → 3.9.8-beta.12

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/cjs/components/use-table/use-table-columns.d.ts.map +1 -1
  2. package/cjs/components/use-table/use-table-columns.js +16 -9
  3. package/esm/components/use-table/use-table-columns.d.ts.map +1 -1
  4. package/esm/components/use-table/use-table-columns.js +16 -9
  5. package/package.json +1 -1
package/cjs/components/use-table/use-table-columns.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"use-table-columns.d.ts","sourceRoot":"","sources":["use-table-columns.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAE3F,OAAO,KAA+C,MAAM,OAAO,CAAC;AAEpE,MAAM,WAAW,eAAe,CAAC,IAAI;IACnC,OAAO,CAAC,EAAE,eAAe,CAAC,IAAI,CAAC,EAAE,CAAC;IAClC,IAAI,CAAC,EAAE,IAAI,EAAE,CAAC;IACd,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,aAAa,CAAC,EAAE,OAAO,GAAG,mBAAmB,CAAC;IAC9C,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;CACzC;AAYD,MAAM,MAAM,iBAAiB,GAAG;IAC9B,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,IAAI,EAAE,QAAQ,GAAG,YAAY,CAAC;IAC9B,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,KAAK,CAAC,MAAM,KAAK,CAAC,SAAS,CAAC,GAAG,SAAS,CAAC;IAC3E,OAAO,CAAC,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,KAAK,IAAI,CAAC;CAChD,GAAG,IAAI,CAAC;AAKT,QAAA,MAAM,UAAU;;;;wBA6EkC,MAAM;;;;;CAoGvD,CAAC;AAEF,eAAe,UAAU,CAAC"}
1
+ {"version":3,"file":"use-table-columns.d.ts","sourceRoot":"","sources":["use-table-columns.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAE3F,OAAO,KAA+C,MAAM,OAAO,CAAC;AAEpE,MAAM,WAAW,eAAe,CAAC,IAAI;IACnC,OAAO,CAAC,EAAE,eAAe,CAAC,IAAI,CAAC,EAAE,CAAC;IAClC,IAAI,CAAC,EAAE,IAAI,EAAE,CAAC;IACd,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,aAAa,CAAC,EAAE,OAAO,GAAG,mBAAmB,CAAC;IAC9C,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;CACzC;AAYD,MAAM,MAAM,iBAAiB,GAAG;IAC9B,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,IAAI,EAAE,QAAQ,GAAG,YAAY,CAAC;IAC9B,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,KAAK,CAAC,MAAM,KAAK,CAAC,SAAS,CAAC,GAAG,SAAS,CAAC;IAC3E,OAAO,CAAC,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,KAAK,IAAI,CAAC;CAChD,GAAG,IAAI,CAAC;AAKT,QAAA,MAAM,UAAU;;;;wBA6EkC,MAAM;;;;;CA2GvD,CAAC;AAEF,eAAe,UAAU,CAAC"}
package/cjs/components/use-table/use-table-columns.js CHANGED
@@ -126,21 +126,21 @@ var useColumns = function useColumns(props) {
126
126
  var scrollLeft = scrollInfo.scrollLeft;
127
127
  var sum = 0;
128
128
  var currentIndex = 0;
129
- for (var i = 0, len = middleColumns.length - 1; i < len; i++) {
129
+ for (var i = 0, len = middleColumns.length; i < len; i++) {
130
130
  var curCol = middleColumns[i];
131
131
  sum += curCol.width || 100;
132
132
  if (scrollLeft < sum) {
133
133
  // 计算可视区域内需要渲染的列数
134
- for (var j = i + 1; j <= len; j++) {
134
+ for (var j = i + 1; j < len; j++) {
135
135
  var _props$scrollRef$curr;
136
136
  var nextCol = middleColumns[j];
137
137
  sum += nextCol.width || 100;
138
138
  if (props.scrollRef.current && sum - scrollLeft >= ((_props$scrollRef$curr = props.scrollRef.current) === null || _props$scrollRef$curr === void 0 ? void 0 : _props$scrollRef$curr.clientWidth)) {
139
139
  // 在原有基础上，右侧增加缓冲列
140
- var visibleCount = j - i;
140
+ var visibleCount = j - i + 1;
141
141
  setRenderedCount(Math.min(visibleCount + overscan * 2, len));
142
142
  break;
143
- } else if (j === len) {
143
+ } else if (j === len - 1) {
144
144
  // 到达最后一列
145
145
  var _visibleCount = j - i + 1;
146
146
  setRenderedCount(Math.min(_visibleCount + overscan * 2, len));
@@ -177,17 +177,24 @@ var useColumns = function useColumns(props) {
177
177
  if (col.fixed) {
178
178
  return col;
179
179
  }
180
- if (index < startIndex || index > startIndex + renderedCount) {
180
+ // 计算当前列在 middleColumns 中的索引
181
+ var middleIndex = index - leftFixedColumns.length;
182
+
183
+ // 如果不在可渲染范围内
184
+ if (middleIndex < startIndex || middleIndex > startIndex + renderedCount) {
181
185
  var colSpan;
182
186
  var colSpanWidth;
183
- if (index > startIndex + renderedCount && index === startIndex + renderedCount + 1) {
187
+ // 如果是可见范围后的第一列，合并后面所有隐藏的列
188
+ if (middleIndex > startIndex + renderedCount && middleIndex === startIndex + renderedCount + 1) {
184
189
  colSpan = function colSpan() {
185
- return middleColumns.length - index;
190
+ return middleColumns.length - middleIndex;
186
191
  };
187
- colSpanWidth = middleColumns.slice(index).reduce(function (sum, c) {
192
+ colSpanWidth = middleColumns.slice(middleIndex).reduce(function (sum, c) {
188
193
  return sum + (c.width || 0);
189
194
  }, 0);
190
- } else if (index < startIndex && index === leftFixedColumns.length && startIndex > 0) {
195
+ }
196
+ // 如果是第一个中间列且前面有隐藏列，合并前面所有隐藏的列
197
+ else if (middleIndex < startIndex && middleIndex === 0 && startIndex > 0) {
191
198
  colSpan = function colSpan() {
192
199
  return startIndex;
193
200
  };
package/esm/components/use-table/use-table-columns.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"use-table-columns.d.ts","sourceRoot":"","sources":["use-table-columns.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAE3F,OAAO,KAA+C,MAAM,OAAO,CAAC;AAEpE,MAAM,WAAW,eAAe,CAAC,IAAI;IACnC,OAAO,CAAC,EAAE,eAAe,CAAC,IAAI,CAAC,EAAE,CAAC;IAClC,IAAI,CAAC,EAAE,IAAI,EAAE,CAAC;IACd,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,aAAa,CAAC,EAAE,OAAO,GAAG,mBAAmB,CAAC;IAC9C,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;CACzC;AAYD,MAAM,MAAM,iBAAiB,GAAG;IAC9B,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,IAAI,EAAE,QAAQ,GAAG,YAAY,CAAC;IAC9B,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,KAAK,CAAC,MAAM,KAAK,CAAC,SAAS,CAAC,GAAG,SAAS,CAAC;IAC3E,OAAO,CAAC,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,KAAK,IAAI,CAAC;CAChD,GAAG,IAAI,CAAC;AAKT,QAAA,MAAM,UAAU;;;;wBA6EkC,MAAM;;;;;CAoGvD,CAAC;AAEF,eAAe,UAAU,CAAC"}
1
+ {"version":3,"file":"use-table-columns.d.ts","sourceRoot":"","sources":["use-table-columns.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAE3F,OAAO,KAA+C,MAAM,OAAO,CAAC;AAEpE,MAAM,WAAW,eAAe,CAAC,IAAI;IACnC,OAAO,CAAC,EAAE,eAAe,CAAC,IAAI,CAAC,EAAE,CAAC;IAClC,IAAI,CAAC,EAAE,IAAI,EAAE,CAAC;IACd,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,aAAa,CAAC,EAAE,OAAO,GAAG,mBAAmB,CAAC;IAC9C,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;CACzC;AAYD,MAAM,MAAM,iBAAiB,GAAG;IAC9B,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,IAAI,EAAE,QAAQ,GAAG,YAAY,CAAC;IAC9B,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,KAAK,CAAC,MAAM,KAAK,CAAC,SAAS,CAAC,GAAG,SAAS,CAAC;IAC3E,OAAO,CAAC,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,KAAK,IAAI,CAAC;CAChD,GAAG,IAAI,CAAC;AAKT,QAAA,MAAM,UAAU;;;;wBA6EkC,MAAM;;;;;CA2GvD,CAAC;AAEF,eAAe,UAAU,CAAC"}
package/esm/components/use-table/use-table-columns.js CHANGED
@@ -119,21 +119,21 @@ var useColumns = function useColumns(props) {
119
119
  var scrollLeft = scrollInfo.scrollLeft;
120
120
  var sum = 0;
121
121
  var currentIndex = 0;
122
- for (var i = 0, len = middleColumns.length - 1; i < len; i++) {
122
+ for (var i = 0, len = middleColumns.length; i < len; i++) {
123
123
  var curCol = middleColumns[i];
124
124
  sum += curCol.width || 100;
125
125
  if (scrollLeft < sum) {
126
126
  // 计算可视区域内需要渲染的列数
127
- for (var j = i + 1; j <= len; j++) {
127
+ for (var j = i + 1; j < len; j++) {
128
128
  var _props$scrollRef$curr;
129
129
  var nextCol = middleColumns[j];
130
130
  sum += nextCol.width || 100;
131
131
  if (props.scrollRef.current && sum - scrollLeft >= ((_props$scrollRef$curr = props.scrollRef.current) === null || _props$scrollRef$curr === void 0 ? void 0 : _props$scrollRef$curr.clientWidth)) {
132
132
  // 在原有基础上，右侧增加缓冲列
133
- var visibleCount = j - i;
133
+ var visibleCount = j - i + 1;
134
134
  setRenderedCount(Math.min(visibleCount + overscan * 2, len));
135
135
  break;
136
- } else if (j === len) {
136
+ } else if (j === len - 1) {
137
137
  // 到达最后一列
138
138
  var _visibleCount = j - i + 1;
139
139
  setRenderedCount(Math.min(_visibleCount + overscan * 2, len));
@@ -170,17 +170,24 @@ var useColumns = function useColumns(props) {
170
170
  if (col.fixed) {
171
171
  return col;
172
172
  }
173
- if (index < startIndex || index > startIndex + renderedCount) {
173
+ // 计算当前列在 middleColumns 中的索引
174
+ var middleIndex = index - leftFixedColumns.length;
175
+
176
+ // 如果不在可渲染范围内
177
+ if (middleIndex < startIndex || middleIndex > startIndex + renderedCount) {
174
178
  var colSpan;
175
179
  var colSpanWidth;
176
- if (index > startIndex + renderedCount && index === startIndex + renderedCount + 1) {
180
+ // 如果是可见范围后的第一列，合并后面所有隐藏的列
181
+ if (middleIndex > startIndex + renderedCount && middleIndex === startIndex + renderedCount + 1) {
177
182
  colSpan = function colSpan() {
178
- return middleColumns.length - index;
183
+ return middleColumns.length - middleIndex;
179
184
  };
180
- colSpanWidth = middleColumns.slice(index).reduce(function (sum, c) {
185
+ colSpanWidth = middleColumns.slice(middleIndex).reduce(function (sum, c) {
181
186
  return sum + (c.width || 0);
182
187
  }, 0);
183
- } else if (index < startIndex && index === leftFixedColumns.length && startIndex > 0) {
188
+ }
189
+ // 如果是第一个中间列且前面有隐藏列，合并前面所有隐藏的列
190
+ else if (middleIndex < startIndex && middleIndex === 0 && startIndex > 0) {
184
191
  colSpan = function colSpan() {
185
192
  return startIndex;
186
193
  };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@sheinx/hooks",
3
- "version": "3.9.8-beta.11",
3
+ "version": "3.9.8-beta.12",
4
4
  "description": "",
5
5
  "keywords": [],
6
6
  "license": "MIT",