@builder.io/react 2.0.4-2 → 2.0.4-3

package/src/blocks/Section.tsx

@@ -40,18 +40,23 @@ class SectionComponent extends React.Component<SectionProps, { inView?: boolean
       if (typeof IntersectionObserver === 'undefined' || !this.ref) {
         this.setState({ inView: true });
       } else {
-        const observer = new IntersectionObserver((entries, observer) => {
-          entries.forEach(entry => {
-            if (entry.intersectionRatio > 0) {
-              this.setState({
-                inView: true,
-              });
-              if (this.ref) {
-                observer.unobserve(this.ref);
+        const observer = new IntersectionObserver(
+          (entries, observer) => {
+            entries.forEach(entry => {
+              if (entry.intersectionRatio > 0) {
+                this.setState({
+                  inView: true,
+                });
+                if (this.ref) {
+                  observer.unobserve(this.ref);
+                }
               }
-            }
-          });
-        });
+            });
+          },
+          {
+            rootMargin: '10px',
+          }
+        );
 
         observer.observe(this.ref);
 

package/src/blocks/Symbol.tsx

@@ -121,6 +121,8 @@ class SymbolComponent extends React.Component<SymbolProps> {
                 this.placeholder
               ) : (
                 <BuilderComponent
+                  // TODO: pass locale down?
+                  // {...state.state.locale && { locale: state.state.locale}}
                   isChild
                   ref={(ref: any) => (this.ref = ref)}
                   context={{ ...state.context, symbolId: this.props.builderBlock?.id }}

package/src/components/builder-block.component.tsx

@@ -251,10 +251,6 @@ export class BuilderBlock extends React.Component<
           eval('debugger');
         }
         for (const patch of patches) {
-          // TODO: soehow mark this.block as a new object,
-          // e.g. access it's parent hm. maybe do the listning mutations
-          // on hte parent element not the child (or rather
-          // send the message to the parent)
           applyPatchWithMinimalMutationChain(this.props.block, patch, true);
         }
         this.setState({ updates: this.state.updates + 1 });

package/src/components/builder-blocks.component.tsx

@@ -108,14 +108,16 @@ export class BuilderBlocks extends React.Component<BuilderBlocksProps, BuilderBl
         // TODO: only fi in iframe?
         builder-path={Builder.isIframe ? this.path : undefined}
         builder-parent-id={this.parentId}
-        css={{
-          ...(!this.props.emailMode && {
-            display: 'flex',
-            flexDirection: 'column',
-            alignItems: 'stretch',
-          }),
-          ...this.props.style,
-        } as any}
+        css={
+          {
+            ...(!this.props.emailMode && {
+              display: 'flex',
+              flexDirection: 'column',
+              alignItems: 'stretch',
+            }),
+            ...this.props.style,
+          } as any
+        }
         onClick={() => {
           if (this.noBlocks) {
             this.onClickEmptyBlocks();

package/src/components/builder-component.component.tsx

@@ -98,7 +98,6 @@ const sizeMap = {
   mobile: 'small',
 };
 
-
 const fetchCache: { [key: string]: any } = {};
 
 export interface BuilderComponentProps {
@@ -277,6 +276,11 @@ export interface BuilderComponentProps {
    * navigation to other pages unintended
    */
   stopClickPropagationWhenEditing?: boolean;
+
+  /**
+   * Locale code
+   */
+  locale?: string;
 }
 
 export interface BuilderComponentState {
@@ -841,7 +845,7 @@ export class BuilderComponent extends React.Component<
   get data() {
     const data = {
       ...(this.inlinedContent && this.inlinedContent.data?.state),
-      ...this.props.data,
+      ...this.externalState,
       ...this.state.state,
     };
     Object.assign(this.rootState, data);
@@ -852,7 +856,7 @@ export class BuilderComponent extends React.Component<
     // TODO: shallow diff
     if (this.props.data && prevProps.data !== this.props.data) {
       this.state.update((state: any) => {
-        Object.assign(state, this.props.data);
+        Object.assign(state, this.externalState);
       });
     }
 
@@ -892,6 +896,13 @@ export class BuilderComponent extends React.Component<
     return content;
   }
 
+  get externalState() {
+    return {
+      ...this.props.data,
+      ... (this.props.locale ? { locale: this.props.locale } : {})
+    }
+  }
+
   get useContent() {
     return this.content || this.state.context.builderContent;
   }
@@ -900,7 +911,7 @@ export class BuilderComponent extends React.Component<
     const content = this.content;
 
     const dataString =
-      Builder.isBrowser && this.props.data && size(this.props.data) && hash(this.props.data);
+      Builder.isBrowser && this.externalState && size(this.externalState) && hash(this.externalState);
     let key = Builder.isEditing ? this.name : this.props.entry;
     if (key && !Builder.isEditing && dataString && dataString.length < 300) {
       key += ':' + dataString;
@@ -971,6 +982,7 @@ export class BuilderComponent extends React.Component<
                           !this.isPreviewing && { initialContent: [] }),
                         ...(this.props.url && { url: this.props.url }),
                         ...this.props.options,
+                        ...(this.props.locale ? { locale: this.props.locale } : {}),
                         ...(this.options.codegen && {
                           format: 'react',
                         }),
@@ -1272,7 +1284,7 @@ export class BuilderComponent extends React.Component<
           deviceSize: this.deviceSizeState,
           device: this.device,
           ...data.state,
-          ...this.props.data,
+          ...this.externalState,
         }),
       };
       if (this.mounted) {
@@ -1358,22 +1370,22 @@ export class BuilderComponent extends React.Component<
               const builderModelRe = /builder\.io\/api\/v2\/([^\/\?]+)/i;
               const builderModelMatch = url.match(builderModelRe);
               const model = builderModelMatch && builderModelMatch[1];
-                this.handleRequest(key, finalUrl);
-                const currentSubscription = this.httpSubscriptionPerKey[key];
-                if (currentSubscription) {
-                  currentSubscription.unsubscribe();
-                }
-
-                // TODO: fix this
-                const newSubscription = (this.httpSubscriptionPerKey[key] =
-                  this.onStateChange.subscribe(() => {
-                    const newUrl = this.evalExpression(url);
-                    if (newUrl !== finalUrl) {
-                      this.handleRequest(key, newUrl);
-                      this.lastHttpRequests[key] = newUrl;
-                    }
-                  }));
-                this.subscriptions.add(newSubscription);
+              this.handleRequest(key, finalUrl);
+              const currentSubscription = this.httpSubscriptionPerKey[key];
+              if (currentSubscription) {
+                currentSubscription.unsubscribe();
+              }
+
+              // TODO: fix this
+              const newSubscription = (this.httpSubscriptionPerKey[key] =
+                this.onStateChange.subscribe(() => {
+                  const newUrl = this.evalExpression(url);
+                  if (newUrl !== finalUrl) {
+                    this.handleRequest(key, newUrl);
+                    this.lastHttpRequests[key] = newUrl;
+                  }
+                }));
+              this.subscriptions.add(newSubscription);
             } else {
               this.handleRequest(key, this.evalExpression(url));
             }

package/src/components/builder-content.component.tsx

@@ -149,7 +149,7 @@ export class BuilderContent<ContentType extends object = any> extends React.Comp
           data: newData,
         });
         if (this.props.contentLoaded) {
-          this.props.contentLoaded(newData.data, this.state.data);
+          this.props.contentLoaded(newData.data, newData);
         }
         break;
       }

package/src/functions/safe-dynamic-require.ts

@@ -6,5 +6,5 @@ const noop = () => null;
 // Allow us to require things dynamically safe from webpack bundling
 
 export let safeDynamicRequire: typeof require;
-if (typeof globalThis.require === 'function') safeDynamicRequire = eval('require');
+if (typeof globalThis.require === 'function') safeDynamicRequire = globalThis.require;
 safeDynamicRequire ??= noop as any;