juxscript 1.0.20 → 1.0.21

package/lib/components/checkbox.ts

@@ -1,98 +1,67 @@
-import { getOrCreateContainer } from './helpers.js';
-import { State } from '../reactivity/state.js';
+import { FormInput, FormInputState } from './base/FormInput.js';
+import { renderIcon } from './icons.js';
+
+// Event definitions
+const TRIGGER_EVENTS = [] as const;
+const CALLBACK_EVENTS = ['change'] as const;
 
 export interface CheckboxOptions {
-    label?: string;
     checked?: boolean;
+    label?: string;
+    required?: boolean;
     disabled?: boolean;
     name?: string;
     value?: string;
     style?: string;
     class?: string;
+    onValidate?: (checked: boolean) => boolean | string;
 }
 
-type CheckboxState = {
-    label: string;
+interface CheckboxState extends FormInputState {
     checked: boolean;
-    disabled: boolean;
-    name: string;
     value: string;
-    style: string;
-    class: string;
-};
-
-/**
- * Checkbox component
- * 
- * Usage:
- *   jux.checkbox('terms', {
- *     label: 'I agree to terms',
- *     checked: false
- *   })
- *   .bind('change', (e) => console.log(e.target.checked))
- *   .render('#form');
- * 
- *   // Two-way binding with state
- *   const termsState = state(false);
- *   jux.checkbox('terms')
- *     .label('I agree to terms')
- *     .sync('checked', termsState)
- *     .render('#form');
- */
-export class Checkbox {
-    state: CheckboxState;
-    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
-    }> = [];
+}
 
+export class Checkbox extends FormInput<CheckboxState> {
     constructor(id: string, options: CheckboxOptions = {}) {
-        this._id = id;
-        this.id = id;
-
-        this.state = {
-            label: options.label ?? '',
+        super(id, {
             checked: options.checked ?? false,
+            value: options.value ?? 'on',
+            label: options.label ?? '',
+            required: options.required ?? false,
             disabled: options.disabled ?? false,
             name: options.name ?? id,
-            value: options.value ?? 'on',
             style: options.style ?? '',
-            class: options.class ?? ''
-        };
-    }
-
-    /* -------------------------
-     * Fluent API
-     * ------------------------- */
+            class: options.class ?? '',
+            errorMessage: undefined
+        });
 
-    label(value: string): this {
-        this.state.label = value;
-        return this;
+        if (options.onValidate) {
+            this._onValidate = options.onValidate;
+        }
     }
 
-    checked(value: boolean): this {
-        this.state.checked = value;
-        this._updateElement();
-        return this;
+    protected getTriggerEvents(): readonly string[] {
+        return TRIGGER_EVENTS;
     }
 
-    disabled(value: boolean): this {
-        this.state.disabled = value;
-        this._updateElement();
-        return this;
+    protected getCallbackEvents(): readonly string[] {
+        return CALLBACK_EVENTS;
     }
 
-    name(value: string): this {
-        this.state.name = value;
-        return this;
+    /* ═════════════════════════════════════════════════════════════════
+     * FLUENT API
+     * ═════════════════════════════════════════════════════════════════ */
+
+    // ✅ Inherited from FormInput/BaseComponent:
+    // - label(), required(), name(), onValidate()
+    // - validate(), isValid()
+    // - style(), class()
+    // - bind(), sync(), renderTo()
+    // - disabled(), enable(), disable()
+
+    checked(value: boolean): this {
+        return this.setValue(value);
     }
 
     value(value: string): this {
@@ -100,183 +69,265 @@ export class Checkbox {
         return this;
     }
 
-    style(value: string): this {
-        this.state.style = value;
-        return this;
-    }
-
-    class(value: string): this {
-        this.state.class = value;
-        return this;
-    }
+    /* ═════════════════════════════════════════════════════════════════
+     * FORM INPUT IMPLEMENTATION
+     * ═════════════════════════════════════════════════════════════════ */
 
-    /**
-     * 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 });
-        return this;
+    getValue(): boolean {
+        return this.state.checked;
     }
 
-    /**
-     * Two-way sync with state (stores for wiring in render)
-     * 
-     * @param property - Component property to sync ('checked', 'label', 'disabled')
-     * @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(`Checkbox.sync: Expected a State object for property "${property}"`);
+    setValue(value: boolean): this {
+        this.state.checked = value;
+        if (this._inputElement) {
+            (this._inputElement as HTMLInputElement).checked = value;
         }
-        this._syncBindings.push({ property, stateObj, toState, toComponent });
         return this;
     }
 
-    /* -------------------------
-     * Helpers
-     * ------------------------- */
+    protected _validateValue(checked: boolean): boolean | string {
+        const { required } = this.state;
 
-    private _updateElement(): void {
-        const input = document.getElementById(`${this._id}-input`) as HTMLInputElement;
-        if (input) {
-            input.checked = this.state.checked;
-            input.disabled = this.state.disabled;
+        if (required && !checked) {
+            return 'This field must be checked';
         }
-    }
 
-    /**
-     * Toggle the checkbox
-     */
-    toggle(): this {
-        this.state.checked = !this.state.checked;
-        this._updateElement();
-        return this;
+        if (this._onValidate) {
+            const result = this._onValidate(checked);
+            if (result !== true) {
+                return result || 'Invalid value';
+            }
+        }
+
+        return true;
     }
 
-    isChecked(): boolean {
-        return this.state.checked;
+    protected _buildInputElement(): HTMLElement {
+        const { checked, value, required, disabled, name } = this.state;
+
+        const input = document.createElement('input');
+        input.type = 'checkbox';
+        input.className = 'jux-checkbox-input';
+        input.id = `${this._id}-input`;
+        input.name = name;
+        input.value = value;
+        input.checked = checked;
+        input.required = required;
+        input.disabled = disabled;
+
+        return input;
     }
 
-    /* -------------------------
-     * 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(`Checkbox: 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 { checked, label, disabled, name, style, class: className } = this.state;
-        const hasCheckedSync = this._syncBindings.some(b => b.property === 'checked');
+        const { style, class: className } = this.state;
 
-        // === 3. BUILD: Create DOM elements ===
+        // Build wrapper
         const wrapper = document.createElement('div');
         wrapper.className = 'jux-checkbox';
         wrapper.id = this._id;
         if (className) wrapper.className += ` ${className}`;
         if (style) wrapper.setAttribute('style', style);
 
-        const labelEl = document.createElement('label');
-        labelEl.className = 'jux-checkbox-label';
+        // Checkbox container
+        const checkboxContainer = document.createElement('label');
+        checkboxContainer.className = 'jux-checkbox-container';
+        checkboxContainer.htmlFor = `${this._id}-input`;
 
-        const input = document.createElement('input');
-        input.type = 'checkbox';
-        input.className = 'jux-checkbox-input';
-        input.id = `${this._id}-input`;
-        input.name = name;
-        input.checked = checked;
-        input.disabled = disabled;
+        // Input element
+        const inputEl = this._buildInputElement() as HTMLInputElement;
+        this._inputElement = inputEl;
+        checkboxContainer.appendChild(inputEl);
 
+        // Checkmark (custom styled)
         const checkmark = document.createElement('span');
         checkmark.className = 'jux-checkbox-checkmark';
+        checkmark.appendChild(renderIcon('check'));
+        checkboxContainer.appendChild(checkmark);
+
+        // Label text
+        if (this.state.label) {
+            const labelText = document.createElement('span');
+            labelText.className = 'jux-checkbox-label-text';
+            labelText.textContent = this.state.label;
+            if (this.state.required) {
+                const requiredSpan = document.createElement('span');
+                requiredSpan.className = 'jux-input-required';
+                requiredSpan.textContent = ' *';
+                labelText.appendChild(requiredSpan);
+            }
+            checkboxContainer.appendChild(labelText);
+        }
+
+        wrapper.appendChild(checkboxContainer);
+
+        // Error element
+        wrapper.appendChild(this._renderError());
 
-        const text = document.createElement('span');
-        text.className = 'jux-checkbox-text';
-        text.textContent = label;
+        // Wire events
+        this._wireStandardEvents(wrapper);
 
-        labelEl.appendChild(input);
-        labelEl.appendChild(checkmark);
-        labelEl.appendChild(text);
-        wrapper.appendChild(labelEl);
+        // Wire checkbox-specific sync (maps 'checked' to 'value' property for consistency)
+        const valueSync = this._syncBindings.find(b => b.property === 'value' || b.property === 'checked');
 
-        // === 4. WIRE: Attach event listeners and sync bindings ===
+        if (valueSync) {
+            const { stateObj, toState, toComponent } = valueSync;
 
-        // Default behavior (only if NOT using sync)
-        if (!hasCheckedSync) {
-            input.addEventListener('change', () => {
-                this.state.checked = input.checked;
+            const transformToState = toState || ((v: boolean) => v);
+            const transformToComponent = toComponent || ((v: any) => Boolean(v));
+
+            let isUpdating = false;
+
+            // State → Component
+            stateObj.subscribe((val: any) => {
+                if (isUpdating) return;
+                const transformed = transformToComponent(val);
+                this.setValue(transformed);
+            });
+
+            // Component → State
+            inputEl.addEventListener('change', () => {
+                if (isUpdating) return;
+                isUpdating = true;
+
+                const checked = inputEl.checked;
+                this.state.checked = checked;
+                this._clearError();
+
+                const transformed = transformToState(checked);
+                stateObj.set(transformed);
+
+                // 🎯 Fire the change callback event
+                this._triggerCallback('change', checked);
+
+                setTimeout(() => { isUpdating = false; }, 0);
+            });
+        } else {
+            // Default behavior without sync
+            inputEl.addEventListener('change', () => {
+                this.state.checked = inputEl.checked;
+                this._clearError();
+
+                // 🎯 Fire the change callback event
+                this._triggerCallback('change', inputEl.checked);
             });
         }
 
-        // Wire custom bindings from .bind() calls
-        this._bindings.forEach(({ event, handler }) => {
-            wrapper.addEventListener(event, handler as EventListener);
+        // Always add blur validation
+        inputEl.addEventListener('blur', () => {
+            this.validate();
         });
 
-        // Wire sync bindings from .sync() calls
-        this._syncBindings.forEach(({ property, stateObj, toState, toComponent }) => {
-            if (property === 'checked') {
-                const transformToState = toState || ((v: any) => Boolean(v));
-                const transformToComponent = toComponent || ((v: any) => Boolean(v));
-
-                let isUpdating = false;
-
-                // State → Component
-                stateObj.subscribe((val: any) => {
-                    if (isUpdating) return;
-                    const transformed = transformToComponent(val);
-                    if (input.checked !== transformed) {
-                        input.checked = transformed;
-                        this.state.checked = transformed;
-                    }
-                });
-
-                // Component → State
-                input.addEventListener('change', () => {
-                    if (isUpdating) return;
-                    isUpdating = true;
-
-                    const transformed = transformToState(input.checked);
-                    this.state.checked = input.checked;
-                    stateObj.set(transformed);
-
-                    setTimeout(() => { isUpdating = false; }, 0);
-                });
-            }
-            else if (property === 'label') {
-                const transformToComponent = toComponent || ((v: any) => String(v));
-
-                stateObj.subscribe((val: any) => {
-                    const transformed = transformToComponent(val);
-                    text.textContent = transformed;
-                    this.state.label = transformed;
-                });
+        // 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._injectCheckboxStyles();
+
+        requestAnimationFrame(() => {
+            if ((window as any).lucide) {
+                (window as any).lucide.createIcons();
             }
         });
 
-        // === 5. RENDER: Append to DOM and finalize ===
-        container.appendChild(wrapper);
         return this;
     }
 
-    renderTo(juxComponent: any): this {
-        if (!juxComponent?._id) {
-            throw new Error('Checkbox.renderTo: Invalid component');
-        }
-        return this.render(`#${juxComponent._id}`);
+    private _injectCheckboxStyles(): void {
+        const styleId = 'jux-checkbox-styles';
+        if (document.getElementById(styleId)) return;
+
+        const style = document.createElement('style');
+        style.id = styleId;
+        style.textContent = `
+      .jux-checkbox {
+        margin-bottom: 12px;
+      }
+
+      .jux-checkbox-container {
+        display: inline-flex;
+        align-items: center;
+        cursor: pointer;
+        user-select: none;
+        position: relative;
+      }
+
+      .jux-checkbox-input {
+        position: absolute;
+        opacity: 0;
+        cursor: pointer;
+        height: 0;
+        width: 0;
+      }
+
+      .jux-checkbox-checkmark {
+        position: relative;
+        height: 20px;
+        width: 20px;
+        border: 2px solid #d1d5db;
+        border-radius: 4px;
+        background-color: white;
+        transition: all 0.2s;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        margin-right: 8px;
+      }
+
+      .jux-checkbox-checkmark svg {
+        width: 14px;
+        height: 14px;
+        stroke: white;
+        stroke-width: 3;
+        opacity: 0;
+        transition: opacity 0.2s;
+      }
+
+      .jux-checkbox-input:checked ~ .jux-checkbox-checkmark {
+        background-color: #3b82f6;
+        border-color: #3b82f6;
+      }
+
+      .jux-checkbox-input:checked ~ .jux-checkbox-checkmark svg {
+        opacity: 1;
+      }
+
+      .jux-checkbox-input:disabled ~ .jux-checkbox-checkmark {
+        background-color: #f3f4f6;
+        border-color: #d1d5db;
+        cursor: not-allowed;
+      }
+
+      .jux-checkbox-input:disabled ~ .jux-checkbox-label-text {
+        color: #9ca3af;
+        cursor: not-allowed;
+      }
+
+      .jux-checkbox-input:focus ~ .jux-checkbox-checkmark {
+        box-shadow: 0 0 0 3px rgba(59, 130, 246, 0.1);
+      }
+
+      .jux-checkbox-input.jux-input-invalid ~ .jux-checkbox-checkmark {
+        border-color: #ef4444;
+      }
+
+      .jux-checkbox-label-text {
+        font-size: 14px;
+        color: #374151;
+      }
+    `;
+        document.head.appendChild(style);
     }
 }