ui-ingredients 0.0.65 → 0.0.66

package/dist/combobox/combobox-clear-trigger.svelte

@@ -19,7 +19,7 @@
   let combobox = getComboboxContext();
 
   let mergedProps = $derived(
-    mergeProps(props, combobox.getClearTriggerProps()),
+    mergeProps(combobox.getClearTriggerProps(), props),
   );
 </script>
 

package/dist/combobox/combobox-content.svelte

@@ -22,7 +22,7 @@
   let presence = getPresenceContext();
 
   let mergedProps = $derived(
-    mergeProps(props, combobox.getContentProps(), presence.getPresenceProps()),
+    mergeProps(combobox.getContentProps(), presence.getPresenceProps(), props),
   );
 </script>
 

package/dist/combobox/combobox-control.svelte

@@ -18,7 +18,7 @@
 
   let combobox = getComboboxContext();
 
-  let mergedProps = $derived(mergeProps(props, combobox.getControlProps()));
+  let mergedProps = $derived(mergeProps(combobox.getControlProps(), props));
 </script>
 
 {#if asChild}

package/dist/combobox/combobox-input.svelte

@@ -13,9 +13,7 @@
 
   let combobox = getComboboxContext();
 
-  let mergedProps = $derived(
-    mergeProps({...props, 'aria-expanded': false}, combobox.getInputProps()),
-  );
+  let mergedProps = $derived(mergeProps(combobox.getInputProps(), props));
 </script>
 
 {#if asChild}

package/dist/combobox/combobox-item-group-label.svelte

@@ -24,10 +24,10 @@
 
   let mergedProps = $derived(
     mergeProps(
-      props,
       combobox.getItemGroupLabelProps({
         htmlFor: itemGroupProps.id,
       }),
+      props,
     ),
   );
 </script>

package/dist/combobox/combobox-item-group.svelte

@@ -30,7 +30,7 @@
   });
 
   let mergedProps = $derived(
-    mergeProps(props, combobox.getItemGroupProps(comboboxItemGroupProps)),
+    mergeProps(combobox.getItemGroupProps(comboboxItemGroupProps), props),
   );
 
   setComboboxItemGroupPropsContext(() => comboboxItemGroupProps);

package/dist/combobox/combobox-item-indicator.svelte

@@ -23,7 +23,7 @@
   let itemProps = getComboboxItemPropsContext();
 
   let mergedProps = $derived(
-    mergeProps(props, combobox.getItemIndicatorProps(itemProps)),
+    mergeProps(combobox.getItemIndicatorProps(itemProps), props),
   );
 </script>
 

package/dist/combobox/combobox-item-text.svelte

@@ -23,7 +23,7 @@
   let itemProps = getComboboxItemPropsContext();
 
   let mergedProps = $derived(
-    mergeProps(props, combobox.getItemTextProps(itemProps)),
+    mergeProps(combobox.getItemTextProps(itemProps), props),
   );
 </script>
 

package/dist/combobox/combobox-item.svelte

@@ -32,7 +32,7 @@
 
   let itemState = $derived(combobox.getItemState(itemProps));
   let mergedProps = $derived(
-    mergeProps(localProps, combobox.getItemProps(itemProps)),
+    mergeProps(combobox.getItemProps(itemProps), localProps),
   );
 
   setComboboxItemPropsContext(() => itemProps);

package/dist/combobox/combobox-label.svelte

@@ -18,7 +18,7 @@
 
   let combobox = getComboboxContext();
 
-  let mergedProps = $derived(mergeProps(props, combobox.getLabelProps()));
+  let mergedProps = $derived(mergeProps(combobox.getLabelProps(), props));
 </script>
 
 {#if asChild}

package/dist/combobox/combobox-list.svelte

@@ -18,7 +18,7 @@
 
   let combobox = getComboboxContext();
 
-  let mergedProps = $derived(mergeProps(props, combobox.getListProps()));
+  let mergedProps = $derived(mergeProps(combobox.getListProps(), props));
 </script>
 
 {#if asChild}

package/dist/combobox/combobox-positioner.svelte

@@ -22,9 +22,9 @@
 
   let mergedProps = $derived(
     mergeProps(
-      props,
       combobox.getPositionerProps(),
       presence.getPresenceProps(),
+      props,
     ),
   );
 </script>

package/dist/combobox/combobox-root.svelte

@@ -90,7 +90,7 @@
     })),
   );
 
-  let mergedProps = $derived(mergeProps(localProps, combobox.getRootProps()));
+  let mergedProps = $derived(mergeProps(combobox.getRootProps(), localProps));
 
   setComboboxContext(combobox);
   setPresenceContext(presence);

package/dist/combobox/combobox-trigger.svelte

@@ -18,7 +18,7 @@
 
   let combobox = getComboboxContext();
 
-  let mergedProps = $derived(mergeProps(props, combobox.getTriggerProps()));
+  let mergedProps = $derived(mergeProps(combobox.getTriggerProps(), props));
 </script>
 
 {#if asChild}

package/dist/date-picker/date-picker-clear-trigger.svelte

@@ -19,7 +19,7 @@
   let datePicker = getDatePickerContext();
 
   let mergedProps = $derived(
-    mergeProps(props, datePicker.getClearTriggerProps()),
+    mergeProps(datePicker.getClearTriggerProps(), props),
   );
 </script>
 

package/dist/date-picker/date-picker-content.svelte

@@ -23,9 +23,9 @@
 
   let mergedProps = $derived(
     mergeProps(
-      props,
       datePicker.getContentProps(),
       presence.getPresenceProps(),
+      props,
     ),
   );
 </script>

package/dist/date-picker/date-picker-control.svelte

@@ -18,7 +18,7 @@
 
   let datePicker = getDatePickerContext();
 
-  let mergedProps = $derived(mergeProps(props, datePicker.getControlProps()));
+  let mergedProps = $derived(mergeProps(datePicker.getControlProps(), props));
 </script>
 
 {#if asChild}

package/dist/date-picker/date-picker-day-table-cell-trigger.svelte

@@ -23,7 +23,7 @@
   let tableCellProps = getDatePickerDayTableCellPropsContext();
 
   let mergedProps = $derived(
-    mergeProps(props, datePicker.getDayTableCellTriggerProps(tableCellProps)),
+    mergeProps(datePicker.getDayTableCellTriggerProps(tableCellProps), props),
   );
 </script>
 

package/dist/date-picker/date-picker-day-table-cell.svelte

@@ -37,7 +37,7 @@
   );
 
   let mergedProps = $derived(
-    mergeProps(localProps, datePicker.getDayTableCellProps(tableCellProps)),
+    mergeProps(datePicker.getDayTableCellProps(tableCellProps), localProps),
   );
 
   setDatePickerDayTableCellPropsContext(() => tableCellProps);

package/dist/date-picker/date-picker-input.svelte

@@ -23,7 +23,7 @@
   let datePicker = getDatePickerContext();
 
   let mergedProps = $derived(
-    mergeProps(props, datePicker.getInputProps({index})),
+    mergeProps(datePicker.getInputProps({index}), props),
   );
 </script>
 

package/dist/date-picker/date-picker-label.svelte

@@ -24,7 +24,7 @@
   let datePicker = getDatePickerContext();
 
   let mergedProps = $derived(
-    mergeProps(props, datePicker.getLabelProps({index})),
+    mergeProps(datePicker.getLabelProps({index}), props),
   );
 </script>
 

package/dist/date-picker/date-picker-month-select.svelte

@@ -22,7 +22,7 @@
   let datePicker = getDatePickerContext();
 
   let mergedProps = $derived(
-    mergeProps(props, datePicker.getMonthSelectProps()),
+    mergeProps(datePicker.getMonthSelectProps(), props),
   );
 </script>
 

package/dist/date-picker/date-picker-month-table-cell-trigger.svelte

@@ -23,7 +23,7 @@
   let tableCellProps = getDatePickerTableCellPropsContext();
 
   let mergedProps = $derived(
-    mergeProps(props, datePicker.getMonthTableCellTriggerProps(tableCellProps)),
+    mergeProps(datePicker.getMonthTableCellTriggerProps(tableCellProps), props),
   );
 </script>
 

package/dist/date-picker/date-picker-month-table-cell.svelte

@@ -35,7 +35,7 @@
   );
 
   let mergedProps = $derived(
-    mergeProps(localProps, datePicker.getMonthTableCellProps(tableCellProps)),
+    mergeProps(datePicker.getMonthTableCellProps(tableCellProps), localProps),
   );
 
   setDatePickerTableCellPropsContext(() => tableCellProps);

package/dist/date-picker/date-picker-next-trigger.svelte

@@ -23,7 +23,7 @@
   let viewProps = getDatePickerViewPropsContext();
 
   let mergedProps = $derived(
-    mergeProps(props, datePicker.getNextTriggerProps(viewProps)),
+    mergeProps(datePicker.getNextTriggerProps(viewProps), props),
   );
 </script>
 

package/dist/date-picker/date-picker-positioner.svelte

@@ -22,9 +22,9 @@
 
   let mergedProps = $derived(
     mergeProps(
-      props,
       datePicker.getPositionerProps(),
       presence.getPresenceProps(),
+      props,
     ),
   );
 </script>

package/dist/date-picker/date-picker-preset-trigger.svelte

@@ -24,7 +24,7 @@
   let datePicker = getDatePickerContext();
 
   let mergedProps = $derived(
-    mergeProps(props, datePicker.getPresetTriggerProps({value})),
+    mergeProps(datePicker.getPresetTriggerProps({value}), props),
   );
 </script>
 

package/dist/date-picker/date-picker-prev-trigger.svelte

@@ -23,7 +23,7 @@
   let viewProps = getDatePickerViewPropsContext();
 
   let mergedProps = $derived(
-    mergeProps(props, datePicker.getPrevTriggerProps(viewProps)),
+    mergeProps(datePicker.getPrevTriggerProps(viewProps), props),
   );
 </script>
 

package/dist/date-picker/date-picker-range-text.svelte

@@ -18,7 +18,7 @@
 
   let datePicker = getDatePickerContext();
 
-  let mergedProps = $derived(mergeProps(props, datePicker.getRangeTextProps()));
+  let mergedProps = $derived(mergeProps(datePicker.getRangeTextProps(), props));
 </script>
 
 {#if asChild}

package/dist/date-picker/date-picker-root.svelte

@@ -75,7 +75,7 @@
     })),
   );
 
-  let mergedProps = $derived(mergeProps(localProps, datePicker.getRootProps()));
+  let mergedProps = $derived(mergeProps(datePicker.getRootProps(), localProps));
 
   setDatePickerContext(datePicker);
   setPresenceContext(presence);

package/dist/date-picker/date-picker-table-body.svelte

@@ -23,7 +23,7 @@
   let tableProps = getDatePickerTablePropsContext();
 
   let mergedProps = $derived(
-    mergeProps(props, datePicker.getTableBodyProps(tableProps)),
+    mergeProps(datePicker.getTableBodyProps(tableProps), props),
   );
 </script>
 

package/dist/date-picker/date-picker-table-head.svelte

@@ -23,7 +23,7 @@
   let tableProps = getDatePickerTablePropsContext();
 
   let mergedProps = $derived(
-    mergeProps(props, datePicker.getTableHeadProps(tableProps)),
+    mergeProps(datePicker.getTableHeadProps(tableProps), props),
   );
 </script>
 

package/dist/date-picker/date-picker-table-header.svelte

@@ -23,7 +23,7 @@
   let tableProps = getDatePickerTablePropsContext();
 
   let mergedProps = $derived(
-    mergeProps(props, datePicker.getTableHeaderProps(tableProps)),
+    mergeProps(datePicker.getTableHeaderProps(tableProps), props),
   );
 </script>
 

package/dist/date-picker/date-picker-table-row.svelte

@@ -23,7 +23,7 @@
   let tableProps = getDatePickerTablePropsContext();
 
   let mergedProps = $derived(
-    mergeProps(props, datePicker.getTableRowProps(tableProps)),
+    mergeProps(datePicker.getTableRowProps(tableProps), props),
   );
 </script>
 

package/dist/date-picker/date-picker-table.svelte

@@ -31,7 +31,7 @@
   let tableProps: TableProps = $derived({...viewProps, id, columns});
 
   let mergedProps = $derived(
-    mergeProps(props, datePicker.getTableProps(tableProps)),
+    mergeProps(datePicker.getTableProps(tableProps), props),
   );
 
   setDatePickerTablePropsContext(() => tableProps);

package/dist/date-picker/date-picker-trigger.svelte

@@ -18,7 +18,7 @@
 
   let datePicker = getDatePickerContext();
 
-  let mergedProps = $derived(mergeProps(props, datePicker.getTriggerProps()));
+  let mergedProps = $derived(mergeProps(datePicker.getTriggerProps(), props));
 </script>
 
 {#if asChild}

package/dist/date-picker/date-picker-view-control.svelte

@@ -23,7 +23,7 @@
   let viewProps = getDatePickerViewPropsContext();
 
   let mergedProps = $derived(
-    mergeProps(props, datePicker.getViewControlProps(viewProps)),
+    mergeProps(datePicker.getViewControlProps(viewProps), props),
   );
 </script>
 

package/dist/date-picker/date-picker-view-trigger.svelte

@@ -23,7 +23,7 @@
   let viewProps = getDatePickerViewPropsContext();
 
   let mergedProps = $derived(
-    mergeProps(props, datePicker.getViewTriggerProps(viewProps)),
+    mergeProps(datePicker.getViewTriggerProps(viewProps), props),
   );
 </script>
 

package/dist/date-picker/date-picker-view.svelte

@@ -26,7 +26,7 @@
   let viewProps: ViewProps = $derived({view});
 
   let mergedProps = $derived(
-    mergeProps(props, datePicker.getViewProps(viewProps)),
+    mergeProps(datePicker.getViewProps(viewProps), props),
   );
 
   setDatePickerViewPropsContext(() => viewProps);

package/dist/date-picker/date-picker-year-select.svelte

@@ -19,7 +19,7 @@
   let datePicker = getDatePickerContext();
 
   let mergedProps = $derived(
-    mergeProps(props, datePicker.getYearSelectProps()),
+    mergeProps(datePicker.getYearSelectProps(), props),
   );
 </script>
 

package/dist/date-picker/date-picker-year-table-cell-trigger.svelte

@@ -23,7 +23,7 @@
   let tableCellProps = getDatePickerTableCellPropsContext();
 
   let mergedProps = $derived(
-    mergeProps(props, datePicker.getYearTableCellTriggerProps(tableCellProps)),
+    mergeProps(datePicker.getYearTableCellTriggerProps(tableCellProps), props),
   );
 </script>
 

package/dist/date-picker/date-picker-year-table-cell.svelte

@@ -35,7 +35,7 @@
   );
 
   let mergedProps = $derived(
-    mergeProps(localProps, datePicker.getYearTableCellProps(tableCellProps)),
+    mergeProps(datePicker.getYearTableCellProps(tableCellProps), localProps),
   );
 
   setDatePickerTableCellPropsContext(() => tableCellProps);

package/dist/dialog/dialog-backdrop.svelte

@@ -30,7 +30,7 @@
   );
 
   let mergedProps = $derived(
-    mergeProps(props, dialog.getBackdropProps(), presence.getPresenceProps()),
+    mergeProps(dialog.getBackdropProps(), presence.getPresenceProps(), props),
   );
 </script>
 

package/dist/dialog/dialog-close-trigger.svelte

@@ -18,7 +18,7 @@
 
   let dialog = getDialogContext();
 
-  let mergedProps = $derived(mergeProps(props, dialog.getCloseTriggerProps()));
+  let mergedProps = $derived(mergeProps(dialog.getCloseTriggerProps(), props));
 </script>
 
 {#if asChild}

package/dist/dialog/dialog-content.svelte

@@ -22,7 +22,7 @@
   let presence = getPresenceContext();
 
   let mergedProps = $derived(
-    mergeProps(props, dialog.getContentProps(), presence.getPresenceProps()),
+    mergeProps(dialog.getContentProps(), presence.getPresenceProps(), props),
   );
 </script>
 

package/dist/dialog/dialog-description.svelte

@@ -18,7 +18,7 @@
 
   let dialog = getDialogContext();
 
-  let mergedProps = $derived(mergeProps(props, dialog.getDescriptionProps()));
+  let mergedProps = $derived(mergeProps(dialog.getDescriptionProps(), props));
 </script>
 
 {#if asChild}

package/dist/dialog/dialog-positioner.svelte

@@ -21,7 +21,7 @@
   let presence = getPresenceContext();
 
   let mergedProps = $derived(
-    mergeProps(props, dialog.getPositionerProps(), presence.getPresenceProps()),
+    mergeProps(dialog.getPositionerProps(), presence.getPresenceProps(), props),
   );
 </script>
 

package/dist/dialog/dialog-title.svelte

@@ -18,7 +18,7 @@
 
   let dialog = getDialogContext();
 
-  let mergedProps = $derived(mergeProps(props, dialog.getTitleProps()));
+  let mergedProps = $derived(mergeProps(dialog.getTitleProps(), props));
 </script>
 
 {#if asChild}

package/dist/dialog/dialog-trigger.svelte

@@ -18,7 +18,7 @@
 
   let dialog = getDialogContext();
 
-  let mergedProps = $derived(mergeProps(props, dialog.getTriggerProps()));
+  let mergedProps = $derived(mergeProps(dialog.getTriggerProps(), props));
 </script>
 
 {#if asChild}

package/dist/editable/editable-area.svelte

@@ -18,7 +18,7 @@
 
   let editable = getEditableContext();
 
-  let mergedProps = $derived(mergeProps(props, editable.getAreaProps()));
+  let mergedProps = $derived(mergeProps(editable.getAreaProps(), props));
 </script>
 
 {#if asChild}

package/dist/editable/editable-cancel-trigger.svelte

@@ -19,7 +19,7 @@
   let editable = getEditableContext();
 
   let mergedProps = $derived(
-    mergeProps(props, editable.getCancelTriggerProps()),
+    mergeProps(editable.getCancelTriggerProps(), props),
   );
 </script>
 

package/dist/editable/editable-control.svelte

@@ -18,7 +18,7 @@
 
   let editable = getEditableContext();
 
-  let mergedProps = $derived(mergeProps(props, editable.getControlProps()));
+  let mergedProps = $derived(mergeProps(editable.getControlProps(), props));
 </script>
 
 {#if asChild}

package/dist/editable/editable-edit-trigger.svelte

@@ -18,7 +18,7 @@
 
   let editable = getEditableContext();
 
-  let mergedProps = $derived(mergeProps(props, editable.getEditTriggerProps()));
+  let mergedProps = $derived(mergeProps(editable.getEditTriggerProps(), props));
 </script>
 
 {#if asChild}

package/dist/editable/editable-input.svelte

@@ -13,7 +13,7 @@
 
   let editable = getEditableContext();
 
-  let mergedProps = $derived(mergeProps(props, editable.getInputProps()));
+  let mergedProps = $derived(mergeProps(editable.getInputProps(), props));
 </script>
 
 {#if asChild}

package/dist/editable/editable-label.svelte

@@ -18,7 +18,7 @@
 
   let editable = getEditableContext();
 
-  let mergedProps = $derived(mergeProps(props, editable.getLabelProps()));
+  let mergedProps = $derived(mergeProps(editable.getLabelProps(), props));
 </script>
 
 {#if asChild}

package/dist/editable/editable-preview.svelte

@@ -18,7 +18,7 @@
 
   let editable = getEditableContext();
 
-  let mergedProps = $derived(mergeProps(props, editable.getPreviewProps()));
+  let mergedProps = $derived(mergeProps(editable.getPreviewProps(), props));
 </script>
 
 {#if asChild}

package/dist/editable/editable-root.svelte

@@ -59,7 +59,7 @@
 
   let editable = createEditable(reflect(() => createEditableProps));
 
-  let mergedProps = $derived(mergeProps(localProps, editable.getRootProps()));
+  let mergedProps = $derived(mergeProps(editable.getRootProps(), localProps));
 
   setEditableContext(editable);
 </script>

package/dist/editable/editable-submit-trigger.svelte

@@ -19,7 +19,7 @@
   let editable = getEditableContext();
 
   let mergedProps = $derived(
-    mergeProps(props, editable.getSubmitTriggerProps()),
+    mergeProps(editable.getSubmitTriggerProps(), props),
   );
 </script>
 

package/dist/field/create-field.svelte.d.ts

@@ -7,7 +7,7 @@ interface ElementIds {
     helperText?: string;
 }
 export interface CreateFieldProps {
-    id?: string | null;
+    id?: string;
     ids?: ElementIds;
     invalid?: boolean;
     required?: boolean;

package/dist/field/field-error-text.svelte

@@ -18,7 +18,7 @@
 
   let field = getFieldContext();
 
-  let mergedProps = $derived(mergeProps(props, field.getErrorTextProps()));
+  let mergedProps = $derived(mergeProps(field.getErrorTextProps(), props));
 </script>
 
 {#if asChild}

package/dist/field/field-helper-text.svelte

@@ -18,7 +18,7 @@
 
   let field = getFieldContext();
 
-  let mergedProps = $derived(mergeProps(props, field.getHelperTextProps()));
+  let mergedProps = $derived(mergeProps(field.getHelperTextProps(), props));
 </script>
 
 {#if asChild}

package/dist/field/field-input.svelte

@@ -13,7 +13,7 @@
 
   let field = getFieldContext();
 
-  let mergedProps = $derived(mergeProps(props, field.getInputProps()));
+  let mergedProps = $derived(mergeProps(field.getInputProps(), props));
 </script>
 
 {#if asChild}