@ptolemy2002/react-proxy-context 2.5.0 → 2.6.0

package/README.md

@@ -33,9 +33,9 @@ type ProxyContextChangeSubscriber<T> = {
     reinitCallback: OnChangeReinitCallback<T>;
 };
 
-type ProxyContextProviderProps<T> = {
+type ProxyContextProviderProps<T, InputT = T> = {
     children: ReactNode;
-    value: T | ProxyContextValueWrapper<T>;
+    value: InputT | ProxyContextValueWrapper<T>;
     onChangeProp?: OnChangePropCallback<T>;
     onChangeReinit?: OnChangeReinitCallback<T>;
     proxyRef?: React.MutableRefObject<T>;
@@ -45,6 +45,14 @@ type UseProxyContextResult<T> = HookResultData<{
     value: T;
     set: (newObj: T) => T;
 }, readonly [T, (newObj: T) => T]>;
+
+type UseProxyContextArgs<T> = [
+    ProxyContext<T>,
+    Dependency<T>[] | null,
+    OnChangePropCallback<T>,
+    OnChangeReinitCallback<T>,
+    boolean
+];
 ```
 
 ## Classes
@@ -100,12 +108,13 @@ Creates a new instance of the ProxyContext, essentially to be used as the contex
 #### Returns
 `ProxyContext<T>` - The context object that can be used in a provider.
 
-### createProxyContextProvider<T extends object | null>
+### createProxyContextProvider<T extends object | null, InputT = T>
 #### Description
 Creates a new proxy context provider component with the specified type. `ProxyContextProvider` is no longer used due to a TypeScript limitation that prevents the context type from being inferred.
 
 #### Parameters
 - `contextClass` (`ProxyContext<T>`): The context class that was created using `createProxyContext`.
+- `transformInput` (`(input: InputT) => T`): A function that transforms the input value into the desired type `T`. This is useful when the input type differs from the context type, allowing for custom initialization logic. By default, this function simply casts the input to type `T`.
 
 #### Returns
 `React.MemoExoticComponent<FunctionComponent<ProxyContextProviderProps<T> & { renderDeps?: any[] }>>` - The provider component that can be used in the React tree. The resulting component is memoized to prevent unnecessary re-renders, but the `renderDeps` prop can be used to force a re-render when the specified dependencies change (necessary when working with the children prop).

package/dist/main.d.ts

@@ -9,9 +9,9 @@ export declare function createProxyContext<T>(name: string): ProxyContext<T>;
 export type Dependency<_T, T = Exclude<_T, null | undefined>> = keyof T | (<K extends keyof T>(prop: K, current: T[K], prev: T[K], obj: T) => boolean) | null | undefined | false | [keyof T, ...PropertyKey[]];
 export declare function evaluateDependency<T>(dep: Dependency<T>): Exclude<Dependency<T>, any[]>;
 export type ProxyContext<T> = ContextWithName<ProxyContextValueWrapper<T> | undefined>;
-export type ProxyContextProviderProps<T> = {
+export type ProxyContextProviderProps<T, InputT = T> = {
     children: ReactNode;
-    value: T | ProxyContextValueWrapper<T>;
+    value: InputT | ProxyContextValueWrapper<T>;
     onChangeProp?: OnChangePropCallback<T>;
     onChangeReinit?: OnChangeReinitCallback<T>;
     proxyRef?: React.MutableRefObject<T>;
@@ -33,11 +33,18 @@ export declare class ProxyContextValueWrapper<T> {
     get(): T;
     set(newObj: T): T;
 }
-export declare function createProxyContextProvider<T extends object | null>(contextClass: ProxyContext<T>): import('react').MemoExoticComponent<import('react').FunctionComponent<ProxyContextProviderProps<T> & {
+export declare function createProxyContextProvider<T extends object | null, InputT = T>(contextClass: ProxyContext<T>, transformInput?: (input: InputT) => T): import('react').MemoExoticComponent<import('react').FunctionComponent<ProxyContextProviderProps<T, InputT> & {
     renderDeps?: unknown[] | null | false;
 }>>;
 export type UseProxyContextResult<T> = HookResultData<{
     value: T;
     set: (newObj: T) => T;
 }, readonly [T, (newObj: T) => T]>;
-export declare function useProxyContext<T>(contextClass: ProxyContext<T>, deps?: Dependency<T>[] | null, onChangeProp?: OnChangePropCallback<T>, onChangeReinit?: OnChangeReinitCallback<T>, listenReinit?: boolean): UseProxyContextResult<T>;
+export type UseProxyContextArgs<T> = [
+    ProxyContext<T>,
+    Dependency<T>[] | null,
+    OnChangePropCallback<T>,
+    OnChangeReinitCallback<T>,
+    boolean
+];
+export declare function useProxyContext<T>(...[contextClass, deps, onChangeProp, onChangeReinit, listenReinit]: UseProxyContextArgs<T>): UseProxyContextResult<T>;

package/dist/main.js

@@ -1,6 +1,6 @@
 var dr = Object.defineProperty;
-var pr = (h, a, c) => a in h ? dr(h, a, { enumerable: !0, configurable: !0, writable: !0, value: c }) : h[a] = c;
-var X = (h, a, c) => pr(h, typeof a != "symbol" ? a + "" : a, c);
+var pr = (h, a, f) => a in h ? dr(h, a, { enumerable: !0, configurable: !0, writable: !0, value: f }) : h[a] = f;
+var X = (h, a, f) => pr(h, typeof a != "symbol" ? a + "" : a, f);
 import Oe, { createContext as br, useRef as Ce, useImperativeHandle as hr, useEffect as yr, useContext as mr, useCallback as Er, useSyncExternalStore as gr } from "react";
 import { nanoid as _r } from "nanoid";
 import Y from "is-callable";
@@ -21,15 +21,15 @@ var Pe;
 function xr() {
   if (Pe) return $;
   Pe = 1;
-  var h = Oe, a = Symbol.for("react.element"), c = Symbol.for("react.fragment"), p = Object.prototype.hasOwnProperty, s = h.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactCurrentOwner, b = { key: !0, ref: !0, __self: !0, __source: !0 };
-  function i(v, d, x) {
+  var h = Oe, a = Symbol.for("react.element"), f = Symbol.for("react.fragment"), v = Object.prototype.hasOwnProperty, d = h.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactCurrentOwner, c = { key: !0, ref: !0, __self: !0, __source: !0 };
+  function l(u, p, x) {
     var E, T = {}, P = null, k = null;
-    x !== void 0 && (P = "" + x), d.key !== void 0 && (P = "" + d.key), d.ref !== void 0 && (k = d.ref);
-    for (E in d) p.call(d, E) && !b.hasOwnProperty(E) && (T[E] = d[E]);
-    if (v && v.defaultProps) for (E in d = v.defaultProps, d) T[E] === void 0 && (T[E] = d[E]);
-    return { $$typeof: a, type: v, key: P, ref: k, props: T, _owner: s.current };
+    x !== void 0 && (P = "" + x), p.key !== void 0 && (P = "" + p.key), p.ref !== void 0 && (k = p.ref);
+    for (E in p) v.call(p, E) && !c.hasOwnProperty(E) && (T[E] = p[E]);
+    if (u && u.defaultProps) for (E in p = u.defaultProps, p) T[E] === void 0 && (T[E] = p[E]);
+    return { $$typeof: a, type: u, key: P, ref: k, props: T, _owner: d.current };
   }
-  return $.Fragment = c, $.jsx = i, $.jsxs = i, $;
+  return $.Fragment = f, $.jsx = l, $.jsxs = l, $;
 }
 var W = {};
 /**
@@ -44,7 +44,7 @@ var W = {};
 var we;
 function Pr() {
   return we || (we = 1, process.env.NODE_ENV !== "production" && function() {
-    var h = Oe, a = Symbol.for("react.element"), c = Symbol.for("react.portal"), p = Symbol.for("react.fragment"), s = Symbol.for("react.strict_mode"), b = Symbol.for("react.profiler"), i = Symbol.for("react.provider"), v = Symbol.for("react.context"), d = Symbol.for("react.forward_ref"), x = Symbol.for("react.suspense"), E = Symbol.for("react.suspense_list"), T = Symbol.for("react.memo"), P = Symbol.for("react.lazy"), k = Symbol.for("react.offscreen"), ee = Symbol.iterator, ke = "@@iterator";
+    var h = Oe, a = Symbol.for("react.element"), f = Symbol.for("react.portal"), v = Symbol.for("react.fragment"), d = Symbol.for("react.strict_mode"), c = Symbol.for("react.profiler"), l = Symbol.for("react.provider"), u = Symbol.for("react.context"), p = Symbol.for("react.forward_ref"), x = Symbol.for("react.suspense"), E = Symbol.for("react.suspense_list"), T = Symbol.for("react.memo"), P = Symbol.for("react.lazy"), k = Symbol.for("react.offscreen"), ee = Symbol.iterator, ke = "@@iterator";
     function je(e) {
       if (e === null || typeof e != "object")
         return null;
@@ -61,18 +61,18 @@ function Pr() {
     }
     function De(e, r, t) {
       {
-        var n = j.ReactDebugCurrentFrame, l = n.getStackAddendum();
-        l !== "" && (r += "%s", t = t.concat([l]));
-        var f = t.map(function(u) {
-          return String(u);
+        var n = j.ReactDebugCurrentFrame, s = n.getStackAddendum();
+        s !== "" && (r += "%s", t = t.concat([s]));
+        var b = t.map(function(o) {
+          return String(o);
         });
-        f.unshift("Warning: " + r), Function.prototype.apply.call(console[e], console, f);
+        b.unshift("Warning: " + r), Function.prototype.apply.call(console[e], console, b);
       }
     }
     var Fe = !1, Ae = !1, Ie = !1, $e = !1, We = !1, re;
     re = Symbol.for("react.module.reference");
     function Ye(e) {
-      return !!(typeof e == "string" || typeof e == "function" || e === p || e === b || We || e === s || e === x || e === E || $e || e === k || Fe || Ae || Ie || typeof e == "object" && e !== null && (e.$$typeof === P || e.$$typeof === T || e.$$typeof === i || e.$$typeof === v || e.$$typeof === d || // This needs to include all possible module reference object
+      return !!(typeof e == "string" || typeof e == "function" || e === v || e === c || We || e === d || e === x || e === E || $e || e === k || Fe || Ae || Ie || typeof e == "object" && e !== null && (e.$$typeof === P || e.$$typeof === T || e.$$typeof === l || e.$$typeof === u || e.$$typeof === p || // This needs to include all possible module reference object
       // types supported by any Flight configuration anywhere since
       // we don't know which Flight build this will end up being used
       // with.
@@ -82,8 +82,8 @@ function Pr() {
       var n = e.displayName;
       if (n)
         return n;
-      var l = r.displayName || r.name || "";
-      return l !== "" ? t + "(" + l + ")" : t;
+      var s = r.displayName || r.name || "";
+      return s !== "" ? t + "(" + s + ")" : t;
     }
     function te(e) {
       return e.displayName || "Context";
@@ -96,13 +96,13 @@ function Pr() {
       if (typeof e == "string")
         return e;
       switch (e) {
-        case p:
+        case v:
           return "Fragment";
-        case c:
+        case f:
           return "Portal";
-        case b:
+        case c:
           return "Profiler";
-        case s:
+        case d:
           return "StrictMode";
         case x:
           return "Suspense";
@@ -111,21 +111,21 @@ function Pr() {
       }
       if (typeof e == "object")
         switch (e.$$typeof) {
-          case v:
+          case u:
             var r = e;
             return te(r) + ".Consumer";
-          case i:
+          case l:
             var t = e;
             return te(t._context) + ".Provider";
-          case d:
+          case p:
             return Ve(e, e.render, "ForwardRef");
           case T:
             var n = e.displayName || null;
             return n !== null ? n : w(e.type) || "Memo";
           case P: {
-            var l = e, f = l._payload, u = l._init;
+            var s = e, b = s._payload, o = s._init;
             try {
-              return w(u(f));
+              return w(o(b));
             } catch {
               return null;
             }
@@ -201,8 +201,8 @@ function Pr() {
         if (B === void 0)
           try {
             throw Error();
-          } catch (l) {
-            var n = l.stack.trim().match(/\n( *(at )?)/);
+          } catch (s) {
+            var n = s.stack.trim().match(/\n( *(at )?)/);
             B = n && n[1] || "";
           }
         return `
@@ -224,33 +224,33 @@ function Pr() {
       }
       var n;
       J = !0;
-      var l = Error.prepareStackTrace;
+      var s = Error.prepareStackTrace;
       Error.prepareStackTrace = void 0;
-      var f;
-      f = N.current, N.current = null, Le();
+      var b;
+      b = N.current, N.current = null, Le();
       try {
         if (r) {
-          var u = function() {
+          var o = function() {
             throw Error();
           };
-          if (Object.defineProperty(u.prototype, "props", {
+          if (Object.defineProperty(o.prototype, "props", {
             set: function() {
               throw Error();
             }
           }), typeof Reflect == "object" && Reflect.construct) {
             try {
-              Reflect.construct(u, []);
+              Reflect.construct(o, []);
             } catch (R) {
               n = R;
             }
-            Reflect.construct(e, [], u);
+            Reflect.construct(e, [], o);
           } else {
             try {
-              u.call();
+              o.call();
             } catch (R) {
               n = R;
             }
-            e.call(u.prototype);
+            e.call(o.prototype);
           }
         } else {
           try {
@@ -262,17 +262,17 @@ function Pr() {
         }
       } catch (R) {
         if (R && n && typeof R.stack == "string") {
-          for (var o = R.stack.split(`
+          for (var i = R.stack.split(`
 `), _ = n.stack.split(`
-`), y = o.length - 1, m = _.length - 1; y >= 1 && m >= 0 && o[y] !== _[m]; )
+`), y = i.length - 1, m = _.length - 1; y >= 1 && m >= 0 && i[y] !== _[m]; )
             m--;
           for (; y >= 1 && m >= 0; y--, m--)
-            if (o[y] !== _[m]) {
+            if (i[y] !== _[m]) {
               if (y !== 1 || m !== 1)
                 do
-                  if (y--, m--, m < 0 || o[y] !== _[m]) {
+                  if (y--, m--, m < 0 || i[y] !== _[m]) {
                     var S = `
-` + o[y].replace(" at new ", " at ");
+` + i[y].replace(" at new ", " at ");
                     return e.displayName && S.includes("<anonymous>") && (S = S.replace("<anonymous>", e.displayName)), typeof e == "function" && L.set(e, S), S;
                   }
                 while (y >= 1 && m >= 0);
@@ -280,7 +280,7 @@ function Pr() {
             }
         }
       } finally {
-        J = !1, N.current = f, Me(), Error.prepareStackTrace = l;
+        J = !1, N.current = b, Me(), Error.prepareStackTrace = s;
       }
       var F = e ? e.displayName || e.name : "", C = F ? V(F) : "";
       return typeof e == "function" && L.set(e, C), C;
@@ -307,14 +307,14 @@ function Pr() {
       }
       if (typeof e == "object")
         switch (e.$$typeof) {
-          case d:
+          case p:
             return Ne(e.render);
           case T:
             return M(e.type, r, t);
           case P: {
-            var n = e, l = n._payload, f = n._init;
+            var n = e, s = n._payload, b = n._init;
             try {
-              return M(f(l), r, t);
+              return M(b(s), r, t);
             } catch {
             }
           }
@@ -329,22 +329,22 @@ function Pr() {
       } else
         de.setExtraStackFrame(null);
     }
-    function Je(e, r, t, n, l) {
+    function Je(e, r, t, n, s) {
       {
-        var f = Function.call.bind(I);
-        for (var u in e)
-          if (f(e, u)) {
-            var o = void 0;
+        var b = Function.call.bind(I);
+        for (var o in e)
+          if (b(e, o)) {
+            var i = void 0;
             try {
-              if (typeof e[u] != "function") {
-                var _ = Error((n || "React class") + ": " + t + " type `" + u + "` is invalid; it must be a function, usually from the `prop-types` package, but received `" + typeof e[u] + "`.This often happens because of typos such as `PropTypes.function` instead of `PropTypes.func`.");
+              if (typeof e[o] != "function") {
+                var _ = Error((n || "React class") + ": " + t + " type `" + o + "` is invalid; it must be a function, usually from the `prop-types` package, but received `" + typeof e[o] + "`.This often happens because of typos such as `PropTypes.function` instead of `PropTypes.func`.");
                 throw _.name = "Invariant Violation", _;
               }
-              o = e[u](r, u, n, t, null, "SECRET_DO_NOT_PASS_THIS_OR_YOU_WILL_BE_FIRED");
+              i = e[o](r, o, n, t, null, "SECRET_DO_NOT_PASS_THIS_OR_YOU_WILL_BE_FIRED");
             } catch (y) {
-              o = y;
+              i = y;
             }
-            o && !(o instanceof Error) && (U(l), g("%s: type specification of %s `%s` is invalid; the type checker function must return `null` or an `Error` but returned a %s. You may have forgotten to pass an argument to the type checker creator (arrayOf, instanceOf, objectOf, oneOf, oneOfType, and shape all require an argument).", n || "React class", t, u, typeof o), U(null)), o instanceof Error && !(o.message in ve) && (ve[o.message] = !0, U(l), g("Failed %s type: %s", t, o.message), U(null));
+            i && !(i instanceof Error) && (U(s), g("%s: type specification of %s `%s` is invalid; the type checker function must return `null` or an `Error` but returned a %s. You may have forgotten to pass an argument to the type checker creator (arrayOf, instanceOf, objectOf, oneOf, oneOfType, and shape all require an argument).", n || "React class", t, o, typeof i), U(null)), i instanceof Error && !(i.message in ve) && (ve[i.message] = !0, U(s), g("Failed %s type: %s", t, i.message), U(null));
           }
       }
     }
@@ -419,51 +419,51 @@ function Pr() {
         });
       }
     }
-    var rr = function(e, r, t, n, l, f, u) {
-      var o = {
+    var rr = function(e, r, t, n, s, b, o) {
+      var i = {
         // This tag allows us to uniquely identify this as a React Element
         $$typeof: a,
         // Built-in properties that belong on the element
         type: e,
         key: r,
         ref: t,
-        props: u,
+        props: o,
         // Record the component responsible for creating this element.
-        _owner: f
+        _owner: b
       };
-      return o._store = {}, Object.defineProperty(o._store, "validated", {
+      return i._store = {}, Object.defineProperty(i._store, "validated", {
         configurable: !1,
         enumerable: !1,
         writable: !0,
         value: !1
-      }), Object.defineProperty(o, "_self", {
+      }), Object.defineProperty(i, "_self", {
         configurable: !1,
         enumerable: !1,
         writable: !1,
         value: n
-      }), Object.defineProperty(o, "_source", {
+      }), Object.defineProperty(i, "_source", {
         configurable: !1,
         enumerable: !1,
         writable: !1,
-        value: l
-      }), Object.freeze && (Object.freeze(o.props), Object.freeze(o)), o;
+        value: s
+      }), Object.freeze && (Object.freeze(i.props), Object.freeze(i)), i;
     };
-    function tr(e, r, t, n, l) {
+    function tr(e, r, t, n, s) {
       {
-        var f, u = {}, o = null, _ = null;
-        t !== void 0 && (be(t), o = "" + t), Xe(r) && (be(r.key), o = "" + r.key), He(r) && (_ = r.ref, Ze(r, l));
-        for (f in r)
-          I.call(r, f) && !ze.hasOwnProperty(f) && (u[f] = r[f]);
+        var b, o = {}, i = null, _ = null;
+        t !== void 0 && (be(t), i = "" + t), Xe(r) && (be(r.key), i = "" + r.key), He(r) && (_ = r.ref, Ze(r, s));
+        for (b in r)
+          I.call(r, b) && !ze.hasOwnProperty(b) && (o[b] = r[b]);
         if (e && e.defaultProps) {
           var y = e.defaultProps;
-          for (f in y)
-            u[f] === void 0 && (u[f] = y[f]);
+          for (b in y)
+            o[b] === void 0 && (o[b] = y[b]);
         }
-        if (o || _) {
+        if (i || _) {
           var m = typeof e == "function" ? e.displayName || e.name || "Unknown" : e;
-          o && Qe(u, m), _ && er(u, m);
+          i && Qe(o, m), _ && er(o, m);
         }
-        return rr(e, o, _, l, n, he.current, u);
+        return rr(e, i, _, s, n, he.current, o);
       }
     }
     var K = j.ReactCurrentOwner, Ee = j.ReactDebugCurrentFrame;
@@ -532,10 +532,10 @@ Check the top-level render call using <` + t + ">.");
         else if (z(e))
           e._store && (e._store.validated = !0);
         else if (e) {
-          var l = je(e);
-          if (typeof l == "function" && l !== e.entries)
-            for (var f = l.call(e), u; !(u = f.next()).done; )
-              z(u.value) && Re(u.value, r);
+          var s = je(e);
+          if (typeof s == "function" && s !== e.entries)
+            for (var b = s.call(e), o; !(o = b.next()).done; )
+              z(o.value) && Re(o.value, r);
         }
       }
     }
@@ -547,7 +547,7 @@ Check the top-level render call using <` + t + ">.");
         var t;
         if (typeof r == "function")
           t = r.propTypes;
-        else if (typeof r == "object" && (r.$$typeof === d || // Note: Memo only checks outer props here.
+        else if (typeof r == "object" && (r.$$typeof === p || // Note: Memo only checks outer props here.
         // Inner props are checked in the reconciler.
         r.$$typeof === T))
           t = r.propTypes;
@@ -558,8 +558,8 @@ Check the top-level render call using <` + t + ">.");
           Je(t, e.props, "prop", n, e);
         } else if (r.PropTypes !== void 0 && !G) {
           G = !0;
-          var l = w(r);
-          g("Component %s declared `PropTypes` instead of `propTypes`. Did you misspell the property assignment?", l || "Unknown");
+          var s = w(r);
+          g("Component %s declared `PropTypes` instead of `propTypes`. Did you misspell the property assignment?", s || "Unknown");
         }
         typeof r.getDefaultProps == "function" && !r.getDefaultProps.isReactClassApproved && g("getDefaultProps is only used on classic React.createClass definitions. Use a static property named `defaultProps` instead.");
       }
@@ -577,21 +577,21 @@ Check the top-level render call using <` + t + ">.");
       }
     }
     var Se = {};
-    function xe(e, r, t, n, l, f) {
+    function xe(e, r, t, n, s, b) {
       {
-        var u = Ye(e);
-        if (!u) {
-          var o = "";
-          (e === void 0 || typeof e == "object" && e !== null && Object.keys(e).length === 0) && (o += " You likely forgot to export your component from the file it's defined in, or you might have mixed up default and named imports.");
+        var o = Ye(e);
+        if (!o) {
+          var i = "";
+          (e === void 0 || typeof e == "object" && e !== null && Object.keys(e).length === 0) && (i += " You likely forgot to export your component from the file it's defined in, or you might have mixed up default and named imports.");
           var _ = nr();
-          _ ? o += _ : o += ge();
+          _ ? i += _ : i += ge();
           var y;
-          e === null ? y = "null" : q(e) ? y = "array" : e !== void 0 && e.$$typeof === a ? (y = "<" + (w(e.type) || "Unknown") + " />", o = " Did you accidentally export a JSX literal instead of a component?") : y = typeof e, g("React.jsx: type is invalid -- expected a string (for built-in components) or a class/function (for composite components) but got: %s.%s", y, o);
+          e === null ? y = "null" : q(e) ? y = "array" : e !== void 0 && e.$$typeof === a ? (y = "<" + (w(e.type) || "Unknown") + " />", i = " Did you accidentally export a JSX literal instead of a component?") : y = typeof e, g("React.jsx: type is invalid -- expected a string (for built-in components) or a class/function (for composite components) but got: %s.%s", y, i);
         }
-        var m = tr(e, r, t, l, f);
+        var m = tr(e, r, t, s, b);
         if (m == null)
           return m;
-        if (u) {
+        if (o) {
           var S = r.children;
           if (S !== void 0)
             if (n)
@@ -618,7 +618,7 @@ React keys must be passed directly to JSX without using spread:
   <%s key={someKey} {...props} />`, H, C, fr, C), Se[C + H] = !0;
           }
         }
-        return e === p ? or(m) : ir(m), m;
+        return e === v ? or(m) : ir(m), m;
       }
     }
     function ur(e, r, t) {
@@ -628,7 +628,7 @@ React keys must be passed directly to JSX without using spread:
       return xe(e, r, t, !1);
     }
     var cr = sr, lr = ur;
-    W.Fragment = p, W.jsx = cr, W.jsxs = lr;
+    W.Fragment = v, W.jsx = cr, W.jsxs = lr;
   }()), W;
 }
 process.env.NODE_ENV === "production" ? Q.exports = xr() : Q.exports = Pr();
@@ -642,13 +642,13 @@ function $r(h) {
 }
 function Or(h) {
   if (Array.isArray(h)) {
-    const [a, ...c] = h;
-    return (p, s, b) => {
-      if (p !== a) return !1;
-      let i = s, v = b;
-      for (const d of c)
-        i = i == null ? void 0 : i[d], v = v == null ? void 0 : v[d];
-      return i !== v;
+    const [a, ...f] = h;
+    return (v, d, c) => {
+      if (v !== a) return !1;
+      let l = d, u = c;
+      for (const p of f)
+        l = l == null ? void 0 : l[p], u = u == null ? void 0 : u[p];
+      return l !== u;
     };
   }
   return h;
@@ -659,106 +659,112 @@ class Z {
     X(this, "changeSubscribers", {});
     this.set(a);
   }
-  subscribe(a, c, p) {
-    const s = _r();
-    return this.changeSubscribers[s] = {
-      id: s,
-      deps: p,
+  subscribe(a, f, v) {
+    const d = _r();
+    return this.changeSubscribers[d] = {
+      id: d,
+      deps: v,
       propCallback: a,
-      reinitCallback: c
-    }, s;
+      reinitCallback: f
+    }, d;
   }
   unsubscribe(a) {
     delete this.changeSubscribers[a];
   }
-  emitChange(a, c, p) {
-    Object.values(this.changeSubscribers).forEach((s) => {
-      var i;
-      const b = (i = s.deps) == null ? void 0 : i.map(Or);
-      (!b || b.includes(a) && p !== c || b.some(
-        (v) => Y(v) && v(a, c, p, this.value)
-      )) && s.propCallback(a, c, p);
+  emitChange(a, f, v) {
+    Object.values(this.changeSubscribers).forEach((d) => {
+      var l;
+      const c = (l = d.deps) == null ? void 0 : l.map(Or);
+      (!c || c.includes(a) && v !== f || c.some(
+        (u) => Y(u) && u(a, f, v, this.value)
+      )) && d.propCallback(a, f, v);
     });
   }
-  emitReinit(a, c, p = !1) {
-    Object.values(this.changeSubscribers).forEach((s) => {
-      s.reinitCallback(a, c, p);
+  emitReinit(a, f, v = !1) {
+    Object.values(this.changeSubscribers).forEach((d) => {
+      d.reinitCallback(a, f, v);
     });
   }
   get() {
     return this.value;
   }
   set(a) {
-    const c = this;
+    const f = this;
     if (a !== this.value) {
-      const p = this.value;
+      const v = this.value;
       a != null ? this.value = new Proxy(a, {
-        get: function(s, b) {
-          const i = Reflect.get(s, b, a);
-          return Y(i) ? i.bind(c.value) : i;
+        get: function(d, c) {
+          const l = Reflect.get(d, c, a);
+          return Y(l) ? l.bind(f.value) : l;
         },
-        set: (s, b, i) => {
-          const v = b, d = s[v];
-          return Reflect.set(s, v, i, a), i = s[v], this.emitChange(v, i, d), !0;
+        set: (d, c, l) => {
+          const u = c, p = d[u];
+          return Reflect.set(d, u, l, a), l = d[u], this.emitChange(u, l, p), !0;
         }
-      }) : this.value = a, this.emitReinit(this.value, p);
+      }) : this.value = a, this.emitReinit(this.value, v);
     }
     return this.value;
   }
 }
-function Wr(h) {
+function Wr(h, a = (f) => f) {
   return Sr(
     ({
-      children: a,
-      value: c,
-      onChangeProp: p,
-      onChangeReinit: s,
-      proxyRef: b
+      children: f,
+      value: v,
+      onChangeProp: d,
+      onChangeReinit: c,
+      proxyRef: l
     }) => {
-      const i = Ce(void 0);
-      i.current === void 0 && (i.current = c instanceof Z ? c : new Z(c), s == null || s(i.current.get(), c instanceof Z ? c.get() : void 0, !0));
-      const v = Rr();
-      return hr(b, () => i.current.get(), [i.current.get()]), yr(() => {
-        const d = i.current.subscribe(
-          p ?? (() => {
+      const u = Ce(void 0);
+      u.current === void 0 && (u.current = v instanceof Z ? v : new Z(a(v)), c == null || c(u.current.get(), v instanceof Z ? v.get() : void 0, !0));
+      const p = Rr();
+      return hr(l, () => u.current.get(), [u.current.get()]), yr(() => {
+        const x = u.current.subscribe(
+          d ?? (() => {
           }),
-          (...x) => {
-            Y(s) && s(...x), v();
+          (...E) => {
+            Y(c) && c(...E), p();
           },
           null
         );
         return () => {
-          i.current.unsubscribe(d);
+          u.current.unsubscribe(x);
         };
-      }, [p, s, v]), /* @__PURE__ */ wr.jsx(h.Provider, { value: i.current, children: a });
+      }, [d, c, p]), /* @__PURE__ */ wr.jsx(h.Provider, { value: u.current, children: f });
     },
     ["children", "onChangeProp", "onChangeReinit", "proxyRef"],
     h.name + ".Provider"
   );
 }
-function Yr(h, a = [], c, p, s = !0) {
-  const b = mr(h);
-  if (b === void 0)
+function Yr(...[
+  h,
+  a,
+  f,
+  v,
+  d = !0
+]) {
+  const c = mr(h);
+  if (c === void 0)
     throw new Error(`No ${h.name} provider found.`);
-  const i = Ce({ value: b }), v = Er((x) => {
-    const E = b.subscribe(
+  const l = Ce({ value: c }), u = Er((x) => {
+    const E = c.subscribe(
       (T, P, k) => {
-        i.current = { value: b }, x(), Y(c) && c(T, P, k);
+        l.current = { value: c }, x(), Y(f) && f(T, P, k);
       },
       (T, P) => {
-        s && (i.current = { value: b }, x()), Y(p) && p(T, P);
+        d && (l.current = { value: c }, x()), Y(v) && v(T, P);
       },
       a
     );
-    return () => b.unsubscribe(E);
-  }, [a, s, c, p, b]), d = gr(
-    v,
-    () => i.current,
-    () => i.current
+    return () => c.unsubscribe(E);
+  }, [a, d, f, v, c]), p = gr(
+    u,
+    () => l.current,
+    () => l.current
   );
   return new Tr(
     // The binding is necessary to fix a strange issue I'm having.
-    { value: d.value.get(), set: d.value.set.bind(d.value) },
+    { value: p.value.get(), set: p.value.set.bind(p.value) },
     ["value", "set"]
   );
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ptolemy2002/react-proxy-context",
   "private": false,
-  "version": "2.5.0",
+  "version": "2.6.0",
   "type": "module",
   "repository": {
     "type": "git",