@legendapp/state 3.0.0-beta.30 → 3.0.0-beta.31

package/index.d.mts

@@ -148,7 +148,7 @@ interface Change {
 type RecordValue<T> = T extends Record<string, infer t> ? t : never;
 type ArrayValue<T> = T extends Array<infer t> ? t : never;
 type ObservableValue<T> = T extends Observable<infer t> ? t : never;
-type Selector<T> = ObservableParam<T> | ObservableEvent | (() => T) | T;
+type Selector<T> = ObservableParam<T> | ObservableEvent | (() => ObservableParam<T>) | (() => T) | T;
 type ClassConstructor<I, Args extends any[] = any[]> = new (...args: Args) => I;
 type ObservableListenerDispose = () => void;
 interface ObservableRoot {
@@ -304,6 +304,8 @@ declare function getProxy(node: NodeInfo, p?: string, asFunction?: Function): Ob
 declare function set(node: NodeInfo, newValue?: any): void;
 declare function get(node: NodeInfo, options?: TrackingType | GetOptions): any;
 declare function peek(node: NodeInfo): any;
+declare function deactivateNode(node: NodeInfo): void;
+declare function reactivateNode(node: NodeInfo, lazyFn: Function): void;
 declare function isObserved(node: NodeInfo): boolean;
 declare function shouldIgnoreUnobserved(node: NodeInfo, refreshFn: () => void): true | undefined;
 
@@ -411,6 +413,7 @@ declare function registerMiddleware(node: NodeInfo, type: MiddlewareEventType, h
 declare const internal: {
     createPreviousHandler: typeof createPreviousHandler;
     clone: typeof clone;
+    deactivateNode: typeof deactivateNode;
     deepMerge: typeof deepMerge;
     ensureNodeValue: typeof ensureNodeValue;
     findIDKey: typeof findIDKey;
@@ -442,6 +445,7 @@ declare const internal: {
     observableFns: Map<string, (node: NodeInfo, ...args: any[]) => any>;
     optimized: symbol;
     peek: typeof peek;
+    reactivateNode: typeof reactivateNode;
     registerMiddleware: typeof registerMiddleware;
     safeParse: typeof safeParse;
     safeStringify: typeof safeStringify;

package/index.d.ts

@@ -148,7 +148,7 @@ interface Change {
 type RecordValue<T> = T extends Record<string, infer t> ? t : never;
 type ArrayValue<T> = T extends Array<infer t> ? t : never;
 type ObservableValue<T> = T extends Observable<infer t> ? t : never;
-type Selector<T> = ObservableParam<T> | ObservableEvent | (() => T) | T;
+type Selector<T> = ObservableParam<T> | ObservableEvent | (() => ObservableParam<T>) | (() => T) | T;
 type ClassConstructor<I, Args extends any[] = any[]> = new (...args: Args) => I;
 type ObservableListenerDispose = () => void;
 interface ObservableRoot {
@@ -304,6 +304,8 @@ declare function getProxy(node: NodeInfo, p?: string, asFunction?: Function): Ob
 declare function set(node: NodeInfo, newValue?: any): void;
 declare function get(node: NodeInfo, options?: TrackingType | GetOptions): any;
 declare function peek(node: NodeInfo): any;
+declare function deactivateNode(node: NodeInfo): void;
+declare function reactivateNode(node: NodeInfo, lazyFn: Function): void;
 declare function isObserved(node: NodeInfo): boolean;
 declare function shouldIgnoreUnobserved(node: NodeInfo, refreshFn: () => void): true | undefined;
 
@@ -411,6 +413,7 @@ declare function registerMiddleware(node: NodeInfo, type: MiddlewareEventType, h
 declare const internal: {
     createPreviousHandler: typeof createPreviousHandler;
     clone: typeof clone;
+    deactivateNode: typeof deactivateNode;
     deepMerge: typeof deepMerge;
     ensureNodeValue: typeof ensureNodeValue;
     findIDKey: typeof findIDKey;
@@ -442,6 +445,7 @@ declare const internal: {
     observableFns: Map<string, (node: NodeInfo, ...args: any[]) => any>;
     optimized: symbol;
     peek: typeof peek;
+    reactivateNode: typeof reactivateNode;
     registerMiddleware: typeof registerMiddleware;
     safeParse: typeof safeParse;
     safeStringify: typeof safeStringify;

package/index.js

@@ -2007,11 +2007,14 @@ function checkProperty(value, key) {
     return value[key];
   }
 }
-function reactivateNode(node, lazyFn) {
+function deactivateNode(node) {
   var _a, _b;
   (_a = node.activatedObserveDispose) == null ? void 0 : _a.call(node);
   (_b = node.linkedToNodeDispose) == null ? void 0 : _b.call(node);
   node.activatedObserveDispose = node.linkedToNodeDispose = node.linkedToNode = void 0;
+}
+function reactivateNode(node, lazyFn) {
+  deactivateNode(node);
   node.lazyFn = lazyFn;
   node.lazy = true;
 }
@@ -2059,7 +2062,7 @@ function activateNodeFunction(node, lazyFn) {
     node.dirtyFn = refreshFn;
     globalState.dirtyNodes.add(node);
   }
-  node.activatedObserveDispose = observe(
+  const observeDispose = observe(
     () => {
       var _a, _b, _c, _d;
       if (isFirst) {
@@ -2162,6 +2165,10 @@ function activateNodeFunction(node, lazyFn) {
     },
     { fromComputed: true }
   );
+  node.activatedObserveDispose = () => {
+    observeDispose == null ? void 0 : observeDispose();
+    disposes.forEach((fn) => fn());
+  };
   return activatedValue;
 }
 function activateNodeBase(node, value) {
@@ -2448,6 +2455,7 @@ function syncState(obs) {
 var internal = {
   createPreviousHandler,
   clone,
+  deactivateNode,
   deepMerge,
   ensureNodeValue,
   findIDKey,
@@ -2465,6 +2473,7 @@ var internal = {
   observableFns,
   optimized,
   peek,
+  reactivateNode,
   registerMiddleware,
   safeParse,
   safeStringify,

package/index.mjs

@@ -2005,11 +2005,14 @@ function checkProperty(value, key) {
     return value[key];
   }
 }
-function reactivateNode(node, lazyFn) {
+function deactivateNode(node) {
   var _a, _b;
   (_a = node.activatedObserveDispose) == null ? void 0 : _a.call(node);
   (_b = node.linkedToNodeDispose) == null ? void 0 : _b.call(node);
   node.activatedObserveDispose = node.linkedToNodeDispose = node.linkedToNode = void 0;
+}
+function reactivateNode(node, lazyFn) {
+  deactivateNode(node);
   node.lazyFn = lazyFn;
   node.lazy = true;
 }
@@ -2057,7 +2060,7 @@ function activateNodeFunction(node, lazyFn) {
     node.dirtyFn = refreshFn;
     globalState.dirtyNodes.add(node);
   }
-  node.activatedObserveDispose = observe(
+  const observeDispose = observe(
     () => {
       var _a, _b, _c, _d;
       if (isFirst) {
@@ -2160,6 +2163,10 @@ function activateNodeFunction(node, lazyFn) {
     },
     { fromComputed: true }
   );
+  node.activatedObserveDispose = () => {
+    observeDispose == null ? void 0 : observeDispose();
+    disposes.forEach((fn) => fn());
+  };
   return activatedValue;
 }
 function activateNodeBase(node, value) {
@@ -2446,6 +2453,7 @@ function syncState(obs) {
 var internal = {
   createPreviousHandler,
   clone,
+  deactivateNode,
   deepMerge,
   ensureNodeValue,
   findIDKey,
@@ -2463,6 +2471,7 @@ var internal = {
   observableFns,
   optimized,
   peek,
+  reactivateNode,
   registerMiddleware,
   safeParse,
   safeStringify,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@legendapp/state",
-  "version": "3.0.0-beta.30",
+  "version": "3.0.0-beta.31",
   "description": "legend-state",
   "sideEffects": false,
   "private": false,

package/react.js

@@ -411,38 +411,6 @@ function Switch({
   const child = children[useSelector(value)];
   return (_b = child ? child() : (_a = children["default"]) == null ? void 0 : _a.call(children)) != null ? _b : null;
 }
-function useObservable(initialValue, deps) {
-  var _a;
-  const ref = React.useRef({});
-  ref.current.value = initialValue;
-  const depsObs$ = deps ? useObservable(deps) : void 0;
-  if (!((_a = ref.current) == null ? void 0 : _a.obs$)) {
-    const value = depsObs$ ? state.isFunction(initialValue) && initialValue.length === 1 ? (p) => {
-      depsObs$.get();
-      return ref.current.value(p);
-    } : () => {
-      depsObs$.get();
-      return state.computeSelector(ref.current.value);
-    } : initialValue;
-    ref.current.obs$ = state.observable(value);
-  }
-  if (depsObs$) {
-    depsObs$.set(deps);
-  }
-  return ref.current.obs$;
-}
-
-// src/react/useComputed.ts
-function useComputed(get, set, deps) {
-  if (!deps && state.isArray(set)) {
-    deps = set;
-    set = void 0;
-  }
-  return useObservable(
-    set ? state.linked({ get, set: ({ value }) => set(value) }) : get,
-    deps
-  );
-}
 var useEffectOnce = (effect, deps) => {
   if (process.env.NODE_ENV === "development" || process.env.NODE_ENV === "test") {
     const refDispose = React.useRef({ num: 0 });
@@ -471,6 +439,8 @@ var useEffectOnce = (effect, deps) => {
     React.useEffect(effect, deps);
   }
 };
+
+// src/react/useMount.ts
 function useMount(fn) {
   return useEffectOnce(() => {
     const ret = fn();
@@ -481,6 +451,54 @@ function useMount(fn) {
 }
 var useMountOnce = useMount;
 
+// src/react/useUnmount.ts
+function useUnmount(fn) {
+  return useMount(() => fn);
+}
+var useUnmountOnce = useUnmount;
+
+// src/react/useObservable.ts
+var { deactivateNode } = state.internal;
+function useObservable(initialValue, deps) {
+  var _a;
+  const ref = React.useRef({});
+  ref.current.value = initialValue;
+  const depsObs$ = deps ? useObservable(deps) : void 0;
+  if (!((_a = ref.current) == null ? void 0 : _a.obs$)) {
+    const value = depsObs$ ? state.isFunction(initialValue) && initialValue.length === 1 ? (p) => {
+      depsObs$.get();
+      return ref.current.value(p);
+    } : () => {
+      depsObs$.get();
+      return state.computeSelector(ref.current.value);
+    } : initialValue;
+    ref.current.obs$ = state.observable(value);
+  }
+  if (depsObs$) {
+    depsObs$.set(deps);
+  }
+  useUnmount(() => {
+    const obs = ref.current.obs$;
+    if (obs) {
+      const node = state.getNode(obs);
+      deactivateNode(node);
+    }
+  });
+  return ref.current.obs$;
+}
+
+// src/react/useComputed.ts
+function useComputed(get, set, deps) {
+  if (!deps && state.isArray(set)) {
+    deps = set;
+    set = void 0;
+  }
+  return useObservable(
+    set ? state.linked({ get, set: ({ value }) => set(value) }) : get,
+    deps
+  );
+}
+
 // src/react/useIsMounted.ts
 function useIsMounted() {
   const obs = useObservable(false);
@@ -500,14 +518,6 @@ function useObservableReducer(reducer, initializerArg, initializer) {
   };
   return [obs, dispatch];
 }
-
-// src/react/useUnmount.ts
-function useUnmount(fn) {
-  return useMount(() => fn);
-}
-var useUnmountOnce = useUnmount;
-
-// src/react/useObserve.ts
 function useObserve(selector, reactionOrOptions, options) {
   let reaction;
   if (state.isFunction(reactionOrOptions)) {

package/react.mjs

@@ -1,4 +1,4 @@
-import { isFunction, isEmpty, observable, computeSelector, isArray, isMap, isObservableValueReady, linked, isPromise, observe, when, whenReady, internal, trackSelector, isPrimitive, isObservable } from '@legendapp/state';
+import { isFunction, isEmpty, observable, computeSelector, isArray, isMap, isObservableValueReady, isPromise, getNode as getNode$1, linked, observe, when, whenReady, internal, trackSelector, isPrimitive, isObservable } from '@legendapp/state';
 import React, { memo, forwardRef, createElement, useState, useContext, useMemo, useRef, useEffect, createContext, useCallback } from 'react';
 import { useSyncExternalStore } from 'use-sync-external-store/shim/index.js';
 import { enableReactive } from '@legendapp/state/react-reactive/enableReactive';
@@ -405,38 +405,6 @@ function Switch({
   const child = children[useSelector(value)];
   return (_b = child ? child() : (_a = children["default"]) == null ? void 0 : _a.call(children)) != null ? _b : null;
 }
-function useObservable(initialValue, deps) {
-  var _a;
-  const ref = useRef({});
-  ref.current.value = initialValue;
-  const depsObs$ = deps ? useObservable(deps) : void 0;
-  if (!((_a = ref.current) == null ? void 0 : _a.obs$)) {
-    const value = depsObs$ ? isFunction(initialValue) && initialValue.length === 1 ? (p) => {
-      depsObs$.get();
-      return ref.current.value(p);
-    } : () => {
-      depsObs$.get();
-      return computeSelector(ref.current.value);
-    } : initialValue;
-    ref.current.obs$ = observable(value);
-  }
-  if (depsObs$) {
-    depsObs$.set(deps);
-  }
-  return ref.current.obs$;
-}
-
-// src/react/useComputed.ts
-function useComputed(get, set, deps) {
-  if (!deps && isArray(set)) {
-    deps = set;
-    set = void 0;
-  }
-  return useObservable(
-    set ? linked({ get, set: ({ value }) => set(value) }) : get,
-    deps
-  );
-}
 var useEffectOnce = (effect, deps) => {
   if (process.env.NODE_ENV === "development" || process.env.NODE_ENV === "test") {
     const refDispose = useRef({ num: 0 });
@@ -465,6 +433,8 @@ var useEffectOnce = (effect, deps) => {
     useEffect(effect, deps);
   }
 };
+
+// src/react/useMount.ts
 function useMount(fn) {
   return useEffectOnce(() => {
     const ret = fn();
@@ -475,6 +445,54 @@ function useMount(fn) {
 }
 var useMountOnce = useMount;
 
+// src/react/useUnmount.ts
+function useUnmount(fn) {
+  return useMount(() => fn);
+}
+var useUnmountOnce = useUnmount;
+
+// src/react/useObservable.ts
+var { deactivateNode } = internal;
+function useObservable(initialValue, deps) {
+  var _a;
+  const ref = useRef({});
+  ref.current.value = initialValue;
+  const depsObs$ = deps ? useObservable(deps) : void 0;
+  if (!((_a = ref.current) == null ? void 0 : _a.obs$)) {
+    const value = depsObs$ ? isFunction(initialValue) && initialValue.length === 1 ? (p) => {
+      depsObs$.get();
+      return ref.current.value(p);
+    } : () => {
+      depsObs$.get();
+      return computeSelector(ref.current.value);
+    } : initialValue;
+    ref.current.obs$ = observable(value);
+  }
+  if (depsObs$) {
+    depsObs$.set(deps);
+  }
+  useUnmount(() => {
+    const obs = ref.current.obs$;
+    if (obs) {
+      const node = getNode$1(obs);
+      deactivateNode(node);
+    }
+  });
+  return ref.current.obs$;
+}
+
+// src/react/useComputed.ts
+function useComputed(get, set, deps) {
+  if (!deps && isArray(set)) {
+    deps = set;
+    set = void 0;
+  }
+  return useObservable(
+    set ? linked({ get, set: ({ value }) => set(value) }) : get,
+    deps
+  );
+}
+
 // src/react/useIsMounted.ts
 function useIsMounted() {
   const obs = useObservable(false);
@@ -494,14 +512,6 @@ function useObservableReducer(reducer, initializerArg, initializer) {
   };
   return [obs, dispatch];
 }
-
-// src/react/useUnmount.ts
-function useUnmount(fn) {
-  return useMount(() => fn);
-}
-var useUnmountOnce = useUnmount;
-
-// src/react/useObserve.ts
 function useObserve(selector, reactionOrOptions, options) {
   let reaction;
   if (isFunction(reactionOrOptions)) {