stream-chat-react-native-core 7.0.1-beta.1 → 7.0.1-beta.2

package/lib/commonjs/hooks/useStateStore.js

@@ -1,27 +1,38 @@
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.useStateStore = useStateStore;
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = require("react");
+var _shim = require("use-sync-external-store/shim");
+var noop = function noop() {};
 function useStateStore(store, selector) {
-  var _useState = (0, _react.useState)(function () {
-      if (!store) {
-        return undefined;
+  var wrappedSubscription = (0, _react.useCallback)(function (onStoreChange) {
+    var unsubscribe = store == null ? void 0 : store.subscribeWithSelector(selector, onStoreChange);
+    return unsubscribe != null ? unsubscribe : noop;
+  }, [store, selector]);
+  var wrappedSnapshot = (0, _react.useMemo)(function () {
+    var cachedTuple;
+    return function () {
+      var currentValue = store == null ? void 0 : store.getLatestValue();
+      if (!currentValue) return undefined;
+      if (cachedTuple && cachedTuple[0] === currentValue) {
+        return cachedTuple[1];
+      }
+      var newlySelected = selector(currentValue);
+      if (cachedTuple) {
+        var selectededAreEqualToCached = true;
+        for (var key in cachedTuple[1]) {
+          if (cachedTuple[1][key] === newlySelected[key]) continue;
+          selectededAreEqualToCached = false;
+          break;
+        }
+        if (selectededAreEqualToCached) return cachedTuple[1];
       }
-      return selector(store.getLatestValue());
-    }),
-    _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
-    state = _useState2[0],
-    setState = _useState2[1];
-  (0, _react.useEffect)(function () {
-    if (!store) {
-      return;
-    }
-    var unsubscribe = store.subscribeWithSelector(selector, setState);
-    return unsubscribe;
+      cachedTuple = [currentValue, newlySelected];
+      return cachedTuple[1];
+    };
   }, [store, selector]);
+  var state = (0, _shim.useSyncExternalStore)(wrappedSubscription, wrappedSnapshot);
   return state;
 }
 //# sourceMappingURL=useStateStore.js.map

package/lib/commonjs/hooks/useStateStore.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","require","useStateStore","store","selector","_useState","useState","undefined","getLatestValue","_useState2","_slicedToArray2","state","setState","useEffect","unsubscribe","subscribeWithSelector"],"sourceRoot":"../../../src","sources":["hooks/useStateStore.ts"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AAYO,SAASC,aAAaA,CAG3BC,KAAgC,EAAEC,QAAqB,EAAE;EACzD,IAAAC,SAAA,GAA0B,IAAAC,eAAQ,EAAgB,YAAM;MACtD,IAAI,CAACH,KAAK,EAAE;QACV,OAAOI,SAAS;MAClB;MACA,OAAOH,QAAQ,CAACD,KAAK,CAACK,cAAc,CAAC,CAAC,CAAC;IACzC,CAAC,CAAC;IAAAC,UAAA,OAAAC,eAAA,aAAAL,SAAA;IALKM,KAAK,GAAAF,UAAA;IAAEG,QAAQ,GAAAH,UAAA;EAOtB,IAAAI,gBAAS,EAAC,YAAM;IACd,IAAI,CAACV,KAAK,EAAE;MACV;IACF;IAEA,IAAMW,WAAW,GAAGX,KAAK,CAACY,qBAAqB,CAACX,QAAQ,EAAEQ,QAAQ,CAAC;IAEnE,OAAOE,WAAW;EACpB,CAAC,EAAE,CAACX,KAAK,EAAEC,QAAQ,CAAC,CAAC;EAErB,OAAOO,KAAK;AACd","ignoreList":[]}
+{"version":3,"names":["_react","require","_shim","noop","useStateStore","store","selector","wrappedSubscription","useCallback","onStoreChange","unsubscribe","subscribeWithSelector","wrappedSnapshot","useMemo","cachedTuple","currentValue","getLatestValue","undefined","newlySelected","selectededAreEqualToCached","key","state","useSyncExternalStore"],"sourceRoot":"../../../src","sources":["hooks/useStateStore.ts"],"mappings":";;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AAGA,IAAAC,KAAA,GAAAD,OAAA;AAEA,IAAME,IAAI,GAAG,SAAPA,IAAIA,CAAA,EAAS,CAAC,CAAC;AAUd,SAASC,aAAaA,CAG3BC,KAAgC,EAAEC,QAAqB,EAAE;EACzD,IAAMC,mBAAmB,GAAG,IAAAC,kBAAW,EACrC,UAACC,aAAyB,EAAK;IAC7B,IAAMC,WAAW,GAAGL,KAAK,oBAALA,KAAK,CAAEM,qBAAqB,CAACL,QAAQ,EAAEG,aAAa,CAAC;IACzE,OAAOC,WAAW,WAAXA,WAAW,GAAIP,IAAI;EAC5B,CAAC,EACD,CAACE,KAAK,EAAEC,QAAQ,CAClB,CAAC;EAED,IAAMM,eAAe,GAAG,IAAAC,cAAO,EAAC,YAAM;IACpC,IAAIC,WAAmB;IAEvB,OAAO,YAAM;MACX,IAAMC,YAAY,GAAGV,KAAK,oBAALA,KAAK,CAAEW,cAAc,CAAC,CAAC;MAE5C,IAAI,CAACD,YAAY,EAAE,OAAOE,SAAS;MAGnC,IAAIH,WAAW,IAAIA,WAAW,CAAC,CAAC,CAAC,KAAKC,YAAY,EAAE;QAClD,OAAOD,WAAW,CAAC,CAAC,CAAC;MACvB;MAEA,IAAMI,aAAa,GAAGZ,QAAQ,CAACS,YAAY,CAAC;MAG5C,IAAID,WAAW,EAAE;QACf,IAAIK,0BAA0B,GAAG,IAAI;QAErC,KAAK,IAAMC,GAAG,IAAIN,WAAW,CAAC,CAAC,CAAC,EAAE;UAChC,IAAIA,WAAW,CAAC,CAAC,CAAC,CAACM,GAAG,CAAC,KAAKF,aAAa,CAACE,GAAG,CAAC,EAAE;UAChDD,0BAA0B,GAAG,KAAK;UAClC;QACF;QAEA,IAAIA,0BAA0B,EAAE,OAAOL,WAAW,CAAC,CAAC,CAAC;MACvD;MAEAA,WAAW,GAAG,CAACC,YAAY,EAAEG,aAAa,CAAC;MAC3C,OAAOJ,WAAW,CAAC,CAAC,CAAC;IACvB,CAAC;EACH,CAAC,EAAE,CAACT,KAAK,EAAEC,QAAQ,CAAC,CAAC;EAErB,IAAMe,KAAK,GAAG,IAAAC,0BAAoB,EAACf,mBAAmB,EAAEK,eAAe,CAAC;EAExE,OAAOS,KAAK;AACd","ignoreList":[]}

package/lib/commonjs/version.json

@@ -1,3 +1,3 @@
 {
-  "version": "7.0.1-beta.1"
+  "version": "7.0.1-beta.2"
 }

package/lib/module/hooks/useStateStore.js

@@ -1,27 +1,38 @@
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.useStateStore = useStateStore;
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = require("react");
+var _shim = require("use-sync-external-store/shim");
+var noop = function noop() {};
 function useStateStore(store, selector) {
-  var _useState = (0, _react.useState)(function () {
-      if (!store) {
-        return undefined;
+  var wrappedSubscription = (0, _react.useCallback)(function (onStoreChange) {
+    var unsubscribe = store == null ? void 0 : store.subscribeWithSelector(selector, onStoreChange);
+    return unsubscribe != null ? unsubscribe : noop;
+  }, [store, selector]);
+  var wrappedSnapshot = (0, _react.useMemo)(function () {
+    var cachedTuple;
+    return function () {
+      var currentValue = store == null ? void 0 : store.getLatestValue();
+      if (!currentValue) return undefined;
+      if (cachedTuple && cachedTuple[0] === currentValue) {
+        return cachedTuple[1];
+      }
+      var newlySelected = selector(currentValue);
+      if (cachedTuple) {
+        var selectededAreEqualToCached = true;
+        for (var key in cachedTuple[1]) {
+          if (cachedTuple[1][key] === newlySelected[key]) continue;
+          selectededAreEqualToCached = false;
+          break;
+        }
+        if (selectededAreEqualToCached) return cachedTuple[1];
       }
-      return selector(store.getLatestValue());
-    }),
-    _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
-    state = _useState2[0],
-    setState = _useState2[1];
-  (0, _react.useEffect)(function () {
-    if (!store) {
-      return;
-    }
-    var unsubscribe = store.subscribeWithSelector(selector, setState);
-    return unsubscribe;
+      cachedTuple = [currentValue, newlySelected];
+      return cachedTuple[1];
+    };
   }, [store, selector]);
+  var state = (0, _shim.useSyncExternalStore)(wrappedSubscription, wrappedSnapshot);
   return state;
 }
 //# sourceMappingURL=useStateStore.js.map

package/lib/module/hooks/useStateStore.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","require","useStateStore","store","selector","_useState","useState","undefined","getLatestValue","_useState2","_slicedToArray2","state","setState","useEffect","unsubscribe","subscribeWithSelector"],"sourceRoot":"../../../src","sources":["hooks/useStateStore.ts"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AAYO,SAASC,aAAaA,CAG3BC,KAAgC,EAAEC,QAAqB,EAAE;EACzD,IAAAC,SAAA,GAA0B,IAAAC,eAAQ,EAAgB,YAAM;MACtD,IAAI,CAACH,KAAK,EAAE;QACV,OAAOI,SAAS;MAClB;MACA,OAAOH,QAAQ,CAACD,KAAK,CAACK,cAAc,CAAC,CAAC,CAAC;IACzC,CAAC,CAAC;IAAAC,UAAA,OAAAC,eAAA,aAAAL,SAAA;IALKM,KAAK,GAAAF,UAAA;IAAEG,QAAQ,GAAAH,UAAA;EAOtB,IAAAI,gBAAS,EAAC,YAAM;IACd,IAAI,CAACV,KAAK,EAAE;MACV;IACF;IAEA,IAAMW,WAAW,GAAGX,KAAK,CAACY,qBAAqB,CAACX,QAAQ,EAAEQ,QAAQ,CAAC;IAEnE,OAAOE,WAAW;EACpB,CAAC,EAAE,CAACX,KAAK,EAAEC,QAAQ,CAAC,CAAC;EAErB,OAAOO,KAAK;AACd","ignoreList":[]}
+{"version":3,"names":["_react","require","_shim","noop","useStateStore","store","selector","wrappedSubscription","useCallback","onStoreChange","unsubscribe","subscribeWithSelector","wrappedSnapshot","useMemo","cachedTuple","currentValue","getLatestValue","undefined","newlySelected","selectededAreEqualToCached","key","state","useSyncExternalStore"],"sourceRoot":"../../../src","sources":["hooks/useStateStore.ts"],"mappings":";;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AAGA,IAAAC,KAAA,GAAAD,OAAA;AAEA,IAAME,IAAI,GAAG,SAAPA,IAAIA,CAAA,EAAS,CAAC,CAAC;AAUd,SAASC,aAAaA,CAG3BC,KAAgC,EAAEC,QAAqB,EAAE;EACzD,IAAMC,mBAAmB,GAAG,IAAAC,kBAAW,EACrC,UAACC,aAAyB,EAAK;IAC7B,IAAMC,WAAW,GAAGL,KAAK,oBAALA,KAAK,CAAEM,qBAAqB,CAACL,QAAQ,EAAEG,aAAa,CAAC;IACzE,OAAOC,WAAW,WAAXA,WAAW,GAAIP,IAAI;EAC5B,CAAC,EACD,CAACE,KAAK,EAAEC,QAAQ,CAClB,CAAC;EAED,IAAMM,eAAe,GAAG,IAAAC,cAAO,EAAC,YAAM;IACpC,IAAIC,WAAmB;IAEvB,OAAO,YAAM;MACX,IAAMC,YAAY,GAAGV,KAAK,oBAALA,KAAK,CAAEW,cAAc,CAAC,CAAC;MAE5C,IAAI,CAACD,YAAY,EAAE,OAAOE,SAAS;MAGnC,IAAIH,WAAW,IAAIA,WAAW,CAAC,CAAC,CAAC,KAAKC,YAAY,EAAE;QAClD,OAAOD,WAAW,CAAC,CAAC,CAAC;MACvB;MAEA,IAAMI,aAAa,GAAGZ,QAAQ,CAACS,YAAY,CAAC;MAG5C,IAAID,WAAW,EAAE;QACf,IAAIK,0BAA0B,GAAG,IAAI;QAErC,KAAK,IAAMC,GAAG,IAAIN,WAAW,CAAC,CAAC,CAAC,EAAE;UAChC,IAAIA,WAAW,CAAC,CAAC,CAAC,CAACM,GAAG,CAAC,KAAKF,aAAa,CAACE,GAAG,CAAC,EAAE;UAChDD,0BAA0B,GAAG,KAAK;UAClC;QACF;QAEA,IAAIA,0BAA0B,EAAE,OAAOL,WAAW,CAAC,CAAC,CAAC;MACvD;MAEAA,WAAW,GAAG,CAACC,YAAY,EAAEG,aAAa,CAAC;MAC3C,OAAOJ,WAAW,CAAC,CAAC,CAAC;IACvB,CAAC;EACH,CAAC,EAAE,CAACT,KAAK,EAAEC,QAAQ,CAAC,CAAC;EAErB,IAAMe,KAAK,GAAG,IAAAC,0BAAoB,EAACf,mBAAmB,EAAEK,eAAe,CAAC;EAExE,OAAOS,KAAK;AACd","ignoreList":[]}

package/lib/module/version.json

@@ -1,3 +1,3 @@
 {
-  "version": "7.0.1-beta.1"
+  "version": "7.0.1-beta.2"
 }

package/lib/typescript/hooks/useStateStore.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useStateStore.d.ts","sourceRoot":"","sources":["../../../src/hooks/useStateStore.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAE9C,wBAAgB,aAAa,CAC3B,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACjC,CAAC,SAAS,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC,EACjE,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;AAClD,wBAAgB,aAAa,CAC3B,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACjC,CAAC,SAAS,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC,EACjE,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC,GAAG,SAAS,EAAE,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC"}
+{"version":3,"file":"useStateStore.d.ts","sourceRoot":"","sources":["../../../src/hooks/useStateStore.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAK9C,wBAAgB,aAAa,CAC3B,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACjC,CAAC,SAAS,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC,EACjE,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;AAClD,wBAAgB,aAAa,CAC3B,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACjC,CAAC,SAAS,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC,EACjE,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC,GAAG,SAAS,EAAE,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "stream-chat-react-native-core",
   "description": "The official React Native and Expo components for Stream Chat, a service for building chat applications",
-  "version": "7.0.1-beta.1",
+  "version": "7.0.1-beta.2",
   "author": {
     "company": "Stream.io Inc",
     "name": "Stream.io Inc"

package/src/hooks/useStateStore.ts

@@ -1,6 +1,9 @@
-import { useEffect, useState } from 'react';
+import { useCallback, useMemo } from 'react';
 
 import type { StateStore } from 'stream-chat';
+import { useSyncExternalStore } from 'use-sync-external-store/shim';
+
+const noop = () => {};
 
 export function useStateStore<
   T extends Record<string, unknown>,
@@ -14,22 +17,48 @@ export function useStateStore<
   T extends Record<string, unknown>,
   O extends Readonly<Record<string, unknown> | Readonly<unknown[]>>,
 >(store: StateStore<T> | undefined, selector: (v: T) => O) {
-  const [state, setState] = useState<O | undefined>(() => {
-    if (!store) {
-      return undefined;
-    }
-    return selector(store.getLatestValue());
-  });
+  const wrappedSubscription = useCallback(
+    (onStoreChange: () => void) => {
+      const unsubscribe = store?.subscribeWithSelector(selector, onStoreChange);
+      return unsubscribe ?? noop;
+    },
+    [store, selector],
+  );
+
+  const wrappedSnapshot = useMemo(() => {
+    let cachedTuple: [T, O];
+
+    return () => {
+      const currentValue = store?.getLatestValue();
+
+      if (!currentValue) return undefined;
 
-  useEffect(() => {
-    if (!store) {
-      return;
-    }
+      // store value hasn't changed, no need to compare individual values
+      if (cachedTuple && cachedTuple[0] === currentValue) {
+        return cachedTuple[1];
+      }
 
-    const unsubscribe = store.subscribeWithSelector(selector, setState);
+      const newlySelected = selector(currentValue);
 
-    return unsubscribe;
+      // store value changed but selected values wouldn't have to, double-check selected
+      if (cachedTuple) {
+        let selectededAreEqualToCached = true;
+
+        for (const key in cachedTuple[1]) {
+          if (cachedTuple[1][key] === newlySelected[key]) continue;
+          selectededAreEqualToCached = false;
+          break;
+        }
+
+        if (selectededAreEqualToCached) return cachedTuple[1];
+      }
+
+      cachedTuple = [currentValue, newlySelected];
+      return cachedTuple[1];
+    };
   }, [store, selector]);
 
+  const state = useSyncExternalStore(wrappedSubscription, wrappedSnapshot);
+
   return state;
 }

package/src/version.json

@@ -1,3 +1,3 @@
 {
-  "version": "7.0.1-beta.1"
+  "version": "7.0.1-beta.2"
 }