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

package/react-web.d.ts

@@ -0,0 +1,6 @@
+import { FCReactiveObject } from '@legendapp/state/react';
+
+type IReactive = FCReactiveObject<JSX.IntrinsicElements>;
+declare const $React: IReactive;
+
+export { $React };

package/react-web.js

@@ -0,0 +1,39 @@
+'use strict';
+
+var state = require('@legendapp/state');
+var react$1 = require('@legendapp/state/react');
+var react = require('react');
+
+// src/react-web/$React.tsx
+var bindInfoOneWay = {
+  value: { handler: "onChange", getValue: (e) => e.target.value, defaultValue: "" }
+};
+var bindInfoInput = Object.assign(
+  { checked: { handler: "onChange", getValue: (e) => e.target.checked } },
+  bindInfoOneWay
+);
+var binders = /* @__PURE__ */ new Map([
+  ["input", bindInfoInput],
+  ["textarea", bindInfoOneWay],
+  ["select", bindInfoOneWay]
+]);
+var $React = new Proxy(
+  {},
+  {
+    get(target, p) {
+      if (!target[p]) {
+        const render = react.forwardRef((props, ref) => {
+          const propsOut = { ...props };
+          if (ref && (state.isFunction(ref) || !state.isEmpty(ref))) {
+            propsOut.ref = ref;
+          }
+          return react.createElement(p, propsOut);
+        });
+        target[p] = react$1.reactive(render, [], binders.get(p));
+      }
+      return target[p];
+    }
+  }
+);
+
+exports.$React = $React;

package/react-web.mjs

@@ -0,0 +1,37 @@
+import { isFunction, isEmpty } from '@legendapp/state';
+import { reactive } from '@legendapp/state/react';
+import { forwardRef, createElement } from 'react';
+
+// src/react-web/$React.tsx
+var bindInfoOneWay = {
+  value: { handler: "onChange", getValue: (e) => e.target.value, defaultValue: "" }
+};
+var bindInfoInput = Object.assign(
+  { checked: { handler: "onChange", getValue: (e) => e.target.checked } },
+  bindInfoOneWay
+);
+var binders = /* @__PURE__ */ new Map([
+  ["input", bindInfoInput],
+  ["textarea", bindInfoOneWay],
+  ["select", bindInfoOneWay]
+]);
+var $React = new Proxy(
+  {},
+  {
+    get(target, p) {
+      if (!target[p]) {
+        const render = forwardRef((props, ref) => {
+          const propsOut = { ...props };
+          if (ref && (isFunction(ref) || !isEmpty(ref))) {
+            propsOut.ref = ref;
+          }
+          return createElement(p, propsOut);
+        });
+        target[p] = reactive(render, [], binders.get(p));
+      }
+      return target[p];
+    }
+  }
+);
+
+export { $React };

package/react.d.mts

@@ -1,6 +1,6 @@
-import * as react from 'react';
-import { ReactNode, ReactElement, FC, LegacyRef, DependencyList, ReducerWithoutAction, ReducerStateWithoutAction, DispatchWithoutAction, Reducer, ReducerState, Dispatch, ReducerAction, ComponentClass } from 'react';
-import { ObservableParam, Observable, ObservableBoolean, Selector, RecursiveValueOrFunction, ObserveOptions, ObserveEvent, ObserveEventCallback } from '@legendapp/state';
+import * as React from 'react';
+import { ReactNode, ReactElement, FC, NamedExoticComponent, LegacyRef, DependencyList, ReducerWithoutAction, ReducerStateWithoutAction, DispatchWithoutAction, Reducer, ReducerState, Dispatch, ReducerAction, ComponentClass } from 'react';
+import { ObservableParam, Observable, ObservableBoolean, Selector, GetOptions, RecursiveValueOrFunction, ObserveOptions, ObserveEvent, ObserveEventCallback } from '@legendapp/state';
 
 declare function Computed({ children }: {
     children: ObservableParam | (() => ReactNode);
@@ -22,11 +22,14 @@ declare function For<T, TProps>({ each, optimized: isOptimized, item, itemProps,
 declare function usePauseProvider(): {
     PauseProvider: ({ children }: {
         children: ReactNode;
-    }) => react.FunctionComponentElement<react.ProviderProps<ObservableBoolean>>;
+    }) => React.FunctionComponentElement<React.ProviderProps<ObservableBoolean>>;
     isPaused$: ObservableBoolean;
 };
 
-declare const Memo: react.MemoExoticComponent<typeof Computed>;
+declare const Memo: NamedExoticComponent<{
+    children: any;
+    scoped?: boolean;
+}>;
 
 interface IReactive {
 }
@@ -43,7 +46,9 @@ interface PropsIfReady<T> {
 interface PropsBase<T> {
     else?: ReactNode | (() => ReactNode);
     $value?: Observable<T>;
-    wrap?: FC;
+    wrap?: FC<{
+        children: ReactNode;
+    }>;
     children: ReactNode | ((value?: T) => ReactNode);
 }
 type Props<T> = PropsBase<T> & (PropsIf<T> | PropsIfReady<T>);
@@ -54,11 +59,11 @@ declare function Switch<T extends object>({ value, children, }: {
     children: Partial<Record<keyof T | 'null' | 'undefined' | 'default', () => ReactNode>>;
 }): ReactElement | null;
 declare function Switch<T extends string | number | symbol>({ value, children, }: {
-    value?: Selector<T>;
+    value?: Selector<T | undefined | null>;
     children: Partial<Record<T | 'null' | 'undefined' | 'default', () => ReactNode>>;
 }): ReactElement | null;
 declare function Switch<T extends boolean>({ value, children, }: {
-    value?: Selector<T>;
+    value?: Selector<T | undefined | null>;
     children: Partial<Record<'false' | 'true' | 'null' | 'undefined' | 'default', () => ReactNode>>;
 }): ReactElement | null;
 declare function Switch<T>({ value, children, }: {
@@ -71,20 +76,20 @@ type ShapeWithNew$<T> = Partial<Omit<T, 'children'>> & {
 } & {
     children?: Selector<ReactNode>;
 };
-interface BindKey<P> {
-    handler?: keyof P;
-    getValue?: (e: any) => any;
+interface BindKey<P, K extends keyof P = keyof P> {
+    handler?: K;
+    getValue?: P[K] extends infer T ? T extends (...args: any) => any ? (params: Parameters<T>[0]) => any : (e: any) => any : (e: any) => any;
     defaultValue?: any;
     selector?: (propsOut: Record<string, any>, p: Observable<any>) => any;
 }
-type BindKeys<P = any> = Record<keyof P, BindKey<P>>;
+type BindKeys<P = any, K extends keyof P = keyof P> = Partial<Record<K, BindKey<P>>>;
 type FCReactiveObject<T> = {
     [K in keyof T]: FC<ShapeWithNew$<T[K]>>;
 };
 type FCReactive<P, P2> = P & FC<ShapeWithNew$<P2> & {
     ref?: LegacyRef<P> | undefined;
 }>;
-interface UseSelectorOptions {
+interface UseSelectorOptions extends GetOptions {
     suspense?: boolean;
     skipCheck?: boolean;
 }
@@ -99,13 +104,26 @@ type ObjectShapeWith$<T> = {
     [K in keyof T]: T[K] extends FC<infer P> ? FC<ShapeWith$<P>> : T[K];
 };
 type ExtractFCPropsType<T> = T extends FC<infer P> ? P : never;
+type ReactifyProps<T, K extends keyof T> = Omit<T, K> & {
+    [P in K]: Selector<T[P]>;
+};
 declare const hasSymbol: false | ((key: string) => symbol);
 declare function observer<P extends FC<any>>(component: P): P;
-declare function reactive<T extends FC<any>>(component: T, bindKeys?: BindKeys<ExtractFCPropsType<T>>): T | FC<ShapeWith$<ExtractFCPropsType<T>>>;
-declare function reactive<T extends FC<any>, T2 extends keyof ExtractFCPropsType<T>>(component: T, bindKeys?: BindKeys<ExtractFCPropsType<T>>): T | FC<ShapeWithPick$<ExtractFCPropsType<T>, T2>>;
-declare function reactiveObserver<T extends FC<any>>(component: T, bindKeys?: BindKeys<ExtractFCPropsType<T>>): T | FC<ShapeWith$<ExtractFCPropsType<T>>>;
-declare function reactiveObserver<T extends FC<any>, T2 extends keyof ExtractFCPropsType<T>>(component: T, bindKeys?: BindKeys<ExtractFCPropsType<T>>): T | FC<ShapeWithPick$<ExtractFCPropsType<T>, T2>>;
-declare function reactiveComponents<P extends Record<string, FC>>(components: P): ObjectShapeWith$<P>;
+declare function reactive<T extends object>(component: React.ComponentClass<T>, keys: undefined | null, bindKeys?: BindKeys<T>): React.FC<ShapeWith$<T>>;
+declare function reactive<T extends object>(component: React.FC<T>, keys: undefined | null, bindKeys?: BindKeys<T>): React.FC<ShapeWith$<T>>;
+declare function reactive<T extends object>(component: React.ForwardRefExoticComponent<T>, keys: undefined | null, bindKeys?: BindKeys<T>): React.ForwardRefExoticComponent<ShapeWith$<T>>;
+declare function reactive<T extends object, K extends keyof T>(component: React.FC<T>, keys: K[] | (keyof T)[], bindKeys?: BindKeys<T, K>): React.FC<ReactifyProps<T, K>>;
+declare function reactive<T extends object, K extends keyof T>(component: React.ForwardRefExoticComponent<T>, keys: K[] | (keyof T)[], bindKeys?: BindKeys<T, K>): React.ForwardRefExoticComponent<ReactifyProps<T, K>>;
+declare function reactive<T extends object>(component: React.ComponentClass<T>): React.ComponentClass<ShapeWith$<T>>;
+declare function reactive<T extends object>(component: React.FC<T>): React.FC<ShapeWith$<T>>;
+declare function reactive<T extends object>(component: React.ForwardRefExoticComponent<T>): React.ForwardRefExoticComponent<ShapeWith$<T>>;
+declare function reactiveObserver<T extends object>(component: React.FC<T>, keys: undefined | null, bindKeys?: BindKeys<T>): React.FC<ShapeWith$<T>>;
+declare function reactiveObserver<T extends object>(component: React.ForwardRefExoticComponent<T>, keys: undefined | null, bindKeys?: BindKeys<T>): React.ForwardRefExoticComponent<ShapeWith$<T>>;
+declare function reactiveObserver<T extends object, K extends keyof T>(component: React.FC<T>, keys: K[] | (keyof T)[], bindKeys?: BindKeys<T, K>): React.FC<ReactifyProps<T, K>>;
+declare function reactiveObserver<T extends object, K extends keyof T>(component: React.ForwardRefExoticComponent<T>, keys: K[] | (keyof T)[], bindKeys?: BindKeys<T, K>): React.ForwardRefExoticComponent<ReactifyProps<T, K>>;
+declare function reactiveObserver<T extends object>(component: React.FC<T>): React.FC<ShapeWith$<T>>;
+declare function reactiveObserver<T extends object>(component: React.ForwardRefExoticComponent<T>): React.ForwardRefExoticComponent<ShapeWith$<T>>;
+declare function reactiveComponents<P extends Record<string, any>>(components: P): ObjectShapeWith$<P>;
 
 declare function useComputed<T>(get: () => T | Promise<T>): Observable<T>;
 declare function useComputed<T>(get: () => T | Promise<T>, deps: any[]): Observable<T>;
@@ -151,12 +169,14 @@ declare function useSelector<T>(selector: Selector<T>, options?: UseSelectorOpti
 declare function useUnmount(fn: () => void): void;
 declare const useUnmountOnce: typeof useUnmount;
 
-declare function useWhen<T>(predicate: Selector<T>, effect: (value: T) => any | (() => any)): Promise<any>;
-declare function useWhenReady<T>(predicate: Selector<T>, effect: (value: T) => any | (() => any)): Promise<any>;
+declare function useWhen<T>(predicate: Selector<T>): Promise<T>;
+declare function useWhen<T, T2>(predicate: Selector<T>, effect: (value: T) => T2): Promise<T2>;
+declare function useWhenReady<T>(predicate: Selector<T>): Promise<T>;
+declare function useWhenReady<T, T2>(predicate: Selector<T>, effect: (value: T) => T2 | (() => T2)): Promise<T2>;
 
 declare function configureReactive({ components, binders, }: {
     components?: Record<string, FC | ComponentClass<any>>;
     binders?: Record<string, BindKeys>;
 }): void;
 
-export { type BindKey, type BindKeys, Computed, type ExtractFCPropsType, type FCReactive, type FCReactiveObject, For, type IReactive, Memo, type ObjectShapeWith$, Reactive, type ShapeWith$, type ShapeWithNew$, type ShapeWithPick$, Show, Switch, type UseObserveOptions, type UseSelectorOptions, configureReactive, hasSymbol, observer, reactive, reactiveComponents, reactiveObserver, useComputed, useEffectOnce, useIsMounted, useMount, useMountOnce, useObservable, useObservableReducer, useObserve, useObserveEffect, usePauseProvider, useSelector, useUnmount, useUnmountOnce, useWhen, useWhenReady };
+export { type BindKey, type BindKeys, Computed, type ExtractFCPropsType, type FCReactive, type FCReactiveObject, For, type IReactive, Memo, type ObjectShapeWith$, type ReactifyProps, Reactive, type ShapeWith$, type ShapeWithNew$, type ShapeWithPick$, Show, Switch, type UseObserveOptions, type UseSelectorOptions, configureReactive, hasSymbol, observer, reactive, reactiveComponents, reactiveObserver, useSelector as use$, useComputed, useEffectOnce, useIsMounted, useMount, useMountOnce, useObservable, useObservableReducer, useObserve, useObserveEffect, usePauseProvider, useSelector, useUnmount, useUnmountOnce, useWhen, useWhenReady };

package/react.d.ts

@@ -1,6 +1,6 @@
-import * as react from 'react';
-import { ReactNode, ReactElement, FC, LegacyRef, DependencyList, ReducerWithoutAction, ReducerStateWithoutAction, DispatchWithoutAction, Reducer, ReducerState, Dispatch, ReducerAction, ComponentClass } from 'react';
-import { ObservableParam, Observable, ObservableBoolean, Selector, RecursiveValueOrFunction, ObserveOptions, ObserveEvent, ObserveEventCallback } from '@legendapp/state';
+import * as React from 'react';
+import { ReactNode, ReactElement, FC, NamedExoticComponent, LegacyRef, DependencyList, ReducerWithoutAction, ReducerStateWithoutAction, DispatchWithoutAction, Reducer, ReducerState, Dispatch, ReducerAction, ComponentClass } from 'react';
+import { ObservableParam, Observable, ObservableBoolean, Selector, GetOptions, RecursiveValueOrFunction, ObserveOptions, ObserveEvent, ObserveEventCallback } from '@legendapp/state';
 
 declare function Computed({ children }: {
     children: ObservableParam | (() => ReactNode);
@@ -22,11 +22,14 @@ declare function For<T, TProps>({ each, optimized: isOptimized, item, itemProps,
 declare function usePauseProvider(): {
     PauseProvider: ({ children }: {
         children: ReactNode;
-    }) => react.FunctionComponentElement<react.ProviderProps<ObservableBoolean>>;
+    }) => React.FunctionComponentElement<React.ProviderProps<ObservableBoolean>>;
     isPaused$: ObservableBoolean;
 };
 
-declare const Memo: react.MemoExoticComponent<typeof Computed>;
+declare const Memo: NamedExoticComponent<{
+    children: any;
+    scoped?: boolean;
+}>;
 
 interface IReactive {
 }
@@ -43,7 +46,9 @@ interface PropsIfReady<T> {
 interface PropsBase<T> {
     else?: ReactNode | (() => ReactNode);
     $value?: Observable<T>;
-    wrap?: FC;
+    wrap?: FC<{
+        children: ReactNode;
+    }>;
     children: ReactNode | ((value?: T) => ReactNode);
 }
 type Props<T> = PropsBase<T> & (PropsIf<T> | PropsIfReady<T>);
@@ -54,11 +59,11 @@ declare function Switch<T extends object>({ value, children, }: {
     children: Partial<Record<keyof T | 'null' | 'undefined' | 'default', () => ReactNode>>;
 }): ReactElement | null;
 declare function Switch<T extends string | number | symbol>({ value, children, }: {
-    value?: Selector<T>;
+    value?: Selector<T | undefined | null>;
     children: Partial<Record<T | 'null' | 'undefined' | 'default', () => ReactNode>>;
 }): ReactElement | null;
 declare function Switch<T extends boolean>({ value, children, }: {
-    value?: Selector<T>;
+    value?: Selector<T | undefined | null>;
     children: Partial<Record<'false' | 'true' | 'null' | 'undefined' | 'default', () => ReactNode>>;
 }): ReactElement | null;
 declare function Switch<T>({ value, children, }: {
@@ -71,20 +76,20 @@ type ShapeWithNew$<T> = Partial<Omit<T, 'children'>> & {
 } & {
     children?: Selector<ReactNode>;
 };
-interface BindKey<P> {
-    handler?: keyof P;
-    getValue?: (e: any) => any;
+interface BindKey<P, K extends keyof P = keyof P> {
+    handler?: K;
+    getValue?: P[K] extends infer T ? T extends (...args: any) => any ? (params: Parameters<T>[0]) => any : (e: any) => any : (e: any) => any;
     defaultValue?: any;
     selector?: (propsOut: Record<string, any>, p: Observable<any>) => any;
 }
-type BindKeys<P = any> = Record<keyof P, BindKey<P>>;
+type BindKeys<P = any, K extends keyof P = keyof P> = Partial<Record<K, BindKey<P>>>;
 type FCReactiveObject<T> = {
     [K in keyof T]: FC<ShapeWithNew$<T[K]>>;
 };
 type FCReactive<P, P2> = P & FC<ShapeWithNew$<P2> & {
     ref?: LegacyRef<P> | undefined;
 }>;
-interface UseSelectorOptions {
+interface UseSelectorOptions extends GetOptions {
     suspense?: boolean;
     skipCheck?: boolean;
 }
@@ -99,13 +104,26 @@ type ObjectShapeWith$<T> = {
     [K in keyof T]: T[K] extends FC<infer P> ? FC<ShapeWith$<P>> : T[K];
 };
 type ExtractFCPropsType<T> = T extends FC<infer P> ? P : never;
+type ReactifyProps<T, K extends keyof T> = Omit<T, K> & {
+    [P in K]: Selector<T[P]>;
+};
 declare const hasSymbol: false | ((key: string) => symbol);
 declare function observer<P extends FC<any>>(component: P): P;
-declare function reactive<T extends FC<any>>(component: T, bindKeys?: BindKeys<ExtractFCPropsType<T>>): T | FC<ShapeWith$<ExtractFCPropsType<T>>>;
-declare function reactive<T extends FC<any>, T2 extends keyof ExtractFCPropsType<T>>(component: T, bindKeys?: BindKeys<ExtractFCPropsType<T>>): T | FC<ShapeWithPick$<ExtractFCPropsType<T>, T2>>;
-declare function reactiveObserver<T extends FC<any>>(component: T, bindKeys?: BindKeys<ExtractFCPropsType<T>>): T | FC<ShapeWith$<ExtractFCPropsType<T>>>;
-declare function reactiveObserver<T extends FC<any>, T2 extends keyof ExtractFCPropsType<T>>(component: T, bindKeys?: BindKeys<ExtractFCPropsType<T>>): T | FC<ShapeWithPick$<ExtractFCPropsType<T>, T2>>;
-declare function reactiveComponents<P extends Record<string, FC>>(components: P): ObjectShapeWith$<P>;
+declare function reactive<T extends object>(component: React.ComponentClass<T>, keys: undefined | null, bindKeys?: BindKeys<T>): React.FC<ShapeWith$<T>>;
+declare function reactive<T extends object>(component: React.FC<T>, keys: undefined | null, bindKeys?: BindKeys<T>): React.FC<ShapeWith$<T>>;
+declare function reactive<T extends object>(component: React.ForwardRefExoticComponent<T>, keys: undefined | null, bindKeys?: BindKeys<T>): React.ForwardRefExoticComponent<ShapeWith$<T>>;
+declare function reactive<T extends object, K extends keyof T>(component: React.FC<T>, keys: K[] | (keyof T)[], bindKeys?: BindKeys<T, K>): React.FC<ReactifyProps<T, K>>;
+declare function reactive<T extends object, K extends keyof T>(component: React.ForwardRefExoticComponent<T>, keys: K[] | (keyof T)[], bindKeys?: BindKeys<T, K>): React.ForwardRefExoticComponent<ReactifyProps<T, K>>;
+declare function reactive<T extends object>(component: React.ComponentClass<T>): React.ComponentClass<ShapeWith$<T>>;
+declare function reactive<T extends object>(component: React.FC<T>): React.FC<ShapeWith$<T>>;
+declare function reactive<T extends object>(component: React.ForwardRefExoticComponent<T>): React.ForwardRefExoticComponent<ShapeWith$<T>>;
+declare function reactiveObserver<T extends object>(component: React.FC<T>, keys: undefined | null, bindKeys?: BindKeys<T>): React.FC<ShapeWith$<T>>;
+declare function reactiveObserver<T extends object>(component: React.ForwardRefExoticComponent<T>, keys: undefined | null, bindKeys?: BindKeys<T>): React.ForwardRefExoticComponent<ShapeWith$<T>>;
+declare function reactiveObserver<T extends object, K extends keyof T>(component: React.FC<T>, keys: K[] | (keyof T)[], bindKeys?: BindKeys<T, K>): React.FC<ReactifyProps<T, K>>;
+declare function reactiveObserver<T extends object, K extends keyof T>(component: React.ForwardRefExoticComponent<T>, keys: K[] | (keyof T)[], bindKeys?: BindKeys<T, K>): React.ForwardRefExoticComponent<ReactifyProps<T, K>>;
+declare function reactiveObserver<T extends object>(component: React.FC<T>): React.FC<ShapeWith$<T>>;
+declare function reactiveObserver<T extends object>(component: React.ForwardRefExoticComponent<T>): React.ForwardRefExoticComponent<ShapeWith$<T>>;
+declare function reactiveComponents<P extends Record<string, any>>(components: P): ObjectShapeWith$<P>;
 
 declare function useComputed<T>(get: () => T | Promise<T>): Observable<T>;
 declare function useComputed<T>(get: () => T | Promise<T>, deps: any[]): Observable<T>;
@@ -151,12 +169,14 @@ declare function useSelector<T>(selector: Selector<T>, options?: UseSelectorOpti
 declare function useUnmount(fn: () => void): void;
 declare const useUnmountOnce: typeof useUnmount;
 
-declare function useWhen<T>(predicate: Selector<T>, effect: (value: T) => any | (() => any)): Promise<any>;
-declare function useWhenReady<T>(predicate: Selector<T>, effect: (value: T) => any | (() => any)): Promise<any>;
+declare function useWhen<T>(predicate: Selector<T>): Promise<T>;
+declare function useWhen<T, T2>(predicate: Selector<T>, effect: (value: T) => T2): Promise<T2>;
+declare function useWhenReady<T>(predicate: Selector<T>): Promise<T>;
+declare function useWhenReady<T, T2>(predicate: Selector<T>, effect: (value: T) => T2 | (() => T2)): Promise<T2>;
 
 declare function configureReactive({ components, binders, }: {
     components?: Record<string, FC | ComponentClass<any>>;
     binders?: Record<string, BindKeys>;
 }): void;
 
-export { type BindKey, type BindKeys, Computed, type ExtractFCPropsType, type FCReactive, type FCReactiveObject, For, type IReactive, Memo, type ObjectShapeWith$, Reactive, type ShapeWith$, type ShapeWithNew$, type ShapeWithPick$, Show, Switch, type UseObserveOptions, type UseSelectorOptions, configureReactive, hasSymbol, observer, reactive, reactiveComponents, reactiveObserver, useComputed, useEffectOnce, useIsMounted, useMount, useMountOnce, useObservable, useObservableReducer, useObserve, useObserveEffect, usePauseProvider, useSelector, useUnmount, useUnmountOnce, useWhen, useWhenReady };
+export { type BindKey, type BindKeys, Computed, type ExtractFCPropsType, type FCReactive, type FCReactiveObject, For, type IReactive, Memo, type ObjectShapeWith$, type ReactifyProps, Reactive, type ShapeWith$, type ShapeWithNew$, type ShapeWithPick$, Show, Switch, type UseObserveOptions, type UseSelectorOptions, configureReactive, hasSymbol, observer, reactive, reactiveComponents, reactiveObserver, useSelector as use$, useComputed, useEffectOnce, useIsMounted, useMount, useMountOnce, useObservable, useObservableReducer, useObserve, useObserveEffect, usePauseProvider, useSelector, useUnmount, useUnmountOnce, useWhen, useWhenReady };

package/react.js

@@ -45,6 +45,7 @@ function createSelectorFunctions(options, isPaused$) {
     } = state.trackSelector(
       _selector,
       _update,
+      options,
       void 0,
       void 0,
       /*createResubscribe*/
@@ -100,12 +101,24 @@ function createSelectorFunctions(options, isPaused$) {
     }
   };
 }
+function doSuspense(selector) {
+  const vProm = state.when(selector);
+  if (React__default.default.use) {
+    React__default.default.use(vProm);
+  } else {
+    throw vProm;
+  }
+}
 function useSelector(selector, options) {
   var _a;
+  let value;
   if (reactGlobals.inObserver && state.isObservable(selector) && !(options == null ? void 0 : options.suspense)) {
-    return state.computeSelector(selector);
+    value = state.computeSelector(selector, options);
+    if ((options == null ? void 0 : options.suspense) && value === void 0) {
+      doSuspense(selector);
+    }
+    return value;
   }
-  let value;
   try {
     const isPaused$ = React.useContext(getPauseContext());
     const selectorFn = React.useMemo(() => createSelectorFunctions(options, isPaused$), []);
@@ -120,16 +133,8 @@ function useSelector(selector, options) {
     }
     throw err;
   }
-  if (options == null ? void 0 : options.suspense) {
-    const isProm = state.isPromise(value);
-    if (state.isPromise(value) || !value && state.isObservable(selector)) {
-      const vProm = isProm ? value : state.when(selector);
-      if (React__default.default.use) {
-        React__default.default.use(vProm);
-      } else {
-        throw vProm;
-      }
-    }
+  if ((options == null ? void 0 : options.suspense) && value === void 0) {
+    doSuspense(selector);
   }
   return value;
 }
@@ -140,7 +145,7 @@ function Computed({ children }) {
 }
 var hasSymbol = typeof Symbol === "function" && Symbol.for;
 var didWarnProps = false;
-function createReactiveComponent(component, observe3, reactive2, bindKeys) {
+function createReactiveComponent(component, observe3, reactive2, keysReactive, bindKeys) {
   const ReactForwardRefSymbol = hasSymbol ? Symbol.for("react.forward_ref") : (
     // eslint-disable-next-line react/display-name, @typescript-eslint/no-unused-vars
     typeof React.forwardRef === "function" && React.forwardRef((props) => null)["$$typeof"]
@@ -165,6 +170,7 @@ function createReactiveComponent(component, observe3, reactive2, bindKeys) {
       throw new Error(`[legend-state] \`render\` property of ForwardRef was not a function`);
     }
   }
+  const keysReactiveSet = keysReactive ? new Set(keysReactive) : void 0;
   const proxyHandler = {
     apply(target, thisArg, argArray) {
       if (reactive2) {
@@ -174,9 +180,10 @@ function createReactiveComponent(component, observe3, reactive2, bindKeys) {
         for (let i = 0; i < keys.length; i++) {
           const key = keys[i];
           const p = props[key];
+          const isReactiveKey = keysReactiveSet && keysReactiveSet.has(key);
           if (key === "children" && (state.isFunction(p) || state.isObservable(p))) {
             props[key] = useSelector(p, { skipCheck: true });
-          } else if (key.startsWith("$") || key.endsWith("$")) {
+          } else if (isReactiveKey || key.startsWith("$") || key.endsWith("$")) {
             if (process.env.NODE_ENV === "development" && !didWarnProps && key.endsWith("$")) {
               didWarnProps = true;
               console.warn(
@@ -186,7 +193,7 @@ function createReactiveComponent(component, observe3, reactive2, bindKeys) {
                 )}. See https://legendapp.com/open-source/state/migrating for more details.`
               );
             }
-            const k = key.endsWith("$") ? key.slice(0, -1) : key.slice(1);
+            const k = isReactiveKey ? key : key.endsWith("$") ? key.slice(0, -1) : key.slice(1);
             const bind = bindKeys == null ? void 0 : bindKeys[k];
             const shouldBind = bind && state.isObservable(p);
             propsOut[k] = shouldBind && (bind == null ? void 0 : bind.selector) ? bind.selector(propsOut, p) : useSelector(p);
@@ -204,7 +211,9 @@ function createReactiveComponent(component, observe3, reactive2, bindKeys) {
                 process.env.NODE_ENV === "development" ? handlerFn : React.useCallback(handlerFn, [props[bind.handler], bindKeys]);
               }
             }
-            delete propsOut[key];
+            if (!isReactiveKey) {
+              delete propsOut[key];
+            }
           } else if (propsOut[key] === void 0) {
             propsOut[key] = p;
           }
@@ -241,11 +250,11 @@ function createReactiveComponent(component, observe3, reactive2, bindKeys) {
 function observer(component) {
   return createReactiveComponent(component, true);
 }
-function reactive(component, bindKeys) {
-  return createReactiveComponent(component, false, true, bindKeys);
+function reactive(component, keys, bindKeys) {
+  return createReactiveComponent(component, false, true, keys, bindKeys);
 }
-function reactiveObserver(component, bindKeys) {
-  return createReactiveComponent(component, true, true, bindKeys);
+function reactiveObserver(component, keys, bindKeys) {
+  return createReactiveComponent(component, true, true, keys, bindKeys);
 }
 function reactiveComponents(components) {
   return new Proxy(
@@ -336,7 +345,10 @@ function For({
   }
   return out;
 }
-var Memo = React.memo(Computed, () => true);
+var Memo = React.memo(
+  Computed,
+  (prev, next) => next.scoped ? prev.children === next.children : true
+);
 
 // src/react/configureReactive.ts
 var ReactiveFns = /* @__PURE__ */ new Map();
@@ -371,7 +383,7 @@ var Reactive = new Proxy(
           }
           return React.createElement(Component, propsOut);
         });
-        target[p] = reactive(render, ReactiveFnBinders.get(p));
+        target[p] = reactive(render, [], ReactiveFnBinders.get(p));
       }
       return target[p];
     }
@@ -516,7 +528,7 @@ function useObserve(selector, reactionOrOptions, options) {
   ref.current.reaction = reaction;
   if (!ref.current.dispose) {
     ref.current.dispose = state.observe(
-      (e) => state.computeSelector(ref.current.selector, e),
+      (e) => state.computeSelector(ref.current.selector, void 0, e),
       (e) => {
         var _a, _b;
         return (_b = (_a = ref.current).reaction) == null ? void 0 : _b.call(_a, e);
@@ -578,6 +590,7 @@ exports.observer = observer;
 exports.reactive = reactive;
 exports.reactiveComponents = reactiveComponents;
 exports.reactiveObserver = reactiveObserver;
+exports.use$ = useSelector;
 exports.useComputed = useComputed;
 exports.useEffectOnce = useEffectOnce;
 exports.useIsMounted = useIsMounted;