@builder.io/sdk-solid 0.12.0 → 0.12.2

package/dist/index.d.ts

@@ -635,6 +635,10 @@ interface ContentVariantsPrps {
      * Additonal props to pass to `blocksWrapper`. Defaults to `{}`.
      */
     blocksWrapperProps?: any;
+    /**
+     * List of hosts to allow editing content from.
+     */
+    trustedHosts?: string[];
 }
 
 type VariantsProviderProps = ContentVariantsPrps & {

package/lib/browser/dev.js

@@ -1,4 +1,4 @@
-import { createComponent, spread, mergeProps, insert, effect, setAttribute, className, style, template, memo, Dynamic, use } from 'solid-js/web';
+import { createComponent, spread, mergeProps, insert, effect, setAttribute, className, style, template, Dynamic, memo, use } from 'solid-js/web';
 import { createContext, Show, useContext, For, createSignal, onMount, createEffect, on } from 'solid-js';
 import { css } from 'solid-styled-components';
 
@@ -333,10 +333,6 @@ function getProcessedBlock({
 }
 
 // src/components/block/block.helpers.ts
-var EMPTY_HTML_ELEMENTS = ["area", "base", "br", "col", "embed", "hr", "img", "input", "keygen", "link", "meta", "param", "source", "track", "wbr"];
-var isEmptyHtmlElement = (tagName) => {
-  return typeof tagName === "string" && EMPTY_HTML_ELEMENTS.includes(tagName.toLowerCase());
-};
 var getComponent = ({
   block,
   context,
@@ -658,48 +654,80 @@ function getStyleAttribute(style) {
   }
 }
 
-// src/components/block/components/block-wrapper.tsx
-function BlockWrapper(props) {
+// src/components/dynamic-renderer/dynamic-renderer.helpers.ts
+var EMPTY_HTML_ELEMENTS = /* @__PURE__ */ new Set(["area", "base", "br", "col", "embed", "hr", "img", "input", "keygen", "link", "meta", "param", "source", "track", "wbr"]);
+var isEmptyElement = (tagName) => {
+  return typeof tagName === "string" && EMPTY_HTML_ELEMENTS.has(tagName.toLowerCase());
+};
+
+// src/components/dynamic-renderer/dynamic-renderer.tsx
+function DynamicRenderer(props) {
   return createComponent(Show, {
     get fallback() {
-      return createComponent(Dynamic, mergeProps(() => getBlockProperties({
-        block: props.block,
-        context: props.context
-      }), () => getBlockActions({
-        block: props.block,
-        rootState: props.context.rootState,
-        rootSetState: props.context.rootSetState,
-        localState: props.context.localState,
-        context: props.context.context,
-        stripPrefix: true
-      }), {
+      return createComponent(Dynamic, mergeProps(() => props.attributes, () => props.actionAttributes, {
         get component() {
-          return props.Wrapper;
+          return props.TagName;
         }
       }));
     },
     get when() {
-      return props.hasChildren;
+      return !isEmptyElement(props.TagName);
     },
     get children() {
-      return createComponent(Dynamic, mergeProps(() => getBlockProperties({
+      return createComponent(Show, {
+        get fallback() {
+          return createComponent(Dynamic, mergeProps(() => props.attributes, () => props.actionAttributes, {
+            get component() {
+              return props.TagName;
+            },
+            get children() {
+              return props.children;
+            }
+          }));
+        },
+        get when() {
+          return typeof props.TagName === "string";
+        },
+        get children() {
+          return createComponent(Dynamic, mergeProps(() => props.attributes, () => props.actionAttributes, {
+            get component() {
+              return props.TagName;
+            },
+            get children() {
+              return props.children;
+            }
+          }));
+        }
+      });
+    }
+  });
+}
+var dynamic_renderer_default = DynamicRenderer;
+
+// src/components/block/components/block-wrapper.tsx
+function BlockWrapper(props) {
+  return createComponent(dynamic_renderer_default, {
+    get TagName() {
+      return props.Wrapper;
+    },
+    get attributes() {
+      return getBlockProperties({
         block: props.block,
         context: props.context
-      }), () => getBlockActions({
+      });
+    },
+    get actionAttributes() {
+      return getBlockActions({
         block: props.block,
         rootState: props.context.rootState,
         rootSetState: props.context.rootSetState,
         localState: props.context.localState,
         context: props.context.context,
         stripPrefix: true
-      }), {
-        get component() {
-          return props.Wrapper;
-        },
-        get children() {
-          return props.children;
-        }
-      }));
+      });
+    },
+    get children() {
+      return props.children;
     }
   });
 }
@@ -940,29 +968,8 @@ function Block(props) {
           return !blockComponent()?.noWrap;
         },
         get children() {
-          return [createComponent(Show, {
-            get when() {
-              return isEmptyHtmlElement(Tag());
-            },
-            get children() {
-              return createComponent(block_wrapper_default, {
-                get Wrapper() {
-                  return Tag();
-                },
-                get block() {
-                  return processedBlock();
-                },
-                get context() {
-                  return props.context;
-                },
-                hasChildren: false
-              });
-            }
-          }), createComponent(Show, {
-            get when() {
-              return memo(() => !!!isEmptyHtmlElement(Tag()))() && repeatItem();
-            },
-            get children() {
+          return createComponent(Show, {
+            get fallback() {
               return createComponent(For, {
                 get each() {
                   return repeatItem();
@@ -983,10 +990,9 @@ function Block(props) {
                   });
                 }
               });
-            }
-          }), createComponent(Show, {
+            },
             get when() {
-              return memo(() => !!!isEmptyHtmlElement(Tag()))() && !repeatItem();
+              return !repeatItem();
             },
             get children() {
               return createComponent(block_wrapper_default, {
@@ -999,7 +1005,6 @@ function Block(props) {
                 get context() {
                   return props.context;
                 },
-                hasChildren: true,
                 get children() {
                   return [createComponent(component_ref_default, {
                     get componentRef() {
@@ -1049,7 +1054,7 @@ function Block(props) {
                 }
               });
             }
-          })];
+          });
         }
       })];
     }
@@ -2375,8 +2380,50 @@ var componentInfo8 = {
   }]
 };
 
-// src/blocks/symbol/component-info.ts
+// src/blocks/slot/component-info.ts
 var componentInfo9 = {
+  name: "Slot",
+  isRSC: true,
+  description: "Allow child blocks to be inserted into this content when used as a Symbol",
+  docsLink: "https://www.builder.io/c/docs/symbols-with-blocks",
+  image: "https://cdn.builder.io/api/v1/image/assets%2FYJIGb4i01jvw0SRdL5Bt%2F3aad6de36eae43b59b52c85190fdef56",
+  // Maybe wrap this for canHaveChildren so bind children to this hm
+  inputs: [{
+    name: "name",
+    type: "string",
+    required: true,
+    defaultValue: "children"
+  }]
+};
+var _tmpl$11 = /* @__PURE__ */ template(`<div>`);
+function Slot(props) {
+  return (() => {
+    const _el$ = _tmpl$11();
+    _el$.style.setProperty("pointer-events", "auto");
+    spread(_el$, mergeProps(() => !props.builderContext.context?.symbolId && {
+      "builder-slot": props.name
+    }), false, true);
+    insert(_el$, createComponent(blocks_default, {
+      get parent() {
+        return props.builderContext.context?.symbolId;
+      },
+      get path() {
+        return `symbol.data.${props.name}`;
+      },
+      get context() {
+        return props.builderContext;
+      },
+      get blocks() {
+        return props.builderContext.rootState?.[props.name];
+      }
+    }));
+    return _el$;
+  })();
+}
+var slot_default = Slot;
+
+// src/blocks/symbol/component-info.ts
+var componentInfo10 = {
   name: "Symbol",
   noWrap: true,
   static: true,
@@ -2412,7 +2459,7 @@ var componentInfo9 = {
 };
 
 // src/blocks/text/component-info.ts
-var componentInfo10 = {
+var componentInfo11 = {
   name: "Text",
   static: true,
   isRSC: true,
@@ -2431,10 +2478,10 @@ var componentInfo10 = {
     textAlign: "center"
   }
 };
-var _tmpl$11 = /* @__PURE__ */ template(`<div class=builder-text>`);
+var _tmpl$12 = /* @__PURE__ */ template(`<div class=builder-text>`);
 function Text(props) {
   return (() => {
-    const _el$ = _tmpl$11();
+    const _el$ = _tmpl$12();
     _el$.style.setProperty("outline", "none");
     effect(() => _el$.innerHTML = props.text?.toString() || "");
     return _el$;
@@ -2443,7 +2490,7 @@ function Text(props) {
 var text_default = Text;
 
 // src/blocks/video/component-info.ts
-var componentInfo11 = {
+var componentInfo12 = {
   name: "Video",
   canHaveChildren: true,
   defaultStyles: {
@@ -2525,7 +2572,7 @@ var componentInfo11 = {
     advanced: true
   }]
 };
-var _tmpl$12 = /* @__PURE__ */ template(`<source type=video/mp4>`);
+var _tmpl$13 = /* @__PURE__ */ template(`<source type=video/mp4>`);
 var _tmpl$23 = /* @__PURE__ */ template(`<div>`);
 var _tmpl$33 = /* @__PURE__ */ template(`<div><video class=builder-video>`);
 function Video(props) {
@@ -2588,7 +2635,7 @@ function Video(props) {
         return !props.lazyLoad;
       },
       get children() {
-        const _el$3 = _tmpl$12();
+        const _el$3 = _tmpl$13();
         effect(() => setAttribute(_el$3, "src", props.video));
         return _el$3;
       }
@@ -2670,13 +2717,16 @@ var getDefaultRegisteredComponents = () => [{
   ...componentInfo8
 }, {
   component: symbol_default,
-  ...componentInfo9
+  ...componentInfo10
 }, {
   component: text_default,
-  ...componentInfo10
+  ...componentInfo11
 }, {
   component: video_default,
-  ...componentInfo11
+  ...componentInfo12
+}, {
+  component: slot_default,
+  ...componentInfo9
 }];
 
 // src/functions/register-component.ts
@@ -2747,10 +2797,10 @@ var getUpdateVariantVisibilityScript = ({
 }) => `window.${UPDATE_VARIANT_VISIBILITY_SCRIPT_FN_NAME}(
     "${variationId}", "${contentId}", ${isHydrationTarget}
   )`;
-var _tmpl$13 = /* @__PURE__ */ template(`<script>`);
+var _tmpl$14 = /* @__PURE__ */ template(`<script>`);
 function InlinedScript(props) {
   return (() => {
-    const _el$ = _tmpl$13();
+    const _el$ = _tmpl$14();
     effect((_p$) => {
       const _v$ = props.scriptStr, _v$2 = props.id || "";
       _v$ !== _p$._v$ && (_el$.innerHTML = _p$._v$ = _v$);
@@ -2999,6 +3049,13 @@ async function fetchEntries(options) {
 }
 var getAllContent = fetchEntries;
 
+// src/functions/is-from-trusted-host.ts
+var DEFAULT_TRUSTED_HOSTS = ["*.beta.builder.io", "beta.builder.io", "builder.io", "localhost", "qa.builder.io"];
+function isFromTrustedHost(trustedHosts, e) {
+  const url = new URL(e.origin), hostname = url.hostname;
+  return (trustedHosts || DEFAULT_TRUSTED_HOSTS).findIndex((trustedHost) => trustedHost.startsWith("*.") ? hostname.endsWith(trustedHost.slice(1)) : trustedHost === hostname) > -1;
+}
+
 // src/functions/is-previewing.ts
 function isPreviewing() {
   if (!isBrowser()) {
@@ -3250,7 +3307,7 @@ var getInteractionPropertiesForEvent = (event) => {
 };
 
 // src/constants/sdk-version.ts
-var SDK_VERSION = "0.12.0";
+var SDK_VERSION = "0.12.2";
 
 // src/functions/register.ts
 var registry = {};
@@ -3328,9 +3385,13 @@ var setupBrowserForEditing = (options = {}) => {
         options
       }
     }, "*");
-    window.addEventListener("message", ({
-      data
-    }) => {
+    window.addEventListener("message", (event) => {
+      if (!isFromTrustedHost(options.trustedHosts, event)) {
+        return;
+      }
+      const {
+        data
+      } = event;
       if (!data?.type) {
         return;
       }
@@ -3426,6 +3487,9 @@ function EnableEditor(props) {
     }));
   }
   function processMessage(event) {
+    if (!isFromTrustedHost(props.trustedHosts, event)) {
+      return;
+    }
     const {
       data
     } = event;
@@ -3557,6 +3621,9 @@ function EnableEditor(props) {
           } : {},
           ...props.enrich ? {
             enrich: props.enrich
+          } : {},
+          ...props.trustedHosts ? {
+            trustedHosts: props.trustedHosts
           } : {}
         });
         Object.values(props.builderContextSignal.componentInfos).forEach((registeredComponent) => {
@@ -3924,6 +3991,9 @@ function ContentComponent(props) {
         },
         get contentWrapperProps() {
           return props.contentWrapperProps;
+        },
+        get trustedHosts() {
+          return props.trustedHosts;
         }
       }, {
         setBuilderContextSignal
@@ -4083,6 +4153,9 @@ function ContentVariants(props) {
             },
             get contentWrapperProps() {
               return props.contentWrapperProps;
+            },
+            get trustedHosts() {
+              return props.trustedHosts;
             }
           });
         }
@@ -4137,6 +4210,9 @@ function ContentVariants(props) {
     },
     get contentWrapperProps() {
       return props.contentWrapperProps;
+    },
+    get trustedHosts() {
+      return props.trustedHosts;
     }
   }))];
 }
@@ -4167,7 +4243,7 @@ var fetchSymbolContent = async ({
 };
 
 // src/blocks/symbol/symbol.tsx
-var _tmpl$14 = /* @__PURE__ */ template(`<div>`);
+var _tmpl$15 = /* @__PURE__ */ template(`<div>`);
 function Symbol(props) {
   const [contentToUse, setContentToUse] = createSignal(props.symbol?.content);
   function className() {
@@ -4193,7 +4269,7 @@ function Symbol(props) {
   }
   createEffect(on(() => [props.symbol], onUpdateFn_0));
   return (() => {
-    const _el$ = _tmpl$14();
+    const _el$ = _tmpl$15();
     spread(_el$, mergeProps({
       get ["class"]() {
         return className();
@@ -4208,7 +4284,10 @@ function Symbol(props) {
         return props.builderContext.apiKey;
       },
       get context() {
-        return props.builderContext.context;
+        return {
+          ...props.builderContext.context,
+          symbolId: props.builderBlock?.id
+        };
       },
       get customComponents() {
         return Object.values(props.builderComponents);