@gridsuite/commons-ui 0.35.5 → 0.36.0

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

@@ -21,32 +21,51 @@ var ElementSearchDialog = function ElementSearchDialog(props) {
     elementsFound = props.elementsFound,
     renderElement = props.renderElement,
     searchTermDisabled = props.searchTermDisabled,
-    initialSearchTerm = props.initialSearchTerm;
+    searchTermDisableReason = props.searchTermDisableReason;
   var _useState = useState(false),
     expanded = _useState[0],
     setExpanded = _useState[1];
-  var _useState2 = useState(false),
-    loading = _useState2[0],
-    setLoading = _useState2[1];
+  var _useState2 = useState(searchTermDisabled && searchTermDisableReason ? {
+      label: searchTermDisableReason
+    } : null),
+    value = _useState2[0],
+    setValue = _useState2[1];
+  var _useState3 = useState(false),
+    loading = _useState3[0],
+    setLoading = _useState3[1];
   useEffect(function () {
     setLoading(false);
   }, [elementsFound]);
+  useEffect(function () {
+    if (!searchTermDisabled || !searchTermDisableReason) {
+      setValue(null);
+    } else {
+      setValue({
+        label: searchTermDisableReason
+      });
+    }
+  }, [searchTermDisabled, searchTermDisableReason]);
   var handleSearchTermChange = function handleSearchTermChange(term) {
     if (term) {
       setLoading(true);
       onSearchTermChange(term);
       setExpanded(true);
+      setValue({
+        label: term
+      });
     } else {
       setExpanded(false);
+      setValue(null);
     }
   };
   var handleClose = useCallback(function () {
+    setValue(null);
     setExpanded(false);
     onClose();
   }, [onClose]);
   return /*#__PURE__*/React.createElement(Dialog, {
     open: open,
-    onClose: onClose,
+    onClose: handleClose,
     disableRestoreFocus: true,
     "aria-labelledby": "dialog-title-search",
     fullWidth: true
@@ -58,13 +77,15 @@ var ElementSearchDialog = function ElementSearchDialog(props) {
       setExpanded(false);
     },
     fullWidth: true,
+    freeSolo: true,
     onInputChange: function onInputChange(_event, value) {
       if (!searchTermDisabled) {
         handleSearchTermChange(value);
       }
     },
     onChange: function onChange(_event, newValue) {
-      return onSelectionChange(newValue);
+      onSelectionChange(newValue);
+      setValue(null);
     },
     getOptionLabel: function getOptionLabel(option) {
       return option.label;
@@ -100,9 +121,7 @@ var ElementSearchDialog = function ElementSearchDialog(props) {
         })
       }));
     },
-    defaultValue: searchTermDisabled ? {
-      label: initialSearchTerm
-    } : null,
+    value: value,
     disabled: searchTermDisabled
   })));
 };
@@ -115,6 +134,6 @@ ElementSearchDialog.propTypes = process.env.NODE_ENV !== "production" ? {
   elementsFound: PropTypes.array.isRequired,
   renderElement: PropTypes.func.isRequired,
   searchTermDisabled: PropTypes.bool,
-  initialSearchTerm: PropTypes.string
+  searchTermDisableReason: PropTypes.string
 } : {};
 export default ElementSearchDialog;

package/es/components/OverflowableText/overflowable-text.js

@@ -75,7 +75,7 @@ OverflowableText.propTypes = process.env.NODE_ENV !== "production" ? {
   text: PropTypes.oneOfType([PropTypes.string, PropTypes.number, PropTypes.node]),
   tooltipStyle: PropTypes.string,
   tooltipSx: PropTypes.object,
-  sx: PropTypes.object,
+  sx: PropTypes.oneOfType([PropTypes.object, PropTypes.array, PropTypes.func]),
   className: PropTypes.string
 } : {};
 export default OverflowableText;

package/es/components/TopBar/TopBar.js

@@ -183,7 +183,7 @@ var TopBar = function TopBar(_ref2) {
     onLanguageClick = _ref2.onLanguageClick,
     language = _ref2.language,
     searchTermDisabled = _ref2.searchTermDisabled,
-    initialSearchTerm = _ref2.initialSearchTerm;
+    searchTermDisableReason = _ref2.searchTermDisableReason;
   var _React$useState = React.useState(null),
     anchorElSettingsMenu = _React$useState[0],
     setAnchorElSettingsMenu = _React$useState[1];
@@ -260,7 +260,7 @@ var TopBar = function TopBar(_ref2) {
   useEffect(function () {
     if (user && withElementsSearch && !searchDisabled) {
       var openSearch = function openSearch(e) {
-        if (e.ctrlKey && e.key === 'F') {
+        if (e.ctrlKey && e.shiftKey && (e.key === 'F' || e.key === 'f')) {
           e.preventDefault();
           setDialogSearchOpen(true);
         }
@@ -312,7 +312,7 @@ var TopBar = function TopBar(_ref2) {
     elementsFound: elementsFound,
     renderElement: renderElement,
     searchTermDisabled: searchTermDisabled,
-    initialSearchTerm: initialSearchTerm
+    searchTermDisableReason: searchTermDisableReason
   }), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Button, {
     color: "inherit",
     onClick: handleClickElementSearch,
@@ -560,6 +560,6 @@ TopBar.propTypes = process.env.NODE_ENV !== "production" ? {
   onLanguageClick: PropTypes.func.isRequired,
   language: PropTypes.string.isRequired,
   searchTermDisabled: PropTypes.bool,
-  initialSearchTerm: PropTypes.string
+  searchTermDisableReason: PropTypes.string
 } : {};
 export default TopBar;

package/package.json

@@ -1,10 +1,10 @@
 {
     "name": "@gridsuite/commons-ui",
-    "version": "0.35.5",
+    "version": "0.36.0",
     "description": "common react components for gridsuite applications",
     "engines": {
-        "npm": "<=6",
-        "node": ">=12 <=14"
+        "npm": ">=9",
+        "node": ">=18"
     },
     "exports": "es/index.js",
     "module": "es/index.js",
@@ -41,7 +41,7 @@
         "@mui/lab": "^5.0.0-alpha.72",
         "@mui/material": "^5.5.0",
         "@hookform/resolvers": "^3.0.0",
-        "notistack": "^2.0.3",
+        "notistack": "^3.0.0",
         "react-router-dom": "^6.0.0",
         "react": "^18.0.0",
         "react-dom": "^18.0.0",
@@ -71,7 +71,7 @@
         "eslint-plugin-prettier": "^4.0.0",
         "eslint-plugin-react": "^7.21.0",
         "eslint-plugin-react-hooks": "^4.1.2",
-        "notistack": "^2.0.3",
+        "notistack": "^3.0.0",
         "nwb": "^0.25.x",
         "prettier": "^2.0.0",
         "puppeteer": "^17.0.0",