Merge pull request #5290 from GeekyAnts/release/3.4.14-rc.0

Release/3.4.14 rc.0
GeekyAnts · Aug 22, 2022 · e142761 · e142761
2 parents 5930fac + cb5cc6b
commit e142761
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 50 deletions.
diff --git a/package.json b/package.json
@@ -36,7 +36,7 @@
       "prettier --write"
     ]
   },
-  "version": "3.4.13-rc.0",
+  "version": "3.4.14-rc.0",
   "license": "MIT",
   "private": false,
   "main": "lib/commonjs/index",

diff --git a/src/hooks/useStyledSystemPropsResolver.ts b/src/hooks/useStyledSystemPropsResolver.ts
@@ -69,7 +69,7 @@ export const useStyledSystemPropsResolver = ({
     console.log('style,resprops', currentBreakpoint);
   }
 
-  restProps.dataSet = dataSet;
+  restProps.dataSet = { ...restProps.dataSet, ...dataSet };
 
   return [style, restProps];
 };
diff --git a/src/hooks/useThemeProps/usePropsResolution.tsx b/src/hooks/useThemeProps/usePropsResolution.tsx
@@ -232,13 +232,9 @@ export const usePropsResolutionWithComponentTheme = (
 
   const resolveComponentTheme = (
     themeType: Array<string>,
-    providedTheme: any,
-    config?: any
+    providedTheme: any
   ): any => {
     try {
-      if (config?.colorScheme) {
-        incomingWithDefaultProps.colorScheme = config.colorScheme;
-      }
       if (themeType[1]) {
         return typeof providedTheme[themeType[0]][themeType[1]] !== 'function'
           ? providedTheme[themeType[0]][themeType[1]]
@@ -290,36 +286,7 @@ export const usePropsResolutionWithComponentTheme = (
     cleanIncomingProps
   );
 
-  //TODO: hack
-  // 2. Flatten incomingDefaultProps
-  let flattenProps: any, specificityMap;
-  [flattenProps, specificityMap] = callPropsFlattener(
-    incomingWithDefaultProps,
-    {},
-    2
-  );
-  const responsiveProps = {};
-  if (disableCSSMediaQueries) {
-    // STEP 1.5: resolving responsive props
-    resolveResponsively.map((propsName) => {
-      if (flattenProps[propsName]) {
-        // @ts-ignore
-        responsiveProps[propsName] = flattenProps[propsName];
-      }
-    });
-  }
-  if (resolveResponsively.includes('direction')) {
-    const propName = 'direction';
-    if (flattenProps[propName]) {
-      // @ts-ignore
-      responsiveProps[propName] = flattenProps[propName];
-    }
-  }
-  const responsivelyResolvedProps: any = useBreakpointResolvedProps(
-    responsiveProps
-  );
-
-  // STEP 2: resolving component theme
+  // STEP 1.5: resolving component theme
   let combinedBaseStyle = {};
   let combinedVariantStyle = {};
   let combinedSizeStyle = {};
@@ -330,52 +297,76 @@ export const usePropsResolutionWithComponentTheme = (
         ...resolveComponentTheme(['baseStyle'], extededComponentTheme),
       };
     }
-    if (responsivelyResolvedProps.variant) {
+    if (incomingWithDefaultProps.variant) {
       if (extededComponentTheme.variants) {
         combinedVariantStyle = {
           ...combinedVariantStyle,
           ...resolveComponentTheme(
-            ['variants', responsivelyResolvedProps.variant],
-            extededComponentTheme,
-            { colorScheme: responsivelyResolvedProps?.colorScheme }
+            ['variants', incomingWithDefaultProps.variant],
+            extededComponentTheme
           ),
         };
       }
     }
     if (
-      responsivelyResolvedProps.size &&
+      incomingWithDefaultProps.size &&
       extededComponentTheme?.sizes &&
-      extededComponentTheme?.sizes[responsivelyResolvedProps.size]
+      extededComponentTheme?.sizes[incomingWithDefaultProps.size]
     ) {
       if (
-        typeof extededComponentTheme.sizes[responsivelyResolvedProps.size] ===
+        typeof extededComponentTheme.sizes[incomingWithDefaultProps.size] ===
           'string' ||
-        typeof extededComponentTheme.sizes[responsivelyResolvedProps.size] ===
+        typeof extededComponentTheme.sizes[incomingWithDefaultProps.size] ===
           'number'
       ) {
-        responsivelyResolvedProps.size =
-          extededComponentTheme.sizes[responsivelyResolvedProps.size];
+        incomingWithDefaultProps.size =
+          extededComponentTheme.sizes[incomingWithDefaultProps.size];
       } else {
         combinedSizeStyle = {
           ...combinedSizeStyle,
           ...resolveComponentTheme(
-            ['sizes', responsivelyResolvedProps.size],
+            ['sizes', incomingWithDefaultProps.size],
             extededComponentTheme
           ),
         };
-        responsivelyResolvedProps.size = undefined;
+        incomingWithDefaultProps.size = undefined;
       }
     }
   });
 
-  // STEP 2.5: flatten them
+  // STEP 2: flatten them
   if (process.env.NODE_ENV === 'development' && cleanIncomingProps.debug) {
     /* eslint-disable-next-line */
     console.log(
       `%cFlattening incoming and Default`,
       'background: #4b5563; color: #FFF; font-weight: 700; padding: 2px 8px;'
     );
   }
+  //TODO: hack
+  let flattenProps: any, specificityMap;
+  [flattenProps, specificityMap] = callPropsFlattener(
+    incomingWithDefaultProps,
+    {},
+    2
+  );
+  const responsiveProps = {};
+  if (disableCSSMediaQueries) {
+    // STEP 2.5: resolving responsive props
+    resolveResponsively.map((propsName) => {
+      if (flattenProps[propsName]) {
+        // @ts-ignore
+        responsiveProps[propsName] = flattenProps[propsName];
+      }
+    });
+  }
+  if (resolveResponsively.includes('direction')) {
+    const propName = 'direction';
+    if (flattenProps[propName]) {
+      // @ts-ignore
+      responsiveProps[propName] = flattenProps[propName];
+    }
+  }
+  const responsivelyResolvedProps = useBreakpointResolvedProps(responsiveProps);
 
   flattenProps = {
     ...flattenProps,