juxscript 1.0.20 → 1.0.21

package/lib/components/radio.ts

@@ -1,111 +1,86 @@
-import { getOrCreateContainer } from './helpers.js';
-import { State } from '../reactivity/state.js';
+import { FormInput, FormInputState } from './base/FormInput.js';
+
+// Event definitions
+const TRIGGER_EVENTS = [] as const;
+const CALLBACK_EVENTS = ['change'] as const;
 
-/**
- * Radio option
- */
 export interface RadioOption {
     label: string;
     value: string;
     disabled?: boolean;
 }
 
-/**
- * Radio component options
- */
 export interface RadioOptions {
     options?: RadioOption[];
     value?: string;
+    label?: string;
+    required?: boolean;
+    disabled?: boolean;
     name?: string;
-    orientation?: 'vertical' | 'horizontal';
+    orientation?: 'vertical' | 'horizontal';  // ✅ Add orientation
     style?: string;
     class?: string;
+    onValidate?: (value: string) => boolean | string;
 }
 
-/**
- * Radio component state
- */
-type RadioState = {
+interface RadioState extends FormInputState {
     options: RadioOption[];
     value: string;
-    name: string;
-    orientation: string;
-    style: string;
-    class: string;
-};
-
-/**
- * Radio component - Radio button group
- * 
- * Usage:
- *   jux.radio('size', {
- *     options: [
- *       { label: 'Small', value: 's' },
- *       { label: 'Medium', value: 'm' },
- *       { label: 'Large', value: 'l' }
- *     ],
- *     value: 'm'
- *   })
- *   .bind('change', (e) => console.log(e.target.value))
- *   .render('#form');
- * 
- *   // Two-way binding with state
- *   const sizeState = state('m');
- *   jux.radio('size')
- *     .sync('value', sizeState)
- *     .render('#form');
- */
-export class Radio {
-    state: RadioState;
-    container: HTMLElement | null = null;
-    _id: string;
-    id: string;
-
-    // CRITICAL: Store bind/sync instructions for deferred wiring
-    private _bindings: Array<{ event: string, handler: Function }> = [];
-    private _syncBindings: Array<{
-        property: string,
-        stateObj: State<any>,
-        toState?: Function,
-        toComponent?: Function
-    }> = [];
+    orientation: 'vertical' | 'horizontal';  // ✅ Add to state
+}
 
-    constructor(id: string, options: RadioOptions = {}) {
-        this._id = id;
-        this.id = id;
+export class Radio extends FormInput<RadioState> {
+    private _radioInputs: HTMLInputElement[] = [];
 
-        this.state = {
+    constructor(id: string, options: RadioOptions = {}) {
+        super(id, {
             options: options.options ?? [],
             value: options.value ?? '',
+            label: options.label ?? '',
+            required: options.required ?? false,
+            disabled: options.disabled ?? false,
             name: options.name ?? id,
-            orientation: options.orientation ?? 'vertical',
+            orientation: options.orientation ?? 'vertical',  // ✅ Default to vertical
             style: options.style ?? '',
-            class: options.class ?? ''
-        };
+            class: options.class ?? '',
+            errorMessage: undefined
+        });
+
+        if (options.onValidate) {
+            this._onValidate = options.onValidate;
+        }
     }
 
-    /* -------------------------
-     * Fluent API
-     * ------------------------- */
+    protected getTriggerEvents(): readonly string[] {
+        return TRIGGER_EVENTS;
+    }
 
-    options(value: RadioOption[]): this {
-        this.state.options = value;
-        return this;
+    protected getCallbackEvents(): readonly string[] {
+        return CALLBACK_EVENTS;
     }
 
-    addOption(option: RadioOption): this {
-        this.state.options = [...this.state.options, option];
+    /* ═════════════════════════════════════════════════════════════════
+     * FLUENT API
+     * ═════════════════════════════════════════════════════════════════ */
+
+    // ✅ Inherited from FormInput/BaseComponent:
+    // - label(), required(), name(), onValidate()
+    // - validate(), isValid()
+    // - style(), class()
+    // - bind(), sync(), renderTo()
+    // - disabled(), enable(), disable()
+
+    options(value: RadioOption[]): this {
+        this.state.options = value;
         return this;
     }
 
     value(value: string): this {
-        this.state.value = value;
-        this._updateElement();
-        return this;
+        return this.setValue(value);
     }
 
-    name(value: string): this {
-        this.state.name = value;
+    addOption(option: RadioOption): this {
+        this.state.options = [...this.state.options, option];
         return this;
     }
 
@@ -114,219 +89,293 @@ export class Radio {
         return this;
     }
 
-    style(value: string): this {
-        this.state.style = value;
-        return this;
-    }
+    /* ═════════════════════════════════════════════════════════════════
+     * FORM INPUT IMPLEMENTATION
+     * ═════════════════════════════════════════════════════════════════ */
 
-    class(value: string): this {
-        this.state.class = value;
-        return this;
+    getValue(): string {
+        return this.state.value;
     }
 
-    /**
-     * Bind event handler (stores for wiring in render)
-     * DOM events only: change, click, focus, blur, etc.
-     */
-    bind(event: string, handler: Function): this {
-        this._bindings.push({ event, handler });
+    setValue(value: string): this {
+        this.state.value = value;
+
+        // Update all radio inputs
+        this._radioInputs.forEach(input => {
+            input.checked = input.value === value;
+        });
+
         return this;
     }
 
-    /**
-     * Two-way sync with state (stores for wiring in render)
-     * 
-     * @param property - Component property to sync ('value', 'options')
-     * @param stateObj - State object to sync with
-     * @param toState - Optional transform function when going from component to state
-     * @param toComponent - Optional transform function when going from state to component
-     */
-    sync(property: string, stateObj: State<any>, toState?: Function, toComponent?: Function): this {
-        if (!stateObj || typeof stateObj.subscribe !== 'function') {
-            throw new Error(`Radio.sync: Expected a State object for property "${property}"`);
+    protected _validateValue(value: string): boolean | string {
+        const { required, options } = this.state;
+
+        if (required && !value) {
+            return 'Please select an option';
         }
-        this._syncBindings.push({ property, stateObj, toState, toComponent });
-        return this;
-    }
 
-    /* -------------------------
-     * Helpers
-     * ------------------------- */
+        // Validate that value is one of the options
+        if (value && !options.some(opt => opt.value === value)) {
+            return 'Invalid option selected';
+        }
 
-    private _updateElement(): void {
-        const inputs = document.querySelectorAll(`input[name="${this.state.name}"]`);
-        inputs.forEach((input) => {
-            const radioInput = input as HTMLInputElement;
-            radioInput.checked = radioInput.value === this.state.value;
-        });
+        if (this._onValidate) {
+            const result = this._onValidate(value);
+            if (result !== true) {
+                return result || 'Invalid value';
+            }
+        }
+
+        return true;
     }
 
-    getValue(): string {
-        return this.state.value;
+    protected _buildInputElement(): HTMLElement {
+        // Radio uses a container, not a single input
+        const container = document.createElement('div');
+        container.className = 'jux-radio-options';
+        return container;
     }
 
-    /* -------------------------
-     * Render
-     * ------------------------- */
+    /* ═════════════════════════════════════════════════════════════════
+     * RENDER
+     * ═════════════════════════════════════════════════════════════════ */
 
     render(targetId?: string): this {
-        // === 1. SETUP: Get or create container ===
-        let container: HTMLElement;
-        if (targetId) {
-            const target = document.querySelector(targetId);
-            if (!target || !(target instanceof HTMLElement)) {
-                throw new Error(`Radio: Target "${targetId}" not found`);
-            }
-            container = target;
-        } else {
-            container = getOrCreateContainer(this._id);
-        }
-        this.container = container;
+        const container = this._setupContainer(targetId);
 
-        // === 2. PREPARE: Destructure state and check sync flags ===
-        const { options, value, name, orientation, style, class: className } = this.state;
-        const hasValueSync = this._syncBindings.some(b => b.property === 'value');
+        const { options, value, name, disabled, orientation, style, class: className } = this.state;  // ✅ Destructure orientation
 
-        // === 3. BUILD: Create DOM elements ===
+        // Build wrapper
         const wrapper = document.createElement('div');
-        wrapper.className = `jux-radio jux-radio-${orientation}`;
+        wrapper.className = 'jux-radio';
         wrapper.id = this._id;
         if (className) wrapper.className += ` ${className}`;
         if (style) wrapper.setAttribute('style', style);
 
-        const inputs: HTMLInputElement[] = [];
+        // Label
+        if (this.state.label) {
+            wrapper.appendChild(this._renderLabel());
+        }
+
+        // Radio options container
+        const optionsContainer = document.createElement('div');
+        optionsContainer.className = `jux-radio-options jux-radio-${orientation}`;  // ✅ Add orientation class
+        this._inputElement = optionsContainer;
 
-        options.forEach((option) => {
-            const radioItem = document.createElement('div');
-            radioItem.className = 'jux-radio-item';
+        this._radioInputs = [];
 
-            const label = document.createElement('label');
-            label.className = 'jux-radio-label';
+        options.forEach((option, index) => {
+            const radioWrapper = document.createElement('label');
+            radioWrapper.className = 'jux-radio-option';
 
             const input = document.createElement('input');
             input.type = 'radio';
             input.className = 'jux-radio-input';
+            input.id = `${this._id}-option-${index}`;
             input.name = name;
             input.value = option.value;
             input.checked = option.value === value;
-            input.disabled = option.disabled || false;
-            inputs.push(input);
+            input.disabled = disabled || option.disabled || false;
+
+            this._radioInputs.push(input);
+
+            const radioMark = document.createElement('span');
+            radioMark.className = 'jux-radio-mark';
 
-            const checkmark = document.createElement('span');
-            checkmark.className = 'jux-radio-checkmark';
+            const labelText = document.createElement('span');
+            labelText.className = 'jux-radio-label-text';
+            labelText.textContent = option.label;
 
-            const text = document.createElement('span');
-            text.className = 'jux-radio-text';
-            text.textContent = option.label;
+            radioWrapper.appendChild(input);
+            radioWrapper.appendChild(radioMark);
+            radioWrapper.appendChild(labelText);
 
-            label.appendChild(input);
-            label.appendChild(checkmark);
-            label.appendChild(text);
-            radioItem.appendChild(label);
-            wrapper.appendChild(radioItem);
+            optionsContainer.appendChild(radioWrapper);
         });
 
-        // === 4. WIRE: Attach event listeners and sync bindings ===
+        wrapper.appendChild(optionsContainer);
 
-        // Default behavior (only if NOT using sync)
-        if (!hasValueSync) {
-            inputs.forEach(input => {
-                input.addEventListener('change', () => {
-                    if (input.checked) {
-                        this.state.value = input.value;
-                    }
-                });
-            });
-        }
+        // Error element
+        wrapper.appendChild(this._renderError());
 
-        // Wire custom bindings from .bind() calls
-        this._bindings.forEach(({ event, handler }) => {
-            wrapper.addEventListener(event, handler as EventListener);
-        });
+        // Wire events
+        this._wireStandardEvents(wrapper);
 
-        // Wire sync bindings from .sync() calls
-        this._syncBindings.forEach(({ property, stateObj, toState, toComponent }) => {
-            if (property === 'value') {
-                const transformToState = toState || ((v: any) => v);
-                const transformToComponent = toComponent || ((v: any) => String(v));
+        // Wire radio-specific sync
+        const valueSync = this._syncBindings.find(b => b.property === 'value');
 
-                let isUpdating = false;
+        if (valueSync) {
+            const { stateObj, toState, toComponent } = valueSync;
+
+            const transformToState = toState || ((v: string) => v);
+            const transformToComponent = toComponent || ((v: any) => String(v));
+
+            let isUpdating = false;
+
+            // State → Component
+            stateObj.subscribe((val: any) => {
+                if (isUpdating) return;
+                const transformed = transformToComponent(val);
+                this.setValue(transformed);
+            });
 
-                // State → Component
-                stateObj.subscribe((val: any) => {
+            // Component → State
+            this._radioInputs.forEach(input => {
+                input.addEventListener('change', () => {
                     if (isUpdating) return;
-                    const transformed = transformToComponent(val);
-                    inputs.forEach(input => {
-                        input.checked = input.value === transformed;
-                    });
-                    this.state.value = transformed;
-                });
+                    isUpdating = true;
+
+                    const selectedValue = input.value;
+                    this.state.value = selectedValue;
+                    this._clearError();
 
-                // Component → State
-                inputs.forEach(input => {
-                    input.addEventListener('change', () => {
-                        if (isUpdating || !input.checked) return;
-                        isUpdating = true;
+                    const transformed = transformToState(selectedValue);
+                    stateObj.set(transformed);
 
-                        const transformed = transformToState(input.value);
-                        this.state.value = input.value;
-                        stateObj.set(transformed);
+                    // 🎯 Fire the change callback event
+                    this._triggerCallback('change', selectedValue);
 
-                        setTimeout(() => { isUpdating = false; }, 0);
-                    });
+                    setTimeout(() => { isUpdating = false; }, 0);
                 });
-            }
-            else if (property === 'options') {
-                const transformToComponent = toComponent || ((v: any) => v);
-
-                stateObj.subscribe((val: any) => {
-                    const transformed = transformToComponent(val);
-                    this.state.options = transformed;
-
-                    // Re-render options
-                    wrapper.innerHTML = '';
-                    transformed.forEach((option: any) => {
-                        const radioItem = document.createElement('div');
-                        radioItem.className = 'jux-radio-item';
-
-                        const label = document.createElement('label');
-                        label.className = 'jux-radio-label';
-
-                        const input = document.createElement('input');
-                        input.type = 'radio';
-                        input.className = 'jux-radio-input';
-                        input.name = this.state.name;
-                        input.value = option.value;
-                        input.checked = option.value === this.state.value;
-                        input.disabled = option.disabled || false;
-
-                        const checkmark = document.createElement('span');
-                        checkmark.className = 'jux-radio-checkmark';
-
-                        const text = document.createElement('span');
-                        text.className = 'jux-radio-text';
-                        text.textContent = option.label;
-
-                        label.appendChild(input);
-                        label.appendChild(checkmark);
-                        label.appendChild(text);
-                        radioItem.appendChild(label);
-                        wrapper.appendChild(radioItem);
-                    });
+            });
+        } else {
+            // Default behavior without sync
+            this._radioInputs.forEach(input => {
+                input.addEventListener('change', () => {
+                    this.state.value = input.value;
+                    this._clearError();
+
+                    // 🎯 Fire the change callback event
+                    this._triggerCallback('change', input.value);
                 });
-            }
+            });
+        }
+
+        // Always add blur validation
+        this._radioInputs.forEach(input => {
+            input.addEventListener('blur', () => {
+                this.validate();
+            });
         });
 
-        // === 5. RENDER: Append to DOM and finalize ===
+        // Sync label changes
+        const labelSync = this._syncBindings.find(b => b.property === 'label');
+        if (labelSync) {
+            const transform = labelSync.toComponent || ((v: any) => String(v));
+            labelSync.stateObj.subscribe((val: any) => {
+                this.label(transform(val));
+            });
+        }
+
         container.appendChild(wrapper);
+        this._injectRadioStyles();
+
         return this;
     }
 
-    renderTo(juxComponent: any): this {
-        if (!juxComponent?._id) {
-            throw new Error('Radio.renderTo: Invalid component');
-        }
-        return this.render(`#${juxComponent._id}`);
+    private _injectRadioStyles(): void {
+        const styleId = 'jux-radio-styles';
+        if (document.getElementById(styleId)) return;
+
+        const style = document.createElement('style');
+        style.id = styleId;
+        style.textContent = `
+      .jux-radio {
+        margin-bottom: 12px;
+      }
+
+      .jux-radio-options {
+        display: flex;
+        gap: 8px;
+      }
+
+      /* ✅ Vertical orientation (default) */
+      .jux-radio-vertical {
+        flex-direction: column;
+      }
+
+      /* ✅ Horizontal orientation */
+      .jux-radio-horizontal {
+        flex-direction: row;
+        flex-wrap: wrap;
+      }
+
+      .jux-radio-option {
+        display: inline-flex;
+        align-items: center;
+        cursor: pointer;
+        user-select: none;
+        position: relative;
+      }
+
+      .jux-radio-input {
+        position: absolute;
+        opacity: 0;
+        cursor: pointer;
+        height: 0;
+        width: 0;
+      }
+
+      .jux-radio-mark {
+        position: relative;
+        height: 20px;
+        width: 20px;
+        border: 2px solid #d1d5db;
+        border-radius: 50%;
+        background-color: white;
+        transition: all 0.2s;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        margin-right: 8px;
+      }
+
+      .jux-radio-mark::after {
+        content: '';
+        position: absolute;
+        width: 10px;
+        height: 10px;
+        border-radius: 50%;
+        background-color: white;
+        opacity: 0;
+        transition: opacity 0.2s;
+      }
+
+      .jux-radio-input:checked ~ .jux-radio-mark {
+        background-color: #3b82f6;
+        border-color: #3b82f6;
+      }
+
+      .jux-radio-input:checked ~ .jux-radio-mark::after {
+        opacity: 1;
+      }
+
+      .jux-radio-input:disabled ~ .jux-radio-mark {
+        background-color: #f3f4f6;
+        border-color: #d1d5db;
+        cursor: not-allowed;
+      }
+
+      .jux-radio-input:disabled ~ .jux-radio-label-text {
+        color: #9ca3af;
+        cursor: not-allowed;
+      }
+
+      .jux-radio-input:focus ~ .jux-radio-mark {
+        box-shadow: 0 0 0 3px rgba(59, 130, 246, 0.1);
+      }
+
+      .jux-radio-input.jux-input-invalid ~ .jux-radio-mark {
+        border-color: #ef4444;
+      }
+
+      .jux-radio-label-text {
+        font-size: 14px;
+        color: #374151;
+      }
+    `;
+        document.head.appendChild(style);
     }
 }