feat(plasma-new-hope): Add wrapper for layout with default props

salute-developers · Sep 25, 2023 · c9d4247 · c9d4247
1 parent 42e38cc
commit c9d4247
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/packages/plasma-new-hope/scripts/replace-linaria_sc.sh b/packages/plasma-new-hope/scripts/replace-linaria_sc.sh
@@ -10,5 +10,5 @@ perl -p -i -e "s/import { css } from '\@linaria\/core'/import { css } from 'styl
 
 rm -rf src-sc/engines/linaria.tsx
 perl -p -i -e "s/import { css as cssLibrary } from '\@linaria\/core'/import { css as cssLibrary } from 'styled-components'/g" src-sc/engines/index.ts 
-perl -p -i -e "s/linaria/styled-components/g" src-sc/engines/index.ts src-sc/engines/common.ts
+perl -p -i -e "s/linaria/styled-components/g" src-sc/engines/index.ts src-sc/engines/common.tsx
 
diff --git a/...ges/plasma-new-hope/src/engines/common.ts → ...es/plasma-new-hope/src/engines/common.tsx b/...ges/plasma-new-hope/src/engines/common.ts → ...es/plasma-new-hope/src/engines/common.tsx
@@ -92,5 +92,9 @@ export function component<
 >(
     config: ComponentConfig<Tag, VariantList, VariantsProps, LayoutProps>,
 ): React.FunctionComponent<VariantsProps & LayoutProps> {
-    return config.layout(_component((config as unknown) as ComponentConfig));
+    const Comp = config.layout(_component((config as unknown) as ComponentConfig));
+
+    return React.forwardRef<VariantsProps & LayoutProps, any>((props, ref) => (
+        <Comp {...config?.defaults} {...props} ref={ref} />
+    ));
 }
diff --git a/packages/plasma-new-hope/src/engines/linaria.tsx b/packages/plasma-new-hope/src/engines/linaria.tsx
@@ -6,14 +6,14 @@ import type { ComponentConfig, HTMLAnyAttributes } from './types';
 
 /* eslint-disable no-underscore-dangle */
 export const _component = (componentConfig: ComponentConfig) => {
-    const { tag, base, defaults, name } = componentConfig;
+    const { tag, base, name } = componentConfig;
     const staticVariants = getStaticVariants(componentConfig);
     const dynamicVariants = getDynamicVariants(componentConfig);
     const Root = tag as React.ElementType;
 
     const component = forwardRef<HTMLElement, HTMLAnyAttributes>((props, ref) => {
         const { className, ...rest } = props;
-        const variants = dynamicVariants({ ...defaults, ...rest });
+        const variants = dynamicVariants(rest);
         const cls = cx(className, base, ...staticVariants, ...variants);
 
         // styled-components do it inside

diff --git a/packages/plasma-new-hope/src/engines/styled-components.tsx b/packages/plasma-new-hope/src/engines/styled-components.tsx
@@ -8,7 +8,7 @@ export { styled, css };
 
 /* eslint-disable no-underscore-dangle */
 export const _component = (componentConfig: ComponentConfig) => {
-    const { tag, base, defaults } = componentConfig;
+    const { tag, base } = componentConfig;
     const staticVariants = getStaticVariants(componentConfig);
     const dynamicVariants = getDynamicVariants(componentConfig);
 
@@ -18,5 +18,5 @@ export const _component = (componentConfig: ComponentConfig) => {
         ${dynamicVariants}
     `;
 
-    return forwardRef<HTMLElement, HTMLAnyAttributes>((props, ref) => <Root {...defaults} {...props} ref={ref} />);
+    return forwardRef<HTMLElement, HTMLAnyAttributes>((props, ref) => <Root {...props} ref={ref} />);
 };