@developer_tribe/react-builder 1.0.2 → 1.0.4

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

@@ -1,17 +1,42 @@
-import React, { useMemo } from 'react';
+import React, { useId, useMemo } from 'react';
 import type { ButtonComponentProps } from './ButtonProps.generated';
 import useNode from '../useNode';
+import { useRenderStore } from '../../store';
 import { useLogRender } from '../../utils/useLogRender';
 import { extractViewStyle } from '../../utils/extractViewStyle';
+import { isNodeSelected, SELECTED_OUTLINE_STYLE } from '../../utils/selection';
+import { useMergedStyle } from '../../utils/useMergedStyle';
 
 function Button({ node }: ButtonComponentProps) {
   useLogRender('Button');
   node = useNode(node);
-  const attributeKey = (node as any)?.sourceType ?? node.type ?? 'button';
-  const style = useMemo(() => extractViewStyle(node), [node]);
+  const generatedId = useId();
+  const attributeName = (node as any)?.sourceType ?? node.type ?? 'button';
+  const attributeKey = node.key ?? generatedId;
+  const { previewMode, current, appConfig, projectColors } = useRenderStore(
+    (s) => ({
+      previewMode: s.previewMode,
+      current: s.current,
+      appConfig: s.appConfig,
+      projectColors: s.projectColors,
+    }),
+  );
+  const baseStyle = useMemo(
+    () => extractViewStyle(node, { appConfig, projectColors }),
+    [node, appConfig, projectColors],
+  );
+  const isSelected = isNodeSelected({ previewMode, current, node });
+  const style = useMergedStyle(
+    baseStyle,
+    isSelected ? SELECTED_OUTLINE_STYLE : undefined,
+  );
 
   return (
-    <div attribute-key={attributeKey} style={style}>
+    <div
+      attribute-name={attributeName}
+      attribute-key={attributeKey}
+      style={style}
+    >
       {String(node?.type ?? 'button')}
     </div>
   );

package/src/build-components/Button/ButtonProps.generated.ts

@@ -16,6 +16,7 @@ export type JustifyContentOptionType =
   | 'space-between'
   | 'space-around'
   | 'space-evenly';
+export type PositionOptionType = 'relative' | 'absolute';
 export type FontWeightOptionType =
   | 'normal'
   | 'bold'
@@ -54,6 +55,13 @@ export interface ButtonPropsGenerated {
     borderRadius?: string;
     width?: string;
     height?: string;
+    flex?: number;
+    position?: PositionOptionType;
+    top?: string;
+    bottom?: string;
+    left?: string;
+    right?: string;
+    zIndex?: number;
     color?: string;
     fontSize?: string;
     fontWeight?: FontWeightOptionType;

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

@@ -1,16 +1,37 @@
-import React, { useMemo } from 'react';
+import React, { useId, useMemo } from 'react';
 import type { CarouselComponentProps } from './CarouselProps.generated';
 import RenderNode from '../RenderNode.generated';
 import { isCarouselItem } from '../../utils/isCarousel';
 import useNode from '../useNode';
+import { useRenderStore } from '../../store';
 import { useLogRender } from '../../utils/useLogRender';
 import { extractViewStyle } from '../../utils/extractViewStyle';
+import { isNodeSelected, SELECTED_OUTLINE_STYLE } from '../../utils/selection';
+import { useMergedStyle } from '../../utils/useMergedStyle';
 
 function Carousel({ node }: CarouselComponentProps) {
   useLogRender('Carousel');
   node = useNode(node);
-  const attributeKey = (node as any)?.sourceType ?? node.type ?? 'carousel';
-  const style = useMemo(() => extractViewStyle(node), [node]);
+  const generatedId = useId();
+  const attributeName = (node as any)?.sourceType ?? node.type ?? 'carousel';
+  const attributeKey = node.key ?? generatedId;
+  const { previewMode, current, appConfig, projectColors } = useRenderStore(
+    (s) => ({
+      previewMode: s.previewMode,
+      current: s.current,
+      appConfig: s.appConfig,
+      projectColors: s.projectColors,
+    }),
+  );
+  const baseStyle = useMemo(
+    () => extractViewStyle(node, { appConfig, projectColors }),
+    [node, appConfig, projectColors],
+  );
+  const isSelected = isNodeSelected({ previewMode, current, node });
+  const style = useMergedStyle(
+    baseStyle,
+    isSelected ? SELECTED_OUTLINE_STYLE : undefined,
+  );
   // Ensure children are carouselItems
   const renderChildren = () => {
     if (Array.isArray(node.children)) {
@@ -27,6 +48,7 @@ function Carousel({ node }: CarouselComponentProps) {
   //TODO: add to md file for agents
   return (
     <div
+      attribute-name={attributeName}
       attribute-key={attributeKey}
       className="embla__container"
       style={style}

package/src/build-components/Carousel/CarouselProps.generated.ts

@@ -16,6 +16,7 @@ export type JustifyContentOptionType =
   | 'space-between'
   | 'space-around'
   | 'space-evenly';
+export type PositionOptionType = 'relative' | 'absolute';
 
 export interface CarouselPropsGenerated {
   child: string;
@@ -42,6 +43,13 @@ export interface CarouselPropsGenerated {
     borderRadius?: string;
     width?: string;
     height?: string;
+    flex?: number;
+    position?: PositionOptionType;
+    top?: string;
+    bottom?: string;
+    left?: string;
+    right?: string;
+    zIndex?: number;
   };
 }
 

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

@@ -1,16 +1,26 @@
-import React, { useContext, useMemo } from 'react';
+import React, { useContext, useId, useMemo } from 'react';
 import type { CarouselButtonsComponentProps } from './CarouselButtonsProps.generated';
 import { carouselContext } from '../CarouselProvider/CarouselProvider';
 import useNode from '../useNode';
 import { useLogRender } from '../../utils/useLogRender';
 import { extractViewStyle } from '../../utils/extractViewStyle';
+import { useRenderStore } from '../../store';
 
 function CarouselButtons({ node }: CarouselButtonsComponentProps) {
   useLogRender('CarouselButtons');
   node = useNode(node);
-  const attributeKey =
+  const generatedId = useId();
+  const attributeName =
     (node as any)?.sourceType ?? node.type ?? 'carouselButtons';
-  const style = useMemo(() => extractViewStyle(node), [node]);
+  const attributeKey = node.key ?? generatedId;
+  const { appConfig, projectColors } = useRenderStore((s) => ({
+    appConfig: s.appConfig,
+    projectColors: s.projectColors,
+  }));
+  const style = useMemo(
+    () => extractViewStyle(node, { appConfig, projectColors }),
+    [node, appConfig, projectColors],
+  );
   const emblaApi = useContext(carouselContext);
   const buttonTypes = node.attributes?.buttonType || [
     'previous_button',
@@ -18,7 +28,12 @@ function CarouselButtons({ node }: CarouselButtonsComponentProps) {
   ];
 
   return (
-    <div attribute-key={attributeKey} className="embla__buttons" style={style}>
+    <div
+      attribute-name={attributeName}
+      attribute-key={attributeKey}
+      className="embla__buttons"
+      style={style}
+    >
       {buttonTypes.includes('previous_button') && (
         <button
           onClick={() => emblaApi?.scrollPrev()}

package/src/build-components/CarouselButtons/CarouselButtonsProps.generated.ts

@@ -16,6 +16,7 @@ export type JustifyContentOptionType =
   | 'space-between'
   | 'space-around'
   | 'space-evenly';
+export type PositionOptionType = 'relative' | 'absolute';
 export type ButtonTypeOptionType =
   | 'previous_button'
   | 'next_button'
@@ -46,6 +47,13 @@ export interface CarouselButtonsPropsGenerated {
     borderRadius?: string;
     width?: string;
     height?: string;
+    flex?: number;
+    position?: PositionOptionType;
+    top?: string;
+    bottom?: string;
+    left?: string;
+    right?: string;
+    zIndex?: number;
     buttonType?: ButtonTypeOptionType;
     skipNumber?: number;
   };

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

@@ -1,23 +1,31 @@
-import React, { useContext, useEffect, useMemo, useState } from 'react';
+import React, { useContext, useEffect, useId, useMemo, useState } from 'react';
 import type { CarouselDotsComponentProps } from './CarouselDotsProps.generated';
 import { carouselContext } from '../CarouselProvider/CarouselProvider';
 import { onboardContext } from '../OnboardProvider/OnboardProvider';
 import useNode from '../useNode';
 import { useLogRender } from '../../utils/useLogRender';
 import { extractViewStyle } from '../../utils/extractViewStyle';
+import { useRenderStore } from '../../store';
 
 function CarouselDots({ node }: CarouselDotsComponentProps) {
   useLogRender('CarouselDots');
 
   node = useNode(node);
 
-  const attributeKey = (node as any)?.sourceType ?? node.type ?? 'carouselDots';
+  const generatedId = useId();
+  const attributeName =
+    (node as any)?.sourceType ?? node.type ?? 'carouselDots';
+  const attributeKey = node.key ?? generatedId;
 
   const dotType = node.attributes?.dotType || 'normal_dot';
+  const { appConfig, projectColors } = useRenderStore((s) => ({
+    appConfig: s.appConfig,
+    projectColors: s.projectColors,
+  }));
 
   const style = useMemo(() => {
-    return extractViewStyle(node);
-  }, [node]);
+    return extractViewStyle(node, { appConfig, projectColors });
+  }, [node, appConfig, projectColors]);
 
   // Use the appropriate context based on sourceType
   const isOnboard = (node as any)?.sourceType === 'OnboardDot';
@@ -51,6 +59,7 @@ function CarouselDots({ node }: CarouselDotsComponentProps) {
 
   return (
     <div
+      attribute-name={attributeName}
       attribute-key={attributeKey}
       className={`embla__dots embla__dots--${dotType}`}
       style={style}

package/src/build-components/CarouselDots/CarouselDotsProps.generated.ts

@@ -16,6 +16,7 @@ export type JustifyContentOptionType =
   | 'space-between'
   | 'space-around'
   | 'space-evenly';
+export type PositionOptionType = 'relative' | 'absolute';
 export type DotTypeOptionType =
   | 'expanding_dot'
   | 'normal_dot'
@@ -49,6 +50,13 @@ export interface CarouselDotsPropsGenerated {
     borderRadius?: string;
     width?: string;
     height?: string;
+    flex?: number;
+    position?: PositionOptionType;
+    top?: string;
+    bottom?: string;
+    left?: string;
+    right?: string;
+    zIndex?: number;
     dotType?: DotTypeOptionType;
   };
 }

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

@@ -1,17 +1,33 @@
-import React, { useMemo } from 'react';
+import React, { useId, useMemo } from 'react';
 import type { CarouselItemComponentProps } from './CarouselItemProps.generated';
 import { RenderNode } from '../..';
 import useNode from '../useNode';
 import { useLogRender } from '../../utils/useLogRender';
 import { extractViewStyle } from '../../utils/extractViewStyle';
+import { useRenderStore } from '../../store';
 
 export function CarouselItem({ node }: CarouselItemComponentProps) {
   useLogRender('CarouselItem');
   node = useNode(node);
-  const attributeKey = (node as any)?.sourceType ?? node.type ?? 'carouselItem';
-  const style = useMemo(() => extractViewStyle(node), [node]);
+  const generatedId = useId();
+  const attributeName =
+    (node as any)?.sourceType ?? node.type ?? 'carouselItem';
+  const attributeKey = node.key ?? generatedId;
+  const { appConfig, projectColors } = useRenderStore((s) => ({
+    appConfig: s.appConfig,
+    projectColors: s.projectColors,
+  }));
+  const style = useMemo(
+    () => extractViewStyle(node, { appConfig, projectColors }),
+    [node, appConfig, projectColors],
+  );
   return (
-    <div className="embla__slide" attribute-key={attributeKey} style={style}>
+    <div
+      className="embla__slide"
+      attribute-name={attributeName}
+      attribute-key={attributeKey}
+      style={style}
+    >
       {node.children && <RenderNode node={node.children} />}
     </div>
   );

package/src/build-components/CarouselItem/CarouselItemProps.generated.ts

@@ -16,6 +16,7 @@ export type JustifyContentOptionType =
   | 'space-between'
   | 'space-around'
   | 'space-evenly';
+export type PositionOptionType = 'relative' | 'absolute';
 
 export interface CarouselItemPropsGenerated {
   child: string;
@@ -42,6 +43,13 @@ export interface CarouselItemPropsGenerated {
     borderRadius?: string;
     width?: string;
     height?: string;
+    flex?: number;
+    position?: PositionOptionType;
+    top?: string;
+    bottom?: string;
+    left?: string;
+    right?: string;
+    zIndex?: number;
   };
 }
 

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

@@ -1,20 +1,31 @@
-import React, { createContext, useMemo } from 'react';
+import React, { createContext, useId, useMemo } from 'react';
 import type { CarouselProviderComponentProps } from './CarouselProviderProps.generated';
 import { RenderNode } from '../..';
 import useEmblaCarousel from 'embla-carousel-react';
 import useNode from '../useNode';
 import { extractViewStyle } from '../../utils/extractViewStyle';
+import { useRenderStore } from '../../store';
 
 export const carouselContext = createContext<any>(undefined);
 function CarouselProvider({ node }: CarouselProviderComponentProps) {
   node = useNode(node);
   const [emblaRef, emblaApi] = useEmblaCarousel(node.attributes as any);
-  const attributeKey =
+  const generatedId = useId();
+  const attributeName =
     (node as any)?.sourceType ?? node.type ?? 'carouselProvider';
-  const viewStyle = useMemo(() => extractViewStyle(node), [node]);
+  const attributeKey = node.key ?? generatedId;
+  const { appConfig, projectColors } = useRenderStore((s) => ({
+    appConfig: s.appConfig,
+    projectColors: s.projectColors,
+  }));
+  const viewStyle = useMemo(
+    () => extractViewStyle(node, { appConfig, projectColors }),
+    [node, appConfig, projectColors],
+  );
   return (
     <carouselContext.Provider value={emblaApi}>
       <div
+        attribute-name={attributeName}
         attribute-key={attributeKey}
         className="carousel-provider"
         style={viewStyle}

package/src/build-components/CarouselProvider/CarouselProviderProps.generated.ts

@@ -16,6 +16,7 @@ export type JustifyContentOptionType =
   | 'space-between'
   | 'space-around'
   | 'space-evenly';
+export type PositionOptionType = 'relative' | 'absolute';
 
 export interface CarouselProviderPropsGenerated {
   child: string;
@@ -42,6 +43,13 @@ export interface CarouselProviderPropsGenerated {
     borderRadius?: string;
     width?: string;
     height?: string;
+    flex?: number;
+    position?: PositionOptionType;
+    top?: string;
+    bottom?: string;
+    left?: string;
+    right?: string;
+    zIndex?: number;
   };
 }
 

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

@@ -1,24 +1,42 @@
-import React, { useMemo } from 'react';
+import React, { useId, useMemo } from 'react';
 import type { ImageComponentProps } from './ImageProps.generated';
 import useNode from '../useNode';
+import { useRenderStore } from '../../store';
 import { extractImageStyle } from '../../utils/extractImageStyle';
-import { extractViewStyle } from '../../utils/extractViewStyle';
 import { useLogRender } from '../../utils/useLogRender';
+import { isNodeSelected, SELECTED_OUTLINE_STYLE } from '../../utils/selection';
+import { useMergedStyle } from '../../utils/useMergedStyle';
 
 function Image({ node }: ImageComponentProps) {
   useLogRender('Image');
   node = useNode(node);
-  const attributeKey = (node as any)?.sourceType ?? node.type ?? 'image';
-  const viewStyle = useMemo(() => extractViewStyle(node), [node]);
-  const imageStyle = extractImageStyle(node);
-  const style = { ...viewStyle, ...imageStyle };
+  const generatedId = useId();
+  const attributeName = (node as any)?.sourceType ?? node.type ?? 'image';
+  const attributeKey = node.key ?? generatedId;
+  const { previewMode, current, appConfig, projectColors } = useRenderStore(
+    (s) => ({
+      previewMode: s.previewMode,
+      current: s.current,
+      appConfig: s.appConfig,
+      projectColors: s.projectColors,
+    }),
+  );
+  const imageStyle = useMemo(
+    () => extractImageStyle(node, { appConfig, projectColors }),
+    [node, appConfig, projectColors],
+  );
+  const isSelected = isNodeSelected({ previewMode, current, node });
+  const style = useMergedStyle(
+    imageStyle,
+    isSelected ? SELECTED_OUTLINE_STYLE : undefined,
+  );
+
   return (
     <img
-      key={node.key}
+      key={node.key + (node.attributes?.src ?? '-')}
+      attribute-name={attributeName}
       attribute-key={attributeKey}
       src={node.attributes?.src}
-      width={node.attributes?.width}
-      height={node.attributes?.height}
       style={style}
       alt=""
     />

package/src/build-components/Image/ImageProps.generated.ts

@@ -16,6 +16,7 @@ export type JustifyContentOptionType =
   | 'space-between'
   | 'space-around'
   | 'space-evenly';
+export type PositionOptionType = 'relative' | 'absolute';
 export type ResizeModeOptionType = 'cover' | 'contain' | 'stretch' | 'center';
 
 export interface ImagePropsGenerated {
@@ -43,6 +44,13 @@ export interface ImagePropsGenerated {
     borderRadius?: string;
     width?: string;
     height?: string;
+    flex?: number;
+    position?: PositionOptionType;
+    top?: string;
+    bottom?: string;
+    left?: string;
+    right?: string;
+    zIndex?: number;
     src?: string;
     resizeMode?: ResizeModeOptionType;
   };

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

@@ -9,8 +9,7 @@
       "src": "string",
       "width": "size",
       "height": "size",
-      "resizeMode": ["cover", "contain", "stretch", "center"],
-      "borderRadius": "size"
+      "resizeMode": ["cover", "contain", "stretch", "center"]
     }
   },
   "meta": {
@@ -45,13 +44,6 @@
         "category": "style",
         "specialCategory": null,
         "sort": 4
-      },
-      "borderRadius": {
-        "label": "Border Radius",
-        "description": "Corner rounding.",
-        "category": "style",
-        "specialCategory": null,
-        "sort": 5
       }
     }
   }

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

@@ -7,10 +7,10 @@ import { useLogRender } from '../../utils/useLogRender';
 function Onboard({ node }: OnboardComponentProps) {
   useLogRender('Onboard');
   node = useNode(node);
-  const attributeKey = node.type ?? 'Onboard';
+  const attributeName = node.type ?? 'Onboard';
   return (
     <Carousel
-      node={{ ...node, type: 'carousel', sourceType: attributeKey } as any}
+      node={{ ...node, type: 'carousel', sourceType: attributeName } as any}
     />
   );
 }

package/src/build-components/Onboard/OnboardProps.generated.ts

@@ -16,6 +16,7 @@ export type JustifyContentOptionType =
   | 'space-between'
   | 'space-around'
   | 'space-evenly';
+export type PositionOptionType = 'relative' | 'absolute';
 
 export interface OnboardPropsGenerated {
   child: string;
@@ -42,6 +43,13 @@ export interface OnboardPropsGenerated {
     borderRadius?: string;
     width?: string;
     height?: string;
+    flex?: number;
+    position?: PositionOptionType;
+    top?: string;
+    bottom?: string;
+    left?: string;
+    right?: string;
+    zIndex?: number;
   };
 }
 

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

@@ -1,4 +1,4 @@
-import React, { useContext, useMemo, useRef } from 'react';
+import React, { useContext, useId, useMemo, useRef } from 'react';
 import type {
   EventObjectGenerated,
   OnboardButtonComponentProps,
@@ -13,16 +13,19 @@ import { useMockOSContext, useMockPermission } from '../../mockOS';
 function OnboardButton({ node }: OnboardButtonComponentProps) {
   useLogRender('OnboardButton');
   node = useNode(node);
-  const attributeKey =
+  const attributeName =
     (node as any)?.sourceType ?? node.type ?? 'OnboardButton';
   const { emblaApi } = useContext(onboardContext) ?? {};
-  const { appConfig } = useRenderStore((s) => ({
+  const { appConfig, projectColors } = useRenderStore((s) => ({
     appConfig: s.appConfig,
+    projectColors: s.projectColors,
   }));
 
   const context = useMockOSContext();
   const mockPermissionManager = useMockPermission(context);
   const handledEventsRef = useRef<EventObjectGenerated[]>([]);
+  const generatedId = useId();
+  const attributeKey = node.key ?? generatedId;
 
   const labelRaw = node.attributes?.labelKey ?? '';
   const label =
@@ -33,7 +36,10 @@ function OnboardButton({ node }: OnboardButtonComponentProps) {
   const flex = node.attributes?.flex ?? 1;
   const textColor = node.attributes?.button_text_color ?? '#FFFFFF';
   const backgroundColor = node.attributes?.button_background_color ?? '#0066FF';
-  const viewStyle = useMemo(() => extractViewStyle(node), [node]);
+  const viewStyle = useMemo(
+    () => extractViewStyle(node, { appConfig, projectColors }),
+    [node, appConfig, projectColors],
+  );
 
   const handleClick = () => {
     //TODO: any ??
@@ -51,7 +57,6 @@ function OnboardButton({ node }: OnboardButtonComponentProps) {
         mockPermissionManager.requestPermission(permission);
         handledEventsRef.current.push(e);
         //TODO: cause user to click second time
-        return;
       } else if (e.type === 'Navigate') {
         const eventTargetIndex = e.targetIndex;
         if (typeof eventTargetIndex === 'number') {
@@ -59,7 +64,6 @@ function OnboardButton({ node }: OnboardButtonComponentProps) {
           navigateHandled = true;
           handledEventsRef.current.push(e);
           //TODO: cause user to click second time
-          return;
         } else if (e.navigate_to) {
           const eventTarget = e.navigate_to;
           if (typeof eventTarget === 'string') {
@@ -72,7 +76,6 @@ function OnboardButton({ node }: OnboardButtonComponentProps) {
               alert('Mock OS context not available for navigation.');
             }
           }
-          return;
         }
       }
     }
@@ -81,6 +84,7 @@ function OnboardButton({ node }: OnboardButtonComponentProps) {
 
   return (
     <button
+      attribute-name={attributeName}
       attribute-key={attributeKey}
       className="onboard__button"
       onClick={handleClick}

package/src/build-components/OnboardButton/OnboardButtonProps.generated.ts

@@ -18,6 +18,7 @@ export type JustifyContentOptionType =
   | 'space-between'
   | 'space-around'
   | 'space-evenly';
+export type PositionOptionType = 'relative' | 'absolute';
 export type AnimationOptionType =
   | 'simple-animation'
   | 'line-animation'
@@ -57,12 +58,18 @@ export interface OnboardButtonPropsGenerated {
     borderRadius?: string;
     width?: string;
     height?: string;
+    flex?: number;
+    position?: PositionOptionType;
+    top?: string;
+    bottom?: string;
+    left?: string;
+    right?: string;
+    zIndex?: number;
     labelKey?: string;
     button_text_color?: string;
     animation?: AnimationOptionType;
     animation_color?: string;
     button_background_color?: string;
-    flex?: number;
     events?: EventObjectGenerated[];
   };
 }