@@ -62,7 +62,7 @@
data-enable-preview="false"
data-show-file-icon="true"
data-is-compact="false"
- data-context="{{JSONstringify @root 2}}"
+ data-context="{{JSONstringify (truncateContext @root)}}"
data-instance-id="{{@root.instanceId}}"
data-theme-variant="{{JSONstringify @root.theme}}"
data-allow-item-selection="{{@root.properties.itemSelectionProps.allowItemSelection}}"
diff --git a/search-parts/src/loc/commonStrings.d.ts b/search-parts/src/loc/commonStrings.d.ts
index bb9202a4b..5a5bc66dc 100644
--- a/search-parts/src/loc/commonStrings.d.ts
+++ b/search-parts/src/loc/commonStrings.d.ts
@@ -285,7 +285,9 @@ declare interface ICommonStrings {
SupportHTMLColumnLabel: string;
ResetFieldsBtnLabel: string;
ShowPersonaCardOnHover: string;
+ ShowPersonaCardOnHoverNative: string;
ShowPersonaCardOnHoverCalloutMsg: string;
+ ShowPersonaCardOnHoverCalloutMsgNative: string;
Fields: {
ImageUrl: string;
PrimaryText: string;
diff --git a/search-parts/src/loc/da-dk.js b/search-parts/src/loc/da-dk.js
index 821bda50a..5b5c11559 100644
--- a/search-parts/src/loc/da-dk.js
+++ b/search-parts/src/loc/da-dk.js
@@ -286,6 +286,7 @@ define([], function() {
SupportHTMLColumnLabel: "Tillad HTML",
ResetFieldsBtnLabel: "Nulstil felter til standardvĂŠrdier",
ShowPersonaCardOnHover: "Vis persona-card ved at hover",
+ ShowPersonaCardOnHoverNative: "Vis persona-card ved at hover (LPC)",
ShowPersonaCardOnHoverCalloutMsg: "Denne feature bruger Microsoft Graph til at vise information om brugeren og skal bruge de fĂžlgende API-tilladelser i din tenant, for at det virker: ['User.Read','People.Read','Contacts.Read','User.Read.All'].",
Fields: {
ImageUrl: "Billede-URL",
diff --git a/search-parts/src/loc/en-us.js b/search-parts/src/loc/en-us.js
index b4d0126bc..1823aea14 100644
--- a/search-parts/src/loc/en-us.js
+++ b/search-parts/src/loc/en-us.js
@@ -287,6 +287,8 @@ define([], function() {
ResetFieldsBtnLabel: "Reset fields to default values",
ShowPersonaCardOnHover: "Show persona card on hover",
ShowPersonaCardOnHoverCalloutMsg: "This feature uses Microsoft Graph to display information about the user and needs the following API permissions in your tenant to work: ['User.Read','People.Read','Contacts.Read','User.Read.All'].",
+ ShowPersonaCardOnHoverNative: "Show persona card on hover (LPC)",
+ ShowPersonaCardOnHoverCalloutMsgNative: "This feature uses the native SharePoint implementation to show the live persona card (LPC). See https://pnp.github.io/sp-dev-fx-controls-react/controls/LivePersona/ for considerations.",
Fields: {
ImageUrl: "Image URL",
PrimaryText: "Primary text",
diff --git a/search-parts/src/loc/es-es.js b/search-parts/src/loc/es-es.js
index f74e37d96..8a04e7840 100644
--- a/search-parts/src/loc/es-es.js
+++ b/search-parts/src/loc/es-es.js
@@ -286,6 +286,7 @@ define([], function() {
SupportHTMLColumnLabel: "Permitir HTML",
ResetFieldsBtnLabel: "Restablecer los valores por defecto de los campos",
ShowPersonaCardOnHover: "Mostrar tarjeta de persona al pasar el ratĂłn por encima",
+ ShowPersonaCardOnHoverNative:"Mostrar tarjeta de persona al pasar el ratĂłn por encima (LPC)",
ShowPersonaCardOnHoverCalloutMsg: "Esta funciĂłn utiliza Microsoft Graph para mostrar informaciĂłn sobre el usuario y necesita los siguientes permisos de la API en su inquilino para funcionar: ['User.Read','People.Read','Contacts.Read','User.Read.All'].",
Fields: {
ImageUrl: "URL de la imagen",
diff --git a/search-parts/src/loc/fi-fi.js b/search-parts/src/loc/fi-fi.js
index 5f6a13d0c..da3d3d473 100644
--- a/search-parts/src/loc/fi-fi.js
+++ b/search-parts/src/loc/fi-fi.js
@@ -284,6 +284,7 @@ define([], function() {
SupportHTMLColumnLabel: "Salli HTML",
ResetFieldsBtnLabel: "Palauta kentÀt templaatin oletusarvoihin",
ShowPersonaCardOnHover: "NÀytÀ henkilökortti hoverilla",
+ ShowPersonaCardOnHoverNative: "NÀytÀ henkilökortti hoverilla (LPC)",
ShowPersonaCardOnHoverCalloutMsg: "TÀmÀ ominaisuus kÀyttÀÀ Microsoft Graphia kÀyttÀjÀprofiilin tietojen nÀyttÀmiseen, ja tarvitsee seuraavat API oikeudet tenantissa toimiakseen: ['User.Read','People.Read','Contacts.Read','User.Read.All'].",
Fields: {
ImageUrl: "Kuvan URL",
diff --git a/search-parts/src/loc/fr-fr.js b/search-parts/src/loc/fr-fr.js
index 4e42bc048..02af720f5 100644
--- a/search-parts/src/loc/fr-fr.js
+++ b/search-parts/src/loc/fr-fr.js
@@ -63,8 +63,8 @@ define([], function() {
QueryModifierDefinitionNotFound: "Le queryModifier personnalisé avec la clé '{0}' n'a pas été trouvé. Vérifiez que la solution est correctement déployée dans le catalogue d'applications et que l'ID du manifeste est enregistré pour ce composant WebPart.",
InvalidQueryModifierInstance: "Le queryModifier personnalisé sélectionné '{0}' n'implémente pas correctement la classe abstraite 'BaseQueryModifier'. Certaines méthodes sont manquantes.",
},
- DateFromLabel: "De",
- DateTolabel: "Ă",
+ DateFromLabel: "Du",
+ DateTolabel: "Au",
DatePickerStrings: {
months: ['Janvier', 'Février', 'Mars', 'Avril', 'Mai', 'Juin', 'Juillet', 'Août', 'Septembre', 'Octobre', 'Novembre', 'Décembre'],
shortMonths: ['Janv.', 'Févr.', 'Mars', 'Avr.', 'Mai', 'Juin', 'Juill.', 'Août', 'Sept.', 'Oct.', 'Nov.', 'Déc.'],
@@ -286,6 +286,7 @@ define([], function() {
SupportHTMLColumnLabel: "Autoriser HTML",
ResetFieldsBtnLabel: "Rétablir la valeur par défaut dans les champs",
ShowPersonaCardOnHover: "Afficher lâimage de la carte en pointant le curseur",
+ ShowPersonaCardOnHoverNative: "Afficher lâimage de la carte en pointant le curseur (LPC)",
ShowPersonaCardOnHoverCalloutMsg: "Cette fonction utilise Microsoft Graph pour afficher des renseignements sur lâutilisateur et nĂ©cessite les autorisations API suivantes pour que votre utilisateur puisse travailler : [« User.Read », « People.Read », « Contacts.Read », « User.Read.All »].",
Fields: {
ImageUrl: "URL de lâimage",
diff --git a/search-parts/src/loc/nb-no.js b/search-parts/src/loc/nb-no.js
index d2c31d270..0a7425cee 100644
--- a/search-parts/src/loc/nb-no.js
+++ b/search-parts/src/loc/nb-no.js
@@ -285,6 +285,7 @@ define([], function () {
SupportHTMLColumnLabel: "Tillat HTML",
ResetFieldsBtnLabel: "Bruk standardverdier",
ShowPersonaCardOnHover: "Vis personkort nÄr du fÞrer musen over",
+ ShowPersonaCardOnHoverNative: "Vis personkort nÄr du fÞrer musen over (LPC)",
ShowPersonaCardOnHoverCalloutMsg: "Denne funksjonen bruker Microsoft Graph for Ä vise informasjon om brukere og mÄ ha fÞlgende API-tilganger i din klient for at det skal virke: ['User.Read','People.Read','Contacts.Read','User.Read.All'].",
Fields: {
ImageUrl: "Bilde-URL",
diff --git a/search-parts/src/loc/nl-nl.js b/search-parts/src/loc/nl-nl.js
index 6247b2444..1dfe437c5 100644
--- a/search-parts/src/loc/nl-nl.js
+++ b/search-parts/src/loc/nl-nl.js
@@ -285,6 +285,7 @@ define([], function() {
SupportHTMLColumnLabel: "Sta HTML toe",
ResetFieldsBtnLabel: "Reset velden naar standaard waarden",
ShowPersonaCardOnHover: "Toon persona card bij 'hover'",
+ ShowPersonaCardOnHoverNative: "Toon persona card bij 'hover' (LPC)",
ShowPersonaCardOnHoverCalloutMsg: "Deze feature gebruikt Microsoft Graph om informatie over de gebruiker te tonen en heeft de volgende API rechten nodig in de tenant om te kunnen werken: ['User.Read','People.Read','Contacts.Read','User.Read.All'].",
Fields: {
ImageUrl: "Afbeeldings URL",
diff --git a/search-parts/src/loc/pl-pl.js b/search-parts/src/loc/pl-pl.js
index 3338c5797..75557127d 100644
--- a/search-parts/src/loc/pl-pl.js
+++ b/search-parts/src/loc/pl-pl.js
@@ -286,6 +286,7 @@ define([], function() {
SupportHTMLColumnLabel: "Zezwalaj na HTML",
ResetFieldsBtnLabel: "Resetuj pola do wartoĆci domyĆlnych",
ShowPersonaCardOnHover: "PokaĆŒ kartÄ po wskazaniu",
+ ShowPersonaCardOnHoverNative: "PokaĆŒ kartÄ po wskazaniu (LPC)",
ShowPersonaCardOnHoverCalloutMsg: "Ta funkcja uĆŒywa Microsoft Graph aby wyĆwietliÄ informacje o uĆŒytkowniku i wymaga nastÄpujcych uprawnieĆ API: ['User.Read','People.Read','Contacts.Read','User.ReadBasic.All'].",
Fields: {
ImageUrl: "URL obrazu",
diff --git a/search-parts/src/loc/pt-br.js b/search-parts/src/loc/pt-br.js
index 8f6a5f1f9..87dc0fb92 100644
--- a/search-parts/src/loc/pt-br.js
+++ b/search-parts/src/loc/pt-br.js
@@ -284,6 +284,7 @@ define([], function() {
SupportHTMLColumnLabel: "Permitir HTML",
ResetFieldsBtnLabel: "Redefinir campos para os valores padrĂŁo",
ShowPersonaCardOnHover: "Mostrar cartĂŁo da
persona ao passar o mouse",
+ ShowPersonaCardOnHoverNative: "Mostrar cartĂŁo da
persona ao passar o mouse (LPC)",
ShowPersonaCardOnHoverCalloutMsg: "Esse recurso usa o Microsoft Graph para exibir informaçÔes sobre o usuårio e precisa das seguintes permissÔes de API em seu locatårio para funcionar: ['User.Read','People.Read','Contacts.Read','User.Read.All'].",
Fields: {
ImageUrl: "URL da imagem",
diff --git a/search-parts/src/loc/sv-SE.js b/search-parts/src/loc/sv-SE.js
index 8016a37cb..b281f0d4e 100644
--- a/search-parts/src/loc/sv-SE.js
+++ b/search-parts/src/loc/sv-SE.js
@@ -286,6 +286,7 @@ define([], function () {
SupportHTMLColumnLabel: "TillÄt HTML",
ResetFieldsBtnLabel: "Ă
terstÀll fÀlt till standardvÀrden",
ShowPersonaCardOnHover: "Visa personakort genom att föra musen över",
+ ShowPersonaCardOnHoverNative: "Visa personakort genom att föra musen över (LPC)",
ShowPersonaCardOnHoverCalloutMsg: "Denna funktion anvÀnder Microsoft Graph för att visa information om anvÀndaren och mÄste anvÀnda följande API-behörigheter i din klient för att den ska fungera: ['User.Read','People.Read','Contacts.Read','User.Read.All'].",
Fields: {
ImageUrl: "Bild URL",
diff --git a/search-parts/src/services/templateService/TemplateService.ts b/search-parts/src/services/templateService/TemplateService.ts
index 6a7856990..f2fc88478 100644
--- a/search-parts/src/services/templateService/TemplateService.ts
+++ b/search-parts/src/services/templateService/TemplateService.ts
@@ -11,7 +11,7 @@ import { IComponentDefinition, IExtensibilityLibrary, IResultTemplates, LayoutRe
import groupBy from 'handlebars-group-by';
import { IComponentFieldsConfiguration } from "../../models/common/IComponentFieldsConfiguration";
import { initializeFileTypeIcons } from '@fluentui/react-file-type-icons';
-import { GlobalSettings } from 'office-ui-fabric-react';
+import { GlobalSettings } from '@fluentui/react';
import { IDataResultType, ResultTypeOperator } from "../../models/common/IDataResultType";
import { ISearchResultsTemplateContext, ISearchFiltersTemplateContext } from "../../models/common/ITemplateContext";
import { UrlHelper } from "../../helpers/UrlHelper";
@@ -542,20 +542,23 @@ export class TemplateService implements ITemplateService {
// Use a token or a string value
let param2 = handlebarsToken ? handlebarsToken[1] : `"${currentResultType.value}"`;
+ // Operator: "Not null"
+ if (currentResultType.operator === ResultTypeOperator.NotNull) {
+ param2 = null;
+ }
+
+ let baseCondition = `{{#${operator} (slot item '${param1}') ${param2 || ""}}}
+ ${templateContent}`;
+
// Operator: "Starts With"
if (currentResultType.operator === ResultTypeOperator.StartsWith) {
param1 = `"${currentResultType.value}"`;
param2 = `${currentResultType.property}`;
- }
- // Operator: "Not null"
- if (currentResultType.operator === ResultTypeOperator.NotNull) {
- param2 = null;
+ baseCondition = `{{#${operator} ${param1 || ""} (slot item '${param2}') }}
+ ${templateContent}`;
}
- const baseCondition = `{{#${operator} (slot item '${param1}') ${param2 || ""}}}
- ${templateContent}`;
-
if (currentIdx === resultTypes.length - 1) {
// Renders inner content set in the 'resultTypes' partial
conditionBlockContent = "{{> @partial-block }}";
@@ -577,6 +580,18 @@ export class TemplateService implements ITemplateService {
*/
private registerCustomHelpers() {
+ // Truncate items from context, as that is not usually used and bloats the HTML
+ this.Handlebars.registerHelper("truncateContext", (context: any) => {
+ //Extract data property
+ const { data, ...newContext } = context;
+ //Extract items property
+ // eslint-disable-next-line @typescript-eslint/no-unused-vars
+ const { items, ...newData } = data;
+ //Set data property without items
+ newContext.data = newData;
+ return newContext;
+ })
+
// Return the URL of the search result item
// Usage:
this.Handlebars.registerHelper("getGraphPreviewUrl", (url: any, context?: any) => {
@@ -865,7 +880,7 @@ export class TemplateService implements ITemplateService {
'adaptivecards'
);
- // Initialize the serialization context for the Adaptive Cards, if needed
+ // Initialize the serialization context for the Adaptive Cards, if needed
if (!this._serializationContext) {
const { CardObjectRegistry, GlobalRegistry, SerializationContext } = await import(
@@ -880,20 +895,20 @@ export class TemplateService implements ITemplateService {
this._serializationContext = new SerializationContext();
- const CardElementType = this._adaptiveCardsNS.CardElement;
- const ActionElementType = this._adaptiveCardsNS.Action;
+ const CardElementType = this._adaptiveCardsNS.CardElement;
+ const ActionElementType = this._adaptiveCardsNS.Action;
let elementRegistry = new CardObjectRegistry>();
let actionRegistry = new CardObjectRegistry>();
-
+
GlobalRegistry.populateWithDefaultElements(elementRegistry);
GlobalRegistry.populateWithDefaultActions(actionRegistry);
-
+
useLocalFluentUI(elementRegistry, actionRegistry);
this._serializationContext.setElementRegistry(elementRegistry);
this._serializationContext.setActionRegistry(actionRegistry);
}
-
+
this._adaptiveCardsNS.AdaptiveCard.onProcessMarkdown = (text: string, result) => {
// Special case with HitHighlightedSummary field
diff --git a/search-parts/src/webparts/searchBox/SearchBoxWebPart.ts b/search-parts/src/webparts/searchBox/SearchBoxWebPart.ts
index 08ab9d28b..a1e1a869e 100644
--- a/search-parts/src/webparts/searchBox/SearchBoxWebPart.ts
+++ b/search-parts/src/webparts/searchBox/SearchBoxWebPart.ts
@@ -1,7 +1,7 @@
import * as React from 'react';
import * as ReactDom from 'react-dom';
import { Version, ServiceKey, Text, Log } from '@microsoft/sp-core-library';
-import { GlobalSettings } from 'office-ui-fabric-react';
+import { GlobalSettings } from '@fluentui/react';
import { IWebPartPropertiesMetadata } from '@microsoft/sp-webpart-base';
import { uniqBy } from '@microsoft/sp-lodash-subset';
import { DynamicProperty } from "@microsoft/sp-component-base";
@@ -33,7 +33,7 @@ import { ISuggestionProviderDefinition, BaseSuggestionProvider } from '@pnp/mode
import { AvailableSuggestionProviders, BuiltinSuggestionProviderKeys } from '../../providers/AvailableSuggestionProviders';
import { ISuggestionProvider } from '@pnp/modern-search-extensibility';
import { ServiceScopeHelper } from '../../helpers/ServiceScopeHelper';
-import { Toggle, IToggleProps, MessageBar, MessageBarType, Link } from "office-ui-fabric-react";
+import { Toggle, IToggleProps, MessageBar, MessageBarType, Link } from '@fluentui/react';
import { ISuggestionProviderConfiguration } from '../../providers/ISuggestionProviderConfiguration';
import { IExtensibilityConfiguration } from '../../models/common/IExtensibilityConfiguration';
import { Constants } from '../../common/Constants';
diff --git a/search-parts/src/webparts/searchBox/components/SearchBoxAutoComplete/SearchBoxAutoComplete.tsx b/search-parts/src/webparts/searchBox/components/SearchBoxAutoComplete/SearchBoxAutoComplete.tsx
index d053b18a0..801a9732b 100644
--- a/search-parts/src/webparts/searchBox/components/SearchBoxAutoComplete/SearchBoxAutoComplete.tsx
+++ b/search-parts/src/webparts/searchBox/components/SearchBoxAutoComplete/SearchBoxAutoComplete.tsx
@@ -2,8 +2,8 @@ import * as React from 'react';
import styles from '../SearchBoxContainer.module.scss';
import { ISearchBoxAutoCompleteState } from './ISearchBoxAutoCompleteState';
import { ISearchBoxAutoCompleteProps } from './ISearchBoxAutoCompleteProps';
-import { Spinner, SpinnerSize, FocusZone, FocusZoneDirection, SearchBox, IconButton, Label, Icon, IconType, ISearchBox } from 'office-ui-fabric-react';
-import { ITheme } from 'office-ui-fabric-react/lib/Styling';
+import { Spinner, SpinnerSize, FocusZone, FocusZoneDirection, SearchBox, IconButton, Label, Icon, IconType, ISearchBox } from '@fluentui/react';
+import { ITheme } from '@fluentui/react/lib/Styling';
import { isEqual, debounce } from '@microsoft/sp-lodash-subset';
import { ISuggestion } from '@pnp/modern-search-extensibility';
import * as webPartStrings from 'SearchBoxWebPartStrings';
diff --git a/search-parts/src/webparts/searchBox/components/SearchBoxContainer.tsx b/search-parts/src/webparts/searchBox/components/SearchBoxContainer.tsx
index 52da5271e..beb048835 100644
--- a/search-parts/src/webparts/searchBox/components/SearchBoxContainer.tsx
+++ b/search-parts/src/webparts/searchBox/components/SearchBoxContainer.tsx
@@ -1,7 +1,7 @@
import * as React from 'react';
import { ISearchBoxContainerProps } from './ISearchBoxContainerProps';
import { QueryPathBehavior, UrlHelper, PageOpenBehavior } from '../../../helpers/UrlHelper';
-import { MessageBar, MessageBarType, SearchBox, IconButton, ITheme, ISearchBox } from 'office-ui-fabric-react';
+import { MessageBar, MessageBarType, SearchBox, IconButton, ITheme, ISearchBox } from '@fluentui/react';
import { ISearchBoxContainerState } from './ISearchBoxContainerState';
import { isEqual } from '@microsoft/sp-lodash-subset';
import * as webPartStrings from 'SearchBoxWebPartStrings';
diff --git a/search-parts/src/webparts/searchFilters/SearchFiltersWebPart.ts b/search-parts/src/webparts/searchFilters/SearchFiltersWebPart.ts
index 88008815a..a754d0a26 100644
--- a/search-parts/src/webparts/searchFilters/SearchFiltersWebPart.ts
+++ b/search-parts/src/webparts/searchFilters/SearchFiltersWebPart.ts
@@ -32,7 +32,7 @@ import { LayoutHelper } from '../../helpers/LayoutHelper';
import { TemplateService } from '../../services/templateService/TemplateService';
import { FileFormat, ITemplateService } from '../../services/templateService/ITemplateService';
import { isEmpty, isEqual, uniqBy, cloneDeep, uniq, sortBy } from '@microsoft/sp-lodash-subset';
-import { Dropdown, IDropdownProps, IDropdownOption, Checkbox, Icon, IComboBoxOption, MessageBar, MessageBarType } from 'office-ui-fabric-react';
+import { Dropdown, IDropdownProps, IDropdownOption, Checkbox, Icon, IComboBoxOption, MessageBar, MessageBarType } from '@fluentui/react';
import { BuiltinFilterTemplates, BuiltinFilterTypes } from '../../layouts/AvailableTemplates';
import { ServiceScope } from '@microsoft/sp-core-library';
import { AvailableComponents } from '../../components/AvailableComponents';
@@ -1050,7 +1050,7 @@ export default class SearchFiltersWebPart extends BaseWebPart {
const { PropertyFieldCodeEditor, PropertyFieldCodeEditorLanguages } = await import(
- /* webpackChunkName: 'pnp-modern-search-code-editor' */
+ /* webpackChunkName: 'pnp-modern-search-code-editor', webpackMode: 'lazy' */
'@pnp/spfx-property-controls/lib/propertyFields/codeEditor'
);
diff --git a/search-parts/src/webparts/searchFilters/components/SearchFiltersContainer.tsx b/search-parts/src/webparts/searchFilters/components/SearchFiltersContainer.tsx
index 939dec547..9923303e1 100644
--- a/search-parts/src/webparts/searchFilters/components/SearchFiltersContainer.tsx
+++ b/search-parts/src/webparts/searchFilters/components/SearchFiltersContainer.tsx
@@ -7,7 +7,7 @@ import { WebPartTitle } from "@pnp/spfx-controls-react/lib/WebPartTitle";
import * as webPartStrings from 'SearchFiltersWebPartStrings';
import * as commonStrings from 'CommonStrings';
import update from 'immutability-helper';
-import { MessageBar, MessageBarType } from 'office-ui-fabric-react';
+import { MessageBar, MessageBarType } from '@fluentui/react';
import {
IDataFilterInternal,
IDataFilterValueInternal,
diff --git a/search-parts/src/webparts/searchResults/SearchResultsWebPart.ts b/search-parts/src/webparts/searchResults/SearchResultsWebPart.ts
index 17fb52040..6806f87be 100644
--- a/search-parts/src/webparts/searchResults/SearchResultsWebPart.ts
+++ b/search-parts/src/webparts/searchResults/SearchResultsWebPart.ts
@@ -1,7 +1,7 @@
import * as React from 'react';
import * as ReactDom from 'react-dom';
import { Version, Text, DisplayMode, ServiceScope, Log } from '@microsoft/sp-core-library';
-import { IComboBoxOption, Toggle, IToggleProps, MessageBarType, MessageBar, Link } from 'office-ui-fabric-react';
+import { IComboBoxOption, Toggle, IToggleProps, MessageBarType, MessageBar, Link } from '@fluentui/react';
import { IWebPartPropertiesMetadata } from '@microsoft/sp-webpart-base';
import * as webPartStrings from 'SearchResultsWebPartStrings';
import * as commonStrings from 'CommonStrings';
@@ -1016,7 +1016,7 @@ export default class SearchResultsWebPart extends BaseWebPart {
const { PropertyFieldCodeEditor, PropertyFieldCodeEditorLanguages } = await import(
- /* webpackChunkName: 'pnp-modern-search-code-editor' */
+ /* webpackChunkName: 'pnp-modern-search-code-editor', webpackMode: 'lazy' */
'@pnp/spfx-property-controls/lib/propertyFields/codeEditor'
);
@@ -2208,10 +2208,10 @@ export default class SearchResultsWebPart extends BaseWebPart {
const inputQueryText: string = !isEmpty(GlobalSettings.getValue(BuiltinTokenNames.inputQueryText)) ? GlobalSettings.getValue(BuiltinTokenNames.inputQueryText) : "";
resolvedUrl = resolvedUrl.replace(/\{inputQueryText\}|\{searchTerms\}|\{SearchBoxQuery\}/gi, inputQueryText);
+ resolvedUrl = resolvedUrl.replace(inputQueryText,encodeURIComponent(inputQueryText));
if(vertical.openBehavior === PageOpenBehavior.NewTab){
window.open(resolvedUrl, "_blank");
diff --git a/search-parts/tsconfig.json b/search-parts/tsconfig.json
index 7dbc412f0..1fe62e4df 100644
--- a/search-parts/tsconfig.json
+++ b/search-parts/tsconfig.json
@@ -1,5 +1,5 @@
{
- "extends": "./node_modules/@microsoft/rush-stack-compiler-4.5/includes/tsconfig-web.json",
+ "extends": "./node_modules/@microsoft/rush-stack-compiler-4.7/includes/tsconfig-web.json",
"compilerOptions": {
"target": "es5",
"forceConsistentCasingInFileNames": true,
@@ -16,7 +16,7 @@
"noUnusedLocals": false,
"typeRoots": ["./node_modules/@types", "./node_modules/@microsoft"],
"types": ["webpack-env"],
- "lib": ["es5", "dom", "es2015.collection", "es2015.promise"]
+ "lib": ["es2017", "dom"]
},
"include": ["src/**/*.ts"],
"exclude": ["node_modules", "lib"]