From f37d3bab22fc16bb891496c1409726eabaa3ccde Mon Sep 17 00:00:00 2001 From: Nidhi Manu Date: Tue, 20 Feb 2024 09:28:41 -0500 Subject: [PATCH 1/2] Revert "Revert "Change icons from divs to spans (#1857)"" This reverts commit 67b32df6db93d929fc868c28ca1c815d5d10f618 to add back the changes in #1857 now that we have the accompanying HH Theme changes ready to release. --- src/ui/sass/modules/_SearchBar.scss | 5 +++++ src/ui/templates/icons/builtInIcon.hbs | 4 ++-- src/ui/templates/icons/icon.hbs | 4 ++-- src/ui/templates/icons/iconPartial.hbs | 4 ++-- src/ui/templates/icons/searchBarIcon.hbs | 24 +++++++++++----------- src/ui/templates/icons/voiceSearchIcon.hbs | 2 +- 6 files changed, 24 insertions(+), 19 deletions(-) diff --git a/src/ui/sass/modules/_SearchBar.scss b/src/ui/sass/modules/_SearchBar.scss index d3cf8879f..650d76045 100644 --- a/src/ui/sass/modules/_SearchBar.scss +++ b/src/ui/sass/modules/_SearchBar.scss @@ -280,6 +280,7 @@ $searchbar-button-text-color-active: var(--yxt-searchbar-button-text-color-base) &-buttonImage .Icon svg, .Icon-image { + display: block; width: 2em; height: 2em; } @@ -287,6 +288,10 @@ $searchbar-button-text-color-active: var(--yxt-searchbar-button-text-color-base) &-instructions { display: none; } + + &-CustomLoadingImage { + display: block; + } } // If custom icons are supplied, the SVGs simply alternate opacity diff --git a/src/ui/templates/icons/builtInIcon.hbs b/src/ui/templates/icons/builtInIcon.hbs index 0355d648e..00b0c3b82 100644 --- a/src/ui/templates/icons/builtInIcon.hbs +++ b/src/ui/templates/icons/builtInIcon.hbs @@ -1,3 +1,3 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/ui/templates/icons/icon.hbs b/src/ui/templates/icons/icon.hbs index 422af5e7f..c272170c1 100644 --- a/src/ui/templates/icons/icon.hbs +++ b/src/ui/templates/icons/icon.hbs @@ -1,7 +1,7 @@ - + diff --git a/src/ui/templates/icons/iconPartial.hbs b/src/ui/templates/icons/iconPartial.hbs index e9538d044..2e6020fdc 100644 --- a/src/ui/templates/icons/iconPartial.hbs +++ b/src/ui/templates/icons/iconPartial.hbs @@ -1,7 +1,7 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/ui/templates/icons/searchBarIcon.hbs b/src/ui/templates/icons/searchBarIcon.hbs index c15c187e5..617dcca42 100644 --- a/src/ui/templates/icons/searchBarIcon.hbs +++ b/src/ui/templates/icons/searchBarIcon.hbs @@ -1,41 +1,41 @@ {{#if showLoadingIndicator}} {{#if customLoadingIconUrl}} -
+ {{> icons/iconPartial iconUrl=customLoadingIconUrl}} -
+ {{else}} -
-
+ {{/if}} {{/if}} {{#if submitIcon}} -
+ {{> icons/builtInIcon iconName=submitIcon}} -
+ {{else if _config.customIconUrl}} -
+ {{> icons/iconPartial iconUrl=_config.customIconUrl}} -
+ {{else}} -
{{> icons/builtInIcon iconName='yext_animated_forward' classNames='yxt-SearchBar-MagnifyingGlass--static Icon--lg' complexContentsParams=forwardIconOpts.complexContentsParams }} -
-
{{> icons/builtInIcon iconName='yext_animated_reverse' classNames='yxt-SearchBar-Yext--static Icon--lg' complexContentsParams=forwardIconOpts.complexContentsParams }} -
+ {{/if}} diff --git a/src/ui/templates/icons/voiceSearchIcon.hbs b/src/ui/templates/icons/voiceSearchIcon.hbs index 8160ef592..132788adf 100644 --- a/src/ui/templates/icons/voiceSearchIcon.hbs +++ b/src/ui/templates/icons/voiceSearchIcon.hbs @@ -14,4 +14,4 @@ {{/if}} - \ No newline at end of file + From d7d6fb074da2ec6cf99bac442b218bd6a8249130 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 20 Feb 2024 09:35:30 -0500 Subject: [PATCH 2/2] Update Package Version to v1.17.0 (#1866) *An automated PR which updates the version number in package.json and package-lock.json files* --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2f2a33185..51d24f408 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@yext/answers-search-ui", - "version": "1.16.7", + "version": "1.17.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@yext/answers-search-ui", - "version": "1.16.7", + "version": "1.17.0", "license": "BSD-3-Clause", "dependencies": { "@mapbox/mapbox-gl-language": "^0.10.1", diff --git a/package.json b/package.json index 7637d2d09..c47cfe445 100644 --- a/package.json +++ b/package.json @@ -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": {