@gridsuite/commons-ui 0.38.0 → 0.40.0

package/es/components/ElementSearchDialog/element-search-dialog.js

@@ -45,6 +45,13 @@ var ElementSearchDialog = function ElementSearchDialog(props) {
       });
     }
   }, [searchTermDisabled, searchTermDisableReason]);
+
+  // to reset the value between the dialog closing and opening
+  useEffect(function () {
+    setValue(function (old) {
+      return !open ? null : old;
+    });
+  }, [open]);
   var handleSearchTermChange = function handleSearchTermChange(term) {
     if (term) {
       setLoading(true);

package/es/components/TreeViewFinder/TreeViewFinder.js

@@ -1,4 +1,5 @@
 var _defaultStyles;
+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); }
 /**
  * Copyright (c) 2021, RTE (http://www.rte-france.com)
  * This Source Code Form is subject to the terms of the Mozilla Public
@@ -7,7 +8,7 @@ var _defaultStyles;
  */
 
 import React, { useState, useCallback, useEffect } from 'react';
-import { FormattedMessage, useIntl } from 'react-intl';
+import { useIntl } from 'react-intl';
 import PropTypes from 'prop-types';
 import { toNestedGlobalSelectors, makeComposeClasses } from '../../utils/styles';
 import { styled } from '@mui/system';
@@ -23,6 +24,7 @@ import Typography from '@mui/material/Typography';
 import ExpandMoreIcon from '@mui/icons-material/ExpandMore';
 import ChevronRightIcon from '@mui/icons-material/ChevronRight';
 import CheckIcon from '@mui/icons-material/Check';
+import CancelButton from '../react-hook-form/utils/cancel-button';
 
 // As a bunch of individual variables to try to make it easier
 // to track that they are all used. Not sure, maybe group them in an object ?
@@ -84,6 +86,7 @@ var composeClasses = makeComposeClasses(generateTreeViewFinderClass);
  * @param {String}          [validationButtonText=default text] - Customized Validation Button text (default: Add N Elements)
  * @param {Boolean}         [onlyLeaves=true] - Allow/Forbid selection only on leaves
  * @param {Boolean}         [multiselect=false] - Allow/Forbid multiselection on Tree
+ * @param {Object}          [cancelButtonProps] - The cancel button props
  */
 var TreeViewFinder = function TreeViewFinder(props) {
   var intl = useIntl();
@@ -100,7 +103,8 @@ var TreeViewFinder = function TreeViewFinder(props) {
     onlyLeaves = props.onlyLeaves,
     multiselect = props.multiselect,
     sortMethod = props.sortMethod,
-    className = props.className;
+    className = props.className,
+    cancelButtonProps = props.cancelButtonProps;
   var _useState = useState({}),
     mapPrintedNodes = _useState[0],
     setMapPrintedNodes = _useState[1];
@@ -277,8 +281,7 @@ var TreeViewFinder = function TreeViewFinder(props) {
     multiSelect: multiselect
   }, data && Array.isArray(data) ? data.sort(sortMethod).map(function (child) {
     return renderTree(child);
-  }) : null)), /*#__PURE__*/React.createElement(DialogActions, null, /*#__PURE__*/React.createElement(Button, {
-    variant: "contained",
+  }) : null)), /*#__PURE__*/React.createElement(DialogActions, null, /*#__PURE__*/React.createElement(CancelButton, _extends({
     style: {
       "float": 'left',
       margin: '5px'
@@ -287,10 +290,8 @@ var TreeViewFinder = function TreeViewFinder(props) {
       _onClose([]);
       setSelected([]);
     }
-  }, /*#__PURE__*/React.createElement(FormattedMessage, {
-    id: "treeview_finder/cancel"
-  })), /*#__PURE__*/React.createElement(Button, {
-    variant: "contained",
+  }, cancelButtonProps)), /*#__PURE__*/React.createElement(Button, {
+    variant: "outlined",
     style: {
       "float": 'left',
       margin: '5px'
@@ -323,7 +324,8 @@ TreeViewFinder.propTypes = process.env.NODE_ENV !== "production" ? {
   defaultExpanded: PropTypes.arrayOf(PropTypes.string),
   onlyLeaves: PropTypes.bool,
   multiselect: PropTypes.bool,
-  sortMethod: PropTypes.func
+  sortMethod: PropTypes.func,
+  cancelButtonProps: PropTypes.object
 } : {};
 
 /* TreeViewFinder props default values */

package/es/components/react-hook-form/numbers/float-input.js

@@ -9,13 +9,51 @@ function _extends() { _extends = Object.assign ? Object.assign.bind() : function
 import React from 'react';
 import TextInput from '../text-input';
 import { isFloatNumber } from './utils';
+
+// toLocaleString never uses exponential notation unlike toString.  Avoiding
+// exponential notation makes in place normalizing of numbers after each
+// keystroke less intrusive: we can almost always normalize to a number that
+// uses the same string representation as the intermediate text that the user
+// typed. For example, if the user wants to input "625", they will write "6"
+// and then "62" and then "625". The intermediate strings are numbers that have
+// nothing in common with the final number but their normalization is the
+// same as what was typed by the user. With exponential notation, if the user
+// wants to input "12.5e21", at the intermediate step of "12.5e2" their input
+// is normalized to "1.25e3" and after adding the final "1" they get "12.5e31"
+// instead of "12.5e21".
+// Note: with 16+ digits, two small problems in the current implementation appear:
+//   - rounding due to precision causes the cursor to jump at the end.
+//   - rounding due to precision causes the last digits of the number to jiggle.
+// These two problems should be fixable with manual rounding and cursor
+// handling if we need it.
+var normalizeFixed = function normalizeFixed(number) {
+  return number.toLocaleString('en-US', {
+    maximumFractionDigits: 20,
+    useGrouping: false
+  });
+};
 var FloatInput = function FloatInput(props) {
   var inputTransform = function inputTransform(value) {
-    var sanitizedValue = value === null || value === void 0 ? void 0 : value.toString().replace(',', '.');
-    if (['-', '.'].includes(sanitizedValue)) {
-      return sanitizedValue;
+    if (typeof value == 'number' && !isNaN(value)) {
+      // if we have a parsed real number, normalize like we do after each
+      // keystroke in outputTransform for consistency. We get parsed
+      // numbers when the data doesn't come from a user edit in the form,
+      // but from data persisted as a float.
+      return normalizeFixed(value);
+    } else {
+      // The user is editing, leave as is because we already did what we
+      // need to do in outputTransform after the previous keystroke.
+      // NOTE: To avoid "bad things" we haven't predicted and be extra
+      // cautious, we clear the text on NaN, so we need to special case
+      // known inputs that would be rejected by isNaN but are accepted by
+      // our acceptValue because they are needed as intermediate strings
+      // for the user to input useful numbers.
+      // TODO can we remove the isNaN check and the special cases check?
+      if (['-', '.'].includes(value)) {
+        return value;
+      }
+      return value === null || isNaN(value) ? '' : value;
     }
-    return sanitizedValue === null || isNaN(sanitizedValue) ? '' : sanitizedValue;
   };
   var outputTransform = function outputTransform(value) {
     if (value === '-') {
@@ -25,10 +63,37 @@ var FloatInput = function FloatInput(props) {
       return null;
     }
     var tmp = (value === null || value === void 0 ? void 0 : value.replace(',', '.')) || '';
-    if (tmp.endsWith('.') || tmp.endsWith('0')) {
+
+    // Can't show the normalization to the user when the fractional part
+    // ends with 0 because normalizing removes the trailing zeroes and prevents
+    // inputting the required intermediate strings (e.g "1." or "1.0" to input "1.02")
+    // So we return the user string instead. This has the downside that
+    // when the user finally writes a non 0 digit at the end, the normalization takes place
+    // and may startle the user when changing a lot of its input text.
+    // For example:
+    //   - "1.00000000000000000000000000" and then press any non zero digit
+    //      removes all the zeroes at once
+    //   - "1." or "1.0" and then left arrow to move the cursor to the left and then inputting many digits
+    //      disables all normalization, can write huge numbers that are not rounded like
+    //      -    1231231231241231241231245123124234234123123124234.
+    //        vs 1231231231241231300000000000000000000000000000000
+    //      -    1.4312322342321323434534234235234
+    //        vs 1.4312322342321324
+    // Note: this is a symmetric problem inputting many zeros
+    // to the left of a number to allow to input a final leading nonzero
+    // digit, but users never want to do that, unlike inputting trailing zeroes in the
+    // fractional part before inputing the final trailing non zero digit
+    if (tmp.endsWith('.') || tmp.includes('.') && tmp.endsWith('0')) {
       return tmp;
     }
-    return parseFloat(tmp) || null;
+
+    // normalize after each user keystroke, needs to be very unintrusive
+    // otherwise users are surprised when typing doesn't do what they want
+    // NOTE: the parse should always succeed and produce non-NaN because we
+    // restrict what the user can type with "acceptValue" but if we
+    // have a bug just clear the data instead of sending "NaN"
+    var parsed = parseFloat(tmp);
+    return isNaN(parsed) ? null : normalizeFixed(parsed);
   };
   return /*#__PURE__*/React.createElement(TextInput, _extends({
     acceptValue: isFloatNumber,

package/es/components/react-hook-form/utils/cancel-button.js

@@ -1,26 +1,23 @@
+function _objectDestructuringEmpty(obj) { if (obj == null) throw new TypeError("Cannot destructure " + obj); }
+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); }
+/**
+ * Copyright (c) 2023, RTE (http://www.rte-france.com)
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
 import React from 'react';
 import { Button } from '@mui/material';
 import { FormattedMessage } from 'react-intl';
 import PropTypes from 'prop-types';
 var CancelButton = function CancelButton(_ref) {
-  var onClick = _ref.onClick,
-    variant = _ref.variant,
-    disabled = _ref.disabled,
-    _ref$withCustomColor = _ref.withCustomColor,
-    withCustomColor = _ref$withCustomColor === void 0 ? true : _ref$withCustomColor;
-  return /*#__PURE__*/React.createElement(Button, {
-    onClick: onClick,
-    variant: variant,
-    disabled: disabled,
-    color: withCustomColor ? 'customButton' : 'primary'
-  }, /*#__PURE__*/React.createElement(FormattedMessage, {
+  var buttonProps = _extends({}, (_objectDestructuringEmpty(_ref), _ref));
+  return /*#__PURE__*/React.createElement(Button, buttonProps, /*#__PURE__*/React.createElement(FormattedMessage, {
     id: "cancel"
   }));
 };
 CancelButton.propTypes = process.env.NODE_ENV !== "production" ? {
-  onClick: PropTypes.func.isRequired,
-  variant: PropTypes.string,
-  disabled: PropTypes.bool,
-  withCustomColor: PropTypes.bool
+  buttonProps: PropTypes.object
 } : {};
 export default CancelButton;

package/es/components/react-hook-form/utils/submit-button.js

@@ -1,3 +1,5 @@
+function _objectDestructuringEmpty(obj) { if (obj == null) throw new TypeError("Cannot destructure " + obj); }
+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); }
 /**
  * Copyright (c) 2022, RTE (http://www.rte-france.com)
  * This Source Code Form is subject to the terms of the Mozilla Public
@@ -9,17 +11,19 @@ import React from 'react';
 import { Button } from '@mui/material';
 import { useFormState } from 'react-hook-form';
 import { FormattedMessage } from 'react-intl';
+import PropTypes from 'prop-types';
 var SubmitButton = function SubmitButton(_ref) {
-  var onClick = _ref.onClick,
-    _ref$disabled = _ref.disabled,
-    disabled = _ref$disabled === void 0 ? false : _ref$disabled;
+  var _buttonProps$disabled;
+  var buttonProps = _extends({}, (_objectDestructuringEmpty(_ref), _ref));
   var _useFormState = useFormState(),
     isDirty = _useFormState.isDirty;
-  return /*#__PURE__*/React.createElement(Button, {
-    onClick: onClick,
-    disabled: !isDirty || disabled
-  }, /*#__PURE__*/React.createElement(FormattedMessage, {
+  return /*#__PURE__*/React.createElement(Button, _extends({}, buttonProps, {
+    disabled: !isDirty || ((_buttonProps$disabled = buttonProps === null || buttonProps === void 0 ? void 0 : buttonProps.disabled) !== null && _buttonProps$disabled !== void 0 ? _buttonProps$disabled : false)
+  }), /*#__PURE__*/React.createElement(FormattedMessage, {
     id: "validate"
   }));
 };
+SubmitButton.propTypes = process.env.NODE_ENV !== "production" ? {
+  buttonProps: PropTypes.object
+} : {};
 export default SubmitButton;

package/es/components/translations/common-button-en.js

@@ -0,0 +1,12 @@
+/**
+ * Copyright (c) 2023, RTE (http://www.rte-france.com)
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+var common_button_en = {
+  cancel: 'Cancel',
+  validate: 'Validate'
+};
+export default common_button_en;

package/es/components/translations/common-button-fr.js

@@ -0,0 +1,12 @@
+/**
+ * Copyright (c) 2023, RTE (http://www.rte-france.com)
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+var common_button_fr = {
+  cancel: 'Annuler',
+  validate: 'Valider'
+};
+export default common_button_fr;

package/es/components/translations/treeview-finder-en.js

@@ -7,7 +7,6 @@
 
 var treeview_finder_en = {
   'treeview_finder/close': 'Close',
-  'treeview_finder/cancel': 'Cancel',
   'treeview_finder/validate': 'Validate',
   'treeview_finder/add': 'Add...',
   'treeview_finder/deleteSelection': 'Delete selection',

package/es/components/translations/treeview-finder-fr.js

@@ -7,7 +7,6 @@
 
 var treeview_finder_fr = {
   'treeview_finder/close': 'Fermer',
-  'treeview_finder/cancel': 'Annuler',
   'treeview_finder/validate': 'Valider',
   'treeview_finder/add': 'Ajouter...',
   'treeview_finder/deleteSelection': 'Supprimer la selection',

package/es/index.js

@@ -43,6 +43,8 @@ export { default as flat_parameters_en } from './components/translations/flat-pa
 export { default as flat_parameters_fr } from './components/translations/flat-parameters-fr';
 export { default as multiple_selection_dialog_en } from './components/translations/multiple-selection-dialog-en';
 export { default as multiple_selection_dialog_fr } from './components/translations/multiple-selection-dialog-fr';
+export { default as common_button_en } from './components/translations/common-button-en';
+export { default as common_button_fr } from './components/translations/common-button-fr';
 export { TagRenderer } from './components/ElementSearchDialog';
 export { EquipmentItem } from './components/ElementSearchDialog/equipment-item';
 export { default as CardErrorBoundary } from './components/CardErrorBoundary';

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@gridsuite/commons-ui",
-    "version": "0.38.0",
+    "version": "0.40.0",
     "description": "common react components for gridsuite applications",
     "engines": {
         "npm": ">=9",