@builder.io/react 2.0.4-1 → 2.0.4-10

package/dist/types/src/components/builder-component.component.d.ts

@@ -181,6 +181,10 @@ export interface BuilderComponentProps {
      * navigation to other pages unintended
      */
     stopClickPropagationWhenEditing?: boolean;
+    /**
+     * Locale code, should match one of the locales in your spaces locale, wll auto resolve the localized inputs to the localized value
+     */
+    locale?: string;
 }
 export interface BuilderComponentState {
     state: any;
@@ -247,6 +251,7 @@ export declare class BuilderComponent extends React.Component<BuilderComponentPr
         url?: string | undefined;
         isChild?: boolean | undefined;
         stopClickPropagationWhenEditing?: boolean | undefined;
+        locale?: string | undefined;
         children?: React.ReactNode;
     };
     get name(): string | undefined;
@@ -295,6 +300,7 @@ export declare class BuilderComponent extends React.Component<BuilderComponentPr
     checkStyles(data: any): void;
     reload(): void;
     get content(): Content | undefined;
+    get externalState(): any;
     get useContent(): any;
     render(): JSX.Element;
     evalExpression(expression: string): string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@builder.io/react",
-  "version": "2.0.4-1",
+  "version": "2.0.4-10",
   "description": "",
   "keywords": [],
   "main": "dist/builder-react.cjs.js",
@@ -75,6 +75,7 @@
     "@types/rollup-plugin-commonjs": "^9.2.0",
     "@types/rollup-plugin-json": "^3.0.3",
     "@types/rollup-plugin-node-resolve": "^4.1.0",
+    "@types/traverse": "^0.6.32",
     "colors": "^1.1.2",
     "commitizen": "^4.2.4",
     "coveralls": "^3.0.0",
@@ -123,10 +124,11 @@
     "react-dom": ">=16.8.0"
   },
   "dependencies": {
-    "@builder.io/sdk": "^1.1.27",
+    "@builder.io/sdk": "^1.1.28-1",
     "@emotion/core": "^10.0.17",
     "hash-sum": "^2.0.0",
     "preact": "^10.1.0",
+    "traverse": "^0.6.6",
     "vm2": "^3.9.10"
   },
   "gitHead": "4d96fbc32864698afbb355ab991c6d90be991951"

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,7 @@ class SymbolComponent extends React.Component<SymbolProps> {
                 this.placeholder
               ) : (
                 <BuilderComponent
+                  {...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

@@ -11,6 +11,7 @@ import { BuilderStoreContext } from '../store/builder-store';
 import { applyPatchWithMinimalMutationChain } from '../functions/apply-patch-with-mutation';
 import { blockToHtmlString } from '../functions/block-to-html-string';
 import { Link } from './Link';
+import traverse from 'traverse';
 
 const camelCaseToKebabCase = (str?: string) =>
   str ? str.replace(/([A-Z])/g, g => `-${g[0].toLowerCase()}`) : '';
@@ -18,6 +19,21 @@ const camelCaseToKebabCase = (str?: string) =>
 const kebabCaseToCamelCase = (str = '') =>
   str.replace(/-([a-z])/g, match => match[1].toUpperCase());
 
+const localizedType = '@builder.io/core:LocalizedValue';
+const resolveLocalizedOptions = (options?: any, locale?: string) => {
+  if (!locale || !options) {
+    return options;
+  }
+
+  const result = traverse(options).map(function (el) {
+    if (el && el['@type'] === localizedType) {
+      this.update(el[locale] || el.Default);
+    }
+  });
+
+  return result;
+};
+
 const Device = { desktop: 0, tablet: 1, mobile: 2 };
 
 const voidElements = new Set([
@@ -248,13 +264,9 @@ export class BuilderBlock extends React.Component<
         }
 
         if (location.href.includes('builder.debug=true')) {
-          this.eval('debugger');
+          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 });
@@ -456,10 +468,13 @@ export class BuilderBlock extends React.Component<
       }
     }
 
-    const innerComponentProperties = (options.component || options.options) && {
-      ...options.options,
-      ...(options.component.options || options.component.data),
-    };
+    const innerComponentProperties = resolveLocalizedOptions(
+      (options.component || options.options) && {
+        ...options.options,
+        ...(options.component.options || options.component.data),
+      },
+      this.privateState.state.locale
+    );
 
     const isVoid = voidElements.has(TagName);
 

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, should match one of the locales in your spaces locale, wll auto resolve the localized inputs to the localized value
+   */
+  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,10 @@ 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 +985,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 +1287,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 +1373,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/scripts/init-editing.ts

@@ -6,7 +6,7 @@ if (typeof window !== 'undefined') {
       type: 'builder.isReactSdk',
       data: {
         value: true,
-        supportsPatchUpdates: 'v3',
+        supportsPatchUpdates: 'v4',
         priorVersion: version,
       },
     },