Skip to content

Commit

Permalink
Merge pull request #3822 from microsoft-search/develop
Browse files Browse the repository at this point in the history
Patches to v4.12.2
  • Loading branch information
wobba authored Jun 25, 2024
2 parents fd4faef + 257daab commit c0cb997
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 17 deletions.
2 changes: 1 addition & 1 deletion docs/usage/search-box/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ The 'Search box' Web Part allows users to enter free text search queries connect

### Query suggestions

!["Search Box suggestions"](../../assets/webparts/search-box/search_box_suggestions){: .center}
!["Search Box suggestions"](../../assets/webparts/search-box/search_box_suggestions.png){: .center}

The query suggestions allows users to easily find relevant query keywords based on their entry:

Expand Down
2 changes: 1 addition & 1 deletion docs/usage/search-verticals/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ The options for a vertical are as follow:
| **Link URL** | If the tab is an hyperlink, the link URL to use. Tokens `{<TokenName>}` are supported here. See [tokens](../search-results/tokens.md) for more info.
| **Open behavior** | If the tab is an hyperlink, the opening behavior (new tab or current tab).
| **Show link icon** | If the tab is an hyperlink, display or hide an icon next to the tab name indicating the tab is a link (same page or external).
| **Audience** | Groups that this vertical will be visible to. If left empty the vertical will be visible for all users.
| **Audience** | Groups that this vertical will be visible to. If left empty the vertical will be visible for all users. Requires at least User.Read.All and GroupMember.Read.All permissions for the SharePoint Online Client Extensibility Web Application Principal.
2 changes: 1 addition & 1 deletion search-parts/config/package-solution.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"solution": {
"name": "PnP Modern Search - Search Web Parts - v4",
"id": "59903278-dd5d-4e9e-bef6-562aae716b8b",
"version": "4.12.0.0",
"version": "4.12.2.0",
"includeClientSideAssets": true,
"skipFeatureDeployment": true,
"isDomainIsolated": false,
Expand Down
4 changes: 2 additions & 2 deletions search-parts/package-lock.json

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

2 changes: 1 addition & 1 deletion search-parts/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@pnp/modern-search-web-parts",
"version": "4.12.0",
"version": "4.12.2",
"private": true,
"main": "lib/index.js",
"engines": {
Expand Down
8 changes: 0 additions & 8 deletions search-parts/src/components/DetailsListComponent.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -430,13 +430,6 @@ export class DetailsListComponent extends React.Component<IDetailsListComponentP

const { columns, items } = this.state;

let focusIndex = -1;
if (this.props.selectedKeys && this.props.selectedKeys.length > 0) {
const key = this.props.selectedKeys[0];
focusIndex = items.findIndex(item => item.key == key);
}


let shimmeredDetailsListProps: IShimmeredDetailsListProps = {
theme: this.props.themeVariant as ITheme,
items: items,
Expand All @@ -446,7 +439,6 @@ export class DetailsListComponent extends React.Component<IDetailsListComponentP
selection: this._selection,
layoutMode: DetailsListLayoutMode.justified,
isHeaderVisible: true,
initialFocusedIndex: focusIndex,
enableShimmer: this.props.showShimmers,
selectionPreservedOnEmptyClick: true,
enterModalSelectionOnTouch: true,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2461,16 +2461,17 @@ export default class SearchResultsWebPart extends BaseWebPart<ISearchResultsWebP
if (this._filtersConnectionSourceData) {
const filtersSourceData: IDataFilterSourceData = DynamicPropertyHelper.tryGetValueSafe(this._filtersConnectionSourceData);
if (filtersSourceData) {
const selectedFilters = dataContext.filters.selectedFilters.concat(filtersSourceData.selectedFilters);

// Reset the page number if filters have been updated by the user
if (!isEqual(filtersSourceData.selectedFilters, this._lastSelectedFilters)) {
if (!isEqual(selectedFilters, this._lastSelectedFilters)) {
dataContext.pageNumber = 1;
this.currentPageNumber = 1;
}

// Use the filter confiugration and then get the corresponding values
// Use the filter configuration and then get the corresponding values
dataContext.filters.filtersConfiguration = filtersSourceData.filterConfiguration;
dataContext.filters.selectedFilters = dataContext.filters.selectedFilters.concat(filtersSourceData.selectedFilters);
dataContext.filters.selectedFilters = selectedFilters;
dataContext.filters.filterOperator = filtersSourceData.filterOperator;
dataContext.filters.instanceId = filtersSourceData.instanceId;

Expand Down

0 comments on commit c0cb997

Please sign in to comment.