@pega/lists-core 9.0.0-build.9.8 → 9.0.0

package/lib/src/core/features/uIFeatures/beforeRender/customColumn.js

@@ -1,6 +1,9 @@
-import { actionColumnDragDrop, actionColumnToggle, actionUpdateColumnOrder } from '../../../actions/actions';
+import { actionColumnDragDrop, actionColumnToggle, actionUpdateColumnOrder, addColumnIntoVisibility } from '../../../actions/actions';
 import { withMemoization } from '../../../utils/util';
 /* eslint-enable @typescript-eslint/no-unused-vars */
+function isMergeColumnsPayload(payload) {
+    return typeof payload === 'object' && payload !== null && 'uniqueID' in payload;
+}
 const deleteStaleColumns = (getView, customFields) => {
     // deleted custom column from state should also be removed from meta if any.
     getView()
@@ -11,8 +14,8 @@ const deleteStaleColumns = (getView, customFields) => {
             getView().removeColumn(id);
     });
 };
-const addColumn = (getView, customField) => {
-    const primaryFieldDef = getView().meta.fieldDefs.find(f => customField.primaryColumnId === `${f.id}`);
+const addColumn = (getView, getRsStore, customField) => {
+    const primaryFieldDef = getRsStore().getFieldDefById(customField.primaryColumnId);
     const column = {
         isCustomColumn: true,
         formatterAllowed: false,
@@ -33,10 +36,16 @@ const addColumn = (getView, customField) => {
         category: [],
         type: 'custom'
     };
+    /*
+    Updating the fieldDef within the meta mutatively.
+    This will ensure that the fieldDef is added in all places where the meta is referenced(view.meta, rsStore.meta).
+    */
+    getView().meta.fieldDefs.push(field);
     const customColumn = getView().addColumn(field, column);
+    getRsStore().fieldDefsMap.set(customField.id, field);
     return [customColumn, primaryFieldDef];
 };
-const updateCustomColumns = ([{ getView, getState, queuedActions: actions, dispatch }]) => {
+const updateCustomColumns = ([{ getView, getRsStore, getState, queuedActions: actions, dispatch }]) => {
     const state = getState();
     const customFields = state?.customFields || [];
     deleteStaleColumns(getView, customFields);
@@ -44,19 +53,24 @@ const updateCustomColumns = ([{ getView, getState, queuedActions: actions, dispa
         // if column already exist in meta, skip it otherwise add a new
         const column = getView().columns?.find(c => c.isCustomColumn && customField.id === c.field.id);
         if (!column) {
-            const [customColumn, primaryFieldDef] = addColumn(getView, customField);
+            const [customColumn, primaryFieldDef] = addColumn(getView, getRsStore, customField);
             if (!state?.colOrder?.includes(customColumn.field.id)) {
                 dispatch(actionUpdateColumnOrder([customColumn.field.id]));
                 dispatch(actionColumnDragDrop(customColumn.field.id, primaryFieldDef.id));
             }
         }
     });
-    if ('payload' in actions[0] && actions[0].payload.hideColumns) {
-        dispatch(actionColumnToggle(actions[0].payload.hideColumns));
+    // Add newly created customColumn into visibleColumns
+    const action = actions[0];
+    if ('payload' in action && isMergeColumnsPayload(action.payload)) {
+        dispatch(addColumnIntoVisibility(action.payload.uniqueID));
+    }
+    if ('payload' in action && isMergeColumnsPayload(action.payload) && action.payload.hideColumns) {
+        dispatch(actionColumnToggle(action.payload.hideColumns));
     }
 };
 /**
- * Adds the custom column in current set of{@link View.columns columns} and updates the {@link State.colOrder}, {@link State.hiddenColumns} with {@link State.customFields customFields} information when following properties are changed:
+ * Adds the custom column in current set of{@link View.columns columns} and updates the {@link State.colOrder}, {@link State.visibleColumns} with {@link State.customFields customFields} information when following properties are changed:
  * - {@link State.customFields}
  * - `active` in {@link State.personalization}
  */

package/lib/src/core/features/uIFeatures/beforeRender/customColumn.js.map

@@ -1 +1 @@
-{"version":3,"file":"customColumn.js","sourceRoot":"","sources":["../../../../../../src/core/features/uIFeatures/beforeRender/customColumn.ts"],"names":[],"mappings":"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","sourcesContent":["import type { FieldDef } from '../../../../../types/Meta.types';\nimport {\n  actionColumnDragDrop,\n  actionColumnToggle,\n  actionUpdateColumnOrder\n} from '../../../actions/actions';\nimport type { MergeColumnsPayload } from '../../../actions/actions.types';\nimport type Column from '../../../generators/ColumnGenerator';\nimport { withMemoization } from '../../../utils/util';\nimport type { BeforeRenderFeatureProps } from '../../featureFactory';\n/* eslint-disable @typescript-eslint/no-unused-vars */\nimport type View from '../../../generators/ViewGenerator';\nimport type { CustomField, State } from '../../../../../types/State.types';\n/* eslint-enable @typescript-eslint/no-unused-vars */\n\nconst deleteStaleColumns = (\n  getView: BeforeRenderFeatureProps['getView'],\n  customFields: CustomField[]\n): void => {\n  // deleted custom column from state should also be removed from meta if any.\n  getView()\n    .columns?.filter(c => c.isCustomColumn)\n    .forEach(({ field: { id } }) => {\n      const isStaleColumn = customFields.every(customField => customField.id !== id);\n      if (isStaleColumn) getView().removeColumn(id);\n    });\n};\n\nconst addColumn = (\n  getView: BeforeRenderFeatureProps['getView'],\n  customField: CustomField\n): [Column, FieldDef] => {\n  const primaryFieldDef = getView().meta.fieldDefs.find(\n    f => customField.primaryColumnId === `${f.id}`\n  );\n  const column = {\n    isCustomColumn: true,\n    formatterAllowed: false,\n    label: customField.label,\n    cellRenderer: getView().meta.customFieldRenderer || 'customCellRenderer',\n    headerCellRenderer: getView().meta.customHeaderRenderer || 'headerCellRenderer'\n  };\n  const { idHash, width, ...restOfFieldDef } =\n    primaryFieldDef!; /* BUG-680257: Do not copy idHash from primaryFieldDef. It is generated in view.addColumn */\n  const field: FieldDef = {\n    ...restOfFieldDef,\n    grouping: false,\n    filter: false,\n    resize: true,\n    sort: false,\n    aggregation: false,\n    id: customField.id,\n    label: customField.label,\n    category: [],\n    type: 'custom'\n  };\n\n  const customColumn = getView().addColumn(field, column);\n  return [customColumn, primaryFieldDef!];\n};\n\nconst updateCustomColumns = ([{ getView, getState, queuedActions: actions, dispatch }]: [\n  featureProps: BeforeRenderFeatureProps\n]): void => {\n  const state = getState();\n  const customFields = state?.customFields || [];\n  deleteStaleColumns(getView, customFields);\n\n  customFields.forEach(customField => {\n    // if column already exist in meta, skip it otherwise add a new\n    const column = getView().columns?.find(c => c.isCustomColumn && customField.id === c.field.id);\n    if (!column) {\n      const [customColumn, primaryFieldDef] = addColumn(getView, customField);\n      if (!state?.colOrder?.includes(customColumn.field.id)) {\n        dispatch(actionUpdateColumnOrder([customColumn.field.id]));\n        dispatch(actionColumnDragDrop(customColumn.field.id, primaryFieldDef.id));\n      }\n    }\n  });\n  if ('payload' in actions[0] && (actions[0].payload as MergeColumnsPayload).hideColumns) {\n    dispatch(actionColumnToggle((actions[0].payload as MergeColumnsPayload).hideColumns!));\n  }\n};\n\n/**\n * Adds the custom column in current set of{@link View.columns columns} and updates the {@link State.colOrder}, {@link State.hiddenColumns} with {@link State.customFields customFields} information when following properties are changed:\n * - {@link State.customFields}\n * - `active` in {@link State.personalization}\n */\nexport default () => {\n  const memoizedUpdateCustomColumns = withMemoization(updateCustomColumns);\n\n  return function execute(featureProps: BeforeRenderFeatureProps) {\n    const state = featureProps.getState();\n    memoizedUpdateCustomColumns(\n      [featureProps],\n      [state.customFields, state?.personalization?.active]\n    );\n  };\n};\n"]}
+{"version":3,"file":"customColumn.js","sourceRoot":"","sources":["../../../../../../src/core/features/uIFeatures/beforeRender/customColumn.ts"],"names":[],"mappings":"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","sourcesContent":["import type { FieldDef } from '../../../../../types/Meta.types';\nimport {\n  actionColumnDragDrop,\n  actionColumnToggle,\n  actionUpdateColumnOrder,\n  addColumnIntoVisibility\n} from '../../../actions/actions';\nimport type { MergeColumnsPayload } from '../../../actions/actions.types';\nimport type Column from '../../../generators/ColumnGenerator';\nimport { withMemoization } from '../../../utils/util';\nimport type { BeforeRenderFeatureProps } from '../../featureFactory';\n/* eslint-disable @typescript-eslint/no-unused-vars */\nimport type View from '../../../generators/ViewGenerator';\nimport type { CustomField, State } from '../../../../../types/State.types';\n/* eslint-enable @typescript-eslint/no-unused-vars */\n\nfunction isMergeColumnsPayload(payload: unknown): payload is MergeColumnsPayload {\n  return typeof payload === 'object' && payload !== null && 'uniqueID' in payload;\n}\n\nconst deleteStaleColumns = (\n  getView: BeforeRenderFeatureProps['getView'],\n  customFields: CustomField[]\n): void => {\n  // deleted custom column from state should also be removed from meta if any.\n  getView()\n    .columns?.filter(c => c.isCustomColumn)\n    .forEach(({ field: { id } }) => {\n      const isStaleColumn = customFields.every(customField => customField.id !== id);\n      if (isStaleColumn) getView().removeColumn(id);\n    });\n};\n\nconst addColumn = (\n  getView: BeforeRenderFeatureProps['getView'],\n  getRsStore: BeforeRenderFeatureProps['getRsStore'],\n  customField: CustomField\n): [Column, FieldDef] => {\n  const primaryFieldDef = getRsStore().getFieldDefById(customField.primaryColumnId);\n  const column = {\n    isCustomColumn: true,\n    formatterAllowed: false,\n    label: customField.label,\n    cellRenderer: getView().meta.customFieldRenderer || 'customCellRenderer',\n    headerCellRenderer: getView().meta.customHeaderRenderer || 'headerCellRenderer'\n  };\n  const { idHash, width, ...restOfFieldDef } =\n    primaryFieldDef!; /* BUG-680257: Do not copy idHash from primaryFieldDef. It is generated in view.addColumn */\n  const field: FieldDef = {\n    ...restOfFieldDef,\n    grouping: false,\n    filter: false,\n    resize: true,\n    sort: false,\n    aggregation: false,\n    id: customField.id,\n    label: customField.label,\n    category: [],\n    type: 'custom'\n  };\n\n  /*\n  Updating the fieldDef within the meta mutatively.\n  This will ensure that the fieldDef is added in all places where the meta is referenced(view.meta, rsStore.meta).\n  */\n  getView().meta.fieldDefs.push(field);\n  const customColumn = getView().addColumn(field, column);\n\n  getRsStore().fieldDefsMap.set(customField.id, field);\n  return [customColumn, primaryFieldDef!];\n};\n\nconst updateCustomColumns = ([\n  { getView, getRsStore, getState, queuedActions: actions, dispatch }\n]: [featureProps: BeforeRenderFeatureProps]): void => {\n  const state = getState();\n  const customFields = state?.customFields || [];\n  deleteStaleColumns(getView, customFields);\n\n  customFields.forEach(customField => {\n    // if column already exist in meta, skip it otherwise add a new\n    const column = getView().columns?.find(c => c.isCustomColumn && customField.id === c.field.id);\n    if (!column) {\n      const [customColumn, primaryFieldDef] = addColumn(getView, getRsStore, customField);\n      if (!state?.colOrder?.includes(customColumn.field.id)) {\n        dispatch(actionUpdateColumnOrder([customColumn.field.id]));\n        dispatch(actionColumnDragDrop(customColumn.field.id, primaryFieldDef.id));\n      }\n    }\n  });\n\n  // Add newly created customColumn into visibleColumns\n  const action = actions[0];\n  if ('payload' in action && isMergeColumnsPayload(action.payload)) {\n    dispatch(addColumnIntoVisibility(action.payload.uniqueID));\n  }\n\n  if ('payload' in action && isMergeColumnsPayload(action.payload) && action.payload.hideColumns) {\n    dispatch(actionColumnToggle(action.payload.hideColumns));\n  }\n};\n\n/**\n * Adds the custom column in current set of{@link View.columns columns} and updates the {@link State.colOrder}, {@link State.visibleColumns} with {@link State.customFields customFields} information when following properties are changed:\n * - {@link State.customFields}\n * - `active` in {@link State.personalization}\n */\nexport default () => {\n  const memoizedUpdateCustomColumns = withMemoization(updateCustomColumns);\n\n  return function execute(featureProps: BeforeRenderFeatureProps) {\n    const state = featureProps.getState();\n    memoizedUpdateCustomColumns(\n      [featureProps],\n      [state.customFields, state?.personalization?.active]\n    );\n  };\n};\n"]}

package/lib/src/core/features/uIFeatures/beforeRender/errorColumn.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"errorColumn.d.ts","sourceRoot":"","sources":["../../../../../../src/core/features/uIFeatures/beforeRender/errorColumn.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AAmBrE;;;;GAIG;+BAGuB,cAAc,wBAAwB;AAFhE,wBAOE"}
+{"version":3,"file":"errorColumn.d.ts","sourceRoot":"","sources":["../../../../../../src/core/features/uIFeatures/beforeRender/errorColumn.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AAsBrE;;;;GAIG;+BAGuB,cAAc,wBAAwB;AAFhE,wBAOE"}

package/lib/src/core/features/uIFeatures/beforeRender/errorColumn.js

@@ -1,13 +1,16 @@
 import { withMemoization } from '../../../utils/util';
 import { rowErrorColumnMeta } from '../../../constants';
 function toggleErrorColumnVisibility([{ getView, getState }]) {
-    const { hiddenColumns, errors } = getState();
-    const errorCol = getView().columns?.find(c => c.field.name === rowErrorColumnMeta.field.name);
+    const { visibleColumns, errors } = getState();
     const hasDataErrors = errors?.dataErrors && !!Object.keys(errors.dataErrors).length;
-    const isErrorColumnHidden = hiddenColumns?.includes(rowErrorColumnMeta.field.id);
-    // hiddenColumns can be undefined if not hydrated, so do exact check of false.
-    if ((isErrorColumnHidden && hasDataErrors) || (isErrorColumnHidden === false && !hasDataErrors)) {
-        errorCol?.applyToggleVisibility();
+    const isErrorColumnVisible = visibleColumns?.includes(rowErrorColumnMeta.field.id);
+    if (!isErrorColumnVisible && hasDataErrors) {
+        // Show error column: errors exist but column is not visible.
+        getView().type.updateColumnsVisibility({ [rowErrorColumnMeta.field.id]: true });
+    }
+    else if (isErrorColumnVisible && !hasDataErrors) {
+        // Hide error column: no errors but column is still visible.
+        getView().type.updateColumnsVisibility({ [rowErrorColumnMeta.field.id]: false });
     }
 }
 /**

package/lib/src/core/features/uIFeatures/beforeRender/errorColumn.js.map

@@ -1 +1 @@
-{"version":3,"file":"errorColumn.js","sourceRoot":"","sources":["../../../../../../src/core/features/uIFeatures/beforeRender/errorColumn.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAOxD,SAAS,2BAA2B,CAAC,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,CAE1D;IACC,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,GAAG,QAAQ,EAAE,CAAC;IAC7C,MAAM,QAAQ,GAAG,OAAO,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,KAAK,kBAAkB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC9F,MAAM,aAAa,GAAG,MAAM,EAAE,UAAU,IAAI,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC;IACpF,MAAM,mBAAmB,GAAG,aAAa,EAAE,QAAQ,CAAC,kBAAkB,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IACjF,8EAA8E;IAC9E,IAAI,CAAC,mBAAmB,IAAI,aAAa,CAAC,IAAI,CAAC,mBAAmB,KAAK,KAAK,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC;QAChG,QAAQ,EAAE,qBAAqB,EAAE,CAAC;IACpC,CAAC;AACH,CAAC;AAED;;;;GAIG;AACH,eAAe,GAAG,EAAE;IAClB,MAAM,mCAAmC,GAAG,eAAe,CAAC,2BAA2B,CAAC,CAAC;IACzF,OAAO,SAAS,OAAO,CAAC,YAAsC;QAC5D,MAAM,MAAM,GAAG,YAAY,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC;QAC9C,MAAM,YAAY,GAAG,CAAC,CAAC,CAAC,MAAM,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,CAAC;QACzE,mCAAmC,CAAC,CAAC,YAAY,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC;IACtE,CAAC,CAAC;AACJ,CAAC,CAAC","sourcesContent":["import { withMemoization } from '../../../utils/util';\nimport { rowErrorColumnMeta } from '../../../constants';\nimport type { BeforeRenderFeatureProps } from '../../featureFactory';\n/* eslint-disable @typescript-eslint/no-unused-vars */\nimport type View from '../../../generators/ViewGenerator';\nimport type { State } from '../../../../../types/State.types';\nimport type { Meta } from '../../../../../types/Meta.types';\n\nfunction toggleErrorColumnVisibility([{ getView, getState }]: [\n  featureProps: BeforeRenderFeatureProps\n]) {\n  const { hiddenColumns, errors } = getState();\n  const errorCol = getView().columns?.find(c => c.field.name === rowErrorColumnMeta.field.name);\n  const hasDataErrors = errors?.dataErrors && !!Object.keys(errors.dataErrors).length;\n  const isErrorColumnHidden = hiddenColumns?.includes(rowErrorColumnMeta.field.id);\n  // hiddenColumns can be undefined if not hydrated, so do exact check of false.\n  if ((isErrorColumnHidden && hasDataErrors) || (isErrorColumnHidden === false && !hasDataErrors)) {\n    errorCol?.applyToggleVisibility();\n  }\n}\n\n/**\n *\n * Adds `error column` in the view {@link View.columns columns} when {@link Meta.showErrorField showErrorField} is set in `Meta`.\n * It also toggles error column visibility when {@link State.errors} is changed.\n */\nexport default () => {\n  const memoizedToggleErrorColumnVisibility = withMemoization(toggleErrorColumnVisibility);\n  return function execute(featureProps: BeforeRenderFeatureProps) {\n    const errors = featureProps.getState().errors;\n    const haDataErrors = !!(errors && Object.keys(errors.dataErrors).length);\n    memoizedToggleErrorColumnVisibility([featureProps], [haDataErrors]);\n  };\n};\n"]}
+{"version":3,"file":"errorColumn.js","sourceRoot":"","sources":["../../../../../../src/core/features/uIFeatures/beforeRender/errorColumn.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAOxD,SAAS,2BAA2B,CAAC,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,CAE1D;IACC,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,GAAG,QAAQ,EAAE,CAAC;IAC9C,MAAM,aAAa,GAAG,MAAM,EAAE,UAAU,IAAI,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC;IACpF,MAAM,oBAAoB,GAAG,cAAc,EAAE,QAAQ,CAAC,kBAAkB,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IAEnF,IAAI,CAAC,oBAAoB,IAAI,aAAa,EAAE,CAAC;QAC3C,6DAA6D;QAC7D,OAAO,EAAE,CAAC,IAAI,CAAC,uBAAuB,CAAC,EAAE,CAAC,kBAAkB,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;IAClF,CAAC;SAAM,IAAI,oBAAoB,IAAI,CAAC,aAAa,EAAE,CAAC;QAClD,4DAA4D;QAC5D,OAAO,EAAE,CAAC,IAAI,CAAC,uBAAuB,CAAC,EAAE,CAAC,kBAAkB,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;IACnF,CAAC;AACH,CAAC;AAED;;;;GAIG;AACH,eAAe,GAAG,EAAE;IAClB,MAAM,mCAAmC,GAAG,eAAe,CAAC,2BAA2B,CAAC,CAAC;IACzF,OAAO,SAAS,OAAO,CAAC,YAAsC;QAC5D,MAAM,MAAM,GAAG,YAAY,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC;QAC9C,MAAM,YAAY,GAAG,CAAC,CAAC,CAAC,MAAM,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,CAAC;QACzE,mCAAmC,CAAC,CAAC,YAAY,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC;IACtE,CAAC,CAAC;AACJ,CAAC,CAAC","sourcesContent":["import { withMemoization } from '../../../utils/util';\nimport { rowErrorColumnMeta } from '../../../constants';\nimport type { BeforeRenderFeatureProps } from '../../featureFactory';\n/* eslint-disable @typescript-eslint/no-unused-vars */\nimport type View from '../../../generators/ViewGenerator';\nimport type { State } from '../../../../../types/State.types';\nimport type { Meta } from '../../../../../types/Meta.types';\n\nfunction toggleErrorColumnVisibility([{ getView, getState }]: [\n  featureProps: BeforeRenderFeatureProps\n]) {\n  const { visibleColumns, errors } = getState();\n  const hasDataErrors = errors?.dataErrors && !!Object.keys(errors.dataErrors).length;\n  const isErrorColumnVisible = visibleColumns?.includes(rowErrorColumnMeta.field.id);\n\n  if (!isErrorColumnVisible && hasDataErrors) {\n    // Show error column: errors exist but column is not visible.\n    getView().type.updateColumnsVisibility({ [rowErrorColumnMeta.field.id]: true });\n  } else if (isErrorColumnVisible && !hasDataErrors) {\n    // Hide error column: no errors but column is still visible.\n    getView().type.updateColumnsVisibility({ [rowErrorColumnMeta.field.id]: false });\n  }\n}\n\n/**\n *\n * Adds `error column` in the view {@link View.columns columns} when {@link Meta.showErrorField showErrorField} is set in `Meta`.\n * It also toggles error column visibility when {@link State.errors} is changed.\n */\nexport default () => {\n  const memoizedToggleErrorColumnVisibility = withMemoization(toggleErrorColumnVisibility);\n  return function execute(featureProps: BeforeRenderFeatureProps) {\n    const errors = featureProps.getState().errors;\n    const haDataErrors = !!(errors && Object.keys(errors.dataErrors).length);\n    memoizedToggleErrorColumnVisibility([featureProps], [haDataErrors]);\n  };\n};\n"]}

package/lib/src/core/features/uIFeatures/beforeRender/filter.d.ts

@@ -2,6 +2,7 @@ import type { BeforeRenderFeatureProps } from '../../featureFactory';
 /**
  * Sets {@link View.isFilterApplied isFilterApplied} property in the view and {@link Column.filtered filtered}, {@link Column.refresh refresh} properties in the column when any of the following state properties are changed:
  * - {@link State.filterExpression}
+ * - {@link state.visibleColumns}
  * - `query` in {@link State.search}
  * - `active` in {@link State.personalization}
  */

package/lib/src/core/features/uIFeatures/beforeRender/filter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"filter.d.ts","sourceRoot":"","sources":["../../../../../../src/core/features/uIFeatures/beforeRender/filter.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AAkCrE;;;;;GAKG;+BAIuB,cAAc,wBAAwB;AAHhE,wBAUE"}
+{"version":3,"file":"filter.d.ts","sourceRoot":"","sources":["../../../../../../src/core/features/uIFeatures/beforeRender/filter.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AAuCrE;;;;;;GAMG;+BAIuB,cAAc,wBAAwB;AAHhE,wBAeE"}

package/lib/src/core/features/uIFeatures/beforeRender/filter.js

@@ -5,13 +5,17 @@ const onFilter = ([{ getView, getState }]) => {
     const filteredFields = filterExpression ? getFilters({ filterExpression }) : [];
     const isFilterApplied = !!((filteredFields && filteredFields.length) ||
         (search?.query && search.query.trim().length));
+    // Compare new search query with previous searchText to detect search change
+    const prevSearchText = getView().state.searchText;
+    const newSearchQuery = search?.query ?? '';
+    const isSearchChanged = newSearchQuery !== prevSearchText;
     getView().columns?.forEach(column => {
         const filtered = !!(filterExpression && getFilters({ filterExpression }).includes(column.field.name));
         column = column.setProp({
             filtered
         });
-        // For search to reflect in cells using highlighter, new columns should be generated for all the search based fields(i.e. 'text' type columns)
-        if (search?.fields?.includes(column.field.name)) {
+        // For search to reflect in cells using highlighter, refresh searchable columns when search query changes
+        if (isSearchChanged && column.field.searchable) {
             column = column.setProp({
                 refresh: Date.now()
             });
@@ -23,6 +27,7 @@ const onFilter = ([{ getView, getState }]) => {
 /**
  * Sets {@link View.isFilterApplied isFilterApplied} property in the view and {@link Column.filtered filtered}, {@link Column.refresh refresh} properties in the column when any of the following state properties are changed:
  * - {@link State.filterExpression}
+ * - {@link state.visibleColumns}
  * - `query` in {@link State.search}
  * - `active` in {@link State.personalization}
  */
@@ -30,7 +35,12 @@ export default () => {
     const memoizedOnFilter = withMemoization(onFilter);
     return function execute(featureProps) {
         const state = featureProps.getState();
-        memoizedOnFilter([featureProps], [state.filterExpression, state.search?.query, state?.personalization?.active]);
+        memoizedOnFilter([featureProps], [
+            state.filterExpression,
+            state.search?.query,
+            state?.personalization?.active,
+            state.visibleColumns
+        ]);
     };
 };
 //# sourceMappingURL=filter.js.map

package/lib/src/core/features/uIFeatures/beforeRender/filter.js.map

@@ -1 +1 @@
-{"version":3,"file":"filter.js","sourceRoot":"","sources":["../../../../../../src/core/features/uIFeatures/beforeRender/filter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAMlE,qDAAqD;AAErD,MAAM,QAAQ,GAAG,CAAC,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,CAA2C,EAAE,EAAE;IACrF,MAAM,EAAE,gBAAgB,EAAE,MAAM,EAAE,GAAG,QAAQ,EAAE,CAAC;IAChD,MAAM,cAAc,GAAG,gBAAgB,CAAC,CAAC,CAAC,UAAU,CAAC,EAAE,gBAAgB,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAChF,MAAM,eAAe,GAAG,CAAC,CAAC,CACxB,CAAC,cAAc,IAAI,cAAc,CAAC,MAAM,CAAC;QACzC,CAAC,MAAM,EAAE,KAAK,IAAI,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,MAAM,CAAC,CAC9C,CAAC;IAEF,OAAO,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,EAAE;QAClC,MAAM,QAAQ,GAAG,CAAC,CAAC,CACjB,gBAAgB,IAAI,UAAU,CAAC,EAAE,gBAAgB,EAAE,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CACjF,CAAC;QACF,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC;YACtB,QAAQ;SACT,CAAC,CAAC;QACH,8IAA8I;QAC9I,IAAI,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;YAChD,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC;gBACtB,OAAO,EAAE,IAAI,CAAC,GAAG,EAAE;aACpB,CAAC,CAAC;QACL,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,8BAA8B;IAC9B,OAAO,EAAE,CAAC,OAAO,CAAC,iBAAiB,EAAE,eAAe,CAAC,CAAC;AACxD,CAAC,CAAC;AAEF;;;;;GAKG;AACH,eAAe,GAAG,EAAE;IAClB,MAAM,gBAAgB,GAAG,eAAe,CAAC,QAAQ,CAAC,CAAC;IAEnD,OAAO,SAAS,OAAO,CAAC,YAAsC;QAC5D,MAAM,KAAK,GAAG,YAAY,CAAC,QAAQ,EAAE,CAAC;QACtC,gBAAgB,CACd,CAAC,YAAY,CAAC,EACd,CAAC,KAAK,CAAC,gBAAgB,EAAE,KAAK,CAAC,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,eAAe,EAAE,MAAM,CAAC,CAC9E,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC,CAAC","sourcesContent":["import { withMemoization, getFilters } from '../../../utils/util';\nimport type { BeforeRenderFeatureProps } from '../../featureFactory';\n/* eslint-disable @typescript-eslint/no-unused-vars */\nimport type View from '../../../generators/ViewGenerator';\nimport type { State } from '../../../../../types/State.types';\nimport type Column from '../../../generators/ColumnGenerator';\n/* eslint-enable @typescript-eslint/no-unused-vars */\n\nconst onFilter = ([{ getView, getState }]: [featureProps: BeforeRenderFeatureProps]) => {\n  const { filterExpression, search } = getState();\n  const filteredFields = filterExpression ? getFilters({ filterExpression }) : [];\n  const isFilterApplied = !!(\n    (filteredFields && filteredFields.length) ||\n    (search?.query && search.query.trim().length)\n  );\n\n  getView().columns?.forEach(column => {\n    const filtered = !!(\n      filterExpression && getFilters({ filterExpression }).includes(column.field.name)\n    );\n    column = column.setProp({\n      filtered\n    });\n    // For search to reflect in cells using highlighter, new columns should be generated for all the search based fields(i.e. 'text' type columns)\n    if (search?.fields?.includes(column.field.name)) {\n      column = column.setProp({\n        refresh: Date.now()\n      });\n    }\n  });\n\n  // global level filter applied\n  getView().setProp('isFilterApplied', isFilterApplied);\n};\n\n/**\n * Sets {@link View.isFilterApplied isFilterApplied} property in the view and {@link Column.filtered filtered}, {@link Column.refresh refresh} properties in the column when any of the following state properties are changed:\n * - {@link State.filterExpression}\n * - `query` in {@link State.search}\n * - `active` in {@link State.personalization}\n */\nexport default () => {\n  const memoizedOnFilter = withMemoization(onFilter);\n\n  return function execute(featureProps: BeforeRenderFeatureProps) {\n    const state = featureProps.getState();\n    memoizedOnFilter(\n      [featureProps],\n      [state.filterExpression, state.search?.query, state?.personalization?.active]\n    );\n  };\n};\n"]}
+{"version":3,"file":"filter.js","sourceRoot":"","sources":["../../../../../../src/core/features/uIFeatures/beforeRender/filter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAMlE,qDAAqD;AAErD,MAAM,QAAQ,GAAG,CAAC,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,CAA2C,EAAE,EAAE;IACrF,MAAM,EAAE,gBAAgB,EAAE,MAAM,EAAE,GAAG,QAAQ,EAAE,CAAC;IAChD,MAAM,cAAc,GAAG,gBAAgB,CAAC,CAAC,CAAC,UAAU,CAAC,EAAE,gBAAgB,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAChF,MAAM,eAAe,GAAG,CAAC,CAAC,CACxB,CAAC,cAAc,IAAI,cAAc,CAAC,MAAM,CAAC;QACzC,CAAC,MAAM,EAAE,KAAK,IAAI,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,MAAM,CAAC,CAC9C,CAAC;IAEF,4EAA4E;IAC5E,MAAM,cAAc,GAAG,OAAO,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC;IAClD,MAAM,cAAc,GAAG,MAAM,EAAE,KAAK,IAAI,EAAE,CAAC;IAC3C,MAAM,eAAe,GAAG,cAAc,KAAK,cAAc,CAAC;IAE1D,OAAO,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,EAAE;QAClC,MAAM,QAAQ,GAAG,CAAC,CAAC,CACjB,gBAAgB,IAAI,UAAU,CAAC,EAAE,gBAAgB,EAAE,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CACjF,CAAC;QACF,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC;YACtB,QAAQ;SACT,CAAC,CAAC;QACH,yGAAyG;QACzG,IAAI,eAAe,IAAI,MAAM,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC;YAC/C,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC;gBACtB,OAAO,EAAE,IAAI,CAAC,GAAG,EAAE;aACpB,CAAC,CAAC;QACL,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,8BAA8B;IAC9B,OAAO,EAAE,CAAC,OAAO,CAAC,iBAAiB,EAAE,eAAe,CAAC,CAAC;AACxD,CAAC,CAAC;AAEF;;;;;;GAMG;AACH,eAAe,GAAG,EAAE;IAClB,MAAM,gBAAgB,GAAG,eAAe,CAAC,QAAQ,CAAC,CAAC;IAEnD,OAAO,SAAS,OAAO,CAAC,YAAsC;QAC5D,MAAM,KAAK,GAAG,YAAY,CAAC,QAAQ,EAAE,CAAC;QACtC,gBAAgB,CACd,CAAC,YAAY,CAAC,EACd;YACE,KAAK,CAAC,gBAAgB;YACtB,KAAK,CAAC,MAAM,EAAE,KAAK;YACnB,KAAK,EAAE,eAAe,EAAE,MAAM;YAC9B,KAAK,CAAC,cAAc;SACrB,CACF,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC,CAAC","sourcesContent":["import { withMemoization, getFilters } from '../../../utils/util';\nimport type { BeforeRenderFeatureProps } from '../../featureFactory';\n/* eslint-disable @typescript-eslint/no-unused-vars */\nimport type View from '../../../generators/ViewGenerator';\nimport type { State } from '../../../../../types/State.types';\nimport type Column from '../../../generators/ColumnGenerator';\n/* eslint-enable @typescript-eslint/no-unused-vars */\n\nconst onFilter = ([{ getView, getState }]: [featureProps: BeforeRenderFeatureProps]) => {\n  const { filterExpression, search } = getState();\n  const filteredFields = filterExpression ? getFilters({ filterExpression }) : [];\n  const isFilterApplied = !!(\n    (filteredFields && filteredFields.length) ||\n    (search?.query && search.query.trim().length)\n  );\n\n  // Compare new search query with previous searchText to detect search change\n  const prevSearchText = getView().state.searchText;\n  const newSearchQuery = search?.query ?? '';\n  const isSearchChanged = newSearchQuery !== prevSearchText;\n\n  getView().columns?.forEach(column => {\n    const filtered = !!(\n      filterExpression && getFilters({ filterExpression }).includes(column.field.name)\n    );\n    column = column.setProp({\n      filtered\n    });\n    // For search to reflect in cells using highlighter, refresh searchable columns when search query changes\n    if (isSearchChanged && column.field.searchable) {\n      column = column.setProp({\n        refresh: Date.now()\n      });\n    }\n  });\n\n  // global level filter applied\n  getView().setProp('isFilterApplied', isFilterApplied);\n};\n\n/**\n * Sets {@link View.isFilterApplied isFilterApplied} property in the view and {@link Column.filtered filtered}, {@link Column.refresh refresh} properties in the column when any of the following state properties are changed:\n * - {@link State.filterExpression}\n * - {@link state.visibleColumns}\n * - `query` in {@link State.search}\n * - `active` in {@link State.personalization}\n */\nexport default () => {\n  const memoizedOnFilter = withMemoization(onFilter);\n\n  return function execute(featureProps: BeforeRenderFeatureProps) {\n    const state = featureProps.getState();\n    memoizedOnFilter(\n      [featureProps],\n      [\n        state.filterExpression,\n        state.search?.query,\n        state?.personalization?.active,\n        state.visibleColumns\n      ]\n    );\n  };\n};\n"]}

package/lib/src/core/features/uIFeatures/beforeRender/freeze.d.ts

@@ -1,11 +1,11 @@
 import type { State } from '../../../../../types/State.types';
 import type View from '../../../generators/ViewGenerator';
 import type { BeforeRenderFeatureProps } from '../../featureFactory';
-export declare const calculateFieldLeft: (colId: string, columns: View["columns"], freezeColumns?: State["freezeColumns"], hiddenColumns?: State["hiddenColumns"], columnWidths?: State["columnWidths"]) => number;
+export declare const calculateFieldLeft: (colId: string, columns: View["columns"], freezeColumns?: State["freezeColumns"], visibleColumns?: State["visibleColumns"], columnWidths?: State["columnWidths"]) => number;
 /**
  * Calculates `left` position, {@link Column.frozen frozen}, {@link Column.lastFrozen lastFrozen} properties of each column and `left` position of {@link View.freezeLine} when any of the following properties are changed:
  * - {@link State.freezeColumns}
- * - {@link State.hiddenColumns}
+ * - {@link State.visibleColumns}
  * - {@link State.columnWidths}
  * - `active` in {@link State.personalization}
  */

package/lib/src/core/features/uIFeatures/beforeRender/freeze.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"freeze.d.ts","sourceRoot":"","sources":["../../../../../../src/core/features/uIFeatures/beforeRender/freeze.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,kCAAkC,CAAC;AAC9D,OAAO,KAAK,IAAI,MAAM,mCAAmC,CAAC;AAE1D,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AAIrE,eAAO,MAAM,kBAAkB,GAC7B,OAAO,MAAM,EACb,SAAS,IAAI,CAAC,SAAS,CAAC,EACxB,gBAAe,KAAK,CAAC,eAAe,CAAM,EAC1C,gBAAe,KAAK,CAAC,eAAe,CAAM,EAC1C,eAAc,KAAK,CAAC,cAAc,CAAM,WAiBzC,CAAC;AA8CF;;;;;;GAMG;+BAGuB,cAAc,wBAAwB;AAFhE,wBASE"}
+{"version":3,"file":"freeze.d.ts","sourceRoot":"","sources":["../../../../../../src/core/features/uIFeatures/beforeRender/freeze.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,kCAAkC,CAAC;AAC9D,OAAO,KAAK,IAAI,MAAM,mCAAmC,CAAC;AAE1D,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AAIrE,eAAO,MAAM,kBAAkB,GAC7B,OAAO,MAAM,EACb,SAAS,IAAI,CAAC,SAAS,CAAC,EACxB,gBAAe,KAAK,CAAC,eAAe,CAAM,EAC1C,iBAAgB,KAAK,CAAC,gBAAgB,CAAM,EAC5C,eAAc,KAAK,CAAC,cAAc,CAAM,WAiBzC,CAAC;AA8CF;;;;;;GAMG;+BAGuB,cAAc,wBAAwB;AAFhE,wBAcE"}

package/lib/src/core/features/uIFeatures/beforeRender/freeze.js

@@ -1,5 +1,5 @@
 import { withMemoization, isFreezingEnabled } from '../../../utils/util';
-export const calculateFieldLeft = (colId, columns, freezeColumns = [], hiddenColumns = [], columnWidths = {}) => {
+export const calculateFieldLeft = (colId, columns, freezeColumns = [], visibleColumns = [], columnWidths = {}) => {
     let left = 0;
     // iterate through the frozen columns and add its width to left if it appears before current column
     for (let j = 0; j < freezeColumns.length; j += 1) {
@@ -8,7 +8,7 @@ export const calculateFieldLeft = (colId, columns, freezeColumns = [], hiddenCol
             break;
         }
         // If the column is frozen but if it is hidden then don't consider
-        if (!hiddenColumns.includes(id)) {
+        if (visibleColumns.includes(id)) {
             const previousCol = columns?.find(c => `${c.field.id}` === id);
             const width = columnWidths[previousCol.field.id] || previousCol.field.width;
             left += width;
@@ -16,11 +16,11 @@ export const calculateFieldLeft = (colId, columns, freezeColumns = [], hiddenCol
     }
     return left;
 };
-const getLastFrozenField = (freezeColumns = [], hiddenColumns = []) => {
+const getLastFrozenField = (freezeColumns = [], visibleColumns = []) => {
     let lastFrozenColumnId = '';
     for (let i = freezeColumns.length - 1; i > -1; i -= 1) {
         const id = freezeColumns[i];
-        if (!hiddenColumns.includes(id)) {
+        if (visibleColumns.includes(id)) {
             lastFrozenColumnId = id;
             break;
         }
@@ -32,8 +32,8 @@ const setPositions = ([{ getView, getState }]) => {
     if (!isFreezingEnabled(getView().meta)) {
         return;
     }
-    const { freezeColumns = [], hiddenColumns = [], columnWidths } = getState();
-    const lastFrozenColumnId = getLastFrozenField(freezeColumns, hiddenColumns);
+    const { freezeColumns = [], visibleColumns = [], columnWidths } = getState();
+    const lastFrozenColumnId = getLastFrozenField(freezeColumns, visibleColumns);
     getView().columns?.forEach(column => {
         const { id } = column.field;
         const style = { ...column.style };
@@ -42,7 +42,7 @@ const setPositions = ([{ getView, getState }]) => {
         let lastFrozen = false;
         if (freezeColumns.includes(`${id}`)) {
             frozen = true;
-            left = calculateFieldLeft(id, getView().columns, freezeColumns, hiddenColumns, columnWidths);
+            left = calculateFieldLeft(id, getView().columns, freezeColumns, visibleColumns, columnWidths);
             if (`${id}` === lastFrozenColumnId) {
                 lastFrozen = true;
             }
@@ -58,7 +58,7 @@ const setPositions = ([{ getView, getState }]) => {
 /**
  * Calculates `left` position, {@link Column.frozen frozen}, {@link Column.lastFrozen lastFrozen} properties of each column and `left` position of {@link View.freezeLine} when any of the following properties are changed:
  * - {@link State.freezeColumns}
- * - {@link State.hiddenColumns}
+ * - {@link State.visibleColumns}
  * - {@link State.columnWidths}
  * - `active` in {@link State.personalization}
  */
@@ -66,7 +66,12 @@ export default () => {
     const memoizedSetPositions = withMemoization(setPositions);
     return function execute(featureProps) {
         const state = featureProps.getState();
-        memoizedSetPositions([featureProps], [state.freezeColumns, state.hiddenColumns, state.columnWidths, state?.personalization?.active]);
+        memoizedSetPositions([featureProps], [
+            state.freezeColumns,
+            state.visibleColumns,
+            state.columnWidths,
+            state?.personalization?.active
+        ]);
     };
 };
 //# sourceMappingURL=freeze.js.map

package/lib/src/core/features/uIFeatures/beforeRender/freeze.js.map

@@ -1 +1 @@
-{"version":3,"file":"freeze.js","sourceRoot":"","sources":["../../../../../../src/core/features/uIFeatures/beforeRender/freeze.ts"],"names":[],"mappings":"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","sourcesContent":["import type { State } from '../../../../../types/State.types';\nimport type View from '../../../generators/ViewGenerator';\nimport { withMemoization, isFreezingEnabled } from '../../../utils/util';\nimport type { BeforeRenderFeatureProps } from '../../featureFactory';\n// eslint-disable-next-line @typescript-eslint/no-unused-vars\nimport type Column from '../../../generators/ColumnGenerator';\n\nexport const calculateFieldLeft = (\n  colId: string,\n  columns: View['columns'],\n  freezeColumns: State['freezeColumns'] = [],\n  hiddenColumns: State['hiddenColumns'] = [],\n  columnWidths: State['columnWidths'] = {}\n) => {\n  let left = 0;\n  // iterate through the frozen columns and add its width to left if it appears before current column\n  for (let j = 0; j < freezeColumns.length; j += 1) {\n    const id = freezeColumns[j];\n    if (id === `${colId}`) {\n      break;\n    }\n    // If the column is frozen but if it is hidden then don't consider\n    if (!hiddenColumns.includes(id)) {\n      const previousCol = columns?.find(c => `${c.field.id}` === id);\n      const width = columnWidths[previousCol!.field.id] || previousCol!.field.width;\n      left += width!;\n    }\n  }\n  return left;\n};\n\nconst getLastFrozenField = (\n  freezeColumns: State['freezeColumns'] = [],\n  hiddenColumns: State['hiddenColumns'] = []\n) => {\n  let lastFrozenColumnId = '';\n  for (let i = freezeColumns.length - 1; i > -1; i -= 1) {\n    const id = freezeColumns[i];\n    if (!hiddenColumns.includes(id)) {\n      lastFrozenColumnId = id;\n      break;\n    }\n  }\n  return lastFrozenColumnId;\n};\n\nconst setPositions = ([{ getView, getState }]: [featureProps: BeforeRenderFeatureProps]): void => {\n  // TODO: Remove this early exit optimization once we start preparing the column objects only for visible fields.\n  if (!isFreezingEnabled(getView().meta)) {\n    return;\n  }\n  const { freezeColumns = [], hiddenColumns = [], columnWidths } = getState();\n  const lastFrozenColumnId = getLastFrozenField(freezeColumns, hiddenColumns);\n  getView().columns?.forEach(column => {\n    const { id } = column.field;\n    const style = { ...column.style };\n    let left = 0;\n    let frozen = false;\n    let lastFrozen = false;\n    if (freezeColumns.includes(`${id}`)) {\n      frozen = true;\n      left = calculateFieldLeft(id, getView().columns, freezeColumns, hiddenColumns, columnWidths);\n      if (`${id}` === lastFrozenColumnId) {\n        lastFrozen = true;\n      }\n    }\n    style.left = `${left}px`;\n    column = column.setProp({\n      style,\n      frozen,\n      lastFrozen\n    });\n  });\n};\n\n/**\n * Calculates `left` position, {@link Column.frozen frozen}, {@link Column.lastFrozen lastFrozen} properties of each column and `left` position of {@link View.freezeLine} when any of the following properties are changed:\n * - {@link State.freezeColumns}\n * - {@link State.hiddenColumns}\n * - {@link State.columnWidths}\n * - `active` in {@link State.personalization}\n */\nexport default () => {\n  const memoizedSetPositions = withMemoization(setPositions);\n  return function execute(featureProps: BeforeRenderFeatureProps) {\n    const state = featureProps.getState();\n    memoizedSetPositions(\n      [featureProps],\n      [state.freezeColumns, state.hiddenColumns, state.columnWidths, state?.personalization?.active]\n    );\n  };\n};\n"]}
+{"version":3,"file":"freeze.js","sourceRoot":"","sources":["../../../../../../src/core/features/uIFeatures/beforeRender/freeze.ts"],"names":[],"mappings":"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","sourcesContent":["import type { State } from '../../../../../types/State.types';\nimport type View from '../../../generators/ViewGenerator';\nimport { withMemoization, isFreezingEnabled } from '../../../utils/util';\nimport type { BeforeRenderFeatureProps } from '../../featureFactory';\n// eslint-disable-next-line @typescript-eslint/no-unused-vars\nimport type Column from '../../../generators/ColumnGenerator';\n\nexport const calculateFieldLeft = (\n  colId: string,\n  columns: View['columns'],\n  freezeColumns: State['freezeColumns'] = [],\n  visibleColumns: State['visibleColumns'] = [],\n  columnWidths: State['columnWidths'] = {}\n) => {\n  let left = 0;\n  // iterate through the frozen columns and add its width to left if it appears before current column\n  for (let j = 0; j < freezeColumns.length; j += 1) {\n    const id = freezeColumns[j];\n    if (id === `${colId}`) {\n      break;\n    }\n    // If the column is frozen but if it is hidden then don't consider\n    if (visibleColumns.includes(id)) {\n      const previousCol = columns?.find(c => `${c.field.id}` === id);\n      const width = columnWidths[previousCol!.field.id] || previousCol!.field.width;\n      left += width!;\n    }\n  }\n  return left;\n};\n\nconst getLastFrozenField = (\n  freezeColumns: State['freezeColumns'] = [],\n  visibleColumns: State['visibleColumns'] = []\n) => {\n  let lastFrozenColumnId = '';\n  for (let i = freezeColumns.length - 1; i > -1; i -= 1) {\n    const id = freezeColumns[i];\n    if (visibleColumns.includes(id)) {\n      lastFrozenColumnId = id;\n      break;\n    }\n  }\n  return lastFrozenColumnId;\n};\n\nconst setPositions = ([{ getView, getState }]: [featureProps: BeforeRenderFeatureProps]): void => {\n  // TODO: Remove this early exit optimization once we start preparing the column objects only for visible fields.\n  if (!isFreezingEnabled(getView().meta)) {\n    return;\n  }\n  const { freezeColumns = [], visibleColumns = [], columnWidths } = getState();\n  const lastFrozenColumnId = getLastFrozenField(freezeColumns, visibleColumns);\n  getView().columns?.forEach(column => {\n    const { id } = column.field;\n    const style = { ...column.style };\n    let left = 0;\n    let frozen = false;\n    let lastFrozen = false;\n    if (freezeColumns.includes(`${id}`)) {\n      frozen = true;\n      left = calculateFieldLeft(id, getView().columns, freezeColumns, visibleColumns, columnWidths);\n      if (`${id}` === lastFrozenColumnId) {\n        lastFrozen = true;\n      }\n    }\n    style.left = `${left}px`;\n    column = column.setProp({\n      style,\n      frozen,\n      lastFrozen\n    });\n  });\n};\n\n/**\n * Calculates `left` position, {@link Column.frozen frozen}, {@link Column.lastFrozen lastFrozen} properties of each column and `left` position of {@link View.freezeLine} when any of the following properties are changed:\n * - {@link State.freezeColumns}\n * - {@link State.visibleColumns}\n * - {@link State.columnWidths}\n * - `active` in {@link State.personalization}\n */\nexport default () => {\n  const memoizedSetPositions = withMemoization(setPositions);\n  return function execute(featureProps: BeforeRenderFeatureProps) {\n    const state = featureProps.getState();\n    memoizedSetPositions(\n      [featureProps],\n      [\n        state.freezeColumns,\n        state.visibleColumns,\n        state.columnWidths,\n        state?.personalization?.active\n      ]\n    );\n  };\n};\n"]}

package/lib/src/core/features/uIFeatures/beforeRender/grouping.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"grouping.d.ts","sourceRoot":"","sources":["../../../../../../src/core/features/uIFeatures/beforeRender/grouping.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAa1D,OAAO,KAAK,UAAU,MAAM,qBAAqB,CAAC;AAClD,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AAOrE,OAAO,KAAK,EACV,WAAW,EACX,uBAAuB,EAGxB,MAAM,uCAAuC,CAAC;AAE/C,MAAM,WAAW,kBAAkB;IACjC,oDAAoD;IACpD,OAAO,EAAE,MAAM,CAAC;IAChB,oEAAoE;IACpE,KAAK,EAAE,MAAM,CAAC;IACd,wCAAwC;IACxC,SAAS,EAAE,CAAC,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,CAAC,EAAE,CAAC;IAChD,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED,MAAM,MAAM,YAAY,GAAG,UAAU,CAAC,WAAW,EAAE,UAAU,CAAC,GAC5D,kBAAkB,GAAG;IACnB,QAAQ,CAAC,EAAE,YAAY,EAAE,CAAC;CAC3B,CAAC;AAEJ,MAAM,MAAM,wBAAwB,GAAG,UAAU,CAAC,uBAAuB,EAAE,UAAU,CAAC,GACpF,kBAAkB,GAAG;IACnB,QAAQ,CAAC,EAAE,wBAAwB,EAAE,CAAC;IACtC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,IAAI,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,CAAC;CAChD,CAAC;AA+hBJ;;;;;;;;GAQG;yBACa,YAAY,UAAU,qBAYC,wBAAwB;AAZ/D,wBAoEE"}
+{"version":3,"file":"grouping.d.ts","sourceRoot":"","sources":["../../../../../../src/core/features/uIFeatures/beforeRender/grouping.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAa1D,OAAO,KAAK,UAAU,MAAM,qBAAqB,CAAC;AAClD,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AAOrE,OAAO,KAAK,EACV,WAAW,EACX,uBAAuB,EAGxB,MAAM,uCAAuC,CAAC;AAE/C,MAAM,WAAW,kBAAkB;IACjC,oDAAoD;IACpD,OAAO,EAAE,MAAM,CAAC;IAChB,oEAAoE;IACpE,KAAK,EAAE,MAAM,CAAC;IACd,wCAAwC;IACxC,SAAS,EAAE,CAAC,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,CAAC,EAAE,CAAC;IAChD,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED,MAAM,MAAM,YAAY,GAAG,UAAU,CAAC,WAAW,EAAE,UAAU,CAAC,GAC5D,kBAAkB,GAAG;IACnB,QAAQ,CAAC,EAAE,YAAY,EAAE,CAAC;CAC3B,CAAC;AAEJ,MAAM,MAAM,wBAAwB,GAAG,UAAU,CAAC,uBAAuB,EAAE,UAAU,CAAC,GACpF,kBAAkB,GAAG;IACnB,QAAQ,CAAC,EAAE,wBAAwB,EAAE,CAAC;IACtC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,IAAI,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,CAAC;CAChD,CAAC;AA8hBJ;;;;;;;;GAQG;yBACa,YAAY,UAAU,qBAYC,wBAAwB;AAZ/D,wBAqEE"}

package/lib/src/core/features/uIFeatures/beforeRender/grouping.js

@@ -3,7 +3,7 @@ import { actionGroupingExpandCollapseAll } from '../../../actions/actions';
 import { AFTER_FETCH } from '../../../pubSub/events';
 import GroupGenerator from '../../../generators/GroupGenerator';
 function isNodeExpanded(groupToggle, node, defaultState) {
-    /** Groups with 0 count should not be expandable. */
+    /** Groups with count 0 should not be expandable. */
     if (node.count === 0) {
         return false;
     }
@@ -15,13 +15,12 @@ const getLabel = (view, groupBy, getState) => {
     const { columnId, dateFunction } = getGroupFromKey(groupBy, getState().groups);
     let { label } = view.columns.find(column => column.field.id.toString() === columnId.toString());
     if (dateFunction) {
-        // @ts-expect-error dateFunction cannot be used to index dateFunctionLabels. Check this.
         label += ` (${dateFunctionLabels[dateFunction]})`;
     }
     return label;
 };
-// This function checks if hierarchy exist or not.
-// which will decide whether start and end Index would be there on leaf node or on hierarchical node.
+// This function checks if hierarchy exists or not.
+// which will decide whether start and end Index would be there on the leaf node or on the hierarchical node.
 const doesExistInViewInfo = (viewInfo, hierarchy = [], isHierarchical = false) => {
     return viewInfo.some(v => {
         const filters = Object.values(v.filters);
@@ -40,13 +39,13 @@ const doesExistInViewInfo = (viewInfo, hierarchy = [], isHierarchical = false) =
 };
 const prepareGroupHeaders = (props) => {
     const [groupingInfo = [], viewInfo = [], rsInternal, groupToggle = {}, allGroupsExpanded] = props;
-    // If group and viewInfo are empty, prerape group header for top level leaf node.
+    // If group and viewInfo are empty, prepare group header for top level leaf node.
     // This is for easing on UI , one contract whether grouping is in place/not.
     // TODO: support for enabling feature on view.
     const view = rsInternal.getView();
     const { getState } = rsInternal.getRsStateResolver();
     if (groupingInfo.length === 0) {
-        // construct view header object.
+        // construct a view header object.
         const viewHeader = new GroupGenerator({
             isVisible: false,
             isLeafNode: true,
@@ -75,7 +74,7 @@ const prepareGroupHeaders = (props) => {
             const isExpanded = isNodeExpanded(groupToggle, child, allGroupsExpanded);
             const isSubGroupPresent = child.children && child.children.length;
             const label = child.isHierarchical ? '' : getLabel(view, child.groupBy, getState);
-            // construct view header object.
+            // construct a view header object.
             const viewHeader = new GroupGenerator({
                 isVisible: !!child.visibleRow,
                 isLeafNode: !isSubGroupPresent,
@@ -93,7 +92,7 @@ const prepareGroupHeaders = (props) => {
                 data: 'data' in child ? child.data : undefined,
                 additionalFieldsData: 'additionalFieldsData' in child ? child.additionalFieldsData : undefined
             }, rsInternal);
-            // If header node is a leaf node then , add start index and endIndex to resolve data.
+            // If the header node is a leaf node, then, add start index and endIndex to resolve data.
             if ((viewHeader.isLeafNode || viewHeader.isHierarchical) &&
                 viewHeader.isExpanded &&
                 doesExistInViewInfo(viewInfo, viewHeader.hierarchy, viewHeader.isHierarchical)) {
@@ -136,7 +135,7 @@ function getRecordsCount(group, count, includedRowCount, parentGroup, from, to,
             parentGroups[currentGroup.groupBy] = currentGroup.name;
         }
         count += 1;
-        // group has subgroups and group is expanded
+        // the group has subgroups and a group is expanded
         const isExpanded = isNodeExpanded(groupToggle, group[i], allGroupsExpanded);
         let includeThisGroup = false;
         if (count > from && count - 1 <= to) {
@@ -144,8 +143,8 @@ function getRecordsCount(group, count, includedRowCount, parentGroup, from, to,
             includedRowCount += 1;
         }
         group[i].visibleRow = includeThisGroup;
-        // Footer should be shown only if node expands.
-        // groupToggle will effect footer visibility so reset footer flag.
+        // Footer should be shown only if the node expands.
+        // groupToggle will affect footer visibility so reset a footer flag.
         group[i].showHierarchicalFooter = false;
         if (group[i].children && isExpanded) {
             [count, includedRowCount] = getRecordsCount(group[i].children, count, includedRowCount, parentGroups, from, to, groupFilters, groupToggle, allGroupsExpanded, state, getView);
@@ -154,7 +153,7 @@ function getRecordsCount(group, count, includedRowCount, parentGroup, from, to,
                     !!group[i].children.find(g => g.visibleRow && (g.isHierarchical || !g.children));
         }
         else if (!group[i].children && isExpanded) {
-            // group doesn't have subgroups and group is expanded
+            // the group doesn't have subgroups and the group is expanded
             const innerCount = count + group[i].count;
             if (count <= to) {
                 let groupFrom = 0;
@@ -199,8 +198,8 @@ const constructGroupingPagination = (groupingInfo, groupToggle, paginationOption
     getRecordsCount(groupingInfo, 0, 0, {}, paginationOptions.startIndex, paginationOptions.endIndex, groupFilters, groupToggle, allGroupsExpanded, state, getView);
     return groupFilters;
 };
-// This is basically used to update count on non leaf node.
-// which is sum of count of leaf node children in their hierarchy.
+// This is basically used to update count on non-leaf node.
+// which is the sum of count of leaf node children in their hierarchy.
 function updateCountOnNonLeafNode(groupingInfo) {
     const updateCount = (child) => {
         if (child.count !== undefined)
@@ -339,8 +338,8 @@ const getTotalItemCount = (getView, state, groupingInfo) => {
     const { groupToggle, allGroupsExpanded } = state;
     while (stack.length) {
         const child = stack.shift();
-        // We are considering header count whether if it is of hierarchical node or
-        // a normal group node and it has data associated with it in its hierarchy.
+        // We are considering header count whether if it is of a hierarchical node or
+        // a normal group node, and it has data associated with it in its hierarchy.
         if (child) {
             totalItemCount += 1;
             const isSubGroupPresent = child.children && child.children.length;
@@ -374,15 +373,15 @@ function postFetch(rsInternal, memoizedPrepareGroupHeaders) {
     const rsStore = getRsStore();
     const { getState } = getRsStateResolver();
     if (!rsStore.groupingInfo || !rsStore.groupingInfo.length) {
-        // As we are giving ways to always use header though grouping is not in place
+        // As we are giving ways to always use header, though grouping is not in place
         // update total item count given by API.
         getView().setProp('totalItemCount', getView().resultsCount);
         memoizedPrepareGroupHeaders([[], [], rsInternal], [getView().rows.length]);
     }
     else {
-        // As our group headers are representing data in UI , so
+        // As our group headers are representing data in UI, so
         // like data after every fetch group headers should also change so that
-        // UI get to know about latest group.
+        // UI get to know about the latest group.
         getView().setProp('totalItemCount', getTotalItemCount(getView, getState(), rsStore.groupingInfo));
         memoizedPrepareGroupHeaders([
             rsStore.groupingInfo,
@@ -408,8 +407,8 @@ export default (rsInternal) => {
     const memorizeOnHierarchicalGroupChange = withMemoization(onHierarchicalGroupChange);
     const memoizedUpdateGroupFilters = withMemoization(updateGroupFilters);
     const memoizedAutoExpandGroups = withMemoization(autoExpandGroups);
-    // Prepare group header even though groups are not present to have one flow.
-    // depend on after fetch event as , it depends on data when no grouping is there.
+    // Prepare a group header even though groups are not present to have one flow.
+    // depend on after fetch event as it depends on data when no grouping is there.
     rsInternal
         .getPubSubUtils()
         .subscribe(AFTER_FETCH, () => postFetch(rsInternal, withMemoization(prepareGroupHeaders)));
@@ -424,7 +423,7 @@ export default (rsInternal) => {
             state.personalization?.active,
             state.refresh,
             state.aggregationInfo,
-            state.hiddenColumns
+            state.visibleColumns
         ]);
         memoizedAutoExpandGroups([featureProps], [state.personalization?.active]);
         await memorizeOnHierarchicalGroupChange([featureProps], [
@@ -434,10 +433,10 @@ export default (rsInternal) => {
             state.aggregationInfo,
             state.personalization?.active
         ]);
-        // In new grouping, update group info in state.
+        // In the new grouping, update group info in state.
         // Action dispatched for group info will prepare group headers.
         if (state.paginationOptions) {
-            // TODO: use this comarator for optimization but isVisible calculated prop on grouping info needs to be handled.ISSUE-80012
+            // TODO: use this comparator for optimization but isVisible calculated prop on grouping info needs to be handled.ISSUE-80012
             // const comparator =(prev, next) => {
             //   if (prev[1] !== next[1] || prev[3] !== next[3]) return false;
             //   return compareArray(prev[2], next[2], ['children', 'count', 'name']);