@revolist/revogrid 4.9.41 → 4.9.42

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@revolist/revogrid",
-  "version": "4.9.41",
+  "version": "4.9.42",
   "type": "module",
   "description": "Virtual reactive data grid spreadsheet component - RevoGrid.",
   "license": "MIT",
@@ -62,26 +62,26 @@
   "types": "dist/types/index.d.ts",
   "exports": {
     ".": {
+      "types": "./dist/types/index.d.ts",
       "import": "./dist/index.js",
-      "require": "./dist/index.cjs.js",
-      "types": "./dist/types/index.d.ts"
+      "require": "./dist/index.cjs.js"
     },
     "./standalone": {
-      "import": "./standalone/revo-grid.js",
-      "types": "./standalone/revo-grid.d.ts"
+      "types": "./standalone/revo-grid.d.ts",
+      "import": "./standalone/revo-grid.js"
     },
     "./standalone/revo-grid.js": {
-      "import": "./standalone/revo-grid.js",
-      "types": "./standalone/revo-grid.d.ts"
+      "types": "./standalone/revo-grid.d.ts",
+      "import": "./standalone/revo-grid.js"
     },
     "./standalone/revogr-filter-panel.js": {
-      "import": "./standalone/revogr-filter-panel.js",
-      "types": "./standalone/revogr-filter-panel.d.ts"
+      "types": "./standalone/revogr-filter-panel.d.ts",
+      "import": "./standalone/revogr-filter-panel.js"
     },
     "./loader": {
+      "types": "./loader/index.d.ts",
       "import": "./loader/index.js",
-      "require": "./loader/index.cjs",
-      "types": "./loader/index.d.ts"
+      "require": "./loader/index.cjs"
     }
   },
   "files": [
@@ -104,14 +104,14 @@
   "devDependencies": {
     "@angular/core": "^18.1.2",
     "@juggle/resize-observer": "^3.4.0",
-    "@revolist/stencil-vue2-output-target": "^0.0.5",
+    "@revolist/stencil-vue2-output-target": "^0.0.6",
+    "@revolist/svelte-output-target": "0.0.5",
     "@stencil/angular-output-target": "0.8.4",
     "@stencil/core": "4.20.0",
     "@stencil/react-output-target": "0.5.3",
     "@stencil/sass": "^3.0.12",
     "@stencil/store": "^2.0.16",
-    "@stencil/svelte-output-target": "0.0.3",
-    "@stencil/vue-output-target": "^0.8.8",
+    "@stencil/vue-output-target": "^0.8.9",
     "@types/events": "^3.0.3",
     "@types/jest": "^29.5.12",
     "@types/lodash": "^4.17.5",
@@ -121,23 +121,24 @@
     "@types/resize-observer-browser": "^0.1.11",
     "bootstrap": "^5.3.2",
     "chalk": "^5.3.0",
+    "minimist": "^1.2.8",
     "execa": "^9.2.0",
     "fs": "^0.0.1-security",
-    "jest": "26.0.1",
-    "jest-cli": "26.0.1",
+    "jest": "^29.7.0",
+    "jest-cli": "^29.7.0",
+    "json2md": "^2.0.1",
     "lodash": "npm:lodash-es@4.17.21",
     "path": "^0.12.7",
     "prettier": "3.3.2",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "rxjs": "^7.8.1",
-    "svelte": "^4.2.18",
+    "svelte": "^5.2.10",
     "typedoc": "^0.26.5",
     "typedoc-plugin-markdown": "^4.2.3",
     "typescript": "^5.5.4",
     "url": "^0.11.3",
-    "vue": "^3.4.34",
-    "json2md": "^2.0.1"
+    "vue": "^3.4.34"
   },
   "publishConfig": {
     "access": "public"

package/readme.md

@@ -7,8 +7,9 @@
 <p align="center">
   <a href="https://www.npmjs.com/package/@revolist/revogrid"><img src="https://img.shields.io/npm/v/@revolist/revogrid" alt="Latest Version on NPM"/></a>
   <a href="https://github.com/revolist/revogrid/blob/master/LICENSE"><img src="https://img.shields.io/npm/l/@revolist/revogrid" alt="Software License"/></a>
-  <img src="https://badgen.net/bundlephobia/dependency-count/@revolist/revogrid@latest" alt="Tree shaking"/>
-  <img src="https://badgen.net/bundlephobia/tree-shaking/@revolist/revogrid@latest" alt="Tree shaking"/>
+  <img src="https://badgen.net/bundlephobia/dependency-count/@revolist/revogrid" alt="Dependency count"/>
+  <img src="https://badgen.net/bundlephobia/tree-shaking/@revolist/revogrid" alt="Tree shaking"/>
+  <img src="https://img.shields.io/bundlephobia/min/@revolist/revogrid" alt="Bundle size"/>
   <img src="https://sonarcloud.io/api/project_badges/measure?project=revolist_revogrid&metric=alert_status" alt="Sonar Quality Gate"/>
 </p>
 
@@ -53,6 +54,8 @@ Support Millions of cells and thousands of columns easy and efficiently for fast
 
 - **Formula Support**: Evaluate formulas in cell data.
 
+- **Master Detail/Subtables/Forms**: Expand rows to reveal child data.
+
 - **Drag and Drop**: Drag and drop in rows and columns.
 
 - **Sorting**: Multiple options, customizable per column, with advanced event handling.
@@ -225,11 +228,11 @@ grid.source = items;
 
 -   Redesigned type support:
         - Removed deprecated namespaces:
-            - **Before**: `RevoGrid.ColumnDataSchemaRegular`
-            - **Now**: `ColumnDataSchemaRegular`;
+            - **Before**: `RevoGrid.ColumnRegular`
+            - **Now**: `ColumnRegular`;
         - Improved type import:
             - **Before**: `import { RevoGrid } from '@revolist/revogrid/dist/types/interfaces'`
-            - **Now**: `import { ColumnDataSchemaRegular } from '@revolist/revogrid'`.
+            - **Now**: `import { ColumnRegular } from '@revolist/revogrid'`.
         - Changed viewport type names everywhere. For example, before: `rowDefinitions: [{ type: "row", index: 0, size: 145 }]`, after: `rowDefinitions: [{ type: "rgRow", index: 0, size: 145 }]`.
     -   Updated [event](https://rv-grid.com/guide/api/revoGrid.html#Events) naming convention. Review your [event](https://rv-grid.com/guide/api/revoGrid.html#Events) usage. [Event names](https://rv-grid.com/guide/api/revoGrid.html#Events) are all lowercase now and are aligned with modern event naming conventions. For example, `afterEdit` -> `afteredit`.
     - Multiple event breaking changes introduced: beforerowrender now returns `BeforeRowRenderEvent`. Check all events for details.
@@ -251,33 +254,28 @@ grid.source = items;
 
 ## Our Sponsors
 
-We would like to extend our heartfelt gratitude to our sponsors for their generous support. Their contributions help us maintain and develop RevoGrid, ensuring continuous improvements and updates.
+We would like to extend our heartfelt gratitude to our sponsors for their generous support. Their contributions help us maintain and develop RevoGrid.
 
 [![Altruistiq](https://cdn.prod.website-files.com/62cd69e08130a1a33f5ef900/6310b4d500e971695db5e9c3_615b5db69ce8931a276e5ed2_Social_Icons_AQ_3_32x32.png)](https://altruistiq.com)
 
 
 ### Become a Sponsor
 
-If you or your company would like to support the ongoing development of RevoGrid, please consider becoming a sponsor or use or [Pro version](https://rv-grid.com/pro/). Your support will help us continue to improve the project and provide the best possible tool for the community.
-
-[![Sponsor Us](https://img.shields.io/badge/Sponsor%20Us-%F0%9F%92%96-brightgreen)](https://opencollective.com/revogrid)
+If you or your company would like to support the ongoing development of RevoGrid, please consider [![Sponsor Us](https://img.shields.io/badge/Sponsor%20Us-%F0%9F%92%96-brightgreen)](https://opencollective.com/revogrid) or use a [Pro version](https://rv-grid.com/pro/). Your support will help us continue to improve the project and provide the best possible tool for the community.
 
 Thank you for supporting RevoGrid! 🙏
 
+
 ## Contributing
 
-We invite you to join our vibrant community and contribute to the growth and success of RevoGrid. By getting involved, you'll have the opportunity to enhance your skills, gain valuable experience, and make a significant impact on an innovative project.
+By getting involved, you'll have the opportunity to enhance your skills, gain valuable experience, and make a significant impact on an innovative project. Your contribution, no matter how big or small, is valuable.
 
 ### Why Contribute?
 
-- **Expand Your Knowledge**: Working on RevoGrid allows you to dive deep into modern web technologies, improve your coding skills, and learn best practices in performance optimization, data handling, and component-based architecture.
-- **Valuable Experience**: Contributing to an open-source project like RevoGrid provides you with practical experience that can be a great addition to your portfolio. It demonstrates your ability to work collaboratively, solve complex problems, and contribute to a project's success.
-- **Professional Growth**: By contributing, you become part of a network of talented developers. This can lead to mentorship opportunities, collaborations, and professional connections that can benefit your career.
-- **Make a Difference**: Your contributions can help improve RevoGrid, making it more powerful and user-friendly for developers around the world. Your input can shape the future of the project and drive innovation.
-
-### Join Us
+- **Expand Your Knowledge**: Working on complex libraries allows you to dive deep into modern web technologies, improve your coding skills, and learn best practices in performance optimization, data handling, and component-based architecture.
+- **Experience**: Contributing to an open-source project like provides you with practical experience that can be a great addition to your portfolio. It demonstrates your ability to work collaboratively, solve complex problems, and contribute to a project's success.
+- **Professional Growth**: By contributing, you become part of a network of talented developers. This can lead to mentorship opportunities, collaborations, and professional connections that can benefit your career. 
 
-Your contribution, no matter how big or small, is valuable. By working on RevoGrid, you'll be part of an exciting project that's making a difference in the world of data grids. Join us today and let's build something amazing together!
 
 ## License
 

package/standalone/column.service.js

@@ -1,7 +1,7 @@
 /*!
  * Built by Revolist OU ❤️
  */
-import { x as keys, o as isArrayLike, w as baseIteratee, k as isArray, j as createStore, i as setStore, m as isIterateeCall, l as toInteger, a as getVisibleSourceItem, b as getSourceItem } from './data.store.js';
+import { y as keys, q as isArrayLike, x as baseIteratee, l as isArray, j as createStore, i as setStore, n as isIterateeCall, m as toInteger, a as getVisibleSourceItem, b as getSourceItem } from './data.store.js';
 import '@stencil/core/internal/client';
 import { G as GRID_INTERNALS, C as CELL_CLASS, b as DISABLED_CLASS } from './consts.js';
 import './platform.js';
@@ -189,6 +189,150 @@ function reduce(collection, iteratee, accumulator) {
   return func(collection, baseIteratee(iteratee), accumulator, initAccum, baseEach$1);
 }
 
+function getCellData(val) {
+    if (typeof val === 'undefined' || val === null) {
+        return '';
+    }
+    return val;
+}
+function getCellRaw(model, column) {
+    if (!column) {
+        return;
+    }
+    if (column.cellParser) {
+        return column.cellParser(model, column);
+    }
+    return model[column.prop];
+}
+function getCellDataParsed(model, column) {
+    return getCellData(getCellRaw(model, column));
+}
+/**
+ * Get column type from column data
+ */
+function getColumnType(rgCol) {
+    if (rgCol.pin) {
+        return rgCol.pin;
+    }
+    return 'rgCol';
+}
+function getColumnSizes(cols) {
+    const res = {};
+    for (const [i, c] of cols.entries()) {
+        if (c.size) {
+            res[i] = c.size;
+        }
+    }
+    return res;
+}
+/**
+ * Check if column is grouping column
+ */
+function isColGrouping(colData) {
+    return !!colData.children;
+}
+/**
+ * This function is used to create a collection of columns.
+ */
+function getColumns(columns, level = 0, types) {
+    const collection = {
+        // columns as they are in stores per type
+        columns: {
+            rgCol: [],
+            colPinStart: [],
+            colPinEnd: [],
+        },
+        // columns indexed by prop for quick access
+        columnByProp: {},
+        // column grouping
+        columnGrouping: {
+            rgCol: [],
+            colPinStart: [],
+            colPinEnd: [],
+        },
+        // max depth level for column grouping
+        maxLevel: level,
+        // sorting
+        sort: {},
+    };
+    return reduce(columns, (res, colData) => {
+        // Grouped column
+        if (isColGrouping(colData)) {
+            res = gatherGroup(res, colData, getColumns(colData.children, level + 1, types), level);
+            return res;
+        }
+        // Column type
+        const columnDefinitionFromType = colData.columnType && (types === null || types === void 0 ? void 0 : types[colData.columnType]);
+        // Regular column
+        const regularColumn = Object.assign(Object.assign({}, columnDefinitionFromType), colData);
+        // Regular column, no Pin
+        if (!regularColumn.pin) {
+            res.columns.rgCol.push(regularColumn);
+            // Pin
+        }
+        else {
+            res.columns[regularColumn.pin].push(regularColumn);
+        }
+        if (regularColumn.order) {
+            res.sort[regularColumn.prop] = regularColumn;
+        }
+        // it's possible that some columns have same prop, but better to avoid it
+        if (!res.columnByProp[regularColumn.prop]) {
+            res.columnByProp[regularColumn.prop] = [];
+        }
+        res.columnByProp[regularColumn.prop].push(regularColumn);
+        // trigger setup hook if present
+        regularColumn.beforeSetup && regularColumn.beforeSetup(regularColumn);
+        return res;
+    }, collection);
+}
+function gatherGroup(res, colData, collection, level = 0) {
+    // group template
+    const group = Object.assign(Object.assign({}, colData), { level, ids: [] });
+    // check columns for update
+    for (let k in collection.columns) {
+        const key = k;
+        const resultItem = res.columns[key];
+        const collectionItem = collection.columns[key];
+        // if column data
+        if (isArray(resultItem) && isArray(collectionItem)) {
+            // fill columns
+            resultItem.push(...collectionItem);
+            // fill grouping
+            if (collectionItem.length) {
+                res.columnGrouping[key].push(Object.assign(Object.assign({}, group), { ids: collectionItem.map(item => item.prop) }));
+            }
+        }
+    }
+    // merge column groupings
+    for (let k in collection.columnGrouping) {
+        const key = k;
+        const collectionItem = collection.columnGrouping[key];
+        res.columnGrouping[key].push(...collectionItem);
+    }
+    res.maxLevel = Math.max(res.maxLevel, collection.maxLevel);
+    res.sort = Object.assign(Object.assign({}, res.sort), collection.sort);
+    res.columnByProp = Object.assign(Object.assign({}, res.columnByProp), collection.columnByProp);
+    return res;
+}
+function findColumn(columns, prop) {
+    for (const c of columns) {
+        if (isColGrouping(c)) {
+            const found = findColumn(c.children, prop);
+            if (found) {
+                return found;
+            }
+        }
+        else if (c.prop === prop) {
+            return c;
+        }
+    }
+    return undefined;
+}
+function getColumnByProp(columns, prop) {
+    return findColumn(columns, prop);
+}
+
 /**
  * Selection store
  */
@@ -620,164 +764,62 @@ function isRangeSingleCell(a) {
     return a.x === a.x1 && a.y === a.y1;
 }
 
-function getCellData(val) {
-    if (typeof val === 'undefined' || val === null) {
-        return '';
-    }
-    return val;
-}
-function getCellDataParsed(model, column) {
-    const val = column.cellParser ? column.cellParser(model, column) : model[column.prop];
-    return getCellData(val);
-}
-/**
- * Get column type from column data
- */
-function getColumnType(rgCol) {
-    if (rgCol.pin) {
-        return rgCol.pin;
-    }
-    return 'rgCol';
-}
-function getColumnSizes(cols) {
-    const res = {};
-    for (const [i, c] of cols.entries()) {
-        if (c.size) {
-            res[i] = c.size;
-        }
-    }
-    return res;
-}
-/**
- * Check if column is grouping column
- */
-function isColGrouping(colData) {
-    return !!colData.children;
-}
-/**
- * This function is used to create a collection of columns.
- */
-function getColumns(columns, level = 0, types) {
-    const collection = {
-        // columns as they are in stores per type
-        columns: {
-            rgCol: [],
-            colPinStart: [],
-            colPinEnd: [],
-        },
-        // columns indexed by prop for quick access
-        columnByProp: {},
-        // column grouping
-        columnGrouping: {
-            rgCol: [],
-            colPinStart: [],
-            colPinEnd: [],
-        },
-        // max depth level for column grouping
-        maxLevel: level,
-        // sorting
-        sort: {},
-    };
-    return reduce(columns, (res, colData) => {
-        // Grouped column
-        if (isColGrouping(colData)) {
-            return gatherGroup(res, colData, getColumns(colData.children, level + 1, types), level);
-        }
-        // Column type
-        const columnDefinitionFromType = colData.columnType && (types === null || types === void 0 ? void 0 : types[colData.columnType]);
-        // Regular column
-        const regularColumn = Object.assign(Object.assign({}, columnDefinitionFromType), colData);
-        // Regular column, no Pin
-        if (!regularColumn.pin) {
-            res.columns.rgCol.push(regularColumn);
-            // Pin
-        }
-        else {
-            res.columns[regularColumn.pin].push(regularColumn);
-        }
-        if (regularColumn.order) {
-            res.sort[regularColumn.prop] = regularColumn;
-        }
-        // it's possible that some columns have same prop, but better to avoid it
-        if (!res.columnByProp[regularColumn.prop]) {
-            res.columnByProp[regularColumn.prop] = [];
-        }
-        res.columnByProp[regularColumn.prop].push(regularColumn);
-        // trigger setup hook if present
-        regularColumn.beforeSetup && regularColumn.beforeSetup(regularColumn);
-        return res;
-    }, collection);
-}
-function gatherGroup(res, colData, collection, level = 0) {
-    // group template
-    const group = Object.assign(Object.assign({}, colData), { level, ids: [] });
-    // check columns for update
-    for (let k in collection.columns) {
-        const key = k;
-        const resultItem = res.columns[key];
-        const collectionItem = collection.columns[key];
-        // if column data
-        if (isArray(resultItem) && isArray(collectionItem)) {
-            // fill columns
-            resultItem.push(...collectionItem);
-            // fill grouping
-            if (collectionItem.length) {
-                res.columnGrouping[key].push(Object.assign(Object.assign({}, group), { ids: collectionItem.map(item => item.prop) }));
-            }
-        }
-    }
-    // merge column groupings
-    for (let k in collection.columnGrouping) {
-        const key = k;
-        const collectionItem = collection.columnGrouping[key];
-        res.columnGrouping[key].push(...collectionItem);
-    }
-    res.maxLevel = Math.max(res.maxLevel, collection.maxLevel);
-    res.sort = Object.assign(Object.assign({}, res.sort), collection.sort);
-    return res;
-}
-function findColumn(columns, prop) {
-    for (const c of columns) {
-        if (isColGrouping(c)) {
-            const found = findColumn(c.children, prop);
-            if (found) {
-                return found;
-            }
-        }
-        else if (c.prop === prop) {
-            return c;
-        }
-    }
-    return undefined;
-}
-function getColumnByProp(columns, prop) {
-    return findColumn(columns, prop);
-}
-
 const GROUP_DEPTH = `${GRID_INTERNALS}-depth`;
 const PSEUDO_GROUP_ITEM = `${GRID_INTERNALS}-name`;
 const PSEUDO_GROUP_ITEM_ID = `${GRID_INTERNALS}-id`;
 const PSEUDO_GROUP_ITEM_VALUE = `${GRID_INTERNALS}-value`;
 const PSEUDO_GROUP_COLUMN = `${GRID_INTERNALS}-column`;
 const GROUP_EXPANDED = `${GRID_INTERNALS}-expanded`;
+const GROUP_COLUMN_PROP = `${GRID_INTERNALS}-prop`;
 const GROUP_ORIGINAL_INDEX = `${GRID_INTERNALS}-original-index`;
 const GROUP_EXPAND_BTN = `group-expand`;
-const GROUP_EXPAND_EVENT = `groupexpandclick`;
 const GROUPING_ROW_TYPE = 'rgRow';
 
 function getGroupValueDefault(item, prop) {
     return item[prop] || null;
 }
+// get source based on proxy item collection to preserve rgRow order
+function getSource(source, items, withoutGrouping = false) {
+    let index = 0;
+    const result = {
+        source: [],
+        prevExpanded: {},
+        oldNewIndexes: {},
+    };
+    // order important here, expected parent is first, then others
+    items.forEach(i => {
+        const model = source[i];
+        if (!withoutGrouping) {
+            result.source.push(model);
+            return;
+        }
+        // grouping filter
+        if (isGrouping(model)) {
+            if (getExpanded(model)) {
+                result.prevExpanded[model[PSEUDO_GROUP_ITEM_VALUE]] = true;
+            }
+        }
+        else {
+            result.source.push(model);
+            result.oldNewIndexes[i] = index;
+            index++;
+        }
+    });
+    return result;
+}
+function getExpanded(model = {}) {
+    return model[GROUP_EXPANDED];
+}
 /**
  * Gather data for grouping
  * @param array - flat data array
- * @param groupIds - ids of groups
+ * @param columnProps - ids of groups
  * @param expanded - potentially expanded items if present
  */
-function gatherGrouping(array, groupIds, { prevExpanded, expandedAll, getGroupValue = getGroupValueDefault, }) {
+function gatherGrouping(array, columnProps, { prevExpanded, expandedAll, getGroupValue = getGroupValueDefault, }) {
     const groupedItems = new Map();
     array.forEach((item, originalIndex) => {
-        const groupLevelValues = groupIds.map(groupId => getGroupValue(item, groupId));
+        const groupLevelValues = columnProps.map(groupId => getGroupValue(item, groupId));
         const lastLevelValue = groupLevelValues.pop();
         let currentGroupLevel = groupedItems;
         groupLevelValues.forEach(value => {
@@ -793,7 +835,7 @@ function gatherGrouping(array, groupIds, { prevExpanded, expandedAll, getGroupVa
         lastLevelItems.push(Object.assign(Object.assign({}, item), { [GROUP_ORIGINAL_INDEX]: originalIndex }));
     });
     let itemIndex = -1;
-    const groupingDepth = groupIds.length;
+    const groupingDepth = columnProps.length;
     // collapse all groups in the beginning
     const trimmed = {};
     // index mapping
@@ -813,6 +855,8 @@ function gatherGrouping(array, groupIds, { prevExpanded, expandedAll, getGroupVa
                 [PSEUDO_GROUP_ITEM_ID]: JSON.stringify(levelIds),
                 [PSEUDO_GROUP_ITEM_VALUE]: mergedIds,
                 [GROUP_EXPANDED]: isGroupExpanded,
+                [GROUP_COLUMN_PROP]: columnProps[depth],
+                [columnProps[depth]]: groupId,
             });
             itemIndex += 1;
             if (!isGroupExpanded && depth) {
@@ -856,7 +900,7 @@ function isGrouping(rgRow) {
     return typeof (rgRow === null || rgRow === void 0 ? void 0 : rgRow[PSEUDO_GROUP_ITEM]) !== 'undefined';
 }
 function isGroupingColumn(column) {
-    return column && typeof column[PSEUDO_GROUP_COLUMN] !== 'undefined';
+    return typeof (column === null || column === void 0 ? void 0 : column[PSEUDO_GROUP_COLUMN]) !== 'undefined';
 }
 function measureEqualDepth(groupA, groupB) {
     const ln = groupA.length;
@@ -979,12 +1023,13 @@ class ColumnService {
         }
         return !!readOnly;
     }
-    mergeProperties(r, c, defaultProps, model, extraPropsFunc) {
+    mergeProperties(r, c, defaultProps, schemaModel) {
+        var _a, _b;
         const props = Object.assign({}, defaultProps);
         props.class = Object.assign(Object.assign({}, (typeof props.class === 'string'
             ? { [props.class]: true }
             : props.class)), { [CELL_CLASS]: true, [DISABLED_CLASS]: this.isReadOnly(r, c) });
-        const extra = extraPropsFunc === null || extraPropsFunc === void 0 ? void 0 : extraPropsFunc(model);
+        const extra = (_b = (_a = schemaModel.column) === null || _a === void 0 ? void 0 : _a.cellProperties) === null || _b === void 0 ? void 0 : _b.call(_a, schemaModel);
         if (!extra) {
             return props;
         }
@@ -994,24 +1039,12 @@ class ColumnService {
         const model = getSourceItem(this.dataStore, r) || {};
         return model[prop] || '';
     }
-    getCellData(r, c) {
-        const data = this.rowDataModel(r, c);
-        return getCellData(data.model[data.prop]);
-    }
     getSaveData(rowIndex, colIndex, val) {
         const data = this.rowDataModel(rowIndex, colIndex);
         if (typeof val === 'undefined') {
-            val = getCellData(data.model[data.prop]);
+            val = getCellData(data.value);
         }
-        return {
-            prop: data.prop,
-            rowIndex,
-            colIndex,
-            val,
-            model: data.model,
-            colType: this.type,
-            type: this.dataStore.get('type'),
-        };
+        return Object.assign(Object.assign({}, data), { val });
     }
     getCellEditor(_r, c, editors) {
         var _a;
@@ -1033,7 +1066,6 @@ class ColumnService {
         const column = this.columns[colIndex];
         const prop = column === null || column === void 0 ? void 0 : column.prop;
         const model = getSourceItem(this.dataStore, rowIndex) || {};
-        const value = model[prop];
         const type = this.dataStore.get('type');
         return {
             prop,
@@ -1044,7 +1076,7 @@ class ColumnService {
             colIndex,
             colType: this.type,
             type,
-            value,
+            value: getCellRaw(model, column),
         };
     }
     getRangeData(d, columns) {
@@ -1246,6 +1278,6 @@ function doPropMerge(existing, extra) {
     return props;
 }
 
-export { SelectionStoreConnector as A, doPropMerge as B, GROUP_EXPAND_BTN as C, PSEUDO_GROUP_ITEM as D, EMPTY_INDEX as E, isRowDragService as F, GROUP_EXPANDED as G, ColumnService as H, PSEUDO_GROUP_ITEM_VALUE as P, SelectionStore as S, isRangeSingleCell as a, getCellData as b, cropCellToMax as c, getCellDataParsed as d, getColumnType as e, getColumnSizes as f, getRange as g, isColGrouping as h, isHiddenStore as i, getColumns as j, gatherGroup as k, getColumnByProp as l, baseEach$1 as m, nextCell as n, isGrouping as o, getGroupingName as p, getParsedGroup as q, reduce as r, isSameGroup as s, GROUP_DEPTH as t, PSEUDO_GROUP_ITEM_ID as u, GROUPING_ROW_TYPE as v, PSEUDO_GROUP_COLUMN as w, GROUP_EXPAND_EVENT as x, gatherGrouping as y, isGroupingColumn as z };
+export { PSEUDO_GROUP_ITEM_VALUE as A, GROUPING_ROW_TYPE as B, PSEUDO_GROUP_COLUMN as C, SelectionStoreConnector as D, EMPTY_INDEX as E, doPropMerge as F, GROUP_EXPANDED as G, GROUP_EXPAND_BTN as H, PSEUDO_GROUP_ITEM as I, isRowDragService as J, ColumnService as K, PSEUDO_GROUP_ITEM_ID as P, SelectionStore as S, isRangeSingleCell as a, getSource as b, cropCellToMax as c, getExpanded as d, gatherGrouping as e, getGroupingName as f, getRange as g, isGrouping as h, isHiddenStore as i, isGroupingColumn as j, getParsedGroup as k, isSameGroup as l, measureEqualDepth as m, nextCell as n, getCellData as o, getCellRaw as p, getCellDataParsed as q, getColumnType as r, getColumnSizes as s, isColGrouping as t, getColumns as u, gatherGroup as v, getColumnByProp as w, reduce as x, baseEach$1 as y, GROUP_DEPTH as z };
 
 //# sourceMappingURL=column.service.js.map