package-lock.json

 {
   "name": "i4-js-commons",
-  "version": "4.0.22",
+  "version": "4.0.23",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

 {
   "name": "i4-js-commons",
-  "version": "4.0.22",
+  "version": "4.0.23",
   "description": "Just a load of common stuff for i4 front-ends and some probably usable in back-end as well",
   "dependencies": {
     "@deepstream/client": "^5.0.6",

src/client/extended.js

@@ -312,8 +312,7 @@ export const fromChannels = async ({
       datasetMerge(counts),
       // R.tap(dss => console.log('before datasetMerge:', JSON.stringify(dss))),
     )(histories);
-    console.log('merged:', merged);
-    console.log('historyCb:', historyCb);
+    // console.log('merged:', merged);
     if (historyCb) historyCb(merged);
     else if (cb) merged.map(cb);
     if (noSub) return merged;

src/ui/Chart.js

@@ -180,7 +180,7 @@ export const Chart = ({
   // const chartId = useRef(generateString(8));
 
   useEffect(() => {
-    console.log('Chart init:', type, data, options, point, points, length, ttl);
+    // console.log('Chart init:', type, data, options, point, points, length, ttl);
     if (!chart.current) {
       /* eslint-disable no-param-reassign */
       if (!Array.isArray(data.datasets)) data.datasets = [];
@@ -196,14 +196,14 @@ export const Chart = ({
 
   useEffect(() => {
     if (nilOrEmpty(points)) return;
-    console.log('Chart useEffect points:', points);
+    // console.log('Chart useEffect points:', points);
     R.map(pointIntoChart(chart.current, { length, ttl }))(points);
     chart.current.update();
   }, [points]);
 
   useEffect(() => {
     if (nilOrEmpty(point)) return;
-    console.log('Chart useEffect point:', point);
+    // console.log('Chart useEffect point:', point);
     pointIntoChart(chart.current, { length: length || 10, ttl }, point);
     chart.current.update();
   }, [point]);

src/withSubs.js

@@ -49,11 +49,11 @@ export const withSubs = ({
       const unsubscribes = useRef([]);
       const [point, setPoint] = useState(init);
       const [points, setPoints] = useState([]);
-      console.log('WithSubs render:', points, point);
+      // console.log('WithSubs render:', points, point);
 
       const setter = useCallback(
         msg => {
-          console.log('WithSubs setter:', msg);
+          // console.log('WithSubs setter:', msg);
           setPoint(prevData => prepareMsg(prevData)(msg));
         },
         [setPoint],
@@ -61,11 +61,12 @@ export const withSubs = ({
 
       const historySetter = useCallback(
         msgs => {
-          console.log('WithSubs historySetter:', msgs);
+          // console.log('WithSubs historySetter:', msgs);
           setPoints(prevData => {
+            if (R.isEmpty(prevData)) return msgs;
+            // TODO: fix below for case of 'last' (?)
             const newData = R.zipWith(prepareMsg)(prevData, msgs);
             console.log('WithSubs newData:', newData);
-            if (R.isEmpty(prevData)) return msgs;
             return newData;
           });
         },
@@ -81,7 +82,7 @@ export const withSubs = ({
       );
 
       useEffect(() => {
-        console.log('WithSubs init-effect:', channels);
+        // console.log('WithSubs init-effect:', channels);
         if (!channels) return undefined;
         // if (!channels || channels.some(hasnt('rid'))) return undefined;
         // console.log('WithSubs will run fromChannels with:', channels, ttl);