@developer_tribe/react-builder 0.1.30 → 0.1.32

package/src/build-components/Text/TextProps.generated.ts

@@ -2,19 +2,41 @@
 
 import type { NodeData } from '../../types/Node';
 
+export type FlexDirectionOptionType = 'row' | 'column';
+export type AlignItemsOptionType =
+  | 'flex-start'
+  | 'center'
+  | 'flex-end'
+  | 'stretch'
+  | 'baseline';
+export type JustifyContentOptionType =
+  | 'flex-start'
+  | 'center'
+  | 'flex-end'
+  | 'space-between'
+  | 'space-around'
+  | 'space-evenly';
+export type FontWeightOptionType =
+  | 'normal'
+  | 'bold'
+  | '100'
+  | '200'
+  | '300'
+  | '400'
+  | '500'
+  | '600'
+  | '700'
+  | '800'
+  | '900';
+export type TextAlignOptionType = 'left' | 'center' | 'right' | 'justify';
+
 export interface TextPropsGenerated {
   child: string;
   attributes: {
     scrollable?: boolean;
-    flexDirection?: 'row' | 'column';
-    alignItems?: 'flex-start' | 'center' | 'flex-end' | 'stretch' | 'baseline';
-    justifyContent?:
-      | 'flex-start'
-      | 'center'
-      | 'flex-end'
-      | 'space-between'
-      | 'space-around'
-      | 'space-evenly';
+    flexDirection?: FlexDirectionOptionType;
+    alignItems?: AlignItemsOptionType;
+    justifyContent?: JustifyContentOptionType;
     gap?: string;
     padding?: number;
     paddingHorizontal?: string;
@@ -36,18 +58,8 @@ export interface TextPropsGenerated {
     height?: number;
     color?: string;
     fontSize?: number;
-    fontWeight?:
-      | 'normal'
-      | 'bold'
-      | '100'
-      | '200'
-      | '300'
-      | '400'
-      | '500'
-      | '600'
-      | '700'
-      | '800'
-      | '900';
+    fontWeight?: FontWeightOptionType;
+    textAlign?: TextAlignOptionType;
   };
 }
 

package/src/build-components/Text/pattern.json

@@ -20,8 +20,8 @@
         "700",
         "800",
         "900"
-      ]
-    },
-    "textAlign": ["left", "center", "right", "justify"]
+      ],
+      "textAlign": ["left", "center", "right", "justify"]
+    }
   }
 }

package/src/build-components/View/View.tsx

@@ -6,55 +6,12 @@ import type {
 import RenderNode from '../RenderNode.generated';
 import { Node } from '../../types/Node';
 import useNode from '../useNode';
-
-function mapAttributesToStyle(
-  attributes: ViewPropsGenerated['attributes'],
-): React.CSSProperties {
-  const scrollable = attributes?.scrollable ?? false;
-  const style: React.CSSProperties = {
-    display: 'flex',
-    flexDirection: 'column',
-  };
-  if (!attributes) return style;
-  if (scrollable) {
-    if (attributes.flexDirection === 'row') {
-      style.overflowX = 'auto';
-      style.overflowY = 'hidden';
-      style.maxWidth = '100%';
-      style.maxHeight = '100%';
-    } else {
-      style.overflowY = 'auto';
-      style.overflowX = 'hidden';
-      style.maxHeight = '100%';
-      style.maxWidth = '100%';
-    }
-  }
-  if (attributes.flexDirection) style.flexDirection = attributes.flexDirection;
-  if (attributes.alignItems)
-    style.alignItems =
-      attributes.alignItems as React.CSSProperties['alignItems'];
-  if (attributes.justifyContent)
-    style.justifyContent =
-      attributes.justifyContent as React.CSSProperties['justifyContent'];
-  if (attributes.gap !== undefined) style.gap = attributes.gap;
-  if (attributes.padding !== undefined) style.padding = attributes.padding;
-  if (attributes.margin !== undefined) style.margin = attributes.margin;
-  if (attributes.backgroundColor)
-    style.backgroundColor = attributes.backgroundColor;
-  if (attributes.borderRadius !== undefined)
-    style.borderRadius = attributes.borderRadius;
-  if (attributes.width !== undefined) style.width = attributes.width;
-  if (attributes.height !== undefined) style.height = attributes.height;
-  return style;
-}
+import { extractViewStyle } from '../../utils/extractViewStyle';
 
 export function View({ node }: ViewComponentProps) {
   node = useNode(node);
   return (
-    <div
-      style={mapAttributesToStyle(node.attributes ?? {})}
-      className="scroll-container"
-    >
+    <div style={extractViewStyle(node)} className="scroll-container">
       <RenderNode node={node.children as Node} />
     </div>
   );

package/src/build-components/View/ViewProps.generated.ts

@@ -2,19 +2,28 @@
 
 import type { NodeData } from '../../types/Node';
 
+export type FlexDirectionOptionType = 'row' | 'column';
+export type AlignItemsOptionType =
+  | 'flex-start'
+  | 'center'
+  | 'flex-end'
+  | 'stretch'
+  | 'baseline';
+export type JustifyContentOptionType =
+  | 'flex-start'
+  | 'center'
+  | 'flex-end'
+  | 'space-between'
+  | 'space-around'
+  | 'space-evenly';
+
 export interface ViewPropsGenerated {
   child: string;
   attributes: {
     scrollable?: boolean;
-    flexDirection?: 'row' | 'column';
-    alignItems?: 'flex-start' | 'center' | 'flex-end' | 'stretch' | 'baseline';
-    justifyContent?:
-      | 'flex-start'
-      | 'center'
-      | 'flex-end'
-      | 'space-between'
-      | 'space-around'
-      | 'space-evenly';
+    flexDirection?: FlexDirectionOptionType;
+    alignItems?: AlignItemsOptionType;
+    justifyContent?: JustifyContentOptionType;
     gap?: string;
     padding?: number;
     paddingHorizontal?: string;

package/src/build-components/patterns.generated.ts

@@ -111,15 +111,15 @@ export const patterns = [
         animation_color: 'string',
         button_background_color: 'string',
         flex: 'number',
-        targetIndex: 'number',
         events: 'EventObject[]',
       },
     },
     types: {
       EventObject: {
         type: ['Permission', 'Navigate'],
-        permission: ['att', 'notification', 'rating', 'null'],
-        navigate_to: ['string', 'null'],
+        permission: ['att', 'notification', 'rating', 'GDPR', 'null'],
+        navigate_to: 'string',
+        targetIndex: 'number',
       },
     },
   },
@@ -185,6 +185,7 @@ export const patterns = [
           '800',
           '900',
         ],
+        textAlign: ['left', 'center', 'right', 'justify'],
         scrollable: 'boolean',
         flexDirection: ['row', 'column'],
         alignItems: ['flex-start', 'center', 'flex-end', 'stretch', 'baseline'],
@@ -223,7 +224,6 @@ export const patterns = [
         linkedWordSecondColor: 'string',
         linkedWordSecondPage: 'string',
       },
-      textAlign: ['left', 'center', 'right', 'justify'],
     },
     defaults: { paddingHorizontal: '24@s' },
     types: {},
@@ -240,8 +240,12 @@ export const patterns = [
         height: 'number',
         resizeMode: ['cover', 'contain', 'stretch', 'center'],
         borderRadius: 'number',
+        video_url: 'string',
+        lottie: 'string',
       },
     },
+    types: {},
+    defaults: {},
   },
   {
     schemaVersion: 1,
@@ -307,6 +311,7 @@ export const patterns = [
           '800',
           '900',
         ],
+        textAlign: ['left', 'center', 'right', 'justify'],
         scrollable: 'boolean',
         flexDirection: ['row', 'column'],
         alignItems: ['flex-start', 'center', 'flex-end', 'stretch', 'baseline'],
@@ -338,7 +343,6 @@ export const patterns = [
         width: 'number',
         height: 'number',
       },
-      textAlign: ['left', 'center', 'right', 'justify'],
     },
     defaults: { fontSize: '14@fs', fontWeight: '600' },
     types: {},
@@ -365,6 +369,7 @@ export const patterns = [
           '800',
           '900',
         ],
+        textAlign: ['left', 'center', 'right', 'justify'],
         scrollable: 'boolean',
         flexDirection: ['row', 'column'],
         alignItems: ['flex-start', 'center', 'flex-end', 'stretch', 'baseline'],
@@ -396,7 +401,6 @@ export const patterns = [
         width: 'number',
         height: 'number',
       },
-      textAlign: ['left', 'center', 'right', 'justify'],
     },
     defaults: { fontSize: '24@fs', fontWeight: '700', textAlign: 'center' },
     types: {},
@@ -453,8 +457,8 @@ export const patterns = [
           '800',
           '900',
         ],
+        textAlign: ['left', 'center', 'right', 'justify'],
       },
-      textAlign: ['left', 'center', 'right', 'justify'],
     },
     types: {},
     defaults: {},

package/src/build-components/useNode.ts

@@ -6,7 +6,6 @@ export default function useNode<
 >(node: NodeData<T>): NodeData<T> {
   const type = node?.type;
   const defaults = getDefaultsForType(type) as Partial<T> | undefined;
-  console.log('defaults', type, defaults);
   if (!defaults) return node;
   const mergedAttributes: T = {
     ...(defaults as T),

package/src/index.ts

@@ -25,3 +25,6 @@ export { AttributesEditor };
 export * from './build-components/index';
 export { default as useNode } from './build-components/useNode';
 export { querySelector } from './utils/querySelector';
+export { extractViewStyle } from './utils/extractViewStyle';
+export { extractImageStyle } from './utils/extractImageStyle';
+export { extractTextStyle } from './utils/extractTextStyle';

package/src/utils/extractImageStyle.ts

@@ -0,0 +1,24 @@
+import { ImagePropsGenerated } from '../build-components/Image/ImageProps.generated';
+import type { NodeData } from '../types/Node';
+
+export function extractImageStyle<T extends ImagePropsGenerated['attributes']>(
+  node: NodeData<T>,
+) {
+  const attributes = node.attributes;
+  const style: React.CSSProperties = {};
+
+  if (!attributes) return style;
+
+  if (attributes.width !== undefined) style.width = attributes.width;
+  if (attributes.height !== undefined) style.height = attributes.height;
+  if (attributes.borderRadius !== undefined)
+    style.borderRadius = attributes.borderRadius;
+
+  // Map resizeMode to CSS object-fit
+  if (attributes.resizeMode === 'cover') style.objectFit = 'cover';
+  else if (attributes.resizeMode === 'contain') style.objectFit = 'contain';
+  else if (attributes.resizeMode === 'stretch') style.objectFit = 'fill';
+  else if (attributes.resizeMode === 'center') style.objectFit = 'none';
+
+  return style;
+}

package/src/utils/extractTextStyle.ts

@@ -0,0 +1,109 @@
+import type { NodeData } from '../types/Node';
+import type { TextPropsGenerated } from '../build-components/Text/TextProps.generated';
+import { fs, parseSize } from '../size-matters';
+import { useRenderStore } from '../store';
+
+export function extractTextStyle<T extends TextPropsGenerated['attributes']>(
+  node: NodeData<T>,
+) {
+  const attributes = node.attributes;
+
+  const { screenStyle, theme } = useRenderStore.getState();
+  const fallbackColor =
+    theme === 'light' ? screenStyle.light.color : screenStyle.dark.color;
+
+  const style: React.CSSProperties = {};
+
+  if (!attributes) {
+    style.fontSize = fs(14);
+    style.color = fallbackColor;
+    return style;
+  }
+
+  // Typography
+  if (attributes.fontSize !== undefined) {
+    const parsed = parseSize(attributes.fontSize);
+    style.fontSize = parsed as React.CSSProperties['fontSize'];
+  } else {
+    style.fontSize = fs(14);
+  }
+  if (attributes.fontWeight) style.fontWeight = attributes.fontWeight;
+  style.color = attributes.color ?? fallbackColor;
+  if (attributes.textAlign)
+    style.textAlign = attributes.textAlign as React.CSSProperties['textAlign'];
+
+  // Spacing
+  // Shorthand
+  if (attributes.padding !== undefined) style.padding = attributes.padding;
+  if (attributes.margin !== undefined) style.margin = attributes.margin;
+
+  // Axis shorthands
+  if (attributes.paddingHorizontal !== undefined) {
+    const v = parseSize(attributes.paddingHorizontal);
+    style.paddingLeft = v as React.CSSProperties['paddingLeft'];
+    style.paddingRight = v as React.CSSProperties['paddingRight'];
+  }
+  if (attributes.paddingVertical !== undefined) {
+    const v = parseSize(attributes.paddingVertical);
+    style.paddingTop = v as React.CSSProperties['paddingTop'];
+    style.paddingBottom = v as React.CSSProperties['paddingBottom'];
+  }
+  if (attributes.marginHorizontal !== undefined) {
+    const v = parseSize(attributes.marginHorizontal);
+    style.marginLeft = v as React.CSSProperties['marginLeft'];
+    style.marginRight = v as React.CSSProperties['marginRight'];
+  }
+  if (attributes.marginVertical !== undefined) {
+    const v = parseSize(attributes.marginVertical);
+    style.marginTop = v as React.CSSProperties['marginTop'];
+    style.marginBottom = v as React.CSSProperties['marginBottom'];
+  }
+
+  // Edges
+  if (attributes.paddingTop !== undefined)
+    style.paddingTop = parseSize(
+      attributes.paddingTop,
+    ) as React.CSSProperties['paddingTop'];
+  if (attributes.paddingBottom !== undefined)
+    style.paddingBottom = parseSize(
+      attributes.paddingBottom,
+    ) as React.CSSProperties['paddingBottom'];
+  if (attributes.paddingLeft !== undefined)
+    style.paddingLeft = parseSize(
+      attributes.paddingLeft,
+    ) as React.CSSProperties['paddingLeft'];
+  if (attributes.paddingRight !== undefined)
+    style.paddingRight = parseSize(
+      attributes.paddingRight,
+    ) as React.CSSProperties['paddingRight'];
+
+  if (attributes.marginTop !== undefined)
+    style.marginTop = parseSize(
+      attributes.marginTop,
+    ) as React.CSSProperties['marginTop'];
+  if (attributes.marginBottom !== undefined)
+    style.marginBottom = parseSize(
+      attributes.marginBottom,
+    ) as React.CSSProperties['marginBottom'];
+  if (attributes.marginLeft !== undefined)
+    style.marginLeft = parseSize(
+      attributes.marginLeft,
+    ) as React.CSSProperties['marginLeft'];
+  if (attributes.marginRight !== undefined)
+    style.marginRight = parseSize(
+      attributes.marginRight,
+    ) as React.CSSProperties['marginRight'];
+
+  // Decor
+  if (attributes.backgroundColor)
+    style.backgroundColor = attributes.backgroundColor;
+  if (attributes.borderRadius !== undefined)
+    style.borderRadius =
+      attributes.borderRadius as React.CSSProperties['borderRadius'];
+
+  // Dimensions (rare for text but supported by schema)
+  if (attributes.width !== undefined) style.width = attributes.width;
+  if (attributes.height !== undefined) style.height = attributes.height;
+
+  return style;
+}

package/src/utils/extractViewStyle.ts

@@ -0,0 +1,44 @@
+import { ViewPropsGenerated } from '../build-components/View/ViewProps.generated';
+import type { NodeData } from '../types/Node';
+
+export function extractViewStyle<T extends ViewPropsGenerated['attributes']>(
+  node: NodeData<T>,
+) {
+  const attributes = node.attributes;
+  const scrollable = attributes?.scrollable ?? false;
+  const style: React.CSSProperties = {
+    display: 'flex',
+    flexDirection: 'column',
+  };
+  if (!attributes) return style;
+  if (scrollable) {
+    if (attributes.flexDirection === 'row') {
+      style.overflowX = 'auto';
+      style.overflowY = 'hidden';
+      style.maxWidth = '100%';
+      style.maxHeight = '100%';
+    } else {
+      style.overflowY = 'auto';
+      style.overflowX = 'hidden';
+      style.maxHeight = '100%';
+      style.maxWidth = '100%';
+    }
+  }
+  if (attributes.flexDirection) style.flexDirection = attributes.flexDirection;
+  if (attributes.alignItems)
+    style.alignItems =
+      attributes.alignItems as React.CSSProperties['alignItems'];
+  if (attributes.justifyContent)
+    style.justifyContent =
+      attributes.justifyContent as React.CSSProperties['justifyContent'];
+  if (attributes.gap !== undefined) style.gap = attributes.gap;
+  if (attributes.padding !== undefined) style.padding = attributes.padding;
+  if (attributes.margin !== undefined) style.margin = attributes.margin;
+  if (attributes.backgroundColor)
+    style.backgroundColor = attributes.backgroundColor;
+  if (attributes.borderRadius !== undefined)
+    style.borderRadius = attributes.borderRadius;
+  if (attributes.width !== undefined) style.width = attributes.width;
+  if (attributes.height !== undefined) style.height = attributes.height;
+  return style;
+}

package/src/utils/novaToJson.ts

@@ -172,6 +172,9 @@ function buildCarouselItem(
       // derive resizeMode from is_bg_image and try to extract borderRadius from styles
       const isBgImage = Boolean(comp?.attributes?.is_bg_image);
       const imageStyle = extractViewStyleAttributesFromComponent(comp);
+      // optional rich media
+      const lottie = comp?.attributes?.lottie as string | undefined;
+      const videoUrl = comp?.attributes?.video_url as string | undefined;
 
       if (src) {
         children.push({
@@ -183,6 +186,8 @@ function buildCarouselItem(
             ...(typeof imageStyle.borderRadius === 'number'
               ? { borderRadius: imageStyle.borderRadius }
               : {}),
+            ...(typeof lottie === 'string' ? { lottie } : {}),
+            ...(typeof videoUrl === 'string' ? { video_url: videoUrl } : {}),
           },
           children: undefined as unknown as Node,
         } as unknown as NodeData);
@@ -208,7 +213,7 @@ function buildCarouselItem(
         const animationColor = attrs?.animation_color as string | undefined;
         const flex = attrs?.flex ? Number(attrs.flex) : undefined;
 
-        // Find first Navigate event and map to target index
+        // Normalize events and compute Navigate target indices when resolvable
         let targetIndex: number | undefined = undefined;
         //@eslint-disable-next-line @typescript-eslint/no-explicit-any
         const actions = (attrs?.actions || []) as any[];
@@ -216,6 +221,7 @@ function buildCarouselItem(
           type: 'Permission' | 'Navigate';
           permission?: string;
           navigate_to?: string | null;
+          targetIndex?: number;
         }[] = [];
         for (const action of actions) {
           //@eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -241,6 +247,9 @@ function buildCarouselItem(
               normalizedEvents.push({
                 type: 'Navigate',
                 navigate_to,
+                ...(hasTarget
+                  ? { targetIndex: pageKeyToIndex.get(nextKey!)! }
+                  : {}),
               });
               if (hasTarget) {
                 targetIndex = pageKeyToIndex.get(nextKey!)!;
@@ -264,7 +273,6 @@ function buildCarouselItem(
               ? { button_background_color: buttonBackgroundColor }
               : {}),
             ...(typeof flex === 'number' ? { flex } : {}),
-            ...(typeof targetIndex === 'number' ? { targetIndex } : {}),
             ...(normalizedEvents.length ? { events: normalizedEvents } : {}),
           },
           children: undefined as unknown as Node,