-
Notifications
You must be signed in to change notification settings - Fork 22
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
react/DP-13169: Add default header search behavior. #519
Open
avrilpearl
wants to merge
8
commits into
develop
Choose a base branch
from
react/DP-13169--Default-HeaderSearch-Behaviour
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
77b2478
react/DP-13169: Add default header search behavior.
avrilpearl 0c4024e
add state value check
avrilpearl 5bac5f5
Update changelogs/DP-13169.md
clairesunstudio 6038cb5
Update react/src/components/molecules/HeaderSearch/index.js
smurrayatwork 49043c0
Update react/src/components/molecules/HeaderSearch/index.js
smurrayatwork 93a55d0
Merge branch 'develop' into react/DP-13169--Default-HeaderSearch-Beha…
avrilpearl 01a138a
Merge branch 'develop' into react/DP-13169--Default-HeaderSearch-Beha…
avrilpearl d55687c
address comments
avrilpearl File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
Minor | ||
Added | ||
- (React) [HeaderSearch] DP-13169: Added default behaviour to HeaderSearch for onClick action to direct to search.mass.gov. Can be overidden by passing a custom onClick function to HeaderSearch's buttonSearch props. #519 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
@@ -1,5 +1,6 @@ | ||||||
import React from 'react'; | ||||||
import PropTypes from 'prop-types'; | ||||||
import is from 'is'; | ||||||
import { componentWithName } from 'airbnb-prop-types'; | ||||||
import ButtonWithIcon from '../../atoms/buttons/ButtonWithIcon'; | ||||||
import TypeAheadDropdown from '../../molecules/TypeAheadDropdown'; | ||||||
|
@@ -16,19 +17,36 @@ class HeaderSearch extends React.Component { | |||||
this.setState({ value: nextProps.defaultText }); | ||||||
} | ||||||
|
||||||
handleChange(event) { | ||||||
const query = event.target.value; | ||||||
handleChange(e) { | ||||||
const query = e.target.value; | ||||||
this.setState({ value: query }); | ||||||
// invokes custom function if passed in the component | ||||||
if (typeof this.props.onChange === 'function') { | ||||||
/** | ||||||
* Invokes a custom onChange function if passed. | ||||||
* @param {string} query - The current query string of the input. | ||||||
*/ | ||||||
if (this.props.onChange && is.fn(this.props.onChange)) { | ||||||
this.props.onChange(query); | ||||||
} | ||||||
} | ||||||
handleClick(e) { | ||||||
const event = e; | ||||||
if (this.props.buttonSearch && is.fn(this.props.buttonSearch.onClick)) { | ||||||
/** | ||||||
* Invokes a custom onClick function if passed to the buttonSearch component. | ||||||
* @param {object} event - The click event. | ||||||
* @param {string} query - The current query string input. | ||||||
*/ | ||||||
this.props.buttonSearch.onClick({ event, query: this.state.value }); | ||||||
} else if (this.state.value && this.state.value.length > 0) { | ||||||
window.location.assign(`https://search.mass.gov/?q=${this.state.value}`); | ||||||
} | ||||||
} | ||||||
|
||||||
render() { | ||||||
const headerSearch = this.props; | ||||||
const orgDropdown = headerSearch.orgDropdown; | ||||||
const shouldShowTypeAhead = (orgDropdown && orgDropdown.dropdownButton && orgDropdown.inputText); | ||||||
const { onClick, ...buttonSearchRest } = headerSearch.buttonSearch; | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. looks good!, should we remove onSubmit since we decide not to use it |
||||||
return( | ||||||
<div className="ma__header-search__wrapper ma__header-search__wrapper--responsive"> | ||||||
{shouldShowTypeAhead && | ||||||
|
@@ -57,7 +75,10 @@ class HeaderSearch extends React.Component { | |||||
{this.props.postInputFilter} | ||||||
</div> | ||||||
)} | ||||||
<ButtonWithIcon {...headerSearch.buttonSearch} /> | ||||||
<ButtonWithIcon | ||||||
onClick={(e) => this.handleClick(e)} | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
{...buttonSearchRest} | ||||||
/> | ||||||
</form> | ||||||
</div> | ||||||
</div> | ||||||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.