@webkrafters/react-eagleeye 1.1.0-alpha.19 → 1.1.0-alpha.20

package/dist/main/index.js

@@ -134,16 +134,10 @@ var ObservableContext = exports.ObservableContext = /*#__PURE__*/function (_Abst
           _useState4 = _slicedToArray(_useState3, 2),
           store = _useState4[0],
           setStore = _useState4[1];
-        var mounted = (0, _react.useRef)(false);
         (0, _react.useEffect)(function () {
           channel.selectorMap = selectorMap;
         }, [selectorMap]);
         (0, _react.useEffect)(function () {
-          if (mounted.current) {
-            setStore(makeStore(channel));
-          } else {
-            mounted.current = true;
-          }
           channel.addListener('data-changed', function () {
             return setStore(_objectSpread(_objectSpread({}, store), {}, {
               data: channel.data
@@ -152,7 +146,7 @@ var ObservableContext = exports.ObservableContext = /*#__PURE__*/function (_Abst
           return function () {
             return channel.endStream();
           };
-        }, [channel]);
+        }, []);
         return store;
       };
     }

package/dist/main/universe/index.js

@@ -399,26 +399,13 @@ var ObservableUniverse = exports.ObservableUniverse = /*#__PURE__*/function () {
     value: function defineStreamHook() {
       var _this4 = this;
       return function (selectorMap) {
+        var mounted = (0, _react.useRef)(false);
+        var targetId = (0, _react.use)(_this4._context);
         var _useState = (0, _react.useState)(function () {
-            return _this4._util.hashSelectorMap(selectorMap);
+            return getStreamHandle(_this4._obs.createHandleFor(targetId), selectorMap, _this4._util.hashSelectorMap(selectorMap));
           }),
-          _useState2 = _slicedToArray(_useState, 2),
-          sMapHash = _useState2[0],
-          updateSMapHash = _useState2[1];
-        (0, _react.useEffect)(function () {
-          return updateSMapHash(_this4._util.hashSelectorMap(selectorMap));
-        }, [selectorMap]);
-        var targetId = (0, _react.use)(_this4._context);
-        var handle = (0, _react.useMemo)(function () {
-          var ctxHandle = _this4._obs.createHandleFor(targetId);
-          var streamHandle = ctxHandle.getChannelHandleAt(sMapHash);
-          if (!streamHandle.isValid) {
-            ctxHandle.addChannelAt(sMapHash, ctxHandle.resource.stream(selectorMap));
-            streamHandle = ctxHandle.getChannelHandleAt(sMapHash);
-          }
-          return streamHandle;
-        }, [sMapHash, targetId]);
-        var mounted = (0, _react.useRef)(false);
+          _useState2 = _slicedToArray(_useState, 1),
+          handle = _useState2[0];
         var _useState3 = (0, _react.useState)(getCurrentUri),
           _useState4 = _slicedToArray(_useState3, 1),
           currentUri = _useState4[0];
@@ -429,12 +416,17 @@ var ObservableUniverse = exports.ObservableUniverse = /*#__PURE__*/function () {
           store = _useState6[0],
           setStore = _useState6[1];
         (0, _react.useEffect)(function () {
-          var channel = handle.resource;
+          if (!mounted.current) {
+            return;
+          }
+          throw new Error('Selector map change not supported in SSR Mode.');
+        }, [selectorMap]);
+        (0, _react.useEffect)(function () {
           if (mounted.current) {
-            setStore((0, _.makeStore)(channel));
-          } else {
-            mounted.current = true;
+            return;
           }
+          mounted.current = true;
+          var channel = handle.resource;
           var fn = function fn() {
             return setStore(_objectSpread(_objectSpread({}, store), {}, {
               data: channel.data
@@ -445,20 +437,14 @@ var ObservableUniverse = exports.ObservableUniverse = /*#__PURE__*/function () {
           return function () {
             channel.removeListener('data-changed', fn);
             handle.dec();
-            var uri = getCurrentUri();
-            currentUri === uri && handle.release();
-            currentUri = uri;
+            currentUri === getCurrentUri() && handle.release();
           };
-        }, [handle.resource]);
+        }, []);
         return store;
       };
     }
   }]);
 }();
-function getCurrentUri() {
-  var _globalThis$location;
-  return (_globalThis$location = globalThis.location) === null || _globalThis$location === void 0 ? void 0 : _globalThis$location.pathname;
-}
 var Utility = exports.Utility = /*#__PURE__*/function () {
   function Utility(context) {
     _classCallCheck(this, Utility);
@@ -522,4 +508,16 @@ var Utility = exports.Utility = /*#__PURE__*/function () {
 }();
 function createContext() {
   return new ObservableUniverse();
+}
+function getCurrentUri() {
+  var _globalThis$location;
+  return (_globalThis$location = globalThis.location) === null || _globalThis$location === void 0 ? void 0 : _globalThis$location.pathname;
+}
+function getStreamHandle(contextHandle, selectorMap, sMapHash) {
+  var streamHandle = contextHandle.getChannelHandleAt(sMapHash);
+  if (!streamHandle.isValid) {
+    contextHandle.addChannelAt(sMapHash, contextHandle.resource.stream(selectorMap));
+    streamHandle = contextHandle.getChannelHandleAt(sMapHash);
+  }
+  return streamHandle;
 }

package/package.json

@@ -126,7 +126,7 @@
     "test:watch": "eslint --fix && jest --updateSnapshot --watchAll"
   },
   "types": "dist/index.d.ts",
-  "version": "1.1.0-alpha.19",
+  "version": "1.1.0-alpha.20",
   "dependencies": {
     "@webkrafters/eagleeye": "^1.0.8",
     "js-sha512": "^0.9.0",