@deviceinsight/ng-ui-components 6.28.1 → 6.30.0

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 (16) hide show
  1. package/lib/cjs/components/reactable/Reactable.d.ts +1 -0
  2. package/lib/cjs/components/reactable/Reactable.d.ts.map +1 -1
  3. package/lib/cjs/components/reactable/Reactable.js +12 -0
  4. package/lib/cjs/components/reactable/helpers/ReactableTableFilterRow.d.ts.map +1 -1
  5. package/lib/cjs/components/reactable/helpers/ReactableTableFilterRow.js +7 -3
  6. package/lib/esm/components/reactable/Reactable.d.ts +1 -0
  7. package/lib/esm/components/reactable/Reactable.d.ts.map +1 -1
  8. package/lib/esm/components/reactable/Reactable.js +12 -0
  9. package/lib/esm/components/reactable/helpers/ReactableTableFilterRow.d.ts.map +1 -1
  10. package/lib/esm/components/reactable/helpers/ReactableTableFilterRow.js +8 -4
  11. package/lib/esm/src/components/reactable/Reactable.d.ts +1 -0
  12. package/lib/esm/src/components/reactable/Reactable.d.ts.map +1 -1
  13. package/lib/esm/src/components/reactable/Reactable.js +12 -0
  14. package/lib/esm/src/components/reactable/helpers/ReactableTableFilterRow.d.ts.map +1 -1
  15. package/lib/esm/src/components/reactable/helpers/ReactableTableFilterRow.js +8 -4
  16. package/package.json +2 -1
package/lib/cjs/components/reactable/Reactable.d.ts CHANGED
@@ -35,6 +35,7 @@ export declare type Props<T, ID extends string | number | undefined | null = any
35
35
  * Each column can also be extended to be sortable and/or filterable
36
36
  */
37
37
  export default class Reactable<T = any, ID extends string | number | undefined | null = any> extends React.Component<Props<T, ID>> {
38
+ componentDidUpdate(prevProps: Props<T, ID>): void;
38
39
  render(): React.JSX.Element;
39
40
  }
40
41
  //# sourceMappingURL=Reactable.d.ts.map
package/lib/cjs/components/reactable/Reactable.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Reactable.d.ts","sourceRoot":"","sources":["../../../../src/components/reactable/Reactable.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAI/B,OAAO,EAAC,kBAAkB,EAAE,eAAe,EAAE,uBAAuB,EAAC,MAAM,SAAS,CAAC;AACrF,OAAO,EAAC,QAAQ,EAAE,kBAAkB,EAAE,aAAa,EAAC,MAAM,wBAAwB,CAAC;AAEnF,oBAAY,KAAK,CAAC,CAAC,EAAE,EAAE,SAAS,MAAM,GAAG,MAAM,GAAG,SAAS,GAAG,IAAI,GAAG,GAAG,IAAI;IAC3E,+EAA+E;IAC/E,UAAU,EAAE,KAAK,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC;IAEzC,8DAA8D;IAC9D,aAAa,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,EAAE,CAAC;IAE/B,qCAAqC;IACrC,kBAAkB,EAAE,kBAAkB,CAAC;IAEvC,qDAAqD;IACrD,YAAY,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAErC,4CAA4C;IAC5C,MAAM,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,aAAa,KAAK,IAAI,CAAC;IAE7D,6DAA6D;IAC7D,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAEtC,mEAAmE;IACnE,QAAQ,CAAC,EAAE,CAAC,cAAc,EAAE,uBAAuB,KAAK,IAAI,CAAC;IAE7D,mCAAmC;IACnC,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,6DAA6D;IAC7D,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,IAAI,GAAG,SAAS,CAAC;IAEzC,0EAA0E;IAC1E,MAAM,CAAC,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC;IAE5B,uCAAuC;IACvC,SAAS,EAAE,OAAO,CAAC;IAEnB,+CAA+C;IAC/C,SAAS,CAAC,EAAE,OAAO,CAAC;IAEpB,wDAAwD;IACxD,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAE1B,aAAa,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF;;;GAGG;AACH,MAAM,CAAC,OAAO,OAAO,SAAS,CAAC,CAAC,GAAG,GAAG,EAAE,EAAE,SAAS,MAAM,GAAG,MAAM,GAAG,SAAS,GAAG,IAAI,GAAG,GAAG,CAAE,SAAQ,KAAK,CAAC,SAAS,CACnH,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CACZ;IACA,MAAM;CAoBN"}
1
+ {"version":3,"file":"Reactable.d.ts","sourceRoot":"","sources":["../../../../src/components/reactable/Reactable.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAI/B,OAAO,EAAC,kBAAkB,EAAE,eAAe,EAAE,uBAAuB,EAAC,MAAM,SAAS,CAAC;AACrF,OAAO,EAAC,QAAQ,EAAE,kBAAkB,EAAE,aAAa,EAAC,MAAM,wBAAwB,CAAC;AAEnF,oBAAY,KAAK,CAAC,CAAC,EAAE,EAAE,SAAS,MAAM,GAAG,MAAM,GAAG,SAAS,GAAG,IAAI,GAAG,GAAG,IAAI;IAC3E,+EAA+E;IAC/E,UAAU,EAAE,KAAK,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC;IAEzC,8DAA8D;IAC9D,aAAa,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,EAAE,CAAC;IAE/B,qCAAqC;IACrC,kBAAkB,EAAE,kBAAkB,CAAC;IAEvC,qDAAqD;IACrD,YAAY,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAErC,4CAA4C;IAC5C,MAAM,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,aAAa,KAAK,IAAI,CAAC;IAE7D,6DAA6D;IAC7D,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAEtC,mEAAmE;IACnE,QAAQ,CAAC,EAAE,CAAC,cAAc,EAAE,uBAAuB,KAAK,IAAI,CAAC;IAE7D,mCAAmC;IACnC,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,6DAA6D;IAC7D,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,IAAI,GAAG,SAAS,CAAC;IAEzC,0EAA0E;IAC1E,MAAM,CAAC,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC;IAE5B,uCAAuC;IACvC,SAAS,EAAE,OAAO,CAAC;IAEnB,+CAA+C;IAC/C,SAAS,CAAC,EAAE,OAAO,CAAC;IAEpB,wDAAwD;IACxD,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAE1B,aAAa,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF;;;GAGG;AACH,MAAM,CAAC,OAAO,OAAO,SAAS,CAAC,CAAC,GAAG,GAAG,EAAE,EAAE,SAAS,MAAM,GAAG,MAAM,GAAG,SAAS,GAAG,IAAI,GAAG,GAAG,CAAE,SAAQ,KAAK,CAAC,SAAS,CACnH,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CACZ;IACA,kBAAkB,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC;IAgB1C,MAAM;CAoBN"}
package/lib/cjs/components/reactable/Reactable.js CHANGED
@@ -34,6 +34,18 @@ const ReactableTable_1 = __importDefault(require("./helpers/ReactableTable"));
34
34
  * Each column can also be extended to be sortable and/or filterable
35
35
  */
36
36
  class Reactable extends React.Component {
37
+ componentDidUpdate(prevProps) {
38
+ const { pageable, paginationSettings, onChangePage } = this.props;
39
+ if (!pageable) {
40
+ return;
41
+ }
42
+ const totalPages = pageable.totalPages || 0;
43
+ const currentPage = paginationSettings.page;
44
+ const clampedPage = totalPages > 0 ? Math.min(currentPage, totalPages - 1) : 0;
45
+ if (currentPage !== clampedPage) {
46
+ onChangePage(clampedPage);
47
+ }
48
+ }
37
49
  render() {
38
50
  const { paginationSettings, pageable, onChangePage, onChangeSize } = this.props;
39
51
  const showPagination = onChangeSize
package/lib/cjs/components/reactable/helpers/ReactableTableFilterRow.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"ReactableTableFilterRow.d.ts","sourceRoot":"","sources":["../../../../../src/components/reactable/helpers/ReactableTableFilterRow.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA4B,MAAM,OAAO,CAAC;AAEjD,OAAO,EAAC,kBAAkB,EAAE,uBAAuB,EAAC,MAAM,UAAU,CAAC;AAKrE,aAAK,KAAK,GAAG;IACZ,UAAU,EAAE,KAAK,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC,CAAC;IAC3C,QAAQ,EAAE,CAAC,aAAa,EAAE,uBAAuB,KAAK,IAAI,CAAC;IAC3D,SAAS,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AACF,QAAA,MAAM,uBAAuB,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CAwH5C,CAAC;AAEF,eAAe,uBAAuB,CAAC"}
1
+ {"version":3,"file":"ReactableTableFilterRow.d.ts","sourceRoot":"","sources":["../../../../../src/components/reactable/helpers/ReactableTableFilterRow.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAoC,MAAM,OAAO,CAAC;AAEzD,OAAO,EAAC,kBAAkB,EAAE,uBAAuB,EAAC,MAAM,UAAU,CAAC;AAKrE,aAAK,KAAK,GAAG;IACZ,UAAU,EAAE,KAAK,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC,CAAC;IAC3C,QAAQ,EAAE,CAAC,aAAa,EAAE,uBAAuB,KAAK,IAAI,CAAC;IAC3D,SAAS,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AACF,QAAA,MAAM,uBAAuB,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CA6H5C,CAAC;AAEF,eAAe,uBAAuB,CAAC"}
package/lib/cjs/components/reactable/helpers/ReactableTableFilterRow.js CHANGED
@@ -34,11 +34,15 @@ const SelectWithSearch_1 = __importDefault(require("../../input/SelectWithSearch
34
34
  const ReactableTableFilterRow = ({ columnDefs, onFilter, tableName }) => {
35
35
  const { t } = (0, i18n_1.useTranslation)();
36
36
  const [state, setState] = (0, react_1.useState)({});
37
+ const onFilterRef = (0, react_1.useRef)(onFilter);
38
+ (0, react_1.useEffect)(() => {
39
+ onFilterRef.current = onFilter;
40
+ }, [onFilter]);
37
41
  (0, react_1.useEffect)(() => {
38
42
  setState((prev) => {
39
43
  const merged = {};
40
44
  for (const cd of columnDefs) {
41
- merged[cd.name] = prev[cd.name] !== undefined ? prev[cd.name] : cd.filterable?.initialValue ?? '';
45
+ merged[cd.name] = prev[cd.name] !== undefined ? prev[cd.name] : (cd.filterable?.initialValue ?? '');
42
46
  }
43
47
  const prevKeys = Object.keys(prev);
44
48
  const mergedKeys = Object.keys(merged);
@@ -48,11 +52,11 @@ const ReactableTableFilterRow = ({ columnDefs, onFilter, tableName }) => {
48
52
  return prev; // no change
49
53
  }
50
54
  if (Object.values(merged).some((v) => v)) {
51
- onFilter(merged);
55
+ onFilterRef.current(merged);
52
56
  }
53
57
  return merged;
54
58
  });
55
- }, [columnDefs, onFilter]);
59
+ }, [columnDefs]);
56
60
  const changeFilter = (columnName, value) => {
57
61
  const newState = { ...state, [columnName]: value };
58
62
  setState(newState);
package/lib/esm/components/reactable/Reactable.d.ts CHANGED
@@ -35,6 +35,7 @@ export declare type Props<T, ID extends string | number | undefined | null = any
35
35
  * Each column can also be extended to be sortable and/or filterable
36
36
  */
37
37
  export default class Reactable<T = any, ID extends string | number | undefined | null = any> extends React.Component<Props<T, ID>> {
38
+ componentDidUpdate(prevProps: Props<T, ID>): void;
38
39
  render(): React.JSX.Element;
39
40
  }
40
41
  //# sourceMappingURL=Reactable.d.ts.map
package/lib/esm/components/reactable/Reactable.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Reactable.d.ts","sourceRoot":"","sources":["../../../../src/components/reactable/Reactable.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAI/B,OAAO,EAAC,kBAAkB,EAAE,eAAe,EAAE,uBAAuB,EAAC,MAAM,SAAS,CAAC;AACrF,OAAO,EAAC,QAAQ,EAAE,kBAAkB,EAAE,aAAa,EAAC,MAAM,wBAAwB,CAAC;AAEnF,oBAAY,KAAK,CAAC,CAAC,EAAE,EAAE,SAAS,MAAM,GAAG,MAAM,GAAG,SAAS,GAAG,IAAI,GAAG,GAAG,IAAI;IAC3E,+EAA+E;IAC/E,UAAU,EAAE,KAAK,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC;IAEzC,8DAA8D;IAC9D,aAAa,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,EAAE,CAAC;IAE/B,qCAAqC;IACrC,kBAAkB,EAAE,kBAAkB,CAAC;IAEvC,qDAAqD;IACrD,YAAY,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAErC,4CAA4C;IAC5C,MAAM,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,aAAa,KAAK,IAAI,CAAC;IAE7D,6DAA6D;IAC7D,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAEtC,mEAAmE;IACnE,QAAQ,CAAC,EAAE,CAAC,cAAc,EAAE,uBAAuB,KAAK,IAAI,CAAC;IAE7D,mCAAmC;IACnC,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,6DAA6D;IAC7D,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,IAAI,GAAG,SAAS,CAAC;IAEzC,0EAA0E;IAC1E,MAAM,CAAC,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC;IAE5B,uCAAuC;IACvC,SAAS,EAAE,OAAO,CAAC;IAEnB,+CAA+C;IAC/C,SAAS,CAAC,EAAE,OAAO,CAAC;IAEpB,wDAAwD;IACxD,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAE1B,aAAa,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF;;;GAGG;AACH,MAAM,CAAC,OAAO,OAAO,SAAS,CAAC,CAAC,GAAG,GAAG,EAAE,EAAE,SAAS,MAAM,GAAG,MAAM,GAAG,SAAS,GAAG,IAAI,GAAG,GAAG,CAAE,SAAQ,KAAK,CAAC,SAAS,CACnH,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CACZ;IACA,MAAM;CAoBN"}
1
+ {"version":3,"file":"Reactable.d.ts","sourceRoot":"","sources":["../../../../src/components/reactable/Reactable.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAI/B,OAAO,EAAC,kBAAkB,EAAE,eAAe,EAAE,uBAAuB,EAAC,MAAM,SAAS,CAAC;AACrF,OAAO,EAAC,QAAQ,EAAE,kBAAkB,EAAE,aAAa,EAAC,MAAM,wBAAwB,CAAC;AAEnF,oBAAY,KAAK,CAAC,CAAC,EAAE,EAAE,SAAS,MAAM,GAAG,MAAM,GAAG,SAAS,GAAG,IAAI,GAAG,GAAG,IAAI;IAC3E,+EAA+E;IAC/E,UAAU,EAAE,KAAK,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC;IAEzC,8DAA8D;IAC9D,aAAa,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,EAAE,CAAC;IAE/B,qCAAqC;IACrC,kBAAkB,EAAE,kBAAkB,CAAC;IAEvC,qDAAqD;IACrD,YAAY,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAErC,4CAA4C;IAC5C,MAAM,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,aAAa,KAAK,IAAI,CAAC;IAE7D,6DAA6D;IAC7D,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAEtC,mEAAmE;IACnE,QAAQ,CAAC,EAAE,CAAC,cAAc,EAAE,uBAAuB,KAAK,IAAI,CAAC;IAE7D,mCAAmC;IACnC,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,6DAA6D;IAC7D,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,IAAI,GAAG,SAAS,CAAC;IAEzC,0EAA0E;IAC1E,MAAM,CAAC,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC;IAE5B,uCAAuC;IACvC,SAAS,EAAE,OAAO,CAAC;IAEnB,+CAA+C;IAC/C,SAAS,CAAC,EAAE,OAAO,CAAC;IAEpB,wDAAwD;IACxD,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAE1B,aAAa,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF;;;GAGG;AACH,MAAM,CAAC,OAAO,OAAO,SAAS,CAAC,CAAC,GAAG,GAAG,EAAE,EAAE,SAAS,MAAM,GAAG,MAAM,GAAG,SAAS,GAAG,IAAI,GAAG,GAAG,CAAE,SAAQ,KAAK,CAAC,SAAS,CACnH,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CACZ;IACA,kBAAkB,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC;IAgB1C,MAAM;CAoBN"}
package/lib/esm/components/reactable/Reactable.js CHANGED
@@ -6,6 +6,18 @@ import ReactableTable from './helpers/ReactableTable';
6
6
  * Each column can also be extended to be sortable and/or filterable
7
7
  */
8
8
  export default class Reactable extends React.Component {
9
+ componentDidUpdate(prevProps) {
10
+ const { pageable, paginationSettings, onChangePage } = this.props;
11
+ if (!pageable) {
12
+ return;
13
+ }
14
+ const totalPages = pageable.totalPages || 0;
15
+ const currentPage = paginationSettings.page;
16
+ const clampedPage = totalPages > 0 ? Math.min(currentPage, totalPages - 1) : 0;
17
+ if (currentPage !== clampedPage) {
18
+ onChangePage(clampedPage);
19
+ }
20
+ }
9
21
  render() {
10
22
  const { paginationSettings, pageable, onChangePage, onChangeSize } = this.props;
11
23
  const showPagination = onChangeSize
package/lib/esm/components/reactable/helpers/ReactableTableFilterRow.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"ReactableTableFilterRow.d.ts","sourceRoot":"","sources":["../../../../../src/components/reactable/helpers/ReactableTableFilterRow.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA4B,MAAM,OAAO,CAAC;AAEjD,OAAO,EAAC,kBAAkB,EAAE,uBAAuB,EAAC,MAAM,UAAU,CAAC;AAKrE,aAAK,KAAK,GAAG;IACZ,UAAU,EAAE,KAAK,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC,CAAC;IAC3C,QAAQ,EAAE,CAAC,aAAa,EAAE,uBAAuB,KAAK,IAAI,CAAC;IAC3D,SAAS,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AACF,QAAA,MAAM,uBAAuB,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CAwH5C,CAAC;AAEF,eAAe,uBAAuB,CAAC"}
1
+ {"version":3,"file":"ReactableTableFilterRow.d.ts","sourceRoot":"","sources":["../../../../../src/components/reactable/helpers/ReactableTableFilterRow.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAoC,MAAM,OAAO,CAAC;AAEzD,OAAO,EAAC,kBAAkB,EAAE,uBAAuB,EAAC,MAAM,UAAU,CAAC;AAKrE,aAAK,KAAK,GAAG;IACZ,UAAU,EAAE,KAAK,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC,CAAC;IAC3C,QAAQ,EAAE,CAAC,aAAa,EAAE,uBAAuB,KAAK,IAAI,CAAC;IAC3D,SAAS,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AACF,QAAA,MAAM,uBAAuB,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CA6H5C,CAAC;AAEF,eAAe,uBAAuB,CAAC"}
package/lib/esm/components/reactable/helpers/ReactableTableFilterRow.js CHANGED
@@ -1,4 +1,4 @@
1
- import React, { useEffect, useState } from 'react';
1
+ import React, { useEffect, useRef, useState } from 'react';
2
2
  import { useTranslation } from '../../../i18n';
3
3
  import ReactableTextFilter from './ReactableTextFilter';
4
4
  import { getClassName } from './helper';
@@ -6,11 +6,15 @@ import SelectWithSearch from '../../input/SelectWithSearch';
6
6
  const ReactableTableFilterRow = ({ columnDefs, onFilter, tableName }) => {
7
7
  const { t } = useTranslation();
8
8
  const [state, setState] = useState({});
9
+ const onFilterRef = useRef(onFilter);
10
+ useEffect(() => {
11
+ onFilterRef.current = onFilter;
12
+ }, [onFilter]);
9
13
  useEffect(() => {
10
14
  setState((prev) => {
11
15
  const merged = {};
12
16
  for (const cd of columnDefs) {
13
- merged[cd.name] = prev[cd.name] !== undefined ? prev[cd.name] : cd.filterable?.initialValue ?? '';
17
+ merged[cd.name] = prev[cd.name] !== undefined ? prev[cd.name] : (cd.filterable?.initialValue ?? '');
14
18
  }
15
19
  const prevKeys = Object.keys(prev);
16
20
  const mergedKeys = Object.keys(merged);
@@ -20,11 +24,11 @@ const ReactableTableFilterRow = ({ columnDefs, onFilter, tableName }) => {
20
24
  return prev; // no change
21
25
  }
22
26
  if (Object.values(merged).some((v) => v)) {
23
- onFilter(merged);
27
+ onFilterRef.current(merged);
24
28
  }
25
29
  return merged;
26
30
  });
27
- }, [columnDefs, onFilter]);
31
+ }, [columnDefs]);
28
32
  const changeFilter = (columnName, value) => {
29
33
  const newState = { ...state, [columnName]: value };
30
34
  setState(newState);
package/lib/esm/src/components/reactable/Reactable.d.ts CHANGED
@@ -35,6 +35,7 @@ export declare type Props<T, ID extends string | number | undefined | null = any
35
35
  * Each column can also be extended to be sortable and/or filterable
36
36
  */
37
37
  export default class Reactable<T = any, ID extends string | number | undefined | null = any> extends React.Component<Props<T, ID>> {
38
+ componentDidUpdate(prevProps: Props<T, ID>): void;
38
39
  render(): React.JSX.Element;
39
40
  }
40
41
  //# sourceMappingURL=Reactable.d.ts.map
package/lib/esm/src/components/reactable/Reactable.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Reactable.d.ts","sourceRoot":"","sources":["../../../../../src/components/reactable/Reactable.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAI/B,OAAO,EAAC,kBAAkB,EAAE,eAAe,EAAE,uBAAuB,EAAC,MAAM,SAAS,CAAC;AACrF,OAAO,EAAC,QAAQ,EAAE,kBAAkB,EAAE,aAAa,EAAC,MAAM,wBAAwB,CAAC;AAEnF,oBAAY,KAAK,CAAC,CAAC,EAAE,EAAE,SAAS,MAAM,GAAG,MAAM,GAAG,SAAS,GAAG,IAAI,GAAG,GAAG,IAAI;IAC3E,+EAA+E;IAC/E,UAAU,EAAE,KAAK,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC;IAEzC,8DAA8D;IAC9D,aAAa,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,EAAE,CAAC;IAE/B,qCAAqC;IACrC,kBAAkB,EAAE,kBAAkB,CAAC;IAEvC,qDAAqD;IACrD,YAAY,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAErC,4CAA4C;IAC5C,MAAM,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,aAAa,KAAK,IAAI,CAAC;IAE7D,6DAA6D;IAC7D,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAEtC,mEAAmE;IACnE,QAAQ,CAAC,EAAE,CAAC,cAAc,EAAE,uBAAuB,KAAK,IAAI,CAAC;IAE7D,mCAAmC;IACnC,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,6DAA6D;IAC7D,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,IAAI,GAAG,SAAS,CAAC;IAEzC,0EAA0E;IAC1E,MAAM,CAAC,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC;IAE5B,uCAAuC;IACvC,SAAS,EAAE,OAAO,CAAC;IAEnB,+CAA+C;IAC/C,SAAS,CAAC,EAAE,OAAO,CAAC;IAEpB,wDAAwD;IACxD,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAE1B,aAAa,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF;;;GAGG;AACH,MAAM,CAAC,OAAO,OAAO,SAAS,CAAC,CAAC,GAAG,GAAG,EAAE,EAAE,SAAS,MAAM,GAAG,MAAM,GAAG,SAAS,GAAG,IAAI,GAAG,GAAG,CAAE,SAAQ,KAAK,CAAC,SAAS,CACnH,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CACZ;IACA,MAAM;CAoBN"}
1
+ {"version":3,"file":"Reactable.d.ts","sourceRoot":"","sources":["../../../../../src/components/reactable/Reactable.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAI/B,OAAO,EAAC,kBAAkB,EAAE,eAAe,EAAE,uBAAuB,EAAC,MAAM,SAAS,CAAC;AACrF,OAAO,EAAC,QAAQ,EAAE,kBAAkB,EAAE,aAAa,EAAC,MAAM,wBAAwB,CAAC;AAEnF,oBAAY,KAAK,CAAC,CAAC,EAAE,EAAE,SAAS,MAAM,GAAG,MAAM,GAAG,SAAS,GAAG,IAAI,GAAG,GAAG,IAAI;IAC3E,+EAA+E;IAC/E,UAAU,EAAE,KAAK,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC;IAEzC,8DAA8D;IAC9D,aAAa,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,EAAE,CAAC;IAE/B,qCAAqC;IACrC,kBAAkB,EAAE,kBAAkB,CAAC;IAEvC,qDAAqD;IACrD,YAAY,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAErC,4CAA4C;IAC5C,MAAM,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,aAAa,KAAK,IAAI,CAAC;IAE7D,6DAA6D;IAC7D,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAEtC,mEAAmE;IACnE,QAAQ,CAAC,EAAE,CAAC,cAAc,EAAE,uBAAuB,KAAK,IAAI,CAAC;IAE7D,mCAAmC;IACnC,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,6DAA6D;IAC7D,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,IAAI,GAAG,SAAS,CAAC;IAEzC,0EAA0E;IAC1E,MAAM,CAAC,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC;IAE5B,uCAAuC;IACvC,SAAS,EAAE,OAAO,CAAC;IAEnB,+CAA+C;IAC/C,SAAS,CAAC,EAAE,OAAO,CAAC;IAEpB,wDAAwD;IACxD,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAE1B,aAAa,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF;;;GAGG;AACH,MAAM,CAAC,OAAO,OAAO,SAAS,CAAC,CAAC,GAAG,GAAG,EAAE,EAAE,SAAS,MAAM,GAAG,MAAM,GAAG,SAAS,GAAG,IAAI,GAAG,GAAG,CAAE,SAAQ,KAAK,CAAC,SAAS,CACnH,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CACZ;IACA,kBAAkB,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC;IAgB1C,MAAM;CAoBN"}
package/lib/esm/src/components/reactable/Reactable.js CHANGED
@@ -6,6 +6,18 @@ import ReactableTable from './helpers/ReactableTable';
6
6
  * Each column can also be extended to be sortable and/or filterable
7
7
  */
8
8
  export default class Reactable extends React.Component {
9
+ componentDidUpdate(prevProps) {
10
+ const { pageable, paginationSettings, onChangePage } = this.props;
11
+ if (!pageable) {
12
+ return;
13
+ }
14
+ const totalPages = pageable.totalPages || 0;
15
+ const currentPage = paginationSettings.page;
16
+ const clampedPage = totalPages > 0 ? Math.min(currentPage, totalPages - 1) : 0;
17
+ if (currentPage !== clampedPage) {
18
+ onChangePage(clampedPage);
19
+ }
20
+ }
9
21
  render() {
10
22
  const { paginationSettings, pageable, onChangePage, onChangeSize } = this.props;
11
23
  const showPagination = onChangeSize
package/lib/esm/src/components/reactable/helpers/ReactableTableFilterRow.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"ReactableTableFilterRow.d.ts","sourceRoot":"","sources":["../../../../../../src/components/reactable/helpers/ReactableTableFilterRow.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA4B,MAAM,OAAO,CAAC;AAEjD,OAAO,EAAC,kBAAkB,EAAE,uBAAuB,EAAC,MAAM,UAAU,CAAC;AAKrE,aAAK,KAAK,GAAG;IACZ,UAAU,EAAE,KAAK,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC,CAAC;IAC3C,QAAQ,EAAE,CAAC,aAAa,EAAE,uBAAuB,KAAK,IAAI,CAAC;IAC3D,SAAS,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AACF,QAAA,MAAM,uBAAuB,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CAwH5C,CAAC;AAEF,eAAe,uBAAuB,CAAC"}
1
+ {"version":3,"file":"ReactableTableFilterRow.d.ts","sourceRoot":"","sources":["../../../../../../src/components/reactable/helpers/ReactableTableFilterRow.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAoC,MAAM,OAAO,CAAC;AAEzD,OAAO,EAAC,kBAAkB,EAAE,uBAAuB,EAAC,MAAM,UAAU,CAAC;AAKrE,aAAK,KAAK,GAAG;IACZ,UAAU,EAAE,KAAK,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC,CAAC;IAC3C,QAAQ,EAAE,CAAC,aAAa,EAAE,uBAAuB,KAAK,IAAI,CAAC;IAC3D,SAAS,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AACF,QAAA,MAAM,uBAAuB,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CA6H5C,CAAC;AAEF,eAAe,uBAAuB,CAAC"}
package/lib/esm/src/components/reactable/helpers/ReactableTableFilterRow.js CHANGED
@@ -1,4 +1,4 @@
1
- import React, { useEffect, useState } from 'react';
1
+ import React, { useEffect, useRef, useState } from 'react';
2
2
  import { useTranslation } from '../../../i18n';
3
3
  import ReactableTextFilter from './ReactableTextFilter';
4
4
  import { getClassName } from './helper';
@@ -6,11 +6,15 @@ import SelectWithSearch from '../../input/SelectWithSearch';
6
6
  const ReactableTableFilterRow = ({ columnDefs, onFilter, tableName }) => {
7
7
  const { t } = useTranslation();
8
8
  const [state, setState] = useState({});
9
+ const onFilterRef = useRef(onFilter);
10
+ useEffect(() => {
11
+ onFilterRef.current = onFilter;
12
+ }, [onFilter]);
9
13
  useEffect(() => {
10
14
  setState((prev) => {
11
15
  const merged = {};
12
16
  for (const cd of columnDefs) {
13
- merged[cd.name] = prev[cd.name] !== undefined ? prev[cd.name] : cd.filterable?.initialValue ?? '';
17
+ merged[cd.name] = prev[cd.name] !== undefined ? prev[cd.name] : (cd.filterable?.initialValue ?? '');
14
18
  }
15
19
  const prevKeys = Object.keys(prev);
16
20
  const mergedKeys = Object.keys(merged);
@@ -20,11 +24,11 @@ const ReactableTableFilterRow = ({ columnDefs, onFilter, tableName }) => {
20
24
  return prev; // no change
21
25
  }
22
26
  if (Object.values(merged).some((v) => v)) {
23
- onFilter(merged);
27
+ onFilterRef.current(merged);
24
28
  }
25
29
  return merged;
26
30
  });
27
- }, [columnDefs, onFilter]);
31
+ }, [columnDefs]);
28
32
  const changeFilter = (columnName, value) => {
29
33
  const newState = { ...state, [columnName]: value };
30
34
  setState(newState);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@deviceinsight/ng-ui-components",
3
- "version": "6.28.1",
3
+ "version": "6.30.0",
4
4
  "private": false,
5
5
  "license": "SEE LICENSE IN LICENSE",
6
6
  "repository": {
@@ -92,6 +92,7 @@
92
92
  "@testing-library/react": "^13.4.0",
93
93
  "@testing-library/user-event": "14.4.3",
94
94
  "@types/lodash": "4.17.16",
95
+ "@types/minimatch": "^5.1.2",
95
96
  "@types/node": "22.13.13",
96
97
  "@types/react": "18.3.12",
97
98
  "@types/react-datepicker": "4.3.4",