@sitecore-jss/sitecore-jss-react 21.6.3-canary.2 → 21.6.3-canary.4

package/dist/cjs/components/PlaceholderCommon.js

@@ -24,14 +24,6 @@ const FEaaSComponent_1 = require("./FEaaSComponent");
 const FEaaSWrapper_1 = require("./FEaaSWrapper");
 const BYOCComponent_1 = require("./BYOCComponent");
 const BYOCWrapper_1 = require("./BYOCWrapper");
-/**
- * These patterns need for right rendering Dynamic placeholders.
- * Must be distinguished Splitter components and another placeholders(containers)
- */
-const EXCLUDE_PLACEHOLDERS_RENDER = [
-    new RegExp(/column-(\d{1})-\{\*\}/i),
-    new RegExp(/row-(\d{1})-\{\*\}/i),
-];
 class PlaceholderCommon extends react_1.default.Component {
     constructor(props) {
         super(props);
@@ -47,9 +39,10 @@ class PlaceholderCommon extends react_1.default.Component {
         from backend side we get common name of placeholder is called 'nameOfContainer-{*}' where '{*}' marker for replacing **/
         if (rendering === null || rendering === void 0 ? void 0 : rendering.placeholders) {
             Object.keys(rendering.placeholders).forEach((placeholder) => {
-                if (placeholder.indexOf('{*}') !== -1 &&
-                    !EXCLUDE_PLACEHOLDERS_RENDER.some((pattern) => name.search(pattern) !== -1) &&
-                    name.replace(/[^a-zA-Z]*/gi, '') === placeholder.replace(/[^a-zA-Z]*/gi, '')) {
+                const patternPlaceholder = placeholder.indexOf('{*}') !== -1
+                    ? new RegExp(`^${placeholder.replace(/\{\*\}+/i, '\\d+')}$`)
+                    : null;
+                if (patternPlaceholder && patternPlaceholder.test(name)) {
                     rendering.placeholders[name] = rendering.placeholders[placeholder];
                     delete rendering.placeholders[placeholder];
                 }

package/dist/cjs/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ComponentBuilder = exports.EditFrame = exports.withDatasourceCheck = exports.withPlaceholder = exports.withEditorChromes = exports.useSitecoreContext = exports.withSitecoreContext = exports.SitecoreContextReactContext = exports.SitecoreContext = exports.VisitorIdentification = exports.File = exports.LinkPropTypes = exports.Link = exports.BYOCWrapper = exports.fetchBYOCComponentServerProps = exports.BYOCComponent = exports.FEaaSWrapper = exports.fetchFEaaSComponentServerProps = exports.FEaaSComponent = exports.DateField = exports.Text = exports.RichTextPropTypes = exports.RichText = exports.getEEMarkup = exports.Image = exports.Placeholder = exports.getFEAASLibraryStylesheetLinks = exports.mediaApi = exports.RestDictionaryService = exports.GraphQLDictionaryService = exports.trackingApi = exports.getFieldValue = exports.getChildPlaceholder = exports.RestLayoutService = exports.GraphQLLayoutService = exports.LayoutServicePageState = exports.getContentStylesheetLink = exports.DefaultEditFrameButtons = exports.DefaultEditFrameButton = exports.resetEditorChromes = exports.isEditorActive = exports.enableDebug = exports.constants = void 0;
+exports.ComponentBuilder = exports.EditFrame = exports.withDatasourceCheck = exports.withPlaceholder = exports.withEditorChromes = exports.useSitecoreContext = exports.withSitecoreContext = exports.SitecoreContextReactContext = exports.SitecoreContext = exports.VisitorIdentification = exports.File = exports.LinkPropTypes = exports.Link = exports.BYOCWrapper = exports.fetchBYOCComponentServerProps = exports.BYOCComponent = exports.FEaaSWrapper = exports.fetchFEaaSComponentServerProps = exports.FEaaSComponent = exports.DateField = exports.Text = exports.RichTextPropTypes = exports.RichText = exports.getEEMarkup = exports.Image = exports.Placeholder = exports.getFEAASLibraryStylesheetLinks = exports.mediaApi = exports.DefaultRetryStrategy = exports.RestDictionaryService = exports.GraphQLDictionaryService = exports.trackingApi = exports.getFieldValue = exports.getChildPlaceholder = exports.RestLayoutService = exports.GraphQLLayoutService = exports.LayoutServicePageState = exports.getContentStylesheetLink = exports.DefaultEditFrameButtons = exports.DefaultEditFrameButton = exports.resetEditorChromes = exports.isEditorActive = exports.enableDebug = exports.constants = void 0;
 var sitecore_jss_1 = require("@sitecore-jss/sitecore-jss");
 Object.defineProperty(exports, "constants", { enumerable: true, get: function () { return sitecore_jss_1.constants; } });
 Object.defineProperty(exports, "enableDebug", { enumerable: true, get: function () { return sitecore_jss_1.enableDebug; } });
@@ -21,6 +21,8 @@ Object.defineProperty(exports, "trackingApi", { enumerable: true, get: function
 var i18n_1 = require("@sitecore-jss/sitecore-jss/i18n");
 Object.defineProperty(exports, "GraphQLDictionaryService", { enumerable: true, get: function () { return i18n_1.GraphQLDictionaryService; } });
 Object.defineProperty(exports, "RestDictionaryService", { enumerable: true, get: function () { return i18n_1.RestDictionaryService; } });
+var graphql_1 = require("@sitecore-jss/sitecore-jss/graphql");
+Object.defineProperty(exports, "DefaultRetryStrategy", { enumerable: true, get: function () { return graphql_1.DefaultRetryStrategy; } });
 var media_1 = require("@sitecore-jss/sitecore-jss/media");
 Object.defineProperty(exports, "mediaApi", { enumerable: true, get: function () { return media_1.mediaApi; } });
 var feaas_1 = require("@sitecore-jss/sitecore-jss/feaas");

package/dist/esm/components/PlaceholderCommon.js

@@ -18,14 +18,6 @@ import { FEaaSComponent, FEAAS_COMPONENT_RENDERING_NAME } from './FEaaSComponent
 import { FEaaSWrapper, FEAAS_WRAPPER_RENDERING_NAME } from './FEaaSWrapper';
 import { BYOCComponent, BYOC_COMPONENT_RENDERING_NAME } from './BYOCComponent';
 import { BYOCWrapper, BYOC_WRAPPER_RENDERING_NAME } from './BYOCWrapper';
-/**
- * These patterns need for right rendering Dynamic placeholders.
- * Must be distinguished Splitter components and another placeholders(containers)
- */
-const EXCLUDE_PLACEHOLDERS_RENDER = [
-    new RegExp(/column-(\d{1})-\{\*\}/i),
-    new RegExp(/row-(\d{1})-\{\*\}/i),
-];
 export class PlaceholderCommon extends React.Component {
     constructor(props) {
         super(props);
@@ -41,9 +33,10 @@ export class PlaceholderCommon extends React.Component {
         from backend side we get common name of placeholder is called 'nameOfContainer-{*}' where '{*}' marker for replacing **/
         if (rendering === null || rendering === void 0 ? void 0 : rendering.placeholders) {
             Object.keys(rendering.placeholders).forEach((placeholder) => {
-                if (placeholder.indexOf('{*}') !== -1 &&
-                    !EXCLUDE_PLACEHOLDERS_RENDER.some((pattern) => name.search(pattern) !== -1) &&
-                    name.replace(/[^a-zA-Z]*/gi, '') === placeholder.replace(/[^a-zA-Z]*/gi, '')) {
+                const patternPlaceholder = placeholder.indexOf('{*}') !== -1
+                    ? new RegExp(`^${placeholder.replace(/\{\*\}+/i, '\\d+')}$`)
+                    : null;
+                if (patternPlaceholder && patternPlaceholder.test(name)) {
                     rendering.placeholders[name] = rendering.placeholders[placeholder];
                     delete rendering.placeholders[placeholder];
                 }

package/dist/esm/index.js

@@ -3,6 +3,7 @@ export { isEditorActive, resetEditorChromes, DefaultEditFrameButton, DefaultEdit
 export { getContentStylesheetLink, LayoutServicePageState, GraphQLLayoutService, RestLayoutService, getChildPlaceholder, getFieldValue, } from '@sitecore-jss/sitecore-jss/layout';
 export { trackingApi, } from '@sitecore-jss/sitecore-jss/tracking';
 export { GraphQLDictionaryService, RestDictionaryService, } from '@sitecore-jss/sitecore-jss/i18n';
+export { DefaultRetryStrategy } from '@sitecore-jss/sitecore-jss/graphql';
 export { mediaApi } from '@sitecore-jss/sitecore-jss/media';
 export { getFEAASLibraryStylesheetLinks } from '@sitecore-jss/sitecore-jss/feaas';
 export { Placeholder } from './components/Placeholder';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sitecore-jss/sitecore-jss-react",
-  "version": "21.6.3-canary.2",
+  "version": "21.6.3-canary.4",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
   "sideEffects": false,
@@ -62,14 +62,14 @@
     "react-dom": "^18.2.0"
   },
   "dependencies": {
-    "@sitecore-jss/sitecore-jss": "^21.6.3-canary.2",
+    "@sitecore-jss/sitecore-jss": "^21.6.3-canary.4",
     "deep-equal": "^2.1.0",
     "prop-types": "^15.8.1",
     "style-attr": "^1.3.0"
   },
   "description": "",
   "types": "types/index.d.ts",
-  "gitHead": "ae4c394708b517e9f521181b8200e7628170e9b6",
+  "gitHead": "0e3e185e0f9f38b2afcac22ca813b93f6ddf36c8",
   "files": [
     "dist",
     "types"

package/types/index.d.ts

@@ -3,6 +3,7 @@ export { isEditorActive, resetEditorChromes, DefaultEditFrameButton, DefaultEdit
 export { getContentStylesheetLink, LayoutService, LayoutServiceData, LayoutServicePageState, LayoutServiceContext, LayoutServiceContextData, GraphQLLayoutService, RestLayoutService, RouteData, Field, Item, HtmlElementRendering, getChildPlaceholder, getFieldValue, ComponentRendering, ComponentFields, ComponentParams, } from '@sitecore-jss/sitecore-jss/layout';
 export { trackingApi, TrackingRequestOptions, CampaignInstance, GoalInstance, OutcomeInstance, EventInstance, PageViewInstance, } from '@sitecore-jss/sitecore-jss/tracking';
 export { DictionaryPhrases, DictionaryService, GraphQLDictionaryService, RestDictionaryService, } from '@sitecore-jss/sitecore-jss/i18n';
+export { RetryStrategy, DefaultRetryStrategy } from '@sitecore-jss/sitecore-jss/graphql';
 export { mediaApi } from '@sitecore-jss/sitecore-jss/media';
 export { getFEAASLibraryStylesheetLinks } from '@sitecore-jss/sitecore-jss/feaas';
 export { ComponentFactory } from './components/sharedTypes';