@builder.io/sdk-react 0.2.1 → 0.2.2

package/packages/react/src/blocks/symbol/symbol.jsx

@@ -4,6 +4,7 @@ import RenderContent from "../../components/render-content/render-content";
 import BuilderContext from "../../context/builder.context.js";
 import { getContent } from "../../functions/get-content/index.js";
 import { TARGET } from "../../constants/target";
+import { logger } from "../../helpers/logger";
 
 function Symbol(props) {
   const [className, setClassName] = useState(() =>
@@ -53,7 +54,7 @@ function Symbol(props) {
           }
         })
         .catch((err) => {
-          console.error("[Builder.io]: Could not fetch symbol content: ", err);
+          logger.error("Could not fetch symbol content: ", err);
         });
     }
   }

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

@@ -16,7 +16,6 @@ import { TARGET } from "../../constants/target.js";
 import { extractTextStyles } from "../../functions/extract-text-styles.js";
 import RenderComponent from "./render-component";
 import { getReactNativeBlockStyles } from "../../functions/get-react-native-block-styles.js";
-import { checkIsDefined } from "../../helpers/nullable.js";
 
 function RenderBlock(props) {
   const [component, setComponent] = useState(() =>
@@ -47,10 +46,10 @@ function RenderBlock(props) {
   const [tag, setTag] = useState(() => props.block.tagName || "div");
 
   function canShowBlock() {
-    if (checkIsDefined(useBlock().hide)) {
+    if ("hide" in useBlock()) {
       return !useBlock().hide;
     }
-    if (checkIsDefined(useBlock().show)) {
+    if ("show" in useBlock()) {
       return useBlock().show;
     }
     return true;

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

@@ -26,6 +26,7 @@ import {
   getContextStateInitialValue,
 } from "./render-content.helpers.js";
 import { TARGET } from "../../constants/target.js";
+import { logger } from "../../helpers/logger.js";
 
 function RenderContent(props) {
   const elementRef = useRef(null);
@@ -233,8 +234,8 @@ function RenderContent(props) {
 
   useEffect(() => {
     if (!props.apiKey) {
-      console.error(
-        "[Builder.io]: No API key provided to `RenderContent` component. This can cause issues. Please provide an API key using the `apiKey` prop."
+      logger.error(
+        "No API key provided to `RenderContent` component. This can cause issues. Please provide an API key using the `apiKey` prop."
       );
     }
     if (isBrowser()) {
@@ -280,22 +281,24 @@ function RenderContent(props) {
       // override normal content in preview mode
       if (isPreviewing()) {
         const searchParams = new URL(location.href).searchParams;
-        const searchParamPreview = searchParams.get("builder.preview");
+        const searchParamPreviewModel = searchParams.get("builder.preview");
+        const searchParamPreviewId = searchParams.get(
+          `builder.preview.${searchParamPreviewModel}`
+        );
         const previewApiKey =
           searchParams.get("apiKey") || searchParams.get("builder.space");
 
         /**
          * Make sure that:
          * - the preview model name is the same as the one we're rendering, since there can be multiple models rendered  *  at the same time, e.g. header/page/footer.  * - the API key is the same, since we don't want to preview content from other organizations.
-         *
-         * TO-DO: should we check that the preview item ID is the same as the initial one being rendered? Or would
-         * this break scenarios where the item is not published yet?
+         * - if there is content, that the preview ID is the same as that of the one we receive.
          *
          * TO-DO: should we only update the state when there is a change?
          **/
         if (
-          searchParamPreview === props.model &&
-          previewApiKey === props.apiKey
+          searchParamPreviewModel === props.model &&
+          previewApiKey === props.apiKey &&
+          (!props.content || searchParamPreviewId === props.content.id)
         ) {
           getContent({
             model: props.model,

package/packages/react/src/functions/get-block-properties.js

@@ -20,9 +20,12 @@ var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 import { TARGET } from "../constants/target.js";
 import { convertStyleMapToCSSArray } from "../helpers/css.js";
 import { transformBlockProperties } from "./transform-block-properties.js";
+const extractRelevantRootBlockProperties = (block) => {
+  return { href: block.href };
+};
 function getBlockProperties(block) {
   var _a;
-  const properties = __spreadProps(__spreadValues({}, block.properties), {
+  const properties = __spreadProps(__spreadValues(__spreadValues({}, extractRelevantRootBlockProperties(block)), block.properties), {
     "builder-id": block.id,
     style: getStyleAttribute(block.style),
     class: [block.id, "builder-block", block.class, (_a = block.properties) == null ? void 0 : _a.class].filter(Boolean).join(" ")

package/packages/react/src/functions/get-content/index.js

@@ -37,13 +37,14 @@ var __async = (__this, __arguments, generator) => {
     step((generator = generator.apply(__this, __arguments)).next());
   });
 };
+import { logger } from "../../helpers/logger.js";
 import { fetch } from "../get-fetch.js";
 import { handleABTesting } from "./ab-testing.js";
 import { generateContentUrl } from "./generate-content-url.js";
 function getContent(options) {
   return __async(this, null, function* () {
     const allContent = yield getAllContent(__spreadProps(__spreadValues({}, options), { limit: 1 }));
-    if ("results" in allContent) {
+    if (allContent && "results" in allContent) {
       return (allContent == null ? void 0 : allContent.results[0]) || null;
     }
     return null;
@@ -51,24 +52,29 @@ function getContent(options) {
 }
 function getAllContent(options) {
   return __async(this, null, function* () {
-    const url = generateContentUrl(options);
-    const res = yield fetch(url.href);
-    const content = yield res.json();
-    if ("status" in content && !("results" in content)) {
-      console.error("[Builder.io]: Error fetching data. ", content, options);
-      return content;
-    }
-    const canTrack = options.canTrack !== false;
     try {
-      if (canTrack && Array.isArray(content.results)) {
-        for (const item of content.results) {
-          yield handleABTesting({ item, canTrack });
+      const url = generateContentUrl(options);
+      const res = yield fetch(url.href);
+      const content = yield res.json();
+      if ("status" in content && !("results" in content)) {
+        logger.error("Error fetching data. ", content, options);
+        return content;
+      }
+      const canTrack = options.canTrack !== false;
+      try {
+        if (canTrack && Array.isArray(content.results)) {
+          for (const item of content.results) {
+            yield handleABTesting({ item, canTrack });
+          }
         }
+      } catch (e) {
+        logger.error("Could not setup A/B testing. ", e);
       }
-    } catch (e) {
-      console.error("[Builder.io]: Could not setup A/B testing. ", e);
+      return content;
+    } catch (error) {
+      logger.error("Error fetching data. ", error);
+      return null;
     }
-    return content;
   });
 }
 export {

package/packages/react/src/functions/track/index.js

@@ -50,6 +50,7 @@ var __async = (__this, __arguments, generator) => {
   });
 };
 import { TARGET } from "../../constants/target.js";
+import { logger } from "../../helpers/logger.js";
 import { getSessionId } from "../../helpers/sessionId.js";
 import { getVisitorId } from "../../helpers/visitorId.js";
 import { isBrowser } from "../is-browser.js";
@@ -95,7 +96,7 @@ const createEvent = (_a) => __async(void 0, null, function* () {
 function _track(eventProps) {
   return __async(this, null, function* () {
     if (!eventProps.apiKey) {
-      console.error("[Builder.io]: Missing API key for track call. Please provide your API key.");
+      logger.error("Missing API key for track call. Please provide your API key.");
       return;
     }
     if (!eventProps.canTrack) {

package/packages/react/src/helpers/logger.js

@@ -0,0 +1,9 @@
+const MSG_PREFIX = "[Builder.io]: ";
+const logger = {
+  log: (...message) => console.log(MSG_PREFIX, ...message),
+  error: (...message) => console.error(MSG_PREFIX, ...message),
+  warn: (...message) => console.warn(MSG_PREFIX, ...message)
+};
+export {
+  logger
+};

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

@@ -3,6 +3,7 @@ import RenderContent from "../../components/render-content/render-content";
 import BuilderContext from "../../context/builder.context.js";
 import { getContent } from "../../functions/get-content/index.js";
 import { TARGET } from "../../constants/target";
+import { logger } from "../../helpers/logger";
 
 function Symbol(props) {
   const _context = { ...props["_context"] };
@@ -51,10 +52,7 @@ function Symbol(props) {
             }
           })
           .catch((err) => {
-            console.error(
-              "[Builder.io]: Could not fetch symbol content: ",
-              err
-            );
+            logger.error("Could not fetch symbol content: ", err);
           });
       }
     },

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

@@ -15,7 +15,6 @@ import { TARGET } from "../../constants/target.js";
 import { extractTextStyles } from "../../functions/extract-text-styles.js";
 import RenderComponent from "./render-component";
 import { getReactNativeBlockStyles } from "../../functions/get-react-native-block-styles.js";
-import { checkIsDefined } from "../../helpers/nullable.js";
 
 function RenderBlock(props) {
   const _context = { ...props["_context"] };
@@ -41,10 +40,10 @@ function RenderBlock(props) {
     },
     tag: props.block.tagName || "div",
     get canShowBlock() {
-      if (checkIsDefined(state.useBlock.hide)) {
+      if ("hide" in state.useBlock) {
         return !state.useBlock.hide;
       }
-      if (checkIsDefined(state.useBlock.show)) {
+      if ("show" in state.useBlock) {
         return state.useBlock.show;
       }
       return true;

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

@@ -25,6 +25,7 @@ import {
   getContextStateInitialValue,
 } from "./render-content.helpers.js";
 import { TARGET } from "../../constants/target.js";
+import { logger } from "../../helpers/logger.js";
 
 function RenderContent(props) {
   const _context = { ...props["_context"] };

package/packages/rsc/src/functions/get-block-properties.js

@@ -20,9 +20,12 @@ var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 import { TARGET } from "../constants/target.js";
 import { convertStyleMapToCSSArray } from "../helpers/css.js";
 import { transformBlockProperties } from "./transform-block-properties.js";
+const extractRelevantRootBlockProperties = (block) => {
+  return { href: block.href };
+};
 function getBlockProperties(block) {
   var _a;
-  const properties = __spreadProps(__spreadValues({}, block.properties), {
+  const properties = __spreadProps(__spreadValues(__spreadValues({}, extractRelevantRootBlockProperties(block)), block.properties), {
     "builder-id": block.id,
     style: getStyleAttribute(block.style),
     class: [block.id, "builder-block", block.class, (_a = block.properties) == null ? void 0 : _a.class].filter(Boolean).join(" ")

package/packages/rsc/src/functions/get-content/index.js

@@ -37,13 +37,14 @@ var __async = (__this, __arguments, generator) => {
     step((generator = generator.apply(__this, __arguments)).next());
   });
 };
+import { logger } from "../../helpers/logger.js";
 import { fetch } from "../get-fetch.js";
 import { handleABTesting } from "./ab-testing.js";
 import { generateContentUrl } from "./generate-content-url.js";
 function getContent(options) {
   return __async(this, null, function* () {
     const allContent = yield getAllContent(__spreadProps(__spreadValues({}, options), { limit: 1 }));
-    if ("results" in allContent) {
+    if (allContent && "results" in allContent) {
       return (allContent == null ? void 0 : allContent.results[0]) || null;
     }
     return null;
@@ -51,24 +52,29 @@ function getContent(options) {
 }
 function getAllContent(options) {
   return __async(this, null, function* () {
-    const url = generateContentUrl(options);
-    const res = yield fetch(url.href);
-    const content = yield res.json();
-    if ("status" in content && !("results" in content)) {
-      console.error("[Builder.io]: Error fetching data. ", content, options);
-      return content;
-    }
-    const canTrack = options.canTrack !== false;
     try {
-      if (canTrack && Array.isArray(content.results)) {
-        for (const item of content.results) {
-          yield handleABTesting({ item, canTrack });
+      const url = generateContentUrl(options);
+      const res = yield fetch(url.href);
+      const content = yield res.json();
+      if ("status" in content && !("results" in content)) {
+        logger.error("Error fetching data. ", content, options);
+        return content;
+      }
+      const canTrack = options.canTrack !== false;
+      try {
+        if (canTrack && Array.isArray(content.results)) {
+          for (const item of content.results) {
+            yield handleABTesting({ item, canTrack });
+          }
         }
+      } catch (e) {
+        logger.error("Could not setup A/B testing. ", e);
       }
-    } catch (e) {
-      console.error("[Builder.io]: Could not setup A/B testing. ", e);
+      return content;
+    } catch (error) {
+      logger.error("Error fetching data. ", error);
+      return null;
     }
-    return content;
   });
 }
 export {

package/packages/rsc/src/functions/track/index.js

@@ -50,6 +50,7 @@ var __async = (__this, __arguments, generator) => {
   });
 };
 import { TARGET } from "../../constants/target.js";
+import { logger } from "../../helpers/logger.js";
 import { getSessionId } from "../../helpers/sessionId.js";
 import { getVisitorId } from "../../helpers/visitorId.js";
 import { isBrowser } from "../is-browser.js";
@@ -95,7 +96,7 @@ const createEvent = (_a) => __async(void 0, null, function* () {
 function _track(eventProps) {
   return __async(this, null, function* () {
     if (!eventProps.apiKey) {
-      console.error("[Builder.io]: Missing API key for track call. Please provide your API key.");
+      logger.error("Missing API key for track call. Please provide your API key.");
       return;
     }
     if (!eventProps.canTrack) {

package/packages/rsc/src/helpers/logger.js

@@ -0,0 +1,9 @@
+const MSG_PREFIX = "[Builder.io]: ";
+const logger = {
+  log: (...message) => console.log(MSG_PREFIX, ...message),
+  error: (...message) => console.error(MSG_PREFIX, ...message),
+  warn: (...message) => console.warn(MSG_PREFIX, ...message)
+};
+export {
+  logger
+};

package/src/blocks/BaseText.jsx

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

package/src/blocks/button/button.jsx

@@ -1,27 +0,0 @@
-import * as React from "react";
-
-export default function Button(props) {
-  return (
-    <>
-      {props.link ? (
-        <>
-          <a
-            role="button"
-            {...props.attributes}
-            href={props.link}
-            target={props.openLinkInNewTab ? "_blank" : undefined}
-          >
-            {props.text}
-          </a>
-        </>
-      ) : (
-        <button className="button-7028b0a4" {...props.attributes}>
-          {props.text}
-        </button>
-      )}
-      <style>{`.button-7028b0a4 {
-all: unset;
-}`}</style>
-    </>
-  );
-}

package/src/blocks/button/component-info.js

@@ -1,41 +0,0 @@
-const componentInfo = {
-  name: "Core:Button",
-  builtIn: true,
-  image: "https://cdn.builder.io/api/v1/image/assets%2FIsxPKMo2gPRRKeakUztj1D6uqed2%2F81a15681c3e74df09677dfc57a615b13",
-  defaultStyles: {
-    appearance: "none",
-    paddingTop: "15px",
-    paddingBottom: "15px",
-    paddingLeft: "25px",
-    paddingRight: "25px",
-    backgroundColor: "#000000",
-    color: "white",
-    borderRadius: "4px",
-    textAlign: "center",
-    cursor: "pointer"
-  },
-  inputs: [
-    {
-      name: "text",
-      type: "text",
-      defaultValue: "Click me!",
-      bubble: true
-    },
-    {
-      name: "link",
-      type: "url",
-      bubble: true
-    },
-    {
-      name: "openLinkInNewTab",
-      type: "boolean",
-      defaultValue: false,
-      friendlyName: "Open link in new tab"
-    }
-  ],
-  static: true,
-  noWrap: true
-};
-export {
-  componentInfo
-};

package/src/blocks/columns/columns.jsx

@@ -1,172 +0,0 @@
-import * as React from "react";
-import RenderBlocks from "../../components/render-blocks.js";
-import { getSizesForBreakpoints } from "../../constants/device-sizes";
-import RenderInlinedStyles from "../../components/render-inlined-styles.js";
-import { TARGET } from "../../constants/target.js";
-import { convertStyleMapToCSS } from "../../helpers/css";
-
-export default function Columns(props) {
-  function getGutterSize() {
-    return typeof props.space === "number" ? props.space || 0 : 20;
-  }
-
-  function getColumns() {
-    return props.columns || [];
-  }
-
-  function getWidth(index) {
-    const columns = getColumns();
-    return columns[index]?.width || 100 / columns.length;
-  }
-
-  function getColumnCssWidth(index) {
-    const columns = getColumns();
-    const gutterSize = getGutterSize();
-    const subtractWidth = (gutterSize * (columns.length - 1)) / columns.length;
-    return `calc(${getWidth(index)}% - ${subtractWidth}px)`;
-  }
-
-  function maybeApplyForTablet(prop) {
-    const _stackColumnsAt = props.stackColumnsAt || "tablet";
-    return _stackColumnsAt === "tablet" ? prop : "inherit";
-  }
-
-  function columnsCssVars() {
-    const flexDir =
-      props.stackColumnsAt === "never"
-        ? "inherit"
-        : props.reverseColumnsWhenStacked
-        ? "column-reverse"
-        : "column";
-    return {
-      "--flex-dir": flexDir,
-      "--flex-dir-tablet": maybeApplyForTablet(flexDir),
-    };
-  }
-
-  function columnCssVars() {
-    const width = "100%";
-    const marginLeft = "0";
-    return {
-      "--column-width": width,
-      "--column-margin-left": marginLeft,
-      "--column-width-tablet": maybeApplyForTablet(width),
-      "--column-margin-left-tablet": maybeApplyForTablet(marginLeft),
-    };
-  }
-
-  function getWidthForBreakpointSize(size) {
-    const breakpointSizes = getSizesForBreakpoints(
-      props.customBreakpoints || {}
-    );
-    return breakpointSizes[size].max;
-  }
-
-  function columnStyleObjects() {
-    return {
-      columns: {
-        small: {
-          flexDirection: "var(--flex-dir)",
-          alignItems: "stretch",
-        },
-        medium: {
-          flexDirection: "var(--flex-dir-tablet)",
-          alignItems: "stretch",
-        },
-      },
-      column: {
-        small: {
-          width: "var(--column-width) !important",
-          marginLeft: "var(--column-margin-left) !important",
-        },
-        medium: {
-          width: "var(--column-width-tablet) !important",
-          marginLeft: "var(--column-margin-left-tablet) !important",
-        },
-      },
-    };
-  }
-
-  function columnsStyles() {
-    return `
-      @media (max-width: ${getWidthForBreakpointSize("medium")}px) {
-        .${props.builderBlock.id}-breakpoints {
-          ${convertStyleMapToCSS(columnStyleObjects().columns.medium)}
-        }
-
-        .${props.builderBlock.id}-breakpoints > .builder-column {
-          ${convertStyleMapToCSS(columnStyleObjects().column.medium)}
-        }
-      }
-
-      @media (max-width: ${getWidthForBreakpointSize("small")}px) {
-        .${props.builderBlock.id}-breakpoints {
-          ${convertStyleMapToCSS(columnStyleObjects().columns.small)}
-        }
-
-        .${props.builderBlock.id}-breakpoints > .builder-column {
-          ${convertStyleMapToCSS(columnStyleObjects().column.small)}
-        }
-      },
-    `;
-  }
-
-  function reactNativeColumnsStyles() {
-    return columnStyleObjects.columns.small;
-  }
-
-  function reactNativeColumnStyles() {
-    return columnStyleObjects.column.small;
-  }
-
-  return (
-    <>
-      <div
-        className={
-          `builder-columns ${props.builderBlock.id}-breakpoints` +
-          " div-bda7d4e0"
-        }
-        style={{
-          ...(TARGET === "reactNative" ? reactNativeColumnsStyles() : {}),
-          ...columnsCssVars(),
-        }}
-      >
-        {TARGET !== "reactNative" ? (
-          <>
-            <RenderInlinedStyles styles={columnsStyles()} />
-          </>
-        ) : null}
-
-        {props.columns?.map((column, index) => (
-          <div
-            className="builder-column div-bda7d4e0-2"
-            style={{
-              width: getColumnCssWidth(index),
-              marginLeft: `${index === 0 ? 0 : getGutterSize()}px`,
-              ...(TARGET === "reactNative" ? reactNativeColumnStyles() : {}),
-              ...columnCssVars(),
-            }}
-            key={index}
-          >
-            <RenderBlocks
-              blocks={column.blocks}
-              path={`component.options.columns.${index}.blocks`}
-              parent={props.builderBlock.id}
-              styleProp={{
-                flexGrow: "1",
-              }}
-            />
-          </div>
-        ))}
-      </div>
-      <style>{`.div-bda7d4e0 {
-display: flex;
-line-height: normal;
-}.div-bda7d4e0-2 {
-display: flex;
-flex-direction: column;
-align-items: stretch;
-}`}</style>
-    </>
-  );
-}