@builder.io/sdk-react 0.1.4 → 0.1.5

package/packages/rsc/src/blocks/columns/columns.jsx

@@ -118,7 +118,7 @@ export default function Columns(props) {
       <div
         className={
           `builder-columns ${props.builderBlock.id}-breakpoints` +
-          " div-540739f0"
+          " div-ca644030"
         }
         style={{
           ...(TARGET === "reactNative" ? state.reactNativeColumnsStyles : {}),
@@ -136,7 +136,7 @@ export default function Columns(props) {
 
         {props.columns?.map((column, index) => (
           <div
-            className="builder-column div-540739f0-2"
+            className="builder-column div-ca644030-2"
             style={{
               width: state.getColumnCssWidth(index),
               marginLeft: `${index === 0 ? 0 : state.getGutterSize()}px`,
@@ -159,10 +159,10 @@ export default function Columns(props) {
           </div>
         ))}
       </div>
-      <style>{`.div-540739f0 {
+      <style>{`.div-ca644030 {
 display: flex;
 line-height: normal;
-}.div-540739f0-2 {
+}.div-ca644030-2 {
 display: flex;
 flex-direction: column;
 align-items: stretch;

package/packages/rsc/src/blocks/form/form.jsx

@@ -237,7 +237,7 @@ export default function FormComponent(props) {
         ) : null}{" "}
         {state.submissionState === "error" && state.responseData ? (
           <>
-            <pre className="builder-form-error-text pre-105231da">
+            <pre className="builder-form-error-text pre-41e7c77e">
               {" "}
               {JSON.stringify(state.responseData, null, 2)}{" "}
             </pre>
@@ -253,7 +253,7 @@ export default function FormComponent(props) {
           </>
         ) : null}{" "}
       </form>{" "}
-      <style>{`.pre-105231da { padding: 10px; color: red; text-align: center; }`}</style>{" "}
+      <style>{`.pre-41e7c77e { padding: 10px; color: red; text-align: center; }`}</style>{" "}
     </>
   );
 }

package/packages/rsc/src/blocks/image/image.jsx

@@ -68,7 +68,7 @@ export default function Image(props) {
             className={
               "builder-image" +
               (props.className ? " " + props.className : "") +
-              " img-d6cf1f9c"
+              " img-5aa89e3a"
             }
             src={props.image}
             srcSet={state.srcSetToUse}
@@ -80,7 +80,7 @@ export default function Image(props) {
         !(props.builderBlock?.children?.length && props.fitContent) ? (
           <>
             <div
-              className="builder-image-sizer div-d6cf1f9c"
+              className="builder-image-sizer div-5aa89e3a"
               style={{
                 paddingTop:
                   // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
@@ -96,18 +96,18 @@ export default function Image(props) {
 
         {!props.fitContent && props.children ? (
           <>
-            <div className="div-d6cf1f9c-2">{props.children}</div>
+            <div className="div-5aa89e3a-2">{props.children}</div>
           </>
         ) : null}
       </>
-      <style>{`.img-d6cf1f9c {
+      <style>{`.img-5aa89e3a {
 opacity: 1;
 transition: opacity 0.2s ease-in-out;
-}.div-d6cf1f9c {
+}.div-5aa89e3a {
 width: 100%;
 pointer-events: none;
 font-size: 0;
-}.div-d6cf1f9c-2 {
+}.div-5aa89e3a-2 {
 display: flex;
 flex-direction: column;
 align-items: stretch;

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

@@ -37,10 +37,29 @@ export default function RenderBlock(props) {
             shouldEvaluateBindings: true,
           });
     },
+    get 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;
+    },
     get actions() {
       return getBlockActions({
         block: state.useBlock,
-        state: props.context.state,
+        state: state.proxyState,
         context: props.context.context,
       });
     },
@@ -117,6 +136,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/rsc/src/components/render-block/render-repeated-block.jsx

@@ -8,6 +8,7 @@ export default function RenderRepeatedBlock(props) {
   _context.BuilderContext = {
     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/rsc/src/components/render-blocks.jsx

@@ -46,7 +46,7 @@ export default function RenderBlocks(props) {
   return (
     <>
       <div
-        className={state.className + " div-4f307ff9"}
+        className={state.className + " div-d19f7a9a"}
         builder-path={props.path}
         builder-parent-id={props.parent}
         dataSet={{
@@ -80,7 +80,7 @@ export default function RenderBlocks(props) {
           </>
         ) : null}
       </div>
-      <style>{`.div-4f307ff9 {
+      <style>{`.div-d19f7a9a {
 display: flex;
 flex-direction: column;
 align-items: stretch;

package/packages/rsc/src/components/render-content/builder-editing.jsx

@@ -1,7 +1,64 @@
-import * as React from "react";
+import React, { useEffect } from 'react';
+import { setupBrowserForEditing } from '../../scripts/init-editing.js';
+// import type { RegisteredComponent } from '../../context/types.js';
+// import type { BuilderContent } from '../../types/builder-content.js';
 
-export default function BuilderEditing(props) {
-  const _context = { ...props["_context"] };
+/**
+ * @typedef {object} RegisteredComponent
+ * @typedef {object} BuilderContent
+ * @typedef {(data: {data: object, key: string }) => void} OnUpdateCallback
+ * @typedef {{
+ *   model: string,
+ *   components?: RegisteredComponent[],
+ *   children: any,
+ *   onUpdate?: OnUpdateCallback,
+ * }} BuilderEditingProps
+ */
 
-  return <div />;
+/**
+ * @param {BuilderEditingProps} props
+ */
+export function BuilderEditingWrapper(props) {
+  useEffect(() => {
+    setupBrowserForEditing();
+
+    if (props.components) {
+      for (const component of props.components) {
+        window.parent.postMessage(
+          {
+            type: 'builder.registerComponent',
+            data: component,
+          },
+          '*'
+        );
+      }
+    }
+
+    /**
+     *
+     * @param {MessageEvent} e
+     */
+    function onMessage(e) {
+      switch (e.data?.type) {
+        case 'builder.contentUpdate': {
+          props.onUpdate?.(e.data.data);
+        }
+      }
+    }
+
+    addEventListener('message', onMessage);
+
+    return () => window.removeEventListener('message', onMessage);
+  }, [props.model]);
+  return (
+    <div
+      onMouseDown={(e) => e.preventDefault()}
+      onClickCapture={(e) => {
+        e.stopPropagation();
+        e.preventDefault();
+      }}
+    >
+      {props.children}
+    </div>
+  );
 }

package/packages/rsc/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/rsc/src/components/render-content/components/render-styles.jsx

@@ -1,67 +1,21 @@
 import * as React 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) {
   const _context = { ...props["_context"] };
 
   const state = {
-    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;
-    },
-    getFontCss({ customFonts }) {
-      // TODO: flag for this
-      // if (!this.builder.allowCustomFonts) {
-      //   return '';
-      // }
-      // TODO: separate internal data from external
-      return (
-        customFonts?.map((font) => this.getCssFromFont(font))?.join(" ") || ""
-      );
-    },
-    get injectedStyles() {
-      return `
-${props.cssCode || ""}
-${state.getFontCss({
+    injectedStyles: `
+${getCss({
+  cssCode: props.cssCode,
+  contentId: props.contentId,
+})}
+${getFontCss({
   customFonts: props.customFonts,
-})}`;
-    },
+})}
+`,
   };
 
   return (

package/packages/rsc/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/rsc/src/components/render-content/render-content.jsx

@@ -21,6 +21,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 _context = { ...props["_context"] };
@@ -28,45 +32,46 @@ export default function RenderContent(props) {
   const state = {
     forceReRenderCount: 0,
     overrideContent: null,
-    get useContent() {
-      if (!props.content && !state.overrideContent) {
-        return undefined;
-      }
-      return {
-        ...props.content,
-        ...state.overrideContent,
+    useContent: getContentInitialValue({
+      content: props.content,
+      data: props.data,
+    }),
+    mergeNewContent(newContent) {
+      state.useContent = {
+        ...state.useContent,
+        ...newContent,
         data: {
-          ...props.content?.data,
-          ...props.data,
-          ...state.overrideContent?.data,
+          ...state.useContent?.data,
+          ...newContent?.data,
         },
         meta: {
-          ...props.content?.meta,
-          ...state.overrideContent?.meta,
+          ...state.useContent?.meta,
+          ...newContent?.meta,
           breakpoints:
-            state.useBreakpoints ||
-            state.overrideContent?.meta?.breakpoints ||
-            props.content?.meta?.breakpoints,
+            newContent?.meta?.breakpoints ||
+            state.useContent?.meta?.breakpoints,
+        },
+      };
+    },
+    setBreakpoints(breakpoints) {
+      state.useContent = {
+        ...state.useContent,
+        meta: {
+          ...state.useContent?.meta,
+          breakpoints,
         },
       };
     },
     update: 0,
-    useBreakpoints: null,
     canTrackToUse: checkIsDefined(props.canTrack) ? props.canTrack : true,
-    overrideState: {},
-    get contentState() {
-      return {
-        ...props.content?.data?.state,
-        ...props.data,
-        ...(props.locale
-          ? {
-              locale: props.locale,
-            }
-          : {}),
-        ...state.overrideState,
-      };
+    contentState: getContextStateInitialValue({
+      content: props.content,
+      data: props.data,
+      locale: props.locale,
+    }),
+    setContextState(newState) {
+      state.contentState = newState;
     },
-    contextContext: props.context || {},
     allRegisteredComponents: [
       ...getDefaultRegisteredComponents(),
       // While this `components` object is deprecated, we must maintain support for it.
@@ -93,7 +98,9 @@ export default function RenderContent(props) {
             if (!contentId || contentId !== state.useContent?.id) {
               return;
             }
-            state.useBreakpoints = breakpoints;
+            if (breakpoints) {
+              state.setBreakpoints(breakpoints);
+            }
             state.forceReRenderCount = state.forceReRenderCount + 1; // This is a hack to force Qwik to re-render.
             break;
           }
@@ -106,7 +113,7 @@ export default function RenderContent(props) {
               messageContent.modelName;
             const contentData = messageContent.data;
             if (key === props.model) {
-              state.overrideContent = contentData;
+              state.mergeNewContent(contentData);
               state.forceReRenderCount = state.forceReRenderCount + 1; // This is a hack to force Qwik to re-render.
             }
 
@@ -125,7 +132,7 @@ export default function RenderContent(props) {
       if (jsCode) {
         evaluate({
           code: jsCode,
-          context: state.contextContext,
+          context: props.context || {},
           state: state.contentState,
         });
       }
@@ -154,7 +161,7 @@ export default function RenderContent(props) {
       return expression.replace(/{{([^}]+)}}/g, (_match, group) =>
         evaluate({
           code: group,
-          context: state.contextContext,
+          context: props.context || {},
           state: state.contentState,
         })
       );
@@ -163,11 +170,11 @@ export default function RenderContent(props) {
       fetch(url)
         .then((response) => response.json())
         .then((json) => {
-          const newOverrideState = {
-            ...state.overrideState,
+          const newState = {
+            ...state.contentState,
             [key]: json,
           };
-          state.overrideState = newOverrideState;
+          state.setContextState(newState);
         })
         .catch((err) => {
           console.log("error fetching dynamic data", url, err);
@@ -211,7 +218,8 @@ export default function RenderContent(props) {
   _context.builderContext = {
     content: state.useContent,
     state: state.contentState,
-    context: state.contextContext,
+    setState: state.setContextState,
+    context: props.context || {},
     apiKey: props.apiKey,
     registeredComponents: state.allRegisteredComponents,
   };
@@ -226,6 +234,7 @@ export default function RenderContent(props) {
           >
             {state.shouldRenderContentStyles ? (
               <RenderContentStyles
+                contentId={state.useContent?.id}
                 cssCode={state.useContent?.data?.cssCode}
                 customFonts={state.useContent?.data?.customFonts}
                 _context={_context}

package/packages/rsc/src/constants/builder-registered-components.js

@@ -37,17 +37,17 @@ import { componentInfo as imgComponentInfo } from "../blocks/img/component-info.
 import { default as customCode } from "../blocks/custom-code/custom-code";
 import { componentInfo as customCodeInfo } from "../blocks/custom-code/component-info.js";
 const getDefaultRegisteredComponents = () => [
+  __spreadValues({ component: Button }, buttonComponentInfo),
   __spreadValues({ component: Columns }, columnsComponentInfo),
+  __spreadValues({ component: customCode }, customCodeInfo),
+  __spreadValues({ component: embed }, embedComponentInfo),
+  __spreadValues({ component: Fragment }, fragmentComponentInfo),
   __spreadValues({ component: Image }, imageComponentInfo),
   __spreadValues({ component: Img }, imgComponentInfo),
-  __spreadValues({ component: Text }, textComponentInfo),
-  __spreadValues({ component: Video }, videoComponentInfo),
-  __spreadValues({ component: Symbol }, symbolComponentInfo),
-  __spreadValues({ component: Button }, buttonComponentInfo),
   __spreadValues({ component: Section }, sectionComponentInfo),
-  __spreadValues({ component: Fragment }, fragmentComponentInfo),
-  __spreadValues({ component: embed }, embedComponentInfo),
-  __spreadValues({ component: customCode }, customCodeInfo)
+  __spreadValues({ component: Symbol }, symbolComponentInfo),
+  __spreadValues({ component: Text }, textComponentInfo),
+  __spreadValues({ component: Video }, videoComponentInfo)
 ];
 export {
   getDefaultRegisteredComponents

package/packages/rsc/src/context/builder.context.js

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

package/packages/rsc/src/index-helpers/blocks-exports.js

@@ -1,22 +1,22 @@
-import { default as default2 } from "../blocks/columns/columns";
-import { default as default3 } from "../blocks/image/image";
-import { default as default4 } from "../blocks/text/text";
-import { default as default5 } from "../blocks/video/video";
-import { default as default6 } from "../blocks/symbol/symbol";
-import { default as default7 } from "../blocks/button/button";
+import { default as default2 } from "../blocks/button/button";
+import { default as default3 } from "../blocks/columns/columns";
+import { default as default4 } from "../blocks/fragment/fragment";
+import { default as default5 } from "../blocks/image/image";
+import { default as default6 } from "../components/render-blocks";
+import { default as default7 } from "../components/render-content/render-content";
 import { default as default8 } from "../blocks/section/section";
-import { default as default9 } from "../blocks/fragment/fragment";
-import { default as default10 } from "../components/render-content/render-content";
-import { default as default11 } from "../components/render-blocks";
+import { default as default9 } from "../blocks/symbol/symbol";
+import { default as default10 } from "../blocks/text/text";
+import { default as default11 } from "../blocks/video/video";
 export {
-  default7 as Button,
-  default2 as Columns,
-  default9 as Fragment,
-  default3 as Image,
-  default11 as RenderBlocks,
-  default10 as RenderContent,
+  default2 as Button,
+  default3 as Columns,
+  default4 as Fragment,
+  default5 as Image,
+  default6 as RenderBlocks,
+  default7 as RenderContent,
   default8 as Section,
-  default6 as Symbol,
-  default4 as Text,
-  default5 as Video
+  default9 as Symbol,
+  default10 as Text,
+  default11 as Video
 };

package/packages/_rsc/src/blocks/BaseText.jsx

@@ -1,10 +0,0 @@
-import * as React from "react";
-import BuilderContext from "../context/builder.context.js";
-
-export default function BaseText(props) {
-  const _context = { ...props["_context"] };
-
-  const builderContext = _context["BuilderContext"];
-
-  return <span style={builderContext.inheritedStyles}>{props.text}</span>;
-}