@developer_tribe/react-builder 1.0.3 → 1.0.5

package/src/attributes-editor/Field.tsx

@@ -9,6 +9,7 @@ import {
 } from '../utils/patterns';
 import { Checkbox } from '../components/Checkbox';
 import { LayoutPreviewPicker } from './LayoutPreviewPicker';
+import { SizeField, type PreferredScale } from './SizeField';
 import { LayoutContext, LayoutFieldName, isBooleanFieldType } from './types';
 
 export type FieldProps = {
@@ -21,7 +22,7 @@ export type FieldProps = {
   layoutContext?: LayoutContext;
   viewAttributes?: Partial<ViewPropsGenerated['attributes']>;
   label?: React.ReactNode;
-  preferredScale?: string;
+  preferredScale?: PreferredScale;
 };
 
 const layoutFieldNames: LayoutFieldName[] = [
@@ -251,10 +252,54 @@ export function Field({
                   );
                 })}
               </div>
-              <div style={{ marginTop: 8 }}>
+              <div
+                style={{
+                  marginTop: 8,
+                  display: 'flex',
+                  alignItems: 'center',
+                  justifyContent: 'space-between',
+                  gap: 8,
+                }}
+              >
+                <div style={{ display: 'flex', gap: 4 }}>
+                  <button
+                    type="button"
+                    onClick={(event) => {
+                      event.stopPropagation();
+                      if (idx <= 0) return;
+                      const next = [...arr];
+                      const tmp = next[idx - 1];
+                      next[idx - 1] = next[idx];
+                      next[idx] = tmp;
+                      onChange(next);
+                    }}
+                    disabled={idx <= 0}
+                    aria-label="Move up"
+                  >
+                    ↑
+                  </button>
+                  <button
+                    type="button"
+                    onClick={(event) => {
+                      event.stopPropagation();
+                      if (idx >= arr.length - 1) return;
+                      const next = [...arr];
+                      const tmp = next[idx + 1];
+                      next[idx + 1] = next[idx];
+                      next[idx] = tmp;
+                      onChange(next);
+                    }}
+                    disabled={idx >= arr.length - 1}
+                    aria-label="Move down"
+                  >
+                    ↓
+                  </button>
+                </div>
+
                 <button
                   type="button"
-                  onClick={() => {
+                  onClick={(event) => {
+                    event.stopPropagation();
                     const next = arr.filter((_, i) => i !== idx);
                     onChange(next.length ? next : undefined);
                   }}
@@ -510,160 +555,3 @@ function ColorPickerButton({
     </>
   );
 }
-
-type SizeUnit = '' | 'vs' | 's' | 'f' | '%';
-
-function parseSizeValue(value: unknown): { amount: string; unit: SizeUnit } {
-  const empty = { amount: '', unit: '' as SizeUnit };
-  if (typeof value === 'number' && Number.isFinite(value)) {
-    return { amount: String(value), unit: '' };
-  }
-  if (typeof value !== 'string') return empty;
-  const trimmed = value.trim();
-  if (!trimmed) return empty;
-  if (trimmed.endsWith('%')) {
-    return { amount: trimmed.slice(0, -1), unit: '%' };
-  }
-  const lower = trimmed.toLowerCase();
-  if (lower.endsWith('@vs'))
-    return { amount: trimmed.slice(0, -3), unit: 'vs' };
-  if (lower.endsWith('vs')) return { amount: trimmed.slice(0, -2), unit: 'vs' };
-  if (lower.endsWith('@fs')) return { amount: trimmed.slice(0, -3), unit: 'f' };
-  if (lower.endsWith('@f')) return { amount: trimmed.slice(0, -2), unit: 'f' };
-  if (lower.endsWith('fs')) return { amount: trimmed.slice(0, -2), unit: 'f' };
-  if (lower.endsWith('f')) return { amount: trimmed.slice(0, -1), unit: 'f' };
-  if (lower.endsWith('@s')) return { amount: trimmed.slice(0, -2), unit: 's' };
-  if (lower.endsWith('s')) return { amount: trimmed.slice(0, -1), unit: 's' };
-  if (lower.endsWith('px')) return { amount: trimmed.slice(0, -2), unit: '' };
-  return { amount: trimmed, unit: '' };
-}
-
-function composeSizeValue(amount: string, unit: SizeUnit): string | number {
-  const trimmed = amount.trim();
-  if (unit === '%') {
-    return `${trimmed}%`;
-  }
-  if (unit === '') {
-    const numeric = Number(trimmed);
-    return Number.isFinite(numeric) ? numeric : trimmed;
-  }
-  if (unit === 'f') {
-    return `${trimmed}@fs`;
-  }
-  return `${trimmed}@${unit}`;
-}
-
-type SizeFieldProps = {
-  value: unknown;
-  onChange: (val: unknown) => void;
-  preferredScale?: string;
-  fieldName: string;
-};
-
-function normalizePreferredScale(
-  preferredScale: string | undefined,
-  fieldName: string,
-): SizeUnit {
-  const fallbackName = fieldName.trim().toLowerCase();
-  const fallback: SizeUnit =
-    fallbackName.includes('height') ||
-    fallbackName.includes('top') ||
-    fallbackName.includes('vertical')
-      ? 'vs'
-      : 's';
-  if (typeof preferredScale !== 'string') return fallback;
-  const normalized = preferredScale.trim().toLowerCase();
-  if (
-    normalized === 'vs' ||
-    normalized === 's' ||
-    normalized === 'f' ||
-    normalized === '%'
-  ) {
-    return normalized as SizeUnit;
-  }
-  return fallback;
-}
-
-function SizeField({
-  value,
-  onChange,
-  preferredScale,
-  fieldName,
-}: SizeFieldProps) {
-  const parsed = useMemo(() => parseSizeValue(value), [value]);
-  const normalizedPreferred = useMemo(
-    () => normalizePreferredScale(preferredScale, fieldName),
-    [preferredScale, fieldName],
-  );
-  const [amount, setAmount] = useState(parsed.amount);
-  const [unit, setUnit] = useState<SizeUnit>(
-    parsed.unit || normalizedPreferred,
-  );
-
-  useEffect(() => {
-    setAmount(parsed.amount);
-    setUnit(parsed.unit || normalizedPreferred);
-  }, [parsed.amount, parsed.unit, normalizedPreferred]);
-
-  const emitValue = useCallback(
-    (nextAmount: string, nextUnit: SizeUnit) => {
-      const trimmed = nextAmount.trim();
-      if (!trimmed) {
-        onChange(undefined);
-        return;
-      }
-      onChange(composeSizeValue(trimmed, nextUnit));
-    },
-    [onChange],
-  );
-
-  const handleAmountChange = (e: React.ChangeEvent<HTMLInputElement>) => {
-    const nextAmount = e.target.value;
-    setAmount(nextAmount);
-    if (!nextAmount.trim()) {
-      onChange(undefined);
-      return;
-    }
-    emitValue(nextAmount, unit);
-  };
-
-  const handleUnitChange = (e: React.ChangeEvent<HTMLSelectElement>) => {
-    const nextUnit = e.target.value as SizeUnit;
-    setUnit(nextUnit);
-    if (!amount.trim()) return;
-    emitValue(amount, nextUnit);
-  };
-
-  const unitPriority: SizeUnit[] = ['vs', 's', 'f', '%'];
-  const orderedUnits = [
-    normalizedPreferred,
-    ...unitPriority.filter((unit) => unit !== normalizedPreferred),
-  ];
-  const unitOptions: Array<{ value: SizeUnit; label: string }> =
-    orderedUnits.map((unit) => ({
-      value: unit,
-      label: unit === normalizedPreferred ? `${unit}` : unit,
-    }));
-
-  return (
-    <div className="attributes-editor__size-field">
-      <input
-        type="number"
-        className="input attributes-editor__size-field-input"
-        value={amount}
-        onChange={handleAmountChange}
-      />
-      <select
-        className="input attributes-editor__size-field-select"
-        value={unit}
-        onChange={handleUnitChange}
-      >
-        {unitOptions.map((opt) => (
-          <option key={opt.value} value={opt.value}>
-            {opt.label}
-          </option>
-        ))}
-      </select>
-    </div>
-  );
-}

package/src/attributes-editor/SizeField.tsx

@@ -0,0 +1,184 @@
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
+
+type SizeUnit = '' | 'vs' | 's' | 'f' | '%';
+type SizeSelectUnit = SizeUnit | 'auto';
+
+export type PreferredScale = 'vs' | 's' | 'f' | '%';
+
+export function toPreferredScale(value: unknown): PreferredScale | undefined {
+  if (value === 'vs' || value === 's' || value === 'f' || value === '%') {
+    return value;
+  }
+  if (typeof value !== 'string') return undefined;
+  const normalized = value.trim().toLowerCase();
+  return normalized === 'vs' ||
+    normalized === 's' ||
+    normalized === 'f' ||
+    normalized === '%'
+    ? (normalized as PreferredScale)
+    : undefined;
+}
+
+export type SizeFieldProps = {
+  value: unknown;
+  onChange: (val: unknown) => void;
+  preferredScale?: PreferredScale;
+  fieldName: string;
+};
+
+function parseSizeValue(value: unknown): { amount: string; unit: SizeUnit } {
+  const empty = { amount: '', unit: '' as SizeUnit };
+  if (typeof value === 'number' && Number.isFinite(value)) {
+    return { amount: String(value), unit: '' };
+  }
+  if (typeof value !== 'string') return empty;
+  const trimmed = value.trim();
+  if (!trimmed) return empty;
+  if (trimmed.endsWith('%')) {
+    return { amount: trimmed.slice(0, -1), unit: '%' };
+  }
+  const lower = trimmed.toLowerCase();
+  if (lower.endsWith('@vs'))
+    return { amount: trimmed.slice(0, -3), unit: 'vs' };
+  if (lower.endsWith('vs')) return { amount: trimmed.slice(0, -2), unit: 'vs' };
+  if (lower.endsWith('@fs')) return { amount: trimmed.slice(0, -3), unit: 'f' };
+  if (lower.endsWith('@f')) return { amount: trimmed.slice(0, -2), unit: 'f' };
+  if (lower.endsWith('fs')) return { amount: trimmed.slice(0, -2), unit: 'f' };
+  if (lower.endsWith('f')) return { amount: trimmed.slice(0, -1), unit: 'f' };
+  if (lower.endsWith('@s')) return { amount: trimmed.slice(0, -2), unit: 's' };
+  if (lower.endsWith('s')) return { amount: trimmed.slice(0, -1), unit: 's' };
+  if (lower.endsWith('px')) return { amount: trimmed.slice(0, -2), unit: '' };
+  return { amount: trimmed, unit: '' };
+}
+
+function composeSizeValue(amount: string, unit: SizeUnit): string | number {
+  const trimmed = amount.trim();
+  if (unit === '%') {
+    return `${trimmed}%`;
+  }
+  if (unit === '') {
+    const numeric = Number(trimmed);
+    return Number.isFinite(numeric) ? numeric : trimmed;
+  }
+  if (unit === 'f') {
+    return `${trimmed}@fs`;
+  }
+  return `${trimmed}@${unit}`;
+}
+
+function normalizePreferredScale(
+  preferredScale: PreferredScale | undefined,
+  fieldName: string,
+): SizeUnit {
+  const fallbackName = fieldName.trim().toLowerCase();
+  const fallback: SizeUnit =
+    fallbackName.includes('height') ||
+    fallbackName.includes('top') ||
+    fallbackName.includes('vertical')
+      ? 'vs'
+      : 's';
+  return preferredScale ?? fallback;
+}
+
+export function SizeField({
+  value,
+  onChange,
+  preferredScale,
+  fieldName,
+}: SizeFieldProps) {
+  const parsed = useMemo(() => parseSizeValue(value), [value]);
+  const normalizedPreferred = useMemo(
+    () => normalizePreferredScale(preferredScale, fieldName),
+    [preferredScale, fieldName],
+  );
+
+  const [amount, setAmount] = useState(parsed.amount);
+  const [unit, setUnit] = useState<SizeSelectUnit>(() => {
+    // Default to "auto" when the stored unit is already the preferred one (or empty)
+    // so that "auto" means "use preferredScale" without changing behavior.
+    return parsed.unit && parsed.unit !== normalizedPreferred
+      ? parsed.unit
+      : 'auto';
+  });
+
+  useEffect(() => {
+    setAmount(parsed.amount);
+
+    // Keep "auto" selected whenever value is preferred (or unscaled).
+    const nextUnit: SizeSelectUnit =
+      parsed.unit && parsed.unit !== normalizedPreferred ? parsed.unit : 'auto';
+    setUnit(nextUnit);
+  }, [parsed.amount, parsed.unit, normalizedPreferred]);
+
+  const resolveUnit = useCallback(
+    (nextUnit: SizeSelectUnit): SizeUnit =>
+      nextUnit === 'auto' ? normalizedPreferred : nextUnit,
+    [normalizedPreferred],
+  );
+
+  const emitValue = useCallback(
+    (nextAmount: string, nextUnit: SizeSelectUnit) => {
+      const trimmed = nextAmount.trim();
+      if (!trimmed) {
+        onChange(undefined);
+        return;
+      }
+      // If "auto" is selected, persist the preferredScale.
+      onChange(composeSizeValue(trimmed, resolveUnit(nextUnit)));
+    },
+    [onChange, resolveUnit],
+  );
+
+  const handleAmountChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+    const nextAmount = e.target.value;
+    setAmount(nextAmount);
+    if (!nextAmount.trim()) {
+      onChange(undefined);
+      return;
+    }
+    emitValue(nextAmount, unit);
+  };
+
+  const handleUnitChange = (e: React.ChangeEvent<HTMLSelectElement>) => {
+    const nextUnit = e.target.value as SizeSelectUnit;
+    setUnit(nextUnit);
+    if (!amount.trim()) return;
+    emitValue(amount, nextUnit);
+  };
+
+  const unitPriority: SizeUnit[] = ['vs', 's', 'f', '%'];
+  const orderedUnits = [
+    normalizedPreferred,
+    ...unitPriority.filter((u) => u !== normalizedPreferred),
+  ];
+
+  const unitOptions: Array<{ value: SizeSelectUnit; label: string }> = [
+    { value: 'auto', label: 'auto' },
+    ...orderedUnits.map((u) => ({
+      value: u,
+      label: u === normalizedPreferred ? `${u} (preferred)` : u,
+    })),
+  ];
+
+  return (
+    <div className="attributes-editor__size-field">
+      <input
+        type="number"
+        className="input attributes-editor__size-field-input"
+        value={amount}
+        onChange={handleAmountChange}
+      />
+      <select
+        className="input attributes-editor__size-field-select"
+        value={unit}
+        onChange={handleUnitChange}
+      >
+        {unitOptions.map((opt) => (
+          <option key={opt.value} value={opt.value}>
+            {opt.label}
+          </option>
+        ))}
+      </select>
+    </div>
+  );
+}

package/src/attributes-editor/SpecialCategorySection.tsx

@@ -3,6 +3,7 @@ import { NodeDefaultAttribute } from '../types/Node';
 import type { ProjectColors } from '../types/Project';
 import { Field } from './Field';
 import { FieldInfoTooltip } from './FieldInfoTooltip';
+import { toPreferredScale } from './SizeField';
 import {
   AttributeMetaMap,
   LayoutContext,
@@ -92,7 +93,9 @@ export function SpecialCategorySection({
         {entries.map(({ name, type }) => {
           const label = attributeMeta?.[name]?.label ?? name;
           const description = attributeMeta?.[name]?.description;
-          const preferredScale = attributeMeta?.[name]?.preferedScale;
+          const preferredScale = toPreferredScale(
+            attributeMeta?.[name]?.preferedScale,
+          );
           const currentValue = (attributes as Record<string, unknown>)[name];
           const isBoolean = isBooleanFieldType(type);
           const fieldSlot = detectFieldSlot(name);
@@ -169,7 +172,9 @@ export function SpecialCategorySection({
         {boxEntries.map(({ name, type }) => {
           const label = attributeMeta?.[name]?.label ?? name;
           const description = attributeMeta?.[name]?.description;
-          const preferredScale = attributeMeta?.[name]?.preferedScale;
+          const preferredScale = toPreferredScale(
+            attributeMeta?.[name]?.preferedScale,
+          );
           const currentValue = (attributes as Record<string, unknown>)[name];
           const isBoolean = isBooleanFieldType(type);
           const fieldSlot = detectFieldSlot(name);
@@ -212,7 +217,9 @@ export function SpecialCategorySection({
           {baseEntries.map(({ name, type }) => {
             const label = attributeMeta?.[name]?.label ?? name;
             const description = attributeMeta?.[name]?.description;
-            const preferredScale = attributeMeta?.[name]?.preferedScale;
+            const preferredScale = toPreferredScale(
+              attributeMeta?.[name]?.preferedScale,
+            );
             const currentValue = (attributes as Record<string, unknown>)[name];
             const isBoolean = isBooleanFieldType(type);
             const wrapperClassNames = [
@@ -270,7 +277,7 @@ export function SpecialCategorySection({
             className="special-category-section__toggle"
             data-active={showAdvanced}
           >
-            {showAdvanced ? 'Hide advanced' : 'Show advanced'}
+            {showAdvanced ? 'Show less' : 'Show more'}
           </button>
         ) : null}
       </div>

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

@@ -0,0 +1,56 @@
+import React, { useId, useMemo } from 'react';
+import type { BIconComponentProps } from './BIconProps.generated';
+import useNode from '../useNode';
+import { useRenderStore } from '../../store';
+import { extractViewStyle } from '../../utils/extractViewStyle';
+import { useLogRender } from '../../utils/useLogRender';
+import { isNodeSelected, SELECTED_OUTLINE_STYLE } from '../../utils/selection';
+import { useMergedStyle } from '../../utils/useMergedStyle';
+import { Icon } from '../../components/Icon.generated';
+import { IconsType } from '../../types/Icons';
+import { extractTextStyle } from '../../utils/extractTextStyle';
+
+function BIcon({ node }: BIconComponentProps) {
+  useLogRender('BIcon');
+  node = useNode(node);
+  const generatedId = useId();
+  const attributeName = (node as any)?.sourceType ?? node.type ?? 'BIcon';
+  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(
+    () => extractTextStyle(node, { appConfig, projectColors }),
+    [node, appConfig, projectColors],
+  );
+  const isSelected = isNodeSelected({ previewMode, current, node });
+  const style = useMergedStyle(
+    baseStyle,
+    isSelected ? SELECTED_OUTLINE_STYLE : undefined,
+  );
+  const iconType = node.attributes?.iconType ?? 'activity';
+  const strokeWidth = node.attributes?.strokeWidth;
+
+  return (
+    <Icon
+      attribute-name={attributeName}
+      attribute-key={attributeKey}
+      iconType={iconType as IconsType}
+      //TODO: font size general like theme
+      size={(style.fontSize as number) ?? 16}
+      strokeWidth={typeof strokeWidth === 'number' ? strokeWidth : undefined}
+      style={style}
+      color={style.color}
+      alt=""
+    />
+  );
+}
+
+export default React.memo(BIcon);

package/src/build-components/BIcon/BIconProps.generated.ts

@@ -0,0 +1,82 @@
+/* AUTO-GENERATED FILE - DO NOT EDIT */
+
+import type { NodeData } from '../../types/Node';
+
+export type FontWeightOptionType =
+  | 'normal'
+  | 'bold'
+  | '100'
+  | '200'
+  | '300'
+  | '400'
+  | '500'
+  | '600'
+  | '700'
+  | '800'
+  | '900';
+export type TextAlignOptionType = 'left' | 'center' | 'right' | 'justify';
+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 PositionOptionType = 'relative' | 'absolute';
+
+export interface BIconPropsGenerated {
+  child: string;
+  attributes: {
+    color?: string;
+    fontSize?: string;
+    fontWeight?: FontWeightOptionType;
+    textAlign?: TextAlignOptionType;
+    scrollable?: boolean;
+    flexDirection?: FlexDirectionOptionType;
+    alignItems?: AlignItemsOptionType;
+    justifyContent?: JustifyContentOptionType;
+    gap?: string;
+    padding?: string;
+    paddingHorizontal?: string;
+    paddingVertical?: string;
+    paddingTop?: string;
+    paddingBottom?: string;
+    paddingLeft?: string;
+    paddingRight?: string;
+    margin?: string;
+    marginVertical?: string;
+    marginTop?: string;
+    marginBottom?: string;
+    marginLeft?: string;
+    marginRight?: string;
+    backgroundColor?: string;
+    borderRadius?: string;
+    width?: string;
+    minWidth?: string;
+    maxWidth?: string;
+    height?: string;
+    minHeight?: string;
+    maxHeight?: string;
+    flex?: number;
+    position?: PositionOptionType;
+    top?: string;
+    bottom?: string;
+    left?: string;
+    right?: string;
+    zIndex?: number;
+    iconType?: string;
+    size?: number;
+    strokeWidth?: number;
+  };
+}
+
+export interface BIconComponentProps {
+  node: NodeData<BIconPropsGenerated['attributes']>;
+}

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

@@ -0,0 +1,47 @@
+{
+  "schemaVersion": 1,
+  "allowUnknownAttributes": false,
+  "pattern": {
+    "type": "BIcon",
+    "children": "never",
+    "extends": "Text",
+    "attributes": {
+      "iconType": "iconType",
+      "size": "number",
+      "strokeWidth": "number"
+    },
+    "defaults": {
+      "iconType": "activity",
+      "fontSize": "16",
+      "strokeWidth": 1.5
+    }
+  },
+  "meta": {
+    "desiredParent": ["all"],
+    "label": "BIcon",
+    "description": "Renders an icon from the icon set.",
+    "attributes": {
+      "iconType": {
+        "label": "Icon",
+        "description": "Which icon to render.",
+        "category": "other",
+        "specialCategory": null,
+        "sort": 1
+      },
+      "size": {
+        "label": "Size",
+        "description": "Icon size (px).",
+        "category": "style",
+        "specialCategory": null,
+        "sort": 2
+      },
+      "strokeWidth": {
+        "label": "Stroke Width",
+        "description": "SVG stroke width override (applied to the icon paths).",
+        "category": "style",
+        "specialCategory": null,
+        "sort": 3
+      }
+    }
+  }
+}

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

@@ -4,6 +4,8 @@ import useNode from '../useNode';
 import { useRenderStore } from '../../store';
 import { extractViewStyle } from '../../utils/extractViewStyle';
 import { useLogRender } from '../../utils/useLogRender';
+import { isNodeSelected, SELECTED_OUTLINE_STYLE } from '../../utils/selection';
+import { useMergedStyle } from '../../utils/useMergedStyle';
 
 function BackgroundImage({ node }: BackgroundImageComponentProps) {
   useLogRender('BackgroundImage');
@@ -56,25 +58,13 @@ function BackgroundImage({ node }: BackgroundImageComponentProps) {
 
     return style;
   }, [node]);
-  const isSelected =
-    previewMode &&
-    !!current &&
-    (current as any)?.key &&
-    (node as any)?.key &&
-    (current as any).key === (node as any).key;
-
-  const mergedStyle = useMemo(
-    () => ({
-      ...baseStyle,
-      ...backgroundStyle,
-    }),
-    [baseStyle, backgroundStyle],
+  const isSelected = isNodeSelected({ previewMode, current, node });
+  const mergedStyle = useMergedStyle(baseStyle, backgroundStyle);
+  const style = useMergedStyle(
+    mergedStyle,
+    isSelected ? SELECTED_OUTLINE_STYLE : undefined,
   );
 
-  const style = isSelected
-    ? { ...mergedStyle, outline: '2px solid #2684FF' }
-    : mergedStyle;
-
   return (
     <div
       attribute-name={attributeName}