Merge pull request #370 from B77Mills/fixIdxPropSpread

Set default value & spread props only when set
parameter1 · Jul 9, 2022 · 79b9770 · 79b9770
2 parents 30eb984 + b6261df
commit 79b9770
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/packages/marko-web-theme-monorail/components/site-footer.marko b/packages/marko-web-theme-monorail/components/site-footer.marko
@@ -1,9 +1,11 @@
 import getNavItems from "@parameter1/base-cms-marko-web-theme-default/components/site-navbar/utils/get-nav-items";
 import defaultValue from "@parameter1/base-cms-marko-core/utils/default-value";
+import { getAsObject } from "@parameter1/base-cms-object-path";
 import { asObject } from "@parameter1/base-cms-utils";
 
 $ const { config, site, i18n } = out.global;
 $ const newsletterSignupConfigName = defaultValue(input.newsletterSignupConfigName, "signupFooter");
+$ const newsletterBlockProps = getAsObject(input, "newsletterBlockProps");
 $ const newsletterConfig = site.getAsObject(`newsletter.${newsletterSignupConfigName}`);
 $ const blockName = input.blockName || "site-footer";
 $ const tagline = site.get("tagline");
@@ -36,7 +38,7 @@ $ const useIdxNewsletterSignup = defaultValue(input.useIdxNewsletterSignup, true
       <div class="row">
         <marko-web-element block-name=blockName name="section" attrs={ "aria-label": "Newsletter Sign-Up Form Footer"}>
           <if(!newsletterConfig.disabled && useIdxNewsletterSignup)>
-            <identity-x-newsletter-form-footer config-name=newsletterSignupConfigName ...input.newsletterBlockProps />
+            <identity-x-newsletter-form-footer config-name=newsletterSignupConfigName ...newsletterBlockProps />
           </if>
           <else-if(!newsletterConfig.disabled && newsletterConfig.action)>
             <theme-newsletter-signup-banner-external-block

diff --git a/packages/marko-web-theme-monorail/components/site-header.marko b/packages/marko-web-theme-monorail/components/site-header.marko
@@ -1,8 +1,10 @@
 import defaultValue from "@parameter1/base-cms-marko-core/utils/default-value";
+import { getAsObject } from "@parameter1/base-cms-object-path";
 
 $ const { config, site } = out.global;
 
 $ const newsletterConfig = site.getAsObject('newsletter.pushdown');
+$ const newsletterMenuBlockProps = getAsObject(input, "newsletterMenuBlockProps");
 $ const blockName = input.blockName || "site-header";
 $ const useIdxNewsletterSignup = defaultValue(input.useIdxNewsletterSignup, true);
 $ const showSearchIcon = defaultValue(input.showSearchIcon, false);
@@ -88,8 +90,8 @@ $ const navigation = {
 </marko-web-block>
 
 <if(useIdxNewsletterSignup)>
-    <identity-x-newsletter-form-pushdown ...input.newsletterMenuBlockProps />
+    <identity-x-newsletter-form-pushdown ...newsletterMenuBlockProps />
 </if>
 <else>
-  <theme-site-newsletter-menu ...input.newsletterMenuBlockProps />
+  <theme-site-newsletter-menu ...newsletterMenuBlockProps />
 </else>