@legendapp/state 0.15.0-next.7 → 0.15.0

package/react.js

@@ -2,84 +2,126 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var react = require('react');
 var state = require('@legendapp/state');
+var react = require('react');
 
 function useForceRender() {
     const [, forceRender] = react.useReducer((s) => s + 1, 0);
     return react.useCallback(() => forceRender(), []);
 }
 
-function useObserver(fn, updateFn) {
-    var _a;
-    const refListeners = react.useRef([]);
-    const listeners = refListeners.current;
-    // Cleanup old listeners before tracking
-    if (listeners.length > 0) {
-        cleanup(listeners);
-    }
-    // Cache previous tracking nodes since this might be nested from another observing component
-    const trackingPrev = state.tracking.nodes;
-    // Reset tracking nodes
-    state.tracking.nodes = new Map();
-    // Calling the function fills up the tracking nodes
-    const ret = fn();
-    const nodes = state.tracking.nodes;
-    // Listen to tracked nodes
-    for (let tracked of nodes.values()) {
-        const { node, track } = tracked;
-        let options;
-        if (track) {
-            options = {
-                shallow: track === state.Tracking.shallow,
-                optimized: track === state.Tracking.optimized,
-            };
+/**
+ * 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 = state.symbolUndef;
+    let cachedNodes;
+    const fr = whenToRender !== false && useForceRender();
+    const update = function () {
+        // If running, run and return the value
+        // Don't need to run 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;
         }
-        listeners.push(state.onChange(node, updateFn, options));
-    }
-    // Do tracing if it was requested
-    if (process.env.NODE_ENV === 'development') {
-        (_a = state.tracking.listeners) === null || _a === void 0 ? void 0 : _a.call(state.tracking, nodes);
-        if (state.tracking.updates) {
-            updateFn = state.tracking.updates(updateFn);
+        else if (whenToRender) {
+            fr();
         }
-    }
-    // Restore previous tracking nodes
-    state.tracking.nodes = trackingPrev;
-    // Cleanup listeners on unmounts
-    react.useEffect(() => {
-        let listeners = refListeners.current;
-        // Workaround for React 18's double calling useEffect. If this is the
-        // second useEffect, set up listeners again.
-        if (process.env.NODE_ENV === 'development' && refListeners.current === undefined) {
-            listeners = refListeners.current = [];
-            // Re-listen to tracked nodes. This should be copied from above.
-            for (let tracked of nodes.values()) {
-                const { node, track } = tracked;
-                let options;
-                if (track) {
-                    options = {
-                        shallow: track === state.Tracking.shallow,
-                        optimized: track === state.Tracking.optimized,
-                    };
-                }
-                listeners.push(state.onChange(node, updateFn, options));
-            }
+        inRun = false;
+        // Workaround for React 18's double calling useEffect - cached the tracking nodes
+        if (process.env.NODE_ENV === 'development') {
+            cachedNodes = state.tracking.nodes;
         }
-        return () => {
-            cleanup(listeners);
-            // Set it to undefined so it would trigger the above React 18 workaround
-            refListeners.current = undefined;
-        };
-    }, []);
+    };
+    let dispose = state.observe(update);
+    if (process.env.NODE_ENV === 'development') {
+        react.useEffect(() => {
+            // Workaround for React 18's double calling useEffect. If this is the
+            // second useEffect, set up tracking again.
+            if (dispose === undefined) {
+                dispose = state.setupTracking(cachedNodes, update);
+            }
+            return () => {
+                dispose();
+                dispose = undefined;
+            };
+        });
+    }
+    else {
+        // Return dispose to cleanup before each render or on unmount
+        react.useEffect(() => dispose);
+    }
     return ret;
 }
-function cleanup(listeners) {
-    // Cleanup listeners
-    for (let i = 0; i < listeners.length; i++) {
-        listeners[i]();
+
+function computeProp(prop) {
+    return useComputed(() => {
+        let p = prop;
+        if (state.isFunction(p)) {
+            p = p();
+        }
+        if (state.isObservable(p)) {
+            p = p.get();
+        }
+        return p;
+    });
+}
+function Computed({ children }) {
+    return useComputed(children, true);
+}
+const Memo = react.memo(function Memo({ children }) {
+    return useComputed(children, true);
+}, () => true);
+function Show({ if: if_, else: else_, children, }) {
+    const value = computeProp(if_);
+    return (value
+        ? state.isFunction(children)
+            ? children(value)
+            : children
+        : else_
+            ? state.isFunction(else_)
+                ? else_()
+                : else_
+            : null);
+}
+function Switch({ value, children, }) {
+    var _a, _b, _c, _d;
+    return ((_d = (_b = (_a = children[computeProp(value)]) === null || _a === void 0 ? void 0 : _a.call(children)) !== null && _b !== void 0 ? _b : (_c = children['default']) === null || _c === void 0 ? void 0 : _c.call(children)) !== null && _d !== void 0 ? _d : null);
+}
+function For({ each, optimized, item, children, }) {
+    if (!each)
+        return null;
+    // Get the raw value with a shallow listener so this list only re-renders
+    // when the array length changes
+    const v = useComputed(() => each.get(optimized ? state.Tracking.optimized : state.Tracking.shallow), true);
+    if (!v)
+        return null;
+    // The child function gets wrapped in a memoized observer component
+    if (!item && children) {
+        // Update the ref so the generated component uses the latest function
+        const refChildren = react.useRef();
+        refChildren.current = children;
+        item = react.useMemo(() => react.memo(({ item }) => useComputed(() => refChildren.current(item), true)), []);
     }
-    listeners.length = 0;
+    // Get the appropriate id field
+    const id = v.length > 0 ? (v[0].id ? 'id' : v[0]._id ? '_id' : v[0].__id ? '__id' : undefined) : undefined;
+    // Create the child elements
+    let out = [];
+    for (let i = 0; i < v.length; i++) {
+        if (v[i]) {
+            const key = v[i][id];
+            out.push(react.createElement(item, { key: key, item: each[i] }));
+        }
+    }
+    return out;
 }
 
 const hasSymbol = typeof Symbol === 'function' && Symbol.for;
@@ -100,9 +142,7 @@ function observer(component, propsAreEqual) {
     const componentName = component.displayName || component.name;
     // Create a wrapper observer component
     let observer = function (props, ref) {
-        const forceRender = useForceRender();
-        // Set up all the listeners while rendering the component
-        return useObserver(() => component(props, ref), forceRender);
+        return useComputed(() => component(props, ref), true);
     };
     if (componentName !== '') {
         observer.displayName = componentName;
@@ -113,26 +153,33 @@ function observer(component, propsAreEqual) {
     }
     return react.memo(observer, propsAreEqual);
 }
-
-function useComputed(selector, deps) {
-    // Do all the computed magic inside a useMemo so we can get an initial value
-    const initial = react.useMemo(() => {
-        let prevValue;
-        const onChange = () => {
-            const v = selector();
-            // If the selector value is different than previously
-            if (v !== prevValue) {
-                prevValue = v;
-                setValue(v);
-            }
-        };
-        // Set up all the listeners while computing the value
-        prevValue = useObserver(selector, onChange);
-        return prevValue;
-    }, deps || []);
-    const [value, setValue] = react.useState(initial);
+// Memoized component to wrap the observable value
+const Text = react.memo(function Text({ data }) {
+    // Exit the tracking context first
+    const trackingPrev = state.tracking.nodes;
+    state.tracking.nodes = undefined;
+    let [value, setValue] = react.useState(state.getNodeValue(data));
+    react.useEffect(() => {
+        const cur = state.getNodeValue(data);
+        // Set to current if it changed since mount
+        if (value !== cur) {
+            setValue(cur);
+        }
+        // Set up change listener, leanup on unmount
+        return state.onChange(data, (v) => setValue(v));
+    }, []);
+    // Restore the tracking context
+    state.tracking.nodes = trackingPrev;
     return value;
-}
+}, () => true);
+const ReactTypeofSymbol = hasSymbol ? Symbol.for('react.element') : react.createElement('a').$$typeof;
+// Set extra props for the proxyHandler to return on primitives
+state.extraPrimitiveProps.set('$$typeof', ReactTypeofSymbol);
+state.extraPrimitiveProps.set('type', Text);
+state.extraPrimitiveProps.set('props', {
+    __fn: (obs) => ({ data: obs }),
+});
+state.extraPrimitiveProps.set('ref', null);
 
 /**
  * A React hook that creates a new observable and can optionally listen or persist its state.
@@ -146,6 +193,11 @@ function useObservable(initialValue) {
     return react.useMemo(() => state.observable(state.isFunction(initialValue) ? initialValue() : initialValue), []); // eslint-disable-line react-hooks/exhaustive-deps
 }
 
+exports.Computed = Computed;
+exports.For = For;
+exports.Memo = Memo;
+exports.Show = Show;
+exports.Switch = Switch;
 exports.observer = observer;
 exports.useComputed = useComputed;
 exports.useObservable = useObservable;

package/react.js.map

@@ -1 +1 @@
-{"version":3,"file":"react.js","sources":["../../src/react/useForceRender.ts","../../src/react/useObserver.ts","../../src/react/observer.ts","../../src/react/useComputed.ts","../../src/react/useObservable.ts"],"sourcesContent":[null,null,null,null,null],"names":["useReducer","useCallback","useRef","tracking","Tracking","onChange","useEffect","forwardRef","memo","useMemo","useState","observable","isFunction"],"mappings":";;;;;;;SAEgB,cAAc,GAAA;AAC1B,IAAA,MAAM,GAAG,WAAW,CAAC,GAAGA,gBAAU,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;IACpD,OAAOC,iBAAW,CAAC,MAAM,WAAW,EAAE,EAAE,EAAE,CAAC,CAAC;AAChD;;ACFgB,SAAA,WAAW,CAAI,EAAW,EAAE,QAAoB,EAAA;;AAC5D,IAAA,MAAM,YAAY,GAAGC,YAAM,CAA8B,EAAE,CAAC,CAAC;AAC7D,IAAA,MAAM,SAAS,GAAG,YAAY,CAAC,OAAO,CAAC;;AAGvC,IAAA,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE;QACtB,OAAO,CAAC,SAAS,CAAC,CAAC;AACtB,KAAA;;AAGD,IAAA,MAAM,YAAY,GAAGC,cAAQ,CAAC,KAAK,CAAC;;AAGpC,IAAAA,cAAQ,CAAC,KAAK,GAAG,IAAI,GAAG,EAAE,CAAC;;AAG3B,IAAA,MAAM,GAAG,GAAG,EAAE,EAAE,CAAC;AAEjB,IAAA,MAAM,KAAK,GAAGA,cAAQ,CAAC,KAAK,CAAC;;AAG7B,IAAA,KAAK,IAAI,OAAO,IAAI,KAAK,CAAC,MAAM,EAAE,EAAE;AAChC,QAAA,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC;AAChC,QAAA,IAAI,OAAwB,CAAC;AAC7B,QAAA,IAAI,KAAK,EAAE;AACP,YAAA,OAAO,GAAG;AACN,gBAAA,OAAO,EAAE,KAAK,KAAKC,cAAQ,CAAC,OAAO;AACnC,gBAAA,SAAS,EAAE,KAAK,KAAKA,cAAQ,CAAC,SAAS;aAC1C,CAAC;AACL,SAAA;AACD,QAAA,SAAS,CAAC,IAAI,CAACC,cAAQ,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC;AACrD,KAAA;;AAGD,IAAA,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,aAAa,EAAE;AACxC,QAAA,CAAA,EAAA,GAAAF,cAAQ,CAAC,SAAS,MAAG,IAAA,IAAA,EAAA,KAAA,KAAA,CAAA,GAAA,KAAA,CAAA,GAAA,EAAA,CAAA,IAAA,CAAAA,cAAA,EAAA,KAAK,CAAC,CAAC;QAC5B,IAAIA,cAAQ,CAAC,OAAO,EAAE;AAClB,YAAA,QAAQ,GAAGA,cAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;AACzC,SAAA;AACJ,KAAA;;AAGD,IAAAA,cAAQ,CAAC,KAAK,GAAG,YAAY,CAAC;;IAG9BG,eAAS,CAAC,MAAK;AACX,QAAA,IAAI,SAAS,GAAG,YAAY,CAAC,OAAO,CAAC;;;AAGrC,QAAA,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,aAAa,IAAI,YAAY,CAAC,OAAO,KAAK,SAAS,EAAE;AAC9E,YAAA,SAAS,GAAG,YAAY,CAAC,OAAO,GAAG,EAAE,CAAC;;AAEtC,YAAA,KAAK,IAAI,OAAO,IAAI,KAAK,CAAC,MAAM,EAAE,EAAE;AAChC,gBAAA,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC;AAEhC,gBAAA,IAAI,OAAwB,CAAC;AAC7B,gBAAA,IAAI,KAAK,EAAE;AACP,oBAAA,OAAO,GAAG;AACN,wBAAA,OAAO,EAAE,KAAK,KAAKF,cAAQ,CAAC,OAAO;AACnC,wBAAA,SAAS,EAAE,KAAK,KAAKA,cAAQ,CAAC,SAAS;qBAC1C,CAAC;AACL,iBAAA;AAED,gBAAA,SAAS,CAAC,IAAI,CAACC,cAAQ,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC;AACrD,aAAA;AACJ,SAAA;AACD,QAAA,OAAO,MAAK;YACR,OAAO,CAAC,SAAS,CAAC,CAAC;;AAEnB,YAAA,YAAY,CAAC,OAAO,GAAG,SAAS,CAAC;AACrC,SAAC,CAAC;KACL,EAAE,EAAE,CAAC,CAAC;AAEP,IAAA,OAAO,GAAG,CAAC;AACf,CAAC;AAED,SAAS,OAAO,CAAC,SAAsC,EAAA;;AAEnD,IAAA,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;AACvC,QAAA,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC;AAClB,KAAA;AACD,IAAA,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC;AACzB;;ACjFA,MAAM,SAAS,GAAG,OAAO,MAAM,KAAK,UAAU,IAAI,MAAM,CAAC,GAAG,CAAC;AAE7D;AACA,MAAM,qBAAqB,GAAG,SAAS;AACnC,MAAE,MAAM,CAAC,GAAG,CAAC,mBAAmB,CAAC;AACjC,MAAE,OAAOE,gBAAU,KAAK,UAAU,IAAIA,gBAAU,CAAC,CAAC,KAAU,KAAK,IAAI,CAAC,CAAC,UAAU,CAAC,CAAC;AAEvE,SAAA,QAAQ,CACpB,SAAY,EACZ,aAA2G,EAAA;;AAG3G,IAAA,IAAI,aAAsB,CAAC;IAC3B,IAAI,qBAAqB,IAAI,SAAS,CAAC,UAAU,CAAC,KAAK,qBAAqB,EAAE;QAC1E,aAAa,GAAG,IAAI,CAAC;AACrB,QAAA,SAAS,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC;AAChC,QAAA,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,aAAa,IAAI,OAAO,SAAS,KAAK,UAAU,EAAE;AAC3E,YAAA,MAAM,IAAI,KAAK,CAAC,CAAA,mEAAA,CAAqE,CAAC,CAAC;AAC1F,SAAA;AACJ,KAAA;IAED,MAAM,aAAa,GAAG,SAAS,CAAC,WAAW,IAAI,SAAS,CAAC,IAAI,CAAC;;AAG9D,IAAA,IAAI,QAAQ,GAAG,UAAU,KAAK,EAAE,GAAG,EAAA;AAC/B,QAAA,MAAM,WAAW,GAAG,cAAc,EAAE,CAAC;;AAGrC,QAAA,OAAO,WAAW,CAAC,MAAM,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE,WAAW,CAAC,CAAC;AACjE,KAAC,CAAC;IAEF,IAAI,aAAa,KAAK,EAAE,EAAE;AACrB,QAAA,QAAe,CAAC,WAAW,GAAG,aAAa,CAAC;AAChD,KAAA;;AAGD,IAAA,IAAI,aAAa,EAAE;AACf,QAAA,QAAQ,GAAGA,gBAAU,CAAC,QAAQ,CAAC,CAAC;AACnC,KAAA;AAED,IAAA,OAAOC,UAAI,CAAC,QAAQ,EAAE,aAAa,CAAiB,CAAC;AACzD;;AC1CgB,SAAA,WAAW,CAAI,QAAiB,EAAE,IAAW,EAAA;;AAEzD,IAAA,MAAM,OAAO,GAAGC,aAAO,CAAC,MAAK;AACzB,QAAA,IAAI,SAAS,CAAC;QACd,MAAM,QAAQ,GAAG,MAAK;AAClB,YAAA,MAAM,CAAC,GAAG,QAAQ,EAAE,CAAC;;YAErB,IAAI,CAAC,KAAK,SAAS,EAAE;gBACjB,SAAS,GAAG,CAAC,CAAC;gBACd,QAAQ,CAAC,CAAC,CAAC,CAAC;AACf,aAAA;AACL,SAAC,CAAC;;AAEF,QAAA,SAAS,GAAG,WAAW,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;AAE5C,QAAA,OAAO,SAAS,CAAC;AACrB,KAAC,EAAE,IAAI,IAAI,EAAE,CAAC,CAAC;IAEf,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAGC,cAAQ,CAAC,OAAO,CAAC,CAAC;AAE5C,IAAA,OAAO,KAAK,CAAC;AACjB;;ACpBA;;;;;;AAMG;AACG,SAAU,aAAa,CAAI,YAA2B,EAAA;;IAExD,OAAOD,aAAO,CACV,MAAME,gBAAU,CAAMC,gBAAU,CAAC,YAAY,CAAC,GAAG,YAAY,EAAE,GAAG,YAAY,CAAC,EAC/E,EAAE,CAC6B,CAAC;AACxC;;;;;;"}
+{"version":3,"file":"react.js","sources":["../../src/react/useForceRender.ts","../../src/react/useComputed.ts","../../src/react/flow.tsx","../../src/react/observer.ts","../../src/react/useObservable.ts"],"sourcesContent":[null,null,null,null,null],"names":["useReducer","useCallback","symbolUndef","tracking","observe","useEffect","setupTracking","isFunction","isObservable","memo","Tracking","useRef","useMemo","createElement","forwardRef","useState","getNodeValue","onChange","extraPrimitiveProps","observable"],"mappings":"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"}

package/react.mjs

@@ -1,81 +1,123 @@
-import { useReducer, useCallback, useRef, useEffect, forwardRef, memo, useMemo, useState } from 'react';
-import { tracking, Tracking, onChange, observable, isFunction } from '@legendapp/state';
+import { observe, setupTracking, symbolUndef, tracking, isFunction, Tracking, isObservable, getNodeValue, onChange, extraPrimitiveProps, observable } from '@legendapp/state';
+import { useReducer, useCallback, useEffect, memo, useRef, useMemo, createElement, forwardRef, useState } from 'react';
 
 function useForceRender() {
     const [, forceRender] = useReducer((s) => s + 1, 0);
     return useCallback(() => forceRender(), []);
 }
 
-function useObserver(fn, updateFn) {
-    var _a;
-    const refListeners = useRef([]);
-    const listeners = refListeners.current;
-    // Cleanup old listeners before tracking
-    if (listeners.length > 0) {
-        cleanup(listeners);
-    }
-    // Cache previous tracking nodes since this might be nested from another observing component
-    const trackingPrev = tracking.nodes;
-    // Reset tracking nodes
-    tracking.nodes = new Map();
-    // Calling the function fills up the tracking nodes
-    const ret = fn();
-    const nodes = tracking.nodes;
-    // Listen to tracked nodes
-    for (let tracked of nodes.values()) {
-        const { node, track } = tracked;
-        let options;
-        if (track) {
-            options = {
-                shallow: track === Tracking.shallow,
-                optimized: track === Tracking.optimized,
-            };
+/**
+ * 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, run and return the value
+        // Don't need to run 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;
         }
-        listeners.push(onChange(node, updateFn, options));
-    }
-    // Do tracing if it was requested
-    if (process.env.NODE_ENV === 'development') {
-        (_a = tracking.listeners) === null || _a === void 0 ? void 0 : _a.call(tracking, nodes);
-        if (tracking.updates) {
-            updateFn = tracking.updates(updateFn);
+        else if (whenToRender) {
+            fr();
         }
-    }
-    // Restore previous tracking nodes
-    tracking.nodes = trackingPrev;
-    // Cleanup listeners on unmounts
-    useEffect(() => {
-        let listeners = refListeners.current;
-        // Workaround for React 18's double calling useEffect. If this is the
-        // second useEffect, set up listeners again.
-        if (process.env.NODE_ENV === 'development' && refListeners.current === undefined) {
-            listeners = refListeners.current = [];
-            // Re-listen to tracked nodes. This should be copied from above.
-            for (let tracked of nodes.values()) {
-                const { node, track } = tracked;
-                let options;
-                if (track) {
-                    options = {
-                        shallow: track === Tracking.shallow,
-                        optimized: track === Tracking.optimized,
-                    };
-                }
-                listeners.push(onChange(node, updateFn, options));
-            }
+        inRun = false;
+        // Workaround for React 18's double calling useEffect - cached the tracking nodes
+        if (process.env.NODE_ENV === 'development') {
+            cachedNodes = tracking.nodes;
         }
-        return () => {
-            cleanup(listeners);
-            // Set it to undefined so it would trigger the above React 18 workaround
-            refListeners.current = undefined;
-        };
-    }, []);
+    };
+    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);
+            }
+            return () => {
+                dispose();
+                dispose = undefined;
+            };
+        });
+    }
+    else {
+        // Return dispose to cleanup before each render or on unmount
+        useEffect(() => dispose);
+    }
     return ret;
 }
-function cleanup(listeners) {
-    // Cleanup listeners
-    for (let i = 0; i < listeners.length; i++) {
-        listeners[i]();
+
+function computeProp(prop) {
+    return useComputed(() => {
+        let p = prop;
+        if (isFunction(p)) {
+            p = p();
+        }
+        if (isObservable(p)) {
+            p = p.get();
+        }
+        return p;
+    });
+}
+function Computed({ children }) {
+    return useComputed(children, true);
+}
+const Memo = memo(function Memo({ children }) {
+    return useComputed(children, true);
+}, () => true);
+function Show({ if: if_, else: else_, children, }) {
+    const value = computeProp(if_);
+    return (value
+        ? isFunction(children)
+            ? children(value)
+            : children
+        : else_
+            ? isFunction(else_)
+                ? else_()
+                : else_
+            : null);
+}
+function Switch({ value, children, }) {
+    var _a, _b, _c, _d;
+    return ((_d = (_b = (_a = children[computeProp(value)]) === null || _a === void 0 ? void 0 : _a.call(children)) !== null && _b !== void 0 ? _b : (_c = children['default']) === null || _c === void 0 ? void 0 : _c.call(children)) !== null && _d !== void 0 ? _d : null);
+}
+function For({ each, optimized, item, children, }) {
+    if (!each)
+        return null;
+    // Get the raw value with a shallow listener so this list only re-renders
+    // when the array length changes
+    const v = useComputed(() => each.get(optimized ? Tracking.optimized : Tracking.shallow), true);
+    if (!v)
+        return null;
+    // The child function gets wrapped in a memoized observer component
+    if (!item && children) {
+        // Update the ref so the generated component uses the latest function
+        const refChildren = useRef();
+        refChildren.current = children;
+        item = useMemo(() => memo(({ item }) => useComputed(() => refChildren.current(item), true)), []);
+    }
+    // Get the appropriate id field
+    const id = v.length > 0 ? (v[0].id ? 'id' : v[0]._id ? '_id' : v[0].__id ? '__id' : undefined) : undefined;
+    // Create the child elements
+    let out = [];
+    for (let i = 0; i < v.length; i++) {
+        if (v[i]) {
+            const key = v[i][id];
+            out.push(createElement(item, { key: key, item: each[i] }));
+        }
     }
-    listeners.length = 0;
+    return out;
 }
 
 const hasSymbol = typeof Symbol === 'function' && Symbol.for;
@@ -96,9 +138,7 @@ function observer(component, propsAreEqual) {
     const componentName = component.displayName || component.name;
     // Create a wrapper observer component
     let observer = function (props, ref) {
-        const forceRender = useForceRender();
-        // Set up all the listeners while rendering the component
-        return useObserver(() => component(props, ref), forceRender);
+        return useComputed(() => component(props, ref), true);
     };
     if (componentName !== '') {
         observer.displayName = componentName;
@@ -109,26 +149,33 @@ function observer(component, propsAreEqual) {
     }
     return memo(observer, propsAreEqual);
 }
-
-function useComputed(selector, deps) {
-    // Do all the computed magic inside a useMemo so we can get an initial value
-    const initial = useMemo(() => {
-        let prevValue;
-        const onChange = () => {
-            const v = selector();
-            // If the selector value is different than previously
-            if (v !== prevValue) {
-                prevValue = v;
-                setValue(v);
-            }
-        };
-        // Set up all the listeners while computing the value
-        prevValue = useObserver(selector, onChange);
-        return prevValue;
-    }, deps || []);
-    const [value, setValue] = useState(initial);
+// Memoized component to wrap the observable value
+const Text = memo(function Text({ data }) {
+    // Exit the tracking context first
+    const trackingPrev = tracking.nodes;
+    tracking.nodes = undefined;
+    let [value, setValue] = useState(getNodeValue(data));
+    useEffect(() => {
+        const cur = getNodeValue(data);
+        // Set to current if it changed since mount
+        if (value !== cur) {
+            setValue(cur);
+        }
+        // Set up change listener, leanup on unmount
+        return onChange(data, (v) => setValue(v));
+    }, []);
+    // Restore the tracking context
+    tracking.nodes = trackingPrev;
     return value;
-}
+}, () => true);
+const ReactTypeofSymbol = hasSymbol ? Symbol.for('react.element') : createElement('a').$$typeof;
+// Set extra props for the proxyHandler to return on primitives
+extraPrimitiveProps.set('$$typeof', ReactTypeofSymbol);
+extraPrimitiveProps.set('type', Text);
+extraPrimitiveProps.set('props', {
+    __fn: (obs) => ({ data: obs }),
+});
+extraPrimitiveProps.set('ref', null);
 
 /**
  * A React hook that creates a new observable and can optionally listen or persist its state.
@@ -142,5 +189,5 @@ function useObservable(initialValue) {
     return useMemo(() => observable(isFunction(initialValue) ? initialValue() : initialValue), []); // eslint-disable-line react-hooks/exhaustive-deps
 }
 
-export { observer, useComputed, useObservable };
+export { Computed, For, Memo, Show, Switch, observer, useComputed, useObservable };
 //# sourceMappingURL=react.mjs.map

package/react.mjs.map

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

package/src/globals.d.ts

@@ -1,6 +1,9 @@
 import { NodeValue } from './observableInterfaces';
 export declare const symbolDateModified: unique symbol;
 export declare const symbolIsObservable: unique symbol;
+export declare const symbolGetNode: unique symbol;
+export declare const symbolUndef: unique symbol;
+export declare const extraPrimitiveProps: Map<string, any>;
 export declare namespace Tracking {
     const normal = true;
     const shallow: unique symbol;
@@ -12,5 +15,4 @@ export declare const nextNodeID: {
 export declare function checkTracking(node: NodeValue, track: boolean | Symbol): void;
 export declare function get(node: NodeValue, keyOrTrack?: string | number | boolean | Symbol, track?: boolean | Symbol): any;
 export declare function getNodeValue(node: NodeValue): any;
-export declare function getOutputValue(node: NodeValue): any;
 export declare function getChildNode(node: NodeValue, key: string | number): NodeValue;

package/src/helpers.d.ts

@@ -1,3 +1,5 @@
-import type { ObservableObject } from './observableInterfaces';
+import type { NodeValue, ObservableObject, ObservableRef } from './observableInterfaces';
 export declare function isObservable(obs: any): obs is ObservableObject;
+export declare function getNode(obs: ObservableRef): NodeValue;
+export declare function lockObservable(obs: ObservableRef, value: boolean): void;
 export declare function mergeIntoObservable(target: ObservableObject | object, ...sources: any[]): any;