Skip to content

Commit

Permalink
fix(styling): improved and fixed makeStyles
Browse files Browse the repository at this point in the history
improved the mergeStyles function and made changes to the makeStyles accordingly

resolves #20

Signed-off-by: Niloy Sikdar <niloysikdar30@gmail.com>
  • Loading branch information
niloysikdar committed Jun 26, 2022
1 parent 57e3f8a commit 6b9892b
Show file tree
Hide file tree
Showing 7 changed files with 24 additions and 52 deletions.
2 changes: 1 addition & 1 deletion src/components/Email/index.ts
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export * from './Email';
export { Email, EmailProps } from './Email';
1 change: 1 addition & 0 deletions src/components/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from './Email';
2 changes: 1 addition & 1 deletion src/index.ts
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
export * from './components/Email';
export * from './components';
export * from './utils';
3 changes: 2 additions & 1 deletion src/utils/index.ts
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
export * from './stylings';
export { sx } from './stylings';
export { makeStyles } from './makeStyles';
19 changes: 19 additions & 0 deletions src/utils/makeStyles.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import { CSSProperties } from 'react';

interface CSSClasses {
[key: string]: CSSProperties;
}

const mergeStyles = (target: CSSClasses, source: CSSClasses): CSSClasses => {
for (const key in source) {
target[key] = Object.assign({ ...target[key] }, { ...source[key] });
}

return target;
};

export const makeStyles = (classes: CSSClasses) => {
return (classes_?: CSSClasses) => {
return mergeStyles(classes, classes_ as CSSClasses);
};
};
38 changes: 0 additions & 38 deletions src/utils/mergeDeep.ts

This file was deleted.

11 changes: 0 additions & 11 deletions src/utils/stylings.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
import { CSSProperties } from 'react';
import { mergeDeep } from './mergeDeep';

export interface CSSClasses {
[key: string]: CSSProperties;
}

export const sx = (...args: CSSProperties[]): CSSProperties => {
const initialValue: CSSProperties = {};
Expand All @@ -14,9 +9,3 @@ export const sx = (...args: CSSProperties[]): CSSProperties => {

return result;
};

export const makeStyles = (classes: CSSClasses) => {
return (classes_: CSSClasses) => {
return mergeDeep(classes, classes_);
};
};

0 comments on commit 6b9892b

Please sign in to comment.