react-rx 1.0.0-beta.6 → 1.0.0

package/.idea/workspace.xml

@@ -8,8 +8,6 @@
       <change beforePath="$PROJECT_DIR$/../react-rx.dev/package-lock.json" beforeDir="false" afterPath="$PROJECT_DIR$/../react-rx.dev/package-lock.json" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/../react-rx.dev/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/../react-rx.dev/package.json" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/../react-rx.dev/src/pages/Index/ReactRxReadme.md" beforeDir="false" afterPath="$PROJECT_DIR$/../react-rx.dev/src/pages/Index/ReactRxReadme.md" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/index.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/index.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/useObservable.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/useObservable.ts" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -85,7 +83,7 @@
       <recent name="$PROJECT_DIR$/../react-rx.dev/webpack-configs" />
     </key>
   </component>
-  <component name="RunManager" selected="Jest.useObservable.test.tsx">
+  <component name="RunManager" selected="Jest.it calls the setup function once, at mount">
     <configuration name="All Tests" type="JavaScriptTestRunnerJest" nameIsGenerated="true">
       <node-interpreter value="project" />
       <node-options value="" />
@@ -105,20 +103,20 @@
       <test-file value="$PROJECT_DIR$/src/__tests__/asObservable.test.tsx" />
       <method v="2" />
     </configuration>
-    <configuration name="the returned observable should *not* receive a new value when component is rendered with an unchanged value" type="JavaScriptTestRunnerJest" temporary="true" nameIsGenerated="true">
+    <configuration name="it calls the setup function once, at mount" type="JavaScriptTestRunnerJest" temporary="true" nameIsGenerated="true">
       <node-interpreter value="project" />
       <node-options value="" />
       <jest-package value="$PROJECT_DIR$/node_modules/jest" />
       <working-dir value="$PROJECT_DIR$" />
       <envs />
       <scope-kind value="TEST" />
-      <test-file value="$PROJECT_DIR$/src/__tests__/asObservable.test.tsx" />
+      <test-file value="$PROJECT_DIR$/src/__tests__/reactiveComponent.test.tsx" />
       <test-names>
-        <test-name value="the returned observable should *not* receive a new value when component is rendered with an unchanged value" />
+        <test-name value="it calls the setup function once, at mount" />
       </test-names>
       <method v="2" />
     </configuration>
-    <configuration name="the returned observable should receive a new value when component is rendered with a new value" type="JavaScriptTestRunnerJest" temporary="true" nameIsGenerated="true">
+    <configuration name="the returned observable should *not* receive a new value when component is rendered with an unchanged value" type="JavaScriptTestRunnerJest" temporary="true" nameIsGenerated="true">
       <node-interpreter value="project" />
       <node-options value="" />
       <jest-package value="$PROJECT_DIR$/node_modules/jest" />
@@ -127,11 +125,11 @@
       <scope-kind value="TEST" />
       <test-file value="$PROJECT_DIR$/src/__tests__/asObservable.test.tsx" />
       <test-names>
-        <test-name value="the returned observable should receive a new value when component is rendered with a new value" />
+        <test-name value="the returned observable should *not* receive a new value when component is rendered with an unchanged value" />
       </test-names>
       <method v="2" />
     </configuration>
-    <configuration name="the returned observable should receive a new value when component is rendered with an unchanged value" type="JavaScriptTestRunnerJest" temporary="true" nameIsGenerated="true">
+    <configuration name="the returned observable should receive a new value when component is rendered with a new value" type="JavaScriptTestRunnerJest" temporary="true" nameIsGenerated="true">
       <node-interpreter value="project" />
       <node-options value="" />
       <jest-package value="$PROJECT_DIR$/node_modules/jest" />
@@ -140,7 +138,7 @@
       <scope-kind value="TEST" />
       <test-file value="$PROJECT_DIR$/src/__tests__/asObservable.test.tsx" />
       <test-names>
-        <test-name value="the returned observable should receive a new value when component is rendered with an unchanged value" />
+        <test-name value="the returned observable should receive a new value when component is rendered with a new value" />
       </test-names>
       <method v="2" />
     </configuration>
@@ -166,20 +164,20 @@
     </configuration>
     <list>
       <item itemvalue="Jest.All Tests" />
+      <item itemvalue="Jest.useObservable.test.tsx" />
       <item itemvalue="Jest.asObservable.test.tsx" />
+      <item itemvalue="Jest.it calls the setup function once, at mount" />
       <item itemvalue="Jest.the returned observable should *not* receive a new value when component is rendered with an unchanged value" />
       <item itemvalue="Jest.the returned observable should receive a new value when component is rendered with a new value" />
-      <item itemvalue="Jest.the returned observable should receive a new value when component is rendered with an unchanged value" />
       <item itemvalue="Jest.useAsObservable.test.tsx" />
-      <item itemvalue="Jest.useObservable.test.tsx" />
     </list>
     <recent_temporary>
       <list>
+        <item itemvalue="Jest.it calls the setup function once, at mount" />
         <item itemvalue="Jest.useAsObservable.test.tsx" />
         <item itemvalue="Jest.asObservable.test.tsx" />
         <item itemvalue="Jest.the returned observable should receive a new value when component is rendered with a new value" />
         <item itemvalue="Jest.the returned observable should *not* receive a new value when component is rendered with an unchanged value" />
-        <item itemvalue="Jest.the returned observable should receive a new value when component is rendered with an unchanged value" />
       </list>
     </recent_temporary>
   </component>
@@ -222,7 +220,7 @@
     </ignored-roots>
   </component>
   <component name="com.intellij.coverage.CoverageDataManagerImpl">
-    <SUITE FILE_PATH="coverage/react_rx$All_Tests.info" NAME="All Tests Coverage Results" MODIFIED="1585859619310" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="JestJavaScriptTestRunnerCoverage" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" />
     <SUITE FILE_PATH="coverage/react_rx$toObservable_test_tsx.info" NAME="toObservable.test.tsx Coverage Results" MODIFIED="1585859575939" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="JestJavaScriptTestRunnerCoverage" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" />
+    <SUITE FILE_PATH="coverage/react_rx$All_Tests.info" NAME="All Tests Coverage Results" MODIFIED="1585859619310" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="JestJavaScriptTestRunnerCoverage" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" />
   </component>
 </project>

package/dist/cjs/WithObservable.js

@@ -4,9 +4,9 @@ exports.WithObservable = void 0;
 var operators_1 = require("rxjs/operators");
 var reactiveComponent_1 = require("./reactiveComponent");
 function createWithObservable() {
-    return reactiveComponent_1.reactiveComponent(function (props$) {
-        return props$.pipe(operators_1.distinctUntilChanged(function (props, prevProps) { return props.observable === prevProps.observable; }), operators_1.switchMap(function (props) {
-            return props.observable.pipe(operators_1.map(function (observableValue) { return props.children(observableValue); }));
+    return (0, reactiveComponent_1.reactiveComponent)(function (props$) {
+        return props$.pipe((0, operators_1.distinctUntilChanged)(function (props, prevProps) { return props.observable === prevProps.observable; }), (0, operators_1.switchMap)(function (props) {
+            return props.observable.pipe((0, operators_1.map)(function (observableValue) { return props.children(observableValue); }));
         }));
     });
 }

package/dist/cjs/reactiveComponent.js

@@ -7,14 +7,14 @@ var useObservable_1 = require("./useObservable");
 var react_1 = require("react");
 function fromComponent(component) {
     var wrappedComponent = function (props) {
-        return react_1.createElement(react_1.Fragment, null, useObservable_1.useObservable(react_1.useRef(component(useAsObservable_1.useAsObservable(props))).current));
+        return (0, react_1.createElement)(react_1.Fragment, null, (0, useObservable_1.useObservable)((0, react_1.useRef)(component((0, useAsObservable_1.useAsObservable)(props))).current));
     };
-    wrappedComponent.displayName = displayName_1.wrapDisplayName(component, 'reactiveComponent');
+    wrappedComponent.displayName = (0, displayName_1.wrapDisplayName)(component, 'reactiveComponent');
     return wrappedComponent;
 }
 function fromObservable(input$) {
     return function ReactiveComponent() {
-        return react_1.createElement(react_1.Fragment, null, useObservable_1.useObservable(input$));
+        return (0, react_1.createElement)(react_1.Fragment, null, (0, useObservable_1.useObservable)(input$));
     };
 }
 function reactiveComponent(observableOrComponent) {
@@ -24,10 +24,10 @@ function reactiveComponent(observableOrComponent) {
 }
 exports.reactiveComponent = reactiveComponent;
 function forwardRef(component) {
-    var wrappedComponent = react_1.forwardRef(function (props, ref) {
-        return react_1.createElement(react_1.Fragment, null, useObservable_1.useObservable(react_1.useRef(component(useAsObservable_1.useAsObservable(props), ref)).current));
+    var wrappedComponent = (0, react_1.forwardRef)(function (props, ref) {
+        return (0, react_1.createElement)(react_1.Fragment, null, (0, useObservable_1.useObservable)((0, react_1.useRef)(component((0, useAsObservable_1.useAsObservable)(props), ref)).current));
     });
-    wrappedComponent.displayName = displayName_1.wrapDisplayName(component, 'reactiveComponent');
+    wrappedComponent.displayName = (0, displayName_1.wrapDisplayName)(component, 'reactiveComponent');
     return wrappedComponent;
 }
 exports.forwardRef = forwardRef;

package/dist/cjs/useAsObservable.js

@@ -5,14 +5,14 @@ var rxjs_1 = require("rxjs");
 var react_1 = require("react");
 var useIsomorphicEffect_1 = require("./useIsomorphicEffect");
 function useAsObservable(value, operator) {
-    var isInitial = react_1.useRef(true);
-    var subjectRef = react_1.useRef(new rxjs_1.BehaviorSubject(value));
-    var observableRef = react_1.useRef();
+    var isInitial = (0, react_1.useRef)(true);
+    var subjectRef = (0, react_1.useRef)(new rxjs_1.BehaviorSubject(value));
+    var observableRef = (0, react_1.useRef)();
     if (!observableRef.current) {
         var observable = subjectRef.current.asObservable();
         observableRef.current = operator ? observable.pipe(operator) : observable;
     }
-    useIsomorphicEffect_1.useIsomorphicEffect(function () {
+    (0, useIsomorphicEffect_1.useIsomorphicEffect)(function () {
         if (isInitial.current) {
             isInitial.current = false;
         }
@@ -21,7 +21,7 @@ function useAsObservable(value, operator) {
             subjectRef.current.next(value);
         }
     }, [value]);
-    useIsomorphicEffect_1.useIsomorphicEffect(function () {
+    (0, useIsomorphicEffect_1.useIsomorphicEffect)(function () {
         return function () {
             return subjectRef.current.complete();
         };

package/dist/cjs/useObservable.js

@@ -7,9 +7,9 @@ function getValue(value) {
     return typeof value === 'function' ? value() : value;
 }
 function useObservable(observable, initialValue) {
-    var subscription = react_1.useRef();
-    var isInitial = react_1.useRef(true);
-    var _a = react_1.useState(function () {
+    var subscription = (0, react_1.useRef)();
+    var isInitial = (0, react_1.useRef)(true);
+    var _a = (0, react_1.useState)(function () {
         var isSync = true;
         var syncVal = getValue(initialValue);
         subscription.current = observable.subscribe(function (nextVal) {
@@ -23,7 +23,7 @@ function useObservable(observable, initialValue) {
         isSync = false;
         return syncVal;
     }), value = _a[0], setState = _a[1];
-    useIsomorphicEffect_1.useIsomorphicEffect(function () {
+    (0, useIsomorphicEffect_1.useIsomorphicEffect)(function () {
         // when the observable changes after initial (possibly sync render)
         if (!isInitial.current) {
             subscription.current = observable.subscribe(function (nextVal) { return setState(nextVal); });
@@ -40,6 +40,6 @@ function useObservable(observable, initialValue) {
 }
 exports.useObservable = useObservable;
 function useMemoObservable(observableOrFactory, deps, initialValue) {
-    return useObservable(react_1.useMemo(function () { return getValue(observableOrFactory); }, deps), initialValue);
+    return useObservable((0, react_1.useMemo)(function () { return getValue(observableOrFactory); }, deps), initialValue);
 }
 exports.useMemoObservable = useMemoObservable;

package/dist/cjs/useObservableCallback.js

@@ -6,14 +6,14 @@ var observable_callback_1 = require("observable-callback");
 var EMPTY_DEPS = [];
 function useObservableCallback(fn, dependencies) {
     if (dependencies === void 0) { dependencies = EMPTY_DEPS; }
-    var callbackRef = react_1.useRef();
+    var callbackRef = (0, react_1.useRef)();
     if (!callbackRef.current) {
-        callbackRef.current = observable_callback_1.observableCallback();
+        callbackRef.current = (0, observable_callback_1.observableCallback)();
     }
     var _a = callbackRef.current, calls$ = _a[0], call = _a[1];
     // eslint-disable-next-line react-hooks/exhaustive-deps
-    var callback = react_1.useCallback(fn, dependencies);
-    react_1.useEffect(function () {
+    var callback = (0, react_1.useCallback)(fn, dependencies);
+    (0, react_1.useEffect)(function () {
         var subscription = calls$.pipe(callback).subscribe();
         return function () {
             subscription.unsubscribe();

package/dist/cjs/useWithObservable.js

@@ -5,7 +5,7 @@ var useObservable_1 = require("./useObservable");
 var useAsObservable_1 = require("./useAsObservable");
 function useWithObservable(value, operator) {
     return operator
-        ? useObservable_1.useObservable(useAsObservable_1.useAsObservable(value, operator))
-        : useObservable_1.useObservable(useAsObservable_1.useAsObservable(value));
+        ? (0, useObservable_1.useObservable)((0, useAsObservable_1.useAsObservable)(value, operator))
+        : (0, useObservable_1.useObservable)((0, useAsObservable_1.useAsObservable)(value));
 }
 exports.useWithObservable = useWithObservable;

package/dist/cjs/utils.js

@@ -5,26 +5,26 @@ var useAsObservable_1 = require("./useAsObservable");
 var observable_callback_1 = require("observable-callback");
 var operators_1 = require("rxjs/operators");
 var react_1 = require("react");
-var createState = function (initialState) { return observable_callback_1.observableCallback(operators_1.startWith(initialState)); };
+var createState = function (initialState) { return (0, observable_callback_1.observableCallback)((0, operators_1.startWith)(initialState)); };
 function observeState(initial) {
-    var _a = react_1.useState(initial), value = _a[0], update = _a[1];
-    return [useAsObservable_1.useAsObservable(value), update];
+    var _a = (0, react_1.useState)(initial), value = _a[0], update = _a[1];
+    return [(0, useAsObservable_1.useAsObservable)(value), update];
 }
 exports.observeState = observeState;
 function observeCallback(operator) {
-    var ref = react_1.useRef();
+    var ref = (0, react_1.useRef)();
     if (!ref.current) {
-        ref.current = operator ? observable_callback_1.observableCallback(operator) : observable_callback_1.observableCallback();
+        ref.current = operator ? (0, observable_callback_1.observableCallback)(operator) : (0, observable_callback_1.observableCallback)();
     }
     return ref.current;
 }
 exports.observeCallback = observeCallback;
 function observeContext(context) {
-    return useAsObservable_1.useAsObservable(react_1.useContext(context));
+    return (0, useAsObservable_1.useAsObservable)((0, react_1.useContext)(context));
 }
 exports.observeContext = observeContext;
 function observeElement() {
-    var ref = react_1.useRef();
+    var ref = (0, react_1.useRef)();
     if (!ref.current) {
         ref.current = createState(null);
     }

package/dist/cjs/withPropsStream.js

@@ -39,13 +39,13 @@ var reactiveComponent_1 = require("./reactiveComponent");
  * @deprecated Use reactiveComponent instead
  */
 function withPropsStream(observableOrFactory, TargetComponent) {
-    var ComposedComponent = reactiveComponent_1.reactiveComponent(function (sourceProps$) {
+    var ComposedComponent = (0, reactiveComponent_1.reactiveComponent)(function (sourceProps$) {
         var targetProps$ = typeof observableOrFactory === 'function'
             ? observableOrFactory(sourceProps$)
             : observableOrFactory;
-        return targetProps$.pipe(operators_1.map(function (props) { return React.createElement(TargetComponent, __assign({}, props)); }));
+        return targetProps$.pipe((0, operators_1.map)(function (props) { return React.createElement(TargetComponent, __assign({}, props)); }));
     });
-    ComposedComponent.displayName = displayName_1.wrapDisplayName(TargetComponent, 'withPropsStream');
+    ComposedComponent.displayName = (0, displayName_1.wrapDisplayName)(TargetComponent, 'withPropsStream');
     return ComposedComponent;
 }
 exports.withPropsStream = withPropsStream;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-rx",
-  "version": "1.0.0-beta.6",
+  "version": "1.0.0",
   "description": "React + RxJS = <3",
   "main": "dist/cjs/index.js",
   "types": "dist/cjs/index.d.ts",
@@ -25,8 +25,8 @@
     "observable-callback": "^1.0.1"
   },
   "peerDependencies": {
-    "react": ">=16.8",
-    "rxjs": "^6"
+    "react": ">=16.8 | >= 17",
+    "rxjs": "^6 | ^7"
   },
   "devDependencies": {
     "@testing-library/dom": "^7.29.6",