move variant setting to filterPRops

Author: linddominic

.vscode/settings.json

@@ -21,7 +21,7 @@
     "**/*.js": true
   },
   "editor.codeActionsOnSave": {
-    "source.fixAll.eslint": true
+    "source.fixAll.eslint": "explicit"
   },
   "editor.formatOnSave": true,
   "[typescriptreact]": {

src/hooks/useRestyle.ts

@@ -12,11 +12,13 @@ const filterRestyleProps = <
   componentProps: TProps,
   omitPropertiesMap: {[key in keyof TProps]: boolean},
 ) => {
-  const cleanProps: TProps = {} as TProps;
+  const cleanProps: TProps & {variant?: unknown} = {} as TProps;
   const restyleProps: TProps & {variant?: unknown} = {} as TProps;
   let serializedRestyleProps = '';
+
   if (omitPropertiesMap.variant) {
     restyleProps.variant = componentProps.variant ?? 'defaults';
+    cleanProps.variant = restyleProps.variant;
   }
   for (const key in componentProps) {
     if (omitPropertiesMap[key as keyof TProps]) {
@@ -26,7 +28,6 @@ const filterRestyleProps = <
       cleanProps[key] = componentProps[key];
     }
   }
-
   const keys = {cleanProps, restyleProps, serializedRestyleProps};
   return keys;
 };
@@ -93,9 +94,6 @@ const useRestyle = <
   ]);
 
   cleanProps.style = calculatedStyle;
-  if (restyleProps.variant) {
-    (cleanProps as TProps & {variant?: unknown}).variant = restyleProps.variant;
-  }
   return cleanProps;
 };