es-grid-template 1.9.41 → 1.9.42

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 (6) hide show
  1. package/es/group-component/hook/utils.d.ts +3 -3
  2. package/es/table-component/TableContainer.js +1 -1
  3. package/es/table-virtuoso/body/TableBodyRow.js +6 -1
  4. package/lib/table-component/TableContainer.js +1 -1
  5. package/lib/table-virtuoso/body/TableBodyRow.js +6 -1
  6. package/package.json +1 -1
package/es/group-component/hook/utils.d.ts CHANGED
@@ -194,10 +194,10 @@ export declare const fixColumnsLeft: <RecordType>(columns: ColumnTable<RecordTyp
194
194
  value: any;
195
195
  rowData: RecordType;
196
196
  }) => import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>> | import("react").ReactNode);
197
- onCellStyles?: Omit<CSSProperties, "left" | "right" | "display" | "width" | "minWidth" | "position"> | ((cellValue: any, cell: import("@tanstack/react-table").Cell<RecordType, unknown>) => Omit<CSSProperties, "left" | "right" | "display" | "width" | "minWidth" | "position">);
198
- onCellHeaderStyles?: Omit<CSSProperties, "left" | "right" | "display" | "width" | "minWidth" | "position"> | ((cell: import("@tanstack/react-table").Header<RecordType, unknown>) => Omit<CSSProperties, "left" | "right" | "display" | "width" | "minWidth" | "position">);
197
+ onCellStyles?: Omit<CSSProperties, "position" | "display" | "left" | "minWidth" | "right" | "width"> | ((cellValue: any, cell: import("@tanstack/react-table").Cell<RecordType, unknown>) => Omit<CSSProperties, "position" | "display" | "left" | "minWidth" | "right" | "width">);
198
+ onCellHeaderStyles?: Omit<CSSProperties, "position" | "display" | "left" | "minWidth" | "right" | "width"> | ((cell: import("@tanstack/react-table").Header<RecordType, unknown>) => Omit<CSSProperties, "position" | "display" | "left" | "minWidth" | "right" | "width">);
199
199
  onCell?: (rowData: RecordType, index: number) => import("react").TdHTMLAttributes<HTMLTableCellElement>;
200
- onCellFooterStyles?: Omit<CSSProperties, "left" | "right" | "display" | "width" | "minWidth" | "position"> | ((cellValue: any, cell: import("@tanstack/react-table").Header<RecordType, unknown>) => Omit<CSSProperties, "left" | "right" | "display" | "width" | "minWidth" | "position">);
200
+ onCellFooterStyles?: Omit<CSSProperties, "position" | "display" | "left" | "minWidth" | "right" | "width"> | ((cellValue: any, cell: import("@tanstack/react-table").Header<RecordType, unknown>) => Omit<CSSProperties, "position" | "display" | "left" | "minWidth" | "right" | "width">);
201
201
  getValue?: (row: any, rowIndex: number) => any;
202
202
  getCellProps?: (value: any, row: any, rowIndex: number) => import("./../../grid-component/type").CellProps;
203
203
  headerCellProps?: import("./../../grid-component/type").CellProps;
package/es/table-component/TableContainer.js CHANGED
@@ -200,7 +200,7 @@ const TableContainer = props => {
200
200
  if (!toolbarItems) {
201
201
  return undefined;
202
202
  }
203
- return toolbarItems.filter(it => it.position !== 'Bottom' && it.fixedRight !== false);
203
+ return toolbarItems.filter(it => it.position !== 'Bottom' && it.fixedRight !== true);
204
204
  }, [toolbarItems]);
205
205
  const toolbarItemBottom = React.useMemo(() => {
206
206
  if (!toolbarItems) {
package/es/table-virtuoso/body/TableBodyRow.js CHANGED
@@ -83,7 +83,12 @@ const TableBodyRow = ({
83
83
  const firstNonGroupColumn = nonGroupColumns[0];
84
84
 
85
85
  // const colSpan = row.subRows && cell.column.id === firstNonGroupColumn?.id ? (groupSetting?.groupColumnSpan ?? 2)
86
- const colSpanGroup = row.subRows && row.subRows.length > 0 && cell.column.id === firstNonGroupColumn?.column.id ? 2 : row.subRows && nonGroupColumns[1].column.id === cell.column.id ? 0 : 1;
86
+
87
+ // const colSpanGroup = row.subRows && row.subRows.length > 0 && cell.column.id === firstNonGroupColumn?.column.id ? (groupSetting?.groupColumnSpan ?? 2) : (row.subRows && nonGroupColumns[1].column.id === cell.column.id ? 0 : 1)
88
+
89
+ const groupColumnSpan = groupSetting?.groupColumnSpan ?? 2;
90
+ const hiddenGroupColumns = new Set(nonGroupColumns.slice(1, groupColumnSpan).map(col => col.column.id));
91
+ const colSpanGroup = row.subRows?.length > 0 ? cell.column.id === firstNonGroupColumn?.column.id ? groupColumnSpan : hiddenGroupColumns.has(cell.column.id) ? 0 : 1 : 1;
87
92
 
88
93
  // if (row.subRows && row.subRows.length > 0 && colSpanGroup === 0 || onCellRowSpan === 0 || onCellColSpan === 0) {
89
94
  if (row.subRows && row.getCanExpand() && colSpanGroup === 0 || onCellRowSpan === 0 || onCellColSpan === 0) {
package/lib/table-component/TableContainer.js CHANGED
@@ -207,7 +207,7 @@ const TableContainer = props => {
207
207
  if (!toolbarItems) {
208
208
  return undefined;
209
209
  }
210
- return toolbarItems.filter(it => it.position !== 'Bottom' && it.fixedRight !== false);
210
+ return toolbarItems.filter(it => it.position !== 'Bottom' && it.fixedRight !== true);
211
211
  }, [toolbarItems]);
212
212
  const toolbarItemBottom = _react.default.useMemo(() => {
213
213
  if (!toolbarItems) {
package/lib/table-virtuoso/body/TableBodyRow.js CHANGED
@@ -90,7 +90,12 @@ const TableBodyRow = ({
90
90
  const firstNonGroupColumn = nonGroupColumns[0];
91
91
 
92
92
  // const colSpan = row.subRows && cell.column.id === firstNonGroupColumn?.id ? (groupSetting?.groupColumnSpan ?? 2)
93
- const colSpanGroup = row.subRows && row.subRows.length > 0 && cell.column.id === firstNonGroupColumn?.column.id ? 2 : row.subRows && nonGroupColumns[1].column.id === cell.column.id ? 0 : 1;
93
+
94
+ // const colSpanGroup = row.subRows && row.subRows.length > 0 && cell.column.id === firstNonGroupColumn?.column.id ? (groupSetting?.groupColumnSpan ?? 2) : (row.subRows && nonGroupColumns[1].column.id === cell.column.id ? 0 : 1)
95
+
96
+ const groupColumnSpan = groupSetting?.groupColumnSpan ?? 2;
97
+ const hiddenGroupColumns = new Set(nonGroupColumns.slice(1, groupColumnSpan).map(col => col.column.id));
98
+ const colSpanGroup = row.subRows?.length > 0 ? cell.column.id === firstNonGroupColumn?.column.id ? groupColumnSpan : hiddenGroupColumns.has(cell.column.id) ? 0 : 1 : 1;
94
99
 
95
100
  // if (row.subRows && row.subRows.length > 0 && colSpanGroup === 0 || onCellRowSpan === 0 || onCellColSpan === 0) {
96
101
  if (row.subRows && row.getCanExpand() && colSpanGroup === 0 || onCellRowSpan === 0 || onCellColSpan === 0) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "es-grid-template",
3
- "version": "1.9.41",
3
+ "version": "1.9.42",
4
4
  "description": "es-grid-template",
5
5
  "keywords": [
6
6
  "react",