@zag-js/core 1.22.0 → 1.23.0

package/dist/index.d.mts

@@ -1,12 +1,14 @@
+import { isActiveElement } from '@zag-js/dom-query';
+
 interface Props {
-    [key: string]: any;
+    [key: string | symbol]: any;
 }
 type TupleTypes<T extends any[]> = T[number];
 type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends (k: infer I) => void ? I : never;
 declare function mergeProps<T extends Props>(...args: T[]): UnionToIntersection<TupleTypes<T[]>>;
 
 type NoInfer<T> = [T][T extends any ? 0 : never];
-declare function memo<TDeps extends any[], TDepArgs, TResult>(getDeps: (depArgs: TDepArgs) => [...TDeps], fn: (...args: NoInfer<[...TDeps]>) => TResult, opts?: {
+declare function memo<TDeps extends any[], TDepArgs, TResult>(getDeps: (depArgs: TDepArgs) => [...TDeps], fn: (args: NoInfer<[...TDeps]>, deps: TDepArgs) => TResult, opts?: {
     onChange?: ((result: TResult) => void) | undefined;
 }): (depArgs: TDepArgs) => TResult;
 
@@ -246,7 +248,7 @@ declare function createScope(props: Pick<Scope, "id" | "ids" | "getRootNode">):
     getDoc: () => Document;
     getWin: () => Window & typeof globalThis;
     getActiveElement: () => HTMLElement | null;
-    isActiveElement: (elem: HTMLElement | null) => boolean;
+    isActiveElement: typeof isActiveElement;
     getById: <T extends Element = HTMLElement>(id: string) => T | null;
     id?: string | undefined | undefined;
     ids?: Record<string, any> | undefined;

package/dist/index.d.ts

@@ -1,12 +1,14 @@
+import { isActiveElement } from '@zag-js/dom-query';
+
 interface Props {
-    [key: string]: any;
+    [key: string | symbol]: any;
 }
 type TupleTypes<T extends any[]> = T[number];
 type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends (k: infer I) => void ? I : never;
 declare function mergeProps<T extends Props>(...args: T[]): UnionToIntersection<TupleTypes<T[]>>;
 
 type NoInfer<T> = [T][T extends any ? 0 : never];
-declare function memo<TDeps extends any[], TDepArgs, TResult>(getDeps: (depArgs: TDepArgs) => [...TDeps], fn: (...args: NoInfer<[...TDeps]>) => TResult, opts?: {
+declare function memo<TDeps extends any[], TDepArgs, TResult>(getDeps: (depArgs: TDepArgs) => [...TDeps], fn: (args: NoInfer<[...TDeps]>, deps: TDepArgs) => TResult, opts?: {
     onChange?: ((result: TResult) => void) | undefined;
 }): (depArgs: TDepArgs) => TResult;
 
@@ -246,7 +248,7 @@ declare function createScope(props: Pick<Scope, "id" | "ids" | "getRootNode">):
     getDoc: () => Document;
     getWin: () => Window & typeof globalThis;
     getActiveElement: () => HTMLElement | null;
-    isActiveElement: (elem: HTMLElement | null) => boolean;
+    isActiveElement: typeof isActiveElement;
     getById: <T extends Element = HTMLElement>(id: string) => T | null;
     id?: string | undefined | undefined;
     ids?: Record<string, any> | undefined;

package/dist/index.js

@@ -46,6 +46,10 @@ function mergeProps(...args) {
         result[key] = props[key];
       }
     }
+    const symbols = Object.getOwnPropertySymbols(props);
+    for (let symbol of symbols) {
+      result[symbol] = props[symbol];
+    }
   }
   return result;
 }
@@ -57,7 +61,7 @@ function memo(getDeps, fn, opts) {
     const depsChanged = newDeps.length !== deps.length || newDeps.some((dep, index) => !utils.isEqual(deps[index], dep));
     if (!depsChanged) return result;
     deps = newDeps;
-    result = fn(...newDeps);
+    result = fn(newDeps, depArgs);
     opts?.onChange?.(result);
     return result;
   };
@@ -113,7 +117,6 @@ function createScope(props) {
   const getDoc = () => domQuery.getDocument(getRootNode());
   const getWin = () => getDoc().defaultView ?? window;
   const getActiveElementFn = () => domQuery.getActiveElement(getRootNode());
-  const isActiveElement = (elem) => elem === getActiveElementFn();
   const getById = (id) => getRootNode().getElementById(id);
   return {
     ...props,
@@ -121,7 +124,7 @@ function createScope(props) {
     getDoc,
     getWin,
     getActiveElement: getActiveElementFn,
-    isActiveElement,
+    isActiveElement: domQuery.isActiveElement,
     getById
   };
 }

package/dist/index.mjs

@@ -1,5 +1,5 @@
 import { callAll, isEqual, isString } from '@zag-js/utils';
-import { getActiveElement, getDocument } from '@zag-js/dom-query';
+import { isActiveElement, getActiveElement, getDocument } from '@zag-js/dom-query';
 
 // src/merge-props.ts
 var clsx = (...args) => args.map((str) => str?.trim?.()).filter(Boolean).join(" ");
@@ -44,6 +44,10 @@ function mergeProps(...args) {
         result[key] = props[key];
       }
     }
+    const symbols = Object.getOwnPropertySymbols(props);
+    for (let symbol of symbols) {
+      result[symbol] = props[symbol];
+    }
   }
   return result;
 }
@@ -55,7 +59,7 @@ function memo(getDeps, fn, opts) {
     const depsChanged = newDeps.length !== deps.length || newDeps.some((dep, index) => !isEqual(deps[index], dep));
     if (!depsChanged) return result;
     deps = newDeps;
-    result = fn(...newDeps);
+    result = fn(newDeps, depArgs);
     opts?.onChange?.(result);
     return result;
   };
@@ -111,7 +115,6 @@ function createScope(props) {
   const getDoc = () => getDocument(getRootNode());
   const getWin = () => getDoc().defaultView ?? window;
   const getActiveElementFn = () => getActiveElement(getRootNode());
-  const isActiveElement = (elem) => elem === getActiveElementFn();
   const getById = (id) => getRootNode().getElementById(id);
   return {
     ...props,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zag-js/core",
-  "version": "1.22.0",
+  "version": "1.23.0",
   "description": "A minimal implementation of xstate fsm for UI machines",
   "keywords": [
     "ui-machines",
@@ -25,8 +25,8 @@
     "url": "https://github.com/chakra-ui/zag/issues"
   },
   "dependencies": {
-    "@zag-js/utils": "1.22.0",
-    "@zag-js/dom-query": "1.22.0"
+    "@zag-js/utils": "1.23.0",
+    "@zag-js/dom-query": "1.23.0"
   },
   "devDependencies": {
     "clean-package": "2.2.0"