primereact 10.6.5 → 10.6.6

package/datatable/datatable.esm.js

@@ -168,6 +168,7 @@ var ColumnBase = ComponentBase.extend({
     body: null,
     bodyClassName: null,
     bodyStyle: null,
+    cellEditValidateOnClose: false,
     cellEditValidator: null,
     cellEditValidatorEvent: 'click',
     className: null,
@@ -1157,6 +1158,7 @@ var BodyCell = /*#__PURE__*/React.memo(function (props) {
   var selfClick = React.useRef(false);
   var tabindexTimeout = React.useRef(null);
   var initFocusTimeout = React.useRef(null);
+  var editingRowDataStateRef = React.useRef(null);
   var _props$ptCallbacks = props.ptCallbacks,
     ptm = _props$ptCallbacks.ptm,
     ptmo = _props$ptCallbacks.ptmo,
@@ -1193,6 +1195,9 @@ var BodyCell = /*#__PURE__*/React.memo(function (props) {
   var isEditable = function isEditable() {
     return getColumnProp('editor');
   };
+  var cellEditValidateOnClose = function cellEditValidateOnClose() {
+    return getColumnProp('cellEditValidateOnClose');
+  };
   var _useEventListener = useEventListener({
       type: 'click',
       listener: function listener(e) {
@@ -1275,40 +1280,37 @@ var BodyCell = /*#__PURE__*/React.memo(function (props) {
       unbindDocumentClickListener();
       OverlayService.off('overlay-click', overlayEventListener.current);
       overlayEventListener.current = null;
+      editingRowDataStateRef.current = null;
       selfClick.current = false;
     }, 1);
   };
   var switchCellToViewMode = function switchCellToViewMode(event, submit) {
     var callbackParams = getCellCallbackParams(event);
-    setEditingRowDataState(function (prev) {
-      var newRowData = prev;
-      var newValue = resolveFieldData(newRowData);
-      var params = _objectSpread$a(_objectSpread$a({}, callbackParams), {}, {
-        newRowData: newRowData,
-        newValue: newValue
-      });
-      var onCellEditCancel = getColumnProp('onCellEditCancel');
-      var cellEditValidator = getColumnProp('cellEditValidator');
-      var onCellEditComplete = getColumnProp('onCellEditComplete');
-      if (!submit && onCellEditCancel) {
-        onCellEditCancel(params);
-      }
-      var valid = true;
-      if (!submit && cellEditValidator) {
-        valid = cellEditValidator(params);
-      }
-      if (valid) {
-        if (submit && onCellEditComplete) {
-          setTimeout(function () {
-            return onCellEditComplete(params);
-          });
-        }
-        closeCell(event);
-      } else {
-        event.preventDefault();
-      }
-      return newRowData;
+    var newRowData = _objectSpread$a({}, editingRowDataStateRef.current);
+    var newValue = resolveFieldData(newRowData);
+    var params = _objectSpread$a(_objectSpread$a({}, callbackParams), {}, {
+      newRowData: newRowData,
+      newValue: newValue
     });
+    var onCellEditCancel = getColumnProp('onCellEditCancel');
+    var cellEditValidator = getColumnProp('cellEditValidator');
+    var onCellEditComplete = getColumnProp('onCellEditComplete');
+    if (!submit && onCellEditCancel) {
+      onCellEditCancel(params);
+    }
+    var valid = true;
+    if ((!submit || cellEditValidateOnClose()) && cellEditValidator) {
+      valid = cellEditValidator(params);
+    }
+    if (valid) {
+      if (submit && onCellEditComplete) {
+        onCellEditComplete(params);
+      }
+      closeCell(event);
+    } else {
+      event.preventDefault();
+    }
+    setEditingRowDataState(newRowData);
   };
   var findNextSelectableCell = function findNextSelectableCell(cell) {
     var nextCell = cell.nextElementSibling;
@@ -1579,6 +1581,11 @@ var BodyCell = /*#__PURE__*/React.memo(function (props) {
       setEditingRowDataState(getEditingRowData());
     }
   }, [props.editingMeta]);
+  React.useEffect(function () {
+    if (editingRowDataState) {
+      editingRowDataStateRef.current = editingRowDataState;
+    }
+  }, [editingRowDataState]);
   React.useEffect(function () {
     if (props.editMode === 'cell' || props.editMode === 'row') {
       var callbackParams = getCellCallbackParams();
@@ -1689,10 +1696,11 @@ var BodyCell = /*#__PURE__*/React.memo(function (props) {
         rowIndex: props.rowIndex,
         props: props.tableProps
       }) : true;
+      var customIcon = getColumnProp('rowReorderIcon');
       var rowReorderIconProps = mergeProps({
         className: cx('rowReorderIcon')
-      }, getColumnPTOptions('rowReorderIcon'));
-      var rowReorderIcon = getColumnProp('rowReorderIcon') || /*#__PURE__*/React.createElement(BarsIcon, rowReorderIconProps);
+      }, customIcon ? null : getColumnPTOptions('rowReorderIcon'));
+      var rowReorderIcon = customIcon || /*#__PURE__*/React.createElement(BarsIcon, rowReorderIconProps);
       content = showReorder ? IconUtils.getJSXIcon(rowReorderIcon, _objectSpread$a({}, rowReorderIconProps), {
         props: props
       }) : null;
@@ -2136,7 +2144,7 @@ var BodyRow = /*#__PURE__*/React.memo(function (props) {
         focusedItem && focusedItem !== firstSelectedRow && (focusedItem.tabIndex = '-1');
       } else {
         rows[0].tabIndex = '0';
-        focusedItem !== rows[0] && (rows[rowIndex].tabIndex = '-1');
+        focusedItem !== rows[0] && (rows[props.rowIndex].tabIndex = '-1');
       }
     }
   };
@@ -3036,6 +3044,7 @@ var TableBody = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function
     var event = e.originalEvent;
     if (!isUnsyled && DomHandler.hasClass(event.target, 'p-datatable-reorderablerow-handle')) {
       event.currentTarget.draggable = true;
+      event.target.draggable = false;
     } else {
       event.currentTarget.draggable = false;
     }
@@ -5617,6 +5626,19 @@ var TableHeader = /*#__PURE__*/React.memo(function (props) {
 });
 TableHeader.displayName = 'TableHeader';
 
+var getStorage = function getStorage(stateStorageProp) {
+  switch (stateStorageProp) {
+    case 'local':
+      return window.localStorage;
+    case 'session':
+      return window.sessionStorage;
+    case 'custom':
+      return null;
+    default:
+      throw new Error(stateStorageProp + ' is not a valid value for the state storage, supported values are "local", "session" and "custom".');
+  }
+};
+
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
 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; }
@@ -5801,18 +5823,6 @@ var DataTable = /*#__PURE__*/React.forwardRef(function (inProps, ref) {
     }
     return columns;
   };
-  var getStorage = function getStorage() {
-    switch (props.stateStorage) {
-      case 'local':
-        return window.localStorage;
-      case 'session':
-        return window.sessionStorage;
-      case 'custom':
-        return null;
-      default:
-        throw new Error(props.stateStorage + ' is not a valid value for the state storage, supported values are "local", "session" and "custom".');
-    }
-  };
   var saveState = function saveState() {
     var state = {};
     if (props.paginator) {
@@ -5848,7 +5858,7 @@ var DataTable = /*#__PURE__*/React.forwardRef(function (inProps, ref) {
         props.customSaveState(state);
       }
     } else {
-      var storage = getStorage();
+      var storage = getStorage(props.stateStorage);
       if (ObjectUtils.isNotEmpty(state)) {
         storage.setItem(props.stateKey, JSON.stringify(state));
       }
@@ -5858,7 +5868,7 @@ var DataTable = /*#__PURE__*/React.forwardRef(function (inProps, ref) {
     }
   };
   var clearState = function clearState() {
-    var storage = getStorage();
+    var storage = getStorage(props.stateStorage);
     if (storage && props.stateKey) {
       storage.removeItem(props.stateKey);
     }
@@ -5870,7 +5880,7 @@ var DataTable = /*#__PURE__*/React.forwardRef(function (inProps, ref) {
         restoredState = props.customRestoreState();
       }
     } else {
-      var storage = getStorage();
+      var storage = getStorage(props.stateStorage);
       var stateString = storage.getItem(props.stateKey);
       var dateFormat = /\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.\d{3}Z/;
       var reviver = function reviver(key, value) {