@vitus-labs/elements 2.3.0 → 2.5.0

package/lib/index.d.ts

@@ -318,6 +318,8 @@ type ExtendedProps = {
   even: boolean;
   position: number;
 };
+/** Loose item-callback param — uniformly typed across branches. */
+type LooseItem = SimpleValue | ObjectValue | Record<string, SimpleValue>;
 /**
  * Iterator over an array of strings/numbers. Each item is wrapped in
  * `{ [valueName]: item }` and that object is what callbacks see + what's
@@ -332,44 +334,47 @@ type SimpleProps<T extends SimpleValue> = {
    * passed to the component as its children.
    */
   valueName?: string; /** Optional wrapper around each item. */
-  wrapComponent?: ElementType; /** Stable key per item (defaults to index). */
-  itemKey?: (item: T, index: number) => SimpleValue; /** Extra props merged onto the rendered component, optionally per-item. */
-  itemProps?: TObj | ((item: {
-    [k: string]: T;
-  }, ext: ExtendedProps) => TObj); /** Extra props merged onto the wrapper, optionally per-item. */
-  wrapProps?: TObj | ((item: {
-    [k: string]: T;
-  }, ext: ExtendedProps) => TObj);
-  children?: never;
+  wrapComponent?: ElementType; /** Stable key per item — pick a key, or compute it. */
+  itemKey?: keyof ObjectValue | ((item: LooseItem, index: number) => SimpleValue); /** Extra props merged onto the rendered component, optionally per-item. */
+  itemProps?: TObj | ((item: LooseItem, ext: ExtendedProps) => TObj); /** Extra props merged onto the wrapper, optionally per-item. */
+  wrapProps?: TObj | ((item: LooseItem, ext: ExtendedProps) => TObj); /** Children are ignored at runtime when `data` is present. */
+  children?: ReactNode;
 };
 /**
  * Iterator over an array of objects. Each item is spread onto the rendered
  * component as props. Per-item `component` overrides also work — when an
  * item carries its own `component` field, the wrapper is bypassed.
+ *
+ * `itemKey` keeps the per-`T` narrowing (`keyof T`) so direct callers
+ * benefit from key-completion against the concrete `T`. itemProps /
+ * wrapProps share the loose signature for forwarding compatibility.
  */
 type ObjectProps<T extends ObjectValue> = {
   data: Array<T | MaybeNull>; /** Default React component to be rendered per item (item-level `component` overrides). */
-  component: ElementType; /** `valueName` is meaningless when iterating objects — TS forbids it. */
-  valueName?: never; /** Optional wrapper around each item. */
+  component: ElementType; /** `valueName` is meaningless when iterating objects (runtime ignores it). */
+  valueName?: string; /** Optional wrapper around each item. */
   wrapComponent?: ElementType; /** Stable key per item — pick a key from the item, or compute it. */
-  itemKey?: keyof T | ((item: T, index: number) => SimpleValue); /** Extra props merged onto the rendered component, optionally per-item. */
-  itemProps?: TObj | ((item: T, ext: ExtendedProps) => TObj); /** Extra props merged onto the wrapper, optionally per-item. */
-  wrapProps?: TObj | ((item: T, ext: ExtendedProps) => TObj);
-  children?: never;
+  itemKey?: keyof T | ((item: LooseItem, index: number) => SimpleValue); /** Extra props merged onto the rendered component, optionally per-item. */
+  itemProps?: TObj | ((item: LooseItem, ext: ExtendedProps) => TObj); /** Extra props merged onto the wrapper, optionally per-item. */
+  wrapProps?: TObj | ((item: LooseItem, ext: ExtendedProps) => TObj); /** Children are ignored at runtime when `data` is present. */
+  children?: ReactNode;
 };
 /**
- * Iterator over `children` — no `data`/`component`. Each child gets
- * positional metadata via `itemProps` and an optional `wrapComponent`.
+ * Iterator over `children` — no `data`/`component` at runtime. Each
+ * child gets positional metadata via `itemProps` and an optional
+ * `wrapComponent`. data/component/valueName/itemKey are accepted at the
+ * type level for forwarding compatibility but ignored at runtime when
+ * `children` is the active discriminator.
  */
 type ChildrenProps = {
   children: ReactNode;
-  data?: never;
-  component?: never;
-  valueName?: never;
-  itemKey?: never;
+  data?: Array<SimpleValue | ObjectValue | MaybeNull>;
+  component?: ElementType;
+  valueName?: string;
+  itemKey?: keyof ObjectValue | ((item: LooseItem, index: number) => SimpleValue);
   wrapComponent?: ElementType;
-  itemProps?: TObj | ((_: Record<string, never>, ext: ExtendedProps) => TObj);
-  wrapProps?: TObj | ((_: Record<string, never>, ext: ExtendedProps) => TObj);
+  itemProps?: TObj | ((item: LooseItem, ext: ExtendedProps) => TObj);
+  wrapProps?: TObj | ((item: LooseItem, ext: ExtendedProps) => TObj);
 };
 type PropsCallback = TObj | ((itemProps: Record<string, never> | Record<string, SimpleValue> | ObjectValue, extendedProps: ExtendedProps) => TObj);
 type LooseProps = Partial<{

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vitus-labs/elements",
-  "version": "2.3.0",
+  "version": "2.5.0",
   "license": "MIT",
   "author": "Vit Bokisch <vit@bokisch.cz>",
   "maintainers": [
@@ -57,8 +57,8 @@
     "typecheck": "tsc --noEmit"
   },
   "peerDependencies": {
-    "@vitus-labs/core": "^2.3.0",
-    "@vitus-labs/unistyle": "^2.3.0",
+    "@vitus-labs/core": "^2.5.0",
+    "@vitus-labs/unistyle": "^2.5.0",
     "react": ">= 19",
     "react-dom": ">= 19",
     "react-native": ">= 0.76"