@rettangoli/ui 0.1.2-rc26 → 0.1.2-rc28

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rettangoli/ui",
-  "version": "0.1.2-rc26",
+  "version": "0.1.2-rc28",
   "description": "A UI component library for building web interfaces.",
   "main": "dist/rettangoli-esm.min.js",
   "type": "module",

package/src/components/form/form.handlers.js

@@ -186,3 +186,17 @@ export const handleWaveformClick = (e, deps) => {
     }),
   );
 };
+
+export const handleSelectAddOption = (e, deps) => {
+  const { store, dispatchEvent } = deps;
+  const name = e.currentTarget.id.replace("select-", "");
+  dispatchEvent(
+    new CustomEvent("action-click", {
+      detail: {
+        actionId: 'select-options-add',
+        name: name,
+        formValues: store.selectFormValues(),
+      },
+    }),
+  );
+};

package/src/components/form/form.view.yaml

@@ -50,19 +50,23 @@ propsSchema:
                     const: select
                   placeholder:
                     type: string
+                  noClear:
+                    type: boolean
+                  addOption:
+                    type: object
+                    properties:
+                      label:
+                        type: string
                   options:
                     type: array
                     items:
                       type: object
                       properties:
-                        id:
-                          type: string
                         label:
                           type: string
                         value:
                           type: any
                       required:
-                        - id
                         - label
                         - value
                 required:
@@ -209,6 +213,8 @@ refs:
     eventListeners:
       select-change:
         handler: handleSelectChange
+      add-option-selected:
+        handler: handleSelectAddOption
   colorpicker-*:
     eventListeners:
       colorpicker-change:
@@ -241,6 +247,7 @@ refs:
 events:
   form-change: {}
   extra-event: {}
+  action-click: {}
 
 template:
   - rtgl-view w=f p=md g=lg ${containerAttrString}:
@@ -260,7 +267,7 @@ template:
                   - $if field.inputType == "popover-input":
                       - rtgl-popover-input#popover-input-${field.name} label="${field.label}" .defaultValue=fields[${i}].defaultValue:
                   - $if field.inputType == "select":
-                      - rtgl-select#select-${field.name} key=${key} w=f .options=fields[${i}].options .placeholder=fields[${i}].placeholder .selectedValue=fields[${i}].defaultValue:
+                      - rtgl-select#select-${field.name} key=${key} w=f .options=fields[${i}].options .placeholder=fields[${i}].placeholder .selectedValue=fields[${i}].defaultValue ?no-clear=fields[${i}].noClear .addOption=fields[${i}].addOption:
                   - $if field.inputType == "colorPicker":
                       - rtgl-color-picker#colorpicker-${field.name} key=${key} value=${field.defaultValue}:
                   - $if field.inputType == "slider":

package/src/components/select/select.handlers.js

@@ -2,7 +2,7 @@ import { deepEqual } from '../../common.js';
 
 export const handleBeforeMount = (deps) => {
   const { store, props, render } = deps;
-  
+
   if (props.selectedValue !== null && props.selectedValue !== undefined && props.options) {
     const selectedOption = props.options.find(opt => deepEqual(opt.value, props.selectedValue));
     if (selectedOption) {
@@ -15,16 +15,16 @@ export const handleBeforeMount = (deps) => {
 export const handleOnUpdate = (changes, deps) => {
   const { oldAttrs, newAttrs, oldProps, newProps } = changes;
   const { store, props, render } = deps;
-  
+
   // Check if key changed
   if (oldAttrs?.key !== newAttrs?.key && newAttrs?.key) {
     // Clear current state using store action
     store.resetSelection();
-    
+
     // Re-apply the prop value if available
     const selectedValue = newProps?.selectedValue || props?.selectedValue;
     const options = newProps?.options || props?.options;
-    
+
     if (selectedValue !== null && selectedValue !== undefined && options) {
       const selectedOption = options.find(opt => deepEqual(opt.value, selectedValue));
       if (selectedOption) {
@@ -36,12 +36,29 @@ export const handleOnUpdate = (changes, deps) => {
 }
 
 export const handleButtonClick = (e, deps) => {
-  const { store, render, getRefIds } = deps;
+  const { store, render, getRefIds, props } = deps;
+
+  const button = getRefIds()['select-button'].elm;
+
+  // Get first child's bounding rectangle (since button has display: contents)
+  const firstChild = button.firstElementChild;
+  const rect = firstChild ? firstChild.getBoundingClientRect() : button.getBoundingClientRect();
+
+  // Find the index of the currently selected option
+  const storeSelectedValue = store.selectSelectedValue();
+  const currentValue = storeSelectedValue !== null ? storeSelectedValue : props.selectedValue;
+  let selectedIndex = null;
+  if (currentValue !== null && currentValue !== undefined && props.options) {
+    selectedIndex = props.options.findIndex(opt => deepEqual(opt.value, currentValue));
+    if (selectedIndex === -1) selectedIndex = null;
+  }
+
   store.openOptionsPopover({
     position: {
-      y: e.clientY,
-      x: e.clientX,
-    }
+      y: rect.bottom + 12,  // Bottom edge of button
+      x: rect.left - 24,    // Left edge of button
+    },
+    selectedIndex
   })
   render();
 }
@@ -77,6 +94,73 @@ export const handleOptionClick = (e, deps) => {
     detail: { selectedValue: option.value },
     bubbles: true
   }));
+
+  render();
+}
+
+export const handleOptionMouseEnter = (e, deps) => {
+  const { store, render } = deps;
+  const id = parseInt(e.currentTarget.id.replace('option-', ''));
+  store.setHoveredOption(id);
+  render();
+}
+
+export const handleOptionMouseLeave = (e, deps) => {
+  const { store, render } = deps;
+  store.clearHoveredOption();
+  render();
+}
+
+export const handleClearClick = (e, deps) => {
+  const { store, render, dispatchEvent, props } = deps;
+
+  e.stopPropagation();
+
+  // Clear the internal state
+  store.clearSelectedValue();
+
+  // Call onChange if provided
+  if (props.onChange && typeof props.onChange === 'function') {
+    props.onChange(undefined);
+  }
+
+  // Dispatch custom event for backward compatibility
+  dispatchEvent(new CustomEvent('option-selected', {
+    detail: { value: undefined, label: undefined },
+    bubbles: true
+  }));
+
+  // Also dispatch select-change event to match form's event listener pattern
+  dispatchEvent(new CustomEvent('select-change', {
+    detail: { selectedValue: undefined },
+    bubbles: true
+  }));
+
+  render();
+}
+
+export const handleAddOptionClick = (e, deps) => {
+  const { store, render, dispatchEvent } = deps;
   
+  // Close the popover
+  store.closeOptionsPopover();
+
+  // Dispatch custom event for add option (no detail)
+  dispatchEvent(new CustomEvent('add-option-selected', {
+    bubbles: true
+  }));
+
+  render();
+}
+
+export const handleAddOptionMouseEnter = (e, deps) => {
+  const { store, render } = deps;
+  store.setHoveredAddOption(true);
+  render();
+}
+
+export const handleAddOptionMouseLeave = (e, deps) => {
+  const { store, render } = deps;
+  store.setHoveredAddOption(false);
   render();
 }

package/src/components/select/select.store.js

@@ -1,5 +1,28 @@
 import { deepEqual } from '../../common.js';
 
+// Attributes that should not be passed through to the container
+// These are either handled internally or have special meaning
+const blacklistedAttrs = [
+  "id", 
+  "class", 
+  "style", 
+  "slot",
+  // Select-specific props that are handled separately
+  "placeholder",
+  "selectedValue", 
+  "selected-value",
+  "onChange",
+  "on-change",
+  "options"
+];
+
+const stringifyAttrs = (attrs) => {
+  return Object.entries(attrs || {})
+    .filter(([key]) => !blacklistedAttrs.includes(key))
+    .map(([key, value]) => `${key}=${value}`)
+    .join(" ");
+};
+
 export const INITIAL_STATE = Object.freeze({
   isOpen: false,
   position: {
@@ -7,38 +30,53 @@ export const INITIAL_STATE = Object.freeze({
     y: 0,
   },
   selectedValue: null,
+  hoveredOptionId: null,
+  hoveredAddOption: false,
 });
 
-export const toViewData = ({ state, props }) => {
+export const toViewData = ({ state, props, attrs }) => {
+  // Generate container attribute string
+  const containerAttrString = stringifyAttrs(attrs);
+  
   // Use state's selected value if available, otherwise use props.selectedValue
   const currentValue = state.selectedValue !== null ? state.selectedValue : props.selectedValue;
-  
+
   // Calculate display label from value
   let displayLabel = props.placeholder || 'Select an option';
+  let isPlaceholderLabel = true;
   if (currentValue !== null && currentValue !== undefined && props.options) {
     const selectedOption = props.options.find(opt => deepEqual(opt.value, currentValue));
     if (selectedOption) {
       displayLabel = selectedOption.label;
+      isPlaceholderLabel = false;
     }
   }
-  
+
   // Map options to include isSelected flag and computed background color
-  const optionsWithSelection = (props.options || []).map(option => {
+  const optionsWithSelection = (props.options || []).map((option, index) => {
     const isSelected = deepEqual(option.value, currentValue);
+    const isHovered = state.hoveredOptionId === index;
     return {
       ...option,
       isSelected,
-      bgc: isSelected ? 'mu' : ''
+      bgc: isHovered ? 'ac' : (isSelected ? 'mu' : '')
     };
   });
-  
+
   return {
+    containerAttrString,
     isOpen: state.isOpen,
     position: state.position,
     options: optionsWithSelection,
     selectedValue: currentValue,
     selectedLabel: displayLabel,
-    placeholder: props.placeholder || 'Select an option'
+    selectedLabelColor: isPlaceholderLabel ? "mu-fg" : "fg",
+    placeholder: props.placeholder || 'Select an option',
+    hasValue: currentValue !== null && currentValue !== undefined,
+    showClear: !attrs['no-clear'] && !props['no-clear'] && (currentValue !== null && currentValue !== undefined),
+    showAddOption: !!props.addOption,
+    addOptionLabel: props.addOption?.label ? `+ ${props.addOption.label}` : '+ Add',
+    addOptionBgc: state.hoveredAddOption ? 'ac' : ''
   };
 }
 
@@ -46,10 +84,18 @@ export const selectState = ({ state }) => {
   return state;
 }
 
+export const selectSelectedValue = ({ state }) => {
+  return state.selectedValue;
+}
+
 export const openOptionsPopover = (state, payload) => {
-  const { position } = payload;
+  const { position, selectedIndex } = payload;
   state.position = position;
   state.isOpen = true;
+  // Set hoveredOptionId to the selected option's index if available
+  if (selectedIndex !== undefined && selectedIndex !== null) {
+    state.hoveredOptionId = selectedIndex;
+  }
 }
 
 export const closeOptionsPopover = (state) => {
@@ -65,5 +111,21 @@ export const resetSelection = (state) => {
   state.selectedValue = undefined;
 }
 
+export const setHoveredOption = (state, optionId) => {
+  state.hoveredOptionId = optionId;
+}
+
+export const clearHoveredOption = (state) => {
+  state.hoveredOptionId = null;
+}
+
+export const clearSelectedValue = (state) => {
+  state.selectedValue = undefined;
+}
+
+export const setHoveredAddOption = (state, isHovered) => {
+  state.hoveredAddOption = isHovered;
+}
+
 
 

package/src/components/select/select.view.yaml

@@ -11,8 +11,6 @@ propsSchema:
       items:
         type: object
         properties:
-          id:
-            type: string
           label:
             type: string
           value:
@@ -23,12 +21,23 @@ propsSchema:
       type: string
     onChange:
       type: function
+    no-clear:
+      type: boolean
+    addOption:
+      type: object
+      properties:
+        label:
+          type: string
 
 refs:
   select-button:
     eventListeners:
       click:
         handler: handleButtonClick
+  clear-button:
+    eventListeners:
+      click:
+        handler: handleClearClick
   popover:
     eventListeners:
       close:
@@ -37,14 +46,35 @@ refs:
     eventListeners:
       click:
         handler: handleOptionClick
+      mouseenter:
+        handler: handleOptionMouseEnter
+      mouseleave:
+        handler: handleOptionMouseLeave
+  option-add:
+    eventListeners:
+      click:
+        handler: handleAddOptionClick
+      mouseenter:
+        handler: handleAddOptionMouseEnter
+      mouseleave:
+        handler: handleAddOptionMouseLeave
 
 events: {}
 
 template:
-  - rtgl-button#select-button v=ol:
-    - ${selectedLabel}
-  - rtgl-popover#popover ?open=${isOpen} x=${position.x} y=${position.y}:
-    - rtgl-view wh=300 g=xs slot=content bgc=background br=md sv=true:
-      - $for option, i in options:
-        - rtgl-view#option-${i} w=f h-bgc=ac ph=lg pv=md cur=p br=md bgc=${option.bgc}:
-          - rtgl-text: ${option.label}
+  - rtgl-button#select-button v=ol ${containerAttrString}:
+      - rtgl-view d=h av=c w=f:
+          - rtgl-text c=${selectedLabelColor}: ${selectedLabel}
+          - rtgl-view mh=md flex=1:
+          - $if showClear:
+              - rtgl-svg#clear-button mr=md svg=x wh=16 c=mu-fg cur=p:
+          - rtgl-svg svg=chevronDown wh=16 c=mu-fg:
+  - rtgl-popover#popover ?open=${isOpen} x=${position.x} y=${position.y} placement=right-start:
+      - rtgl-view wh=300 g=xs slot=content bgc=background br=md sv=true:
+          - $for option, i in options:
+              - rtgl-view#option-${i} w=f ph=lg pv=md cur=p br=md bgc=${option.bgc}:
+                  - rtgl-text: ${option.label}
+          - $if showAddOption:
+              - rtgl-view w=f bw=xs bc=mu-bg bt=sm:
+              - rtgl-view#option-add w=f ph=lg pv=md cur=p br=md bgc=${addOptionBgc}:
+                  - rtgl-text c=ac: ${addOptionLabel}

package/src/primitives/svg.js

@@ -1,6 +1,7 @@
 import { css, dimensionWithUnit } from "../common.js";
 import flexChildStyles from "../styles/flexChildStyles.js";
 import paddingSvgStyles from "../styles/paddingSvgStyles.js";
+import marginStyles from "../styles/marginStyles.js";
 import cursorStyles from "../styles/cursorStyles.js";
 import textColorStyles from "../styles/textColorStyles.js";
 
@@ -18,6 +19,7 @@ class RettangoliSvgElement extends HTMLElement {
         }
         ${textColorStyles}
         ${paddingSvgStyles}
+        ${marginStyles}
         ${flexChildStyles}
         ${cursorStyles}
       `);