@proyecto-viviana/solidaria 0.4.1 → 0.4.3

package/src/dnd/DragManager.ts

@@ -245,10 +245,7 @@ class DragSession {
     this.cancelEvent(e);
 
     if (e.key === "Enter") {
-      if (
-        e.altKey ||
-        nodeContains(this.getCurrentActivateButton(), getEventTarget<Node>(e))
-      ) {
+      if (e.altKey || nodeContains(this.getCurrentActivateButton(), getEventTarget<Node>(e))) {
         this.activate(this.currentDropTarget, this.currentDropItem);
       } else {
         this.drop();
@@ -556,7 +553,10 @@ class DragSession {
     }
 
     if (item != null && item !== this.currentDropItem) {
-      if (this.currentDropTarget && typeof this.currentDropTarget.onDropTargetEnter === "function") {
+      if (
+        this.currentDropTarget &&
+        typeof this.currentDropTarget.onDropTargetEnter === "function"
+      ) {
         this.currentDropTarget.onDropTargetEnter(item.target);
       }
       item.element.focus();

package/src/dnd/DropTargetKeyboardNavigation.ts

@@ -93,7 +93,9 @@ function nextDropTarget(
     } else {
       nextKey = keyboardDelegate.getKeyBelow?.(target.key, { includeDisabled: true });
     }
-    let nextCollectionKey = getNextItem(collection, target.key, (key) => collection.getKeyAfter(key));
+    let nextCollectionKey = getNextItem(collection, target.key, (key) =>
+      collection.getKeyAfter(key),
+    );
 
     // If the keyboard delegate did not move to the next key in the collection,
     // jump to that key with the same drop position. Otherwise, try the other
@@ -137,7 +139,8 @@ function nextDropTarget(
         // If this is the last sibling in a level, traverse to the parent.
         let targetNode = collection.getItem(target.key);
         let nextSiblingKey = targetNode != null ? collection.getKeyAfter(targetNode.key) : null;
-        let nextItemInSameLevel = nextSiblingKey != null ? collection.getItem(nextSiblingKey) : null;
+        let nextItemInSameLevel =
+          nextSiblingKey != null ? collection.getItem(nextSiblingKey) : null;
         while (nextItemInSameLevel != null && nextItemInSameLevel.type !== "item") {
           let afterKey = collection.getKeyAfter(nextItemInSameLevel.key);
           nextItemInSameLevel = afterKey != null ? collection.getItem(afterKey) : null;
@@ -306,8 +309,7 @@ function getLastChild(collection: Collection, key: Key): DropTarget | null {
   let nextNode = nextKey != null ? collection.getItem(nextKey) : null;
   if (targetNode && nextNode && nextNode.level > targetNode.level) {
     let lastChild: CollectionNode | null = null;
-    lastChild =
-      Array.from(targetNode.childNodes).findLast((item) => item.type === "item") || null;
+    lastChild = Array.from(targetNode.childNodes).findLast((item) => item.type === "item") || null;
 
     if (lastChild) {
       return {

package/src/dnd/createDraggableItem.ts

@@ -114,7 +114,9 @@ export function createDraggableItem(
     if (opts.hasAction && dragModality === "keyboard") {
       msg += "Alt";
     }
-    return stringFormatter().format(msg as Parameters<ReturnType<typeof stringFormatter>["format"]>[0]);
+    return stringFormatter().format(
+      msg as Parameters<ReturnType<typeof stringFormatter>["format"]>[0],
+    );
   });
   const descriptionProps = createDescription(dragDescription);
 

package/src/dnd/createDroppableCollection.ts

@@ -717,12 +717,7 @@ export function createDroppableCollection(
 
             let target = state.target;
             if (!target) {
-              target = nextValidTarget(
-                null,
-                types,
-                drag.allowedDropOperations,
-                getPreviousTarget,
-              );
+              target = nextValidTarget(null, types, drag.allowedDropOperations, getPreviousTarget);
             } else if (target.type === "item") {
               // If at the top already, switch to the root. Otherwise navigate a page up.
               if (target.key === keyboardDelegate.getFirstKey?.()) {
@@ -809,9 +804,13 @@ function normalizeSelection(selection: "all" | Iterable<Key> | undefined): "all"
 // stamps `data-key={String(key)}`, so the attribute is the stringified key; map it
 // back to the real (possibly numeric) collection key by matching against the
 // collection's nodes.
-function keyFromDragElement(element: HTMLElement | null, collection: Collection | undefined): Key | null {
+function keyFromDragElement(
+  element: HTMLElement | null,
+  collection: Collection | undefined,
+): Key | null {
   if (!element) return null;
-  const raw = element.getAttribute("data-key") ?? element.closest("[data-key]")?.getAttribute("data-key");
+  const raw =
+    element.getAttribute("data-key") ?? element.closest("[data-key]")?.getAttribute("data-key");
   if (raw == null) return null;
   if (!collection) return raw;
   // Fast path: the raw string is already a valid key.

package/src/select/createSelect.ts

@@ -387,15 +387,17 @@ export function createSelect<T>(
           "aria-disabled": isDisabled || undefined,
           "aria-required": p.isRequired || undefined,
           "aria-describedby": p["aria-describedby"] || undefined,
-          // Mirror upstream `useSelect`: the trigger's accessible name folds the
-          // SELECTED VALUE ("Pro") ahead of the field label ("Plan") → "Pro Plan"
-          // via `aria-labelledby=[valueId, labelId]`. Only wire this when there is
-          // a real visible label; with an `aria-label` (no `labelledby`) the field
-          // props' `aria-label` stays the trigger name (label-less legacy path,
-          // keeps TabsPicker/label-less Select unchanged).
-          "aria-labelledby": fieldProps["aria-labelledby"]
-            ? [valueId, fieldProps["aria-labelledby"]].filter(Boolean).join(" ")
-            : undefined,
+          // Mirror upstream `useSelect` exactly: the trigger name starts with
+          // the selected value, then the visible label. When only `aria-label`
+          // is present, the trigger references itself so that label follows the
+          // value as well ("Pro Plan"), rather than masking visible text.
+          "aria-labelledby": [
+            valueId,
+            fieldProps["aria-labelledby"],
+            fieldProps["aria-label"] && !fieldProps["aria-labelledby"] ? fieldProps.id : undefined,
+          ]
+            .filter(Boolean)
+            .join(" "),
           onKeyDown,
           onFocus: handleFocus,
           onBlur: handleBlur,
@@ -428,13 +430,14 @@ export function createSelect<T>(
       return {
         id: listBoxId,
         role: "listbox",
-        // Mirror upstream `useSelect`: the listbox is labelled by the FIELD LABEL
-        // (`fieldProps['aria-labelledby']` → the visible "Plan" label), NOT the
-        // trigger button — the button's own accessible name folds in the selected
-        // value ("Pro Plan"), which must not leak onto the listbox. Only when
-        // there is no visible label (an `aria-label` on the field) does it fall
-        // back to the trigger id (unchanged legacy behavior for label-less use).
-        "aria-labelledby": fieldProps["aria-labelledby"] ?? buttonId,
+        // Mirror upstream `useSelect`: a visible field label names the listbox;
+        // the trigger is the fallback only for the `aria-label` branch.
+        "aria-labelledby": [
+          fieldProps["aria-labelledby"],
+          fieldProps["aria-label"] && !fieldProps["aria-labelledby"] ? fieldProps.id : undefined,
+        ]
+          .filter(Boolean)
+          .join(" "),
         "aria-multiselectable": state.selectionMode() === "multiple" ? true : undefined,
         tabIndex: -1,
         onBlur: (e: FocusEvent) => {

package/src/spinbutton/index.ts

@@ -1,10 +1,2 @@
-export {
-  createSpinButton,
-  type SpinButtonProps,
-  type SpinButtonAria,
-} from "./createSpinButton";
-export {
-  spinButtonStrings,
-  spinButtonDictionary,
-  type SpinButtonStringKey,
-} from "./intl";
+export { createSpinButton, type SpinButtonProps, type SpinButtonAria } from "./createSpinButton";
+export { spinButtonStrings, spinButtonDictionary, type SpinButtonStringKey } from "./intl";

package/src/spinbutton/intl.ts

@@ -7,106 +7,106 @@ export type SpinButtonStringKey = "Empty";
 
 export const spinButtonStrings: Record<string, Record<SpinButtonStringKey, string>> = {
   "ar-AE": {
-  "Empty": `\u{641}\u{627}\u{631}\u{63A}`
+    Empty: `\u{641}\u{627}\u{631}\u{63A}`,
   },
   "bg-BG": {
-  "Empty": `\u{418}\u{437}\u{43F}\u{440}\u{430}\u{437}\u{43D}\u{438}`
+    Empty: `\u{418}\u{437}\u{43F}\u{440}\u{430}\u{437}\u{43D}\u{438}`,
   },
   "cs-CZ": {
-  "Empty": `Pr\xe1zdn\xe9`
+    Empty: `Pr\xe1zdn\xe9`,
   },
   "da-DK": {
-  "Empty": `Tom`
+    Empty: `Tom`,
   },
   "de-DE": {
-  "Empty": `Leer`
+    Empty: `Leer`,
   },
   "el-GR": {
-  "Empty": `\u{386}\u{3B4}\u{3B5}\u{3B9}\u{3BF}`
+    Empty: `\u{386}\u{3B4}\u{3B5}\u{3B9}\u{3BF}`,
   },
   "en-US": {
-  "Empty": `Empty`
+    Empty: `Empty`,
   },
   "es-ES": {
-  "Empty": `Vac\xedo`
+    Empty: `Vac\xedo`,
   },
   "et-EE": {
-  "Empty": `T\xfchjenda`
+    Empty: `T\xfchjenda`,
   },
   "fi-FI": {
-  "Empty": `Tyhj\xe4`
+    Empty: `Tyhj\xe4`,
   },
   "fr-FR": {
-  "Empty": `Vide`
+    Empty: `Vide`,
   },
   "he-IL": {
-  "Empty": `\u{5E8}\u{5D9}\u{5E7}`
+    Empty: `\u{5E8}\u{5D9}\u{5E7}`,
   },
   "hr-HR": {
-  "Empty": `Prazno`
+    Empty: `Prazno`,
   },
   "hu-HU": {
-  "Empty": `\xdcres`
+    Empty: `\xdcres`,
   },
   "it-IT": {
-  "Empty": `Vuoto`
+    Empty: `Vuoto`,
   },
   "ja-JP": {
-  "Empty": `\u{7A7A}`
+    Empty: `\u{7A7A}`,
   },
   "ko-KR": {
-  "Empty": `\u{BE44}\u{C5B4} \u{C788}\u{C74C}`
+    Empty: `\u{BE44}\u{C5B4} \u{C788}\u{C74C}`,
   },
   "lt-LT": {
-  "Empty": `Tu\u{161}\u{10D}ias`
+    Empty: `Tu\u{161}\u{10D}ias`,
   },
   "lv-LV": {
-  "Empty": `Tuk\u{161}s`
+    Empty: `Tuk\u{161}s`,
   },
   "nb-NO": {
-  "Empty": `Tom`
+    Empty: `Tom`,
   },
   "nl-NL": {
-  "Empty": `Leeg`
+    Empty: `Leeg`,
   },
   "pl-PL": {
-  "Empty": `Pusty`
+    Empty: `Pusty`,
   },
   "pt-BR": {
-  "Empty": `Vazio`
+    Empty: `Vazio`,
   },
   "pt-PT": {
-  "Empty": `Vazio`
+    Empty: `Vazio`,
   },
   "ro-RO": {
-  "Empty": `Gol`
+    Empty: `Gol`,
   },
   "ru-RU": {
-  "Empty": `\u{41D}\u{435} \u{437}\u{430}\u{43F}\u{43E}\u{43B}\u{43D}\u{435}\u{43D}\u{43E}`
+    Empty: `\u{41D}\u{435} \u{437}\u{430}\u{43F}\u{43E}\u{43B}\u{43D}\u{435}\u{43D}\u{43E}`,
   },
   "sk-SK": {
-  "Empty": `Pr\xe1zdne`
+    Empty: `Pr\xe1zdne`,
   },
   "sl-SI": {
-  "Empty": `Prazen`
+    Empty: `Prazen`,
   },
   "sr-SP": {
-  "Empty": `Prazno`
+    Empty: `Prazno`,
   },
   "sv-SE": {
-  "Empty": `Tomt`
+    Empty: `Tomt`,
   },
   "tr-TR": {
-  "Empty": `Bo\u{15F}`
+    Empty: `Bo\u{15F}`,
   },
   "uk-UA": {
-  "Empty": `\u{41F}\u{443}\u{441}\u{442}\u{43E}`
+    Empty: `\u{41F}\u{443}\u{441}\u{442}\u{43E}`,
   },
   "zh-CN": {
-  "Empty": `\u{7A7A}`
+    Empty: `\u{7A7A}`,
   },
   "zh-TW": {
-  "Empty": `\u{7A7A}\u{767D}`
+    Empty: `\u{7A7A}\u{767D}`,
   },
 };
 

package/src/table/createTable.ts

@@ -615,9 +615,8 @@ export function createTable<T extends object>(
     const s = state();
 
     const describedBy =
-      [sortDescriptionProps["aria-describedby"], p["aria-describedby"]]
-        .filter(Boolean)
-        .join(" ") || undefined;
+      [sortDescriptionProps["aria-describedby"], p["aria-describedby"]].filter(Boolean).join(" ") ||
+      undefined;
 
     const baseProps: Record<string, unknown> = {
       role: "grid",

package/src/table/utils.ts

@@ -3,12 +3,7 @@
  * Port of @react-aria/table/utils (`getRowLabelledBy` / cell id derivation).
  */
 
-import type {
-  Key,
-  GridNode,
-  TableState,
-  TableCollection,
-} from "@proyecto-viviana/solid-stately";
+import type { Key, GridNode, TableState, TableCollection } from "@proyecto-viviana/solid-stately";
 import { getTableData } from "./createTable";
 
 /**

package/src/tree/createTree.ts

@@ -287,10 +287,7 @@ export function createTree<T extends object, C extends TreeCollection<T> = TreeC
       // enters at the first selected row, else the first navigable row.
       const backward =
         !!relatedTarget &&
-        !!(
-          currentTarget.compareDocumentPosition(relatedTarget) &
-          Node.DOCUMENT_POSITION_FOLLOWING
-        );
+        !!(currentTarget.compareDocumentPosition(relatedTarget) & Node.DOCUMENT_POSITION_FOLLOWING);
       key = backward
         ? (lastSelectedKey(s) ??
           findNextNavigableKey(s, s.collection.getLastKey(), (k) => s.collection.getKeyBefore(k)))