@sheinx/base 3.7.7-beta.4 → 3.7.7-beta.6

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 (9) hide show
  1. package/cjs/table/table.d.ts.map +1 -1
  2. package/cjs/table/table.js +23 -1
  3. package/cjs/virtual-scroll/scroll-table.d.ts.map +1 -1
  4. package/cjs/virtual-scroll/scroll-table.js +6 -2
  5. package/esm/table/table.d.ts.map +1 -1
  6. package/esm/table/table.js +24 -2
  7. package/esm/virtual-scroll/scroll-table.d.ts.map +1 -1
  8. package/esm/virtual-scroll/scroll-table.js +6 -2
  9. package/package.json +2 -2
package/cjs/table/table.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"table.d.ts","sourceRoot":"","sources":["table.tsx"],"names":[],"mappings":"AAyBA,OAAO,EAAgB,UAAU,EAAE,MAAM,cAAc,CAAC;;AAexD,wBAoqBE"}
1
+ {"version":3,"file":"table.d.ts","sourceRoot":"","sources":["table.tsx"],"names":[],"mappings":"AA0BA,OAAO,EAAgB,UAAU,EAAE,MAAM,cAAc,CAAC;;AAexD,wBA4rBE"}
package/cjs/table/table.js CHANGED
@@ -226,7 +226,7 @@ var _default = exports.default = function _default(props) {
226
226
  onChange: inputableData.onChange,
227
227
  disabled: props.disabled
228
228
  });
229
- (0, _react.useEffect)(function () {
229
+ var handleTheadAndTfootHeight = (0, _hooks.usePersistFn)(function () {
230
230
  var _theadRef$current, _tfootRef$current;
231
231
  var theadHeight = (theadRef === null || theadRef === void 0 || (_theadRef$current = theadRef.current) === null || _theadRef$current === void 0 ? void 0 : _theadRef$current.clientHeight) || 0;
232
232
  var tfootHeight = ((_tfootRef$current = tfootRef.current) === null || _tfootRef$current === void 0 ? void 0 : _tfootRef$current.clientHeight) || 0;
@@ -235,6 +235,28 @@ var _default = exports.default = function _default(props) {
235
235
  } else {
236
236
  context.theadAndTfootHeight = theadHeight + tfootHeight;
237
237
  }
238
+ });
239
+ (0, _react.useEffect)(function () {
240
+ handleTheadAndTfootHeight();
241
+ var cancelFunc1;
242
+ if (theadRef !== null && theadRef !== void 0 && theadRef.current) {
243
+ cancelFunc1 = (0, _hooks.addResizeObserver)(theadRef === null || theadRef === void 0 ? void 0 : theadRef.current, handleTheadAndTfootHeight, {
244
+ direction: 'y',
245
+ timer: 10
246
+ });
247
+ }
248
+ var cancelFunc2;
249
+ if (tfootRef !== null && tfootRef !== void 0 && tfootRef.current) {
250
+ cancelFunc2 = (0, _hooks.addResizeObserver)(tfootRef === null || tfootRef === void 0 ? void 0 : tfootRef.current, handleTheadAndTfootHeight, {
251
+ direction: 'y',
252
+ timer: 10
253
+ });
254
+ }
255
+ return function () {
256
+ var _cancelFunc, _cancelFunc2;
257
+ (_cancelFunc = cancelFunc1) === null || _cancelFunc === void 0 || _cancelFunc();
258
+ (_cancelFunc2 = cancelFunc2) === null || _cancelFunc2 === void 0 || _cancelFunc2();
259
+ };
238
260
  }, [theadRef.current, tfootRef.current]);
239
261
  var virtualInfo = (0, _hooks.useTableVirtual)({
240
262
  disabled: !virtual,
package/cjs/virtual-scroll/scroll-table.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"scroll-table.d.ts","sourceRoot":"","sources":["scroll-table.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAkC,MAAM,OAAO,CAAC;AAIvD,UAAU,WAAW;IACnB,KAAK,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IAC5B,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,GAAG,MAAM,CAAC;IAC7B,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACzB,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;IAC1B,UAAU,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;IAC7C,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC;IAC7C,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE;QAChB,UAAU,EAAE,MAAM,CAAC;QACnB,SAAS,EAAE,MAAM,CAAC;QAClB,CAAC,EAAE,MAAM,CAAC;QACV,CAAC,EAAE,MAAM,CAAC;QACV,QAAQ,EAAE,OAAO,CAAC;QAClB,MAAM,EAAE,MAAM,CAAC;QACf,KAAK,EAAE,MAAM,CAAC;KACf,KAAK,IAAI,CAAC;IACX,gBAAgB,CAAC,EAAE,CAAC,OAAO,CAAC,EAAE,GAAG,KAAK,IAAI,CAAC;IAC3C,cAAc,EAAE,CAAC,CAAC,EAAE,OAAO,KAAK,IAAI,CAAC;IACrC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;IAC1C,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IACpC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAWD,QAAA,MAAM,MAAM,UAAW,WAAW,4CAoJjC,CAAC;AAEF,eAAe,MAAM,CAAC"}
1
+ {"version":3,"file":"scroll-table.d.ts","sourceRoot":"","sources":["scroll-table.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAkC,MAAM,OAAO,CAAC;AAIvD,UAAU,WAAW;IACnB,KAAK,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IAC5B,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,GAAG,MAAM,CAAC;IAC7B,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACzB,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;IAC1B,UAAU,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;IAC7C,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC;IAC7C,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE;QAChB,UAAU,EAAE,MAAM,CAAC;QACnB,SAAS,EAAE,MAAM,CAAC;QAClB,CAAC,EAAE,MAAM,CAAC;QACV,CAAC,EAAE,MAAM,CAAC;QACV,QAAQ,EAAE,OAAO,CAAC;QAClB,MAAM,EAAE,MAAM,CAAC;QACf,KAAK,EAAE,MAAM,CAAC;KACf,KAAK,IAAI,CAAC;IACX,gBAAgB,CAAC,EAAE,CAAC,OAAO,CAAC,EAAE,GAAG,KAAK,IAAI,CAAC;IAC3C,cAAc,EAAE,CAAC,CAAC,EAAE,OAAO,KAAK,IAAI,CAAC;IACrC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;IAC1C,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IACpC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAWD,QAAA,MAAM,MAAM,UAAW,WAAW,4CAwJjC,CAAC;AAEF,eAAe,MAAM,CAAC"}
package/cjs/virtual-scroll/scroll-table.js CHANGED
@@ -30,7 +30,8 @@ var Scroll = function Scroll(props) {
30
30
  var wrapperRef = (0, _hooks.useForkRef)(scrollRef, props.wrapperRef);
31
31
  var _useRef = (0, _react.useRef)({
32
32
  isMouseDown: false,
33
- lastTableHeight: 0
33
+ lastTableHeight: 0,
34
+ unmounted: false
34
35
  }),
35
36
  context = _useRef.current;
36
37
  var _props$scrollHeight = props.scrollHeight,
@@ -139,7 +140,7 @@ var Scroll = function Scroll(props) {
139
140
 
140
141
  // 非定高的Table但依旧采用了virtual渲染方式，需要渲染出全部的data
141
142
  (0, _react.useLayoutEffect)(function () {
142
- if (!props.tableRef.current) return;
143
+ if (!props.tableRef.current || context.unmounted) return;
143
144
  var rootTableHeight = props.tableRef.current.clientHeight;
144
145
  var container = containerRef.current;
145
146
  // 判断内容滚动高度是否真的超过了容器高度
@@ -151,6 +152,9 @@ var Scroll = function Scroll(props) {
151
152
  } else {
152
153
  context.lastTableHeight = rootTableHeight;
153
154
  }
155
+ return function () {
156
+ context.unmounted = true;
157
+ };
154
158
  }, [paddingTop]);
155
159
  if (props.isEmpty) {
156
160
  return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", _objectSpread(_objectSpread({}, scrollRoleProps), {}, {
package/esm/table/table.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"table.d.ts","sourceRoot":"","sources":["table.tsx"],"names":[],"mappings":"AAyBA,OAAO,EAAgB,UAAU,EAAE,MAAM,cAAc,CAAC;;AAexD,wBAoqBE"}
1
+ {"version":3,"file":"table.d.ts","sourceRoot":"","sources":["table.tsx"],"names":[],"mappings":"AA0BA,OAAO,EAAgB,UAAU,EAAE,MAAM,cAAc,CAAC;;AAexD,wBA4rBE"}
package/esm/table/table.js CHANGED
@@ -22,7 +22,7 @@ import AbsoluteContext from "../absolute-list/absolute-context";
22
22
  import Empty from "../empty";
23
23
  import Sticky, { defaultZIndex } from "../sticky";
24
24
  import { useConfig } from "../config";
25
- import { useTableLayout, useTableColumns, useTableFilter, useTableSort, useTableTree, usePersistFn, useListSelect, useInputAble, useTableVirtual, usePaginationList, useLatestObj, useResize, useScrollbarWidth, util } from '@sheinx/hooks';
25
+ import { useTableLayout, useTableColumns, useTableFilter, useTableSort, useTableTree, usePersistFn, useListSelect, useInputAble, useTableVirtual, usePaginationList, useLatestObj, useResize, useScrollbarWidth, util, addResizeObserver } from '@sheinx/hooks';
26
26
  import useTableSelect from "./use-table-select";
27
27
  import Colgroup from "./colgroup";
28
28
  import Thead from "./thead";
@@ -219,7 +219,7 @@ export default (function (props) {
219
219
  onChange: inputableData.onChange,
220
220
  disabled: props.disabled
221
221
  });
222
- useEffect(function () {
222
+ var handleTheadAndTfootHeight = usePersistFn(function () {
223
223
  var _theadRef$current, _tfootRef$current;
224
224
  var theadHeight = (theadRef === null || theadRef === void 0 || (_theadRef$current = theadRef.current) === null || _theadRef$current === void 0 ? void 0 : _theadRef$current.clientHeight) || 0;
225
225
  var tfootHeight = ((_tfootRef$current = tfootRef.current) === null || _tfootRef$current === void 0 ? void 0 : _tfootRef$current.clientHeight) || 0;
@@ -228,6 +228,28 @@ export default (function (props) {
228
228
  } else {
229
229
  context.theadAndTfootHeight = theadHeight + tfootHeight;
230
230
  }
231
+ });
232
+ useEffect(function () {
233
+ handleTheadAndTfootHeight();
234
+ var cancelFunc1;
235
+ if (theadRef !== null && theadRef !== void 0 && theadRef.current) {
236
+ cancelFunc1 = addResizeObserver(theadRef === null || theadRef === void 0 ? void 0 : theadRef.current, handleTheadAndTfootHeight, {
237
+ direction: 'y',
238
+ timer: 10
239
+ });
240
+ }
241
+ var cancelFunc2;
242
+ if (tfootRef !== null && tfootRef !== void 0 && tfootRef.current) {
243
+ cancelFunc2 = addResizeObserver(tfootRef === null || tfootRef === void 0 ? void 0 : tfootRef.current, handleTheadAndTfootHeight, {
244
+ direction: 'y',
245
+ timer: 10
246
+ });
247
+ }
248
+ return function () {
249
+ var _cancelFunc, _cancelFunc2;
250
+ (_cancelFunc = cancelFunc1) === null || _cancelFunc === void 0 || _cancelFunc();
251
+ (_cancelFunc2 = cancelFunc2) === null || _cancelFunc2 === void 0 || _cancelFunc2();
252
+ };
231
253
  }, [theadRef.current, tfootRef.current]);
232
254
  var virtualInfo = useTableVirtual({
233
255
  disabled: !virtual,
package/esm/virtual-scroll/scroll-table.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"scroll-table.d.ts","sourceRoot":"","sources":["scroll-table.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAkC,MAAM,OAAO,CAAC;AAIvD,UAAU,WAAW;IACnB,KAAK,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IAC5B,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,GAAG,MAAM,CAAC;IAC7B,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACzB,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;IAC1B,UAAU,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;IAC7C,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC;IAC7C,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE;QAChB,UAAU,EAAE,MAAM,CAAC;QACnB,SAAS,EAAE,MAAM,CAAC;QAClB,CAAC,EAAE,MAAM,CAAC;QACV,CAAC,EAAE,MAAM,CAAC;QACV,QAAQ,EAAE,OAAO,CAAC;QAClB,MAAM,EAAE,MAAM,CAAC;QACf,KAAK,EAAE,MAAM,CAAC;KACf,KAAK,IAAI,CAAC;IACX,gBAAgB,CAAC,EAAE,CAAC,OAAO,CAAC,EAAE,GAAG,KAAK,IAAI,CAAC;IAC3C,cAAc,EAAE,CAAC,CAAC,EAAE,OAAO,KAAK,IAAI,CAAC;IACrC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;IAC1C,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IACpC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAWD,QAAA,MAAM,MAAM,UAAW,WAAW,4CAoJjC,CAAC;AAEF,eAAe,MAAM,CAAC"}
1
+ {"version":3,"file":"scroll-table.d.ts","sourceRoot":"","sources":["scroll-table.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAkC,MAAM,OAAO,CAAC;AAIvD,UAAU,WAAW;IACnB,KAAK,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IAC5B,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,GAAG,MAAM,CAAC;IAC7B,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACzB,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;IAC1B,UAAU,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;IAC7C,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC;IAC7C,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE;QAChB,UAAU,EAAE,MAAM,CAAC;QACnB,SAAS,EAAE,MAAM,CAAC;QAClB,CAAC,EAAE,MAAM,CAAC;QACV,CAAC,EAAE,MAAM,CAAC;QACV,QAAQ,EAAE,OAAO,CAAC;QAClB,MAAM,EAAE,MAAM,CAAC;QACf,KAAK,EAAE,MAAM,CAAC;KACf,KAAK,IAAI,CAAC;IACX,gBAAgB,CAAC,EAAE,CAAC,OAAO,CAAC,EAAE,GAAG,KAAK,IAAI,CAAC;IAC3C,cAAc,EAAE,CAAC,CAAC,EAAE,OAAO,KAAK,IAAI,CAAC;IACrC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;IAC1C,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IACpC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAWD,QAAA,MAAM,MAAM,UAAW,WAAW,4CAwJjC,CAAC;AAEF,eAAe,MAAM,CAAC"}
package/esm/virtual-scroll/scroll-table.js CHANGED
@@ -23,7 +23,8 @@ var Scroll = function Scroll(props) {
23
23
  var wrapperRef = useForkRef(scrollRef, props.wrapperRef);
24
24
  var _useRef = useRef({
25
25
  isMouseDown: false,
26
- lastTableHeight: 0
26
+ lastTableHeight: 0,
27
+ unmounted: false
27
28
  }),
28
29
  context = _useRef.current;
29
30
  var _props$scrollHeight = props.scrollHeight,
@@ -132,7 +133,7 @@ var Scroll = function Scroll(props) {
132
133
 
133
134
  // 非定高的Table但依旧采用了virtual渲染方式，需要渲染出全部的data
134
135
  useLayoutEffect(function () {
135
- if (!props.tableRef.current) return;
136
+ if (!props.tableRef.current || context.unmounted) return;
136
137
  var rootTableHeight = props.tableRef.current.clientHeight;
137
138
  var container = containerRef.current;
138
139
  // 判断内容滚动高度是否真的超过了容器高度
@@ -144,6 +145,9 @@ var Scroll = function Scroll(props) {
144
145
  } else {
145
146
  context.lastTableHeight = rootTableHeight;
146
147
  }
148
+ return function () {
149
+ context.unmounted = true;
150
+ };
147
151
  }, [paddingTop]);
148
152
  if (props.isEmpty) {
149
153
  return /*#__PURE__*/_jsxs("div", _objectSpread(_objectSpread({}, scrollRoleProps), {}, {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@sheinx/base",
3
- "version": "3.7.7-beta.4",
3
+ "version": "3.7.7-beta.6",
4
4
  "description": "",
5
5
  "keywords": [],
6
6
  "license": "MIT",
@@ -10,7 +10,7 @@
10
10
  "module": "./esm/index.js",
11
11
  "typings": "./cjs/index.d.ts",
12
12
  "dependencies": {
13
- "@sheinx/hooks": "3.7.7-beta.4",
13
+ "@sheinx/hooks": "3.7.7-beta.6",
14
14
  "immer": "^10.0.0",
15
15
  "classnames": "^2.0.0",
16
16
  "@shined/reactive": "^0.1.3-alpha.0"