app-studio 0.2.7 → 0.2.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -407,10 +407,7 @@
407
407
  children
408
408
  } = _ref;
409
409
  // Fusion profonde des thèmes par défaut avec ceux fournis
410
- const mergedTheme = deepMerge({
411
- main: defaultThemeMain,
412
- components: {}
413
- }, theme);
410
+ const mergedTheme = deepMerge(defaultThemeMain, theme);
414
411
  // Fusion profonde des couleurs par défaut avec celles fournies
415
412
  const mergedColors = deepMerge({
416
413
  main: defaultColors,
@@ -422,6 +419,9 @@
422
419
  * @param name - Le nom de la couleur à récupérer.
423
420
  * @returns La valeur de couleur résolue ou le nom original si non trouvé.
424
421
  */
422
+ console.log({
423
+ mergedTheme
424
+ });
425
425
  const getColor = name => {
426
426
  if (name === 'transparent') return name;
427
427
  try {
@@ -877,7 +877,7 @@
877
877
  media,
878
878
  ...nestedProps
879
879
  } = value;
880
- const nestedResult = applyStyle(nestedProps, getColor, mediaQueries, devices);
880
+ const nestedResult = computeStyleProps(nestedProps);
881
881
  styleProps[property] = nestedResult.styleProps;
882
882
  keyframesList.push(...(nestedResult.keyframes || []));
883
883
  } else {
@@ -974,7 +974,7 @@
974
974
  if (!styleProps[`&:${event}`]) {
975
975
  styleProps[`&:${event}`] = {};
976
976
  }
977
- const nestedResult = computeStyleProps(value[event], getColor, mediaQueries, devices);
977
+ const nestedResult = computeStyleProps(value[event]);
978
978
  Object.assign(styleProps[`&:${event}`], nestedResult.styleProps);
979
979
  keyframesList.push(...(nestedResult.keyframes || []));
980
980
  }
@@ -986,7 +986,7 @@
986
986
  if (!styleProps[mediaQuery]) {
987
987
  styleProps[mediaQuery] = {};
988
988
  }
989
- const nestedResult = computeStyleProps(mediaValue, getColor, mediaQueries, devices);
989
+ const nestedResult = computeStyleProps(mediaValue);
990
990
  Object.assign(styleProps[mediaQuery], nestedResult.styleProps);
991
991
  keyframesList.push(...(nestedResult.keyframes || []));
992
992
  } else if (devices[screenOrDevices]) {
@@ -997,7 +997,7 @@
997
997
  if (!styleProps[mediaQuery]) {
998
998
  styleProps[mediaQuery] = {};
999
999
  }
1000
- const nestedResult = computeStyleProps(mediaValue, getColor, mediaQueries, devices);
1000
+ const nestedResult = computeStyleProps(mediaValue);
1001
1001
  Object.assign(styleProps[mediaQuery], nestedResult.styleProps);
1002
1002
  keyframesList.push(...(nestedResult.keyframes || []));
1003
1003
  }
@@ -1012,7 +1012,7 @@
1012
1012
  media,
1013
1013
  ...nestedProps
1014
1014
  } = value;
1015
- const nestedResult = computeStyleProps(nestedProps, getColor, mediaQueries, devices);
1015
+ const nestedResult = computeStyleProps(nestedProps);
1016
1016
  styleProps[property] = nestedResult.styleProps;
1017
1017
  keyframesList.push(...(nestedResult.keyframes || []));
1018
1018
  }
@@ -1022,6 +1022,9 @@
1022
1022
  }
1023
1023
  }
1024
1024
  });
1025
+ console.log({
1026
+ styleProps
1027
+ });
1025
1028
  return {
1026
1029
  styleProps,
1027
1030
  keyframes: keyframesList