@progress/kendo-vue-grid 3.7.2-dev.202211010734 → 3.7.3-dev.202211021251

package/dist/es/Grid.js

@@ -51,13 +51,14 @@ import { FilterRow } from './header/FilterRow';
 import { GroupPanel } from './header/GroupPanel';
 import { Footer } from './footer/Footer';
 import { FooterRow } from './footer/FooterRow';
+import { GridCellValue } from './GridCellValue';
 import { operators } from './filterCommon';
 import { VirtualScroll } from './VirtualScroll';
 import { ColumnResize } from './drag/ColumnResize';
 import { CommonDragLogic } from './drag/CommonDragLogic';
 import { DragClue } from './drag/DragClue';
 import { DropClue } from './drag/DropClue';
-import { getNestedValue, flatData, mapColumns, readColumns, autoGenerateColumns, applyExpandedState, groupedFirstItemValue } from './utils/main';
+import { flatData, mapColumns, readColumns, autoGenerateColumns, applyExpandedState, groupedFirstItemValue } from './utils/main';
 import { GridCell } from './cells/GridCell';
 import { GridGroupCell } from './cells/GridGroupCell';
 import { GridRow } from './rows/GridRow';
@@ -1149,8 +1150,6 @@ var GridVue2 = {
       colSpans = _a.colSpans,
       isColHidden = _a.hiddenColumns;
     var dataRow = function dataRow(item, rowId, rowDataIndex) {
-      var isInEdit = false;
-      var selectedValue = this.$props.selectedField ? getNestedValue(this.$props.selectedField, item.dataItem) : undefined;
       return {
         row: this._columns.map(function (column, index) {
           var _this = this;
@@ -1165,14 +1164,6 @@ var GridVue2 = {
             left: column.right + 'px',
             right: column.left + 'px'
           } : {};
-          var currentColumnIsInEdit = false;
-          if (column.editable && this.$props.editField) {
-            var inEdit = getNestedValue(this.$props.editField, item.dataItem);
-            if (inEdit === true || inEdit === column.field) {
-              isInEdit = true;
-              currentColumnIsInEdit = true;
-            }
-          }
           var columnCellRenderFunction;
           if (column.cell) {
             columnCellRenderFunction = templateRendering.call(this, column.cell, getListeners.call(this));
@@ -1204,8 +1195,7 @@ var GridVue2 = {
                 level: item.level,
                 expanded: isExpanded,
                 dataIndex: item.dataIndex,
-                ariaColumnIndex: column.ariaColumnIndex,
-                isSelected: Array.isArray(selectedValue) && selectedValue.indexOf(index) > -1
+                ariaColumnIndex: column.ariaColumnIndex
               },
               colSpan: colSpans[index],
               dataItem: item.dataItem,
@@ -1245,20 +1235,156 @@ var GridVue2 = {
               expanded: isExpanded,
               dataIndex: item.dataIndex,
               style: style,
-              ariaColumnIndex: column.ariaColumnIndex,
-              isSelected: Array.isArray(selectedValue) && selectedValue.indexOf(index) > -1
+              ariaColumnIndex: column.ariaColumnIndex
             });
           }
-          if (currentColumnIsInEdit) {
-            // @ts-ignore
-            return h(GridEditCell, {
+          // @ts-ignore
+          return h(GridCellValue, {
+            dataItem: item.dataItem,
+            attrs: this.v3 ? undefined : {
+              dataItem: item.dataItem,
+              editField: this.$props.editField,
+              column: column,
+              editCell: h(GridEditCell, {
+                id: navigationTools.generateNavigatableId("".concat(rowId, "-").concat(String(index)), idPrefix),
+                attrs: this.v3 ? undefined : {
+                  id: navigationTools.generateNavigatableId("".concat(rowId, "-").concat(String(index)), idPrefix),
+                  colSpan: colSpans[index],
+                  dataItem: item.dataItem,
+                  field: column.field || '' // todo
+                  ,
+                  editor: column.editor,
+                  format: column.format,
+                  readFormat: column.readFormat,
+                  type: column.type,
+                  className: className,
+                  render: columnCellRenderFunction || cellRenderFunction,
+                  columnIndex: index,
+                  columnsCount: this._columns.filter(function (c) {
+                    return !c.children.length;
+                  }).length,
+                  rowType: item.rowType,
+                  level: item.level,
+                  expanded: isExpanded,
+                  dataIndex: item.dataIndex
+                },
+                key: index,
+                colSpan: colSpans[index],
+                dataItem: item.dataItem,
+                field: column.field || '',
+                editor: column.editor,
+                format: column.format,
+                readFormat: column.readFormat,
+                type: column.type,
+                className: className,
+                render: columnCellRenderFunction || cellRenderFunction,
+                onEdit: this.editHandler,
+                on: this.v3 ? undefined : {
+                  "edit": this.editHandler,
+                  "remove": this.removeHandler,
+                  "save": this.saveHandler,
+                  "cancel": this.cancelHandler,
+                  "change": this.itemChange
+                },
+                onRemove: this.removeHandler,
+                onSave: this.saveHandler,
+                onCancel: this.cancelHandler,
+                onChange: this.itemChange,
+                columnIndex: index,
+                columnsCount: this._columns.filter(function (c) {
+                  return !c.children.length;
+                }).length,
+                rowType: item.rowType,
+                level: item.level,
+                expanded: isExpanded,
+                dataIndex: item.dataIndex,
+                style: style
+              }),
+              inbuildCell: h(GridCell, {
+                key: index,
+                id: navigationTools.generateNavigatableId("".concat(rowId, "-").concat(String(index)), idPrefix),
+                attrs: this.v3 ? undefined : {
+                  id: navigationTools.generateNavigatableId("".concat(rowId, "-").concat(String(index)), idPrefix),
+                  colSpan: colSpans[index],
+                  dataItem: item.dataItem,
+                  field: column.field || '' // todo
+                  ,
+                  editor: column.editor,
+                  format: column.format,
+                  readFormat: column.readFormat,
+                  type: column.type,
+                  className: className,
+                  render: columnCellRenderFunction || cellRenderFunction,
+                  columnIndex: index,
+                  columnsCount: this._columns.filter(function (c) {
+                    return !c.children.length;
+                  }).length,
+                  rowType: item.rowType,
+                  level: item.level,
+                  expanded: isExpanded,
+                  dataIndex: item.dataIndex
+                },
+                colSpan: colSpans[index],
+                dataItem: item.dataItem,
+                field: column.field || '',
+                editor: column.editor,
+                format: column.format,
+                readFormat: column.readFormat,
+                type: column.type,
+                className: className,
+                render: columnCellRenderFunction || cellRenderFunction,
+                onCellclick: this.cellClickHandler,
+                on: this.v3 ? undefined : {
+                  "cellclick": this.cellClickHandler,
+                  "cellkeydown": this.cellKeydownHandler,
+                  "edit": this.editHandler,
+                  "remove": this.removeHandler,
+                  "save": this.saveHandler,
+                  "cancel": this.cancelHandler,
+                  "change": this.itemChange,
+                  "selectionchange": function selectionchange(e) {
+                    return _this.selectionChangeHandler({
+                      event: e,
+                      dataItem: item.dataItem,
+                      dataIndex: rowDataIndex,
+                      columnIndex: index
+                    });
+                  }
+                },
+                onCellkeydown: this.cellKeydownHandler,
+                onEdit: this.editHandler,
+                onRemove: this.removeHandler,
+                onSave: this.saveHandler,
+                onCancel: this.cancelHandler,
+                onChange: this.itemChange,
+                onSelectionchange: function selectionchange(e) {
+                  return _this.selectionChangeHandler({
+                    event: e,
+                    dataItem: item.dataItem,
+                    dataIndex: rowDataIndex,
+                    columnIndex: index
+                  });
+                },
+                columnIndex: index,
+                columnsCount: this._columns.filter(function (c) {
+                  return !c.children.length;
+                }).length,
+                rowType: item.rowType,
+                level: item.level,
+                expanded: isExpanded,
+                dataIndex: item.dataIndex,
+                style: style
+              })
+            },
+            editField: this.$props.editField,
+            column: column,
+            editCell: h(GridEditCell, {
               id: navigationTools.generateNavigatableId("".concat(rowId, "-").concat(String(index)), idPrefix),
               attrs: this.v3 ? undefined : {
                 id: navigationTools.generateNavigatableId("".concat(rowId, "-").concat(String(index)), idPrefix),
                 colSpan: colSpans[index],
                 dataItem: item.dataItem,
-                field: column.field || '' // todo
-                ,
+                field: column.field || '',
                 editor: column.editor,
                 format: column.format,
                 readFormat: column.readFormat,
@@ -1305,24 +1431,71 @@ var GridVue2 = {
               expanded: isExpanded,
               dataIndex: item.dataIndex,
               style: style
-            });
-          }
-          // @ts-ignore
-          var inbuiltSlot = h(GridCell, {
-            key: index,
-            id: navigationTools.generateNavigatableId("".concat(rowId, "-").concat(String(index)), idPrefix),
-            attrs: this.v3 ? undefined : {
+            }),
+            inbuildCell: h(GridCell, {
+              key: index,
               id: navigationTools.generateNavigatableId("".concat(rowId, "-").concat(String(index)), idPrefix),
+              attrs: this.v3 ? undefined : {
+                id: navigationTools.generateNavigatableId("".concat(rowId, "-").concat(String(index)), idPrefix),
+                colSpan: colSpans[index],
+                dataItem: item.dataItem,
+                field: column.field || '',
+                editor: column.editor,
+                format: column.format,
+                readFormat: column.readFormat,
+                type: column.type,
+                className: className,
+                render: columnCellRenderFunction || cellRenderFunction,
+                columnIndex: index,
+                columnsCount: this._columns.filter(function (c) {
+                  return !c.children.length;
+                }).length,
+                rowType: item.rowType,
+                level: item.level,
+                expanded: isExpanded,
+                dataIndex: item.dataIndex
+              },
               colSpan: colSpans[index],
               dataItem: item.dataItem,
-              field: column.field || '' // todo
-              ,
+              field: column.field || '',
               editor: column.editor,
               format: column.format,
               readFormat: column.readFormat,
               type: column.type,
               className: className,
               render: columnCellRenderFunction || cellRenderFunction,
+              onCellclick: this.cellClickHandler,
+              on: this.v3 ? undefined : {
+                "cellclick": this.cellClickHandler,
+                "cellkeydown": this.cellKeydownHandler,
+                "edit": this.editHandler,
+                "remove": this.removeHandler,
+                "save": this.saveHandler,
+                "cancel": this.cancelHandler,
+                "change": this.itemChange,
+                "selectionchange": function selectionchange(e) {
+                  return _this.selectionChangeHandler({
+                    event: e,
+                    dataItem: item.dataItem,
+                    dataIndex: rowDataIndex,
+                    columnIndex: index
+                  });
+                }
+              },
+              onCellkeydown: this.cellKeydownHandler,
+              onEdit: this.editHandler,
+              onRemove: this.removeHandler,
+              onSave: this.saveHandler,
+              onCancel: this.cancelHandler,
+              onChange: this.itemChange,
+              onSelectionchange: function selectionchange(e) {
+                return _this.selectionChangeHandler({
+                  event: e,
+                  dataItem: item.dataItem,
+                  dataIndex: rowDataIndex,
+                  columnIndex: index
+                });
+              },
               columnIndex: index,
               columnsCount: this._columns.filter(function (c) {
                 return !c.children.length;
@@ -1330,63 +1503,11 @@ var GridVue2 = {
               rowType: item.rowType,
               level: item.level,
               expanded: isExpanded,
-              dataIndex: item.dataIndex
-            },
-            colSpan: colSpans[index],
-            dataItem: item.dataItem,
-            field: column.field || '',
-            editor: column.editor,
-            format: column.format,
-            readFormat: column.readFormat,
-            type: column.type,
-            className: className,
-            render: columnCellRenderFunction || cellRenderFunction,
-            onCellclick: this.cellClickHandler,
-            on: this.v3 ? undefined : {
-              "cellclick": this.cellClickHandler,
-              "cellkeydown": this.cellKeydownHandler,
-              "edit": this.editHandler,
-              "remove": this.removeHandler,
-              "save": this.saveHandler,
-              "cancel": this.cancelHandler,
-              "change": this.itemChange,
-              "selectionchange": function selectionchange(e) {
-                return _this.selectionChangeHandler({
-                  event: e,
-                  dataItem: item.dataItem,
-                  dataIndex: rowDataIndex,
-                  columnIndex: index
-                });
-              }
-            },
-            onCellkeydown: this.cellKeydownHandler,
-            onEdit: this.editHandler,
-            onRemove: this.removeHandler,
-            onSave: this.saveHandler,
-            onCancel: this.cancelHandler,
-            onChange: this.itemChange,
-            onSelectionchange: function selectionchange(e) {
-              return _this.selectionChangeHandler({
-                event: e,
-                dataItem: item.dataItem,
-                dataIndex: rowDataIndex,
-                columnIndex: index
-              });
-            },
-            columnIndex: index,
-            columnsCount: this._columns.filter(function (c) {
-              return !c.children.length;
-            }).length,
-            rowType: item.rowType,
-            level: item.level,
-            expanded: isExpanded,
-            dataIndex: item.dataIndex,
-            style: style
+              dataIndex: item.dataIndex,
+              style: style
+            })
           });
-          return inbuiltSlot;
-        }, this),
-        isInEdit: isInEdit,
-        isSelected: typeof selectedValue === 'boolean' && selectedValue
+        }, this)
       };
     };
     var hiddenRows = 0;
@@ -1446,18 +1567,15 @@ var GridVue2 = {
         attrs: this.v3 ? undefined : {
           dataItem: item.dataItem,
           isAltRow: isAlt,
-          isInEdit: dataRow.isInEdit,
           rowType: item.rowType,
           isHidden: hidden(rowIndex),
           selectedField: this.$props.selectedField,
           rowHeight: this.$props.rowHeight,
           render: rowRenderFunction,
           ariaRowIndex: currentAriaRowIndex,
-          dataIndex: dataIndex,
-          isSelected: dataRow.isSelected
+          dataIndex: dataIndex
         },
         isAltRow: isAlt,
-        isInEdit: dataRow.isInEdit,
         rowType: item.rowType,
         isHidden: hidden(rowIndex),
         onRowclick: function onRowclick(e) {
@@ -1479,7 +1597,6 @@ var GridVue2 = {
         render: rowRenderFunction,
         ariaRowIndex: currentAriaRowIndex,
         dataIndex: dataIndex,
-        isSelected: dataRow.isSelected,
         "class": this.$props.rowClass ? this.$props.rowClass(item) : ''
       }, this.v3 ? function () {
         return [dataRow.call(_this2, item, rowId, dataIndex).row];

package/dist/es/GridCellValue.d.ts

@@ -0,0 +1,21 @@
+declare type DefaultData<V> = object | ((this: V) => {});
+declare type DefaultMethods<V> = {
+    [key: string]: (this: V, ...args: any[]) => any;
+};
+import { DefineComponent, RecordPropsDefinition, ComponentOptions, Vue2type } from './additionalTypes';
+interface GridCellValueProps {
+    dataItem: object;
+    column: object;
+    editCell: object;
+    inbuildCell: object;
+    editField?: string;
+}
+/**
+ * @hidden
+ */
+declare let GridCellValueVue2: ComponentOptions<Vue2type, DefaultData<{}>, DefaultMethods<{}>, {}, RecordPropsDefinition<GridCellValueProps>>;
+/**
+ * @hidden
+ */
+declare const GridCellValue: DefineComponent<GridCellValueProps, any, {}, {}, {}, {}, {}, {}, string, GridCellValueProps, GridCellValueProps, {}>;
+export { GridCellValue, GridCellValueVue2 };

package/dist/es/GridCellValue.js

@@ -0,0 +1,37 @@
+// @ts-ignore
+import * as Vue from 'vue';
+var allVue = Vue;
+var gh = allVue.h;
+var isV3 = allVue.version && allVue.version[0] === '3';
+import { getNestedValue } from '@progress/kendo-vue-common';
+/**
+ * @hidden
+ */
+var GridCellValueVue2 = {
+  name: 'GridCellValue',
+  props: {
+    dataItem: Object,
+    column: Object,
+    editField: String,
+    editCell: Object,
+    inbuildCell: Object
+  },
+  // @ts-ignore
+  setup: !isV3 ? undefined : function () {
+    var v3 = !!isV3;
+    return {
+      v3: v3
+    };
+  },
+  // @ts-ignore
+  render: function render(createElement) {
+    var h = gh || createElement;
+    var inEdit = this.editField ? getNestedValue(this.editField, this.dataItem) : false;
+    return this.column.editable && this.editField && (inEdit === true || inEdit === this.column.field) ? this.editCell : this.inbuildCell;
+  }
+};
+/**
+ * @hidden
+ */
+var GridCellValue = GridCellValueVue2;
+export { GridCellValue, GridCellValueVue2 };

package/dist/es/package-metadata.js

@@ -5,7 +5,7 @@ export var packageMetadata = {
     name: '@progress/kendo-vue-grid',
     productName: 'Kendo UI for Vue',
     productCodes: ['KENDOUIVUE', 'KENDOUICOMPLETE'],
-    publishDate: 1667287687,
+    publishDate: 1667393037,
     version: '',
     licensingDocsUrl: 'https://www.telerik.com/kendo-vue-ui/my-license/?utm_medium=product&utm_source=kendovue&utm_campaign=kendo-ui-vue-purchase-license-keys-warning'
 };