@blaze-cms/react-page-builder 0.133.0-admin-updates.1 → 0.133.0-admin-updates.2

package/CHANGELOG.md

@@ -3,6 +3,21 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.133.0-admin-updates.2](https://github.com/thebyte9/blaze/compare/v0.133.0-admin-updates.1...v0.133.0-admin-updates.2) (2023-09-06)
+
+
+### Bug Fixes
+
+* fix typo ([3c87c7f](https://github.com/thebyte9/blaze/commit/3c87c7f50b0c184fc369a3efbac0584fb0af6c09))
+* handle sort order when user sort not applied ([#4040](https://github.com/thebyte9/blaze/issues/4040)) ([7e674ef](https://github.com/thebyte9/blaze/commit/7e674ef7798d3032351dd4ef50c88d81f2130be4))
+* unwanted space when banner not served ([fb35848](https://github.com/thebyte9/blaze/commit/fb35848b7f91c9c063833d30b37e44996b2a4a56))
+* update ad slot render test ([dc9655f](https://github.com/thebyte9/blaze/commit/dc9655f2a2f9b9b5f5e98c77382561d3c4c4088d))
+* update ad slot render test ([2d12523](https://github.com/thebyte9/blaze/commit/2d12523f79245208e8919b7d90fa6d4294f396da))
+
+
+
+
+
 # [0.133.0-admin-updates.1](https://github.com/thebyte9/blaze/compare/v0.133.0-admin-updates.0...v0.133.0-admin-updates.1) (2023-09-05)
 
 

package/lib/components/Banner/AdSlotRender.js

@@ -23,6 +23,7 @@ var _react = _interopRequireWildcard(require("react"));
 var _reactDfp = require("react-dfp");
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _constants = require("../../constants");
+var _Wrapper = _interopRequireDefault(require("../Wrapper"));
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 var AdSlotRender = function AdSlotRender(_ref) {
@@ -31,6 +32,7 @@ var AdSlotRender = function AdSlotRender(_ref) {
     sizeId = _ref.sizeId,
     parsedAdunit = _ref.parsedAdunit,
     parsedSizes = _ref.parsedSizes,
+    modifiers = _ref.modifiers,
     targetingArguments = _ref.targetingArguments;
   var _useState = (0, _react.useState)({}),
     _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
@@ -52,11 +54,16 @@ var AdSlotRender = function AdSlotRender(_ref) {
     return "@media(min-width:".concat(minWidth, "px){.").concat(bannerClass, "{min-height:").concat(minimumHeight, "px;}");
   }).sort();
   var className = "ad-slot ad-slot-".concat(loadingStatus, " ").concat(bannerClass);
-  return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, styles && /*#__PURE__*/_react["default"].createElement("style", null, styles.join('\n')), /*#__PURE__*/_react["default"].createElement("div", {
+  var newModifers = "".concat(modifiers, " banner-").concat(loadingStatus);
+  return /*#__PURE__*/_react["default"].createElement(_Wrapper["default"], {
+    className: "banner",
+    modifiers: newModifers
+  }, styles && /*#__PURE__*/_react["default"].createElement("style", null, styles.join('\n')), /*#__PURE__*/_react["default"].createElement("div", {
     className: className,
     style: {
       minHeight: minHeight
-    }
+    },
+    "data-testid": "ad-slot"
   }, shouldShowBanner && /*#__PURE__*/_react["default"].createElement(_reactDfp.AdSlot, {
     adUnit: parsedAdunit,
     sizes: parsedSizes,
@@ -81,10 +88,12 @@ AdSlotRender.propTypes = {
   sizeId: _propTypes["default"].string.isRequired,
   parsedAdunit: _propTypes["default"].string.isRequired,
   parsedSizes: _propTypes["default"].array,
+  modifiers: _propTypes["default"].string,
   targetingArguments: _propTypes["default"].object.isRequired
 };
 AdSlotRender.defaultProps = {
-  parsedSizes: null
+  parsedSizes: null,
+  modifiers: ''
 };
 var _default = AdSlotRender;
 exports["default"] = _default;

package/lib/components/Banner/AdSlotRender.js.map

@@ -1 +1 @@
-{"version":3,"file":"AdSlotRender.js","names":["_react","_interopRequireWildcard","require","_reactDfp","_propTypes","_interopRequireDefault","_constants","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","_typeof","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","AdSlotRender","_ref","shouldShowBanner","sizeMapping","sizeId","parsedAdunit","parsedSizes","targetingArguments","_useState","useState","_useState2","_slicedToArray2","_useState2$","_useState2$$loadingSt","loadingStatus","BANNER_LOADING","minHeight","setLoadingStatus","bannerClass","concat","styles","map","_ref2","styleSizes","sizes","_ref2$viewport","viewport","minWidth","minimumHeight","Math","min","apply","_toConsumableArray2","_ref3","_ref4","height","sort","className","createElement","Fragment","join","style","AdSlot","adUnit","onSlotRender","slotData","_slotData$event","event","isEmpty","size","slotHeight","length","undefined","newLoadingStatus","BANNER_EMPTY","BANNER_LOADED","propTypes","PropTypes","bool","isRequired","array","string","object","defaultProps","_default","exports"],"sources":["../../../src/components/Banner/AdSlotRender.js"],"sourcesContent":["import React, { useState } from 'react';\nimport { AdSlot } from 'react-dfp';\nimport PropTypes from 'prop-types';\nimport { BANNER_LOADING, BANNER_EMPTY, BANNER_LOADED } from '../../constants';\n\nconst AdSlotRender = ({\n  shouldShowBanner,\n  sizeMapping,\n  sizeId,\n  parsedAdunit,\n  parsedSizes,\n  targetingArguments\n}) => {\n  const [{ loadingStatus = BANNER_LOADING, minHeight }, setLoadingStatus] = useState({});\n\n  const bannerClass = `banner-${sizeId}`;\n\n  const styles =\n    loadingStatus === BANNER_LOADING &&\n    sizeMapping\n      .map(({ sizes: styleSizes, viewport: [minWidth] }) => {\n        const minimumHeight = Math.min(...styleSizes.map(([, height]) => height));\n        return `@media(min-width:${minWidth}px){.${bannerClass}{min-height:${minimumHeight}px;}`;\n      })\n      .sort();\n  const className = `ad-slot ad-slot-${loadingStatus} ${bannerClass}`;\n\n  return (\n    <>\n      {styles && <style>{styles.join('\\n')}</style>}\n      <div className={className} style={{ minHeight }}>\n        {shouldShowBanner && (\n          <AdSlot\n            adUnit={parsedAdunit}\n            sizes={parsedSizes}\n            targetingArguments={targetingArguments}\n            sizeMapping={sizeMapping}\n            onSlotRender={slotData => {\n              const {\n                event: { isEmpty, size }\n              } = slotData;\n              const slotHeight = size && size.length ? size[1] : undefined;\n              const newLoadingStatus = isEmpty ? BANNER_EMPTY : BANNER_LOADED;\n              setLoadingStatus({ loadingStatus: newLoadingStatus, minHeight: slotHeight });\n            }}\n          />\n        )}\n      </div>\n    </>\n  );\n};\n\nAdSlotRender.propTypes = {\n  shouldShowBanner: PropTypes.bool.isRequired,\n  sizeMapping: PropTypes.array.isRequired,\n  sizeId: PropTypes.string.isRequired,\n  parsedAdunit: PropTypes.string.isRequired,\n  parsedSizes: PropTypes.array,\n  targetingArguments: PropTypes.object.isRequired\n};\n\nAdSlotRender.defaultProps = {\n  parsedSizes: null\n};\n\nexport default AdSlotRender;\n"],"mappings":"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"}
+{"version":3,"file":"AdSlotRender.js","names":["_react","_interopRequireWildcard","require","_reactDfp","_propTypes","_interopRequireDefault","_constants","_Wrapper","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","_typeof","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","AdSlotRender","_ref","shouldShowBanner","sizeMapping","sizeId","parsedAdunit","parsedSizes","modifiers","targetingArguments","_useState","useState","_useState2","_slicedToArray2","_useState2$","_useState2$$loadingSt","loadingStatus","BANNER_LOADING","minHeight","setLoadingStatus","bannerClass","concat","styles","map","_ref2","styleSizes","sizes","_ref2$viewport","viewport","minWidth","minimumHeight","Math","min","apply","_toConsumableArray2","_ref3","_ref4","height","sort","className","newModifers","createElement","join","style","AdSlot","adUnit","onSlotRender","slotData","_slotData$event","event","isEmpty","size","slotHeight","length","undefined","newLoadingStatus","BANNER_EMPTY","BANNER_LOADED","propTypes","PropTypes","bool","isRequired","array","string","object","defaultProps","_default","exports"],"sources":["../../../src/components/Banner/AdSlotRender.js"],"sourcesContent":["import React, { useState } from 'react';\nimport { AdSlot } from 'react-dfp';\nimport PropTypes from 'prop-types';\nimport { BANNER_LOADING, BANNER_EMPTY, BANNER_LOADED } from '../../constants';\nimport Wrapper from '../Wrapper';\n\nconst AdSlotRender = ({\n  shouldShowBanner,\n  sizeMapping,\n  sizeId,\n  parsedAdunit,\n  parsedSizes,\n  modifiers,\n  targetingArguments\n}) => {\n  const [{ loadingStatus = BANNER_LOADING, minHeight }, setLoadingStatus] = useState({});\n\n  const bannerClass = `banner-${sizeId}`;\n\n  const styles =\n    loadingStatus === BANNER_LOADING &&\n    sizeMapping\n      .map(({ sizes: styleSizes, viewport: [minWidth] }) => {\n        const minimumHeight = Math.min(...styleSizes.map(([, height]) => height));\n        return `@media(min-width:${minWidth}px){.${bannerClass}{min-height:${minimumHeight}px;}`;\n      })\n      .sort();\n  const className = `ad-slot ad-slot-${loadingStatus} ${bannerClass}`;\n  const newModifers = `${modifiers} banner-${loadingStatus}`;\n  return (\n    <Wrapper className=\"banner\" modifiers={newModifers}>\n      {styles && <style>{styles.join('\\n')}</style>}\n      <div className={className} style={{ minHeight }} data-testid=\"ad-slot\">\n        {shouldShowBanner && (\n          <AdSlot\n            adUnit={parsedAdunit}\n            sizes={parsedSizes}\n            targetingArguments={targetingArguments}\n            sizeMapping={sizeMapping}\n            onSlotRender={slotData => {\n              const {\n                event: { isEmpty, size }\n              } = slotData;\n              const slotHeight = size && size.length ? size[1] : undefined;\n              const newLoadingStatus = isEmpty ? BANNER_EMPTY : BANNER_LOADED;\n              setLoadingStatus({ loadingStatus: newLoadingStatus, minHeight: slotHeight });\n            }}\n          />\n        )}\n      </div>\n    </Wrapper>\n  );\n};\n\nAdSlotRender.propTypes = {\n  shouldShowBanner: PropTypes.bool.isRequired,\n  sizeMapping: PropTypes.array.isRequired,\n  sizeId: PropTypes.string.isRequired,\n  parsedAdunit: PropTypes.string.isRequired,\n  parsedSizes: PropTypes.array,\n  modifiers: PropTypes.string,\n  targetingArguments: PropTypes.object.isRequired\n};\n\nAdSlotRender.defaultProps = {\n  parsedSizes: null,\n  modifiers: ''\n};\n\nexport default AdSlotRender;\n"],"mappings":"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"}

package/lib/components/Banner/Banner.js

@@ -26,7 +26,6 @@ var _client = require("@apollo/client");
 var _router = require("next/router");
 var _helpers = require("./helpers");
 var _query = require("../../application/query");
-var _Wrapper = _interopRequireDefault(require("../Wrapper"));
 var _BannerRender = _interopRequireDefault(require("./BannerRender"));
 var _buildPropsQuery = _interopRequireDefault(require("../../helpers/build-props-query"));
 var _utils = require("../../utils");
@@ -84,17 +83,15 @@ var Banner = function Banner(_ref) {
     actionKey = _getEntityRenderProps.actionKey,
     action = _getEntityRenderProps.action;
   var bannerKey = "".concat(sizeId).concat(asPath);
-  return /*#__PURE__*/_react["default"].createElement(_Wrapper["default"], {
-    className: type,
-    modifiers: modifiers
-  }, /*#__PURE__*/_react["default"].createElement(_BannerRender["default"], (0, _extends2["default"])({
+  return /*#__PURE__*/_react["default"].createElement(_BannerRender["default"], (0, _extends2["default"])({
     key: bannerKey
   }, otherProps, {
     action: action,
     actionKey: actionKey,
     asPath: asPath,
-    userPropsData: userPropsData
-  })));
+    userPropsData: userPropsData,
+    modifiers: modifiers
+  }));
 };
 Banner.propTypes = {
   type: _propTypes["default"].string

package/lib/components/Banner/Banner.js.map

@@ -1 +1 @@
-{"version":3,"file":"Banner.js","names":["_react","_interopRequireWildcard","require","_nextjsComponents","_coreAuthUi","_propTypes","_interopRequireDefault","_lodash","_client","_router","_helpers","_query","_Wrapper","_BannerRender","_buildPropsQuery","_utils","_getEntityRenderProps2","_excluded","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","_typeof","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","Banner","_ref","type","otherProps","_objectWithoutProperties2","router","useRouter","_useContext","useContext","MainContext","isPreview","_checkIfLoggedIn","checkIfLoggedIn","userId","id","asPath","parent","entity","sizeId","_otherProps$propsToDi","propsToDisplay","_otherProps$userProps","userPropsToDisplay","userQuery","buildUserQuery","itemEntity","_useQuery","useQuery","getSingleEntitySchema","variables","data","error","loading","_useQuery2","getUser","skip","length","_useQuery2$data","_useQuery2$data2","userData","userLoading","message","modifiers","getClassModifiers","queryProps","buildPropsQuery","flatten","map","_ref2","propertiesToDisplay","userPropsData","buildPropsData","_getEntityRenderProps","getEntityRenderProps","actionKey","action","bannerKey","concat","createElement","className","_extends2","propTypes","PropTypes","string","defaultProps","_default","exports"],"sources":["../../../src/components/Banner/Banner.js"],"sourcesContent":["import React, { useContext } from 'react';\nimport { MainContext } from '@blaze-cms/nextjs-components';\nimport { checkIfLoggedIn } from '@blaze-cms/core-auth-ui';\nimport PropTypes from 'prop-types';\nimport flatten from 'lodash.flatten';\nimport { useQuery } from '@apollo/client';\nimport { useRouter } from 'next/router';\nimport { buildUserQuery, buildPropsData } from './helpers';\nimport { getSingleEntitySchema, getUser } from '../../application/query';\nimport Wrapper from '../Wrapper';\nimport BannerRender from './BannerRender';\nimport buildPropsQuery from '../../helpers/build-props-query';\nimport { getClassModifiers } from '../../utils';\nimport getEntityRenderProps from '../../helpers/get-entity-render-props';\n\nconst Banner = ({ type, ...otherProps }) => {\n  const router = useRouter();\n  const { isPreview } = useContext(MainContext);\n  const { id: userId } = checkIfLoggedIn();\n  const { asPath } = router;\n  const { parent, entity, sizeId, propsToDisplay = [], userPropsToDisplay = [] } = otherProps;\n  const userQuery = buildUserQuery(userPropsToDisplay);\n  const { itemEntity } = parent;\n  const { data, error, loading } = useQuery(getSingleEntitySchema, {\n    variables: { id: entity || itemEntity }\n  });\n  const { data: { getUser: userData } = {}, loading: userLoading } = useQuery(getUser(userQuery), {\n    variables: { id: userId },\n    skip: !userPropsToDisplay.length || !userId\n  });\n\n  if (loading || userLoading) return '';\n  if (error) return error.message;\n  if (!data) return null;\n  if (!sizeId) return null;\n\n  const modifiers = getClassModifiers('banner', otherProps);\n  const queryProps = buildPropsQuery(\n    data,\n    propsToDisplay.length\n      ? flatten(propsToDisplay.map(({ propertiesToDisplay }) => propertiesToDisplay))\n      : []\n  );\n\n  const userPropsData = buildPropsData(userData, userPropsToDisplay);\n  const { actionKey, action } = getEntityRenderProps(queryProps, data, isPreview);\n  const bannerKey = `${sizeId}${asPath}`;\n\n  return (\n    <Wrapper className={type} modifiers={modifiers}>\n      <BannerRender\n        key={bannerKey}\n        {...otherProps}\n        action={action}\n        actionKey={actionKey}\n        asPath={asPath}\n        userPropsData={userPropsData}\n      />\n    </Wrapper>\n  );\n};\n\nBanner.propTypes = {\n  type: PropTypes.string\n};\n\nBanner.defaultProps = {\n  type: 'banner'\n};\n\nexport default Banner;\n"],"mappings":"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"}
+{"version":3,"file":"Banner.js","names":["_react","_interopRequireWildcard","require","_nextjsComponents","_coreAuthUi","_propTypes","_interopRequireDefault","_lodash","_client","_router","_helpers","_query","_BannerRender","_buildPropsQuery","_utils","_getEntityRenderProps2","_excluded","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","_typeof","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","Banner","_ref","type","otherProps","_objectWithoutProperties2","router","useRouter","_useContext","useContext","MainContext","isPreview","_checkIfLoggedIn","checkIfLoggedIn","userId","id","asPath","parent","entity","sizeId","_otherProps$propsToDi","propsToDisplay","_otherProps$userProps","userPropsToDisplay","userQuery","buildUserQuery","itemEntity","_useQuery","useQuery","getSingleEntitySchema","variables","data","error","loading","_useQuery2","getUser","skip","length","_useQuery2$data","_useQuery2$data2","userData","userLoading","message","modifiers","getClassModifiers","queryProps","buildPropsQuery","flatten","map","_ref2","propertiesToDisplay","userPropsData","buildPropsData","_getEntityRenderProps","getEntityRenderProps","actionKey","action","bannerKey","concat","createElement","_extends2","propTypes","PropTypes","string","defaultProps","_default","exports"],"sources":["../../../src/components/Banner/Banner.js"],"sourcesContent":["import React, { useContext } from 'react';\nimport { MainContext } from '@blaze-cms/nextjs-components';\nimport { checkIfLoggedIn } from '@blaze-cms/core-auth-ui';\nimport PropTypes from 'prop-types';\nimport flatten from 'lodash.flatten';\nimport { useQuery } from '@apollo/client';\nimport { useRouter } from 'next/router';\nimport { buildUserQuery, buildPropsData } from './helpers';\nimport { getSingleEntitySchema, getUser } from '../../application/query';\nimport BannerRender from './BannerRender';\nimport buildPropsQuery from '../../helpers/build-props-query';\nimport { getClassModifiers } from '../../utils';\nimport getEntityRenderProps from '../../helpers/get-entity-render-props';\n\nconst Banner = ({ type, ...otherProps }) => {\n  const router = useRouter();\n  const { isPreview } = useContext(MainContext);\n  const { id: userId } = checkIfLoggedIn();\n  const { asPath } = router;\n  const { parent, entity, sizeId, propsToDisplay = [], userPropsToDisplay = [] } = otherProps;\n  const userQuery = buildUserQuery(userPropsToDisplay);\n  const { itemEntity } = parent;\n  const { data, error, loading } = useQuery(getSingleEntitySchema, {\n    variables: { id: entity || itemEntity }\n  });\n  const { data: { getUser: userData } = {}, loading: userLoading } = useQuery(getUser(userQuery), {\n    variables: { id: userId },\n    skip: !userPropsToDisplay.length || !userId\n  });\n\n  if (loading || userLoading) return '';\n  if (error) return error.message;\n  if (!data) return null;\n  if (!sizeId) return null;\n\n  const modifiers = getClassModifiers('banner', otherProps);\n  const queryProps = buildPropsQuery(\n    data,\n    propsToDisplay.length\n      ? flatten(propsToDisplay.map(({ propertiesToDisplay }) => propertiesToDisplay))\n      : []\n  );\n\n  const userPropsData = buildPropsData(userData, userPropsToDisplay);\n  const { actionKey, action } = getEntityRenderProps(queryProps, data, isPreview);\n  const bannerKey = `${sizeId}${asPath}`;\n\n  return (\n    <BannerRender\n      key={bannerKey}\n      {...otherProps}\n      action={action}\n      actionKey={actionKey}\n      asPath={asPath}\n      userPropsData={userPropsData}\n      modifiers={modifiers}\n    />\n  );\n};\n\nBanner.propTypes = {\n  type: PropTypes.string\n};\n\nBanner.defaultProps = {\n  type: 'banner'\n};\n\nexport default Banner;\n"],"mappings":"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"}

package/lib/components/Banner/BannerRender.js

@@ -25,7 +25,7 @@ var _helpers = require("./helpers");
 var _constants = require("../../constants");
 var _HOC = require("../../HOC");
 var _AdSlotRender = _interopRequireDefault(require("./AdSlotRender"));
-var _excluded = ["baseAdunit", "adunit", "sizeId", "sizes", "propsToDisplay", "entity", "targetings", "parent", "asPath", "action", "actionKey", "renderCounter", "userPropsData"];
+var _excluded = ["baseAdunit", "adunit", "sizeId", "sizes", "propsToDisplay", "entity", "targetings", "parent", "asPath", "action", "actionKey", "renderCounter", "userPropsData", "modifiers"];
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var BannerRender = function BannerRender(_ref) {
@@ -42,6 +42,7 @@ var BannerRender = function BannerRender(_ref) {
     actionKey = _ref.actionKey,
     renderCounter = _ref.renderCounter,
     userPropsData = _ref.userPropsData,
+    modifiers = _ref.modifiers,
     otherProps = (0, _objectWithoutProperties2["default"])(_ref, _excluded);
   var id = otherProps.id;
   var itemId = parent.itemId;
@@ -94,6 +95,7 @@ var BannerRender = function BannerRender(_ref) {
     sizeId: sizeId,
     parsedAdunit: parsedAdunit,
     parsedSizes: parsedSizes,
+    modifiers: modifiers,
     targetingArguments: targetingArguments
   });
 };
@@ -110,6 +112,7 @@ BannerRender.propTypes = {
   targetings: _propTypes["default"].string,
   sizes: _propTypes["default"].string,
   renderCounter: _propTypes["default"].number,
+  modifiers: _propTypes["default"].string,
   userPropsData: _propTypes["default"].object
 };
 BannerRender.defaultProps = {
@@ -121,6 +124,7 @@ BannerRender.defaultProps = {
   targetings: '',
   sizes: '',
   renderCounter: null,
+  modifiers: '',
   userPropsData: {}
 };
 var _default = (0, _HOC.withTitle)(BannerRender);

package/lib/components/Banner/BannerRender.js.map

@@ -1 +1 @@
-{"version":3,"file":"BannerRender.js","names":["_react","_interopRequireDefault","require","_propTypes","_client","_query","_helpers","_constants","_HOC","_AdSlotRender","_excluded","ownKeys","e","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty2","getOwnPropertyDescriptors","defineProperties","defineProperty","BannerRender","_ref","baseAdunit","adunit","sizeId","sizes","propsToDisplay","entity","targetings","parent","asPath","action","actionKey","renderCounter","userPropsData","otherProps","_objectWithoutProperties2","id","itemId","_useQuery","useQuery","variables","where","skip","_useQuery$data","data","entityRecordData","_useQuery2","generateSingleItemQuery","GET_BANNER","BANNER_QUERY_PROPS","_useQuery2$data","bannerData","_useQuery3","getCount","COUNT_CONTENT_HIERARCHIES","parentId","childEntity","_ilike","concat","PUBLISHED","_useQuery3$data","parsedTargetings","buildContextualTargeting","entityData","_ref2","bannerSizes","sizeMapping","buildSizeMapping","parsedSizes","buildBannerSizes","countContentHierarchies","parsedAdunit","buildParsedAdunit","isContextualTargetingSet","isContextualTargetingReady","shouldShowBanner","customTargetings","setCustomTargetings","targetingArguments","createElement","propTypes","PropTypes","object","isRequired","string","array","number","defaultProps","_default","withTitle","exports"],"sources":["../../../src/components/Banner/BannerRender.js"],"sourcesContent":["import React from 'react';\nimport PropTypes from 'prop-types';\n\nimport { useQuery } from '@apollo/client';\n\nimport { generateSingleItemQuery, getCount } from '../../application/query';\nimport {\n  buildBannerSizes,\n  buildContextualTargeting,\n  buildParsedAdunit,\n  buildSizeMapping,\n  setCustomTargetings\n} from './helpers';\nimport {\n  BANNER_QUERY_PROPS,\n  COUNT_CONTENT_HIERARCHIES,\n  GET_BANNER,\n  PUBLISHED\n} from '../../constants';\nimport { withTitle } from '../../HOC';\nimport AdSlotRender from './AdSlotRender';\n\nconst BannerRender = ({\n  baseAdunit,\n  adunit,\n  sizeId,\n  sizes,\n  propsToDisplay,\n  entity,\n  targetings,\n  parent,\n  asPath,\n  action,\n  actionKey,\n  renderCounter,\n  userPropsData,\n  ...otherProps\n}) => {\n  const { id } = otherProps;\n  const { itemId } = parent;\n\n  const { data: entityRecordData = {} } = useQuery(action, {\n    variables: { where: { id: id || itemId } },\n    skip: id && id !== itemId\n  });\n\n  const { data: bannerData = {} } = useQuery(\n    generateSingleItemQuery(GET_BANNER, BANNER_QUERY_PROPS),\n    {\n      variables: { id: sizeId },\n      skip: !sizeId\n    }\n  );\n\n  const { data = {} } = useQuery(getCount(COUNT_CONTENT_HIERARCHIES), {\n    variables: {\n      where: {\n        parentId: id || itemId,\n        childEntity: {\n          _ilike: `${PUBLISHED}_%`\n        }\n      }\n    }\n  });\n\n  const parsedTargetings = buildContextualTargeting(actionKey, entityRecordData, propsToDisplay);\n  const { entityData } = bannerData;\n  const { sizes: bannerSizes } = entityData || {};\n\n  const sizeMapping = buildSizeMapping(sizeId, bannerSizes);\n  const parsedSizes = buildBannerSizes(sizeId, bannerSizes, sizes);\n\n  const { countContentHierarchies } = data;\n\n  const parsedAdunit = buildParsedAdunit(asPath, countContentHierarchies, baseAdunit, adunit);\n  const isContextualTargetingSet =\n    propsToDisplay.length && parsedTargetings && Object.keys(parsedTargetings).length;\n  const isContextualTargetingReady = isContextualTargetingSet || !propsToDisplay.length;\n  const shouldShowBanner =\n    parsedAdunit && parsedSizes && !!parsedSizes.length && isContextualTargetingReady;\n\n  const customTargetings = setCustomTargetings(targetings, renderCounter);\n\n  const targetingArguments = { ...parsedTargetings, ...customTargetings, ...userPropsData };\n\n  return (\n    <AdSlotRender\n      shouldShowBanner={!!shouldShowBanner}\n      sizeMapping={sizeMapping}\n      sizeId={sizeId}\n      parsedAdunit={parsedAdunit}\n      parsedSizes={parsedSizes}\n      targetingArguments={targetingArguments}\n    />\n  );\n};\n\nBannerRender.propTypes = {\n  parent: PropTypes.object.isRequired,\n  asPath: PropTypes.string.isRequired,\n  action: PropTypes.object.isRequired,\n  actionKey: PropTypes.string.isRequired,\n  adunit: PropTypes.string,\n  baseAdunit: PropTypes.string,\n  sizeId: PropTypes.string,\n  propsToDisplay: PropTypes.array,\n  entity: PropTypes.string,\n  targetings: PropTypes.string,\n  sizes: PropTypes.string,\n  renderCounter: PropTypes.number,\n  userPropsData: PropTypes.object\n};\n\nBannerRender.defaultProps = {\n  adunit: '',\n  baseAdunit: '',\n  sizeId: '',\n  propsToDisplay: [],\n  entity: '',\n  targetings: '',\n  sizes: '',\n  renderCounter: null,\n  userPropsData: {}\n};\n\nexport default withTitle(BannerRender);\n"],"mappings":";;;;;;;;;;;;;;;;;;;AAAA,IAAAA,MAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,UAAA,GAAAF,sBAAA,CAAAC,OAAA;AAEA,IAAAE,OAAA,GAAAF,OAAA;AAEA,IAAAG,MAAA,GAAAH,OAAA;AACA,IAAAI,QAAA,GAAAJ,OAAA;AAOA,IAAAK,UAAA,GAAAL,OAAA;AAMA,IAAAM,IAAA,GAAAN,OAAA;AACA,IAAAO,aAAA,GAAAR,sBAAA,CAAAC,OAAA;AAA0C,IAAAQ,SAAA;AAAA,SAAAC,QAAAC,CAAA,EAAAC,CAAA,QAAAC,CAAA,GAAAC,MAAA,CAAAC,IAAA,CAAAJ,CAAA,OAAAG,MAAA,CAAAE,qBAAA,QAAAC,CAAA,GAAAH,MAAA,CAAAE,qBAAA,CAAAL,CAAA,GAAAC,CAAA,KAAAK,CAAA,GAAAA,CAAA,CAAAC,MAAA,WAAAN,CAAA,WAAAE,MAAA,CAAAK,wBAAA,CAAAR,CAAA,EAAAC,CAAA,EAAAQ,UAAA,OAAAP,CAAA,CAAAQ,IAAA,CAAAC,KAAA,CAAAT,CAAA,EAAAI,CAAA,YAAAJ,CAAA;AAAA,SAAAU,cAAAZ,CAAA,aAAAC,CAAA,MAAAA,CAAA,GAAAY,SAAA,CAAAC,MAAA,EAAAb,CAAA,UAAAC,CAAA,WAAAW,SAAA,CAAAZ,CAAA,IAAAY,SAAA,CAAAZ,CAAA,QAAAA,CAAA,OAAAF,OAAA,CAAAI,MAAA,CAAAD,CAAA,OAAAa,OAAA,WAAAd,CAAA,QAAAe,gBAAA,aAAAhB,CAAA,EAAAC,CAAA,EAAAC,CAAA,CAAAD,CAAA,SAAAE,MAAA,CAAAc,yBAAA,GAAAd,MAAA,CAAAe,gBAAA,CAAAlB,CAAA,EAAAG,MAAA,CAAAc,yBAAA,CAAAf,CAAA,KAAAH,OAAA,CAAAI,MAAA,CAAAD,CAAA,GAAAa,OAAA,WAAAd,CAAA,IAAAE,MAAA,CAAAgB,cAAA,CAAAnB,CAAA,EAAAC,CAAA,EAAAE,MAAA,CAAAK,wBAAA,CAAAN,CAAA,EAAAD,CAAA,iBAAAD,CAAA;AAE1C,IAAMoB,YAAY,GAAG,SAAfA,YAAYA,CAAAC,IAAA,EAeZ;EAAA,IAdJC,UAAU,GAAAD,IAAA,CAAVC,UAAU;IACVC,MAAM,GAAAF,IAAA,CAANE,MAAM;IACNC,MAAM,GAAAH,IAAA,CAANG,MAAM;IACNC,KAAK,GAAAJ,IAAA,CAALI,KAAK;IACLC,cAAc,GAAAL,IAAA,CAAdK,cAAc;IACdC,MAAM,GAAAN,IAAA,CAANM,MAAM;IACNC,UAAU,GAAAP,IAAA,CAAVO,UAAU;IACVC,MAAM,GAAAR,IAAA,CAANQ,MAAM;IACNC,MAAM,GAAAT,IAAA,CAANS,MAAM;IACNC,MAAM,GAAAV,IAAA,CAANU,MAAM;IACNC,SAAS,GAAAX,IAAA,CAATW,SAAS;IACTC,aAAa,GAAAZ,IAAA,CAAbY,aAAa;IACbC,aAAa,GAAAb,IAAA,CAAba,aAAa;IACVC,UAAU,OAAAC,yBAAA,aAAAf,IAAA,EAAAvB,SAAA;EAEb,IAAQuC,EAAE,GAAKF,UAAU,CAAjBE,EAAE;EACV,IAAQC,MAAM,GAAKT,MAAM,CAAjBS,MAAM;EAEd,IAAAC,SAAA,GAAwC,IAAAC,gBAAQ,EAACT,MAAM,EAAE;MACvDU,SAAS,EAAE;QAAEC,KAAK,EAAE;UAAEL,EAAE,EAAEA,EAAE,IAAIC;QAAO;MAAE,CAAC;MAC1CK,IAAI,EAAEN,EAAE,IAAIA,EAAE,KAAKC;IACrB,CAAC,CAAC;IAAAM,cAAA,GAAAL,SAAA,CAHMM,IAAI;IAAEC,gBAAgB,GAAAF,cAAA,cAAG,CAAC,CAAC,GAAAA,cAAA;EAKnC,IAAAG,UAAA,GAAkC,IAAAP,gBAAQ,EACxC,IAAAQ,8BAAuB,EAACC,qBAAU,EAAEC,6BAAkB,CAAC,EACvD;MACET,SAAS,EAAE;QAAEJ,EAAE,EAAEb;MAAO,CAAC;MACzBmB,IAAI,EAAE,CAACnB;IACT,CACF,CAAC;IAAA2B,eAAA,GAAAJ,UAAA,CANOF,IAAI;IAAEO,UAAU,GAAAD,eAAA,cAAG,CAAC,CAAC,GAAAA,eAAA;EAQ7B,IAAAE,UAAA,GAAsB,IAAAb,gBAAQ,EAAC,IAAAc,eAAQ,EAACC,oCAAyB,CAAC,EAAE;MAClEd,SAAS,EAAE;QACTC,KAAK,EAAE;UACLc,QAAQ,EAAEnB,EAAE,IAAIC,MAAM;UACtBmB,WAAW,EAAE;YACXC,MAAM,KAAAC,MAAA,CAAKC,oBAAS;UACtB;QACF;MACF;IACF,CAAC,CAAC;IAAAC,eAAA,GAAAR,UAAA,CATMR,IAAI;IAAJA,IAAI,GAAAgB,eAAA,cAAG,CAAC,CAAC,GAAAA,eAAA;EAWjB,IAAMC,gBAAgB,GAAG,IAAAC,iCAAwB,EAAC/B,SAAS,EAAEc,gBAAgB,EAAEpB,cAAc,CAAC;EAC9F,IAAQsC,UAAU,GAAKZ,UAAU,CAAzBY,UAAU;EAClB,IAAAC,KAAA,GAA+BD,UAAU,IAAI,CAAC,CAAC;IAAhCE,WAAW,GAAAD,KAAA,CAAlBxC,KAAK;EAEb,IAAM0C,WAAW,GAAG,IAAAC,yBAAgB,EAAC5C,MAAM,EAAE0C,WAAW,CAAC;EACzD,IAAMG,WAAW,GAAG,IAAAC,yBAAgB,EAAC9C,MAAM,EAAE0C,WAAW,EAAEzC,KAAK,CAAC;EAEhE,IAAQ8C,uBAAuB,GAAK1B,IAAI,CAAhC0B,uBAAuB;EAE/B,IAAMC,YAAY,GAAG,IAAAC,0BAAiB,EAAC3C,MAAM,EAAEyC,uBAAuB,EAAEjD,UAAU,EAAEC,MAAM,CAAC;EAC3F,IAAMmD,wBAAwB,GAC5BhD,cAAc,CAACZ,MAAM,IAAIgD,gBAAgB,IAAI3D,MAAM,CAACC,IAAI,CAAC0D,gBAAgB,CAAC,CAAChD,MAAM;EACnF,IAAM6D,0BAA0B,GAAGD,wBAAwB,IAAI,CAAChD,cAAc,CAACZ,MAAM;EACrF,IAAM8D,gBAAgB,GACpBJ,YAAY,IAAIH,WAAW,IAAI,CAAC,CAACA,WAAW,CAACvD,MAAM,IAAI6D,0BAA0B;EAEnF,IAAME,gBAAgB,GAAG,IAAAC,4BAAmB,EAAClD,UAAU,EAAEK,aAAa,CAAC;EAEvE,IAAM8C,kBAAkB,GAAAnE,aAAA,CAAAA,aAAA,CAAAA,aAAA,KAAQkD,gBAAgB,GAAKe,gBAAgB,GAAK3C,aAAa,CAAE;EAEzF,oBACE9C,MAAA,YAAA4F,aAAA,CAACnF,aAAA,WAAY;IACX+E,gBAAgB,EAAE,CAAC,CAACA,gBAAiB;IACrCT,WAAW,EAAEA,WAAY;IACzB3C,MAAM,EAAEA,MAAO;IACfgD,YAAY,EAAEA,YAAa;IAC3BH,WAAW,EAAEA,WAAY;IACzBU,kBAAkB,EAAEA;EAAmB,CACxC,CAAC;AAEN,CAAC;AAED3D,YAAY,CAAC6D,SAAS,GAAG;EACvBpD,MAAM,EAAEqD,qBAAS,CAACC,MAAM,CAACC,UAAU;EACnCtD,MAAM,EAAEoD,qBAAS,CAACG,MAAM,CAACD,UAAU;EACnCrD,MAAM,EAAEmD,qBAAS,CAACC,MAAM,CAACC,UAAU;EACnCpD,SAAS,EAAEkD,qBAAS,CAACG,MAAM,CAACD,UAAU;EACtC7D,MAAM,EAAE2D,qBAAS,CAACG,MAAM;EACxB/D,UAAU,EAAE4D,qBAAS,CAACG,MAAM;EAC5B7D,MAAM,EAAE0D,qBAAS,CAACG,MAAM;EACxB3D,cAAc,EAAEwD,qBAAS,CAACI,KAAK;EAC/B3D,MAAM,EAAEuD,qBAAS,CAACG,MAAM;EACxBzD,UAAU,EAAEsD,qBAAS,CAACG,MAAM;EAC5B5D,KAAK,EAAEyD,qBAAS,CAACG,MAAM;EACvBpD,aAAa,EAAEiD,qBAAS,CAACK,MAAM;EAC/BrD,aAAa,EAAEgD,qBAAS,CAACC;AAC3B,CAAC;AAED/D,YAAY,CAACoE,YAAY,GAAG;EAC1BjE,MAAM,EAAE,EAAE;EACVD,UAAU,EAAE,EAAE;EACdE,MAAM,EAAE,EAAE;EACVE,cAAc,EAAE,EAAE;EAClBC,MAAM,EAAE,EAAE;EACVC,UAAU,EAAE,EAAE;EACdH,KAAK,EAAE,EAAE;EACTQ,aAAa,EAAE,IAAI;EACnBC,aAAa,EAAE,CAAC;AAClB,CAAC;AAAC,IAAAuD,QAAA,GAEa,IAAAC,cAAS,EAACtE,YAAY,CAAC;AAAAuE,OAAA,cAAAF,QAAA"}
+{"version":3,"file":"BannerRender.js","names":["_react","_interopRequireDefault","require","_propTypes","_client","_query","_helpers","_constants","_HOC","_AdSlotRender","_excluded","ownKeys","e","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty2","getOwnPropertyDescriptors","defineProperties","defineProperty","BannerRender","_ref","baseAdunit","adunit","sizeId","sizes","propsToDisplay","entity","targetings","parent","asPath","action","actionKey","renderCounter","userPropsData","modifiers","otherProps","_objectWithoutProperties2","id","itemId","_useQuery","useQuery","variables","where","skip","_useQuery$data","data","entityRecordData","_useQuery2","generateSingleItemQuery","GET_BANNER","BANNER_QUERY_PROPS","_useQuery2$data","bannerData","_useQuery3","getCount","COUNT_CONTENT_HIERARCHIES","parentId","childEntity","_ilike","concat","PUBLISHED","_useQuery3$data","parsedTargetings","buildContextualTargeting","entityData","_ref2","bannerSizes","sizeMapping","buildSizeMapping","parsedSizes","buildBannerSizes","countContentHierarchies","parsedAdunit","buildParsedAdunit","isContextualTargetingSet","isContextualTargetingReady","shouldShowBanner","customTargetings","setCustomTargetings","targetingArguments","createElement","propTypes","PropTypes","object","isRequired","string","array","number","defaultProps","_default","withTitle","exports"],"sources":["../../../src/components/Banner/BannerRender.js"],"sourcesContent":["import React from 'react';\nimport PropTypes from 'prop-types';\n\nimport { useQuery } from '@apollo/client';\n\nimport { generateSingleItemQuery, getCount } from '../../application/query';\nimport {\n  buildBannerSizes,\n  buildContextualTargeting,\n  buildParsedAdunit,\n  buildSizeMapping,\n  setCustomTargetings\n} from './helpers';\nimport {\n  BANNER_QUERY_PROPS,\n  COUNT_CONTENT_HIERARCHIES,\n  GET_BANNER,\n  PUBLISHED\n} from '../../constants';\nimport { withTitle } from '../../HOC';\nimport AdSlotRender from './AdSlotRender';\n\nconst BannerRender = ({\n  baseAdunit,\n  adunit,\n  sizeId,\n  sizes,\n  propsToDisplay,\n  entity,\n  targetings,\n  parent,\n  asPath,\n  action,\n  actionKey,\n  renderCounter,\n  userPropsData,\n  modifiers,\n  ...otherProps\n}) => {\n  const { id } = otherProps;\n  const { itemId } = parent;\n\n  const { data: entityRecordData = {} } = useQuery(action, {\n    variables: { where: { id: id || itemId } },\n    skip: id && id !== itemId\n  });\n\n  const { data: bannerData = {} } = useQuery(\n    generateSingleItemQuery(GET_BANNER, BANNER_QUERY_PROPS),\n    {\n      variables: { id: sizeId },\n      skip: !sizeId\n    }\n  );\n\n  const { data = {} } = useQuery(getCount(COUNT_CONTENT_HIERARCHIES), {\n    variables: {\n      where: {\n        parentId: id || itemId,\n        childEntity: {\n          _ilike: `${PUBLISHED}_%`\n        }\n      }\n    }\n  });\n\n  const parsedTargetings = buildContextualTargeting(actionKey, entityRecordData, propsToDisplay);\n  const { entityData } = bannerData;\n  const { sizes: bannerSizes } = entityData || {};\n\n  const sizeMapping = buildSizeMapping(sizeId, bannerSizes);\n  const parsedSizes = buildBannerSizes(sizeId, bannerSizes, sizes);\n\n  const { countContentHierarchies } = data;\n\n  const parsedAdunit = buildParsedAdunit(asPath, countContentHierarchies, baseAdunit, adunit);\n  const isContextualTargetingSet =\n    propsToDisplay.length && parsedTargetings && Object.keys(parsedTargetings).length;\n  const isContextualTargetingReady = isContextualTargetingSet || !propsToDisplay.length;\n  const shouldShowBanner =\n    parsedAdunit && parsedSizes && !!parsedSizes.length && isContextualTargetingReady;\n\n  const customTargetings = setCustomTargetings(targetings, renderCounter);\n\n  const targetingArguments = { ...parsedTargetings, ...customTargetings, ...userPropsData };\n\n  return (\n    <AdSlotRender\n      shouldShowBanner={!!shouldShowBanner}\n      sizeMapping={sizeMapping}\n      sizeId={sizeId}\n      parsedAdunit={parsedAdunit}\n      parsedSizes={parsedSizes}\n      modifiers={modifiers}\n      targetingArguments={targetingArguments}\n    />\n  );\n};\n\nBannerRender.propTypes = {\n  parent: PropTypes.object.isRequired,\n  asPath: PropTypes.string.isRequired,\n  action: PropTypes.object.isRequired,\n  actionKey: PropTypes.string.isRequired,\n  adunit: PropTypes.string,\n  baseAdunit: PropTypes.string,\n  sizeId: PropTypes.string,\n  propsToDisplay: PropTypes.array,\n  entity: PropTypes.string,\n  targetings: PropTypes.string,\n  sizes: PropTypes.string,\n  renderCounter: PropTypes.number,\n  modifiers: PropTypes.string,\n  userPropsData: PropTypes.object\n};\n\nBannerRender.defaultProps = {\n  adunit: '',\n  baseAdunit: '',\n  sizeId: '',\n  propsToDisplay: [],\n  entity: '',\n  targetings: '',\n  sizes: '',\n  renderCounter: null,\n  modifiers: '',\n  userPropsData: {}\n};\n\nexport default withTitle(BannerRender);\n"],"mappings":";;;;;;;;;;;;;;;;;;;AAAA,IAAAA,MAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,UAAA,GAAAF,sBAAA,CAAAC,OAAA;AAEA,IAAAE,OAAA,GAAAF,OAAA;AAEA,IAAAG,MAAA,GAAAH,OAAA;AACA,IAAAI,QAAA,GAAAJ,OAAA;AAOA,IAAAK,UAAA,GAAAL,OAAA;AAMA,IAAAM,IAAA,GAAAN,OAAA;AACA,IAAAO,aAAA,GAAAR,sBAAA,CAAAC,OAAA;AAA0C,IAAAQ,SAAA;AAAA,SAAAC,QAAAC,CAAA,EAAAC,CAAA,QAAAC,CAAA,GAAAC,MAAA,CAAAC,IAAA,CAAAJ,CAAA,OAAAG,MAAA,CAAAE,qBAAA,QAAAC,CAAA,GAAAH,MAAA,CAAAE,qBAAA,CAAAL,CAAA,GAAAC,CAAA,KAAAK,CAAA,GAAAA,CAAA,CAAAC,MAAA,WAAAN,CAAA,WAAAE,MAAA,CAAAK,wBAAA,CAAAR,CAAA,EAAAC,CAAA,EAAAQ,UAAA,OAAAP,CAAA,CAAAQ,IAAA,CAAAC,KAAA,CAAAT,CAAA,EAAAI,CAAA,YAAAJ,CAAA;AAAA,SAAAU,cAAAZ,CAAA,aAAAC,CAAA,MAAAA,CAAA,GAAAY,SAAA,CAAAC,MAAA,EAAAb,CAAA,UAAAC,CAAA,WAAAW,SAAA,CAAAZ,CAAA,IAAAY,SAAA,CAAAZ,CAAA,QAAAA,CAAA,OAAAF,OAAA,CAAAI,MAAA,CAAAD,CAAA,OAAAa,OAAA,WAAAd,CAAA,QAAAe,gBAAA,aAAAhB,CAAA,EAAAC,CAAA,EAAAC,CAAA,CAAAD,CAAA,SAAAE,MAAA,CAAAc,yBAAA,GAAAd,MAAA,CAAAe,gBAAA,CAAAlB,CAAA,EAAAG,MAAA,CAAAc,yBAAA,CAAAf,CAAA,KAAAH,OAAA,CAAAI,MAAA,CAAAD,CAAA,GAAAa,OAAA,WAAAd,CAAA,IAAAE,MAAA,CAAAgB,cAAA,CAAAnB,CAAA,EAAAC,CAAA,EAAAE,MAAA,CAAAK,wBAAA,CAAAN,CAAA,EAAAD,CAAA,iBAAAD,CAAA;AAE1C,IAAMoB,YAAY,GAAG,SAAfA,YAAYA,CAAAC,IAAA,EAgBZ;EAAA,IAfJC,UAAU,GAAAD,IAAA,CAAVC,UAAU;IACVC,MAAM,GAAAF,IAAA,CAANE,MAAM;IACNC,MAAM,GAAAH,IAAA,CAANG,MAAM;IACNC,KAAK,GAAAJ,IAAA,CAALI,KAAK;IACLC,cAAc,GAAAL,IAAA,CAAdK,cAAc;IACdC,MAAM,GAAAN,IAAA,CAANM,MAAM;IACNC,UAAU,GAAAP,IAAA,CAAVO,UAAU;IACVC,MAAM,GAAAR,IAAA,CAANQ,MAAM;IACNC,MAAM,GAAAT,IAAA,CAANS,MAAM;IACNC,MAAM,GAAAV,IAAA,CAANU,MAAM;IACNC,SAAS,GAAAX,IAAA,CAATW,SAAS;IACTC,aAAa,GAAAZ,IAAA,CAAbY,aAAa;IACbC,aAAa,GAAAb,IAAA,CAAba,aAAa;IACbC,SAAS,GAAAd,IAAA,CAATc,SAAS;IACNC,UAAU,OAAAC,yBAAA,aAAAhB,IAAA,EAAAvB,SAAA;EAEb,IAAQwC,EAAE,GAAKF,UAAU,CAAjBE,EAAE;EACV,IAAQC,MAAM,GAAKV,MAAM,CAAjBU,MAAM;EAEd,IAAAC,SAAA,GAAwC,IAAAC,gBAAQ,EAACV,MAAM,EAAE;MACvDW,SAAS,EAAE;QAAEC,KAAK,EAAE;UAAEL,EAAE,EAAEA,EAAE,IAAIC;QAAO;MAAE,CAAC;MAC1CK,IAAI,EAAEN,EAAE,IAAIA,EAAE,KAAKC;IACrB,CAAC,CAAC;IAAAM,cAAA,GAAAL,SAAA,CAHMM,IAAI;IAAEC,gBAAgB,GAAAF,cAAA,cAAG,CAAC,CAAC,GAAAA,cAAA;EAKnC,IAAAG,UAAA,GAAkC,IAAAP,gBAAQ,EACxC,IAAAQ,8BAAuB,EAACC,qBAAU,EAAEC,6BAAkB,CAAC,EACvD;MACET,SAAS,EAAE;QAAEJ,EAAE,EAAEd;MAAO,CAAC;MACzBoB,IAAI,EAAE,CAACpB;IACT,CACF,CAAC;IAAA4B,eAAA,GAAAJ,UAAA,CANOF,IAAI;IAAEO,UAAU,GAAAD,eAAA,cAAG,CAAC,CAAC,GAAAA,eAAA;EAQ7B,IAAAE,UAAA,GAAsB,IAAAb,gBAAQ,EAAC,IAAAc,eAAQ,EAACC,oCAAyB,CAAC,EAAE;MAClEd,SAAS,EAAE;QACTC,KAAK,EAAE;UACLc,QAAQ,EAAEnB,EAAE,IAAIC,MAAM;UACtBmB,WAAW,EAAE;YACXC,MAAM,KAAAC,MAAA,CAAKC,oBAAS;UACtB;QACF;MACF;IACF,CAAC,CAAC;IAAAC,eAAA,GAAAR,UAAA,CATMR,IAAI;IAAJA,IAAI,GAAAgB,eAAA,cAAG,CAAC,CAAC,GAAAA,eAAA;EAWjB,IAAMC,gBAAgB,GAAG,IAAAC,iCAAwB,EAAChC,SAAS,EAAEe,gBAAgB,EAAErB,cAAc,CAAC;EAC9F,IAAQuC,UAAU,GAAKZ,UAAU,CAAzBY,UAAU;EAClB,IAAAC,KAAA,GAA+BD,UAAU,IAAI,CAAC,CAAC;IAAhCE,WAAW,GAAAD,KAAA,CAAlBzC,KAAK;EAEb,IAAM2C,WAAW,GAAG,IAAAC,yBAAgB,EAAC7C,MAAM,EAAE2C,WAAW,CAAC;EACzD,IAAMG,WAAW,GAAG,IAAAC,yBAAgB,EAAC/C,MAAM,EAAE2C,WAAW,EAAE1C,KAAK,CAAC;EAEhE,IAAQ+C,uBAAuB,GAAK1B,IAAI,CAAhC0B,uBAAuB;EAE/B,IAAMC,YAAY,GAAG,IAAAC,0BAAiB,EAAC5C,MAAM,EAAE0C,uBAAuB,EAAElD,UAAU,EAAEC,MAAM,CAAC;EAC3F,IAAMoD,wBAAwB,GAC5BjD,cAAc,CAACZ,MAAM,IAAIiD,gBAAgB,IAAI5D,MAAM,CAACC,IAAI,CAAC2D,gBAAgB,CAAC,CAACjD,MAAM;EACnF,IAAM8D,0BAA0B,GAAGD,wBAAwB,IAAI,CAACjD,cAAc,CAACZ,MAAM;EACrF,IAAM+D,gBAAgB,GACpBJ,YAAY,IAAIH,WAAW,IAAI,CAAC,CAACA,WAAW,CAACxD,MAAM,IAAI8D,0BAA0B;EAEnF,IAAME,gBAAgB,GAAG,IAAAC,4BAAmB,EAACnD,UAAU,EAAEK,aAAa,CAAC;EAEvE,IAAM+C,kBAAkB,GAAApE,aAAA,CAAAA,aAAA,CAAAA,aAAA,KAAQmD,gBAAgB,GAAKe,gBAAgB,GAAK5C,aAAa,CAAE;EAEzF,oBACE9C,MAAA,YAAA6F,aAAA,CAACpF,aAAA,WAAY;IACXgF,gBAAgB,EAAE,CAAC,CAACA,gBAAiB;IACrCT,WAAW,EAAEA,WAAY;IACzB5C,MAAM,EAAEA,MAAO;IACfiD,YAAY,EAAEA,YAAa;IAC3BH,WAAW,EAAEA,WAAY;IACzBnC,SAAS,EAAEA,SAAU;IACrB6C,kBAAkB,EAAEA;EAAmB,CACxC,CAAC;AAEN,CAAC;AAED5D,YAAY,CAAC8D,SAAS,GAAG;EACvBrD,MAAM,EAAEsD,qBAAS,CAACC,MAAM,CAACC,UAAU;EACnCvD,MAAM,EAAEqD,qBAAS,CAACG,MAAM,CAACD,UAAU;EACnCtD,MAAM,EAAEoD,qBAAS,CAACC,MAAM,CAACC,UAAU;EACnCrD,SAAS,EAAEmD,qBAAS,CAACG,MAAM,CAACD,UAAU;EACtC9D,MAAM,EAAE4D,qBAAS,CAACG,MAAM;EACxBhE,UAAU,EAAE6D,qBAAS,CAACG,MAAM;EAC5B9D,MAAM,EAAE2D,qBAAS,CAACG,MAAM;EACxB5D,cAAc,EAAEyD,qBAAS,CAACI,KAAK;EAC/B5D,MAAM,EAAEwD,qBAAS,CAACG,MAAM;EACxB1D,UAAU,EAAEuD,qBAAS,CAACG,MAAM;EAC5B7D,KAAK,EAAE0D,qBAAS,CAACG,MAAM;EACvBrD,aAAa,EAAEkD,qBAAS,CAACK,MAAM;EAC/BrD,SAAS,EAAEgD,qBAAS,CAACG,MAAM;EAC3BpD,aAAa,EAAEiD,qBAAS,CAACC;AAC3B,CAAC;AAEDhE,YAAY,CAACqE,YAAY,GAAG;EAC1BlE,MAAM,EAAE,EAAE;EACVD,UAAU,EAAE,EAAE;EACdE,MAAM,EAAE,EAAE;EACVE,cAAc,EAAE,EAAE;EAClBC,MAAM,EAAE,EAAE;EACVC,UAAU,EAAE,EAAE;EACdH,KAAK,EAAE,EAAE;EACTQ,aAAa,EAAE,IAAI;EACnBE,SAAS,EAAE,EAAE;EACbD,aAAa,EAAE,CAAC;AAClB,CAAC;AAAC,IAAAwD,QAAA,GAEa,IAAAC,cAAS,EAACvE,YAAY,CAAC;AAAAwE,OAAA,cAAAF,QAAA"}

package/lib/components/List/helpers/get-sort-props.js

@@ -19,16 +19,19 @@ var getSortProps = function getSortProps(_ref) {
     querySortBy = _ref.querySortBy,
     defaultSortBy = _ref.defaultSortBy,
     isTextSearchFilterApplied = _ref.isTextSearchFilterApplied;
-  var sort = querySort || (sortProperties.length ? null : defaultSort);
-  var sortby = null;
-  if (querySortBy) sortby = [querySortBy];else if (!sortProperties.length) sortby = defaultSortBy;
   var updatedSortProperties = (0, _toConsumableArray2["default"])(sortProperties);
+  if (!querySort && !sortProperties.length) {
+    updatedSortProperties.unshift({
+      sort: defaultSort,
+      propsToDisplay: defaultSortBy
+    });
+  }
   if (isTextSearchFilterApplied) updatedSortProperties.unshift({
     isScore: true
   });
-  if (sort) updatedSortProperties.unshift({
-    sort: sort,
-    propsToDisplay: sortby
+  if (querySort) updatedSortProperties.unshift({
+    sort: querySort,
+    propsToDisplay: [querySortBy]
   });
   var sortbyFilters = updatedSortProperties.map(function (_ref2) {
     var filterProps = _ref2.propsToDisplay;

package/lib/components/List/helpers/get-sort-props.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-sort-props.js","names":["getSortProps","_ref","querySort","sortProperties","defaultSort","querySortBy","defaultSortBy","isTextSearchFilterApplied","sort","length","sortby","updatedSortProperties","_toConsumableArray2","unshift","isScore","propsToDisplay","sortbyFilters","map","_ref2","filterProps","filter","Boolean","flat","_default","exports"],"sources":["../../../../src/components/List/helpers/get-sort-props.js"],"sourcesContent":["const getSortProps = ({\n  querySort,\n  sortProperties,\n  defaultSort,\n  querySortBy,\n  defaultSortBy,\n  isTextSearchFilterApplied\n}) => {\n  const sort = querySort || (sortProperties.length ? null : defaultSort);\n  let sortby = null;\n  if (querySortBy) sortby = [querySortBy];\n  else if (!sortProperties.length) sortby = defaultSortBy;\n\n  const updatedSortProperties = [...sortProperties];\n  if (isTextSearchFilterApplied) updatedSortProperties.unshift({ isScore: true });\n  if (sort) updatedSortProperties.unshift({ sort, propsToDisplay: sortby });\n\n  const sortbyFilters = updatedSortProperties\n    .map(({ propsToDisplay: filterProps }) => filterProps)\n    .filter(Boolean)\n    .flat();\n  return { sortbyFilters, updatedSortProperties };\n};\n\nexport default getSortProps;\n"],"mappings":";;;;;;;;;;;;;;AAAA,IAAMA,YAAY,GAAG,SAAfA,YAAYA,CAAAC,IAAA,EAOZ;EAAA,IANJC,SAAS,GAAAD,IAAA,CAATC,SAAS;IACTC,cAAc,GAAAF,IAAA,CAAdE,cAAc;IACdC,WAAW,GAAAH,IAAA,CAAXG,WAAW;IACXC,WAAW,GAAAJ,IAAA,CAAXI,WAAW;IACXC,aAAa,GAAAL,IAAA,CAAbK,aAAa;IACbC,yBAAyB,GAAAN,IAAA,CAAzBM,yBAAyB;EAEzB,IAAMC,IAAI,GAAGN,SAAS,KAAKC,cAAc,CAACM,MAAM,GAAG,IAAI,GAAGL,WAAW,CAAC;EACtE,IAAIM,MAAM,GAAG,IAAI;EACjB,IAAIL,WAAW,EAAEK,MAAM,GAAG,CAACL,WAAW,CAAC,CAAC,KACnC,IAAI,CAACF,cAAc,CAACM,MAAM,EAAEC,MAAM,GAAGJ,aAAa;EAEvD,IAAMK,qBAAqB,OAAAC,mBAAA,aAAOT,cAAc,CAAC;EACjD,IAAII,yBAAyB,EAAEI,qBAAqB,CAACE,OAAO,CAAC;IAAEC,OAAO,EAAE;EAAK,CAAC,CAAC;EAC/E,IAAIN,IAAI,EAAEG,qBAAqB,CAACE,OAAO,CAAC;IAAEL,IAAI,EAAJA,IAAI;IAAEO,cAAc,EAAEL;EAAO,CAAC,CAAC;EAEzE,IAAMM,aAAa,GAAGL,qBAAqB,CACxCM,GAAG,CAAC,UAAAC,KAAA;IAAA,IAAmBC,WAAW,GAAAD,KAAA,CAA3BH,cAAc;IAAA,OAAoBI,WAAW;EAAA,EAAC,CACrDC,MAAM,CAACC,OAAO,CAAC,CACfC,IAAI,CAAC,CAAC;EACT,OAAO;IAAEN,aAAa,EAAbA,aAAa;IAAEL,qBAAqB,EAArBA;EAAsB,CAAC;AACjD,CAAC;AAAC,IAAAY,QAAA,GAEavB,YAAY;AAAAwB,OAAA,cAAAD,QAAA"}
+{"version":3,"file":"get-sort-props.js","names":["getSortProps","_ref","querySort","sortProperties","defaultSort","querySortBy","defaultSortBy","isTextSearchFilterApplied","updatedSortProperties","_toConsumableArray2","length","unshift","sort","propsToDisplay","isScore","sortbyFilters","map","_ref2","filterProps","filter","Boolean","flat","_default","exports"],"sources":["../../../../src/components/List/helpers/get-sort-props.js"],"sourcesContent":["const getSortProps = ({\n  querySort,\n  sortProperties,\n  defaultSort,\n  querySortBy,\n  defaultSortBy,\n  isTextSearchFilterApplied\n}) => {\n  const updatedSortProperties = [...sortProperties];\n  if (!querySort && !sortProperties.length) {\n    updatedSortProperties.unshift({ sort: defaultSort, propsToDisplay: defaultSortBy });\n  }\n  if (isTextSearchFilterApplied) updatedSortProperties.unshift({ isScore: true });\n  if (querySort) updatedSortProperties.unshift({ sort: querySort, propsToDisplay: [querySortBy] });\n\n  const sortbyFilters = updatedSortProperties\n    .map(({ propsToDisplay: filterProps }) => filterProps)\n    .filter(Boolean)\n    .flat();\n  return { sortbyFilters, updatedSortProperties };\n};\n\nexport default getSortProps;\n"],"mappings":";;;;;;;;;;;;;;AAAA,IAAMA,YAAY,GAAG,SAAfA,YAAYA,CAAAC,IAAA,EAOZ;EAAA,IANJC,SAAS,GAAAD,IAAA,CAATC,SAAS;IACTC,cAAc,GAAAF,IAAA,CAAdE,cAAc;IACdC,WAAW,GAAAH,IAAA,CAAXG,WAAW;IACXC,WAAW,GAAAJ,IAAA,CAAXI,WAAW;IACXC,aAAa,GAAAL,IAAA,CAAbK,aAAa;IACbC,yBAAyB,GAAAN,IAAA,CAAzBM,yBAAyB;EAEzB,IAAMC,qBAAqB,OAAAC,mBAAA,aAAON,cAAc,CAAC;EACjD,IAAI,CAACD,SAAS,IAAI,CAACC,cAAc,CAACO,MAAM,EAAE;IACxCF,qBAAqB,CAACG,OAAO,CAAC;MAAEC,IAAI,EAAER,WAAW;MAAES,cAAc,EAAEP;IAAc,CAAC,CAAC;EACrF;EACA,IAAIC,yBAAyB,EAAEC,qBAAqB,CAACG,OAAO,CAAC;IAAEG,OAAO,EAAE;EAAK,CAAC,CAAC;EAC/E,IAAIZ,SAAS,EAAEM,qBAAqB,CAACG,OAAO,CAAC;IAAEC,IAAI,EAAEV,SAAS;IAAEW,cAAc,EAAE,CAACR,WAAW;EAAE,CAAC,CAAC;EAEhG,IAAMU,aAAa,GAAGP,qBAAqB,CACxCQ,GAAG,CAAC,UAAAC,KAAA;IAAA,IAAmBC,WAAW,GAAAD,KAAA,CAA3BJ,cAAc;IAAA,OAAoBK,WAAW;EAAA,EAAC,CACrDC,MAAM,CAACC,OAAO,CAAC,CACfC,IAAI,CAAC,CAAC;EACT,OAAO;IAAEN,aAAa,EAAbA,aAAa;IAAEP,qBAAqB,EAArBA;EAAsB,CAAC;AACjD,CAAC;AAAC,IAAAc,QAAA,GAEatB,YAAY;AAAAuB,OAAA,cAAAD,QAAA"}

package/lib-es/components/Banner/AdSlotRender.js

@@ -2,12 +2,14 @@ import React, { useState } from 'react';
 import { AdSlot } from 'react-dfp';
 import PropTypes from 'prop-types';
 import { BANNER_LOADING, BANNER_EMPTY, BANNER_LOADED } from '../../constants';
+import Wrapper from '../Wrapper';
 const AdSlotRender = ({
   shouldShowBanner,
   sizeMapping,
   sizeId,
   parsedAdunit,
   parsedSizes,
+  modifiers,
   targetingArguments
 }) => {
   const [{
@@ -23,11 +25,16 @@ const AdSlotRender = ({
     return `@media(min-width:${minWidth}px){.${bannerClass}{min-height:${minimumHeight}px;}`;
   }).sort();
   const className = `ad-slot ad-slot-${loadingStatus} ${bannerClass}`;
-  return /*#__PURE__*/React.createElement(React.Fragment, null, styles && /*#__PURE__*/React.createElement("style", null, styles.join('\n')), /*#__PURE__*/React.createElement("div", {
+  const newModifers = `${modifiers} banner-${loadingStatus}`;
+  return /*#__PURE__*/React.createElement(Wrapper, {
+    className: "banner",
+    modifiers: newModifers
+  }, styles && /*#__PURE__*/React.createElement("style", null, styles.join('\n')), /*#__PURE__*/React.createElement("div", {
     className: className,
     style: {
       minHeight
-    }
+    },
+    "data-testid": "ad-slot"
   }, shouldShowBanner && /*#__PURE__*/React.createElement(AdSlot, {
     adUnit: parsedAdunit,
     sizes: parsedSizes,
@@ -55,10 +62,12 @@ AdSlotRender.propTypes = {
   sizeId: PropTypes.string.isRequired,
   parsedAdunit: PropTypes.string.isRequired,
   parsedSizes: PropTypes.array,
+  modifiers: PropTypes.string,
   targetingArguments: PropTypes.object.isRequired
 };
 AdSlotRender.defaultProps = {
-  parsedSizes: null
+  parsedSizes: null,
+  modifiers: ''
 };
 export default AdSlotRender;
 //# sourceMappingURL=AdSlotRender.js.map

package/lib-es/components/Banner/AdSlotRender.js.map

@@ -1 +1 @@
-{"version":3,"file":"AdSlotRender.js","names":["React","useState","AdSlot","PropTypes","BANNER_LOADING","BANNER_EMPTY","BANNER_LOADED","AdSlotRender","shouldShowBanner","sizeMapping","sizeId","parsedAdunit","parsedSizes","targetingArguments","loadingStatus","minHeight","setLoadingStatus","bannerClass","styles","map","sizes","styleSizes","viewport","minWidth","minimumHeight","Math","min","height","sort","className","createElement","Fragment","join","style","adUnit","onSlotRender","slotData","event","isEmpty","size","slotHeight","length","undefined","newLoadingStatus","propTypes","bool","isRequired","array","string","object","defaultProps"],"sources":["../../../src/components/Banner/AdSlotRender.js"],"sourcesContent":["import React, { useState } from 'react';\nimport { AdSlot } from 'react-dfp';\nimport PropTypes from 'prop-types';\nimport { BANNER_LOADING, BANNER_EMPTY, BANNER_LOADED } from '../../constants';\n\nconst AdSlotRender = ({\n  shouldShowBanner,\n  sizeMapping,\n  sizeId,\n  parsedAdunit,\n  parsedSizes,\n  targetingArguments\n}) => {\n  const [{ loadingStatus = BANNER_LOADING, minHeight }, setLoadingStatus] = useState({});\n\n  const bannerClass = `banner-${sizeId}`;\n\n  const styles =\n    loadingStatus === BANNER_LOADING &&\n    sizeMapping\n      .map(({ sizes: styleSizes, viewport: [minWidth] }) => {\n        const minimumHeight = Math.min(...styleSizes.map(([, height]) => height));\n        return `@media(min-width:${minWidth}px){.${bannerClass}{min-height:${minimumHeight}px;}`;\n      })\n      .sort();\n  const className = `ad-slot ad-slot-${loadingStatus} ${bannerClass}`;\n\n  return (\n    <>\n      {styles && <style>{styles.join('\\n')}</style>}\n      <div className={className} style={{ minHeight }}>\n        {shouldShowBanner && (\n          <AdSlot\n            adUnit={parsedAdunit}\n            sizes={parsedSizes}\n            targetingArguments={targetingArguments}\n            sizeMapping={sizeMapping}\n            onSlotRender={slotData => {\n              const {\n                event: { isEmpty, size }\n              } = slotData;\n              const slotHeight = size && size.length ? size[1] : undefined;\n              const newLoadingStatus = isEmpty ? BANNER_EMPTY : BANNER_LOADED;\n              setLoadingStatus({ loadingStatus: newLoadingStatus, minHeight: slotHeight });\n            }}\n          />\n        )}\n      </div>\n    </>\n  );\n};\n\nAdSlotRender.propTypes = {\n  shouldShowBanner: PropTypes.bool.isRequired,\n  sizeMapping: PropTypes.array.isRequired,\n  sizeId: PropTypes.string.isRequired,\n  parsedAdunit: PropTypes.string.isRequired,\n  parsedSizes: PropTypes.array,\n  targetingArguments: PropTypes.object.isRequired\n};\n\nAdSlotRender.defaultProps = {\n  parsedSizes: null\n};\n\nexport default AdSlotRender;\n"],"mappings":"AAAA,OAAOA,KAAK,IAAIC,QAAQ,QAAQ,OAAO;AACvC,SAASC,MAAM,QAAQ,WAAW;AAClC,OAAOC,SAAS,MAAM,YAAY;AAClC,SAASC,cAAc,EAAEC,YAAY,EAAEC,aAAa,QAAQ,iBAAiB;AAE7E,MAAMC,YAAY,GAAGA,CAAC;EACpBC,gBAAgB;EAChBC,WAAW;EACXC,MAAM;EACNC,YAAY;EACZC,WAAW;EACXC;AACF,CAAC,KAAK;EACJ,MAAM,CAAC;IAAEC,aAAa,GAAGV,cAAc;IAAEW;EAAU,CAAC,EAAEC,gBAAgB,CAAC,GAAGf,QAAQ,CAAC,CAAC,CAAC,CAAC;EAEtF,MAAMgB,WAAW,GAAI,UAASP,MAAO,EAAC;EAEtC,MAAMQ,MAAM,GACVJ,aAAa,KAAKV,cAAc,IAChCK,WAAW,CACRU,GAAG,CAAC,CAAC;IAAEC,KAAK,EAAEC,UAAU;IAAEC,QAAQ,EAAE,CAACC,QAAQ;EAAE,CAAC,KAAK;IACpD,MAAMC,aAAa,GAAGC,IAAI,CAACC,GAAG,CAAC,GAAGL,UAAU,CAACF,GAAG,CAAC,CAAC,GAAGQ,MAAM,CAAC,KAAKA,MAAM,CAAC,CAAC;IACzE,OAAQ,oBAAmBJ,QAAS,QAAON,WAAY,eAAcO,aAAc,MAAK;EAC1F,CAAC,CAAC,CACDI,IAAI,CAAC,CAAC;EACX,MAAMC,SAAS,GAAI,mBAAkBf,aAAc,IAAGG,WAAY,EAAC;EAEnE,oBACEjB,KAAA,CAAA8B,aAAA,CAAA9B,KAAA,CAAA+B,QAAA,QACGb,MAAM,iBAAIlB,KAAA,CAAA8B,aAAA,gBAAQZ,MAAM,CAACc,IAAI,CAAC,IAAI,CAAS,CAAC,eAC7ChC,KAAA,CAAA8B,aAAA;IAAKD,SAAS,EAAEA,SAAU;IAACI,KAAK,EAAE;MAAElB;IAAU;EAAE,GAC7CP,gBAAgB,iBACfR,KAAA,CAAA8B,aAAA,CAAC5B,MAAM;IACLgC,MAAM,EAAEvB,YAAa;IACrBS,KAAK,EAAER,WAAY;IACnBC,kBAAkB,EAAEA,kBAAmB;IACvCJ,WAAW,EAAEA,WAAY;IACzB0B,YAAY,EAAEC,QAAQ,IAAI;MACxB,MAAM;QACJC,KAAK,EAAE;UAAEC,OAAO;UAAEC;QAAK;MACzB,CAAC,GAAGH,QAAQ;MACZ,MAAMI,UAAU,GAAGD,IAAI,IAAIA,IAAI,CAACE,MAAM,GAAGF,IAAI,CAAC,CAAC,CAAC,GAAGG,SAAS;MAC5D,MAAMC,gBAAgB,GAAGL,OAAO,GAAGjC,YAAY,GAAGC,aAAa;MAC/DU,gBAAgB,CAAC;QAAEF,aAAa,EAAE6B,gBAAgB;QAAE5B,SAAS,EAAEyB;MAAW,CAAC,CAAC;IAC9E;EAAE,CACH,CAEA,CACL,CAAC;AAEP,CAAC;AAEDjC,YAAY,CAACqC,SAAS,GAAG;EACvBpC,gBAAgB,EAAEL,SAAS,CAAC0C,IAAI,CAACC,UAAU;EAC3CrC,WAAW,EAAEN,SAAS,CAAC4C,KAAK,CAACD,UAAU;EACvCpC,MAAM,EAAEP,SAAS,CAAC6C,MAAM,CAACF,UAAU;EACnCnC,YAAY,EAAER,SAAS,CAAC6C,MAAM,CAACF,UAAU;EACzClC,WAAW,EAAET,SAAS,CAAC4C,KAAK;EAC5BlC,kBAAkB,EAAEV,SAAS,CAAC8C,MAAM,CAACH;AACvC,CAAC;AAEDvC,YAAY,CAAC2C,YAAY,GAAG;EAC1BtC,WAAW,EAAE;AACf,CAAC;AAED,eAAeL,YAAY"}
+{"version":3,"file":"AdSlotRender.js","names":["React","useState","AdSlot","PropTypes","BANNER_LOADING","BANNER_EMPTY","BANNER_LOADED","Wrapper","AdSlotRender","shouldShowBanner","sizeMapping","sizeId","parsedAdunit","parsedSizes","modifiers","targetingArguments","loadingStatus","minHeight","setLoadingStatus","bannerClass","styles","map","sizes","styleSizes","viewport","minWidth","minimumHeight","Math","min","height","sort","className","newModifers","createElement","join","style","adUnit","onSlotRender","slotData","event","isEmpty","size","slotHeight","length","undefined","newLoadingStatus","propTypes","bool","isRequired","array","string","object","defaultProps"],"sources":["../../../src/components/Banner/AdSlotRender.js"],"sourcesContent":["import React, { useState } from 'react';\nimport { AdSlot } from 'react-dfp';\nimport PropTypes from 'prop-types';\nimport { BANNER_LOADING, BANNER_EMPTY, BANNER_LOADED } from '../../constants';\nimport Wrapper from '../Wrapper';\n\nconst AdSlotRender = ({\n  shouldShowBanner,\n  sizeMapping,\n  sizeId,\n  parsedAdunit,\n  parsedSizes,\n  modifiers,\n  targetingArguments\n}) => {\n  const [{ loadingStatus = BANNER_LOADING, minHeight }, setLoadingStatus] = useState({});\n\n  const bannerClass = `banner-${sizeId}`;\n\n  const styles =\n    loadingStatus === BANNER_LOADING &&\n    sizeMapping\n      .map(({ sizes: styleSizes, viewport: [minWidth] }) => {\n        const minimumHeight = Math.min(...styleSizes.map(([, height]) => height));\n        return `@media(min-width:${minWidth}px){.${bannerClass}{min-height:${minimumHeight}px;}`;\n      })\n      .sort();\n  const className = `ad-slot ad-slot-${loadingStatus} ${bannerClass}`;\n  const newModifers = `${modifiers} banner-${loadingStatus}`;\n  return (\n    <Wrapper className=\"banner\" modifiers={newModifers}>\n      {styles && <style>{styles.join('\\n')}</style>}\n      <div className={className} style={{ minHeight }} data-testid=\"ad-slot\">\n        {shouldShowBanner && (\n          <AdSlot\n            adUnit={parsedAdunit}\n            sizes={parsedSizes}\n            targetingArguments={targetingArguments}\n            sizeMapping={sizeMapping}\n            onSlotRender={slotData => {\n              const {\n                event: { isEmpty, size }\n              } = slotData;\n              const slotHeight = size && size.length ? size[1] : undefined;\n              const newLoadingStatus = isEmpty ? BANNER_EMPTY : BANNER_LOADED;\n              setLoadingStatus({ loadingStatus: newLoadingStatus, minHeight: slotHeight });\n            }}\n          />\n        )}\n      </div>\n    </Wrapper>\n  );\n};\n\nAdSlotRender.propTypes = {\n  shouldShowBanner: PropTypes.bool.isRequired,\n  sizeMapping: PropTypes.array.isRequired,\n  sizeId: PropTypes.string.isRequired,\n  parsedAdunit: PropTypes.string.isRequired,\n  parsedSizes: PropTypes.array,\n  modifiers: PropTypes.string,\n  targetingArguments: PropTypes.object.isRequired\n};\n\nAdSlotRender.defaultProps = {\n  parsedSizes: null,\n  modifiers: ''\n};\n\nexport default AdSlotRender;\n"],"mappings":"AAAA,OAAOA,KAAK,IAAIC,QAAQ,QAAQ,OAAO;AACvC,SAASC,MAAM,QAAQ,WAAW;AAClC,OAAOC,SAAS,MAAM,YAAY;AAClC,SAASC,cAAc,EAAEC,YAAY,EAAEC,aAAa,QAAQ,iBAAiB;AAC7E,OAAOC,OAAO,MAAM,YAAY;AAEhC,MAAMC,YAAY,GAAGA,CAAC;EACpBC,gBAAgB;EAChBC,WAAW;EACXC,MAAM;EACNC,YAAY;EACZC,WAAW;EACXC,SAAS;EACTC;AACF,CAAC,KAAK;EACJ,MAAM,CAAC;IAAEC,aAAa,GAAGZ,cAAc;IAAEa;EAAU,CAAC,EAAEC,gBAAgB,CAAC,GAAGjB,QAAQ,CAAC,CAAC,CAAC,CAAC;EAEtF,MAAMkB,WAAW,GAAI,UAASR,MAAO,EAAC;EAEtC,MAAMS,MAAM,GACVJ,aAAa,KAAKZ,cAAc,IAChCM,WAAW,CACRW,GAAG,CAAC,CAAC;IAAEC,KAAK,EAAEC,UAAU;IAAEC,QAAQ,EAAE,CAACC,QAAQ;EAAE,CAAC,KAAK;IACpD,MAAMC,aAAa,GAAGC,IAAI,CAACC,GAAG,CAAC,GAAGL,UAAU,CAACF,GAAG,CAAC,CAAC,GAAGQ,MAAM,CAAC,KAAKA,MAAM,CAAC,CAAC;IACzE,OAAQ,oBAAmBJ,QAAS,QAAON,WAAY,eAAcO,aAAc,MAAK;EAC1F,CAAC,CAAC,CACDI,IAAI,CAAC,CAAC;EACX,MAAMC,SAAS,GAAI,mBAAkBf,aAAc,IAAGG,WAAY,EAAC;EACnE,MAAMa,WAAW,GAAI,GAAElB,SAAU,WAAUE,aAAc,EAAC;EAC1D,oBACEhB,KAAA,CAAAiC,aAAA,CAAC1B,OAAO;IAACwB,SAAS,EAAC,QAAQ;IAACjB,SAAS,EAAEkB;EAAY,GAChDZ,MAAM,iBAAIpB,KAAA,CAAAiC,aAAA,gBAAQb,MAAM,CAACc,IAAI,CAAC,IAAI,CAAS,CAAC,eAC7ClC,KAAA,CAAAiC,aAAA;IAAKF,SAAS,EAAEA,SAAU;IAACI,KAAK,EAAE;MAAElB;IAAU,CAAE;IAAC,eAAY;EAAS,GACnER,gBAAgB,iBACfT,KAAA,CAAAiC,aAAA,CAAC/B,MAAM;IACLkC,MAAM,EAAExB,YAAa;IACrBU,KAAK,EAAET,WAAY;IACnBE,kBAAkB,EAAEA,kBAAmB;IACvCL,WAAW,EAAEA,WAAY;IACzB2B,YAAY,EAAEC,QAAQ,IAAI;MACxB,MAAM;QACJC,KAAK,EAAE;UAAEC,OAAO;UAAEC;QAAK;MACzB,CAAC,GAAGH,QAAQ;MACZ,MAAMI,UAAU,GAAGD,IAAI,IAAIA,IAAI,CAACE,MAAM,GAAGF,IAAI,CAAC,CAAC,CAAC,GAAGG,SAAS;MAC5D,MAAMC,gBAAgB,GAAGL,OAAO,GAAGnC,YAAY,GAAGC,aAAa;MAC/DY,gBAAgB,CAAC;QAAEF,aAAa,EAAE6B,gBAAgB;QAAE5B,SAAS,EAAEyB;MAAW,CAAC,CAAC;IAC9E;EAAE,CACH,CAEA,CACE,CAAC;AAEd,CAAC;AAEDlC,YAAY,CAACsC,SAAS,GAAG;EACvBrC,gBAAgB,EAAEN,SAAS,CAAC4C,IAAI,CAACC,UAAU;EAC3CtC,WAAW,EAAEP,SAAS,CAAC8C,KAAK,CAACD,UAAU;EACvCrC,MAAM,EAAER,SAAS,CAAC+C,MAAM,CAACF,UAAU;EACnCpC,YAAY,EAAET,SAAS,CAAC+C,MAAM,CAACF,UAAU;EACzCnC,WAAW,EAAEV,SAAS,CAAC8C,KAAK;EAC5BnC,SAAS,EAAEX,SAAS,CAAC+C,MAAM;EAC3BnC,kBAAkB,EAAEZ,SAAS,CAACgD,MAAM,CAACH;AACvC,CAAC;AAEDxC,YAAY,CAAC4C,YAAY,GAAG;EAC1BvC,WAAW,EAAE,IAAI;EACjBC,SAAS,EAAE;AACb,CAAC;AAED,eAAeN,YAAY"}

package/lib-es/components/Banner/Banner.js

@@ -10,7 +10,6 @@ import { useQuery } from '@apollo/client';
 import { useRouter } from 'next/router';
 import { buildUserQuery, buildPropsData } from './helpers';
 import { getSingleEntitySchema, getUser } from '../../application/query';
-import Wrapper from '../Wrapper';
 import BannerRender from './BannerRender';
 import buildPropsQuery from '../../helpers/build-props-query';
 import { getClassModifiers } from '../../utils';
@@ -75,17 +74,15 @@ const Banner = _ref => {
     action
   } = getEntityRenderProps(queryProps, data, isPreview);
   const bannerKey = `${sizeId}${asPath}`;
-  return /*#__PURE__*/React.createElement(Wrapper, {
-    className: type,
-    modifiers: modifiers
-  }, /*#__PURE__*/React.createElement(BannerRender, _extends({
+  return /*#__PURE__*/React.createElement(BannerRender, _extends({
     key: bannerKey
   }, otherProps, {
     action: action,
     actionKey: actionKey,
     asPath: asPath,
-    userPropsData: userPropsData
-  })));
+    userPropsData: userPropsData,
+    modifiers: modifiers
+  }));
 };
 Banner.propTypes = {
   type: PropTypes.string

package/lib-es/components/Banner/Banner.js.map

@@ -1 +1 @@
-{"version":3,"file":"Banner.js","names":["React","useContext","MainContext","checkIfLoggedIn","PropTypes","flatten","useQuery","useRouter","buildUserQuery","buildPropsData","getSingleEntitySchema","getUser","Wrapper","BannerRender","buildPropsQuery","getClassModifiers","getEntityRenderProps","Banner","_ref","type","otherProps","_objectWithoutProperties","_excluded","router","isPreview","id","userId","asPath","parent","entity","sizeId","propsToDisplay","userPropsToDisplay","userQuery","itemEntity","data","error","loading","variables","userData","userLoading","skip","length","message","modifiers","queryProps","map","propertiesToDisplay","userPropsData","actionKey","action","bannerKey","createElement","className","_extends","key","propTypes","string","defaultProps"],"sources":["../../../src/components/Banner/Banner.js"],"sourcesContent":["import React, { useContext } from 'react';\nimport { MainContext } from '@blaze-cms/nextjs-components';\nimport { checkIfLoggedIn } from '@blaze-cms/core-auth-ui';\nimport PropTypes from 'prop-types';\nimport flatten from 'lodash.flatten';\nimport { useQuery } from '@apollo/client';\nimport { useRouter } from 'next/router';\nimport { buildUserQuery, buildPropsData } from './helpers';\nimport { getSingleEntitySchema, getUser } from '../../application/query';\nimport Wrapper from '../Wrapper';\nimport BannerRender from './BannerRender';\nimport buildPropsQuery from '../../helpers/build-props-query';\nimport { getClassModifiers } from '../../utils';\nimport getEntityRenderProps from '../../helpers/get-entity-render-props';\n\nconst Banner = ({ type, ...otherProps }) => {\n  const router = useRouter();\n  const { isPreview } = useContext(MainContext);\n  const { id: userId } = checkIfLoggedIn();\n  const { asPath } = router;\n  const { parent, entity, sizeId, propsToDisplay = [], userPropsToDisplay = [] } = otherProps;\n  const userQuery = buildUserQuery(userPropsToDisplay);\n  const { itemEntity } = parent;\n  const { data, error, loading } = useQuery(getSingleEntitySchema, {\n    variables: { id: entity || itemEntity }\n  });\n  const { data: { getUser: userData } = {}, loading: userLoading } = useQuery(getUser(userQuery), {\n    variables: { id: userId },\n    skip: !userPropsToDisplay.length || !userId\n  });\n\n  if (loading || userLoading) return '';\n  if (error) return error.message;\n  if (!data) return null;\n  if (!sizeId) return null;\n\n  const modifiers = getClassModifiers('banner', otherProps);\n  const queryProps = buildPropsQuery(\n    data,\n    propsToDisplay.length\n      ? flatten(propsToDisplay.map(({ propertiesToDisplay }) => propertiesToDisplay))\n      : []\n  );\n\n  const userPropsData = buildPropsData(userData, userPropsToDisplay);\n  const { actionKey, action } = getEntityRenderProps(queryProps, data, isPreview);\n  const bannerKey = `${sizeId}${asPath}`;\n\n  return (\n    <Wrapper className={type} modifiers={modifiers}>\n      <BannerRender\n        key={bannerKey}\n        {...otherProps}\n        action={action}\n        actionKey={actionKey}\n        asPath={asPath}\n        userPropsData={userPropsData}\n      />\n    </Wrapper>\n  );\n};\n\nBanner.propTypes = {\n  type: PropTypes.string\n};\n\nBanner.defaultProps = {\n  type: 'banner'\n};\n\nexport default Banner;\n"],"mappings":";;;AAAA,OAAOA,KAAK,IAAIC,UAAU,QAAQ,OAAO;AACzC,SAASC,WAAW,QAAQ,8BAA8B;AAC1D,SAASC,eAAe,QAAQ,yBAAyB;AACzD,OAAOC,SAAS,MAAM,YAAY;AAClC,OAAOC,OAAO,MAAM,gBAAgB;AACpC,SAASC,QAAQ,QAAQ,gBAAgB;AACzC,SAASC,SAAS,QAAQ,aAAa;AACvC,SAASC,cAAc,EAAEC,cAAc,QAAQ,WAAW;AAC1D,SAASC,qBAAqB,EAAEC,OAAO,QAAQ,yBAAyB;AACxE,OAAOC,OAAO,MAAM,YAAY;AAChC,OAAOC,YAAY,MAAM,gBAAgB;AACzC,OAAOC,eAAe,MAAM,iCAAiC;AAC7D,SAASC,iBAAiB,QAAQ,aAAa;AAC/C,OAAOC,oBAAoB,MAAM,uCAAuC;AAExE,MAAMC,MAAM,GAAGC,IAAA,IAA6B;EAAA,IAA5B;MAAEC;IAAoB,CAAC,GAAAD,IAAA;IAAZE,UAAU,GAAAC,wBAAA,CAAAH,IAAA,EAAAI,SAAA;EACnC,MAAMC,MAAM,GAAGhB,SAAS,CAAC,CAAC;EAC1B,MAAM;IAAEiB;EAAU,CAAC,GAAGvB,UAAU,CAACC,WAAW,CAAC;EAC7C,MAAM;IAAEuB,EAAE,EAAEC;EAAO,CAAC,GAAGvB,eAAe,CAAC,CAAC;EACxC,MAAM;IAAEwB;EAAO,CAAC,GAAGJ,MAAM;EACzB,MAAM;IAAEK,MAAM;IAAEC,MAAM;IAAEC,MAAM;IAAEC,cAAc,GAAG,EAAE;IAAEC,kBAAkB,GAAG;EAAG,CAAC,GAAGZ,UAAU;EAC3F,MAAMa,SAAS,GAAGzB,cAAc,CAACwB,kBAAkB,CAAC;EACpD,MAAM;IAAEE;EAAW,CAAC,GAAGN,MAAM;EAC7B,MAAM;IAAEO,IAAI;IAAEC,KAAK;IAAEC;EAAQ,CAAC,GAAG/B,QAAQ,CAACI,qBAAqB,EAAE;IAC/D4B,SAAS,EAAE;MAAEb,EAAE,EAAEI,MAAM,IAAIK;IAAW;EACxC,CAAC,CAAC;EACF,MAAM;IAAEC,IAAI,EAAE;MAAExB,OAAO,EAAE4B;IAAS,CAAC,GAAG,CAAC,CAAC;IAAEF,OAAO,EAAEG;EAAY,CAAC,GAAGlC,QAAQ,CAACK,OAAO,CAACsB,SAAS,CAAC,EAAE;IAC9FK,SAAS,EAAE;MAAEb,EAAE,EAAEC;IAAO,CAAC;IACzBe,IAAI,EAAE,CAACT,kBAAkB,CAACU,MAAM,IAAI,CAAChB;EACvC,CAAC,CAAC;EAEF,IAAIW,OAAO,IAAIG,WAAW,EAAE,OAAO,EAAE;EACrC,IAAIJ,KAAK,EAAE,OAAOA,KAAK,CAACO,OAAO;EAC/B,IAAI,CAACR,IAAI,EAAE,OAAO,IAAI;EACtB,IAAI,CAACL,MAAM,EAAE,OAAO,IAAI;EAExB,MAAMc,SAAS,GAAG7B,iBAAiB,CAAC,QAAQ,EAAEK,UAAU,CAAC;EACzD,MAAMyB,UAAU,GAAG/B,eAAe,CAChCqB,IAAI,EACJJ,cAAc,CAACW,MAAM,GACjBrC,OAAO,CAAC0B,cAAc,CAACe,GAAG,CAAC,CAAC;IAAEC;EAAoB,CAAC,KAAKA,mBAAmB,CAAC,CAAC,GAC7E,EACN,CAAC;EAED,MAAMC,aAAa,GAAGvC,cAAc,CAAC8B,QAAQ,EAAEP,kBAAkB,CAAC;EAClE,MAAM;IAAEiB,SAAS;IAAEC;EAAO,CAAC,GAAGlC,oBAAoB,CAAC6B,UAAU,EAAEV,IAAI,EAAEX,SAAS,CAAC;EAC/E,MAAM2B,SAAS,GAAI,GAAErB,MAAO,GAAEH,MAAO,EAAC;EAEtC,oBACE3B,KAAA,CAAAoD,aAAA,CAACxC,OAAO;IAACyC,SAAS,EAAElC,IAAK;IAACyB,SAAS,EAAEA;EAAU,gBAC7C5C,KAAA,CAAAoD,aAAA,CAACvC,YAAY,EAAAyC,QAAA;IACXC,GAAG,EAAEJ;EAAU,GACX/B,UAAU;IACd8B,MAAM,EAAEA,MAAO;IACfD,SAAS,EAAEA,SAAU;IACrBtB,MAAM,EAAEA,MAAO;IACfqB,aAAa,EAAEA;EAAc,EAC9B,CACM,CAAC;AAEd,CAAC;AAED/B,MAAM,CAACuC,SAAS,GAAG;EACjBrC,IAAI,EAAEf,SAAS,CAACqD;AAClB,CAAC;AAEDxC,MAAM,CAACyC,YAAY,GAAG;EACpBvC,IAAI,EAAE;AACR,CAAC;AAED,eAAeF,MAAM"}
+{"version":3,"file":"Banner.js","names":["React","useContext","MainContext","checkIfLoggedIn","PropTypes","flatten","useQuery","useRouter","buildUserQuery","buildPropsData","getSingleEntitySchema","getUser","BannerRender","buildPropsQuery","getClassModifiers","getEntityRenderProps","Banner","_ref","type","otherProps","_objectWithoutProperties","_excluded","router","isPreview","id","userId","asPath","parent","entity","sizeId","propsToDisplay","userPropsToDisplay","userQuery","itemEntity","data","error","loading","variables","userData","userLoading","skip","length","message","modifiers","queryProps","map","propertiesToDisplay","userPropsData","actionKey","action","bannerKey","createElement","_extends","key","propTypes","string","defaultProps"],"sources":["../../../src/components/Banner/Banner.js"],"sourcesContent":["import React, { useContext } from 'react';\nimport { MainContext } from '@blaze-cms/nextjs-components';\nimport { checkIfLoggedIn } from '@blaze-cms/core-auth-ui';\nimport PropTypes from 'prop-types';\nimport flatten from 'lodash.flatten';\nimport { useQuery } from '@apollo/client';\nimport { useRouter } from 'next/router';\nimport { buildUserQuery, buildPropsData } from './helpers';\nimport { getSingleEntitySchema, getUser } from '../../application/query';\nimport BannerRender from './BannerRender';\nimport buildPropsQuery from '../../helpers/build-props-query';\nimport { getClassModifiers } from '../../utils';\nimport getEntityRenderProps from '../../helpers/get-entity-render-props';\n\nconst Banner = ({ type, ...otherProps }) => {\n  const router = useRouter();\n  const { isPreview } = useContext(MainContext);\n  const { id: userId } = checkIfLoggedIn();\n  const { asPath } = router;\n  const { parent, entity, sizeId, propsToDisplay = [], userPropsToDisplay = [] } = otherProps;\n  const userQuery = buildUserQuery(userPropsToDisplay);\n  const { itemEntity } = parent;\n  const { data, error, loading } = useQuery(getSingleEntitySchema, {\n    variables: { id: entity || itemEntity }\n  });\n  const { data: { getUser: userData } = {}, loading: userLoading } = useQuery(getUser(userQuery), {\n    variables: { id: userId },\n    skip: !userPropsToDisplay.length || !userId\n  });\n\n  if (loading || userLoading) return '';\n  if (error) return error.message;\n  if (!data) return null;\n  if (!sizeId) return null;\n\n  const modifiers = getClassModifiers('banner', otherProps);\n  const queryProps = buildPropsQuery(\n    data,\n    propsToDisplay.length\n      ? flatten(propsToDisplay.map(({ propertiesToDisplay }) => propertiesToDisplay))\n      : []\n  );\n\n  const userPropsData = buildPropsData(userData, userPropsToDisplay);\n  const { actionKey, action } = getEntityRenderProps(queryProps, data, isPreview);\n  const bannerKey = `${sizeId}${asPath}`;\n\n  return (\n    <BannerRender\n      key={bannerKey}\n      {...otherProps}\n      action={action}\n      actionKey={actionKey}\n      asPath={asPath}\n      userPropsData={userPropsData}\n      modifiers={modifiers}\n    />\n  );\n};\n\nBanner.propTypes = {\n  type: PropTypes.string\n};\n\nBanner.defaultProps = {\n  type: 'banner'\n};\n\nexport default Banner;\n"],"mappings":";;;AAAA,OAAOA,KAAK,IAAIC,UAAU,QAAQ,OAAO;AACzC,SAASC,WAAW,QAAQ,8BAA8B;AAC1D,SAASC,eAAe,QAAQ,yBAAyB;AACzD,OAAOC,SAAS,MAAM,YAAY;AAClC,OAAOC,OAAO,MAAM,gBAAgB;AACpC,SAASC,QAAQ,QAAQ,gBAAgB;AACzC,SAASC,SAAS,QAAQ,aAAa;AACvC,SAASC,cAAc,EAAEC,cAAc,QAAQ,WAAW;AAC1D,SAASC,qBAAqB,EAAEC,OAAO,QAAQ,yBAAyB;AACxE,OAAOC,YAAY,MAAM,gBAAgB;AACzC,OAAOC,eAAe,MAAM,iCAAiC;AAC7D,SAASC,iBAAiB,QAAQ,aAAa;AAC/C,OAAOC,oBAAoB,MAAM,uCAAuC;AAExE,MAAMC,MAAM,GAAGC,IAAA,IAA6B;EAAA,IAA5B;MAAEC;IAAoB,CAAC,GAAAD,IAAA;IAAZE,UAAU,GAAAC,wBAAA,CAAAH,IAAA,EAAAI,SAAA;EACnC,MAAMC,MAAM,GAAGf,SAAS,CAAC,CAAC;EAC1B,MAAM;IAAEgB;EAAU,CAAC,GAAGtB,UAAU,CAACC,WAAW,CAAC;EAC7C,MAAM;IAAEsB,EAAE,EAAEC;EAAO,CAAC,GAAGtB,eAAe,CAAC,CAAC;EACxC,MAAM;IAAEuB;EAAO,CAAC,GAAGJ,MAAM;EACzB,MAAM;IAAEK,MAAM;IAAEC,MAAM;IAAEC,MAAM;IAAEC,cAAc,GAAG,EAAE;IAAEC,kBAAkB,GAAG;EAAG,CAAC,GAAGZ,UAAU;EAC3F,MAAMa,SAAS,GAAGxB,cAAc,CAACuB,kBAAkB,CAAC;EACpD,MAAM;IAAEE;EAAW,CAAC,GAAGN,MAAM;EAC7B,MAAM;IAAEO,IAAI;IAAEC,KAAK;IAAEC;EAAQ,CAAC,GAAG9B,QAAQ,CAACI,qBAAqB,EAAE;IAC/D2B,SAAS,EAAE;MAAEb,EAAE,EAAEI,MAAM,IAAIK;IAAW;EACxC,CAAC,CAAC;EACF,MAAM;IAAEC,IAAI,EAAE;MAAEvB,OAAO,EAAE2B;IAAS,CAAC,GAAG,CAAC,CAAC;IAAEF,OAAO,EAAEG;EAAY,CAAC,GAAGjC,QAAQ,CAACK,OAAO,CAACqB,SAAS,CAAC,EAAE;IAC9FK,SAAS,EAAE;MAAEb,EAAE,EAAEC;IAAO,CAAC;IACzBe,IAAI,EAAE,CAACT,kBAAkB,CAACU,MAAM,IAAI,CAAChB;EACvC,CAAC,CAAC;EAEF,IAAIW,OAAO,IAAIG,WAAW,EAAE,OAAO,EAAE;EACrC,IAAIJ,KAAK,EAAE,OAAOA,KAAK,CAACO,OAAO;EAC/B,IAAI,CAACR,IAAI,EAAE,OAAO,IAAI;EACtB,IAAI,CAACL,MAAM,EAAE,OAAO,IAAI;EAExB,MAAMc,SAAS,GAAG7B,iBAAiB,CAAC,QAAQ,EAAEK,UAAU,CAAC;EACzD,MAAMyB,UAAU,GAAG/B,eAAe,CAChCqB,IAAI,EACJJ,cAAc,CAACW,MAAM,GACjBpC,OAAO,CAACyB,cAAc,CAACe,GAAG,CAAC,CAAC;IAAEC;EAAoB,CAAC,KAAKA,mBAAmB,CAAC,CAAC,GAC7E,EACN,CAAC;EAED,MAAMC,aAAa,GAAGtC,cAAc,CAAC6B,QAAQ,EAAEP,kBAAkB,CAAC;EAClE,MAAM;IAAEiB,SAAS;IAAEC;EAAO,CAAC,GAAGlC,oBAAoB,CAAC6B,UAAU,EAAEV,IAAI,EAAEX,SAAS,CAAC;EAC/E,MAAM2B,SAAS,GAAI,GAAErB,MAAO,GAAEH,MAAO,EAAC;EAEtC,oBACE1B,KAAA,CAAAmD,aAAA,CAACvC,YAAY,EAAAwC,QAAA;IACXC,GAAG,EAAEH;EAAU,GACX/B,UAAU;IACd8B,MAAM,EAAEA,MAAO;IACfD,SAAS,EAAEA,SAAU;IACrBtB,MAAM,EAAEA,MAAO;IACfqB,aAAa,EAAEA,aAAc;IAC7BJ,SAAS,EAAEA;EAAU,EACtB,CAAC;AAEN,CAAC;AAED3B,MAAM,CAACsC,SAAS,GAAG;EACjBpC,IAAI,EAAEd,SAAS,CAACmD;AAClB,CAAC;AAEDvC,MAAM,CAACwC,YAAY,GAAG;EACpBtC,IAAI,EAAE;AACR,CAAC;AAED,eAAeF,MAAM"}

package/lib-es/components/Banner/BannerRender.js

@@ -1,6 +1,6 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
-const _excluded = ["baseAdunit", "adunit", "sizeId", "sizes", "propsToDisplay", "entity", "targetings", "parent", "asPath", "action", "actionKey", "renderCounter", "userPropsData"];
+const _excluded = ["baseAdunit", "adunit", "sizeId", "sizes", "propsToDisplay", "entity", "targetings", "parent", "asPath", "action", "actionKey", "renderCounter", "userPropsData", "modifiers"];
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 import React from 'react';
@@ -25,7 +25,8 @@ const BannerRender = _ref => {
       action,
       actionKey,
       renderCounter,
-      userPropsData
+      userPropsData,
+      modifiers
     } = _ref,
     otherProps = _objectWithoutProperties(_ref, _excluded);
   const {
@@ -88,6 +89,7 @@ const BannerRender = _ref => {
     sizeId: sizeId,
     parsedAdunit: parsedAdunit,
     parsedSizes: parsedSizes,
+    modifiers: modifiers,
     targetingArguments: targetingArguments
   });
 };
@@ -104,6 +106,7 @@ BannerRender.propTypes = {
   targetings: PropTypes.string,
   sizes: PropTypes.string,
   renderCounter: PropTypes.number,
+  modifiers: PropTypes.string,
   userPropsData: PropTypes.object
 };
 BannerRender.defaultProps = {
@@ -115,6 +118,7 @@ BannerRender.defaultProps = {
   targetings: '',
   sizes: '',
   renderCounter: null,
+  modifiers: '',
   userPropsData: {}
 };
 export default withTitle(BannerRender);

package/lib-es/components/Banner/BannerRender.js.map

@@ -1 +1 @@
-{"version":3,"file":"BannerRender.js","names":["React","PropTypes","useQuery","generateSingleItemQuery","getCount","buildBannerSizes","buildContextualTargeting","buildParsedAdunit","buildSizeMapping","setCustomTargetings","BANNER_QUERY_PROPS","COUNT_CONTENT_HIERARCHIES","GET_BANNER","PUBLISHED","withTitle","AdSlotRender","BannerRender","_ref","baseAdunit","adunit","sizeId","sizes","propsToDisplay","entity","targetings","parent","asPath","action","actionKey","renderCounter","userPropsData","otherProps","_objectWithoutProperties","_excluded","id","itemId","data","entityRecordData","variables","where","skip","bannerData","parentId","childEntity","_ilike","parsedTargetings","entityData","bannerSizes","sizeMapping","parsedSizes","countContentHierarchies","parsedAdunit","isContextualTargetingSet","length","Object","keys","isContextualTargetingReady","shouldShowBanner","customTargetings","targetingArguments","_objectSpread","createElement","propTypes","object","isRequired","string","array","number","defaultProps"],"sources":["../../../src/components/Banner/BannerRender.js"],"sourcesContent":["import React from 'react';\nimport PropTypes from 'prop-types';\n\nimport { useQuery } from '@apollo/client';\n\nimport { generateSingleItemQuery, getCount } from '../../application/query';\nimport {\n  buildBannerSizes,\n  buildContextualTargeting,\n  buildParsedAdunit,\n  buildSizeMapping,\n  setCustomTargetings\n} from './helpers';\nimport {\n  BANNER_QUERY_PROPS,\n  COUNT_CONTENT_HIERARCHIES,\n  GET_BANNER,\n  PUBLISHED\n} from '../../constants';\nimport { withTitle } from '../../HOC';\nimport AdSlotRender from './AdSlotRender';\n\nconst BannerRender = ({\n  baseAdunit,\n  adunit,\n  sizeId,\n  sizes,\n  propsToDisplay,\n  entity,\n  targetings,\n  parent,\n  asPath,\n  action,\n  actionKey,\n  renderCounter,\n  userPropsData,\n  ...otherProps\n}) => {\n  const { id } = otherProps;\n  const { itemId } = parent;\n\n  const { data: entityRecordData = {} } = useQuery(action, {\n    variables: { where: { id: id || itemId } },\n    skip: id && id !== itemId\n  });\n\n  const { data: bannerData = {} } = useQuery(\n    generateSingleItemQuery(GET_BANNER, BANNER_QUERY_PROPS),\n    {\n      variables: { id: sizeId },\n      skip: !sizeId\n    }\n  );\n\n  const { data = {} } = useQuery(getCount(COUNT_CONTENT_HIERARCHIES), {\n    variables: {\n      where: {\n        parentId: id || itemId,\n        childEntity: {\n          _ilike: `${PUBLISHED}_%`\n        }\n      }\n    }\n  });\n\n  const parsedTargetings = buildContextualTargeting(actionKey, entityRecordData, propsToDisplay);\n  const { entityData } = bannerData;\n  const { sizes: bannerSizes } = entityData || {};\n\n  const sizeMapping = buildSizeMapping(sizeId, bannerSizes);\n  const parsedSizes = buildBannerSizes(sizeId, bannerSizes, sizes);\n\n  const { countContentHierarchies } = data;\n\n  const parsedAdunit = buildParsedAdunit(asPath, countContentHierarchies, baseAdunit, adunit);\n  const isContextualTargetingSet =\n    propsToDisplay.length && parsedTargetings && Object.keys(parsedTargetings).length;\n  const isContextualTargetingReady = isContextualTargetingSet || !propsToDisplay.length;\n  const shouldShowBanner =\n    parsedAdunit && parsedSizes && !!parsedSizes.length && isContextualTargetingReady;\n\n  const customTargetings = setCustomTargetings(targetings, renderCounter);\n\n  const targetingArguments = { ...parsedTargetings, ...customTargetings, ...userPropsData };\n\n  return (\n    <AdSlotRender\n      shouldShowBanner={!!shouldShowBanner}\n      sizeMapping={sizeMapping}\n      sizeId={sizeId}\n      parsedAdunit={parsedAdunit}\n      parsedSizes={parsedSizes}\n      targetingArguments={targetingArguments}\n    />\n  );\n};\n\nBannerRender.propTypes = {\n  parent: PropTypes.object.isRequired,\n  asPath: PropTypes.string.isRequired,\n  action: PropTypes.object.isRequired,\n  actionKey: PropTypes.string.isRequired,\n  adunit: PropTypes.string,\n  baseAdunit: PropTypes.string,\n  sizeId: PropTypes.string,\n  propsToDisplay: PropTypes.array,\n  entity: PropTypes.string,\n  targetings: PropTypes.string,\n  sizes: PropTypes.string,\n  renderCounter: PropTypes.number,\n  userPropsData: PropTypes.object\n};\n\nBannerRender.defaultProps = {\n  adunit: '',\n  baseAdunit: '',\n  sizeId: '',\n  propsToDisplay: [],\n  entity: '',\n  targetings: '',\n  sizes: '',\n  renderCounter: null,\n  userPropsData: {}\n};\n\nexport default withTitle(BannerRender);\n"],"mappings":"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"}
+{"version":3,"file":"BannerRender.js","names":["React","PropTypes","useQuery","generateSingleItemQuery","getCount","buildBannerSizes","buildContextualTargeting","buildParsedAdunit","buildSizeMapping","setCustomTargetings","BANNER_QUERY_PROPS","COUNT_CONTENT_HIERARCHIES","GET_BANNER","PUBLISHED","withTitle","AdSlotRender","BannerRender","_ref","baseAdunit","adunit","sizeId","sizes","propsToDisplay","entity","targetings","parent","asPath","action","actionKey","renderCounter","userPropsData","modifiers","otherProps","_objectWithoutProperties","_excluded","id","itemId","data","entityRecordData","variables","where","skip","bannerData","parentId","childEntity","_ilike","parsedTargetings","entityData","bannerSizes","sizeMapping","parsedSizes","countContentHierarchies","parsedAdunit","isContextualTargetingSet","length","Object","keys","isContextualTargetingReady","shouldShowBanner","customTargetings","targetingArguments","_objectSpread","createElement","propTypes","object","isRequired","string","array","number","defaultProps"],"sources":["../../../src/components/Banner/BannerRender.js"],"sourcesContent":["import React from 'react';\nimport PropTypes from 'prop-types';\n\nimport { useQuery } from '@apollo/client';\n\nimport { generateSingleItemQuery, getCount } from '../../application/query';\nimport {\n  buildBannerSizes,\n  buildContextualTargeting,\n  buildParsedAdunit,\n  buildSizeMapping,\n  setCustomTargetings\n} from './helpers';\nimport {\n  BANNER_QUERY_PROPS,\n  COUNT_CONTENT_HIERARCHIES,\n  GET_BANNER,\n  PUBLISHED\n} from '../../constants';\nimport { withTitle } from '../../HOC';\nimport AdSlotRender from './AdSlotRender';\n\nconst BannerRender = ({\n  baseAdunit,\n  adunit,\n  sizeId,\n  sizes,\n  propsToDisplay,\n  entity,\n  targetings,\n  parent,\n  asPath,\n  action,\n  actionKey,\n  renderCounter,\n  userPropsData,\n  modifiers,\n  ...otherProps\n}) => {\n  const { id } = otherProps;\n  const { itemId } = parent;\n\n  const { data: entityRecordData = {} } = useQuery(action, {\n    variables: { where: { id: id || itemId } },\n    skip: id && id !== itemId\n  });\n\n  const { data: bannerData = {} } = useQuery(\n    generateSingleItemQuery(GET_BANNER, BANNER_QUERY_PROPS),\n    {\n      variables: { id: sizeId },\n      skip: !sizeId\n    }\n  );\n\n  const { data = {} } = useQuery(getCount(COUNT_CONTENT_HIERARCHIES), {\n    variables: {\n      where: {\n        parentId: id || itemId,\n        childEntity: {\n          _ilike: `${PUBLISHED}_%`\n        }\n      }\n    }\n  });\n\n  const parsedTargetings = buildContextualTargeting(actionKey, entityRecordData, propsToDisplay);\n  const { entityData } = bannerData;\n  const { sizes: bannerSizes } = entityData || {};\n\n  const sizeMapping = buildSizeMapping(sizeId, bannerSizes);\n  const parsedSizes = buildBannerSizes(sizeId, bannerSizes, sizes);\n\n  const { countContentHierarchies } = data;\n\n  const parsedAdunit = buildParsedAdunit(asPath, countContentHierarchies, baseAdunit, adunit);\n  const isContextualTargetingSet =\n    propsToDisplay.length && parsedTargetings && Object.keys(parsedTargetings).length;\n  const isContextualTargetingReady = isContextualTargetingSet || !propsToDisplay.length;\n  const shouldShowBanner =\n    parsedAdunit && parsedSizes && !!parsedSizes.length && isContextualTargetingReady;\n\n  const customTargetings = setCustomTargetings(targetings, renderCounter);\n\n  const targetingArguments = { ...parsedTargetings, ...customTargetings, ...userPropsData };\n\n  return (\n    <AdSlotRender\n      shouldShowBanner={!!shouldShowBanner}\n      sizeMapping={sizeMapping}\n      sizeId={sizeId}\n      parsedAdunit={parsedAdunit}\n      parsedSizes={parsedSizes}\n      modifiers={modifiers}\n      targetingArguments={targetingArguments}\n    />\n  );\n};\n\nBannerRender.propTypes = {\n  parent: PropTypes.object.isRequired,\n  asPath: PropTypes.string.isRequired,\n  action: PropTypes.object.isRequired,\n  actionKey: PropTypes.string.isRequired,\n  adunit: PropTypes.string,\n  baseAdunit: PropTypes.string,\n  sizeId: PropTypes.string,\n  propsToDisplay: PropTypes.array,\n  entity: PropTypes.string,\n  targetings: PropTypes.string,\n  sizes: PropTypes.string,\n  renderCounter: PropTypes.number,\n  modifiers: PropTypes.string,\n  userPropsData: PropTypes.object\n};\n\nBannerRender.defaultProps = {\n  adunit: '',\n  baseAdunit: '',\n  sizeId: '',\n  propsToDisplay: [],\n  entity: '',\n  targetings: '',\n  sizes: '',\n  renderCounter: null,\n  modifiers: '',\n  userPropsData: {}\n};\n\nexport default withTitle(BannerRender);\n"],"mappings":"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"}

package/lib-es/components/List/helpers/get-sort-props.js

@@ -6,16 +6,19 @@ const getSortProps = ({
   defaultSortBy,
   isTextSearchFilterApplied
 }) => {
-  const sort = querySort || (sortProperties.length ? null : defaultSort);
-  let sortby = null;
-  if (querySortBy) sortby = [querySortBy];else if (!sortProperties.length) sortby = defaultSortBy;
   const updatedSortProperties = [...sortProperties];
+  if (!querySort && !sortProperties.length) {
+    updatedSortProperties.unshift({
+      sort: defaultSort,
+      propsToDisplay: defaultSortBy
+    });
+  }
   if (isTextSearchFilterApplied) updatedSortProperties.unshift({
     isScore: true
   });
-  if (sort) updatedSortProperties.unshift({
-    sort,
-    propsToDisplay: sortby
+  if (querySort) updatedSortProperties.unshift({
+    sort: querySort,
+    propsToDisplay: [querySortBy]
   });
   const sortbyFilters = updatedSortProperties.map(({
     propsToDisplay: filterProps

package/lib-es/components/List/helpers/get-sort-props.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-sort-props.js","names":["getSortProps","querySort","sortProperties","defaultSort","querySortBy","defaultSortBy","isTextSearchFilterApplied","sort","length","sortby","updatedSortProperties","unshift","isScore","propsToDisplay","sortbyFilters","map","filterProps","filter","Boolean","flat"],"sources":["../../../../src/components/List/helpers/get-sort-props.js"],"sourcesContent":["const getSortProps = ({\n  querySort,\n  sortProperties,\n  defaultSort,\n  querySortBy,\n  defaultSortBy,\n  isTextSearchFilterApplied\n}) => {\n  const sort = querySort || (sortProperties.length ? null : defaultSort);\n  let sortby = null;\n  if (querySortBy) sortby = [querySortBy];\n  else if (!sortProperties.length) sortby = defaultSortBy;\n\n  const updatedSortProperties = [...sortProperties];\n  if (isTextSearchFilterApplied) updatedSortProperties.unshift({ isScore: true });\n  if (sort) updatedSortProperties.unshift({ sort, propsToDisplay: sortby });\n\n  const sortbyFilters = updatedSortProperties\n    .map(({ propsToDisplay: filterProps }) => filterProps)\n    .filter(Boolean)\n    .flat();\n  return { sortbyFilters, updatedSortProperties };\n};\n\nexport default getSortProps;\n"],"mappings":"AAAA,MAAMA,YAAY,GAAGA,CAAC;EACpBC,SAAS;EACTC,cAAc;EACdC,WAAW;EACXC,WAAW;EACXC,aAAa;EACbC;AACF,CAAC,KAAK;EACJ,MAAMC,IAAI,GAAGN,SAAS,KAAKC,cAAc,CAACM,MAAM,GAAG,IAAI,GAAGL,WAAW,CAAC;EACtE,IAAIM,MAAM,GAAG,IAAI;EACjB,IAAIL,WAAW,EAAEK,MAAM,GAAG,CAACL,WAAW,CAAC,CAAC,KACnC,IAAI,CAACF,cAAc,CAACM,MAAM,EAAEC,MAAM,GAAGJ,aAAa;EAEvD,MAAMK,qBAAqB,GAAG,CAAC,GAAGR,cAAc,CAAC;EACjD,IAAII,yBAAyB,EAAEI,qBAAqB,CAACC,OAAO,CAAC;IAAEC,OAAO,EAAE;EAAK,CAAC,CAAC;EAC/E,IAAIL,IAAI,EAAEG,qBAAqB,CAACC,OAAO,CAAC;IAAEJ,IAAI;IAAEM,cAAc,EAAEJ;EAAO,CAAC,CAAC;EAEzE,MAAMK,aAAa,GAAGJ,qBAAqB,CACxCK,GAAG,CAAC,CAAC;IAAEF,cAAc,EAAEG;EAAY,CAAC,KAAKA,WAAW,CAAC,CACrDC,MAAM,CAACC,OAAO,CAAC,CACfC,IAAI,CAAC,CAAC;EACT,OAAO;IAAEL,aAAa;IAAEJ;EAAsB,CAAC;AACjD,CAAC;AAED,eAAeV,YAAY"}
+{"version":3,"file":"get-sort-props.js","names":["getSortProps","querySort","sortProperties","defaultSort","querySortBy","defaultSortBy","isTextSearchFilterApplied","updatedSortProperties","length","unshift","sort","propsToDisplay","isScore","sortbyFilters","map","filterProps","filter","Boolean","flat"],"sources":["../../../../src/components/List/helpers/get-sort-props.js"],"sourcesContent":["const getSortProps = ({\n  querySort,\n  sortProperties,\n  defaultSort,\n  querySortBy,\n  defaultSortBy,\n  isTextSearchFilterApplied\n}) => {\n  const updatedSortProperties = [...sortProperties];\n  if (!querySort && !sortProperties.length) {\n    updatedSortProperties.unshift({ sort: defaultSort, propsToDisplay: defaultSortBy });\n  }\n  if (isTextSearchFilterApplied) updatedSortProperties.unshift({ isScore: true });\n  if (querySort) updatedSortProperties.unshift({ sort: querySort, propsToDisplay: [querySortBy] });\n\n  const sortbyFilters = updatedSortProperties\n    .map(({ propsToDisplay: filterProps }) => filterProps)\n    .filter(Boolean)\n    .flat();\n  return { sortbyFilters, updatedSortProperties };\n};\n\nexport default getSortProps;\n"],"mappings":"AAAA,MAAMA,YAAY,GAAGA,CAAC;EACpBC,SAAS;EACTC,cAAc;EACdC,WAAW;EACXC,WAAW;EACXC,aAAa;EACbC;AACF,CAAC,KAAK;EACJ,MAAMC,qBAAqB,GAAG,CAAC,GAAGL,cAAc,CAAC;EACjD,IAAI,CAACD,SAAS,IAAI,CAACC,cAAc,CAACM,MAAM,EAAE;IACxCD,qBAAqB,CAACE,OAAO,CAAC;MAAEC,IAAI,EAAEP,WAAW;MAAEQ,cAAc,EAAEN;IAAc,CAAC,CAAC;EACrF;EACA,IAAIC,yBAAyB,EAAEC,qBAAqB,CAACE,OAAO,CAAC;IAAEG,OAAO,EAAE;EAAK,CAAC,CAAC;EAC/E,IAAIX,SAAS,EAAEM,qBAAqB,CAACE,OAAO,CAAC;IAAEC,IAAI,EAAET,SAAS;IAAEU,cAAc,EAAE,CAACP,WAAW;EAAE,CAAC,CAAC;EAEhG,MAAMS,aAAa,GAAGN,qBAAqB,CACxCO,GAAG,CAAC,CAAC;IAAEH,cAAc,EAAEI;EAAY,CAAC,KAAKA,WAAW,CAAC,CACrDC,MAAM,CAACC,OAAO,CAAC,CACfC,IAAI,CAAC,CAAC;EACT,OAAO;IAAEL,aAAa;IAAEN;EAAsB,CAAC;AACjD,CAAC;AAED,eAAeP,YAAY"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blaze-cms/react-page-builder",
-  "version": "0.133.0-admin-updates.1",
+  "version": "0.133.0-admin-updates.2",
   "description": "Blaze react page builder",
   "main": "lib/index.js",
   "module": "lib-es/index.js",
@@ -89,5 +89,5 @@
     "lib/*",
     "lib-es/*"
   ],
-  "gitHead": "88859485b7c7c151accd57ce8ab8b8d2c8c1b6da"
+  "gitHead": "e7cde74fbaf205be1fe2e352ddde19a80b8e4667"
 }

package/src/components/Banner/AdSlotRender.js

@@ -2,6 +2,7 @@ import React, { useState } from 'react';
 import { AdSlot } from 'react-dfp';
 import PropTypes from 'prop-types';
 import { BANNER_LOADING, BANNER_EMPTY, BANNER_LOADED } from '../../constants';
+import Wrapper from '../Wrapper';
 
 const AdSlotRender = ({
   shouldShowBanner,
@@ -9,6 +10,7 @@ const AdSlotRender = ({
   sizeId,
   parsedAdunit,
   parsedSizes,
+  modifiers,
   targetingArguments
 }) => {
   const [{ loadingStatus = BANNER_LOADING, minHeight }, setLoadingStatus] = useState({});
@@ -24,11 +26,11 @@ const AdSlotRender = ({
       })
       .sort();
   const className = `ad-slot ad-slot-${loadingStatus} ${bannerClass}`;
-
+  const newModifers = `${modifiers} banner-${loadingStatus}`;
   return (
-    <>
+    <Wrapper className="banner" modifiers={newModifers}>
       {styles && <style>{styles.join('\n')}</style>}
-      <div className={className} style={{ minHeight }}>
+      <div className={className} style={{ minHeight }} data-testid="ad-slot">
         {shouldShowBanner && (
           <AdSlot
             adUnit={parsedAdunit}
@@ -46,7 +48,7 @@ const AdSlotRender = ({
           />
         )}
       </div>
-    </>
+    </Wrapper>
   );
 };
 
@@ -56,11 +58,13 @@ AdSlotRender.propTypes = {
   sizeId: PropTypes.string.isRequired,
   parsedAdunit: PropTypes.string.isRequired,
   parsedSizes: PropTypes.array,
+  modifiers: PropTypes.string,
   targetingArguments: PropTypes.object.isRequired
 };
 
 AdSlotRender.defaultProps = {
-  parsedSizes: null
+  parsedSizes: null,
+  modifiers: ''
 };
 
 export default AdSlotRender;

package/src/components/Banner/Banner.js

@@ -7,7 +7,6 @@ import { useQuery } from '@apollo/client';
 import { useRouter } from 'next/router';
 import { buildUserQuery, buildPropsData } from './helpers';
 import { getSingleEntitySchema, getUser } from '../../application/query';
-import Wrapper from '../Wrapper';
 import BannerRender from './BannerRender';
 import buildPropsQuery from '../../helpers/build-props-query';
 import { getClassModifiers } from '../../utils';
@@ -47,16 +46,15 @@ const Banner = ({ type, ...otherProps }) => {
   const bannerKey = `${sizeId}${asPath}`;
 
   return (
-    <Wrapper className={type} modifiers={modifiers}>
-      <BannerRender
-        key={bannerKey}
-        {...otherProps}
-        action={action}
-        actionKey={actionKey}
-        asPath={asPath}
-        userPropsData={userPropsData}
-      />
-    </Wrapper>
+    <BannerRender
+      key={bannerKey}
+      {...otherProps}
+      action={action}
+      actionKey={actionKey}
+      asPath={asPath}
+      userPropsData={userPropsData}
+      modifiers={modifiers}
+    />
   );
 };
 

package/src/components/Banner/BannerRender.js

@@ -34,6 +34,7 @@ const BannerRender = ({
   actionKey,
   renderCounter,
   userPropsData,
+  modifiers,
   ...otherProps
 }) => {
   const { id } = otherProps;
@@ -90,6 +91,7 @@ const BannerRender = ({
       sizeId={sizeId}
       parsedAdunit={parsedAdunit}
       parsedSizes={parsedSizes}
+      modifiers={modifiers}
       targetingArguments={targetingArguments}
     />
   );
@@ -108,6 +110,7 @@ BannerRender.propTypes = {
   targetings: PropTypes.string,
   sizes: PropTypes.string,
   renderCounter: PropTypes.number,
+  modifiers: PropTypes.string,
   userPropsData: PropTypes.object
 };
 
@@ -120,6 +123,7 @@ BannerRender.defaultProps = {
   targetings: '',
   sizes: '',
   renderCounter: null,
+  modifiers: '',
   userPropsData: {}
 };
 

package/src/components/List/helpers/get-sort-props.js

@@ -6,14 +6,12 @@ const getSortProps = ({
   defaultSortBy,
   isTextSearchFilterApplied
 }) => {
-  const sort = querySort || (sortProperties.length ? null : defaultSort);
-  let sortby = null;
-  if (querySortBy) sortby = [querySortBy];
-  else if (!sortProperties.length) sortby = defaultSortBy;
-
   const updatedSortProperties = [...sortProperties];
+  if (!querySort && !sortProperties.length) {
+    updatedSortProperties.unshift({ sort: defaultSort, propsToDisplay: defaultSortBy });
+  }
   if (isTextSearchFilterApplied) updatedSortProperties.unshift({ isScore: true });
-  if (sort) updatedSortProperties.unshift({ sort, propsToDisplay: sortby });
+  if (querySort) updatedSortProperties.unshift({ sort: querySort, propsToDisplay: [querySortBy] });
 
   const sortbyFilters = updatedSortProperties
     .map(({ propsToDisplay: filterProps }) => filterProps)

package/tests/unit/src/components/Banner/AdSlotRender.test.js

@@ -50,17 +50,17 @@ describe('Banner render component', () => {
       <AdSlotRender {...defaultProps} shouldShowBanner={false} />
     );
 
-    expect(container.childNodes[0].nodeName).toEqual('STYLE');
-    expect(container.childNodes[1]).toHaveClass('ad-slot ad-slot-loading banner-sizeId');
+    expect(container.childNodes[0].nodeName).toEqual('DIV');
+    expect(getByTestId('ad-slot')).toHaveClass('ad-slot ad-slot-loading banner-sizeId');
     expect(() => getByTestId(slotTestId)).toThrow();
     expect(asFragment()).toMatchSnapshot();
   });
 
   describe('AdSlot loading', () => {
     it('should render AdSlot', () => {
-      const { asFragment, container, getByTestId } = render(<AdSlotRender {...defaultProps} />);
+      const { asFragment, getByTestId } = render(<AdSlotRender {...defaultProps} />);
       expect(getByTestId('adslot-test')).toBeDefined();
-      expect(container.childNodes[1]).toHaveClass('ad-slot ad-slot-loading banner-sizeId');
+      expect(getByTestId('ad-slot')).toHaveClass('ad-slot ad-slot-loading banner-sizeId');
       expect(asFragment()).toMatchSnapshot();
     });
 
@@ -69,16 +69,11 @@ describe('Banner render component', () => {
       const adSlot = getByTestId(slotTestId);
 
       fireEvent.mouseOver(adSlot);
-      await waitFor(() =>
-        expect(container.childNodes[0]).toHaveClass('ad-slot ad-slot-loaded banner-sizeId')
-      );
-      expect(container.childNodes[0]).toHaveStyle('min-height: 250px');
+      await waitFor(() => expect(container.childNodes[0]).toHaveClass('banner banner-loaded'));
       expect(asFragment()).toMatchSnapshot();
 
       fireEvent.mouseLeave(adSlot);
-      await waitFor(() =>
-        expect(container.childNodes[0]).toHaveClass('ad-slot ad-slot-empty banner-sizeId')
-      );
+      await waitFor(() => expect(container.childNodes[0]).toHaveClass('banner banner-empty'));
       expect(asFragment()).toMatchSnapshot();
     });
   });

package/tests/unit/src/components/Banner/__snapshots__/AdSlotRender.test.js.snap

@@ -3,13 +3,18 @@
 exports[`Banner render component AdSlot loading should change class and remove responsive styles after loaded events 1`] = `
 <DocumentFragment>
   <div
-    class="ad-slot ad-slot-loaded banner-sizeId"
-    style="min-height: 250px;"
+    class="banner  banner-loaded"
   >
     <div
-      data-testid="adslot-test"
-      role="button"
-    />
+      class="ad-slot ad-slot-loaded banner-sizeId"
+      data-testid="ad-slot"
+      style="min-height: 250px;"
+    >
+      <div
+        data-testid="adslot-test"
+        role="button"
+      />
+    </div>
   </div>
 </DocumentFragment>
 `;
@@ -17,44 +22,59 @@ exports[`Banner render component AdSlot loading should change class and remove r
 exports[`Banner render component AdSlot loading should change class and remove responsive styles after loaded events 2`] = `
 <DocumentFragment>
   <div
-    class="ad-slot ad-slot-empty banner-sizeId"
-    style=""
+    class="banner  banner-empty"
   >
     <div
-      data-testid="adslot-test"
-      role="button"
-    />
+      class="ad-slot ad-slot-empty banner-sizeId"
+      data-testid="ad-slot"
+      style=""
+    >
+      <div
+        data-testid="adslot-test"
+        role="button"
+      />
+    </div>
   </div>
 </DocumentFragment>
 `;
 
 exports[`Banner render component AdSlot loading should render AdSlot 1`] = `
 <DocumentFragment>
-  <style>
-    @media(min-width:320px){.banner-sizeId{min-height:100px;}
-@media(min-width:728px){.banner-sizeId{min-height:100px;}
-@media(min-width:970px){.banner-sizeId{min-height:250px;}
-  </style>
   <div
-    class="ad-slot ad-slot-loading banner-sizeId"
+    class="banner  banner-loading"
   >
+    <style>
+      @media(min-width:320px){.banner-sizeId{min-height:100px;}
+@media(min-width:728px){.banner-sizeId{min-height:100px;}
+@media(min-width:970px){.banner-sizeId{min-height:250px;}
+    </style>
     <div
-      data-testid="adslot-test"
-      role="button"
-    />
+      class="ad-slot ad-slot-loading banner-sizeId"
+      data-testid="ad-slot"
+    >
+      <div
+        data-testid="adslot-test"
+        role="button"
+      />
+    </div>
   </div>
 </DocumentFragment>
 `;
 
 exports[`Banner render component should not render AdSlot if shouldShowBanner=false but should render styles and wrapper 1`] = `
 <DocumentFragment>
-  <style>
-    @media(min-width:320px){.banner-sizeId{min-height:100px;}
+  <div
+    class="banner  banner-loading"
+  >
+    <style>
+      @media(min-width:320px){.banner-sizeId{min-height:100px;}
 @media(min-width:728px){.banner-sizeId{min-height:100px;}
 @media(min-width:970px){.banner-sizeId{min-height:250px;}
-  </style>
-  <div
-    class="ad-slot ad-slot-loading banner-sizeId"
-  />
+    </style>
+    <div
+      class="ad-slot ad-slot-loading banner-sizeId"
+      data-testid="ad-slot"
+    />
+  </div>
 </DocumentFragment>
 `;

package/tests/unit/src/components/Banner/__snapshots__/BannerRender.test.js.snap

@@ -2,9 +2,14 @@
 
 exports[`Banner render component should render 1`] = `
 <DocumentFragment>
-  <style />
   <div
-    class="ad-slot ad-slot-loading banner-sizeId"
-  />
+    class="banner  banner-loading"
+  >
+    <style />
+    <div
+      class="ad-slot ad-slot-loading banner-sizeId"
+      data-testid="ad-slot"
+    />
+  </div>
 </DocumentFragment>
 `;

package/tests/unit/src/components/List/helpers/get-sort-props.test.js

@@ -60,6 +60,29 @@ describe('getSortProps helper function', () => {
     ]);
   });
 
+  it('should add score sort as first value if has textSearch but no sort applied', () => {
+    const { updatedSortProperties } = getSortProps({
+      ...props,
+      isTextSearchFilterApplied: true
+    });
+    expect(updatedSortProperties).toEqual([{ isScore: true }, ...sortProperties]);
+  });
+
+  it('should add default sort and score sort as first value if has textSearch and no other sort', () => {
+    const { updatedSortProperties } = getSortProps({
+      ...props,
+      sortProperties: [],
+      isTextSearchFilterApplied: true
+    });
+    expect(updatedSortProperties).toEqual([
+      { isScore: true },
+      {
+        propsToDisplay: props.defaultSortBy,
+        sort: props.defaultSort
+      }
+    ]);
+  });
+
   it('should use old style sort', () => {
     const { sortbyFilters, updatedSortProperties } = getSortProps({
       ...props,