@legendapp/state 0.16.1 → 0.17.0-next.0

package/react.mjs

@@ -1,5 +1,5 @@
-import { isFunction, Tracking, isObservable, updateTracking, getNodeValue, extraPrimitiveProps, tracking, beginTracking, setupTracking, endTracking, observe, symbolUndef, observable } from '@legendapp/state';
-import { memo, useRef, useMemo, createElement, __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED, useReducer, useCallback, useEffect } from 'react';
+import { isFunction, Tracking, isObservable, updateTracking, getNodeValue, extraPrimitiveProps, ObservablePrimitive, tracking, beginTracking, scheduleSweep, setupTracking, endTracking, computed, observe, observable } from '@legendapp/state';
+import { memo, createElement, useRef, useMemo, version, __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED, useEffect } from 'react';
 
 function computeProp(prop) {
     let p = prop;
@@ -17,9 +17,9 @@ function Computed({ children }) {
 const Memo = memo(function Memo({ children }) {
     return children();
 }, () => true);
-function Show({ if: if_, else: else_, children, }) {
+function Show({ if: if_, else: else_, wrap, children, }) {
     const value = computeProp(if_);
-    return (value
+    const child = (value
         ? isFunction(children)
             ? children(value)
             : children
@@ -28,6 +28,7 @@ function Show({ if: if_, else: else_, children, }) {
                 ? else_()
                 : else_
             : null);
+    return wrap ? createElement(wrap, undefined, child) : child;
 }
 function Switch({ value, children, }) {
     var _a, _b, _c, _d;
@@ -62,8 +63,6 @@ function For({ each, optimized, item, children, }) {
 }
 
 let isEnabled = false;
-const Updater = (s) => s + 1;
-const EmptyEffect = () => { };
 function enableLegendStateReact() {
     if (!isEnabled) {
         isEnabled = true;
@@ -83,187 +82,168 @@ function enableLegendStateReact() {
             __fn: (obs) => ({ data: obs }),
         });
         extraPrimitiveProps.set('ref', null);
+        // Set extra props for ObservablePrimitive to return on primitives
+        Object.defineProperties(ObservablePrimitive.prototype, {
+            $$typeof: { configurable: true, value: ReactTypeofSymbol },
+            type: { configurable: true, value: Text },
+            props: {
+                configurable: true,
+                get() {
+                    return { data: this.getNode() };
+                },
+            },
+            ref: { configurable: true, value: null },
+        });
+        const mapOwnersDispose = new WeakMap();
+        const Updater = (s) => s + 1;
+        const EmptyEffect = () => { };
+        function runOwnerDisposes(owner) {
+            // Dispose old listeners if exists
+            if (owner) {
+                const disposeOld = mapOwnersDispose.get(owner);
+                if (disposeOld) {
+                    tracking.callbacksMarked.delete(disposeOld);
+                    disposeOld();
+                    mapOwnersDispose.delete(owner);
+                }
+            }
+        }
         // 2. Override dispatcher access to hook up tracking
         let dispatcher;
         let didBeginTracking = false;
         let prevNodes;
+        const canUseOwner = +version.split('.')[0] >= 18;
         Object.defineProperty(__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactCurrentDispatcher, 'current', {
             get() {
                 return dispatcher;
             },
             set(newDispatcher) {
                 var _a;
+                const owner = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactCurrentOwner.current;
                 if (newDispatcher) {
-                    const useCallback = newDispatcher.useCallback;
-                    // When the React render is complete it sets the dispatcher to an object where useCallback has a length of 0
-                    if (dispatcher && didBeginTracking && useCallback.length < 2) {
-                        didBeginTracking = false;
-                        // If the previous dispatcher tracked nodes then set up hooks
-                        if (tracking.nodes) {
-                            try {
-                                let forceRender = dispatcher.useReducer(Updater, 0)[1];
-                                let noArgs = true;
-                                if (process.env.NODE_ENV === 'development') {
-                                    (_a = tracking.listeners) === null || _a === void 0 ? void 0 : _a.call(tracking, tracking.nodes);
-                                    if (tracking.updates) {
-                                        noArgs = false;
-                                        forceRender = tracking.updates(forceRender);
+                    // If owner then this might be a component
+                    if (!canUseOwner || owner) {
+                        const useCallback = newDispatcher.useCallback;
+                        // Check properties of newDispatcher's useCallback to determine whether this is a component and we should do the work
+                        // Filter out dispatchers for hooks because we don't care about those
+                        // When the React render is complete it sets the dispatcher to an object where useCallback has a length of 0
+                        // So this will be the end of the render of the previous dispatcher
+                        // And we track all accessed nodes
+                        if (dispatcher && didBeginTracking && useCallback.length < 2) {
+                            if (process.env.NODE_ENV === 'development' && dispatcher !== didBeginTracking) {
+                                throw new Error('[legend-state] Unexpected dispatcher');
+                            }
+                            didBeginTracking = undefined;
+                            // If the previous dispatcher tracked nodes then set up hooks
+                            if (tracking.nodes) {
+                                try {
+                                    let dispose;
+                                    let forceRender = dispatcher.useReducer(Updater, 0)[1];
+                                    let noArgs = true;
+                                    // Hook into tracking if user requested it
+                                    if (process.env.NODE_ENV === 'development') {
+                                        (_a = tracking.listeners) === null || _a === void 0 ? void 0 : _a.call(tracking, tracking.nodes);
+                                        if (tracking.updates) {
+                                            noArgs = false;
+                                            forceRender = tracking.updates(forceRender);
+                                        }
                                     }
-                                }
-                                // Track all of the nodes accessed during the dispatcher
-                                let dispose = setupTracking(tracking.nodes, forceRender, /*noArgs*/ noArgs);
-                                if (process.env.NODE_ENV === 'development') {
-                                    // Clear tracing
-                                    tracking.listeners = undefined;
-                                    tracking.updates = undefined;
-                                    const cachedNodes = tracking.nodes;
-                                    dispatcher.useEffect(() => {
-                                        // Workaround for React 18's double calling useEffect. If this is the
-                                        // second useEffect, set up tracking again.
-                                        if (dispose === undefined) {
-                                            dispose = setupTracking(cachedNodes, forceRender, /*noArgs*/ noArgs);
+                                    if (canUseOwner) {
+                                        // Dispose old listeners if exists
+                                        runOwnerDisposes(owner);
+                                        runOwnerDisposes(owner.alternate);
+                                    }
+                                    // Track all of the nodes accessed during the dispatcher
+                                    dispose = setupTracking(tracking.nodes, forceRender, 
+                                    /*noArgs*/ noArgs, 
+                                    /*markAndSweep*/ canUseOwner);
+                                    if (canUseOwner) {
+                                        // Add this dispose function to the map to be able to clear listeners on the next run
+                                        mapOwnersDispose.set(owner, dispose);
+                                    }
+                                    else {
+                                        // If can't use owner (in React 17 or less) then we have to inject a useEffect to cleanup
+                                        if (process.env.NODE_ENV === 'development') {
+                                            // Clear tracing
+                                            tracking.listeners = undefined;
+                                            tracking.updates = undefined;
+                                            const cachedNodes = tracking.nodes;
+                                            dispatcher.useEffect(() => {
+                                                // Workaround for React 18's double calling useEffect. If this is the
+                                                // second useEffect, set up tracking again.
+                                                if (dispose === undefined) {
+                                                    dispose = setupTracking(cachedNodes, forceRender, 
+                                                    /*noArgs*/ noArgs);
+                                                }
+                                                return () => {
+                                                    dispose();
+                                                    dispose = undefined;
+                                                };
+                                            });
                                         }
-                                        return () => {
-                                            dispose();
-                                            dispose = undefined;
-                                        };
-                                    });
+                                        else {
+                                            // Return dispose to cleanup before each render or on unmount
+                                            dispatcher.useEffect(() => dispose);
+                                        }
+                                    }
                                 }
-                                else {
-                                    // Return dispose to cleanup before each render or on unmount
-                                    dispatcher.useEffect(() => dispose);
+                                catch (err) {
+                                    // This may not ever be an error but since this is new we'll leave this here
+                                    // for a bit while we see what the behavior is like
+                                    if (process.env.NODE_ENV === 'development') {
+                                        console.error('[legend-state] error creating hooks', err);
+                                        throw new Error('[legend-state] error creating hooks');
+                                    }
                                 }
+                                // Note that there is no useEffect to handle unmount. State listeners are handled lazily -
                             }
-                            catch (err) {
-                                // This may not ever be an error but since this is new we'll leave this here
-                                // for a bit while we see what the behavior is like
-                                if (process.env.NODE_ENV === 'development') {
-                                    console.error('[legend-state] error creating hooks', err);
-                                    throw new Error('[legend-state] error creating hooks');
+                            else {
+                                // Run empty hook if not tracking nodes, to keep the same number of hooks per render
+                                dispatcher.useReducer(Updater, 0);
+                                if (!canUseOwner) {
+                                    dispatcher.useReducer(EmptyEffect, 0);
                                 }
                             }
+                            // Restore the previous tracking context
+                            endTracking(prevNodes);
                         }
-                        else {
-                            // Run empty hooks if not tracking nodes, to keep the same number of hooks per render
-                            dispatcher.useReducer(Updater, 0);
-                            dispatcher.useEffect(EmptyEffect);
+                        dispatcher = newDispatcher;
+                        // Start a new tracking context when entering a new rendering dispatcher
+                        // In development, rendering dispatchers have useCallback named either "mountHookTypes" or "updateHookTypes"
+                        // In production, they just have length = 2
+                        if (!tracking.isTracking &&
+                            (process.env.NODE_ENV === 'development'
+                                ? !useCallback.toString().includes('Invalid')
+                                : useCallback.length === 2)) {
+                            didBeginTracking = dispatcher;
+                            // Keep a copy of the previous tracking context
+                            prevNodes = beginTracking();
                         }
-                        // Restore the previous tracking context
-                        endTracking(prevNodes);
-                    }
-                    dispatcher = newDispatcher;
-                    // Start a new tracking context when entering a new rendering dispatcher
-                    // In development, rendering dispatchers have useCallback named either "mountHookTypes" or "updateHookTypes"
-                    // In production, they just have length = 2
-                    if (!tracking.isTracking &&
-                        (process.env.NODE_ENV === 'development'
-                            ? !useCallback.toString().includes('Invalid')
-                            : useCallback.length === 2)) {
-                        didBeginTracking = true;
-                        // Keep a copy of the previous tracking context
-                        prevNodes = beginTracking();
                     }
                 }
+                else if (!owner) {
+                    scheduleSweep();
+                }
+                dispatcher = newDispatcher;
             },
         });
     }
 }
 
-function useForceRender() {
-    const [, forceRender] = useReducer((s) => s + 1, 0);
-    return useCallback(() => forceRender(), []);
+function useComputed(compute) {
+    return useMemo(() => computed(compute), []);
 }
 
-/**
- * Runs the specified selector, automatically tracking observable access and optionally re-rendering
- * @param selector A computation function
- * @param whenToRender When to re-render. false = never re-render, undefined = render if different, true = always render
- */
-function useComputed(selector, whenToRender) {
-    let inRun = true;
-    let ret = symbolUndef;
-    let cachedNodes;
-    const fr = whenToRender !== false && useForceRender();
-    const update = function () {
-        // If running, call selector and return the value
-        // Don't need to call the selector again if not running and alwaysUpdate
-        if (inRun || !whenToRender) {
-            const cur = selector();
-            // Re-render if not currently rendering and value has changed
-            if (!inRun && cur !== ret && whenToRender !== false) {
-                // Re-render if value changed
-                fr();
-            }
-            ret = cur;
-        }
-        else if (whenToRender) {
-            fr();
-        }
-        inRun = false;
-        // Workaround for React 18's double calling useEffect - cached the tracking nodes
-        if (process.env.NODE_ENV === 'development') {
-            cachedNodes = tracking.nodes;
-        }
-    };
-    let dispose = observe(update);
-    if (process.env.NODE_ENV === 'development') {
-        useEffect(() => {
-            // Workaround for React 18's double calling useEffect. If this is the
-            // second useEffect, set up tracking again.
-            if (dispose === undefined) {
-                dispose = setupTracking(cachedNodes, update, /*noArgs*/ true);
-            }
-            return () => {
-                dispose();
-                dispose = undefined;
-            };
-        });
-    }
-    else {
-        // Return dispose to cleanup before each render or on unmount
-        useEffect(() => dispose);
-    }
-    return ret;
-}
-
-function useObserve(selector) {
-    // Development-only workaround for React 18 double calling useEffect
-    if (process.env.NODE_ENV === 'development') {
-        let cachedNodes;
-        const update = () => {
-            selector();
-            cachedNodes = tracking.nodes;
-        };
-        let dispose = observe(update);
-        useEffect(() => {
-            // Workaround for React 18's double calling useEffect. If this is the
-            // second useEffect, set up tracking again.
-            if (dispose === undefined) {
-                dispose = setupTracking(cachedNodes, update, /*noArgs*/ true);
-            }
-            return () => {
-                dispose();
-                dispose = undefined;
-            };
-        });
-    }
-    else {
+function useObserve(selector, deps) {
+    useEffect(() => {
         const dispose = observe(selector);
-        // Return dispose to cleanup before each render or on unmount
-        useEffect(() => dispose);
-    }
+        return dispose;
+    }, deps || [selector]);
 }
 
-/**
- * A React hook that creates a new observable and can optionally listen or persist its state.
- *
- * @param initialValue The initial value of the observable or a function that returns the initial value
- *
- * @see https://www.legendapp.com/dev/state/react/#useObservable
- */
 function useObservable(initialValue) {
     // Create the observable from the default value
-    return useMemo(() => observable(isFunction(initialValue) ? initialValue() : initialValue), []); // eslint-disable-line react-hooks/exhaustive-deps
+    return useMemo(() => observable(isFunction(initialValue) ? initialValue() : initialValue), []);
 }
 
 export { Computed, For, Memo, Show, Switch, enableLegendStateReact, useComputed, useObservable, useObserve };

package/react.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"react.mjs","sources":["../../src/react/flow.tsx","../../src/react/enableLegendStateReact.ts","../../src/react/useForceRender.ts","../../src/react/useComputed.ts","../../src/react/useObserve.ts","../../src/react/useObservable.ts"],"sourcesContent":[null,null,null,null,null,null],"names":["ReactInternals"],"mappings":"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"}
+{"version":3,"file":"react.mjs","sources":["../../src/react/flow.tsx","../../src/react/enableLegendStateReact.ts","../../src/react/useComputed.ts","../../src/react/useObserve.ts","../../src/react/useObservable.ts"],"sourcesContent":[null,null,null,null,null],"names":["ReactVersion","ReactInternals"],"mappings":"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"}

package/src/ObservablePrimitive.d.ts

@@ -0,0 +1,11 @@
+import { ListenerFn, NodeValue, ObservableListenerDispose } from './observableInterfaces';
+export declare class ObservablePrimitive<T = any> {
+    #private;
+    constructor(node: NodeValue);
+    get value(): T;
+    set value(value: T);
+    get(): T;
+    set(value: T | ((prev: T) => T)): this;
+    onChange(cb: ListenerFn<T>, track?: boolean | Symbol, noArgs?: boolean, markAndSweep?: boolean): ObservableListenerDispose;
+    obs(): ObservablePrimitive<T>;
+}

package/src/notify.d.ts

@@ -0,0 +1,3 @@
+import { NodeValue } from './observableInterfaces';
+export declare function doNotify(node: NodeValue, value: any, path: (string | number)[], valueAtPath: any, prevAtPath: any, level: number, whenOptimizedOnlyIf?: boolean): void;
+export declare function notify(node: NodeValue, value: any, prev: any, level: number, whenOptimizedOnlyIf?: boolean): void;

package/src/observable.d.ts

@@ -1,9 +1,9 @@
-import { ObservableObjectOrPrimitive, ObservableObjectOrPrimitiveDefault, ObservableObjectOrPrimitiveSafe, ObservablePrimitive } from './observableInterfaces';
-export declare function observable<T extends boolean>(value: T | Promise<T>, safe?: boolean): ObservablePrimitive<boolean>;
-export declare function observable<T extends string>(value: T | Promise<T>, safe?: boolean): ObservablePrimitive<string>;
-export declare function observable<T extends number>(value: T | Promise<T>, safe?: boolean): ObservablePrimitive<number>;
-export declare function observable<T extends object>(value: T | Promise<T>, safe: true): ObservableObjectOrPrimitiveSafe<T>;
-export declare function observable<T extends object>(value: T | Promise<T>, safe: false): ObservableObjectOrPrimitive<T>;
-export declare function observable<T extends object>(value: T | Promise<T>, safe?: undefined): ObservableObjectOrPrimitiveDefault<T>;
-export declare function observable<T extends boolean | string | number>(value: T | Promise<T>, safe?: boolean): ObservablePrimitive<T>;
-export declare function observable<T extends unknown>(value: T | Promise<T>, safe?: boolean): ObservablePrimitive<unknown>;
+import { ObservableObjectOrArray, ObservableObjectOrArrayDefault, ObservableObjectOrArraySafe } from './observableInterfaces';
+import { ObservablePrimitive } from './ObservablePrimitive';
+export declare function observable(value: boolean | Promise<boolean>, safe?: boolean): ObservablePrimitive<boolean>;
+export declare function observable(value: string | Promise<string>, safe?: boolean): ObservablePrimitive<string>;
+export declare function observable(value: number | Promise<number>, safe?: boolean): ObservablePrimitive<number>;
+export declare function observable<T extends object>(value: T | Promise<T>, safe: true): ObservableObjectOrArraySafe<T>;
+export declare function observable<T extends object>(value: T | Promise<T>, safe: false): ObservableObjectOrArray<T>;
+export declare function observable<T extends object>(value: T | Promise<T>, safe?: undefined): ObservableObjectOrArrayDefault<T>;
+export declare function observable<T extends unknown>(value: T | Promise<T>, safe?: boolean): ObservableObjectOrArray<unknown>;

package/src/observableInterfaces.d.ts

@@ -1,3 +1,4 @@
+import type { ObservablePrimitive } from './ObservablePrimitive';
 export declare type ObservableEventType = 'change' | 'changeShallow' | 'equals' | 'hasValue' | 'true';
 export interface ObservableBaseFns<T> {
     get?(track?: boolean | Symbol): T;
@@ -39,7 +40,7 @@ export interface ObservableArrayOverride<T> extends Omit<Array<T>, 'forEach' | '
      */
     map<U>(callbackfn: (value: T, index: number, array: T[]) => U, thisArg?: any): U[];
 }
-export declare type ListenerFn<T = any> = (value: T, getPrevious: () => T, path: (string | number)[], valueAtPath: any, prevAtPath: any, node: NodeValue) => void;
+export declare type ListenerFn<T = any> = (value?: T, getPrevious?: () => T, path?: (string | number)[], valueAtPath?: any, prevAtPath?: any, node?: NodeValue) => void;
 declare type PrimitiveKeys<T> = Pick<T, {
     [K in keyof T]-?: T[K] extends Primitive ? K : never;
 }[keyof T]>;
@@ -165,18 +166,20 @@ export declare type ObservableObjectSafe<T = any> = ObservableFnsRecursiveSafe<T
 export declare type ObservableObjectDefault<T = any> = ObservableFnsRecursiveDefault<T> & ObservableObjectFns<T>;
 export declare type ObservableChild<T = any> = [T] extends [Primitive] ? T & ObservablePrimitiveFns<T> : ObservableObject<T>;
 export declare type ObservableRef<T = any> = [T] extends [Primitive] ? ObservablePrimitiveFns<T> : ObservableObject<T>;
-export declare type ObservablePrimitive<T = any> = {
+export declare type ObservablePrimitiveChild<T = any> = {
     value: T;
 } & ObservablePrimitiveFns<T>;
-export declare type ObservableObjectOrPrimitive<T> = [T] extends [Primitive] ? ObservablePrimitive<T> : T extends any[] ? ObservableArray<T> : ObservableObject<T>;
-export declare type ObservableObjectOrPrimitiveSafe<T> = [T] extends [Primitive] ? ObservablePrimitive<T> : T extends any[] ? ObservableArraySafe<T> : ObservableObjectSafe<T>;
-export declare type ObservableObjectOrPrimitiveDefault<T> = [T] extends [Primitive] ? ObservablePrimitive<T> : T extends any[] ? ObservableArrayDefault<T> : ObservableObjectDefault<T>;
-export declare type ObservableComputed<T = any> = ObservableComputedFns<T> & ObservableComputedFnsRecursive<T> & ([T] extends [Primitive] ? {
-    readonly value: T;
-} : T);
-export declare type Observable<T = any> = [T] extends [Primitive] ? ObservablePrimitive<T> : ObservableObject<T>;
-export declare type ObservableReadable<T = any> = ObservableObject<T> | ObservableComputed<T> | ObservablePrimitive<T> | ObservableRef<T>;
-export declare type ObservableWriteable<T = any> = ObservableObject<T> | ObservablePrimitive<T> | ObservableRef<T>;
+export declare type ObservableObjectOrArray<T> = T extends any[] ? ObservableArray<T> : ObservableObject<T>;
+export declare type ObservableObjectOrArraySafe<T> = T extends any[] ? ObservableArraySafe<T> : ObservableObjectSafe<T>;
+export declare type ObservableObjectOrArrayDefault<T> = T extends any[] ? ObservableArrayDefault<T> : ObservableObjectDefault<T>;
+export declare type ObservableComputed<T = any> = ObservableComputedFns<T> & (T extends object ? ObservableComputedFnsRecursive<T> : Omit<ObservablePrimitive<T>, 'set'>);
+export declare type Observable<T = any> = [T] extends [object] ? ObservableObject<T> : T extends boolean ? ObservablePrimitive<boolean> : T extends number ? ObservablePrimitive<number> : T extends string ? ObservablePrimitive<string> : ObservablePrimitive<T>;
+export declare type ObservableReadable<T = any> = ObservableObject<T> | ObservableComputed<T> | ObservablePrimitiveChild<T> | ObservableRef<T>;
+export interface ListenerInfo {
+    track: boolean | Symbol;
+    noArgs?: boolean;
+    listener: ListenerFn;
+}
 export interface NodeValue {
     id: number;
     parent?: NodeValue;
@@ -184,10 +187,6 @@ export interface NodeValue {
     proxy?: object;
     key?: string | number;
     root: ObservableWrapper;
-    listeners?: Set<{
-        track: boolean | Symbol;
-        noArgs?: boolean;
-        listener: ListenerFn;
-    }>;
+    listeners?: Set<ListenerInfo>;
 }
 export {};

package/src/observe.d.ts

@@ -1,3 +1,3 @@
 import { TrackingNode } from './observableInterfaces';
-export declare function setupTracking(nodes: Map<number, TrackingNode>, update: () => void, noArgs?: boolean): () => void;
+export declare function setupTracking(nodes: Map<number, TrackingNode>, update: () => void, noArgs?: boolean, markAndSweep?: boolean): () => void;
 export declare function observe(run: () => void | (() => void)): () => void;

package/src/onChange.d.ts

@@ -1,2 +1,2 @@
 import { ListenerFn, NodeValue } from './observableInterfaces';
-export declare function onChange(node: NodeValue, callback: ListenerFn<any>, track?: boolean | Symbol, noArgs?: boolean): () => void;
+export declare function onChange(node: NodeValue, callback: ListenerFn<any>, track?: boolean | Symbol, noArgs?: boolean, markAndSweep?: boolean): () => void;

package/src/react/flow.d.ts

@@ -1,4 +1,4 @@
-import { ReactElement, ReactNode } from 'react';
+import { FC, ReactElement, ReactNode } from 'react';
 import type { NotPrimitive, ObservableObject } from '../observableInterfaces';
 export declare function Computed({ children }: {
     children: () => ReactNode;
@@ -9,6 +9,7 @@ export declare const Memo: import("react").NamedExoticComponent<{
 export declare function Show<T>(props: {
     if: NotPrimitive<T>;
     else?: ReactNode | (() => ReactNode);
+    wrap?: FC;
     children: ReactNode | ((value?: T) => ReactNode);
 }): ReactElement;
 export declare function Switch<T>({ value, children, }: {

package/src/react/useComputed.d.ts

@@ -1,6 +1,2 @@
-/**
- * Runs the specified selector, automatically tracking observable access and optionally re-rendering
- * @param selector A computation function
- * @param whenToRender When to re-render. false = never re-render, undefined = render if different, true = always render
- */
-export declare function useComputed<T>(selector: () => T, whenToRender?: boolean): T;
+import { ObservableComputed } from '@legendapp/state';
+export declare function useComputed<T>(compute: () => T): ObservableComputed<T>;

package/src/react/useObservable.d.ts

@@ -1,4 +1,4 @@
-import type { ObservableObjectOrPrimitive } from '../observableInterfaces';
+import { ObservablePrimitive, ObservableObjectOrArray } from '@legendapp/state';
 /**
  * A React hook that creates a new observable and can optionally listen or persist its state.
  *
@@ -6,4 +6,7 @@ import type { ObservableObjectOrPrimitive } from '../observableInterfaces';
  *
  * @see https://www.legendapp.com/dev/state/react/#useObservable
  */
-export declare function useObservable<T>(initialValue: T | (() => T)): ObservableObjectOrPrimitive<T>;
+export declare function useObservable(initialValue: boolean | (() => boolean)): ObservablePrimitive<boolean>;
+export declare function useObservable(initialValue: string | (() => string)): ObservablePrimitive<string>;
+export declare function useObservable(initialValue: number | (() => number)): ObservablePrimitive<number>;
+export declare function useObservable<T>(initialValue: T | (() => T)): ObservableObjectOrArray<T>;

package/src/react/useObserve.d.ts

@@ -1 +1 @@
-export declare function useObserve(selector: () => void): void;
+export declare function useObserve(selector: () => void, deps?: any[]): void;

package/src/react/useSelector.d.ts

@@ -0,0 +1 @@
+export declare function useSelector<T>(selector: () => T): T;

package/src/react-components/react-components.d.ts

@@ -1,13 +1,13 @@
 import { CSSProperties, DetailedHTMLProps, InputHTMLAttributes, ReactElement, SelectHTMLAttributes, TextareaHTMLAttributes } from 'react';
-import type { NotPrimitive, ObservableWriteable, Primitive } from '../observableInterfaces';
+import type { NotPrimitive, ObservableFns, Primitive } from '../observableInterfaces';
 declare type Props<TValue, TProps, TBind> = Omit<TProps, 'className' | 'style'> & {
     className?: string | ((value: TValue) => string);
     style?: CSSProperties | ((value: TValue) => CSSProperties);
-    bind?: ObservableWriteable<TValue> & NotPrimitive<TBind>;
+    bind?: ObservableFns<TValue> & NotPrimitive<TBind>;
 };
 export declare namespace Bindable {
-    const input: <TBind extends ObservableWriteable<any>>(props: Props<Primitive, DetailedHTMLProps<InputHTMLAttributes<HTMLInputElement>, HTMLInputElement>, TBind>) => ReactElement<any, string | import("react").JSXElementConstructor<any>>;
-    const textarea: <TBind extends ObservableWriteable<any>>(props: Props<string, DetailedHTMLProps<TextareaHTMLAttributes<HTMLTextAreaElement>, HTMLTextAreaElement>, TBind>) => ReactElement<any, string | import("react").JSXElementConstructor<any>>;
-    const select: <TBind extends ObservableWriteable<any>>(props: Props<string, DetailedHTMLProps<SelectHTMLAttributes<HTMLSelectElement>, HTMLSelectElement>, TBind>) => ReactElement<any, string | import("react").JSXElementConstructor<any>>;
+    const input: <TBind extends ObservableFns<any>>(props: Props<Primitive, DetailedHTMLProps<InputHTMLAttributes<HTMLInputElement>, HTMLInputElement>, TBind>) => ReactElement<any, string | import("react").JSXElementConstructor<any>>;
+    const textarea: <TBind extends ObservableFns<any>>(props: Props<string, DetailedHTMLProps<TextareaHTMLAttributes<HTMLTextAreaElement>, HTMLTextAreaElement>, TBind>) => ReactElement<any, string | import("react").JSXElementConstructor<any>>;
+    const select: <TBind extends ObservableFns<any>>(props: Props<string, DetailedHTMLProps<SelectHTMLAttributes<HTMLSelectElement>, HTMLSelectElement>, TBind>) => ReactElement<any, string | import("react").JSXElementConstructor<any>>;
 }
 export {};

package/src/react-native-components/rn-components.d.ts

@@ -1,8 +1,8 @@
 import { ReactElement } from 'react';
 import { StyleProp, SwitchProps, TextInputProps, TextStyle, ViewStyle } from 'react-native';
-import type { NotPrimitive, ObservableFns, ObservableWriteable, Primitive } from '../observableInterfaces';
+import type { NotPrimitive, ObservableFns, Primitive } from '../observableInterfaces';
 declare type Props<TValue, TStyle, TProps, TBind> = Omit<TProps, 'style'> & {
-    bind?: ObservableWriteable<TValue> & NotPrimitive<TBind>;
+    bind?: ObservableFns<TValue> & NotPrimitive<TBind>;
     style?: StyleProp<TStyle> | ((value: TValue) => StyleProp<TStyle>);
 };
 export declare namespace Bindable {

package/src/tracking.d.ts

@@ -4,9 +4,12 @@ export declare const tracking: {
     nodes: Map<number, TrackingNode>;
     listeners: (nodes: Map<number, TrackingNode>) => void;
     updates: (fn: () => void) => () => void;
+    callbacksMarked: Set<() => void>;
 };
 export declare function beginTracking(): Map<number, TrackingNode>;
 export declare function endTracking(prevNodes: Map<number, TrackingNode>): void;
 export declare function updateTracking(node: NodeValue, track?: boolean | Symbol): void;
 export declare function untrack(node: NodeValue): void;
 export declare function checkTracking(node: NodeValue, track: boolean | Symbol): void;
+export declare function scheduleSweep(): void;
+export declare function sweep(): void;

package/trace.js

@@ -39,7 +39,7 @@ function onChange(name, updateFn, value, getPrevious, path, valueAtPath, prevAtP
     console.log(`[legend-state] Rendering ${name ? name + ' ' : ''}because "${getNodePath(node)}" changed:
 from: ${JSON.stringify(getPrevious())}
 to: ${JSON.stringify(value)}`);
-    updateFn();
+    return updateFn();
 }
 
 exports.traceListeners = traceListeners;