Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Version 1.17.0 #1867

Merged
merged 5 commits into from
Feb 20, 2024
Merged

Version 1.17.0 #1867

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3da1a04
Merge master (v1.16.5) into develop (#1853)
nmanu1 Dec 5, 2023
5c08fe6
Merge master (v1.16.6) into develop (#1861)
nmanu1 Feb 9, 2024
495eea4
Merge master (v1.16.7) into develop (#1865)
nmanu1 Feb 14, 2024
f37d3ba
Revert "Revert "Change icons from divs to spans (#1857)""
nmanu1 Feb 20, 2024
d7d6fb0
Update Package Version to v1.17.0 (#1866)
github-actions[bot] Feb 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@yext/answers-search-ui",
"version": "1.16.7",
"version": "1.17.0",
"description": "Javascript Search Programming Interface",
"main": "dist/answers-umd.js",
"repository": {
Expand Down
5 changes: 5 additions & 0 deletions src/ui/sass/modules/_SearchBar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,13 +280,18 @@ $searchbar-button-text-color-active: var(--yxt-searchbar-button-text-color-base)

&-buttonImage .Icon svg, .Icon-image
{
display: block;
width: 2em;
height: 2em;
}

&-instructions {
display: none;
}

&-CustomLoadingImage {
display: block;
}
}

// If custom icons are supplied, the SVGs simply alternate opacity
Expand Down
4 changes: 2 additions & 2 deletions src/ui/templates/icons/builtInIcon.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<div class="Icon Icon--{{iconName}} {{classNames}}" aria-hidden="true">
<span class="Icon Icon--{{iconName}} {{classNames}}" aria-hidden="true">
{{icon iconName complexContentsParams}}
</div>
</span>
4 changes: 2 additions & 2 deletions src/ui/templates/icons/icon.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="Icon Icon--{{name}} {{classNames}}" aria-hidden="true">
<span class="Icon Icon--{{name}} {{classNames}}" aria-hidden="true">
{{#if iconUrl}}
<img src="{{iconUrl}}" alt="" class="Icon-image">
{{else}}
{{icon iconName complexContentsParams}}
{{/if}}
</div>
</span>
4 changes: 2 additions & 2 deletions src/ui/templates/icons/iconPartial.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="Icon Icon--{{#if iconName}}{{iconName}}{{else}}custom{{/if}} {{classNames}}" aria-hidden="true">
<span class="Icon Icon--{{#if iconName}}{{iconName}}{{else}}custom{{/if}} {{classNames}}" aria-hidden="true">
{{#if iconUrl}}
<img src="{{iconUrl}}" alt="" class="Icon-image">
{{else}}
{{icon iconName complexContentsParams}}
{{/if}}
</div>
</span>
24 changes: 12 additions & 12 deletions src/ui/templates/icons/searchBarIcon.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,41 +1,41 @@
{{#if showLoadingIndicator}}
{{#if customLoadingIconUrl}}
<div class="yxt-SearchBar-CustomLoadingImage js-yxt-SearchBar-LoadingIndicator js-yxt-SearchBar-Icon yxt-SearchBar-Icon--inactive">
<span class="yxt-SearchBar-CustomLoadingImage js-yxt-SearchBar-LoadingIndicator js-yxt-SearchBar-Icon yxt-SearchBar-Icon--inactive">
{{> icons/iconPartial iconUrl=customLoadingIconUrl}}
</div>
</span>
{{else}}
<div class="yxt-SearchBar-AnimatedIcon js-yxt-SearchBar-LoadingIndicator yxt-SearchBar-LoadingIndicator js-yxt-SearchBar-Icon
<span class="yxt-SearchBar-AnimatedIcon js-yxt-SearchBar-LoadingIndicator yxt-SearchBar-LoadingIndicator js-yxt-SearchBar-Icon
yxt-SearchBar-Icon--inactive Icon--lg">
<svg class= "yxt-SearchBar-LoadingIndicator-AnimatedIcon" viewBox="0 0 72 72">
<circle class="yxt-SearchBar-LoadingIndicator-Circle" cx="36" cy="36" r="33" stroke="black" stroke-width="3" fill="none"/>
</svg>
</div>
</span>
{{/if}}
{{/if}}

{{#if submitIcon}}
<div class="yxt-SearchBar-buttonImage js-yxt-SearchBar-buttonImage js-yxt-SearchBar-Icon">
<span class="yxt-SearchBar-buttonImage js-yxt-SearchBar-buttonImage js-yxt-SearchBar-Icon">
{{> icons/builtInIcon iconName=submitIcon}}
</div>
</span>
{{else if _config.customIconUrl}}
<div class="yxt-SearchBar-buttonImage js-yxt-SearchBar-buttonImage js-yxt-SearchBar-Icon">
<span class="yxt-SearchBar-buttonImage js-yxt-SearchBar-buttonImage js-yxt-SearchBar-Icon">
{{> icons/iconPartial iconUrl=_config.customIconUrl}}
</div>
</span>
{{else}}
<div class="yxt-SearchBar-AnimatedIcon js-yxt-AnimatedForward js-yxt-SearchBar-Icon
<span class="yxt-SearchBar-AnimatedIcon js-yxt-AnimatedForward js-yxt-SearchBar-Icon
{{#unless autoFocus}} yxt-SearchBar-Icon--inactive{{/unless}}">
{{> icons/builtInIcon
iconName='yext_animated_forward'
classNames='yxt-SearchBar-MagnifyingGlass--static Icon--lg'
complexContentsParams=forwardIconOpts.complexContentsParams
}}
</div>
<div class="yxt-SearchBar-AnimatedIcon js-yxt-AnimatedReverse js-yxt-SearchBar-Icon
</span>
<span class="yxt-SearchBar-AnimatedIcon js-yxt-AnimatedReverse js-yxt-SearchBar-Icon
{{#if autoFocus}} yxt-SearchBar-Icon--inactive{{/if}}">
{{> icons/builtInIcon
iconName='yext_animated_reverse'
classNames='yxt-SearchBar-Yext--static Icon--lg'
complexContentsParams=forwardIconOpts.complexContentsParams
}}
</div>
</span>
{{/if}}
2 changes: 1 addition & 1 deletion src/ui/templates/icons/voiceSearchIcon.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@
{{/if}}
</div>
<span class="yxt-SearchBar-voiceSearchText sr-only"></span>
</div>
</div>
Loading