@lemon-fe/kits 1.0.0-5 → 1.0.0-50

package/es/components/Actions/index.d.ts

@@ -1,6 +1,6 @@
-import { ReactElement } from 'react';
+import { type ReactElement } from 'react';
 import type { CSSProperties } from 'react';
-import { ButtonProps } from 'antd';
+import { type ButtonProps } from 'antd';
 interface ActionBtn extends ButtonProps {
     text: string | ReactElement;
     onClick?: () => void;

package/es/components/Actions/index.js

@@ -89,21 +89,26 @@ function Actions(props) {
       }));
 
       if (handleClick !== undefined) {
-        return /*#__PURE__*/React.createElement(Dropdown.Button, {
+        return /*#__PURE__*/React.createElement(Dropdown.Button, _extends({
           key: text,
           disabled: disabled,
           overlay: overlay,
           onClick: handleClick,
+          trigger: ['click'],
+          overlayStyle: {
+            minWidth: 80
+          },
           buttonsRender: function buttonsRender(_ref) {
-            var _ref2 = _slicedToArray(_ref, 2),
-                leftBtn = _ref2[0],
-                _ = _ref2[1];
+            var _ref2 = _slicedToArray(_ref, 1),
+                leftBtn = _ref2[0];
 
             return [leftBtn, /*#__PURE__*/React.createElement(Button, {
-              icon: /*#__PURE__*/React.createElement(Icons.More, null)
+              icon: /*#__PURE__*/React.createElement(Icons.More, null),
+              type: rest.type,
+              key: "more"
             })];
           }
-        }, text);
+        }, rest), text);
       }
 
       return /*#__PURE__*/React.createElement(Dropdown, {
@@ -131,8 +136,8 @@ function Actions(props) {
   }), collapsedBtns.length > 0 ? /*#__PURE__*/React.createElement(Popover, {
     placement: "bottomRight",
     overlayClassName: "".concat(prefixCls, "-actions-popover"),
-    onVisibleChange: setVisible,
-    visible: visible,
+    onOpenChange: setVisible,
+    open: visible,
     trigger: "click",
     content: collapsedBtns.map(function (item, index) {
       if (item === null) {

package/es/components/BaseTable/Actions.js

@@ -77,8 +77,8 @@ export default function Actions(props) {
     }
 
     var key = getKey(item, idx);
-    var dropDown = item.dropDown ? item.dropDown.filter(function (item) {
-      return item !== null;
+    var dropDown = item.dropDown ? item.dropDown.filter(function (sub) {
+      return sub !== null;
     }) : [];
     return /*#__PURE__*/React.createElement("div", {
       className: classNames("".concat(prefixCls, "-item"), _defineProperty({}, "".concat(prefixCls, "-item-disabled"), item.disabled)),

package/es/components/BaseTable/VirtualBody.js

@@ -114,8 +114,8 @@ export default function VirtualList(props) {
 
     var list = [];
     var max = rows.length - 1;
-    var start = range.start,
-        end = range.end;
+    var start = range.start;
+    var end = range.end;
 
     if (end > max) {
       end = max;

package/es/components/BaseTable/index.js

@@ -168,8 +168,8 @@ function BaseTable(props, _ref) {
       return null;
     }
 
-    var style = getComputedStyle(parent);
-    var contentHeight = parent.offsetHeight - (parseFloat(style.getPropertyValue('padding-top')) || 0) - (parseFloat(style.getPropertyValue('padding-bottom')) || 0);
+    var mStyle = getComputedStyle(parent);
+    var contentHeight = parent.offsetHeight - (parseFloat(mStyle.getPropertyValue('padding-top')) || 0) - (parseFloat(mStyle.getPropertyValue('padding-bottom')) || 0);
     var nodes = [];
 
     if (tableBody.previousElementSibling !== null) {

package/es/components/BaseTable/utils.d.ts

@@ -1,4 +1,4 @@
-import { ColumnType, ColumnGroupType } from './typings';
+import type { ColumnType, ColumnGroupType } from './typings';
 export declare function isColumnType<T>(col: ColumnGroupType<T> | ColumnType<T>): col is ColumnType<T>;
 export declare function getColumnKey(col: ColumnType<any>): string | number;
 export declare function randomStr(): string;

package/es/components/DataGrid/cell-editors/Date.d.ts

@@ -3,6 +3,7 @@ import type { ICellEditorReactComp } from '@ag-grid-community/react';
 import type { ICellEditorParams } from '@ag-grid-community/core';
 export interface DateEditorParams {
     format: string;
+    disabled?: boolean;
 }
 declare const _default: React.ForwardRefExoticComponent<ICellEditorParams<any, any> & DateEditorParams & React.RefAttributes<ICellEditorReactComp>>;
 export default _default;

package/es/components/DataGrid/cell-editors/Date.js

@@ -17,9 +17,10 @@ import { DatePicker } from 'antd';
 import EditorWrapper from "./Wrapper";
 import { editorPrefixClass } from "./utils";
 export default /*#__PURE__*/forwardRef(function DateEditor(props, ref) {
-  var cellStartedEdit = props.cellStartedEdit,
-      _props$format = props.format,
-      format = _props$format === void 0 ? 'YYYY-MM-DD' : _props$format;
+  var _props$format = props.format,
+      format = _props$format === void 0 ? 'YYYY-MM-DD' : _props$format,
+      disabled = props.disabled,
+      api = props.api;
 
   var _useState = useState(props.value ? moment(props.value, format) : null),
       _useState2 = _slicedToArray(_useState, 2),
@@ -27,13 +28,12 @@ export default /*#__PURE__*/forwardRef(function DateEditor(props, ref) {
       setValue = _useState2[1];
 
   var elm = useRef(null);
+  var isEdited = useRef(false);
   useEffect(function () {
-    if (cellStartedEdit) {
-      var _elm$current;
+    var _elm$current;
 
-      (_elm$current = elm.current) === null || _elm$current === void 0 ? void 0 : _elm$current.focus();
-    }
-  }, [cellStartedEdit]);
+    (_elm$current = elm.current) === null || _elm$current === void 0 ? void 0 : _elm$current.focus();
+  }, []);
 
   var getValue = function getValue() {
     return value ? value.format(format) : '';
@@ -41,36 +41,39 @@ export default /*#__PURE__*/forwardRef(function DateEditor(props, ref) {
 
   useImperativeHandle(ref, function () {
     return {
-      getValue: getValue,
-      focusIn: function focusIn() {
-        var _elm$current2;
-
-        (_elm$current2 = elm.current) === null || _elm$current2 === void 0 ? void 0 : _elm$current2.focus();
-        return true;
-      },
-      focusOut: function focusOut() {
-        var _elm$current3;
-
-        (_elm$current3 = elm.current) === null || _elm$current3 === void 0 ? void 0 : _elm$current3.blur();
-        return true;
-      }
+      getValue: getValue
     };
   });
   return /*#__PURE__*/React.createElement(EditorWrapper, null, /*#__PURE__*/React.createElement(DatePicker, {
+    onKeyDown: function onKeyDown(e) {
+      if (isEdited.current && e.key === 'Enter') {
+        api.tabToNextCell();
+      }
+    },
     style: {
       display: 'flex',
       paddingTop: 0,
       paddingBottom: 0
     },
+    disabled: disabled,
     className: editorPrefixClass('date'),
     value: value,
     placeholder: format,
+    onOpenChange: function onOpenChange(val) {
+      if (!val) {
+        isEdited.current = true;
+      }
+    },
     onChange: function onChange(val) {
       if (val) {
         setValue(val);
       } else {
         setValue(null);
       }
+
+      requestAnimationFrame(function () {
+        api.tabToNextCell();
+      });
     },
     ref: elm,
     bordered: false

package/es/components/DataGrid/cell-editors/Number.d.ts

@@ -2,8 +2,27 @@ import React from 'react';
 import type { ICellEditorReactComp } from '@ag-grid-community/react';
 import type { ICellEditorParams } from '@ag-grid-community/core';
 export interface NumberEditorParams {
+    disabled?: boolean;
+    /**
+     * @description 最小值
+     */
     min?: number;
+    /**
+     * @description 最大值
+     */
     max?: number;
+    /**
+     * @description 空值
+     */
+    emptyValue?: number;
+    /**
+     * @description 当值不合理时，不修改单元格
+     */
+    undoWhenError?: boolean;
+    /**
+     * @description 精度
+     */
+    precision?: number;
 }
 declare const _default: React.ForwardRefExoticComponent<ICellEditorParams<any, any> & NumberEditorParams & React.RefAttributes<ICellEditorReactComp>>;
 export default _default;

package/es/components/DataGrid/cell-editors/Number.js

@@ -17,9 +17,15 @@ import { editorPrefixClass } from "./utils";
 export default /*#__PURE__*/forwardRef(function NumberEditor(props, ref) {
   var _props$value;
 
-  var cellStartedEdit = props.cellStartedEdit,
-      min = props.min,
-      max = props.max;
+  var _props$min = props.min,
+      min = _props$min === void 0 ? -99999999 : _props$min,
+      _props$max = props.max,
+      max = _props$max === void 0 ? 99999999 : _props$max,
+      emptyValue = props.emptyValue,
+      undoWhenError = props.undoWhenError,
+      disabled = props.disabled,
+      api = props.api,
+      precision = props.precision;
 
   var _useState = useState((_props$value = props.value) !== null && _props$value !== void 0 ? _props$value : null),
       _useState2 = _slicedToArray(_useState, 2),
@@ -27,60 +33,67 @@ export default /*#__PURE__*/forwardRef(function NumberEditor(props, ref) {
       setValue = _useState2[1];
 
   var elm = useRef(null);
+  var dirty = useRef(false);
   useEffect(function () {
-    if (cellStartedEdit) {
-      var _elm$current;
+    var _elm$current;
 
-      (_elm$current = elm.current) === null || _elm$current === void 0 ? void 0 : _elm$current.select();
-    }
-  }, [cellStartedEdit]);
+    (_elm$current = elm.current) === null || _elm$current === void 0 ? void 0 : _elm$current.select();
+  }, []);
 
   var getValue = function getValue() {
-    if (value === '' || value === null) {
-      return null;
-    }
-
     var val;
+    var error = false;
 
-    if (typeof value === 'string') {
-      val = parseFloat(value);
+    if (value === '' || value === null) {
+      val = emptyValue !== null && emptyValue !== void 0 ? emptyValue : null;
     } else {
-      val = value;
+      val = +value;
+
+      if (precision !== undefined) {
+        val = Math.round(val * Math.pow(10, precision)) / Math.pow(10, precision);
+      }
     }
 
-    if (min !== undefined && val < min) {
+    if (val === null) {
+      error = true;
+    } else if (val < min) {
+      error = true;
       val = min;
-    } else if (max !== undefined && val > max) {
+    } else if (val > max) {
+      error = true;
       val = max;
     }
 
+    if (error && undoWhenError) {
+      return props.value;
+    }
+
     return val;
   };
 
   useImperativeHandle(ref, function () {
     return {
       getValue: getValue,
-      focusIn: function focusIn() {
-        var _elm$current2;
-
-        (_elm$current2 = elm.current) === null || _elm$current2 === void 0 ? void 0 : _elm$current2.select();
-        return true;
-      },
-      focusOut: function focusOut() {
-        var _elm$current3;
-
-        (_elm$current3 = elm.current) === null || _elm$current3 === void 0 ? void 0 : _elm$current3.blur();
-        return true;
+      isCancelAfterEnd: function isCancelAfterEnd() {
+        return !dirty.current;
       }
     };
   });
-  return /*#__PURE__*/React.createElement(EditorWrapper, null, /*#__PURE__*/React.createElement("input", {
+  return /*#__PURE__*/React.createElement(EditorWrapper, {
+    onKeyDown: function onKeyDown(e) {
+      if (e.key === 'Enter') {
+        api.tabToNextCell();
+      }
+    }
+  }, /*#__PURE__*/React.createElement("input", {
     type: "number",
+    disabled: disabled,
     className: editorPrefixClass('text'),
     ref: elm,
     value: value !== null && value !== void 0 ? value : '',
     onChange: function onChange(event) {
-      return setValue(event.target.value);
+      dirty.current = true;
+      setValue(event.target.value);
     }
   }));
 });

package/es/components/DataGrid/cell-editors/Row.d.ts

@@ -0,0 +1,22 @@
+import type { MutableRefObject, ReactElement } from 'react';
+import React from 'react';
+import type { ICellEditorReactComp } from '@ag-grid-community/react';
+import type { ICellEditorParams } from '@ag-grid-community/core';
+export declare class RowEditorData<T> {
+    private data;
+    constructor(data: T);
+    getValue(): T;
+}
+export interface RowEditorParams<T = any, K = any> {
+    suppressEnterEvent?: boolean;
+    isCancelAfterEnd?: (prevValue: T, nextValue: T) => boolean;
+    render: (val: K, data: T, params: ICellEditorParams<T, K> & {
+        ref: MutableRefObject<{
+            select?: () => void;
+            focus?: () => void;
+        } | null>;
+        onChange: (val: Partial<T>, action?: 'stop' | 'next') => void;
+    }) => ReactElement | null;
+}
+declare const _default: React.ForwardRefExoticComponent<ICellEditorParams<any, any> & RowEditorParams<any, any> & React.RefAttributes<ICellEditorReactComp>>;
+export default _default;

package/es/components/DataGrid/cell-editors/Row.js

@@ -0,0 +1,124 @@
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
+function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+import React, { useEffect, useRef } from 'react';
+import { get } from 'lodash';
+import { forwardRef, useImperativeHandle, useState } from 'react';
+import EditorWrapper from "./Wrapper";
+import { useGridStore } from "../hooks";
+export var RowEditorData = /*#__PURE__*/function () {
+  function RowEditorData(data) {
+    _classCallCheck(this, RowEditorData);
+
+    _defineProperty(this, "data", void 0);
+
+    this.data = data;
+  }
+
+  _createClass(RowEditorData, [{
+    key: "getValue",
+    value: function getValue() {
+      return this.data;
+    }
+  }]);
+
+  return RowEditorData;
+}();
+export default /*#__PURE__*/forwardRef(function RowEditor(props, ref) {
+  var api = props.api,
+      suppressEnterEvent = props.suppressEnterEvent,
+      stopEditing = props.stopEditing,
+      data = props.data,
+      render = props.render,
+      isCancelAfterEnd = props.isCancelAfterEnd,
+      field = props.colDef.field;
+
+  var _useState = useState(data),
+      _useState2 = _slicedToArray(_useState, 2),
+      value = _useState2[0],
+      setValue = _useState2[1];
+
+  var context = useGridStore(function (state) {
+    return state.context;
+  });
+  var elm = useRef(null);
+  useEffect(function () {
+    if (elm.current !== null) {
+      if (elm.current.select !== undefined) {
+        elm.current.select();
+      } else if (elm.current.focus !== undefined) {
+        elm.current.focus();
+      }
+    }
+  }, []);
+  useImperativeHandle(ref, function () {
+    return {
+      getValue: function getValue() {
+        var prevValue = props.value;
+        var nextValue = prevValue;
+
+        if (field === undefined || value === data || isCancelAfterEnd !== undefined && isCancelAfterEnd(data, _objectSpread(_objectSpread({}, data), value))) {
+          return prevValue;
+        }
+
+        nextValue = get(value, field);
+
+        if (nextValue == prevValue) {
+          return prevValue;
+        }
+
+        return new RowEditorData(value);
+      }
+    };
+  });
+
+  var handleChange = function handleChange(val, action) {
+    setValue(val);
+
+    if (action !== undefined) {
+      requestAnimationFrame(function () {
+        switch (action) {
+          case 'stop':
+            stopEditing();
+            break;
+
+          case 'next':
+            api.tabToNextCell();
+        }
+      });
+    }
+  };
+
+  return /*#__PURE__*/React.createElement(EditorWrapper, {
+    onKeyDown: function onKeyDown(e) {
+      if (!suppressEnterEvent && e.key === 'Enter') {
+        api.tabToNextCell();
+      }
+    }
+  }, render(field ? get(value, field) : props.value, data, _objectSpread(_objectSpread({}, props), {}, {
+    context: context,
+    ref: elm,
+    onChange: handleChange
+  })));
+});

package/es/components/DataGrid/cell-editors/Select.d.ts

@@ -1,7 +1,25 @@
 import React from 'react';
 import type { ICellEditorReactComp } from '@ag-grid-community/react';
 import type { ICellEditorParams } from '@ag-grid-community/core';
-import type { SelectProps } from 'antd/lib/select';
-export declare type SelectEditorParams = Pick<SelectProps, 'options' | 'fieldNames' | 'virtual' | 'showSearch' | 'listHeight' | 'listItemHeight' | 'allowClear' | 'mode' | 'labelInValue'>;
-declare const _default: React.ForwardRefExoticComponent<ICellEditorParams<any, any> & SelectEditorParams & React.RefAttributes<ICellEditorReactComp>>;
+import type { BaseOptionType, SelectProps } from 'antd/lib/select';
+export declare type SelectEditorParams = Pick<SelectProps<any, BaseOptionType>, 'disabled' | 'options' | 'virtual' | 'showSearch' | 'listHeight' | 'allowClear' | 'mode'> & {
+    fieldNames?: {
+        label: string;
+        value: string;
+    };
+    /**
+     * 是否是用options的数组成员作为value的值，此时传入的value也应该是数组成员的类型
+     */
+    valueByOption?: boolean;
+};
+declare const _default: React.ForwardRefExoticComponent<ICellEditorParams<any, any> & Pick<SelectProps<any, BaseOptionType>, "disabled" | "options" | "virtual" | "showSearch" | "listHeight" | "allowClear" | "mode"> & {
+    fieldNames?: {
+        label: string;
+        value: string;
+    } | undefined;
+    /**
+     * 是否是用options的数组成员作为value的值，此时传入的value也应该是数组成员的类型
+     */
+    valueByOption?: boolean | undefined;
+} & React.RefAttributes<ICellEditorReactComp>>;
 export default _default;

package/es/components/DataGrid/cell-editors/Select.js

@@ -1,4 +1,4 @@
-function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
@@ -12,15 +12,23 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
+import { useMemo } from 'react';
 import React, { useEffect, useRef } from 'react';
 import { forwardRef, useImperativeHandle, useState } from 'react';
 import { Select } from 'antd';
 import EditorWrapper from "./Wrapper";
 import { editorPrefixClass } from "./utils";
 export default /*#__PURE__*/forwardRef(function SelectEditor(props, ref) {
-  var stopEditing = props.stopEditing,
-      cellStartedEdit = props.cellStartedEdit,
-      cellEditorParams = props.colDef.cellEditorParams;
+  var api = props.api,
+      disabled = props.disabled,
+      options = props.options,
+      virtual = props.virtual,
+      allowClear = props.allowClear,
+      mode = props.mode,
+      fieldNames = props.fieldNames,
+      valueByOption = props.valueByOption,
+      showSearch = props.showSearch,
+      listHeight = props.listHeight;
 
   var _useState = useState(props.value),
       _useState2 = _slicedToArray(_useState, 2),
@@ -29,42 +37,66 @@ export default /*#__PURE__*/forwardRef(function SelectEditor(props, ref) {
 
   var elm = useRef(null);
   useEffect(function () {
-    if (cellStartedEdit) {
-      var _elm$current;
+    var _elm$current;
 
-      (_elm$current = elm.current) === null || _elm$current === void 0 ? void 0 : _elm$current.focus();
-    }
-  }, [cellStartedEdit]);
+    (_elm$current = elm.current) === null || _elm$current === void 0 ? void 0 : _elm$current.focus();
+  }, []);
   useImperativeHandle(ref, function () {
     return {
       getValue: function getValue() {
         return value;
-      },
-      focusIn: function focusIn() {
-        var _elm$current2;
-
-        (_elm$current2 = elm.current) === null || _elm$current2 === void 0 ? void 0 : _elm$current2.focus();
-        return true;
-      },
-      focusOut: function focusOut() {
-        var _elm$current3;
-
-        (_elm$current3 = elm.current) === null || _elm$current3 === void 0 ? void 0 : _elm$current3.blur();
-        return true;
       }
     };
   });
-  return /*#__PURE__*/React.createElement(EditorWrapper, null, /*#__PURE__*/React.createElement(Select, _extends({
+  var val = useMemo(function () {
+    var result = value;
+
+    if (valueByOption && result !== null && fieldNames !== undefined) {
+      var formatValue = function formatValue(item) {
+        if (item instanceof Object) {
+          return item[fieldNames.value];
+        }
+
+        return item;
+      };
+
+      if (Array.isArray(result)) {
+        result = result.map(function (item) {
+          return formatValue(item);
+        });
+      } else if (_typeof(result) === 'object') {
+        result = formatValue(result);
+      }
+    }
+
+    return result;
+  }, [value]);
+  return /*#__PURE__*/React.createElement(EditorWrapper, null, /*#__PURE__*/React.createElement(Select, {
     ref: elm,
     bordered: false,
-    className: editorPrefixClass('select')
-  }, cellEditorParams, {
-    value: value,
-    onChange: function onChange(val) {
-      setValue(val);
+    fieldNames: fieldNames,
+    disabled: disabled,
+    virtual: virtual,
+    allowClear: allowClear,
+    showSearch: showSearch,
+    mode: mode,
+    className: editorPrefixClass('select'),
+    value: val,
+    options: options,
+    listHeight: listHeight,
+    style: {
+      width: '100%'
+    },
+    onChange: function onChange(changedValue, opt) {
+      if (valueByOption) {
+        setValue(opt);
+      } else {
+        setValue(changedValue);
+      }
+
       requestAnimationFrame(function () {
-        stopEditing();
+        api.tabToNextCell();
       });
     }
-  })));
+  }));
 });

package/es/components/DataGrid/cell-editors/Text.d.ts

@@ -1,5 +1,8 @@
 import React from 'react';
 import type { ICellEditorReactComp } from '@ag-grid-community/react';
 import type { ICellEditorParams } from '@ag-grid-community/core';
-declare const _default: React.ForwardRefExoticComponent<ICellEditorParams<any, any> & React.RefAttributes<ICellEditorReactComp>>;
+export interface TextEditorParams {
+    disabled: boolean;
+}
+declare const _default: React.ForwardRefExoticComponent<ICellEditorParams<any, any> & TextEditorParams & React.RefAttributes<ICellEditorReactComp>>;
 export default _default;