@nbottarini/react-observable 0.3.0 → 0.6.0

package/dist/cjs/index.js

@@ -1,2 +1,2 @@
-"use strict";var react=require("react");function useObservable(observable,initialValue){const[value,setValue]=react.useState(initialValue),forceUpdate=react.useReducer((()=>({})),{})[1];return react.useEffect((()=>{const observer={handler:newValue=>{value===newValue?forceUpdate():setValue(newValue)}};return observable.subscribe(observer,observer.handler),()=>{observable.unsubscribe(observer)}}),[observable]),value}exports.useObservable=useObservable,exports.useObservableProperty=function(property){return useObservable(property.changed,property.value)};
+"use strict";var react=require("react");function useObserve(observable,filterEvents){const forceUpdate=react.useReducer((()=>({})),{})[1],lastValue=react.useRef();return react.useEffect((()=>{const observer={handler:newValue=>{filterEvents&&!filterEvents(newValue)||(lastValue.current=newValue,forceUpdate())}};return observable.subscribe(observer,observer.handler),()=>{observable.unsubscribe(observer)}}),[observable]),lastValue.current}exports.useObservableValue=function(observableValue){return useObserve(observableValue.changed),observableValue.value},exports.useObserve=useObserve;
 //# sourceMappingURL=index.js.map

package/dist/cjs/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":["../../src/useObservable.tsx","../../src/useObservableProperty.tsx"],"sourcesContent":["import { useEffect, useReducer, useState } from 'react'\nimport { Observable } from '@nbottarini/observable'\n\nexport function useObservable<T>(observable: Observable<T>, initialValue: T): T {\n    const [value, setValue] = useState(initialValue)\n    const forceUpdate = useReducer(() => ({}), {})[1] as () => void\n\n    useEffect(() => {\n        const observer = {\n            handler: (newValue: T) => {\n                if (value === newValue) {\n                    forceUpdate()\n                } else { // If setValue is applied before forceUpdate strange things happens with hooks\n                    setValue(newValue)\n                }\n            }\n        }\n        observable.subscribe(observer, observer.handler)\n        return () => {\n            observable.unsubscribe(observer)\n        }\n    }, [observable])\n    return value\n}\n","import { useObservable } from './useObservable'\nimport { ObservableProperty } from '@nbottarini/observable'\n\nexport function useObservableProperty<T>(property: ObservableProperty<T>): T {\n    return useObservable(property.changed, property.value)\n}\n"],"names":["useObservable","observable","initialValue","value","setValue","useState","forceUpdate","useReducer","useEffect","observer","handler","newValue","subscribe","unsubscribe","property","changed"],"mappings":"wCAGgB,SAAAA,cAAiBC,WAA2BC,cACxD,MAAOC,MAAOC,UAAYC,MAAQA,SAACH,cAC7BI,YAAcC,MAAAA,YAAW,KAAO,CAAE,IAAG,CAAE,GAAE,GAiB/C,OAfAC,MAAAA,WAAU,KACN,MAAMC,SAAW,CACbC,QAAUC,WACFR,QAAUQ,SACVL,cAEAF,SAASO,SACZ,GAIT,OADAV,WAAWW,UAAUH,SAAUA,SAASC,SACjC,KACHT,WAAWY,YAAYJ,SAAS,CACnC,GACF,CAACR,aACGE,KACX,mECpBM,SAAmCW,UACrC,OAAOd,cAAcc,SAASC,QAASD,SAASX,MACpD"}
+{"version":3,"file":"index.js","sources":["../../src/useObserve.tsx","../../src/useObservableValue.tsx"],"sourcesContent":["import { useEffect, useReducer, useRef } from 'react'\nimport { Observable } from '@nbottarini/observable'\n\nexport function useObserve<T>(\n    observable: Observable<T>,\n    filterEvents?: (event: T) => boolean,\n): T {\n    const forceUpdate = useReducer(() => ({}), {})[1] as () => void\n    const lastValue = useRef<T>()\n\n    useEffect(() => {\n        const observer = {\n            handler: (newValue: T) => {\n                if (!filterEvents || filterEvents(newValue)) {\n                    lastValue.current = newValue\n                    forceUpdate()\n                }\n            }\n        }\n        observable.subscribe(observer, observer.handler)\n        return () => {\n            observable.unsubscribe(observer)\n        }\n    }, [observable])\n    return lastValue.current\n}\n","import { useObserve } from './useObserve'\nimport { ObservableValue } from '@nbottarini/observable'\n\nexport function useObservableValue<T>(observableValue: ObservableValue<T>): T {\n    useObserve(observableValue.changed)\n    return observableValue.value\n}\n"],"names":["useObserve","observable","filterEvents","forceUpdate","useReducer","lastValue","useRef","useEffect","observer","handler","newValue","current","subscribe","unsubscribe","observableValue","changed","value"],"mappings":"wCAGgB,SAAAA,WACZC,WACAC,cAEA,MAAMC,YAAcC,MAAAA,YAAW,KAAO,CAAE,IAAG,CAAE,GAAE,GACzCC,UAAYC,MAAAA,SAgBlB,OAdAC,MAAAA,WAAU,KACN,MAAMC,SAAW,CACbC,QAAUC,WACDR,eAAgBA,aAAaQ,YAC9BL,UAAUM,QAAUD,SACpBP,cACH,GAIT,OADAF,WAAWW,UAAUJ,SAAUA,SAASC,SACjC,KACHR,WAAWY,YAAYL,SAAS,CACnC,GACF,CAACP,aACGI,UAAUM,OACrB,4BCtBM,SAAgCG,iBAElC,OADAd,WAAWc,gBAAgBC,SACpBD,gBAAgBE,KAC3B"}

package/dist/esm/index.js

@@ -1,2 +1,2 @@
-import{useState,useReducer,useEffect}from"react";function useObservable(observable,initialValue){const[value,setValue]=useState(initialValue),forceUpdate=useReducer((()=>({})),{})[1];return useEffect((()=>{const observer={handler:newValue=>{value===newValue?forceUpdate():setValue(newValue)}};return observable.subscribe(observer,observer.handler),()=>{observable.unsubscribe(observer)}}),[observable]),value}function useObservableProperty(property){return useObservable(property.changed,property.value)}export{useObservable,useObservableProperty};
+import{useReducer,useRef,useEffect}from"react";function useObserve(observable,filterEvents){const forceUpdate=useReducer((()=>({})),{})[1],lastValue=useRef();return useEffect((()=>{const observer={handler:newValue=>{filterEvents&&!filterEvents(newValue)||(lastValue.current=newValue,forceUpdate())}};return observable.subscribe(observer,observer.handler),()=>{observable.unsubscribe(observer)}}),[observable]),lastValue.current}function useObservableValue(observableValue){return useObserve(observableValue.changed),observableValue.value}export{useObservableValue,useObserve};
 //# sourceMappingURL=index.js.map

package/dist/esm/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":["../../src/useObservable.tsx","../../src/useObservableProperty.tsx"],"sourcesContent":["import { useEffect, useReducer, useState } from 'react'\nimport { Observable } from '@nbottarini/observable'\n\nexport function useObservable<T>(observable: Observable<T>, initialValue: T): T {\n    const [value, setValue] = useState(initialValue)\n    const forceUpdate = useReducer(() => ({}), {})[1] as () => void\n\n    useEffect(() => {\n        const observer = {\n            handler: (newValue: T) => {\n                if (value === newValue) {\n                    forceUpdate()\n                } else { // If setValue is applied before forceUpdate strange things happens with hooks\n                    setValue(newValue)\n                }\n            }\n        }\n        observable.subscribe(observer, observer.handler)\n        return () => {\n            observable.unsubscribe(observer)\n        }\n    }, [observable])\n    return value\n}\n","import { useObservable } from './useObservable'\nimport { ObservableProperty } from '@nbottarini/observable'\n\nexport function useObservableProperty<T>(property: ObservableProperty<T>): T {\n    return useObservable(property.changed, property.value)\n}\n"],"names":["useObservable","observable","initialValue","value","setValue","useState","forceUpdate","useReducer","useEffect","observer","handler","newValue","subscribe","unsubscribe","useObservableProperty","property","changed"],"mappings":"iDAGgB,SAAAA,cAAiBC,WAA2BC,cACxD,MAAOC,MAAOC,UAAYC,SAASH,cAC7BI,YAAcC,YAAW,KAAO,CAAE,IAAG,CAAE,GAAE,GAiB/C,OAfAC,WAAU,KACN,MAAMC,SAAW,CACbC,QAAUC,WACFR,QAAUQ,SACVL,cAEAF,SAASO,SACZ,GAIT,OADAV,WAAWW,UAAUH,SAAUA,SAASC,SACjC,KACHT,WAAWY,YAAYJ,SAAS,CACnC,GACF,CAACR,aACGE,KACX,CCpBM,SAAUW,sBAAyBC,UACrC,OAAOf,cAAce,SAASC,QAASD,SAASZ,MACpD"}
+{"version":3,"file":"index.js","sources":["../../src/useObserve.tsx","../../src/useObservableValue.tsx"],"sourcesContent":["import { useEffect, useReducer, useRef } from 'react'\nimport { Observable } from '@nbottarini/observable'\n\nexport function useObserve<T>(\n    observable: Observable<T>,\n    filterEvents?: (event: T) => boolean,\n): T {\n    const forceUpdate = useReducer(() => ({}), {})[1] as () => void\n    const lastValue = useRef<T>()\n\n    useEffect(() => {\n        const observer = {\n            handler: (newValue: T) => {\n                if (!filterEvents || filterEvents(newValue)) {\n                    lastValue.current = newValue\n                    forceUpdate()\n                }\n            }\n        }\n        observable.subscribe(observer, observer.handler)\n        return () => {\n            observable.unsubscribe(observer)\n        }\n    }, [observable])\n    return lastValue.current\n}\n","import { useObserve } from './useObserve'\nimport { ObservableValue } from '@nbottarini/observable'\n\nexport function useObservableValue<T>(observableValue: ObservableValue<T>): T {\n    useObserve(observableValue.changed)\n    return observableValue.value\n}\n"],"names":["useObserve","observable","filterEvents","forceUpdate","useReducer","lastValue","useRef","useEffect","observer","handler","newValue","current","subscribe","unsubscribe","useObservableValue","observableValue","changed","value"],"mappings":"+CAGgB,SAAAA,WACZC,WACAC,cAEA,MAAMC,YAAcC,YAAW,KAAO,CAAE,IAAG,CAAE,GAAE,GACzCC,UAAYC,SAgBlB,OAdAC,WAAU,KACN,MAAMC,SAAW,CACbC,QAAUC,WACDR,eAAgBA,aAAaQ,YAC9BL,UAAUM,QAAUD,SACpBP,cACH,GAIT,OADAF,WAAWW,UAAUJ,SAAUA,SAASC,SACjC,KACHR,WAAWY,YAAYL,SAAS,CACnC,GACF,CAACP,aACGI,UAAUM,OACrB,CCtBM,SAAUG,mBAAsBC,iBAElC,OADAf,WAAWe,gBAAgBC,SACpBD,gBAAgBE,KAC3B"}

package/dist/types/index.d.ts

@@ -1,7 +1,7 @@
-import { Observable, ObservableProperty } from '@nbottarini/observable';
+import { Observable, ObservableValue } from '@nbottarini/observable';
 
-declare function useObservable<T>(observable: Observable<T>, initialValue: T): T;
+declare function useObserve<T>(observable: Observable<T>, filterEvents?: (event: T) => boolean): T;
 
-declare function useObservableProperty<T>(property: ObservableProperty<T>): T;
+declare function useObservableValue<T>(observableValue: ObservableValue<T>): T;
 
-export { useObservable, useObservableProperty };
+export { useObservableValue, useObserve };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nbottarini/react-observable",
-  "version": "0.3.0",
+  "version": "0.6.0",
   "description": "React hook for reacting to changes in @nbottarini/observable properties",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
@@ -28,7 +28,7 @@
     "test": "jest"
   },
   "dependencies": {
-    "@nbottarini/observable": "^0.5.0"
+    "@nbottarini/observable": "^0.8.0"
   },
   "peerDependencies": {
     "react": "*"