@pingux/astro 1.22.0 → 1.23.0-alpha.0

package/lib/cjs/components/ArrayField/ArrayField.js

@@ -68,6 +68,8 @@ var _statuses = _interopRequireDefault(require("../../utils/devUtils/constants/s
 
 var _isValidPositiveInt = _interopRequireDefault(require("../../utils/devUtils/props/isValidPositiveInt"));
 
+var _ArrayFieldItem = _interopRequireDefault(require("./ArrayFieldItem"));
+
 var _react2 = require("@emotion/react");
 
 var _excluded = ["addButtonLabel", "defaultValue", "value", "label", "helperText", "status", "onAdd", "onChange", "onDelete", "renderField", "labelProps", "maxSize", "maxSizeText"],
@@ -102,6 +104,22 @@ var ArrayField = function ArrayField(props) {
       maxSize = props.maxSize,
       maxSizeText = props.maxSizeText,
       others = (0, _objectWithoutProperties2["default"])(props, _excluded);
+
+  var valueRef = _react["default"].useRef(value);
+
+  valueRef.current = value;
+
+  var onAddRef = _react["default"].useRef(onAdd);
+
+  onAddRef.current = onAdd;
+
+  var onChangeRef = _react["default"].useRef(onChange);
+
+  onChangeRef.current = onChange;
+
+  var onDeleteRef = _react["default"].useRef(onDelete);
+
+  onDeleteRef.current = onDelete;
   var isControlled = value !== undefined;
   var createEmptyField = (0, _react.useCallback)(function () {
     return {
@@ -134,16 +152,16 @@ var ArrayField = function ArrayField(props) {
     }
 
     if (isControlled) {
-      onChange(mapArrayFieldWithNewValue(value, tempValue, fieldId));
+      onChangeRef.current(mapArrayFieldWithNewValue(valueRef.current, tempValue, fieldId));
     } else {
       setFieldValues(function (oldValues) {
         return mapArrayFieldWithNewValue(oldValues, tempValue, fieldId);
       });
     }
-  }, [isControlled, mapArrayFieldWithNewValue, onChange, value]);
+  }, [isControlled, mapArrayFieldWithNewValue]);
   var onFieldDelete = (0, _react.useCallback)(function (fieldId) {
     if (isControlled) {
-      onDelete(fieldId);
+      onDeleteRef.current(fieldId);
     } else {
       setFieldValues(function (oldValues) {
         return (0, _filter["default"])(oldValues).call(oldValues, function (_ref) {
@@ -152,10 +170,10 @@ var ArrayField = function ArrayField(props) {
         });
       });
     }
-  }, [isControlled, onDelete]);
+  }, [isControlled]);
   var onFieldAdd = (0, _react.useCallback)(function () {
-    if (onAdd) {
-      return onAdd();
+    if (onAddRef.current) {
+      return onAddRef.current();
     }
 
     return setFieldValues(function (oldValues) {
@@ -163,7 +181,7 @@ var ArrayField = function ArrayField(props) {
 
       return (0, _concat["default"])(_context = []).call(_context, oldValues, [createEmptyField()]);
     });
-  }, [createEmptyField, onAdd]);
+  }, [createEmptyField]);
 
   var _useLabel = (0, _label.useLabel)(_objectSpread({}, props)),
       raLabelProps = _useLabel.labelProps;
@@ -180,11 +198,16 @@ var ArrayField = function ArrayField(props) {
         fieldValue = _ref2.fieldValue,
         otherFieldProps = (0, _objectWithoutProperties2["default"])(_ref2, _excluded2);
     var isDisabled = (value || fieldValues).length === 1;
-    return (0, _react2.jsx)(_Box["default"], {
-      as: "li",
-      mb: "xs",
-      key: id
-    }, onComponentRender ? onComponentRender(id, fieldValue, onFieldValueChange, onFieldDelete, isDisabled, otherFieldProps) : renderField(id, fieldValue, onFieldValueChange, onFieldDelete, isDisabled, otherFieldProps));
+    return (0, _react2.jsx)(_ArrayFieldItem["default"], (0, _extends2["default"])({
+      key: id,
+      id: id,
+      isDisabled: isDisabled,
+      fieldValue: fieldValue,
+      onComponentRender: onComponentRender,
+      onFieldValueChange: onFieldValueChange,
+      onFieldDelete: onFieldDelete,
+      renderField: renderField
+    }, otherFieldProps));
   })), helperText && (0, _react2.jsx)(_FieldHelperText["default"], {
     status: status
   }, helperText), isLimitReached && (0, _react2.jsx)(_FieldHelperText["default"], {

package/lib/cjs/components/ArrayField/ArrayFieldItem.js

@@ -0,0 +1,50 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
+
+var _Object$defineProperty = require("@babel/runtime-corejs3/core-js-stable/object/define-property");
+
+_Object$defineProperty(exports, "__esModule", {
+  value: true
+});
+
+exports["default"] = void 0;
+
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/objectWithoutProperties"));
+
+var _react = _interopRequireDefault(require("react"));
+
+var _propTypes = _interopRequireDefault(require("prop-types"));
+
+var _Box = _interopRequireDefault(require("../Box"));
+
+var _react2 = require("@emotion/react");
+
+var _excluded = ["id", "onComponentRender", "fieldValue", "isDisabled", "onFieldDelete", "onFieldValueChange", "renderField"];
+
+var ArrayFieldItem = /*#__PURE__*/_react["default"].memo(function (_ref) {
+  var id = _ref.id,
+      onComponentRender = _ref.onComponentRender,
+      fieldValue = _ref.fieldValue,
+      isDisabled = _ref.isDisabled,
+      onFieldDelete = _ref.onFieldDelete,
+      onFieldValueChange = _ref.onFieldValueChange,
+      renderField = _ref.renderField,
+      otherFieldProps = (0, _objectWithoutProperties2["default"])(_ref, _excluded);
+  return (0, _react2.jsx)(_Box["default"], {
+    as: "li",
+    mb: "xs"
+  }, onComponentRender ? onComponentRender(id, fieldValue, onFieldValueChange, onFieldDelete, isDisabled, otherFieldProps) : renderField(id, fieldValue, onFieldValueChange, onFieldDelete, isDisabled, otherFieldProps));
+});
+
+ArrayFieldItem.propTypes = {
+  id: _propTypes["default"].string,
+  onComponentRender: _propTypes["default"].func,
+  fieldValue: _propTypes["default"].string,
+  isDisabled: _propTypes["default"].bool,
+  onFieldDelete: _propTypes["default"].func,
+  onFieldValueChange: _propTypes["default"].func,
+  renderField: _propTypes["default"].func
+};
+var _default = ArrayFieldItem;
+exports["default"] = _default;

package/lib/components/ArrayField/ArrayField.js

@@ -32,6 +32,7 @@ import Text from '../Text';
 import Label from '../Label';
 import statuses from '../../utils/devUtils/constants/statuses';
 import isValidPositiveInt from '../../utils/devUtils/props/isValidPositiveInt';
+import ArrayFieldItem from './ArrayFieldItem';
 /**
  * Displays array collections providing useful functions and
  * optimizations for arrays.
@@ -57,6 +58,14 @@ var ArrayField = function ArrayField(props) {
       maxSizeText = props.maxSizeText,
       others = _objectWithoutProperties(props, _excluded);
 
+  var valueRef = React.useRef(value);
+  valueRef.current = value;
+  var onAddRef = React.useRef(onAdd);
+  onAddRef.current = onAdd;
+  var onChangeRef = React.useRef(onChange);
+  onChangeRef.current = onChange;
+  var onDeleteRef = React.useRef(onDelete);
+  onDeleteRef.current = onDelete;
   var isControlled = value !== undefined;
   var createEmptyField = useCallback(function () {
     return {
@@ -89,16 +98,16 @@ var ArrayField = function ArrayField(props) {
     }
 
     if (isControlled) {
-      onChange(mapArrayFieldWithNewValue(value, tempValue, fieldId));
+      onChangeRef.current(mapArrayFieldWithNewValue(valueRef.current, tempValue, fieldId));
     } else {
       setFieldValues(function (oldValues) {
         return mapArrayFieldWithNewValue(oldValues, tempValue, fieldId);
       });
     }
-  }, [isControlled, mapArrayFieldWithNewValue, onChange, value]);
+  }, [isControlled, mapArrayFieldWithNewValue]);
   var onFieldDelete = useCallback(function (fieldId) {
     if (isControlled) {
-      onDelete(fieldId);
+      onDeleteRef.current(fieldId);
     } else {
       setFieldValues(function (oldValues) {
         return _filterInstanceProperty(oldValues).call(oldValues, function (_ref) {
@@ -107,10 +116,10 @@ var ArrayField = function ArrayField(props) {
         });
       });
     }
-  }, [isControlled, onDelete]);
+  }, [isControlled]);
   var onFieldAdd = useCallback(function () {
-    if (onAdd) {
-      return onAdd();
+    if (onAddRef.current) {
+      return onAddRef.current();
     }
 
     return setFieldValues(function (oldValues) {
@@ -118,7 +127,7 @@ var ArrayField = function ArrayField(props) {
 
       return _concatInstanceProperty(_context = []).call(_context, oldValues, [createEmptyField()]);
     });
-  }, [createEmptyField, onAdd]);
+  }, [createEmptyField]);
 
   var _useLabel = useLabel(_objectSpread({}, props)),
       raLabelProps = _useLabel.labelProps;
@@ -136,11 +145,16 @@ var ArrayField = function ArrayField(props) {
         otherFieldProps = _objectWithoutProperties(_ref2, _excluded2);
 
     var isDisabled = (value || fieldValues).length === 1;
-    return ___EmotionJSX(Box, {
-      as: "li",
-      mb: "xs",
-      key: id
-    }, onComponentRender ? onComponentRender(id, fieldValue, onFieldValueChange, onFieldDelete, isDisabled, otherFieldProps) : renderField(id, fieldValue, onFieldValueChange, onFieldDelete, isDisabled, otherFieldProps));
+    return ___EmotionJSX(ArrayFieldItem, _extends({
+      key: id,
+      id: id,
+      isDisabled: isDisabled,
+      fieldValue: fieldValue,
+      onComponentRender: onComponentRender,
+      onFieldValueChange: onFieldValueChange,
+      onFieldDelete: onFieldDelete,
+      renderField: renderField
+    }, otherFieldProps));
   })), helperText && ___EmotionJSX(FieldHelperText, {
     status: status
   }, helperText), isLimitReached && ___EmotionJSX(FieldHelperText, {

package/lib/components/ArrayField/ArrayFieldItem.js

@@ -0,0 +1,31 @@
+import _objectWithoutProperties from "@babel/runtime-corejs3/helpers/esm/objectWithoutProperties";
+var _excluded = ["id", "onComponentRender", "fieldValue", "isDisabled", "onFieldDelete", "onFieldValueChange", "renderField"];
+import React from 'react';
+import PropTypes from 'prop-types';
+import Box from '../Box';
+import { jsx as ___EmotionJSX } from "@emotion/react";
+var ArrayFieldItem = /*#__PURE__*/React.memo(function (_ref) {
+  var id = _ref.id,
+      onComponentRender = _ref.onComponentRender,
+      fieldValue = _ref.fieldValue,
+      isDisabled = _ref.isDisabled,
+      onFieldDelete = _ref.onFieldDelete,
+      onFieldValueChange = _ref.onFieldValueChange,
+      renderField = _ref.renderField,
+      otherFieldProps = _objectWithoutProperties(_ref, _excluded);
+
+  return ___EmotionJSX(Box, {
+    as: "li",
+    mb: "xs"
+  }, onComponentRender ? onComponentRender(id, fieldValue, onFieldValueChange, onFieldDelete, isDisabled, otherFieldProps) : renderField(id, fieldValue, onFieldValueChange, onFieldDelete, isDisabled, otherFieldProps));
+});
+ArrayFieldItem.propTypes = {
+  id: PropTypes.string,
+  onComponentRender: PropTypes.func,
+  fieldValue: PropTypes.string,
+  isDisabled: PropTypes.bool,
+  onFieldDelete: PropTypes.func,
+  onFieldValueChange: PropTypes.func,
+  renderField: PropTypes.func
+};
+export default ArrayFieldItem;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pingux/astro",
-  "version": "1.22.0",
+  "version": "1.23.0-alpha.0",
   "description": "PingUX themeable React component library",
   "author": "ux-development@pingidentity.com",
   "license": "Apache-2.0",