orc-shared 5.7.0-dev.12 → 5.7.0-dev.13

package/dist/components/MaterialUI/Inputs/PredefinedElements/SearchControl.js

@@ -184,15 +184,13 @@ var SearchControl = function SearchControl(_ref) {
   searchOption = getSearchOptionValue(searchOptions, searchOption);
   var classes = useStyles();
   var inputRef = (0, _react.useRef)();
-  var cleanUpSearchValue = function cleanUpSearchValue(value) {
-    if (trimSearchvalue) {
-      return value == null ? void 0 : value.trim();
-    }
-    return value;
+  var onSearchInternal = function onSearchInternal(newSearchOption, value) {
+    var searchValue = trimSearchvalue ? value == null ? void 0 : value.trim() : value;
+    onSearch(newSearchOption, searchValue);
   };
-  var update = function update(value) {
+  var update = function update(newSearchOption) {
     if (focusSearchOnSearchOptionChange && inputRef.current) {
-      onSearch(value, "");
+      onSearchInternal(newSearchOption, "");
       setTimeout(function () {
         /* istanbul ignore next */
         if (inputRef.current) {
@@ -202,7 +200,8 @@ var SearchControl = function SearchControl(_ref) {
         }
       }, 0);
     } else {
-      onSearch(value, cleanUpSearchValue(defaultValue));
+      var _inputRef$current;
+      onSearchInternal(newSearchOption, (_inputRef$current = inputRef.current) == null ? void 0 : _inputRef$current.value);
     }
   };
   var selectProps = new _SelectProps.default();
@@ -235,9 +234,9 @@ var SearchControl = function SearchControl(_ref) {
     });
   };
   var onSubmit = function onSubmit(event) {
-    var _inputRef$current;
+    var _inputRef$current2;
     // using form submit instead of a keydown (with key=enter) to allow the 'enter key' event to be canceled elsewhere to avoid the submit event
-    onSearch(searchOption, cleanUpSearchValue((_inputRef$current = inputRef.current) == null ? void 0 : _inputRef$current.value));
+    onSearchInternal(searchOption, (_inputRef$current2 = inputRef.current) == null ? void 0 : _inputRef$current2.value);
     event.preventDefault();
   };
   var inputSection = /*#__PURE__*/_react.default.createElement("div", {
@@ -265,7 +264,7 @@ var SearchControl = function SearchControl(_ref) {
       disabled: disabled,
       onClick: function onClick() {
         inputRef.current.value = null;
-        onSearch(searchOption);
+        onSearchInternal(searchOption);
         inputRef.current.focus();
       },
       className: classes.clearButton
@@ -281,7 +280,7 @@ var SearchControl = function SearchControl(_ref) {
       root: classes.searchButton
     },
     onClick: function onClick() {
-      onSearch(searchOption, inputRef.current.value);
+      onSearchInternal(searchOption, inputRef.current.value);
     }
   }, /*#__PURE__*/_react.default.createElement(_Icon.default, {
     id: "search"

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "orc-shared",
-	"version": "5.7.0-dev.12",
+	"version": "5.7.0-dev.13",
 	"description": "Shared code for Orckestra applications",
 	"main": "./src/index.js",
 	"exports": {

package/src/components/MaterialUI/Inputs/PredefinedElements/SearchControl.js

@@ -162,16 +162,15 @@ const SearchControl = ({
 
 	const inputRef = useRef();
 
-	const cleanUpSearchValue = value => {
-		if (trimSearchvalue) {
-			return value?.trim();
-		}
-		return value;
+	const onSearchInternal = (newSearchOption, value) => {
+		const searchValue = trimSearchvalue ? value?.trim() : value;
+
+		onSearch(newSearchOption, searchValue);
 	};
 
-	const update = value => {
+	const update = newSearchOption => {
 		if (focusSearchOnSearchOptionChange && inputRef.current) {
-			onSearch(value, "");
+			onSearchInternal(newSearchOption, "");
 			setTimeout(() => {
 				/* istanbul ignore next */
 				if (inputRef.current) {
@@ -181,7 +180,7 @@ const SearchControl = ({
 				}
 			}, 0);
 		} else {
-			onSearch(value, cleanUpSearchValue(defaultValue));
+			onSearchInternal(newSearchOption, inputRef.current?.value);
 		}
 	};
 
@@ -216,7 +215,7 @@ const SearchControl = ({
 
 	const onSubmit = event => {
 		// using form submit instead of a keydown (with key=enter) to allow the 'enter key' event to be canceled elsewhere to avoid the submit event
-		onSearch(searchOption, cleanUpSearchValue(inputRef.current?.value));
+		onSearchInternal(searchOption, inputRef.current?.value);
 		event.preventDefault();
 	};
 
@@ -239,7 +238,7 @@ const SearchControl = ({
 								disabled={disabled}
 								onClick={() => {
 									inputRef.current.value = null;
-									onSearch(searchOption);
+									onSearchInternal(searchOption);
 									inputRef.current.focus();
 								}}
 								className={classes.clearButton}
@@ -260,7 +259,7 @@ const SearchControl = ({
 			disabled={disabled}
 			classes={{ root: classes.searchButton }}
 			onClick={() => {
-				onSearch(searchOption, inputRef.current.value);
+				onSearchInternal(searchOption, inputRef.current.value);
 			}}
 		>
 			<Icon id="search" />