feat(search): add searchOnEnter flag to SearchBox, default true

opengovsg · Sep 2, 2021 · dd9a001 · dd9a001
1 parent 4cf6889
commit dd9a001
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/client/src/components/EnquiryModal/EnquiryModal.component.tsx b/client/src/components/EnquiryModal/EnquiryModal.component.tsx
@@ -80,6 +80,7 @@ export const EnquiryModal = ({
                 placeholder=""
                 value=""
                 showSearchIcon={false}
+                searchOnEnter={false}
                 isInvalid={formErrors.questionTitle}
                 inputRef={ref}
                 {...questionTitleProps}

diff --git a/client/src/components/SearchBox/SearchBox.component.jsx b/client/src/components/SearchBox/SearchBox.component.jsx
@@ -18,6 +18,7 @@ const SearchBox = ({
   inputRef,
   handleSubmit = undefined,
   handleAbandon = (_inputValue) => {},
+  searchOnEnter = true,
   showSearchIcon = true,
   ...inputProps
 }) => {
@@ -146,9 +147,11 @@ const SearchBox = ({
                         // when selecting option using keyboard
                         // downshift prevents form submission which is used to submit analytics event
                         // detect such event and separately send analytics event
-                        sendSearchEventToAnalytics(inputValue)
-                        if (highlightedIndex === null) {
+                        if (highlightedIndex === null && searchOnEnter) {
+                          sendSearchEventToAnalytics(inputValue)
                           handleSubmit(inputValue)
+                        } else if (highlightedIndex !== null) {
+                          sendSearchEventToAnalytics(inputValue)
                         }
                       }