-
Notifications
You must be signed in to change notification settings - Fork 4.3k
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
Simplify frontend script for button-only search #32387
Merged
apeatling
merged 3 commits into
add/search-block-icon-only-with-expand
from
fix/button-search-simplify-frontend
Jun 3, 2021
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
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
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
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,85 +1,63 @@ | ||
| /** | ||
| * Internal dependencies | ||
| */ | ||
| import { showSearchField, hideSearchField } from './utils.js'; | ||
| // eslint-disable-next-line @wordpress/no-global-event-listener | ||
| document.addEventListener( 'DOMContentLoaded', () => { | ||
| const transitionDuration = 300; | ||
|
|
||
| const wpBlockSearch = ( block ) => { | ||
| const attributeContainer = block.querySelector( | ||
| '.wp-block-search__attributes' | ||
| ); | ||
| Array.from( | ||
| document.getElementsByClassName( | ||
| 'wp-block-search__button-behavior-expand' | ||
| ) | ||
| ).forEach( ( block ) => { | ||
| const hiddenClass = 'wp-block-search__searchfield-hidden'; | ||
| const wrapperClass = '.wp-block-search__inside-wrapper'; | ||
| const buttonClass = '.wp-block-search__button'; | ||
|
|
||
| if ( ! attributeContainer ) { | ||
| return; | ||
| } | ||
| const wrapper = block.querySelector( wrapperClass ); | ||
| const searchField = block.querySelector( '.wp-block-search__input' ); | ||
| const button = block.querySelector( buttonClass ); | ||
|
|
||
| let attributes; | ||
| try { | ||
| attributes = JSON.parse( attributeContainer.text ); | ||
| } catch ( e ) { | ||
| return; | ||
| } | ||
| attributeContainer.remove(); | ||
| // Hide search on init. | ||
| block.classList.add( hiddenClass ); | ||
| setTimeout( | ||
| () => | ||
| ( searchField.style.transitionDuration = `${ transitionDuration }ms` ), | ||
| transitionDuration | ||
| ); | ||
|
|
||
| const hiddenClass = 'wp-block-search__searchfield-hidden'; | ||
| const wrapperClass = '.wp-block-search__inside-wrapper'; | ||
| const buttonClass = '.wp-block-search__button'; | ||
| const toggleSearchField = ( e ) => { | ||
| if ( e.target !== button && ! e.target.closest( buttonClass ) ) { | ||
| return false; | ||
| } | ||
|
|
||
| const wrapper = block.querySelector( wrapperClass ); | ||
| const searchField = block.querySelector( '.wp-block-search__input' ); | ||
| const button = block.querySelector( buttonClass ); | ||
| e.preventDefault(); | ||
|
|
||
| const toggleSearchField = ( e ) => { | ||
| if ( e.target !== button && ! e.target.closest( buttonClass ) ) { | ||
| return false; | ||
| } | ||
| return block.classList.contains( hiddenClass ) | ||
| ? doShowSearchField() | ||
| : doHideSearchField(); | ||
| }; | ||
|
|
||
| e.preventDefault(); | ||
| const doShowSearchField = () => { | ||
| block.classList.remove( hiddenClass ); | ||
| searchField.focus(); | ||
|
|
||
| return block.classList.contains( hiddenClass ) | ||
| ? doShowSearchField() | ||
| : doHideSearchField(); | ||
| }; | ||
| wrapper.removeEventListener( 'click', toggleSearchField ); | ||
| document.body.addEventListener( 'click', doSearch ); | ||
| }; | ||
|
|
||
| const doShowSearchField = () => { | ||
| showSearchField( | ||
| wrapper, | ||
| searchField, | ||
| attributes.width, | ||
| attributes.widthUnit | ||
| ); | ||
| block.classList.remove( hiddenClass ); | ||
| searchField.focus(); | ||
| const doHideSearchField = () => { | ||
| block.classList.add( hiddenClass ); | ||
| }; | ||
|
|
||
| wrapper.removeEventListener( 'click', toggleSearchField ); | ||
| document.body.addEventListener( 'click', doBlur ); | ||
| }; | ||
| const doSearch = ( e ) => { | ||
| if ( e.target.closest( wrapperClass ) ) { | ||
| return false; | ||
| } | ||
|
|
||
| const doHideSearchField = ( animate = true ) => { | ||
| hideSearchField( wrapper, searchField, button, animate ); | ||
| block.classList.add( hiddenClass ); | ||
| }; | ||
| doHideSearchField(); | ||
|
|
||
| const doBlur = ( e ) => { | ||
| if ( e.target.closest( wrapperClass ) ) { | ||
| return false; | ||
| } | ||
| document.body.removeEventListener( 'click', doSearch ); | ||
| wrapper.addEventListener( 'click', toggleSearchField ); | ||
| }; | ||
|
|
||
| doHideSearchField(); | ||
| document.body.removeEventListener( 'click', doBlur ); | ||
| wrapper.addEventListener( 'click', toggleSearchField ); | ||
| }; | ||
|
|
||
| wrapper.addEventListener( 'click', toggleSearchField ); | ||
| doHideSearchField( false ); | ||
| }; | ||
|
|
||
| // eslint-disable-next-line @wordpress/no-global-event-listener | ||
| document.addEventListener( 'DOMContentLoaded', () => { | ||
| Array.from( | ||
| document.getElementsByClassName( | ||
| 'wp-block-search__button-behavior-expand' | ||
| ) | ||
| ).forEach( ( block ) => { | ||
| wpBlockSearch( block ); | ||
| } ); | ||
| } ); |
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
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
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
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.
This needs to be
alland notflex-basisbecause usingflex-basissome versions of Safari don't properly apply the transition.