@ariakit/core 0.4.2 → 0.4.3

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @ariakit/core
 
+## 0.4.3
+
+- Fixed regression in `v0.4.2` that caused nested tabs to stop working.
+- Added new [`combobox`](https://ariakit.org/reference/tab-provider#combobox) property to tab store.
+- Improved JSDocs.
+- Fixed TypeScript error on `defaultValue`.
+
 ## 0.4.2
 
 - Fixed [`Focusable`](https://ariakit.org/reference/focusable) to identify `summary` as a native tabbable element.

package/cjs/tab/tab-store.cjs

@@ -27,22 +27,26 @@ var _AV6KTKLEcjs = require('../__chunks/AV6KTKLE.cjs');
 // src/tab/tab-store.ts
 function createTabStore(_a = {}) {
   var _b = _a, {
-    composite: parentComposite
+    composite: parentComposite,
+    combobox
   } = _b, props = _AV6KTKLEcjs.__objRest.call(void 0, _b, [
-    "composite"
+    "composite",
+    "combobox"
   ]);
+  const independentKeys = [
+    "items",
+    "renderedItems",
+    "moves",
+    "orientation",
+    "baseElement",
+    "focusLoop",
+    "focusShift",
+    "focusWrap"
+  ];
   const store = _B4LYZ4EMcjs.mergeStore.call(void 0, 
     props.store,
-    _B4LYZ4EMcjs.omit.call(void 0, parentComposite, [
-      "items",
-      "renderedItems",
-      "moves",
-      "orientation",
-      "baseElement",
-      "focusLoop",
-      "focusShift",
-      "focusWrap"
-    ])
+    _B4LYZ4EMcjs.omit.call(void 0, parentComposite, independentKeys),
+    _B4LYZ4EMcjs.omit.call(void 0, combobox, independentKeys)
   );
   const syncState = store == null ? void 0 : store.getState();
   const composite = _Y7KNI5NScjs.createCompositeStore.call(void 0, _AV6KTKLEcjs.__spreadProps.call(void 0, _AV6KTKLEcjs.__spreadValues.call(void 0, {}, props), {

package/cjs/tab/tab-store.d.cts

@@ -1,8 +1,9 @@
 import type { CollectionStore, CollectionStoreItem } from "../collection/collection-store.js";
+import type { ComboboxStore } from "../combobox/combobox-store.js";
 import type { CompositeStore, CompositeStoreFunctions, CompositeStoreItem, CompositeStoreOptions, CompositeStoreState } from "../composite/composite-store.js";
 import type { Store, StoreOptions, StoreProps } from "../utils/store.js";
 import type { SetState } from "../utils/types.js";
-export declare function createTabStore({ composite: parentComposite, ...props }?: TabStoreProps): TabStore;
+export declare function createTabStore({ composite: parentComposite, combobox, ...props }?: TabStoreProps): TabStore;
 export interface TabStoreItem extends CompositeStoreItem {
     dimmed?: boolean;
 }
@@ -78,13 +79,20 @@ export interface TabStoreFunctions extends CompositeStoreFunctions<TabStoreItem>
 export interface TabStoreOptions extends StoreOptions<TabStoreState, "orientation" | "focusLoop" | "selectedId" | "selectOnMove">, CompositeStoreOptions<TabStoreItem> {
     /**
      * A reference to another [composite
-     * store](https://ariakit.org/reference/composite-store). This is used when
+     * store](https://ariakit.org/reference/use-composite-store). This is used when
      * rendering tabs as part of another composite widget such as
      * [Combobox](https://ariakit.org/components/combobox) or
      * [Select](https://ariakit.org/components/select). The stores will share the
      * same state.
      */
     composite?: CompositeStore | null;
+    /**
+     * A reference to a [combobox
+     * store](https://ariakit.org/reference/use-combobox-store). This is used when
+     * rendering tabs inside a
+     * [Combobox](https://ariakit.org/components/combobox).
+     */
+    combobox?: ComboboxStore | null;
     /**
      * The id of the tab whose panel is currently visible. If it's `undefined`, it
      * will be automatically set to the first enabled tab.

package/cjs/tab/tab-store.d.ts

@@ -1,8 +1,9 @@
 import type { CollectionStore, CollectionStoreItem } from "../collection/collection-store.js";
+import type { ComboboxStore } from "../combobox/combobox-store.js";
 import type { CompositeStore, CompositeStoreFunctions, CompositeStoreItem, CompositeStoreOptions, CompositeStoreState } from "../composite/composite-store.js";
 import type { Store, StoreOptions, StoreProps } from "../utils/store.js";
 import type { SetState } from "../utils/types.js";
-export declare function createTabStore({ composite: parentComposite, ...props }?: TabStoreProps): TabStore;
+export declare function createTabStore({ composite: parentComposite, combobox, ...props }?: TabStoreProps): TabStore;
 export interface TabStoreItem extends CompositeStoreItem {
     dimmed?: boolean;
 }
@@ -78,13 +79,20 @@ export interface TabStoreFunctions extends CompositeStoreFunctions<TabStoreItem>
 export interface TabStoreOptions extends StoreOptions<TabStoreState, "orientation" | "focusLoop" | "selectedId" | "selectOnMove">, CompositeStoreOptions<TabStoreItem> {
     /**
      * A reference to another [composite
-     * store](https://ariakit.org/reference/composite-store). This is used when
+     * store](https://ariakit.org/reference/use-composite-store). This is used when
      * rendering tabs as part of another composite widget such as
      * [Combobox](https://ariakit.org/components/combobox) or
      * [Select](https://ariakit.org/components/select). The stores will share the
      * same state.
      */
     composite?: CompositeStore | null;
+    /**
+     * A reference to a [combobox
+     * store](https://ariakit.org/reference/use-combobox-store). This is used when
+     * rendering tabs inside a
+     * [Combobox](https://ariakit.org/components/combobox).
+     */
+    combobox?: ComboboxStore | null;
     /**
      * The id of the tab whose panel is currently visible. If it's `undefined`, it
      * will be automatically set to the first enabled tab.

package/cjs/utils/misc.d.cts

@@ -121,8 +121,8 @@ export declare function removeUndefinedValues<T extends AnyObject>(obj: T): T;
  * Returns the first value that is not `undefined`.
  */
 export declare function defaultValue<T extends readonly any[]>(...values: T): DefaultValue<T>;
-type DefinedArray<T extends readonly any[]> = {
-    [K in keyof T as undefined extends T[K] ? never : K]: undefined extends T[K] ? [Exclude<T[K], undefined>, never] : [T[K]];
-};
-type DefaultValue<T extends readonly any[]> = DefinedArray<T>[keyof DefinedArray<T>] extends [any, never] ? T[number] : DefinedArray<T>[keyof DefinedArray<T>][0];
+type DefaultValue<T extends readonly any[], Other = never> = T extends [
+    infer Head,
+    ...infer Rest
+] ? Rest extends [] ? T[number] | Other : undefined extends Head ? DefaultValue<Rest, Exclude<Other | Head, undefined>> : Exclude<T[number], undefined> : never;
 export {};

package/cjs/utils/misc.d.ts

@@ -121,8 +121,8 @@ export declare function removeUndefinedValues<T extends AnyObject>(obj: T): T;
  * Returns the first value that is not `undefined`.
  */
 export declare function defaultValue<T extends readonly any[]>(...values: T): DefaultValue<T>;
-type DefinedArray<T extends readonly any[]> = {
-    [K in keyof T as undefined extends T[K] ? never : K]: undefined extends T[K] ? [Exclude<T[K], undefined>, never] : [T[K]];
-};
-type DefaultValue<T extends readonly any[]> = DefinedArray<T>[keyof DefinedArray<T>] extends [any, never] ? T[number] : DefinedArray<T>[keyof DefinedArray<T>][0];
+type DefaultValue<T extends readonly any[], Other = never> = T extends [
+    infer Head,
+    ...infer Rest
+] ? Rest extends [] ? T[number] | Other : undefined extends Head ? DefaultValue<Rest, Exclude<Other | Head, undefined>> : Exclude<T[number], undefined> : never;
 export {};

package/esm/tab/tab-store.d.ts

@@ -1,8 +1,9 @@
 import type { CollectionStore, CollectionStoreItem } from "../collection/collection-store.js";
+import type { ComboboxStore } from "../combobox/combobox-store.js";
 import type { CompositeStore, CompositeStoreFunctions, CompositeStoreItem, CompositeStoreOptions, CompositeStoreState } from "../composite/composite-store.js";
 import type { Store, StoreOptions, StoreProps } from "../utils/store.js";
 import type { SetState } from "../utils/types.js";
-export declare function createTabStore({ composite: parentComposite, ...props }?: TabStoreProps): TabStore;
+export declare function createTabStore({ composite: parentComposite, combobox, ...props }?: TabStoreProps): TabStore;
 export interface TabStoreItem extends CompositeStoreItem {
     dimmed?: boolean;
 }
@@ -78,13 +79,20 @@ export interface TabStoreFunctions extends CompositeStoreFunctions<TabStoreItem>
 export interface TabStoreOptions extends StoreOptions<TabStoreState, "orientation" | "focusLoop" | "selectedId" | "selectOnMove">, CompositeStoreOptions<TabStoreItem> {
     /**
      * A reference to another [composite
-     * store](https://ariakit.org/reference/composite-store). This is used when
+     * store](https://ariakit.org/reference/use-composite-store). This is used when
      * rendering tabs as part of another composite widget such as
      * [Combobox](https://ariakit.org/components/combobox) or
      * [Select](https://ariakit.org/components/select). The stores will share the
      * same state.
      */
     composite?: CompositeStore | null;
+    /**
+     * A reference to a [combobox
+     * store](https://ariakit.org/reference/use-combobox-store). This is used when
+     * rendering tabs inside a
+     * [Combobox](https://ariakit.org/components/combobox).
+     */
+    combobox?: ComboboxStore | null;
     /**
      * The id of the tab whose panel is currently visible. If it's `undefined`, it
      * will be automatically set to the first enabled tab.

package/esm/tab/tab-store.js

@@ -27,22 +27,26 @@ import {
 // src/tab/tab-store.ts
 function createTabStore(_a = {}) {
   var _b = _a, {
-    composite: parentComposite
+    composite: parentComposite,
+    combobox
   } = _b, props = __objRest(_b, [
-    "composite"
+    "composite",
+    "combobox"
   ]);
+  const independentKeys = [
+    "items",
+    "renderedItems",
+    "moves",
+    "orientation",
+    "baseElement",
+    "focusLoop",
+    "focusShift",
+    "focusWrap"
+  ];
   const store = mergeStore(
     props.store,
-    omit(parentComposite, [
-      "items",
-      "renderedItems",
-      "moves",
-      "orientation",
-      "baseElement",
-      "focusLoop",
-      "focusShift",
-      "focusWrap"
-    ])
+    omit(parentComposite, independentKeys),
+    omit(combobox, independentKeys)
   );
   const syncState = store == null ? void 0 : store.getState();
   const composite = createCompositeStore(__spreadProps(__spreadValues({}, props), {

package/esm/utils/misc.d.ts

@@ -121,8 +121,8 @@ export declare function removeUndefinedValues<T extends AnyObject>(obj: T): T;
  * Returns the first value that is not `undefined`.
  */
 export declare function defaultValue<T extends readonly any[]>(...values: T): DefaultValue<T>;
-type DefinedArray<T extends readonly any[]> = {
-    [K in keyof T as undefined extends T[K] ? never : K]: undefined extends T[K] ? [Exclude<T[K], undefined>, never] : [T[K]];
-};
-type DefaultValue<T extends readonly any[]> = DefinedArray<T>[keyof DefinedArray<T>] extends [any, never] ? T[number] : DefinedArray<T>[keyof DefinedArray<T>][0];
+type DefaultValue<T extends readonly any[], Other = never> = T extends [
+    infer Head,
+    ...infer Rest
+] ? Rest extends [] ? T[number] | Other : undefined extends Head ? DefaultValue<Rest, Exclude<Other | Head, undefined>> : Exclude<T[number], undefined> : never;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ariakit/core",
-  "version": "0.4.2",
+  "version": "0.4.3",
   "description": "Ariakit core",
   "sideEffects": false,
   "license": "MIT",