@thoughtbot/superglue 2.0.0-alpha.4 → 2.0.0-alpha.7

package/dist/superglue.mjs

@@ -33,7 +33,7 @@ import {
   ujsHandlers,
   unproxy,
   urlToPageKey
-} from "./chunk-I4A45IH4.mjs";
+} from "./chunk-Q76JBI63.mjs";
 
 // node_modules/lodash/lodash.js
 var require_lodash = __commonJS({
@@ -5527,14 +5527,12 @@ import { useState, useEffect, useRef as useRef2, createContext, useContext } fro
 import { useSelector as useSelector3 } from "react-redux";
 
 // lib/hooks/useContent.tsx
-import { useSelector } from "react-redux";
+import { useSelector, useStore } from "react-redux";
 import { useMemo, useRef } from "react";
 function useContent(fragmentRef, options) {
   const superglueState = useSuperglue();
   const currentPageKey = superglueState.currentPageKey;
   const dependencies = useRef(/* @__PURE__ */ new Set());
-  const fragmentsHookRef = useRef({});
-  const proxyCache = useRef(/* @__PURE__ */ new WeakMap());
   const fragmentId = typeof fragmentRef === "string" ? fragmentRef : fragmentRef?.__id;
   const sourceData = useSelector((state) => {
     if (fragmentId) {
@@ -5543,7 +5541,7 @@ function useContent(fragmentRef, options) {
       return state.pages[currentPageKey].data;
     }
   });
-  const fragments = useSelector(
+  const trackedFragments = useSelector(
     (state) => state.fragments,
     (oldFragments, newFragments) => {
       if (oldFragments === newFragments) {
@@ -5556,9 +5554,10 @@ function useContent(fragmentRef, options) {
       });
     }
   );
-  fragmentsHookRef.current = fragments;
   const raiseOnMissing = !(options?.optional ?? false);
+  const store = useStore();
   const proxy = useMemo(() => {
+    const proxyCache = /* @__PURE__ */ new WeakMap();
     if (fragmentId && !sourceData) {
       if (raiseOnMissing) {
         throw new Error(`Fragment with id "${fragmentId}" not found`);
@@ -5568,11 +5567,11 @@ function useContent(fragmentRef, options) {
     }
     return createProxy(
       sourceData,
-      fragmentsHookRef,
+      { current: store.getState().fragments },
       dependencies.current,
-      proxyCache.current
+      proxyCache
     );
-  }, [sourceData, options?.optional]);
+  }, [sourceData, trackedFragments, options?.optional]);
   return proxy;
 }
 function unproxy2(proxy) {
@@ -5689,7 +5688,7 @@ import React, {
   forwardRef,
   useImperativeHandle
 } from "react";
-import { useDispatch as useDispatch2, useSelector as useSelector4, useStore } from "react-redux";
+import { useDispatch as useDispatch2, useSelector as useSelector4, useStore as useStore2 } from "react-redux";
 var NavigationContext = createContext2(
   {}
 );
@@ -5716,7 +5715,7 @@ var NavigationProvider = forwardRef(function NavigationProvider2({ history, visi
   const currentPageKey = useSelector4(
     (state) => state.superglue.currentPageKey
   );
-  const store = useStore();
+  const store = useStore2();
   useEffect2(() => {
     return history.listen(onHistoryChange);
   }, []);
@@ -6060,7 +6059,21 @@ var rootReducer = {
 };
 
 // lib/index.tsx
-var cable = createConsumer();
+function getConfig(name) {
+  if (typeof document !== "undefined") {
+    const element = document.head.querySelector(
+      `meta[name='action-cable-${name}']`
+    );
+    if (element) {
+      return element.getAttribute("content") || "/cable";
+    } else {
+      return "/cable";
+    }
+  } else {
+    return "/cable";
+  }
+}
+var cable = createConsumer(getConfig("url"));
 var hasWindow2 = typeof window !== "undefined";
 var createHistory = () => {
   if (hasWindow2) {