Skip to content

Commit

Permalink
feat: added styled-components css overload
Browse files Browse the repository at this point in the history
  • Loading branch information
jlopezcur committed Apr 11, 2023
1 parent b0bbf49 commit 4981975
Show file tree
Hide file tree
Showing 10 changed files with 59 additions and 32 deletions.
25 changes: 11 additions & 14 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
"@types/styled-components": "^5.1.26",
"@typescript-eslint/eslint-plugin": "^5.57.1",
"@typescript-eslint/parser": "^5.57.1",
"babel-plugin-styled-components": "^2.1.1",
"dependency-cruiser": "^12.11.1",
"eslint": "^8.38.0",
"eslint-config-prettier": "^8.8.0",
Expand Down
27 changes: 15 additions & 12 deletions packages/core/src/components/TextareaControl/TextareaControl.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import * as React from 'react';
import { CSSProp } from 'styled-components';

// declarations
import {
Expand Down Expand Up @@ -28,6 +29,8 @@ export interface TextareaControlProps
Omit<StyledTextareaControlProps, '$size'> {
/** The size for the textarea. It affects to its padding, font-size... etc. */
size?: FieldSize;
/** Custom styles */
css?: CSSProp;
}

export const TextareaControl: React.FC<TextareaControlProps> = ({
Expand All @@ -36,16 +39,16 @@ export const TextareaControl: React.FC<TextareaControlProps> = ({
rows = 4,
size = 'md',
status = 'base',
css,
...restNativeProps
}) => {
return (
<StyledTextareaControl
{...restNativeProps}
aria-errormessage={status === 'error' ? ariaErrorMessage : undefined}
aria-invalid={ariaInvalid ?? (status === 'error' ? true : undefined)}
rows={rows}
$size={size}
status={status}
/>
);
};
}) => (
<StyledTextareaControl
{...restNativeProps}
aria-errormessage={status === 'error' ? ariaErrorMessage : undefined}
aria-invalid={ariaInvalid ?? (status === 'error' ? true : undefined)}
rows={rows}
$size={size}
status={status}
css={css}
/>
);
1 change: 1 addition & 0 deletions packages/core/src/styled.d.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import 'styled-components';
import { Brand } from '@devoinc/genesys-brand-devo';
import {} from 'styled-components/cssprop';

declare module 'styled-components' {
// eslint-disable-next-line @typescript-eslint/no-empty-interface
Expand Down
2 changes: 1 addition & 1 deletion packages/core/vite.config.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { resolve } from 'path';
import { mergeConfig } from 'vite';

import viteconf from '../../vite.template.config';
import viteconf from '../../vite.config';

/** @type {import('vite').UserConfig} */
export default mergeConfig(viteconf, {
Expand Down
1 change: 1 addition & 0 deletions packages/datetime/src/styled.d.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import 'styled-components';
import { Brand } from '@devoinc/genesys-brand-devo';
import {} from 'styled-components/cssprop';

declare module 'styled-components' {
// eslint-disable-next-line @typescript-eslint/no-empty-interface
Expand Down
2 changes: 1 addition & 1 deletion packages/datetime/vite.config.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { resolve } from 'path';
import { mergeConfig } from 'vite';

import viteconf from '../../vite.template.config';
import viteconf from '../../vite.config';

/** @type {import('vite').UserConfig} */
export default mergeConfig(viteconf, {
Expand Down
1 change: 1 addition & 0 deletions packages/form/src/styled.d.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import 'styled-components';
import { Brand } from '@devoinc/genesys-brand-devo';
import {} from 'styled-components/cssprop';

declare module 'styled-components' {
// eslint-disable-next-line @typescript-eslint/no-empty-interface
Expand Down
2 changes: 1 addition & 1 deletion packages/form/vite.config.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { resolve } from 'path';
import { mergeConfig } from 'vite';

import viteconf from '../../vite.template.config';
import viteconf from '../../vite.config';

/** @type {import('vite').UserConfig} */
export default mergeConfig(viteconf, {
Expand Down
29 changes: 26 additions & 3 deletions vite.template.config.ts → vite.config.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import { resolve } from 'path';
import { defineConfig } from 'vite';
// Used from @storybook/react-vite dependencies
import react from '@vitejs/plugin-react';

import dts from 'vite-plugin-dts';
import { visualizer } from 'rollup-plugin-visualizer';
Expand All @@ -21,9 +23,30 @@ export default defineConfig({
sourcemap: true,
},
plugins: [
dts(),
visualizer({
filename: 'dist/stats.html',
react({
babel: {
plugins: [
[
'babel-plugin-styled-components',
{
ssr: false,
pure: true,
displayName: true,
fileName: false,
},
],
],
},
}),
{
...dts(),
apply: 'build',
},
{
...visualizer({
filename: 'dist/stats.html',
}),
apply: 'build',
},
],
});

0 comments on commit 4981975

Please sign in to comment.