Merge main (v1.1.0) into develop (#348)

Merge main (v1.1.0) into develop

.github/workflows/sync-sites-branch.yml

@@ -4,20 +4,23 @@ on:
   push:
     branches:
       - main
+
 jobs:
   sync-branches:
     runs-on: ubuntu-latest
     name: Syncing branches
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
-      - uses: mtanzi/action-automerge@v1
+        uses: actions/checkout@v3
+      - uses: devmasx/merge-branch@v1.4.0
         with:
-          source: "${{ github.event.repository.default_branch }}"
-          target: "storybook-site"
+          type: now
+          from_branch: ${{ github.event.repository.default_branch }}
+          target_branch: storybook-site
           github_token: ${{ secrets.GITHUB_TOKEN }}
-      - uses: mtanzi/action-automerge@v1
+      - uses: devmasx/merge-branch@v1.4.0
         with:
-          source: "${{ github.event.repository.default_branch }}"
-          target: "test-site"
+          type: now
+          from_branch: ${{ github.event.repository.default_branch }}
+          target_branch: test-site
           github_token: ${{ secrets.GITHUB_TOKEN }}

THIRD-PARTY-NOTICES

@@ -1020,7 +1020,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 The following NPM package may be included in this product:
 
- - @yext/search-core@2.0.0
+ - @yext/search-core@2.1.0
 
 This package contains the following license and notice below:
 
@@ -1064,7 +1064,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 The following NPM package may be included in this product:
 
- - @yext/search-headless-react@2.0.1
+ - @yext/search-headless-react@2.1.0
 
 This package contains the following license and notice below:
 
@@ -1108,7 +1108,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 The following NPM package may be included in this product:
 
- - @yext/search-headless@2.0.0
+ - @yext/search-headless@2.1.0
 
 This package contains the following license and notice below:
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yext/search-ui-react",
-  "version": "1.0.2",
+  "version": "1.1.0",
   "description": "A library of React Components for powering Yext Search integrations",
   "author": "slapshot@yext.com",
   "license": "BSD-3-Clause",
@@ -76,7 +76,7 @@
     "@typescript-eslint/eslint-plugin": "^5.16.0",
     "@typescript-eslint/parser": "^5.16.0",
     "@yext/eslint-config-slapshot": "^0.5.0",
-    "@yext/search-headless-react": "^2.0.1",
+    "@yext/search-headless-react": "^2.1.0",
     "axe-playwright": "^1.1.11",
     "babel-jest": "^27.0.6",
     "eslint": "^8.11.0",
@@ -93,7 +93,7 @@
     "typescript": "~4.5.5"
   },
   "peerDependencies": {
-    "@yext/search-headless-react": "^2.0.1",
+    "@yext/search-headless-react": "^2.1.0",
     "react": "^16.14 || ^17 || ^18",
     "react-dom": "^16.14 || ^17 || ^18"
   },

src/components/FilterSearch.tsx

@@ -105,6 +105,14 @@ export function FilterSearch({
   const searchParamFields = searchFields.map((searchField) => {
     return { ...searchField, fetchEntities: false };
   });
+  const matchingFieldIds: Set<string> = useMemo(() => {
+    const fieldIds = new Set(searchFields.map(s => s.fieldApiName));
+    if (fieldIds.has('builtin.location')) {
+      ['builtin.region', 'address.countryCode'].forEach(s => fieldIds.add(s));
+    }
+    return fieldIds;
+  }, [searchFields]);
+
   const cssClasses = useComposedCssClasses(builtInCssClasses, customCssClasses);
   const [currentFilter, setCurrentFilter] = useState<StaticFilter>();
   const [filterQuery, setFilterQuery] = useState<string>();
@@ -113,9 +121,9 @@ export function FilterSearch({
     return staticFilters?.filter(({ filter, selected }) =>
       selected
       && filter.kind === 'fieldValue'
-      && searchFields.some(s => s.fieldApiName === filter.fieldId)
+      && matchingFieldIds.has(filter.fieldId)
     ) ?? [];
-  }, [staticFilters, searchFields]);
+  }, [staticFilters, matchingFieldIds]);
 
   const [
     filterSearchResponse,
@@ -132,7 +140,7 @@ export function FilterSearch({
   useEffect(() => {
     if (matchingFilters.length > 1 && !onSelect) {
       console.warn('More than one selected static filter found that matches the filter search fields: ['
-        + searchFields.map(s => s.fieldApiName).join(', ')
+        + [...matchingFieldIds].join(', ')
         + ']. Please update the state to remove the extra filters.'
         + ' Picking one filter to display in the input.');
     }
@@ -158,7 +166,7 @@ export function FilterSearch({
     executeFilterSearch,
     onSelect,
     matchingFilters,
-    searchFields
+    matchingFieldIds
   ]);
 
   const sections = useMemo(() => {
@@ -190,7 +198,7 @@ export function FilterSearch({
 
     if (matchingFilters.length > 1) {
       console.warn('More than one selected static filter found that matches the filter search fields: ['
-        + searchFields.map(s => s.fieldApiName).join(', ')
+        + [...matchingFieldIds].join(', ')
         + ']. Unselecting all existing matching filters and selecting the new filter.');
     }
     matchingFilters.forEach(f => searchActions.setFilterOption({ filter: f.filter, selected: false }));
@@ -213,7 +221,7 @@ export function FilterSearch({
     onSelect,
     searchOnSelect,
     matchingFilters,
-    searchFields
+    matchingFieldIds
   ]);
 
   const meetsSubmitCritera = useCallback(index => index >= 0, []);