@deneb-ui/ui 2.0.78 → 2.0.80

package/dist/SiteDataProvider.d.ts

@@ -135,3 +135,14 @@ export declare function useShop(fallback?: GenericRecord): GenericRecord;
  * Hook to retrieve customer reviews / testimonials cleanly from SiteData.
  */
 export declare function useReviews(fallback?: GenericRecord[]): GenericRecord[];
+/**
+ * Hook to retrieve common storefront metadata (website title, slogan, branding, etc.)
+ * with safe hierarchical fallbacks across content.common, shop profile, and user fallbacks.
+ * Never throws ReferenceError or crashes on missing data.
+ */
+export declare function useCommon(fallback?: GenericRecord): GenericRecord;
+/**
+ * Hook to retrieve contact information (WhatsApp, phone, address, email, map link)
+ * with robust fallbacks across contact, common, and shop profile.
+ */
+export declare function useContact(fallback?: GenericRecord): GenericRecord;

package/dist/SiteDataProvider.js

@@ -24,6 +24,8 @@ exports.useSiteApi = useSiteApi;
 exports.useSiteCatalog = useSiteCatalog;
 exports.useShop = useShop;
 exports.useReviews = useReviews;
+exports.useCommon = useCommon;
+exports.useContact = useContact;
 const jsx_runtime_1 = require("react/jsx-runtime");
 const react_1 = require("react");
 const core_1 = require("@deneb-ui/core");
@@ -260,9 +262,18 @@ function SiteDataProvider({ children, initialSiteData, fallbackSiteData, liveCat
                 const currentHome = isRecord(currentContent.home) ? currentContent.home : null;
                 const currentCommon = isRecord(currentContent.common) ? currentContent.common : {};
                 const currentContact = isRecord(currentContent.contact) ? currentContent.contact : {};
-                const nextProducts = Array.isArray(live.products)
-                    ? live.products
-                    : currentContent.products;
+                const rawLiveProducts = Array.isArray(live.products) ? live.products : currentContent.products;
+                const nextProducts = Array.isArray(rawLiveProducts)
+                    ? rawLiveProducts.map((p) => {
+                        if (!isRecord(p))
+                            return p;
+                        const customData = isRecord(p.customData) ? p.customData : {};
+                        return {
+                            ...customData,
+                            ...p,
+                        };
+                    })
+                    : rawLiveProducts;
                 const nextServices = Array.isArray(live.services)
                     ? live.services
                     : currentContent.services;
@@ -293,12 +304,18 @@ function SiteDataProvider({ children, initialSiteData, fallbackSiteData, liveCat
                             if (cleanWa) {
                                 nextContact.whatsappNumber = cleanWa;
                                 nextCommon.whatsappNumber = cleanWa;
-                                // Dynamically update any hardcoded or static wa.me URLs across home
+                                // Dynamically update any hardcoded or static wa.me URLs across home and common
                                 const waRegex = /(https?:\/\/(?:wa\.me|api\.whatsapp\.com\/send\?phone=))\d+/gi;
                                 for (const key of ['whatsappCtaUrl', 'whatsappOrderUrl', 'whatsappUrl']) {
                                     if (typeof nextHome[key] === 'string' && waRegex.test(nextHome[key])) {
                                         nextHome[key] = nextHome[key].replace(waRegex, `$1${cleanWa}`);
                                     }
+                                    if (typeof nextCommon[key] === 'string' && waRegex.test(nextCommon[key])) {
+                                        nextCommon[key] = nextCommon[key].replace(waRegex, `$1${cleanWa}`);
+                                    }
+                                }
+                                if (!nextCommon.whatsappUrl || waRegex.test(nextCommon.whatsappUrl)) {
+                                    nextCommon.whatsappUrl = `https://wa.me/${cleanWa}`;
                                 }
                             }
                         }
@@ -312,6 +329,7 @@ function SiteDataProvider({ children, initialSiteData, fallbackSiteData, liveCat
                         if (typeof street === 'string' && street.trim()) {
                             nextContact.address = street;
                             nextCommon.address = street;
+                            nextCommon.footerAddress = street;
                         }
                         if (typeof address.mapLocation === 'string' && address.mapLocation.trim()) {
                             nextContact.googleMapLink = address.mapLocation;
@@ -639,19 +657,32 @@ function useProducts(fallback = []) {
     const content = isRecord(siteData?.content) ? siteData.content : null;
     if (!content)
         return fallback;
+    let rawList = null;
     if (Array.isArray(content.products) && content.products.length > 0) {
-        return content.products;
+        rawList = content.products;
     }
-    const home = isRecord(content.home) ? content.home : null;
-    if (home) {
-        if (Array.isArray(home.products) && home.products.length > 0) {
-            return home.products;
-        }
-        if (Array.isArray(home.featuredProducts) && home.featuredProducts.length > 0) {
-            return home.featuredProducts;
+    else {
+        const home = isRecord(content.home) ? content.home : null;
+        if (home) {
+            if (Array.isArray(home.products) && home.products.length > 0) {
+                rawList = home.products;
+            }
+            else if (Array.isArray(home.featuredProducts) && home.featuredProducts.length > 0) {
+                rawList = home.featuredProducts;
+            }
         }
     }
-    return fallback;
+    if (!rawList)
+        return fallback;
+    return rawList.map((p) => {
+        if (!isRecord(p))
+            return p;
+        const customData = isRecord(p.customData) ? p.customData : {};
+        return {
+            ...customData,
+            ...p,
+        };
+    });
 }
 /**
  * Hook to retrieve services cleanly from SiteData, supporting both
@@ -744,3 +775,93 @@ function useReviews(fallback = []) {
     }
     return fallback;
 }
+/**
+ * Hook to retrieve common storefront metadata (website title, slogan, branding, etc.)
+ * with safe hierarchical fallbacks across content.common, shop profile, and user fallbacks.
+ * Never throws ReferenceError or crashes on missing data.
+ */
+function useCommon(fallback = {}) {
+    const siteData = useSiteData();
+    const content = isRecord(siteData?.content) ? siteData.content : null;
+    const common = isRecord(content?.common) ? content.common : {};
+    const contact = isRecord(content?.contact) ? content.contact : {};
+    const shop = useShop();
+    const websiteTitle = (typeof common.websiteTitle === 'string' && common.websiteTitle.trim()) ||
+        (typeof shop.name === 'string' && shop.name.trim()) ||
+        (typeof shop.businessName === 'string' && shop.businessName.trim()) ||
+        (typeof fallback.websiteTitle === 'string' && fallback.websiteTitle.trim()) ||
+        'Store';
+    const whatsappNumber = (typeof common.whatsappNumber === 'string' && common.whatsappNumber.trim()) ||
+        (typeof contact.whatsappNumber === 'string' && contact.whatsappNumber.trim()) ||
+        (typeof shop.whatsappNumber === 'string' && shop.whatsappNumber.trim()) ||
+        (typeof shop.phone === 'string' && shop.phone.trim()) ||
+        (typeof fallback.whatsappNumber === 'string' && fallback.whatsappNumber.trim()) ||
+        '';
+    const cleanWa = whatsappNumber.replace(/\D+/g, '');
+    const whatsappUrl = (typeof common.whatsappUrl === 'string' && common.whatsappUrl.trim()) ||
+        (cleanWa ? `https://wa.me/${cleanWa}` : '') ||
+        (typeof fallback.whatsappUrl === 'string' && fallback.whatsappUrl.trim()) ||
+        '';
+    const address = (typeof common.address === 'string' && common.address.trim()) ||
+        (typeof common.footerAddress === 'string' && common.footerAddress.trim()) ||
+        (typeof contact.address === 'string' && contact.address.trim()) ||
+        (typeof shop.address === 'string' && shop.address.trim()) ||
+        (typeof fallback.address === 'string' && fallback.address.trim()) ||
+        '';
+    const logoUrl = (typeof common.logoUrl === 'string' && common.logoUrl.trim()) ||
+        (typeof shop.logoUrl === 'string' && shop.logoUrl.trim()) ||
+        (typeof fallback.logoUrl === 'string' && fallback.logoUrl.trim()) ||
+        '';
+    return {
+        ...fallback,
+        ...common,
+        websiteTitle,
+        whatsappNumber,
+        whatsappUrl,
+        address,
+        logoUrl,
+    };
+}
+/**
+ * Hook to retrieve contact information (WhatsApp, phone, address, email, map link)
+ * with robust fallbacks across contact, common, and shop profile.
+ */
+function useContact(fallback = {}) {
+    const siteData = useSiteData();
+    const content = isRecord(siteData?.content) ? siteData.content : null;
+    const contact = isRecord(content?.contact) ? content.contact : {};
+    const common = isRecord(content?.common) ? content.common : {};
+    const shop = useShop();
+    const whatsappNumber = (typeof contact.whatsappNumber === 'string' && contact.whatsappNumber.trim()) ||
+        (typeof common.whatsappNumber === 'string' && common.whatsappNumber.trim()) ||
+        (typeof shop.whatsappNumber === 'string' && shop.whatsappNumber.trim()) ||
+        (typeof shop.phone === 'string' && shop.phone.trim()) ||
+        (typeof fallback.whatsappNumber === 'string' && fallback.whatsappNumber.trim()) ||
+        '';
+    const cleanWa = whatsappNumber.replace(/\D+/g, '');
+    const whatsappUrl = (typeof contact.whatsappUrl === 'string' && contact.whatsappUrl.trim()) ||
+        (typeof common.whatsappUrl === 'string' && common.whatsappUrl.trim()) ||
+        (cleanWa ? `https://wa.me/${cleanWa}` : '') ||
+        '';
+    const address = (typeof contact.address === 'string' && contact.address.trim()) ||
+        (typeof common.address === 'string' && common.address.trim()) ||
+        (typeof shop.address === 'string' && shop.address.trim()) ||
+        (typeof fallback.address === 'string' && fallback.address.trim()) ||
+        '';
+    const email = (typeof contact.email === 'string' && contact.email.trim()) ||
+        (typeof shop.email === 'string' && shop.email.trim()) ||
+        (typeof fallback.email === 'string' && fallback.email.trim()) ||
+        '';
+    const googleMapLink = (typeof contact.googleMapLink === 'string' && contact.googleMapLink.trim()) ||
+        (typeof fallback.googleMapLink === 'string' && fallback.googleMapLink.trim()) ||
+        '';
+    return {
+        ...fallback,
+        ...contact,
+        whatsappNumber,
+        whatsappUrl,
+        address,
+        email,
+        googleMapLink,
+    };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deneb-ui/ui",
-  "version": "2.0.78",
+  "version": "2.0.80",
   "description": "Visual-first React component library for editable commerce storefronts. Built for Next.js and Fivora.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -50,7 +50,7 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "@deneb-ui/core": "^2.0.78"
+    "@deneb-ui/core": "^2.0.80"
   },
   "peerDependencies": {
     "react": "^18.0.0 || ^19.0.0",