funuicss 3.7.9 → 3.7.11

package/ui/theme/theme.js

@@ -117,7 +117,7 @@ var validateOriginAccess = function (projectId) { return __awaiter(void 0, void
         switch (_a.label) {
             case 0:
                 if (!projectId) {
-                    console.error('❌ No project ID provided');
+                    console.error('❌ No project ID provided for origin validation');
                     return [2 /*return*/, false];
                 }
                 currentOrigin = getCurrentOrigin();
@@ -179,7 +179,7 @@ var loadLocalTheme = function () { return __awaiter(void 0, void 0, void 0, func
             case 3: return [3 /*break*/, 5];
             case 4:
                 error_2 = _a.sent();
-                console.log('No local theme file found');
+                console.log('ℹ️ No local theme file found');
                 return [3 /*break*/, 5];
             case 5: return [2 /*return*/, null];
         }
@@ -193,28 +193,34 @@ var loadThemeFromCDN = function (projectId) { return __awaiter(void 0, void 0, v
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
-                _a.trys.push([0, 5, , 6]);
+                if (!projectId) {
+                    console.error('❌ No project ID provided for CDN loading');
+                    return [2 /*return*/, null];
+                }
+                _a.label = 1;
+            case 1:
+                _a.trys.push([1, 6, , 7]);
                 publicUrl = "https://firebasestorage.googleapis.com/v0/b/funui-4bcd1.firebasestorage.app/o/themes%2F".concat(projectId, ".json?alt=media");
                 return [4 /*yield*/, fetch(publicUrl, {
                         cache: 'no-cache',
                     })];
-            case 1:
+            case 2:
                 response = _a.sent();
-                if (!response.ok) return [3 /*break*/, 3];
+                if (!response.ok) return [3 /*break*/, 4];
                 return [4 /*yield*/, response.json()];
-            case 2:
+            case 3:
                 data = _a.sent();
                 console.log('✅ Loaded theme from Firebase Storage CDN');
                 return [2 /*return*/, data];
-            case 3:
-                console.error('Firebase Storage fetch failed:', response.status, response.statusText);
-                _a.label = 4;
-            case 4: return [3 /*break*/, 6];
-            case 5:
+            case 4:
+                console.error('❌ Firebase Storage fetch failed:', response.status, response.statusText);
+                _a.label = 5;
+            case 5: return [3 /*break*/, 7];
+            case 6:
                 error_3 = _a.sent();
-                console.error('Error loading from Firebase Storage:', error_3);
-                return [3 /*break*/, 6];
-            case 6: return [2 /*return*/, null];
+                console.error('❌ Error loading from Firebase Storage:', error_3);
+                return [3 /*break*/, 7];
+            case 7: return [2 /*return*/, null];
         }
     });
 }); };
@@ -306,99 +312,124 @@ var ThemeProvider = function (_a) {
             });
         }
     }, [theme]);
-    /* ---------------------- CDN Theme Sync with Origin Validation ----------------------- */
+    /* ---------------------- Theme Loading Logic ----------------------- */
     (0, react_1.useEffect)(function () {
         if (typeof window === 'undefined') {
             setIsLoading(false);
             setIsInitialLoad(false);
             return;
         }
-        if (!projectId) {
-            console.error('❌ ThemeProvider: No projectId provided');
-            setError('Project ID is required');
-            setIsLoading(false);
-            setIsInitialLoad(false);
-            return;
-        }
         var root = document.documentElement;
         var pollTimer;
-        var syncTheme = function () { return __awaiter(void 0, void 0, void 0, function () {
-            var hasAccess, localTheme, localVersion, cdnTheme, cdnVersion, err_1;
+        var loadTheme = function () { return __awaiter(void 0, void 0, void 0, function () {
+            var finalTheme, finalVersion, localTheme, localVersion, hasAccess, cdnTheme, cdnVersion, err_1;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        _a.trys.push([0, 4, 5, 6]);
-                        console.log('🔄 Starting theme sync with origin validation...');
-                        return [4 /*yield*/, validateOriginAccess(projectId)];
-                    case 1:
-                        hasAccess = _a.sent();
-                        if (!hasAccess) {
-                            setError('Access denied: This domain is not authorized to use this theme');
-                            setIsLoading(false);
-                            setIsInitialLoad(false);
-                            return [2 /*return*/];
-                        }
+                        _a.trys.push([0, 8, 9, 10]);
+                        console.log('🔄 Starting theme loading process...');
+                        finalTheme = null;
+                        finalVersion = null;
                         return [4 /*yield*/, loadLocalTheme()];
-                    case 2:
+                    case 1:
                         localTheme = _a.sent();
                         localVersion = (localTheme === null || localTheme === void 0 ? void 0 : localTheme.version) || 0;
+                        if (!projectId) return [3 /*break*/, 6];
+                        console.log('🔑 Project ID provided, attempting CDN load with origin validation...');
+                        return [4 /*yield*/, validateOriginAccess(projectId)];
+                    case 2:
+                        hasAccess = _a.sent();
+                        if (!hasAccess) return [3 /*break*/, 4];
                         return [4 /*yield*/, loadThemeFromCDN(projectId)];
                     case 3:
                         cdnTheme = _a.sent();
                         cdnVersion = (cdnTheme === null || cdnTheme === void 0 ? void 0 : cdnTheme.version) || 0;
                         if (cdnTheme) {
-                            // Compare versions and use the newer one
+                            // CDN theme available - use it
+                            finalTheme = cdnTheme;
+                            finalVersion = cdnVersion;
                             if (cdnVersion !== localVersion) {
                                 console.log("\uD83D\uDD04 Version mismatch: Local(".concat(localVersion, ") vs CDN(").concat(cdnVersion, ")"));
                                 console.log('ℹ️ Using CDN version. Please update your local funui.json file manually.');
                             }
-                            // Always use CDN theme if available
-                            if (!currentVersion || cdnVersion !== currentVersion) {
-                                applyThemeData(cdnTheme, root);
-                                setCurrentVersion(cdnVersion);
-                                console.log('✅ Theme loaded from CDN');
-                            }
-                            else {
-                                console.log('✓ Theme up to date');
-                            }
-                            setError(null);
+                            console.log('✅ Theme loaded from CDN');
                         }
                         else if (localTheme) {
-                            // CDN not available but we have local
-                            console.log('⚠️ Using local theme (CDN unavailable)');
-                            applyThemeData(localTheme, root);
-                            setCurrentVersion(localVersion);
-                            setError(null);
+                            // CDN not available but we have local theme
+                            console.log('⚠️ CDN unavailable, using local theme');
+                            finalTheme = localTheme;
+                            finalVersion = localVersion;
                         }
                         else {
                             // No theme available anywhere
-                            console.warn('⚠️ No theme found');
+                            console.warn('⚠️ No theme found (CDN unavailable and no local theme)');
                             setError('Theme not found');
                         }
-                        return [3 /*break*/, 6];
+                        return [3 /*break*/, 5];
                     case 4:
+                        // Origin validation failed
+                        if (localTheme) {
+                            console.log('⚠️ Origin validation failed, using local theme');
+                            finalTheme = localTheme;
+                            finalVersion = localVersion;
+                        }
+                        else {
+                            console.error('❌ Origin validation failed and no local theme available');
+                            setError('Access denied and no local theme available');
+                        }
+                        _a.label = 5;
+                    case 5: return [3 /*break*/, 7];
+                    case 6:
+                        // No project ID provided - only use local theme
+                        console.log('ℹ️ No project ID provided, using local theme only');
+                        if (localTheme) {
+                            finalTheme = localTheme;
+                            finalVersion = localVersion;
+                            console.log('✅ Theme loaded from local file');
+                        }
+                        else {
+                            console.log('ℹ️ No local theme file found - using base theme only');
+                            // No error here - it's valid to use only base theme
+                        }
+                        _a.label = 7;
+                    case 7:
+                        // Apply the theme if we have one
+                        if (finalTheme && (!currentVersion || finalVersion !== currentVersion)) {
+                            applyThemeData(finalTheme, root);
+                            setCurrentVersion(finalVersion);
+                            setError(null);
+                        }
+                        else if (finalTheme) {
+                            console.log('✓ Theme up to date');
+                        }
+                        return [3 /*break*/, 10];
+                    case 8:
                         err_1 = _a.sent();
-                        console.error('❌ Error syncing theme:', err_1);
-                        setError('Failed to sync theme');
-                        return [3 /*break*/, 6];
-                    case 5:
+                        console.error('❌ Error loading theme:', err_1);
+                        setError('Failed to load theme');
+                        return [3 /*break*/, 10];
+                    case 9:
                         setIsLoading(false);
                         setIsInitialLoad(false);
                         return [7 /*endfinally*/];
-                    case 6: return [2 /*return*/];
+                    case 10: return [2 /*return*/];
                 }
             });
         }); };
-        // Initial sync
-        syncTheme();
-        // Poll for updates every 5 minutes
-        pollTimer = setInterval(function () {
-            syncTheme();
-        }, 5 * 60 * 1000);
+        // Initial load
+        loadTheme();
+        // Only poll for updates if we have a project ID
+        if (projectId) {
+            pollTimer = setInterval(function () {
+                loadTheme();
+            }, 5 * 60 * 1000);
+        }
         return function () {
-            clearInterval(pollTimer);
+            if (pollTimer) {
+                clearInterval(pollTimer);
+            }
         };
-    }, [projectId, currentVersion]);
+    }, [projectId, currentVersion, theme]);
     var applyThemeData = function (data, root) {
         var _a;
         var themeConfig = (_a = data.theme_config) !== null && _a !== void 0 ? _a : {};
@@ -531,9 +562,6 @@ var getAssetInfo = function (name) {
     };
 };
 exports.getAssetInfo = getAssetInfo;
-/* -------------------------------------------------------------------------- */
-/*                              ASSETS HOOKS                                  */
-/* -------------------------------------------------------------------------- */
 // Hook to access all assets
 var useAssets = function () {
     var projectData = (0, exports.useTheme)().projectData;

package/ui/video/Video.d.ts

@@ -43,6 +43,8 @@ interface VideoProps {
     rewindCss?: string;
     forwardCss?: string;
     buttonCss?: string;
+    volumeStyle?: 'slider' | 'compact' | 'hover';
+    variant?: string;
 }
-export default function Video({ src, poster, onDuration, onEnded, isPause, spacebarPlay, className, autoPlay, showControls, showPlayPause, showProgress, showVolume, showTime, showFullscreen, showDownload, showSeekButtons, playIcon, pauseIcon, fullscreenIcon, downloadIcon, volumeIcon, muteIcon, rewindIcon, forwardIcon, hideControlsDelay, loop, muted, seekAmount, funcss, containerCss, videoCss, controlsCss, progressCss, progressBarCss, timeCss, playCss, pauseCss, volumeCss, fullscreenCss, downloadCss, rewindCss, forwardCss, buttonCss, }: VideoProps): React.JSX.Element;
+export default function Video({ src, poster, onDuration, onEnded, isPause, spacebarPlay, className, autoPlay, showControls, showPlayPause, showProgress, showVolume, showTime, showFullscreen, showDownload, showSeekButtons, playIcon, pauseIcon, fullscreenIcon, downloadIcon, volumeIcon, muteIcon, rewindIcon, forwardIcon, hideControlsDelay, loop, muted, seekAmount, funcss, containerCss, videoCss, controlsCss, progressCss, progressBarCss, timeCss, playCss, pauseCss, volumeCss, fullscreenCss, downloadCss, rewindCss, forwardCss, buttonCss, volumeStyle, variant, ...rest }: VideoProps): React.JSX.Element;
 export {};