@builder.io/sdk-solid 0.14.6 → 1.0.13

package/lib/browser/index.jsx

@@ -71,7 +71,7 @@ function Button(props) {
 var button_default = Button;
 
 // src/blocks/columns/columns.tsx
-import { Show as Show6, For as For4, createSignal as createSignal5 } from "solid-js";
+import { Show as Show6, For as For4, createSignal as createSignal6, createMemo as createMemo6 } from "solid-js";
 import { css as css2 } from "solid-styled-components";
 
 // src/components/blocks/blocks.tsx
@@ -99,7 +99,7 @@ import { createContext as createContext2 } from "solid-js";
 var components_context_default = createContext2({ registeredComponents: {} });
 
 // src/components/block/block.tsx
-import { Show as Show4, For as For2, onMount, createSignal as createSignal4 } from "solid-js";
+import { Show as Show4, For as For2, onMount, createMemo as createMemo4 } from "solid-js";
 
 // src/functions/get-block-component-options.ts
 function getBlockComponentOptions(block) {
@@ -266,7 +266,7 @@ function flattenState({
         return localState[prop];
       }
       const val = target[prop];
-      if (typeof val === "object") {
+      if (typeof val === "object" && val !== null) {
         return flattenState({
           rootState: val,
           localState: void 0,
@@ -318,6 +318,30 @@ var shouldForceBrowserRuntimeInNode = () => {
 var chooseBrowserOrServerEval = (args) => isBrowser() || shouldForceBrowserRuntimeInNode() ? runInBrowser(args) : runInBrowser(args);
 
 // src/functions/evaluate/evaluate.ts
+var EvalCache = class _EvalCache {
+  static cacheLimit = 20;
+  static cache = /* @__PURE__ */ new Map();
+  static getCacheKey(args) {
+    return JSON.stringify({
+      ...args,
+      // replace the event with a random number to break cache
+      // thats because we can't serialize the event object due to circular refs in DOM node refs.
+      event: args.event ? Math.random() : void 0
+    });
+  }
+  static getCachedValue(key) {
+    const cachedVal = _EvalCache.cache.get(key);
+    return cachedVal;
+  }
+  static setCachedValue(key, value) {
+    if (_EvalCache.cache.size > 20) {
+      _EvalCache.cache.delete(_EvalCache.cache.keys().next().value);
+    }
+    _EvalCache.cache.set(key, {
+      value
+    });
+  }
+};
 function evaluate({
   code,
   context,
@@ -325,11 +349,12 @@ function evaluate({
   rootState,
   rootSetState,
   event,
-  isExpression = true
+  isExpression = true,
+  enableCache
 }) {
   if (code === "") {
     logger.warn("Skipping evaluation of empty code block.");
-    return;
+    return void 0;
   }
   const args = {
     code: parseCode(code, {
@@ -342,8 +367,20 @@ function evaluate({
     rootState,
     localState
   };
+  if (enableCache) {
+    const cacheKey = EvalCache.getCacheKey(args);
+    const cachedValue = EvalCache.getCachedValue(cacheKey);
+    if (cachedValue) {
+      return cachedValue.value;
+    }
+  }
   try {
-    return chooseBrowserOrServerEval(args);
+    const newEval = chooseBrowserOrServerEval(args);
+    if (enableCache) {
+      const cacheKey = EvalCache.getCacheKey(args);
+      EvalCache.setCachedValue(cacheKey, newEval);
+    }
+    return newEval;
   } catch (e) {
     logger.error("Failed code evaluation: " + e.message, {
       code
@@ -398,7 +435,8 @@ var evaluateBindings = ({
       localState,
       rootState,
       rootSetState,
-      context
+      context,
+      enableCache: true
     });
     set(copied, binding, value);
   }
@@ -631,6 +669,70 @@ function bindScrollInViewAnimation(animation) {
   });
 }
 
+// src/functions/camel-to-kebab-case.ts
+var camelToKebabCase = (string) => string.replace(/([a-z0-9]|(?=[A-Z]))([A-Z])/g, "$1-$2").toLowerCase();
+
+// src/helpers/css.ts
+var convertStyleMapToCSSArray = (style) => {
+  const cssProps = Object.entries(style).map(([key, value]) => {
+    if (typeof value === "string") {
+      return `${camelToKebabCase(key)}: ${value};`;
+    } else {
+      return void 0;
+    }
+  });
+  return cssProps.filter(checkIsDefined);
+};
+var convertStyleMapToCSS = (style) => convertStyleMapToCSSArray(style).join("\n");
+var createCssClass = ({
+  mediaQuery,
+  className,
+  styles
+}) => {
+  const cssClass = `.${className} {
+    ${convertStyleMapToCSS(styles)}
+  }`;
+  if (mediaQuery) {
+    return `${mediaQuery} {
+      ${cssClass}
+    }`;
+  } else {
+    return cssClass;
+  }
+};
+
+// src/functions/transform-style-property.ts
+function transformStyleProperty({
+  style
+}) {
+  return style;
+}
+
+// src/functions/get-style.ts
+var getStyle = ({
+  block,
+  context
+}) => {
+  return mapStyleObjToStrIfNeeded(transformStyleProperty({
+    style: block.style || {},
+    context,
+    block
+  }));
+};
+function mapStyleObjToStrIfNeeded(style) {
+  switch (TARGET) {
+    case "svelte":
+    case "vue":
+    case "solid":
+      return convertStyleMapToCSSArray(style).join(" ");
+    case "qwik":
+    case "reactNative":
+    case "react":
+    case "rsc":
+      return style;
+  }
+}
+
 // src/components/block/block.helpers.ts
 var getComponent = ({
   block,
@@ -671,7 +773,8 @@ var getRepeatItemData = ({
     localState: context.localState,
     rootState: context.rootState,
     rootSetState: context.rootSetState,
-    context: context.context
+    context: context.context,
+    enableCache: true
   });
   if (!Array.isArray(itemsArray)) {
     return void 0;
@@ -695,7 +798,7 @@ var getRepeatItemData = ({
 };
 
 // src/components/block/components/block-styles.tsx
-import { Show as Show2 } from "solid-js";
+import { Show as Show2, createMemo } from "solid-js";
 
 // src/constants/device-sizes.ts
 var SIZES = {
@@ -746,38 +849,6 @@ var getSizesForBreakpoints = ({
   return newSizes;
 };
 
-// src/functions/camel-to-kebab-case.ts
-var camelToKebabCase = (string) => string.replace(/([a-z0-9]|(?=[A-Z]))([A-Z])/g, "$1-$2").toLowerCase();
-
-// src/helpers/css.ts
-var convertStyleMapToCSSArray = (style) => {
-  const cssProps = Object.entries(style).map(([key, value]) => {
-    if (typeof value === "string") {
-      return `${camelToKebabCase(key)}: ${value};`;
-    } else {
-      return void 0;
-    }
-  });
-  return cssProps.filter(checkIsDefined);
-};
-var convertStyleMapToCSS = (style) => convertStyleMapToCSSArray(style).join("\n");
-var createCssClass = ({
-  mediaQuery,
-  className,
-  styles
-}) => {
-  const cssClass = `.${className} {
-    ${convertStyleMapToCSS(styles)}
-  }`;
-  if (mediaQuery) {
-    return `${mediaQuery} {
-      ${cssClass}
-    }`;
-  } else {
-    return cssClass;
-  }
-};
-
 // src/components/inlined-styles.tsx
 function InlinedStyles(props) {
   return <style innerHTML={props.styles} id={props.id} />;
@@ -786,7 +857,7 @@ var Inlined_styles_default = InlinedStyles;
 
 // src/components/block/components/block-styles.tsx
 function BlockStyles(props) {
-  function canShowBlock() {
+  const canShowBlock = createMemo(() => {
     const processedBlock = getProcessedBlock({
       block: props.block,
       localState: props.context.localState,
@@ -802,8 +873,8 @@ function BlockStyles(props) {
       return processedBlock.show;
     }
     return true;
-  }
-  function css5() {
+  });
+  const css5 = createMemo(() => {
     const processedBlock = getProcessedBlock({
       block: props.block,
       localState: props.context.localState,
@@ -845,7 +916,7 @@ function BlockStyles(props) {
       )
     }) : "";
     return [largeStylesClass, mediumStylesClass, smallStylesClass].join(" ");
-  }
+  });
   return <Show2 when={TARGET !== "reactNative" && css5() && canShowBlock()}><Inlined_styles_default styles={css5()} /></Show2>;
 }
 var Block_styles_default = BlockStyles;
@@ -864,7 +935,8 @@ var createEventHandler = (value, options) => (event) => evaluate({
   rootState: options.rootState,
   rootSetState: options.rootSetState,
   event,
-  isExpression: false
+  isExpression: false,
+  enableCache: true
 });
 
 // src/functions/get-block-actions.ts
@@ -892,38 +964,6 @@ function getBlockActions(options) {
   return obj;
 }
 
-// src/functions/transform-style-property.ts
-function transformStyleProperty({
-  style
-}) {
-  return style;
-}
-
-// src/functions/get-style.ts
-var getStyle = ({
-  block,
-  context
-}) => {
-  return mapStyleObjToStrIfNeeded(transformStyleProperty({
-    style: block.style || {},
-    context,
-    block
-  }));
-};
-function mapStyleObjToStrIfNeeded(style) {
-  switch (TARGET) {
-    case "svelte":
-    case "vue":
-    case "solid":
-      return convertStyleMapToCSSArray(style).join(" ");
-    case "qwik":
-    case "reactNative":
-    case "react":
-    case "rsc":
-      return style;
-  }
-}
-
 // src/functions/transform-block-properties.ts
 function transformBlockProperties({
   properties
@@ -1083,21 +1123,20 @@ var Repeated_block_default = RepeatedBlock;
 
 // src/components/block/block.tsx
 function Block(props) {
-  const [childrenContext, setChildrenContext] = createSignal4(props.context);
-  function blockComponent() {
+  const blockComponent = createMemo4(() => {
     return getComponent({
       block: props.block,
       context: props.context,
       registeredComponents: props.registeredComponents
     });
-  }
-  function repeatItem() {
+  });
+  const repeatItem = createMemo4(() => {
     return getRepeatItemData({
       block: props.block,
       context: props.context
     });
-  }
-  function processedBlock() {
+  });
+  const processedBlock = createMemo4(() => {
     return props.block.repeat?.collection ? props.block : getProcessedBlock({
       block: props.block,
       localState: props.context.localState,
@@ -1106,15 +1145,15 @@ function Block(props) {
       context: props.context.context,
       shouldEvaluateBindings: true
     });
-  }
-  function Tag() {
+  });
+  const Tag = createMemo4(() => {
     const shouldUseLink = props.block.tagName === "a" || processedBlock().properties?.href || processedBlock().href;
     if (shouldUseLink) {
       return props.linkComponent || "a";
     }
     return props.block.tagName || "div";
-  }
-  function canShowBlock() {
+  });
+  const canShowBlock = createMemo4(() => {
     if (props.block.repeat?.collection) {
       if (repeatItem()?.length)
         return true;
@@ -1123,12 +1162,12 @@ function Block(props) {
     const shouldHide = "hide" in processedBlock() ? processedBlock().hide : false;
     const shouldShow = "show" in processedBlock() ? processedBlock().show : true;
     return shouldShow && !shouldHide;
-  }
-  function childrenWithoutParentComponent() {
+  });
+  const childrenWithoutParentComponent = createMemo4(() => {
     const shouldRenderChildrenOutsideRef = !blockComponent()?.component && !repeatItem();
     return shouldRenderChildrenOutsideRef ? processedBlock().children ?? [] : [];
-  }
-  function componentRefProps() {
+  });
+  const componentRefProps = createMemo4(() => {
     return {
       blockChildren: processedBlock().children ?? [],
       componentRef: blockComponent()?.component,
@@ -1142,14 +1181,14 @@ function Block(props) {
           builderComponents: props.registeredComponents
         } : {}
       },
-      context: childrenContext(),
+      context: props.context,
       linkComponent: props.linkComponent,
       registeredComponents: props.registeredComponents,
       builderBlock: processedBlock(),
       includeBlockProps: blockComponent()?.noWrap === true,
       isInteractive: !blockComponent()?.isRSC
     };
-  }
+  });
   onMount(() => {
     const blockId = processedBlock().id;
     const animations = processedBlock().animations;
@@ -1211,9 +1250,9 @@ function Block(props) {
         return <Block
           key={child.id}
           block={child}
-          context={childrenContext()}
           registeredComponents={props.registeredComponents}
           linkComponent={props.linkComponent}
+          context={props.context}
         />;
       }}</For2>
     </Block_wrapper_default></Show4></Show4>
@@ -1222,12 +1261,13 @@ function Block(props) {
 var Block_default = Block;
 
 // src/components/blocks/blocks-wrapper.tsx
+import { createMemo as createMemo5 } from "solid-js";
 import { Dynamic as Dynamic4 } from "solid-js/web";
 import { css } from "solid-styled-components";
 function BlocksWrapper(props) {
-  function className() {
+  const className = createMemo5(() => {
     return "builder-blocks" + (!props.blocks?.length ? " no-blocks" : "");
-  }
+  });
   function onClick() {
     if (isEditing() && !props.blocks?.length) {
       window.parent?.postMessage(
@@ -1301,12 +1341,12 @@ var Blocks_default = Blocks;
 
 // src/blocks/columns/columns.tsx
 function Columns(props) {
-  const [gutterSize, setGutterSize] = createSignal5(
+  const [gutterSize, setGutterSize] = createSignal6(
     typeof props.space === "number" ? props.space || 0 : 20
   );
-  const [cols, setCols] = createSignal5(props.columns || []);
-  const [stackAt, setStackAt] = createSignal5(props.stackColumnsAt || "tablet");
-  const [flexDir, setFlexDir] = createSignal5(
+  const [cols, setCols] = createSignal6(props.columns || []);
+  const [stackAt, setStackAt] = createSignal6(props.stackColumnsAt || "tablet");
+  const [flexDir, setFlexDir] = createSignal6(
     props.stackColumnsAt === "never" ? "row" : props.reverseColumnsWhenStacked ? "column-reverse" : "column"
   );
   function getWidth(index) {
@@ -1328,7 +1368,7 @@ function Columns(props) {
   }) {
     return stackAt() === "never" ? desktopStyle : stackedStyle;
   }
-  function columnsCssVars() {
+  const columnsCssVars = createMemo6(() => {
     return {
       "--flex-dir": flexDir(),
       "--flex-dir-tablet": getTabletStyle({
@@ -1336,7 +1376,7 @@ function Columns(props) {
         desktopStyle: "row"
       })
     };
-  }
+  });
   function columnCssVars(index) {
     const gutter = index === 0 ? 0 : gutterSize();
     const width = getColumnCssWidth(index);
@@ -1377,7 +1417,7 @@ function Columns(props) {
     );
     return breakpointSizes[size].max;
   }
-  function columnsStyles() {
+  const columnsStyles = createMemo6(() => {
     return `
         @media (max-width: ${getWidthForBreakpointSize("medium")}px) {
           .${props.builderBlock.id}-breakpoints {
@@ -1403,7 +1443,7 @@ function Columns(props) {
           }
         },
       `;
-  }
+  });
   return <div
     class={`builder-columns ${props.builderBlock.id}-breakpoints ` + css2({
       display: "flex",
@@ -1450,7 +1490,7 @@ function FragmentComponent(props) {
 var fragment_default = FragmentComponent;
 
 // src/blocks/image/image.tsx
-import { Show as Show7 } from "solid-js";
+import { Show as Show7, createMemo as createMemo7 } from "solid-js";
 import { css as css3 } from "solid-styled-components";
 
 // src/blocks/image/image.helpers.ts
@@ -1502,7 +1542,7 @@ function getSrcSet(url) {
 
 // src/blocks/image/image.tsx
 function Image(props) {
-  function srcSetToUse() {
+  const srcSetToUse = createMemo7(() => {
     const imageToUse = props.image || props.src;
     const url = imageToUse;
     if (!url || // We can auto add srcset for cdn.builder.io and shopify
@@ -1518,15 +1558,15 @@ function Image(props) {
       return getSrcSet(url);
     }
     return getSrcSet(url);
-  }
-  function webpSrcSet() {
+  });
+  const webpSrcSet = createMemo7(() => {
     if (srcSetToUse()?.match(/builder\.io/) && !props.noWebp) {
       return srcSetToUse().replace(/\?/g, "?format=webp&");
     } else {
       return "";
     }
-  }
-  function aspectRatioCss() {
+  });
+  const aspectRatioCss = createMemo7(() => {
     const aspectRatioStyles = {
       position: "absolute",
       height: "100%",
@@ -1536,7 +1576,7 @@ function Image(props) {
     };
     const out = props.aspectRatio ? aspectRatioStyles : void 0;
     return out;
-  }
+  });
   return <>
     <picture>
       <Show7 when={webpSrcSet()}><source type="image/webp" srcset={webpSrcSet()} /></Show7>
@@ -1609,10 +1649,10 @@ function SectionComponent(props) {
 var section_default = SectionComponent;
 
 // src/blocks/symbol/symbol.tsx
-import { onMount as onMount5, on as on3, createEffect as createEffect3, createSignal as createSignal15 } from "solid-js";
+import { onMount as onMount5, on as on3, createEffect as createEffect3, createMemo as createMemo16, createSignal as createSignal16 } from "solid-js";
 
 // src/components/content-variants/content-variants.tsx
-import { Show as Show12, For as For7, onMount as onMount4, createSignal as createSignal14 } from "solid-js";
+import { Show as Show12, For as For7, onMount as onMount4, createSignal as createSignal15, createMemo as createMemo15 } from "solid-js";
 
 // src/helpers/url.ts
 var getTopLevelDomain = (host) => {
@@ -1806,7 +1846,7 @@ var handleABTesting = async ({
 var getDefaultCanTrack = (canTrack) => checkIsDefined(canTrack) ? canTrack : true;
 
 // src/components/content/content.tsx
-import { Show as Show11, createSignal as createSignal13 } from "solid-js";
+import { Show as Show11, createSignal as createSignal14 } from "solid-js";
 
 // src/blocks/button/component-info.ts
 var componentInfo = {
@@ -2366,10 +2406,10 @@ var componentInfo9 = {
 };
 
 // src/blocks/custom-code/custom-code.tsx
-import { onMount as onMount2, createSignal as createSignal7 } from "solid-js";
+import { onMount as onMount2, createSignal as createSignal8 } from "solid-js";
 function CustomCode(props) {
-  const [scriptsInserted, setScriptsInserted] = createSignal7([]);
-  const [scriptsRun, setScriptsRun] = createSignal7([]);
+  const [scriptsInserted, setScriptsInserted] = createSignal8([]);
+  const [scriptsRun, setScriptsRun] = createSignal8([]);
   let elementRef;
   onMount2(() => {
     if (!elementRef?.getElementsByTagName || typeof window === "undefined") {
@@ -2450,7 +2490,7 @@ var componentInfo10 = {
 };
 
 // src/blocks/embed/embed.tsx
-import { on, createEffect, createSignal as createSignal8 } from "solid-js";
+import { on, createEffect, createMemo as createMemo9, createSignal as createSignal9 } from "solid-js";
 
 // src/blocks/embed/helpers.ts
 var SCRIPT_MIME_TYPES = ["text/javascript", "application/javascript", "application/ecmascript"];
@@ -2458,9 +2498,9 @@ var isJsScript = (script) => SCRIPT_MIME_TYPES.includes(script.type);
 
 // src/blocks/embed/embed.tsx
 function Embed(props) {
-  const [scriptsInserted, setScriptsInserted] = createSignal8([]);
-  const [scriptsRun, setScriptsRun] = createSignal8([]);
-  const [ranInitFn, setRanInitFn] = createSignal8(false);
+  const [scriptsInserted, setScriptsInserted] = createSignal9([]);
+  const [scriptsRun, setScriptsRun] = createSignal9([]);
+  const [ranInitFn, setRanInitFn] = createSignal9(false);
   function findAndRunScripts() {
     if (!elem || !elem.getElementsByTagName)
       return;
@@ -2483,13 +2523,17 @@ function Embed(props) {
     }
   }
   let elem;
+  const onUpdateFn_0_elem = createMemo9(() => elem);
+  const onUpdateFn_0_ranInitFn__ = createMemo9(() => ranInitFn());
   function onUpdateFn_0() {
     if (elem && !ranInitFn()) {
       setRanInitFn(true);
       findAndRunScripts();
     }
   }
-  createEffect(on(() => [elem, ranInitFn()], onUpdateFn_0));
+  createEffect(
+    on(() => [onUpdateFn_0_elem(), onUpdateFn_0_ranInitFn__()], onUpdateFn_0)
+  );
   return <div class="builder-embed" ref={elem} innerHTML={props.content} />;
 }
 var embed_default = Embed;
@@ -2729,7 +2773,7 @@ var componentInfo11 = {
 };
 
 // src/blocks/form/form/form.tsx
-import { Show as Show8, For as For5, createSignal as createSignal9 } from "solid-js";
+import { Show as Show8, For as For5, createSignal as createSignal10 } from "solid-js";
 import { css as css4 } from "solid-styled-components";
 
 // src/functions/get-env.ts
@@ -2747,9 +2791,9 @@ var get = (obj, path, defaultValue) => {
 
 // src/blocks/form/form/form.tsx
 function FormComponent(props) {
-  const [formState, setFormState] = createSignal9("unsubmitted");
-  const [responseData, setResponseData] = createSignal9(null);
-  const [formErrorMessage, setFormErrorMessage] = createSignal9("");
+  const [formState, setFormState] = createSignal10("unsubmitted");
+  const [responseData, setResponseData] = createSignal10(null);
+  const [formErrorMessage, setFormErrorMessage] = createSignal10("");
   function mergeNewRootState(newData) {
     const combinedState = {
       ...props.builderContext.rootState,
@@ -3265,9 +3309,9 @@ var componentInfo16 = {
 };
 
 // src/blocks/video/video.tsx
-import { Show as Show9 } from "solid-js";
+import { Show as Show9, createMemo as createMemo11 } from "solid-js";
 function Video(props) {
-  function videoProps() {
+  const videoProps = createMemo11(() => {
     return {
       ...props.autoPlay === true ? {
         autoPlay: true
@@ -3285,12 +3329,12 @@ function Video(props) {
         playsInline: true
       } : {}
     };
-  }
-  function spreadProps() {
+  });
+  const spreadProps = createMemo11(() => {
     return {
       ...videoProps()
     };
-  }
+  });
   return <div
     style={{
       position: "relative"
@@ -3480,7 +3524,14 @@ function InlinedScript(props) {
 var Inlined_script_default = InlinedScript;
 
 // src/components/content/components/enable-editor.tsx
-import { Show as Show10, onMount as onMount3, on as on2, createEffect as createEffect2, createSignal as createSignal11 } from "solid-js";
+import {
+  Show as Show10,
+  onMount as onMount3,
+  on as on2,
+  createEffect as createEffect2,
+  createMemo as createMemo12,
+  createSignal as createSignal12
+} from "solid-js";
 import { Dynamic as Dynamic5 } from "solid-js/web";
 
 // src/helpers/preview-lru-cache/get.ts
@@ -3963,7 +4014,7 @@ function isFromTrustedHost(trustedHosts, e) {
 }
 
 // src/constants/sdk-version.ts
-var SDK_VERSION = "0.14.6";
+var SDK_VERSION = "1.0.13";
 
 // src/functions/register.ts
 var registry = {};
@@ -4161,15 +4212,15 @@ var subscribeToEditor = (model, callback, options) => {
 
 // src/components/content/components/enable-editor.tsx
 function EnableEditor(props) {
-  const [forceReRenderCount, setForceReRenderCount] = createSignal11(0);
-  const [firstRender, setFirstRender] = createSignal11(true);
-  const [lastUpdated, setLastUpdated] = createSignal11(0);
-  const [shouldSendResetCookie, setShouldSendResetCookie] = createSignal11(false);
-  const [ContentWrapper, setContentWrapper] = createSignal11(
+  const [forceReRenderCount, setForceReRenderCount] = createSignal12(0);
+  const [firstRender, setFirstRender] = createSignal12(true);
+  const [lastUpdated, setLastUpdated] = createSignal12(0);
+  const [shouldSendResetCookie, setShouldSendResetCookie] = createSignal12(false);
+  const [ContentWrapper, setContentWrapper] = createSignal12(
     props.contentWrapper || "div"
   );
-  const [httpReqsData, setHttpReqsData] = createSignal11({});
-  const [clicked, setClicked] = createSignal11(false);
+  const [httpReqsData, setHttpReqsData] = createSignal12({});
+  const [clicked, setClicked] = createSignal12(false);
   function mergeNewRootState(newData) {
     const combinedState = {
       ...props.builderContextSignal.rootState,
@@ -4240,7 +4291,11 @@ function EnableEditor(props) {
         context: props.context || {},
         localState: void 0,
         rootState: props.builderContextSignal.rootState,
-        rootSetState: props.builderContextSignal.rootSetState
+        rootSetState: props.builderContextSignal.rootSetState,
+        /**
+         * We don't want to cache the result of the JS code, since it's arbitrary side effect code.
+         */
+        enableCache: false
       });
     }
   }
@@ -4265,13 +4320,16 @@ function EnableEditor(props) {
   function evalExpression(expression) {
     return expression.replace(
       /{{([^}]+)}}/g,
-      (_match, group) => evaluate({
-        code: group,
-        context: props.context || {},
-        localState: void 0,
-        rootState: props.builderContextSignal.rootState,
-        rootSetState: props.builderContextSignal.rootSetState
-      })
+      (_match, group) => String(
+        evaluate({
+          code: group,
+          context: props.context || {},
+          localState: void 0,
+          rootState: props.builderContextSignal.rootState,
+          rootSetState: props.builderContextSignal.rootSetState,
+          enableCache: true
+        })
+      )
     );
   }
   function handleRequest({ url, key }) {
@@ -4387,40 +4445,63 @@ function EnableEditor(props) {
     runHttpRequests();
     emitStateUpdate();
   });
+  const onUpdateFn_0_props_content = createMemo12(() => props.content);
   function onUpdateFn_0() {
     if (props.content) {
       mergeNewContent(props.content);
     }
   }
-  createEffect2(on2(() => [props.content], onUpdateFn_0));
+  createEffect2(on2(() => [onUpdateFn_0_props_content()], onUpdateFn_0));
+  const onUpdateFn_1_shouldSendResetCookie__ = createMemo12(
+    () => shouldSendResetCookie()
+  );
   function onUpdateFn_1() {
   }
-  createEffect2(on2(() => [shouldSendResetCookie()], onUpdateFn_1));
+  createEffect2(
+    on2(() => [onUpdateFn_1_shouldSendResetCookie__()], onUpdateFn_1)
+  );
+  const onUpdateFn_2_props_builderContextSignal_content__data__jsCode = createMemo12(() => props.builderContextSignal.content?.data?.jsCode);
   function onUpdateFn_2() {
     evaluateJsCode();
   }
   createEffect2(
-    on2(() => [props.builderContextSignal.content?.data?.jsCode], onUpdateFn_2)
+    on2(
+      () => [onUpdateFn_2_props_builderContextSignal_content__data__jsCode()],
+      onUpdateFn_2
+    )
   );
+  const onUpdateFn_3_props_builderContextSignal_content__data__httpRequests = createMemo12(() => props.builderContextSignal.content?.data?.httpRequests);
   function onUpdateFn_3() {
     runHttpRequests();
   }
   createEffect2(
     on2(
-      () => [props.builderContextSignal.content?.data?.httpRequests],
+      () => [
+        onUpdateFn_3_props_builderContextSignal_content__data__httpRequests()
+      ],
       onUpdateFn_3
     )
   );
+  const onUpdateFn_4_props_builderContextSignal_rootState = createMemo12(
+    () => props.builderContextSignal.rootState
+  );
   function onUpdateFn_4() {
     emitStateUpdate();
   }
-  createEffect2(on2(() => [props.builderContextSignal.rootState], onUpdateFn_4));
+  createEffect2(
+    on2(
+      () => [onUpdateFn_4_props_builderContextSignal_rootState()],
+      onUpdateFn_4
+    )
+  );
+  const onUpdateFn_5_props_data = createMemo12(() => props.data);
   function onUpdateFn_5() {
     if (props.data) {
       mergeNewRootState(props.data);
     }
   }
-  createEffect2(on2(() => [props.data], onUpdateFn_5));
+  createEffect2(on2(() => [onUpdateFn_5_props_data()], onUpdateFn_5));
+  const onUpdateFn_6_props_locale = createMemo12(() => props.locale);
   function onUpdateFn_6() {
     if (props.locale) {
       mergeNewRootState({
@@ -4428,7 +4509,7 @@ function EnableEditor(props) {
       });
     }
   }
-  createEffect2(on2(() => [props.locale], onUpdateFn_6));
+  createEffect2(on2(() => [onUpdateFn_6_props_locale()], onUpdateFn_6));
   return <builder_context_default.Provider value={props.builderContextSignal}><Show10 when={props.builderContextSignal.content}><Dynamic5
     class={`variant-${props.content?.testVariationId || props.content?.id}`}
     {...{}}
@@ -4449,7 +4530,7 @@ function EnableEditor(props) {
 var Enable_editor_default = EnableEditor;
 
 // src/components/content/components/styles.tsx
-import { createSignal as createSignal12 } from "solid-js";
+import { createSignal as createSignal13 } from "solid-js";
 
 // src/components/content/components/styles.helpers.ts
 var getCssFromFont = (font) => {
@@ -4505,19 +4586,7 @@ var getCss = ({
   }
   return cssCode?.replace(/&/g, `div[builder-content-id="${contentId}"]`) || "";
 };
-
-// src/components/content/components/styles.tsx
-function ContentStyles(props) {
-  const [injectedStyles, setInjectedStyles] = createSignal12(
-    `
-${getCss({
-      cssCode: props.cssCode,
-      contentId: props.contentId
-    })}
-${getFontCss({
-      customFonts: props.customFonts
-    })}
-
+var DEFAULT_STYLES = `
 .builder-button {
   all: unset;
 }
@@ -4534,6 +4603,23 @@ ${getFontCss({
   text-align: inherit;
   font-family: inherit;
 }
+`;
+var getDefaultStyles = (isNested) => {
+  return !isNested ? DEFAULT_STYLES : "";
+};
+
+// src/components/content/components/styles.tsx
+function ContentStyles(props) {
+  const [injectedStyles, setInjectedStyles] = createSignal13(
+    `
+${getCss({
+      cssCode: props.cssCode,
+      contentId: props.contentId
+    })}
+${getFontCss({
+      customFonts: props.customFonts
+    })}
+${getDefaultStyles(props.isNestedRender)}
 `.trim()
   );
   return <Inlined_styles_default styles={injectedStyles()} />;
@@ -4578,7 +4664,7 @@ var getContentInitialValue = ({
 
 // src/components/content/content.tsx
 function ContentComponent(props) {
-  const [scriptStr, setScriptStr] = createSignal13(
+  const [scriptStr, setScriptStr] = createSignal14(
     getUpdateVariantVisibilityScript({
       // eslint-disable-next-line @typescript-eslint/no-non-null-assertion, @typescript-eslint/no-non-null-asserted-optional-chain
       variationId: props.content?.testVariationId,
@@ -4586,7 +4672,7 @@ function ContentComponent(props) {
       contentId: props.content?.id
     })
   );
-  const [registeredComponents, setRegisteredComponents] = createSignal13(
+  const [registeredComponents, setRegisteredComponents] = createSignal14(
     [
       ...getDefaultRegisteredComponents(),
       ...props.customComponents || []
@@ -4601,7 +4687,7 @@ function ContentComponent(props) {
       {}
     )
   );
-  const [builderContextSignal, setBuilderContextSignal] = createSignal13({
+  const [builderContextSignal, setBuilderContextSignal] = createSignal14({
     content: getContentInitialValue({
       content: props.content,
       data: props.data
@@ -4661,6 +4747,7 @@ function ContentComponent(props) {
   >
     <Show11 when={props.isSsrAbTest}><Inlined_script_default scriptStr={scriptStr()} /></Show11>
     <Show11 when={TARGET !== "reactNative"}><Styles_default
+      isNestedRender={props.isNestedRender}
       contentId={builderContextSignal().content?.id}
       cssCode={builderContextSignal().content?.data?.cssCode}
       customFonts={builderContextSignal().content?.data?.customFonts}
@@ -4677,13 +4764,13 @@ var Content_default = ContentComponent;
 
 // src/components/content-variants/content-variants.tsx
 function ContentVariants(props) {
-  const [shouldRenderVariants, setShouldRenderVariants] = createSignal14(
+  const [shouldRenderVariants, setShouldRenderVariants] = createSignal15(
     checkShouldRenderVariants({
       canTrack: getDefaultCanTrack(props.canTrack),
       content: props.content
     })
   );
-  function updateCookieAndStylesScriptStr() {
+  const updateCookieAndStylesScriptStr = createMemo15(() => {
     return getUpdateCookieAndStylesScript(
       getVariants(props.content).map((value) => ({
         id: value.testVariationId,
@@ -4691,11 +4778,11 @@ function ContentVariants(props) {
       })),
       props.content?.id || ""
     );
-  }
-  function hideVariantsStyleString() {
+  });
+  const hideVariantsStyleString = createMemo15(() => {
     return getVariants(props.content).map((value) => `.variant-${value.testVariationId} { display: none; } `).join("");
-  }
-  function defaultContent() {
+  });
+  const defaultContent = createMemo15(() => {
     return shouldRenderVariants() ? {
       ...props.content,
       testVariationId: props.content?.id
@@ -4703,12 +4790,12 @@ function ContentVariants(props) {
       item: props.content,
       canTrack: getDefaultCanTrack(props.canTrack)
     });
-  }
+  });
   onMount4(() => {
     setShouldRenderVariants(false);
   });
   return <>
-    <Show12 when={!props.__isNestedRender && TARGET !== "reactNative"}><Inlined_script_default scriptStr={getScriptString()} /></Show12>
+    <Show12 when={!props.isNestedRender && TARGET !== "reactNative"}><Inlined_script_default scriptStr={getScriptString()} /></Show12>
     <Show12 when={shouldRenderVariants()}>
       <Inlined_styles_default
         id={`variants-styles-${props.content?.id}`}
@@ -4720,6 +4807,7 @@ function ContentVariants(props) {
       <For7 each={getVariants(props.content)}>{(variant, _index) => {
         const index = _index();
         return <Content_default
+          isNestedRender={props.isNestedRender}
           key={variant.testVariationId}
           content={variant}
           showContent={false}
@@ -4743,6 +4831,7 @@ function ContentVariants(props) {
       }}</For7>
     </Show12>
     <Content_default
+      isNestedRender={props.isNestedRender}
       {...{}}
       content={defaultContent()}
       showContent={true}
@@ -4793,15 +4882,15 @@ var fetchSymbolContent = async ({
 
 // src/blocks/symbol/symbol.tsx
 function Symbol(props) {
-  const [contentToUse, setContentToUse] = createSignal15(props.symbol?.content);
-  function className() {
+  const [contentToUse, setContentToUse] = createSignal16(props.symbol?.content);
+  const className = createMemo16(() => {
     return [
       ...[props.attributes[getClassPropName()]],
       "builder-symbol",
       props.symbol?.inline ? "builder-inline-symbol" : void 0,
       props.symbol?.dynamic || props.dynamic ? "builder-dynamic-symbol" : void 0
     ].filter(Boolean).join(" ");
-  }
+  });
   function setContent() {
     if (contentToUse())
       return;
@@ -4815,14 +4904,14 @@ function Symbol(props) {
     });
   }
   onMount5(() => {
-    setContent();
   });
+  const onUpdateFn_0_props_symbol = createMemo16(() => props.symbol);
   function onUpdateFn_0() {
     setContent();
   }
-  createEffect3(on3(() => [props.symbol], onUpdateFn_0));
+  createEffect3(on3(() => [onUpdateFn_0_props_symbol()], onUpdateFn_0));
   return <div class={className()} {...{}} {...props.attributes} {...{}}><Content_variants_default
-    __isNestedRender={true}
+    isNestedRender={true}
     apiVersion={props.builderContext.apiVersion}
     apiKey={props.builderContext.apiKey}
     context={{