zag-ripple 0.0.13 → 0.0.14

package/package.json

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

package/src/index.ripple

@@ -1,4 +1,31 @@
-export { mergeProps } from "@zag-js/core"
 export * from "./normalize-props.ripple"
 export * from "./machine.ripple"
 export * from "./portal.ripple"
+
+export function mergeProps<T extends Record<string, any>>(...args: T[]): T {
+    let result: any = {}
+    for (const props of args) {
+      if (!props) continue
+      for (const key in result) {
+        const pv = props[key]
+        const derefPv = @pv
+        if (key.startsWith("on") && typeof result[key] === "function" && typeof derefPv === "function") {
+          const prev = result[key]
+          result[key] = (...a: any[]) => { derefPv(...a); prev(...a) }
+          continue
+        }
+        result[key] = derefPv !== undefined ? derefPv : result[key]
+      }
+      for (const key in props) {
+        if (result[key] === undefined) {
+          const pv = props[key]
+          result[key] = @pv
+        }
+      }
+      for (const sym of Object.getOwnPropertySymbols(props)) {
+        result[sym] = (props as any)[sym]
+      }
+    }
+    return result
+  }
+