@diffsome/react 1.1.2 → 1.2.0

package/dist/index.js

@@ -98,6 +98,10 @@ var getEnvVar = (key) => {
 };
 function DiffsomeProvider({ children, config = {} }) {
   const [isReady, setIsReady] = (0, import_react.useState)(false);
+  const [cart, setCart] = (0, import_react.useState)(null);
+  const [cartLoading, setCartLoading] = (0, import_react.useState)(true);
+  const [wishlistItems, setWishlistItems] = (0, import_react.useState)([]);
+  const [wishlistLoading, setWishlistLoading] = (0, import_react.useState)(true);
   const tenantId = config.tenantId || getEnvVar("DIFFSOME_TENANT_ID");
   const apiKey = config.apiKey || getEnvVar("DIFFSOME_API_KEY");
   const baseUrl = config.baseUrl || getEnvVar("DIFFSOME_BASE_URL");
@@ -115,13 +119,59 @@ function DiffsomeProvider({ children, config = {} }) {
       storageType: config.storageType ?? "localStorage"
     });
   }, [tenantId, baseUrl, apiKey, config.persistToken, config.storageType]);
+  const refreshCart = (0, import_react.useCallback)(async () => {
+    setCartLoading(true);
+    try {
+      const cartData = await client.shop.getCart();
+      setCart(cartData);
+    } catch (err) {
+      setCart(null);
+    } finally {
+      setCartLoading(false);
+    }
+  }, [client]);
+  const refreshWishlist = (0, import_react.useCallback)(async () => {
+    if (!client.isAuthenticated()) {
+      setWishlistItems([]);
+      setWishlistLoading(false);
+      return;
+    }
+    setWishlistLoading(true);
+    try {
+      const response = await client.shop.getWishlist({ per_page: 100 });
+      setWishlistItems(response.data);
+    } catch (err) {
+      setWishlistItems([]);
+    } finally {
+      setWishlistLoading(false);
+    }
+  }, [client]);
   (0, import_react.useEffect)(() => {
     setIsReady(true);
-  }, []);
+    refreshCart();
+    refreshWishlist();
+  }, [refreshCart, refreshWishlist]);
+  (0, import_react.useEffect)(() => {
+    const handleAuthChange = () => {
+      refreshWishlist();
+    };
+    if (typeof window !== "undefined") {
+      window.addEventListener("storage", handleAuthChange);
+      return () => window.removeEventListener("storage", handleAuthChange);
+    }
+  }, [refreshWishlist]);
   const value = (0, import_react.useMemo)(() => ({
     client,
-    isReady
-  }), [client, isReady]);
+    isReady,
+    cart,
+    cartLoading,
+    setCart,
+    refreshCart,
+    wishlistItems,
+    wishlistLoading,
+    setWishlistItems,
+    refreshWishlist
+  }), [client, isReady, cart, cartLoading, refreshCart, wishlistItems, wishlistLoading, refreshWishlist]);
   return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(DiffsomeContext.Provider, { value, children });
 }
 function useDiffsome() {
@@ -280,25 +330,7 @@ function useSocialAuth() {
 // src/hooks/useCart.ts
 var import_react4 = require("react");
 function useCart() {
-  const client = useClient();
-  const [cart, setCart] = (0, import_react4.useState)(null);
-  const [loading, setLoading] = (0, import_react4.useState)(true);
-  const [error, setError] = (0, import_react4.useState)(null);
-  const fetchCart = (0, import_react4.useCallback)(async () => {
-    try {
-      const cartData = await client.shop.getCart();
-      setCart(cartData);
-      setError(null);
-    } catch (err) {
-      setCart(null);
-      setError(err instanceof Error ? err : new Error("Failed to fetch cart"));
-    } finally {
-      setLoading(false);
-    }
-  }, [client]);
-  (0, import_react4.useEffect)(() => {
-    fetchCart();
-  }, [fetchCart]);
+  const { client, cart, cartLoading, setCart, refreshCart } = useDiffsome();
   const addToCart = (0, import_react4.useCallback)(async (productId, quantity = 1, variantId, options) => {
     const data = {
       product_id: productId,
@@ -309,25 +341,21 @@ function useCart() {
     const updatedCart = await client.shop.addToCart(data);
     setCart(updatedCart);
     return updatedCart;
-  }, [client]);
+  }, [client, setCart]);
   const updateItem = (0, import_react4.useCallback)(async (itemId, quantity) => {
     const updatedCart = await client.shop.updateCartItem(itemId, { quantity });
     setCart(updatedCart);
     return updatedCart;
-  }, [client]);
+  }, [client, setCart]);
   const removeItem = (0, import_react4.useCallback)(async (itemId) => {
     const updatedCart = await client.shop.removeFromCart(itemId);
     setCart(updatedCart);
     return updatedCart;
-  }, [client]);
+  }, [client, setCart]);
   const clearCart = (0, import_react4.useCallback)(async () => {
     await client.shop.clearCart();
     setCart(null);
-  }, [client]);
-  const refresh = (0, import_react4.useCallback)(async () => {
-    setLoading(true);
-    await fetchCart();
-  }, [fetchCart]);
+  }, [client, setCart]);
   const isInCart = (0, import_react4.useCallback)((productId, variantId) => {
     if (!cart?.items) return false;
     return cart.items.some(
@@ -349,13 +377,12 @@ function useCart() {
     subtotal: cart?.subtotal ?? 0,
     shippingFee: cart?.shipping_fee ?? 0,
     total: cart?.total ?? 0,
-    loading,
-    error,
+    loading: cartLoading,
     addToCart,
     updateItem,
     removeItem,
     clearCart,
-    refresh,
+    refresh: refreshCart,
     isInCart,
     getItemQuantity
   };
@@ -364,102 +391,63 @@ function useCart() {
 // src/hooks/useWishlist.ts
 var import_react5 = require("react");
 function useWishlist() {
-  const client = useClient();
-  const [items, setItems] = (0, import_react5.useState)([]);
-  const [loading, setLoading] = (0, import_react5.useState)(true);
+  const { client, wishlistItems, wishlistLoading, setWishlistItems, refreshWishlist, setCart } = useDiffsome();
   const [error, setError] = (0, import_react5.useState)(null);
-  const [wishlistMap, setWishlistMap] = (0, import_react5.useState)({});
-  const fetchWishlist = (0, import_react5.useCallback)(async () => {
-    if (!client.isAuthenticated()) {
-      setItems([]);
-      setWishlistMap({});
-      setLoading(false);
-      return;
-    }
-    try {
-      const response = await client.shop.getWishlist({ per_page: 100 });
-      setItems(response.data);
-      const map = {};
-      response.data.forEach((item) => {
-        const key = item.variant_id ? `${item.product_id}_${item.variant_id}` : String(item.product_id);
-        map[key] = true;
-      });
-      setWishlistMap(map);
-      setError(null);
-    } catch (err) {
-      setItems([]);
-      setWishlistMap({});
-      setError(err instanceof Error ? err : new Error("Failed to fetch wishlist"));
-    } finally {
-      setLoading(false);
-    }
-  }, [client]);
-  (0, import_react5.useEffect)(() => {
-    fetchWishlist();
-  }, [fetchWishlist]);
+  const wishlistMap = (0, import_react5.useMemo)(() => {
+    const map = {};
+    wishlistItems.forEach((item) => {
+      const key = item.variant_id ? `${item.product_id}_${item.variant_id}` : String(item.product_id);
+      map[key] = true;
+    });
+    return map;
+  }, [wishlistItems]);
   const isInWishlist = (0, import_react5.useCallback)((productId, variantId) => {
     const key = variantId ? `${productId}_${variantId}` : String(productId);
     return wishlistMap[key] || false;
   }, [wishlistMap]);
   const toggleWishlist = (0, import_react5.useCallback)(async (productId, variantId) => {
     const result = await client.shop.toggleWishlist(productId, variantId);
-    const key = variantId ? `${productId}_${variantId}` : String(productId);
-    setWishlistMap((prev) => ({
-      ...prev,
-      [key]: result.in_wishlist
-    }));
     if (result.action === "added") {
-      await fetchWishlist();
+      await refreshWishlist();
     } else {
-      setItems((prev) => prev.filter(
+      setWishlistItems(wishlistItems.filter(
         (item) => !(item.product_id === productId && item.variant_id === variantId)
       ));
     }
     return result;
-  }, [client, fetchWishlist]);
+  }, [client, refreshWishlist, setWishlistItems, wishlistItems]);
   const addToWishlist = (0, import_react5.useCallback)(async (productId, variantId, note) => {
     const item = await client.shop.addToWishlist({
       product_id: productId,
       variant_id: variantId,
       note
     });
-    await fetchWishlist();
+    await refreshWishlist();
     return item;
-  }, [client, fetchWishlist]);
+  }, [client, refreshWishlist]);
   const removeFromWishlist = (0, import_react5.useCallback)(async (wishlistId) => {
-    const item = items.find((i) => i.id === wishlistId);
     await client.shop.removeFromWishlist(wishlistId);
-    if (item) {
-      const key = item.variant_id ? `${item.product_id}_${item.variant_id}` : String(item.product_id);
-      setWishlistMap((prev) => {
-        const next = { ...prev };
-        delete next[key];
-        return next;
-      });
-    }
-    setItems((prev) => prev.filter((i) => i.id !== wishlistId));
-  }, [client, items]);
+    setWishlistItems(wishlistItems.filter((i) => i.id !== wishlistId));
+  }, [client, setWishlistItems, wishlistItems]);
   const moveToCart = (0, import_react5.useCallback)(async (wishlistIds) => {
     const result = await client.shop.moveWishlistToCart(wishlistIds);
-    await fetchWishlist();
+    await refreshWishlist();
+    const cartData = await client.shop.getCart();
+    setCart(cartData);
     return result;
-  }, [client, fetchWishlist]);
+  }, [client, refreshWishlist, setCart]);
   const updateNote = (0, import_react5.useCallback)(async (wishlistId, note) => {
     const item = await client.shop.updateWishlistNote(wishlistId, note);
-    setItems((prev) => prev.map((i) => i.id === wishlistId ? item : i));
+    setWishlistItems(wishlistItems.map((i) => i.id === wishlistId ? item : i));
     return item;
-  }, [client]);
+  }, [client, setWishlistItems, wishlistItems]);
   const getProductWishlistCount = (0, import_react5.useCallback)(async (productSlug) => {
     return await client.shop.getProductWishlistCount(productSlug);
   }, [client]);
-  const refresh = (0, import_react5.useCallback)(async () => {
-    setLoading(true);
-    await fetchWishlist();
-  }, [fetchWishlist]);
   return {
-    items,
-    count: items.length,
-    loading,
+    items: wishlistItems,
+    count: wishlistItems.length,
+    loading: wishlistLoading,
     error,
     isInWishlist,
     toggleWishlist,
@@ -468,7 +456,7 @@ function useWishlist() {
     moveToCart,
     updateNote,
     getProductWishlistCount,
-    refresh
+    refresh: refreshWishlist
   };
 }