@infinite-table/infinite-react 9.0.0 → 9.0.2

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/index.dev.js +12 -9
  2. package/index.dev.mjs +12 -9
  3. package/index.js +6 -6
  4. package/index.mjs +6 -6
  5. package/package.json +2 -2
package/index.dev.js CHANGED
@@ -6516,9 +6516,12 @@ function getGroupByColumnReference(options) {
6516
6516
  if (column.groupByForColumn) {
6517
6517
  if (rowInfo.isGroupRow) {
6518
6518
  const rowGroupBy = rowInfo.groupBy[rowInfo.groupBy.length - 1];
6519
- groupByColumn = rowGroupBy ? fieldsToColumn.get(
6520
- rowGroupBy.field || rowGroupBy.groupField
6521
- ) : void 0;
6519
+ const isThisColumnGroupLevel = Array.isArray(column.groupByForColumn) || column.groupByForColumn === rowGroupBy;
6520
+ if (isThisColumnGroupLevel) {
6521
+ groupByColumn = rowGroupBy ? fieldsToColumn.get(
6522
+ rowGroupBy.field || rowGroupBy.groupField
6523
+ ) : void 0;
6524
+ }
6522
6525
  }
6523
6526
  if (!groupByColumn && column.field) {
6524
6527
  groupByColumn = fieldsToColumn.get(column.field);
@@ -16259,7 +16262,6 @@ function getPivotColumnsAndColumnGroups({
16259
16262
  pivotGroupKey: keys[keys.length - 1],
16260
16263
  pivotIndex: keys.length - 1,
16261
16264
  pivotByAtIndex: pivotByForColumn,
16262
- defaultSortable: false,
16263
16265
  columnGroup: parentColumnGroupId,
16264
16266
  header,
16265
16267
  valueFormatter: ({ rowInfo }) => {
@@ -16315,7 +16317,6 @@ function getPivotColumnsAndColumnGroups({
16315
16317
  pivotByAtIndex: pivotByForColumn,
16316
16318
  pivotIndex: keys.length - 1,
16317
16319
  pivotBy,
16318
- defaultSortable: false,
16319
16320
  valueFormatter: ({ rowInfo }) => {
16320
16321
  if (!rowInfo.isGroupRow) {
16321
16322
  return null;
@@ -26333,17 +26334,19 @@ function getGroupColumnRender({
26333
26334
  const { rowInfo, renderBag, column, align: align2 } = renderOptions;
26334
26335
  let { value: valueToRender, groupIcon, selectionCheckBox } = renderBag;
26335
26336
  const groupRowInfo = rowInfo;
26337
+ const isNestedGroupRow = groupRenderStrategy === "multi-column" && groupRowInfo.isGroupRow && groupIndexForColumn + 1 !== groupRowInfo.groupNesting;
26336
26338
  const className = join(
26337
26339
  display.flex,
26338
26340
  column.align === "end" ? flexFlow.rowReverse : flexFlow.row,
26339
26341
  alignItems.center,
26340
26342
  `${InfiniteTableColumnCellClassName}Expander`,
26341
- groupRenderStrategy === "single-column" || groupRenderStrategy === "multi-column" && (!rowInfo.isGroupRow || selectionCheckBox) ? GroupRowExpanderCls({ align: align2 }) : null
26343
+ groupRenderStrategy === "single-column" || groupRenderStrategy === "multi-column" && (!rowInfo.isGroupRow || selectionCheckBox || isNestedGroupRow && column.field) ? GroupRowExpanderCls({ align: align2 }) : null
26342
26344
  );
26343
- if (groupRenderStrategy === "multi-column") {
26344
- if (groupIndexForColumn + 1 !== groupRowInfo.groupNesting && groupRowInfo.isGroupRow) {
26345
+ if (isNestedGroupRow) {
26346
+ if (!column.field) {
26345
26347
  return selectionCheckBox ? /* @__PURE__ */ React56.createElement("div", { className }, selectionCheckBox) : null;
26346
26348
  }
26349
+ return /* @__PURE__ */ React56.createElement("div", { className }, selectionCheckBox, /* @__PURE__ */ React56.createElement("div", { className: cssEllipsisClassName }, valueToRender ?? null));
26347
26350
  } else if (groupRenderStrategy === "single-column" && !groupRowInfo.isGroupRow) {
26348
26351
  }
26349
26352
  return /* @__PURE__ */ React56.createElement("div", { className }, groupIcon, selectionCheckBox, /* @__PURE__ */ React56.createElement("div", { className: cssEllipsisClassName }, valueToRender ?? null));
@@ -27623,7 +27626,7 @@ var useLicense = (licenseKey = "") => {
27623
27626
  }
27624
27627
  let valid2 = isValidLicense(licenseKey, {
27625
27628
  publishedAt: 1624970570587,
27626
- version: "9.0.0"
27629
+ version: "9.0.2"
27627
27630
  });
27628
27631
  if (!licenseKey && !valid2 && isInsidePlayground) {
27629
27632
  return true;
package/index.dev.mjs CHANGED
@@ -6443,9 +6443,12 @@ function getGroupByColumnReference(options) {
6443
6443
  if (column.groupByForColumn) {
6444
6444
  if (rowInfo.isGroupRow) {
6445
6445
  const rowGroupBy = rowInfo.groupBy[rowInfo.groupBy.length - 1];
6446
- groupByColumn = rowGroupBy ? fieldsToColumn.get(
6447
- rowGroupBy.field || rowGroupBy.groupField
6448
- ) : void 0;
6446
+ const isThisColumnGroupLevel = Array.isArray(column.groupByForColumn) || column.groupByForColumn === rowGroupBy;
6447
+ if (isThisColumnGroupLevel) {
6448
+ groupByColumn = rowGroupBy ? fieldsToColumn.get(
6449
+ rowGroupBy.field || rowGroupBy.groupField
6450
+ ) : void 0;
6451
+ }
6449
6452
  }
6450
6453
  if (!groupByColumn && column.field) {
6451
6454
  groupByColumn = fieldsToColumn.get(column.field);
@@ -16186,7 +16189,6 @@ function getPivotColumnsAndColumnGroups({
16186
16189
  pivotGroupKey: keys[keys.length - 1],
16187
16190
  pivotIndex: keys.length - 1,
16188
16191
  pivotByAtIndex: pivotByForColumn,
16189
- defaultSortable: false,
16190
16192
  columnGroup: parentColumnGroupId,
16191
16193
  header,
16192
16194
  valueFormatter: ({ rowInfo }) => {
@@ -16242,7 +16244,6 @@ function getPivotColumnsAndColumnGroups({
16242
16244
  pivotByAtIndex: pivotByForColumn,
16243
16245
  pivotIndex: keys.length - 1,
16244
16246
  pivotBy,
16245
- defaultSortable: false,
16246
16247
  valueFormatter: ({ rowInfo }) => {
16247
16248
  if (!rowInfo.isGroupRow) {
16248
16249
  return null;
@@ -26265,17 +26266,19 @@ function getGroupColumnRender({
26265
26266
  const { rowInfo, renderBag, column, align: align2 } = renderOptions;
26266
26267
  let { value: valueToRender, groupIcon, selectionCheckBox } = renderBag;
26267
26268
  const groupRowInfo = rowInfo;
26269
+ const isNestedGroupRow = groupRenderStrategy === "multi-column" && groupRowInfo.isGroupRow && groupIndexForColumn + 1 !== groupRowInfo.groupNesting;
26268
26270
  const className = join(
26269
26271
  display.flex,
26270
26272
  column.align === "end" ? flexFlow.rowReverse : flexFlow.row,
26271
26273
  alignItems.center,
26272
26274
  `${InfiniteTableColumnCellClassName}Expander`,
26273
- groupRenderStrategy === "single-column" || groupRenderStrategy === "multi-column" && (!rowInfo.isGroupRow || selectionCheckBox) ? GroupRowExpanderCls({ align: align2 }) : null
26275
+ groupRenderStrategy === "single-column" || groupRenderStrategy === "multi-column" && (!rowInfo.isGroupRow || selectionCheckBox || isNestedGroupRow && column.field) ? GroupRowExpanderCls({ align: align2 }) : null
26274
26276
  );
26275
- if (groupRenderStrategy === "multi-column") {
26276
- if (groupIndexForColumn + 1 !== groupRowInfo.groupNesting && groupRowInfo.isGroupRow) {
26277
+ if (isNestedGroupRow) {
26278
+ if (!column.field) {
26277
26279
  return selectionCheckBox ? /* @__PURE__ */ React56.createElement("div", { className }, selectionCheckBox) : null;
26278
26280
  }
26281
+ return /* @__PURE__ */ React56.createElement("div", { className }, selectionCheckBox, /* @__PURE__ */ React56.createElement("div", { className: cssEllipsisClassName }, valueToRender ?? null));
26279
26282
  } else if (groupRenderStrategy === "single-column" && !groupRowInfo.isGroupRow) {
26280
26283
  }
26281
26284
  return /* @__PURE__ */ React56.createElement("div", { className }, groupIcon, selectionCheckBox, /* @__PURE__ */ React56.createElement("div", { className: cssEllipsisClassName }, valueToRender ?? null));
@@ -27555,7 +27558,7 @@ var useLicense = (licenseKey = "") => {
27555
27558
  }
27556
27559
  let valid2 = isValidLicense(licenseKey, {
27557
27560
  publishedAt: 1624970570587,
27558
- version: "9.0.0"
27561
+ version: "9.0.2"
27559
27562
  });
27560
27563
  if (!licenseKey && !valid2 && isInsidePlayground) {
27561
27564
  return true;