app-studio 0.2.7 → 0.2.10

package/dist/appstudio.cjs.development.js

@@ -408,10 +408,7 @@ const ThemeProvider = _ref => {
     children
   } = _ref;
   // Fusion profonde des thèmes par défaut avec ceux fournis
-  const mergedTheme = deepMerge({
-    main: defaultThemeMain,
-    components: {}
-  }, theme);
+  const mergedTheme = deepMerge(defaultThemeMain, theme);
   // Fusion profonde des couleurs par défaut avec celles fournies
   const mergedColors = deepMerge({
     main: defaultColors,
@@ -423,6 +420,9 @@ const ThemeProvider = _ref => {
    * @param name - Le nom de la couleur à récupérer.
    * @returns La valeur de couleur résolue ou le nom original si non trouvé.
    */
+  console.log({
+    mergedTheme
+  });
   const getColor = name => {
     if (name === 'transparent') return name;
     try {
@@ -810,7 +810,7 @@ const generateCssRules = (selector, styles, getColor, mediaQueries) => {
   return rules;
 };
 // Function to apply styles to a component
-const computeStyleProps = (props, getColor, mediaQueries, devices) => {
+const computeStyleProps = props => {
   const styleProps = {};
   const keyframesList = [];
   // Gestion de la taille de l'élément
@@ -869,22 +869,8 @@ const computeStyleProps = (props, getColor, mediaQueries, devices) => {
   }
   Object.keys(props).forEach(property => {
     if (property !== 'style' && (isStyleProp(property) || extraKeys.has(property))) {
-      const value = props[property];
-      if (typeof value === 'object' && value !== null) {
-        // For other nested styles, exclude 'on' and 'media'
-        // eslint-disable-next-line @typescript-eslint/no-unused-vars
-        const {
-          on,
-          media,
-          ...nestedProps
-        } = value;
-        const nestedResult = applyStyle(nestedProps, getColor, mediaQueries, devices);
-        styleProps[property] = nestedResult.styleProps;
-        keyframesList.push(...(nestedResult.keyframes || []));
-      } else {
-        // Simple style property
-        styleProps[property] = value;
-      }
+      // Simple style property
+      styleProps[property] = props[property];
     }
   });
   return {
@@ -893,7 +879,7 @@ const computeStyleProps = (props, getColor, mediaQueries, devices) => {
   };
 };
 // Function to apply styles to a component
-const applyStyle = function (props, getColor, mediaQueries, devices, depth,
+const applyStyle = function (props, mediaQueries, devices, depth,
 // Add a depth parameter
 maxDepth // Set a maximum depth
 ) {
@@ -975,7 +961,7 @@ maxDepth // Set a maximum depth
             if (!styleProps[`&:${event}`]) {
               styleProps[`&:${event}`] = {};
             }
-            const nestedResult = computeStyleProps(value[event], getColor, mediaQueries, devices);
+            const nestedResult = computeStyleProps(value[event]);
             Object.assign(styleProps[`&:${event}`], nestedResult.styleProps);
             keyframesList.push(...(nestedResult.keyframes || []));
           }
@@ -987,7 +973,7 @@ maxDepth // Set a maximum depth
               if (!styleProps[mediaQuery]) {
                 styleProps[mediaQuery] = {};
               }
-              const nestedResult = computeStyleProps(mediaValue, getColor, mediaQueries, devices);
+              const nestedResult = computeStyleProps(mediaValue);
               Object.assign(styleProps[mediaQuery], nestedResult.styleProps);
               keyframesList.push(...(nestedResult.keyframes || []));
             } else if (devices[screenOrDevices]) {
@@ -998,7 +984,7 @@ maxDepth // Set a maximum depth
                   if (!styleProps[mediaQuery]) {
                     styleProps[mediaQuery] = {};
                   }
-                  const nestedResult = computeStyleProps(mediaValue, getColor, mediaQueries, devices);
+                  const nestedResult = computeStyleProps(mediaValue);
                   Object.assign(styleProps[mediaQuery], nestedResult.styleProps);
                   keyframesList.push(...(nestedResult.keyframes || []));
                 }
@@ -1013,7 +999,7 @@ maxDepth // Set a maximum depth
             media,
             ...nestedProps
           } = value;
-          const nestedResult = computeStyleProps(nestedProps, getColor, mediaQueries, devices);
+          const nestedResult = computeStyleProps(nestedProps);
           styleProps[property] = nestedResult.styleProps;
           keyframesList.push(...(nestedResult.keyframes || []));
         }
@@ -1032,7 +1018,7 @@ const getStyledProps = (props, getColor, mediaQueries, devices) => {
   const {
     styleProps,
     keyframes
-  } = applyStyle(props, getColor, mediaQueries, devices);
+  } = applyStyle(props, mediaQueries, devices);
   const className = generateClassName(styleProps);
   let cssRules = [];
   if (cssRulesCache.has(className)) {