@builder.io/sdk-react 0.1.3 → 0.1.5

package/packages/react/src/components/render-block/render-block.jsx

@@ -5,16 +5,16 @@ import { getBlockComponentOptions } from "../../functions/get-block-component-op
 import { getBlockProperties } from "../../functions/get-block-properties.js";
 import { getBlockTag } from "../../functions/get-block-tag.js";
 import { getProcessedBlock } from "../../functions/get-processed-block.js";
-import BlockStyles from "./block-styles.js";
+import BlockStyles from "./block-styles";
 import {
   getComponent,
   getRepeatItemData,
   isEmptyHtmlElement,
 } from "./render-block.helpers.js";
-import RenderRepeatedBlock from "./render-repeated-block.js";
+import RenderRepeatedBlock from "./render-repeated-block";
 import { TARGET } from "../../constants/target.js";
 import { extractTextStyles } from "../../functions/extract-text-styles.js";
-import RenderComponent from "./render-component.js";
+import RenderComponent from "./render-component";
 import { getReactNativeBlockStyles } from "../../functions/get-react-native-block-styles.js";
 
 export default function RenderBlock(props) {
@@ -40,10 +40,30 @@ export default function RenderBlock(props) {
         });
   }
 
+  function proxyState() {
+    if (typeof Proxy === "undefined") {
+      console.error(
+        "no Proxy available in this environment, cannot proxy state."
+      );
+      return props.context.state;
+    }
+    const useState = new Proxy(props.context.state, {
+      set: (obj, prop, value) => {
+        // set the value on the state object, so that the event handler instantly gets the update.
+        obj[prop] = value;
+
+        // set the value in the context, so that the rest of the app gets the update.
+        props.context.setState?.(obj);
+        return true;
+      },
+    });
+    return useState;
+  }
+
   function actions() {
     return getBlockActions({
       block: useBlock(),
-      state: props.context.state,
+      state: proxyState(),
       context: props.context.context,
     });
   }
@@ -125,6 +145,7 @@ export default function RenderBlock(props) {
       state: props.context.state,
       content: props.context.content,
       context: props.context.context,
+      setState: props.context.setState,
       registeredComponents: props.context.registeredComponents,
       inheritedStyles: getInheritedTextStyles(),
     };

package/packages/react/src/components/render-block/render-component.jsx

@@ -1,6 +1,6 @@
 import * as React from "react";
-import BlockStyles from "./block-styles.js";
-import RenderBlock from "./render-block.js";
+import BlockStyles from "./block-styles";
+import RenderBlock from "./render-block";
 
 export default function RenderComponent(props) {
   const ComponentRefRef = props.componentRef;

package/packages/react/src/components/render-block/render-repeated-block.jsx

@@ -1,7 +1,7 @@
 import * as React from "react";
 import { useContext } from "react";
 import BuilderContext from "../../context/builder.context.js";
-import RenderBlock from "./render-block.js";
+import RenderBlock from "./render-block";
 
 export default function RenderRepeatedBlock(props) {
   return (
@@ -9,6 +9,7 @@ export default function RenderRepeatedBlock(props) {
       value={{
         content: props.repeatContext.content,
         state: props.repeatContext.state,
+        setState: props.repeatContext.setState,
         context: props.repeatContext.context,
         apiKey: props.repeatContext.apiKey,
         registeredComponents: props.repeatContext.registeredComponents,

package/packages/react/src/components/render-blocks.jsx

@@ -2,8 +2,8 @@ import * as React from "react";
 import { useContext } from "react";
 import BuilderContext from "../context/builder.context.js";
 import { isEditing } from "../functions/is-editing.js";
-import BlockStyles from "./render-block/block-styles.js";
-import RenderBlock from "./render-block/render-block.js";
+import BlockStyles from "./render-block/block-styles";
+import RenderBlock from "./render-block/render-block";
 
 export default function RenderBlocks(props) {
   function className() {
@@ -45,7 +45,7 @@ export default function RenderBlocks(props) {
   return (
     <>
       <div
-        className={className() + " div-05727d92"}
+        className={className() + " div-297c34fa"}
         builder-path={props.path}
         builder-parent-id={props.parent}
         dataSet={{
@@ -79,7 +79,7 @@ export default function RenderBlocks(props) {
           </>
         ) : null}
       </div>
-      <style>{`.div-05727d92 {
+      <style>{`.div-297c34fa {
 display: flex;
 flex-direction: column;
 align-items: stretch;

package/packages/react/src/components/render-content/components/render-styles.helpers.js

@@ -0,0 +1,57 @@
+const getCssFromFont = (font) => {
+  var _a, _b;
+  const family = font.family + (font.kind && !font.kind.includes("#") ? ", " + font.kind : "");
+  const name = family.split(",")[0];
+  const url = (_b = font.fileUrl) != null ? _b : (_a = font == null ? void 0 : font.files) == null ? void 0 : _a.regular;
+  let str = "";
+  if (url && family && name) {
+    str += `
+@font-face {
+font-family: "${family}";
+src: local("${name}"), url('${url}') format('woff2');
+font-display: fallback;
+font-weight: 400;
+}
+      `.trim();
+  }
+  if (font.files) {
+    for (const weight in font.files) {
+      const isNumber = String(Number(weight)) === weight;
+      if (!isNumber) {
+        continue;
+      }
+      const weightUrl = font.files[weight];
+      if (weightUrl && weightUrl !== url) {
+        str += `
+@font-face {
+font-family: "${family}";
+src: url('${weightUrl}') format('woff2');
+font-display: fallback;
+font-weight: ${weight};
+}
+        `.trim();
+      }
+    }
+  }
+  return str;
+};
+const getFontCss = ({ customFonts }) => {
+  var _a;
+  return ((_a = customFonts == null ? void 0 : customFonts.map((font) => getCssFromFont(font))) == null ? void 0 : _a.join(" ")) || "";
+};
+const getCss = ({
+  cssCode,
+  contentId
+}) => {
+  if (!cssCode) {
+    return "";
+  }
+  if (!contentId) {
+    return cssCode;
+  }
+  return (cssCode == null ? void 0 : cssCode.replace(/&/g, `div[builder-content-id="${contentId}"]`)) || "";
+};
+export {
+  getCss,
+  getFontCss
+};

package/packages/react/src/components/render-content/components/render-styles.jsx

@@ -1,64 +1,21 @@
 import * as React from "react";
-import RenderInlinedStyles from "../../render-inlined-styles.js";
+import { useState } from "react";
+import RenderInlinedStyles from "../../render-inlined-styles";
+import { getCss } from "./render-styles.helpers";
+import { getFontCss } from "./render-styles.helpers";
 
 export default function RenderContentStyles(props) {
-  function getCssFromFont(font) {
-    // TODO: compute what font sizes are used and only load those.......
-    const family =
-      font.family +
-      (font.kind && !font.kind.includes("#") ? ", " + font.kind : "");
-    const name = family.split(",")[0];
-    const url = font.fileUrl ?? font?.files?.regular;
-    let str = "";
-    if (url && family && name) {
-      str += `
-@font-face {
-  font-family: "${family}";
-  src: local("${name}"), url('${url}') format('woff2');
-  font-display: fallback;
-  font-weight: 400;
-}
-        `.trim();
-    }
-    if (font.files) {
-      for (const weight in font.files) {
-        const isNumber = String(Number(weight)) === weight;
-        if (!isNumber) {
-          continue;
-        }
-        // TODO: maybe limit number loaded
-        const weightUrl = font.files[weight];
-        if (weightUrl && weightUrl !== url) {
-          str += `
-@font-face {
-  font-family: "${family}";
-  src: url('${weightUrl}') format('woff2');
-  font-display: fallback;
-  font-weight: ${weight};
-}
-          `.trim();
-        }
-      }
-    }
-    return str;
-  }
-
-  function getFontCss({ customFonts }) {
-    // TODO: flag for this
-    // if (!builder.allowCustomFonts) {
-    //   return '';
-    // }
-    // TODO: separate internal data from external
-    return customFonts?.map((font) => getCssFromFont(font))?.join(" ") || "";
-  }
-
-  function injectedStyles() {
-    return `
-${props.cssCode || ""}
+  const [injectedStyles, setInjectedStyles] = useState(
+    () => `
+${getCss({
+  cssCode: props.cssCode,
+  contentId: props.contentId,
+})}
 ${getFontCss({
   customFonts: props.customFonts,
-})}`;
-  }
+})}
+`
+  );
 
-  return <RenderInlinedStyles styles={injectedStyles()} />;
+  return <RenderInlinedStyles styles={injectedStyles} />;
 }

package/packages/react/src/components/render-content/index.js

@@ -1,4 +1,4 @@
-import { default as default2 } from "./render-content.js";
+import { default as default2 } from "./render-content";
 export {
   default2 as default
 };

package/packages/react/src/components/render-content/render-content.helpers.js

@@ -0,0 +1,48 @@
+var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+const getContextStateInitialValue = ({
+  content,
+  data,
+  locale
+}) => {
+  var _a, _b, _c;
+  const defaultValues = {};
+  (_b = (_a = content == null ? void 0 : content.data) == null ? void 0 : _a.inputs) == null ? void 0 : _b.forEach((input) => {
+    var _a2;
+    if (input.name && input.defaultValue !== void 0 && ((_a2 = content == null ? void 0 : content.data) == null ? void 0 : _a2.state) && content.data.state[input.name] === void 0) {
+      defaultValues[input.name] = input.defaultValue;
+    }
+  });
+  const stateToUse = __spreadValues(__spreadValues(__spreadValues({}, (_c = content == null ? void 0 : content.data) == null ? void 0 : _c.state), data), locale ? { locale } : {});
+  return __spreadValues(__spreadValues({}, defaultValues), stateToUse);
+};
+const getContentInitialValue = ({
+  content,
+  data
+}) => {
+  return !content ? void 0 : __spreadProps(__spreadValues({}, content), {
+    data: __spreadValues(__spreadValues({}, content == null ? void 0 : content.data), data),
+    meta: content == null ? void 0 : content.meta
+  });
+};
+export {
+  getContentInitialValue,
+  getContextStateInitialValue
+};

package/packages/react/src/components/render-content/render-content.jsx

@@ -13,8 +13,8 @@ import {
   createRegisterComponentMessage,
 } from "../../functions/register-component.js";
 import { _track } from "../../functions/track/index.js";
-import RenderBlocks from "../render-blocks.js";
-import RenderContentStyles from "./components/render-styles.js";
+import RenderBlocks from "../render-blocks";
+import RenderContentStyles from "./components/render-styles";
 import builderContext from "../../context/builder.context.js";
 import {
   registerInsertMenu,
@@ -22,6 +22,10 @@ import {
 } from "../../scripts/init-editing.js";
 import { checkIsDefined } from "../../helpers/nullable.js";
 import { getInteractionPropertiesForEvent } from "../../functions/track/interaction.js";
+import {
+  getContentInitialValue,
+  getContextStateInitialValue,
+} from "./render-content.helpers.js";
 
 export default function RenderContent(props) {
   const elementRef = useRef(null);
@@ -29,56 +33,58 @@ export default function RenderContent(props) {
 
   const [overrideContent, setOverrideContent] = useState(() => null);
 
-  function useContent() {
-    if (!props.content && !overrideContent) {
-      return undefined;
-    }
-    return {
-      ...props.content,
-      ...overrideContent,
+  const [useContent, setUseContent] = useState(() =>
+    getContentInitialValue({
+      content: props.content,
+      data: props.data,
+    })
+  );
+
+  function mergeNewContent(newContent) {
+    setUseContent({
+      ...useContent,
+      ...newContent,
       data: {
-        ...props.content?.data,
-        ...props.data,
-        ...overrideContent?.data,
+        ...useContent?.data,
+        ...newContent?.data,
       },
       meta: {
-        ...props.content?.meta,
-        ...overrideContent?.meta,
+        ...useContent?.meta,
+        ...newContent?.meta,
         breakpoints:
-          useBreakpoints ||
-          overrideContent?.meta?.breakpoints ||
-          props.content?.meta?.breakpoints,
+          newContent?.meta?.breakpoints || useContent?.meta?.breakpoints,
       },
-    };
+    });
   }
 
-  const [update, setUpdate] = useState(() => 0);
+  function setBreakpoints(breakpoints) {
+    setUseContent({
+      ...useContent,
+      meta: {
+        ...useContent?.meta,
+        breakpoints,
+      },
+    });
+  }
 
-  const [useBreakpoints, setUseBreakpoints] = useState(() => null);
+  const [update, setUpdate] = useState(() => 0);
 
   const [canTrackToUse, setCanTrackToUse] = useState(() =>
     checkIsDefined(props.canTrack) ? props.canTrack : true
   );
 
-  const [overrideState, setOverrideState] = useState(() => ({}));
+  const [contentState, setContentState] = useState(() =>
+    getContextStateInitialValue({
+      content: props.content,
+      data: props.data,
+      locale: props.locale,
+    })
+  );
 
-  function contentState() {
-    return {
-      ...props.content?.data?.state,
-      ...props.data,
-      ...(props.locale
-        ? {
-            locale: props.locale,
-          }
-        : {}),
-      ...overrideState,
-    };
+  function setContextState(newState) {
+    setContentState(newState);
   }
 
-  const [contextContext, setContextContext] = useState(
-    () => props.context || {}
-  );
-
   const [allRegisteredComponents, setAllRegisteredComponents] = useState(() =>
     [
       ...getDefaultRegisteredComponents(),
@@ -105,10 +111,12 @@ export default function RenderContent(props) {
         case "builder.configureSdk": {
           const messageContent = data.data;
           const { breakpoints, contentId } = messageContent;
-          if (!contentId || contentId !== useContent?.()?.id) {
+          if (!contentId || contentId !== useContent?.id) {
             return;
           }
-          setUseBreakpoints(breakpoints);
+          if (breakpoints) {
+            setBreakpoints(breakpoints);
+          }
           setForceReRenderCount(forceReRenderCount + 1); // This is a hack to force Qwik to re-render.
           break;
         }
@@ -121,7 +129,7 @@ export default function RenderContent(props) {
             messageContent.modelName;
           const contentData = messageContent.data;
           if (key === props.model) {
-            setOverrideContent(contentData);
+            mergeNewContent(contentData);
             setForceReRenderCount(forceReRenderCount + 1); // This is a hack to force Qwik to re-render.
           }
 
@@ -137,12 +145,12 @@ export default function RenderContent(props) {
 
   function evaluateJsCode() {
     // run any dynamic JS code attached to content
-    const jsCode = useContent?.()?.data?.jsCode;
+    const jsCode = useContent?.data?.jsCode;
     if (jsCode) {
       evaluate({
         code: jsCode,
-        context: contextContext,
-        state: contentState(),
+        context: props.context || {},
+        state: contentState,
       });
     }
   }
@@ -152,9 +160,9 @@ export default function RenderContent(props) {
   const [clicked, setClicked] = useState(() => false);
 
   function onClick(event) {
-    if (useContent()) {
-      const variationId = useContent?.()?.testVariationId;
-      const contentId = useContent?.()?.id;
+    if (useContent) {
+      const variationId = useContent?.testVariationId;
+      const contentId = useContent?.id;
       _track({
         type: "click",
         canTrack: canTrackToUse,
@@ -174,8 +182,8 @@ export default function RenderContent(props) {
     return expression.replace(/{{([^}]+)}}/g, (_match, group) =>
       evaluate({
         code: group,
-        context: contextContext,
-        state: contentState(),
+        context: props.context || {},
+        state: contentState,
       })
     );
   }
@@ -184,11 +192,11 @@ export default function RenderContent(props) {
     fetch(url)
       .then((response) => response.json())
       .then((json) => {
-        const newOverrideState = {
-          ...overrideState,
+        const newState = {
+          ...contentState,
           [key]: json,
         };
-        setOverrideState(newOverrideState);
+        setContextState(newState);
       })
       .catch((err) => {
         console.log("error fetching dynamic data", url, err);
@@ -196,7 +204,7 @@ export default function RenderContent(props) {
   }
 
   function runHttpRequests() {
-    const requests = useContent?.()?.data?.httpRequests ?? {};
+    const requests = useContent?.data?.httpRequests ?? {};
     Object.entries(requests).forEach(([key, url]) => {
       if (url && (!httpReqsData[key] || isEditing())) {
         const evaluatedUrl = evalExpression(url);
@@ -213,7 +221,7 @@ export default function RenderContent(props) {
       window.dispatchEvent(
         new CustomEvent("builder:component:stateChange", {
           detail: {
-            state: contentState(),
+            state: contentState,
             ref: {
               name: props.model,
             },
@@ -225,8 +233,7 @@ export default function RenderContent(props) {
 
   function shouldRenderContentStyles() {
     return Boolean(
-      (useContent?.()?.data?.cssCode ||
-        useContent?.()?.data?.customFonts?.length) &&
+      (useContent?.data?.cssCode || useContent?.data?.customFonts?.length) &&
         TARGET !== "reactNative"
     );
   }
@@ -265,9 +272,9 @@ export default function RenderContent(props) {
           emitStateUpdate
         );
       }
-      if (useContent()) {
-        const variationId = useContent?.()?.testVariationId;
-        const contentId = useContent?.()?.id;
+      if (useContent) {
+        const variationId = useContent?.testVariationId;
+        const contentId = useContent?.id;
         _track({
           type: "impression",
           canTrack: canTrackToUse,
@@ -302,7 +309,7 @@ export default function RenderContent(props) {
             apiKey: props.apiKey,
           }).then((content) => {
             if (content) {
-              setOverrideContent(content);
+              mergeNewContent(content);
             }
           });
         }
@@ -315,13 +322,13 @@ export default function RenderContent(props) {
 
   useEffect(() => {
     evaluateJsCode();
-  }, [useContent?.()?.data?.jsCode, contentState()]);
+  }, [useContent?.data?.jsCode, contentState]);
   useEffect(() => {
     runHttpRequests();
-  }, [useContent?.()?.data?.httpRequests]);
+  }, [useContent?.data?.httpRequests]);
   useEffect(() => {
     emitStateUpdate();
-  }, [contentState()]);
+  }, [contentState]);
 
   useEffect(() => {
     return () => {
@@ -338,30 +345,32 @@ export default function RenderContent(props) {
   return (
     <builderContext.Provider
       value={{
-        content: useContent(),
-        state: contentState(),
-        context: contextContext,
+        content: useContent,
+        state: contentState,
+        setState: setContextState,
+        context: props.context || {},
         apiKey: props.apiKey,
         registeredComponents: allRegisteredComponents,
       }}
     >
-      {useContent() ? (
+      {useContent ? (
         <>
           <div
             ref={elementRef}
             onClick={(event) => onClick(event)}
-            builder-content-id={useContent?.()?.id}
+            builder-content-id={useContent?.id}
             builder-model={props.model}
           >
             {shouldRenderContentStyles() ? (
               <RenderContentStyles
-                cssCode={useContent?.()?.data?.cssCode}
-                customFonts={useContent?.()?.data?.customFonts}
+                contentId={useContent?.id}
+                cssCode={useContent?.data?.cssCode}
+                customFonts={useContent?.data?.customFonts}
               />
             ) : null}
 
             <RenderBlocks
-              blocks={useContent?.()?.data?.blocks}
+              blocks={useContent?.data?.blocks}
               key={forceReRenderCount}
             />
           </div>

package/packages/react/src/components/render-inlined-styles.jsx

@@ -16,9 +16,9 @@ export default function RenderInlinedStyles(props) {
 
   return (
     <>
-      {TARGET === "svelte" ? (
+      {TARGET === "svelte" || TARGET === "qwik" ? (
         <>
-          <div dangerouslySetInnerHTML={{ __html: injectedStyleScript() }} />
+          <TagRef dangerouslySetInnerHTML={{ __html: props.styles }} />
         </>
       ) : (
         <TagRef>{props.styles}</TagRef>