@builder.io/sdk-react-native 0.1.4 → 0.1.6

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

@@ -23,6 +23,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);
@@ -30,56 +34,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(),
@@ -106,10 +112,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;
         }
@@ -122,7 +130,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.
           }
 
@@ -138,12 +146,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,
       });
     }
   }
@@ -153,9 +161,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,
@@ -175,8 +183,8 @@ export default function RenderContent(props) {
     return expression.replace(/{{([^}]+)}}/g, (_match, group) =>
       evaluate({
         code: group,
-        context: contextContext,
-        state: contentState(),
+        context: props.context || {},
+        state: contentState,
       })
     );
   }
@@ -185,11 +193,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);
@@ -197,7 +205,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);
@@ -214,7 +222,7 @@ export default function RenderContent(props) {
       window.dispatchEvent(
         new CustomEvent("builder:component:stateChange", {
           detail: {
-            state: contentState(),
+            state: contentState,
             ref: {
               name: props.model,
             },
@@ -226,8 +234,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"
     );
   }
@@ -266,9 +273,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,
@@ -303,7 +310,7 @@ export default function RenderContent(props) {
             apiKey: props.apiKey,
           }).then((content) => {
             if (content) {
-              setOverrideContent(content);
+              mergeNewContent(content);
             }
           });
         }
@@ -316,13 +323,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 () => {
@@ -339,30 +346,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 ? (
         <>
           <View
             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}
             />
           </View>

package/src/context/builder.context.js

@@ -3,6 +3,8 @@ var stdin_default = createContext({
   content: null,
   context: {},
   state: {},
+  setState() {
+  },
   apiKey: null,
   registeredComponents: {},
   inheritedStyles: {}