@evergis/react 4.0.87 → 4.0.88

package/dist/react.esm.js

@@ -9169,11 +9169,12 @@ const HeaderLayerIcon = ({ noFeature }) => {
 };
 
 const FeatureCardDefaultHeader = ({ noFeature }) => {
+    const { themeName: pageThemeName } = useGlobalContext();
     const { config } = useWidgetConfig(WidgetType.FeatureCard);
     const { header } = config || {};
     const { options } = header || {};
     const { themeName, withPadding, column, height, overlay } = options || {};
-    return (jsx(DefaultHeaderWrapper, { withPadding: withPadding, height: height, "$noFeature": noFeature, children: jsx(ThemeProvider, { theme: getThemeByName(themeName), children: jsx(Header, { "$overlay": overlay, "$isRow": !column, "$noFeature": noFeature, children: jsxs(HeaderFrontView, { isDefault: !column, children: [jsxs(HeaderContainer, { children: [jsx(HeaderLayerIcon, { noFeature: noFeature }), jsx(HeaderTitle, { noFeature: noFeature })] }), jsx(FeatureCardButtons, {})] }) }) }) }));
+    return (jsx(ThemeProvider, { theme: getThemeByName(themeName ?? pageThemeName), children: jsx(DefaultHeaderWrapper, { withPadding: withPadding, height: height, "$noFeature": noFeature, children: jsx(Header, { "$overlay": overlay, "$isRow": !column, "$noFeature": noFeature, children: jsxs(HeaderFrontView, { isDefault: !column, children: [jsxs(HeaderContainer, { children: [jsx(HeaderLayerIcon, { noFeature: noFeature }), jsx(HeaderTitle, { noFeature: noFeature })] }), jsx(FeatureCardButtons, {})] }) }) }) }));
 };
 
 const ImageContainerButton = styled(FlatButton) `
@@ -10216,7 +10217,7 @@ const FeatureCardBackgroundHeader = () => {
     const { options } = header || {};
     const { fontColor, bgColor, height, overlay, bigIcon, withPadding, bottomBlur, themeName, column } = options || {};
     const renderElement = useHeaderRender(header);
-    return (jsx(BackgroundHeaderWrapper, { "$fontColor": fontColor, "$bgColor": bgColor, "$height": height, "$bigIcon": bigIcon, "$withPadding": withPadding, "$bottomBlur": bottomBlur, children: jsx(ThemeProvider, { theme: getThemeByName(themeName ?? pageThemeName), children: jsxs(Header, { "$overlay": overlay, "$isRow": !column, children: [jsxs(HeaderFrontView, { children: [jsxs(HeaderContainer, { column: column, children: [jsx(HeaderLayerIcon, {}), jsx(FeatureCardTitle, { title: renderElement({
+    return (jsx(ThemeProvider, { theme: getThemeByName(themeName ?? pageThemeName), children: jsx(BackgroundHeaderWrapper, { "$fontColor": fontColor, "$bgColor": bgColor, "$height": height, "$bigIcon": bigIcon, "$withPadding": withPadding, "$bottomBlur": bottomBlur, children: jsxs(Header, { "$overlay": overlay, "$isRow": !column, children: [jsxs(HeaderFrontView, { children: [jsxs(HeaderContainer, { column: column, children: [jsx(HeaderLayerIcon, {}), jsx(FeatureCardTitle, { title: renderElement({
                                             id: "title",
                                             wrap: false,
                                         }), description: renderElement({
@@ -10237,7 +10238,7 @@ const FeatureCardSlideshowHeader = () => {
     const { options } = header || {};
     const { height, fontColor, withPadding, themeName, column, overlay } = options || {};
     const renderElement = useHeaderRender(header);
-    return (jsx(SlideshowHeaderWrapper, { fontColor: fontColor, withPadding: withPadding, height: height, big: true, children: jsx(ThemeProvider, { theme: getThemeByName(themeName), children: jsxs(Header, { "$overlay": overlay, "$isRow": !column, children: [jsxs(HeaderFrontView, { children: [jsxs(HeaderContainer, { column: column, children: [jsx(HeaderLayerIcon, {}), jsx(FeatureCardTitle, { title: renderElement({
+    return (jsx(ThemeProvider, { theme: getThemeByName(themeName), children: jsx(SlideshowHeaderWrapper, { fontColor: fontColor, withPadding: withPadding, height: height, big: true, children: jsxs(Header, { "$overlay": overlay, "$isRow": !column, children: [jsxs(HeaderFrontView, { children: [jsxs(HeaderContainer, { column: column, children: [jsx(HeaderLayerIcon, {}), jsx(FeatureCardTitle, { title: renderElement({
                                             id: "title",
                                             wrap: false,
                                         }), description: renderElement({
@@ -12852,7 +12853,18 @@ const useDataSources = ({ type: widgetType, config, attributes, filters, layerPa
         if (!diffFilterNames.length)
             return;
         const filteredDataSources = configDataSources?.filter(({ parameters = {}, query }) => isNil(query) ||
-            diffFilterNames.some(diffFilterName => Object.keys(parameters).some(paramName => parameters[paramName] === `${FILTER_PREFIX}${diffFilterName}`)));
+            diffFilterNames.some(diffFilterName => {
+                // Плейсхолдер параметра может ссылаться на фильтр целиком (`%name`)
+                // либо на его свойство — уровень tree-фильтра или границу range
+                // (`%name.lN`, `%name.min`, `%name.max`). Граница `.` обязательна,
+                // иначе `%name` ложно матчит `%name2.l1`.
+                const placeholder = `${FILTER_PREFIX}${diffFilterName}`;
+                return Object.keys(parameters).some(paramName => {
+                    const paramValue = parameters[paramName];
+                    return (typeof paramValue === "string" &&
+                        (paramValue === placeholder || paramValue.startsWith(`${placeholder}.`)));
+                });
+            }));
         if (!filteredDataSources?.length) {
             return;
         }