@lemon-fe/kits 1.0.0-34 → 1.0.0-36

package/es/components/DataGrid/cell-editors/{Custom.d.ts → Row.d.ts}

@@ -2,8 +2,14 @@ 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 interface CustomEditorParams<T = any, K = any> {
+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;
@@ -12,5 +18,5 @@ export interface CustomEditorParams<T = any, K = any> {
         onChange: (val: Partial<T>, action?: 'stop' | 'next') => void;
     }) => ReactElement | null;
 }
-declare const _default: React.ForwardRefExoticComponent<ICellEditorParams<any, any> & CustomEditorParams<any, any> & React.RefAttributes<ICellEditorReactComp>>;
+declare const _default: React.ForwardRefExoticComponent<ICellEditorParams<any, any> & RowEditorParams<any, any> & React.RefAttributes<ICellEditorReactComp>>;
 export default _default;

package/es/components/DataGrid/cell-editors/{Custom.js → Row.js}

@@ -2,8 +2,6 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 
 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 _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; }
-
 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."); }
@@ -16,18 +14,44 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 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 default /*#__PURE__*/forwardRef(function CustomEditor(props, ref) {
+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,
-      node = props.node,
+      isCancelAfterEnd = props.isCancelAfterEnd,
       field = props.colDef.field;
 
   var _useState = useState(data),
@@ -51,12 +75,20 @@ export default /*#__PURE__*/forwardRef(function CustomEditor(props, ref) {
   useImperativeHandle(ref, function () {
     return {
       getValue: function getValue() {
-        var newData = _objectSpread(_objectSpread({}, data), value);
+        var prevValue = props.value;
+        var nextValue = prevValue;
+
+        if (field === undefined) {
+          return prevValue;
+        }
+
+        nextValue = get(value, field);
+
+        if (nextValue == prevValue || isCancelAfterEnd !== undefined && isCancelAfterEnd(data, _objectSpread(_objectSpread({}, data), value))) {
+          return prevValue;
+        }
 
-        requestAnimationFrame(function () {
-          node.setData(newData);
-        });
-        return field ? get(newData, field) : props.value;
+        return new RowEditorData(value);
       }
     };
   });

package/es/components/DataGrid/index.js

@@ -87,7 +87,7 @@ import DateEditor from "./cell-editors/Date";
 import TextEditor from "./cell-editors/Text";
 import NumberEditor from "./cell-editors/Number";
 import SelectEditor from "./cell-editors/Select";
-import CustomEditor from "./cell-editors/Custom";
+import RowEditor, { RowEditorData } from "./cell-editors/Row";
 import EditorWrapper from "./cell-editors/Wrapper";
 export { AgGridReact } from '@ag-grid-community/react';
 ModuleRegistry.registerModules([ClientSideRowModelModule, RowGroupingModule, InfiniteRowModelModule, ClipboardModule, MenuModule, SideBarModule, ColumnsToolPanelModule, ServerSideRowModelModule], false);
@@ -102,7 +102,7 @@ var defaultComponents = {
   'number-editor': NumberEditor,
   'date-editor': DateEditor,
   'select-editor': SelectEditor,
-  'row-editor': CustomEditor
+  'row-editor': RowEditor
 };
 
 var DataGrid = /*#__PURE__*/function (_Component) {
@@ -581,18 +581,27 @@ var DataGrid = /*#__PURE__*/function (_Component) {
                 _opts.cellRenderer = CellRenderer;
               }
 
-              if (_opts.valueSetter === undefined && valueSetter !== undefined) {
+              if (_opts.valueSetter === undefined) {
                 _opts.valueSetter = function (mParams) {
                   var colField = mParams.colDef.field,
                       data = mParams.data,
-                      newValue = mParams.newValue;
+                      newValue = mParams.newValue,
+                      oldValue = mParams.oldValue;
 
-                  if (colField) {
-                    set(data, colField, newValue);
+                  if (!colField || newValue === oldValue) {
+                    return false;
+                  }
+
+                  set(data, colField, newValue);
+
+                  if (valueSetter !== undefined) {
+                    var _result = valueSetter(newValue, data);
+
+                    Object.assign(data, _result);
+                  } else if (newValue instanceof RowEditorData) {
+                    Object.assign(data, newValue.getValue());
                   }
 
-                  var result = valueSetter(mParams.newValue, mParams.data);
-                  Object.assign(data, result);
                   return true;
                 };
               }

package/es/components/DataGrid/typings.d.ts

@@ -6,13 +6,12 @@ import type { TextEditorParams } from './cell-editors/Text';
 import type { NumberEditorParams } from './cell-editors/Number';
 import type { DateEditorParams } from './cell-editors/Date';
 import type { SelectEditorParams } from './cell-editors/Select';
-import type { CustomEditorParams } from './cell-editors/Custom';
+import type { RowEditorParams } from './cell-editors/Row';
 export type { TextEditorParams } from './cell-editors/Text';
 export type { NumberEditorParams } from './cell-editors/Number';
 export type { DateEditorParams } from './cell-editors/Date';
 export type { SelectEditorParams } from './cell-editors/Select';
-export type { CombinationEditorParams } from './cell-editors/Combination';
-export type { CustomEditorParams } from './cell-editors/Custom';
+export type { RowEditorParams } from './cell-editors/Row';
 export declare type GetRowId<T> = string | ((data: T) => string);
 export declare type PathType = string | (string | number)[];
 export declare type ValidateRule<T> = Pick<RuleItem, 'required' | 'message' | 'pattern' | 'min' | 'max' | 'len' | 'type'> & {
@@ -23,7 +22,7 @@ interface EditorParamsType<T extends string, K extends Record<string, any>> {
     params?: K;
     component?: string;
 }
-declare type EditorType<TData> = EditorParamsType<'text-editor', TextEditorParams> | EditorParamsType<'number-editor', NumberEditorParams> | EditorParamsType<'date-editor', DateEditorParams> | EditorParamsType<'select-editor', SelectEditorParams> | EditorParamsType<'row-editor', CustomEditorParams<TData>>;
+declare type EditorType<TData> = EditorParamsType<'text-editor', TextEditorParams> | EditorParamsType<'number-editor', NumberEditorParams> | EditorParamsType<'date-editor', DateEditorParams> | EditorParamsType<'select-editor', SelectEditorParams> | EditorParamsType<'row-editor', RowEditorParams<TData>>;
 export interface ColType<TData> extends Omit<ColDef<TData>, 'editable'> {
     title?: ReactNode | ((params: IHeaderParams) => ReactNode);
     dataIndex?: PathType;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lemon-fe/kits",
-  "version": "1.0.0-34",
+  "version": "1.0.0-36",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",

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

@@ -1,8 +0,0 @@
-import type { ICellEditorReactComp } from '@ag-grid-community/react';
-import type { ICellEditorParams } from '@ag-grid-community/core';
-import { type ForwardedRef, type ReactElement } from 'react';
-export interface CombinationEditorParams<T = any> {
-    render: (props: ICellEditorParams<T>, ref: ForwardedRef<ICellEditorReactComp>) => ReactElement | null;
-}
-declare const _default: import("react").ForwardRefExoticComponent<ICellEditorParams<any, any> & CombinationEditorParams<any> & import("react").RefAttributes<ICellEditorReactComp>>;
-export default _default;

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

@@ -1,25 +0,0 @@
-var _excluded = ["render"];
-
-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 _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; }
-
-function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-
-import { forwardRef } from 'react';
-import { useGridStore } from "../hooks";
-export default /*#__PURE__*/forwardRef(function CombinationEditor(props, ref) {
-  var render = props.render,
-      restProps = _objectWithoutProperties(props, _excluded);
-
-  var context = useGridStore(function (state) {
-    return state.context;
-  });
-  return render(_objectSpread(_objectSpread({}, restProps), {}, {
-    context: context
-  }), ref);
-});