zag-ripple 0.0.9 → 0.0.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zag-ripple",
-  "version": "0.0.9",
+  "version": "0.0.11",
   "description": "RippleJS Adapter for Zag JS",
   "keywords": [
     "js",

package/src/index.d.ts

@@ -4,7 +4,8 @@ import { Component } from "ripple";
 export { mergeProps } from "@zag-js/core";
 
 // From normalize-props.ripple
-export declare const normalizeProps: <T>(props: T) => T;
+import { NormalizeProps, PropTypes } from "@zag-js/types";
+export declare const normalizeProps: NormalizeProps<PropTypes>;
 
 // From machine.ripple  
 export interface MachineApi<TContext = Record<string, any>, TState extends string = string> {

package/src/machine.ripple

@@ -12,16 +12,11 @@ import type {
 } from "@zag-js/core"
 import { createScope, INIT_STATE, MachineStatus } from "@zag-js/core"
 import { ensure, isFunction, isPlainObject, isString, toArray, warn } from "@zag-js/utils"
-import { track, trackSplit, effect, flushSync } from "ripple"
+import { track, effect, flushSync } from "ripple"
 import { bindable } from "./bindable.ripple"
 import { useRefs } from "./refs.ripple"
 import { createTrack } from "./track.ripple"
 
-function access(userProps) {
-  if (isFunction(userProps)) return userProps()
-  return userProps
-}
-
 function compact(obj) {
   if (!isPlainObject(obj) || obj === undefined) return obj
   const keys = Reflect.ownKeys(obj).filter((key) => typeof key === "string")
@@ -39,9 +34,9 @@ export function useMachine(
   machine,
   _userProps,
 ) {
-  let [id, ids, getRootNode, rest]= trackSplit(access(_userProps), ['id', 'ids', 'getRootNode'])
+  const userProps = track(() => @_userProps)
   let scope = track(() => {
-    return createScope({ id: @id, ids: @ids, getRootNode: @getRootNode })
+    return createScope({ id: @userProps.id, ids: @userProps.ids, getRootNode: @userProps.getRootNode })
   })
 
   const debug = (...args: any[]) => {
@@ -49,8 +44,7 @@ export function useMachine(
   }
 
   let props = track(() => {
-    const p = { ...@rest, id: @id, ids: @ids, getRootNode: @getRootNode }
-    return machine.props?.({ props: compact(p), scope: @scope }) ?? p
+    return machine.props?.({ props: compact(@userProps), scope: @scope }) ?? @userProps
   })
   
   const prop = useProp(() => @props)

package/src/normalize-props.ripple

@@ -1,5 +1,4 @@
-import { createNormalizer } from "@zag-js/types"
-
+import { createNormalizer, type PropTypes } from "@zag-js/types"
 
 type Dict = Record<string, boolean | number | string | undefined>
 
@@ -44,7 +43,7 @@ function toRipplePropValue(key: string, value: Dict[string]) {
   return value
 }
 
-export const normalizeProps = createNormalizer<Record<string, any>>((props) => {
+const normalizeFn = (props: any) => {
   const normalized: Dict = {}
 
   for (const key in props) {
@@ -52,4 +51,6 @@ export const normalizeProps = createNormalizer<Record<string, any>>((props) => {
   }
 
   return normalized
-})
+}
+
+export const normalizeProps = createNormalizer<PropTypes>(normalizeFn)