Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(deps): update dependency @dooboo/eslint-config-react-native to v1.3.0 #458

Merged
merged 2 commits into from
Jul 16, 2023
Merged

chore(deps): update dependency @dooboo/eslint-config-react-native to v1.3.0 #458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3fefe42
chore(deps): update dependency @dooboo/eslint-config-react-native to …
renovate[bot] Jul 16, 2023
d4fa87b
build: update pkgs
hyochan Jul 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions main/modals/Snackbar/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,10 +93,13 @@
setOptions(snackbarOptions);
}

timer = setTimeout(() => {
setVisible(false);
clearTimer();
}, snackbarOptions?.timer ?? SnackbarTimer.SHORT);
timer = setTimeout(
() => {
setVisible(false);
clearTimer();

Check warning on line 99 in main/modals/Snackbar/index.tsx

View check run for this annotation

Codecov / codecov/patch

main/modals/Snackbar/index.tsx#L96-L99 

Added lines #L96 - L99 were not covered by tests
},
snackbarOptions?.timer ?? SnackbarTimer.SHORT,
);
},
close: () => {
setVisible(false);
Expand Down
104 changes: 43 additions & 61 deletions main/uis/Typography/Typography.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,40 +36,30 @@ const StyledHeading = styled.Text<{theme: DoobooTheme}>`

StyledHeading.defaultProps = {style: {includeFontPadding: false}};

export const Heading1 = withTheme(
styled(StyledHeading)`
font-size: 28px;
line-height: 39.2px;
`,
);

export const Heading2 = withTheme(
styled(StyledHeading)`
font-size: 26px;
line-height: 36.4px;
`,
);

export const Heading3 = withTheme(
styled(StyledHeading)`
font-size: 24px;
line-height: 33.6px;
`,
);

export const Heading4 = withTheme(
styled(StyledHeading)`
font-size: 22px;
line-height: 30.8px;
`,
);

export const Heading5 = withTheme(
styled(StyledHeading)`
font-size: 20px;
line-height: 28px;
`,
);
export const Heading1 = withTheme(styled(StyledHeading)`
font-size: 28px;
line-height: 39.2px;
`);

export const Heading2 = withTheme(styled(StyledHeading)`
font-size: 26px;
line-height: 36.4px;
`);

export const Heading3 = withTheme(styled(StyledHeading)`
font-size: 24px;
line-height: 33.6px;
`);

export const Heading4 = withTheme(styled(StyledHeading)`
font-size: 22px;
line-height: 30.8px;
`);

export const Heading5 = withTheme(styled(StyledHeading)`
font-size: 20px;
line-height: 28px;
`);

// Body
const StyledBody = styled.Text<{theme: DoobooTheme}>`
Expand All @@ -85,30 +75,22 @@ const StyledBody = styled.Text<{theme: DoobooTheme}>`

StyledBody.defaultProps = {style: {includeFontPadding: false}};

export const Body1 = withTheme(
styled(StyledBody)`
font-size: 18px;
line-height: 25.2px;
`,
);

export const Body2 = withTheme(
styled(StyledBody)`
font-size: 16px;
line-height: 22.4px;
`,
);

export const Body3 = withTheme(
styled(StyledBody)`
font-size: 14px;
line-height: 19.6px;
`,
);

export const Body4 = withTheme(
styled(StyledBody)`
font-size: 12px;
line-height: 16.4px;
`,
);
export const Body1 = withTheme(styled(StyledBody)`
font-size: 18px;
line-height: 25.2px;
`);

export const Body2 = withTheme(styled(StyledBody)`
font-size: 16px;
line-height: 22.4px;
`);

export const Body3 = withTheme(styled(StyledBody)`
font-size: 14px;
line-height: 19.6px;
`);

export const Body4 = withTheme(styled(StyledBody)`
font-size: 12px;
line-height: 16.4px;
`);
104 changes: 43 additions & 61 deletions main/uis/Typography/TypographyInverted.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,40 +36,30 @@ const InvertedStyledHeading = styled.Text<{theme: DoobooTheme}>`

InvertedStyledHeading.defaultProps = {style: {includeFontPadding: false}};

export const InvertedHeading1 = withTheme(
styled(InvertedStyledHeading)`
font-size: 28px;
line-height: 39.2px;
`,
);

export const InvertedHeading2 = withTheme(
styled(InvertedStyledHeading)`
font-size: 26px;
line-height: 36.4px;
`,
);

export const InvertedHeading3 = withTheme(
styled(InvertedStyledHeading)`
font-size: 24px;
line-height: 33.6px;
`,
);

export const InvertedHeading4 = withTheme(
styled(InvertedStyledHeading)`
font-size: 22px;
line-height: 30.8px;
`,
);

export const InvertedHeading5 = withTheme(
styled(InvertedStyledHeading)`
font-size: 20px;
line-height: 28px;
`,
);
export const InvertedHeading1 = withTheme(styled(InvertedStyledHeading)`
font-size: 28px;
line-height: 39.2px;
`);

export const InvertedHeading2 = withTheme(styled(InvertedStyledHeading)`
font-size: 26px;
line-height: 36.4px;
`);

export const InvertedHeading3 = withTheme(styled(InvertedStyledHeading)`
font-size: 24px;
line-height: 33.6px;
`);

export const InvertedHeading4 = withTheme(styled(InvertedStyledHeading)`
font-size: 22px;
line-height: 30.8px;
`);

export const InvertedHeading5 = withTheme(styled(InvertedStyledHeading)`
font-size: 20px;
line-height: 28px;
`);

// Body
const InvertedStyledBody = styled.Text<{theme: DoobooTheme}>`
Expand All @@ -85,30 +75,22 @@ const InvertedStyledBody = styled.Text<{theme: DoobooTheme}>`

InvertedStyledBody.defaultProps = {style: {includeFontPadding: false}};

export const InvertedBody1 = withTheme(
styled(InvertedStyledBody)`
font-size: 18px;
line-height: 25.2px;
`,
);

export const InvertedBody2 = withTheme(
styled(InvertedStyledBody)`
font-size: 16px;
line-height: 22.4px;
`,
);

export const InvertedBody3 = withTheme(
styled(InvertedStyledBody)`
font-size: 14px;
line-height: 19.6px;
`,
);

export const InvertedBody4 = withTheme(
styled(InvertedStyledBody)`
font-size: 12px;
line-height: 16.4px;
`,
);
export const InvertedBody1 = withTheme(styled(InvertedStyledBody)`
font-size: 18px;
line-height: 25.2px;
`);

export const InvertedBody2 = withTheme(styled(InvertedStyledBody)`
font-size: 16px;
line-height: 22.4px;
`);

export const InvertedBody3 = withTheme(styled(InvertedStyledBody)`
font-size: 14px;
line-height: 19.6px;
`);

export const InvertedBody4 = withTheme(styled(InvertedStyledBody)`
font-size: 12px;
line-height: 16.4px;
`);
5 changes: 3 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
"@babel/preset-react": "^7.18.6",
"@commitlint/cli": "^17.4.2",
"@commitlint/config-conventional": "^17.4.2",
"@dooboo/eslint-config-react-native": "^1.2.0",
"@dooboo/eslint-config-react-native": "^1.3.0",
"@jest/types": "^29.4.1",
"@react-native-community/datetimepicker": "6.7.3",
"@react-native-community/slider": "^4.4.2",
Expand Down Expand Up @@ -100,10 +100,11 @@
"jest-expo": "^49.0.0",
"jest-plugin-context": "^2.9.0",
"lerna": "^7.0.0",
"prettier": "^3.0.0",
"react-test-renderer": "^18.2.0",
"ts-jest": "^29.0.5",
"ts-node": "^10.9.1",
"typescript": "^4.9.4",
"typescript": "^5.1.6",
"webpack-dev-server": "^3.11.3"
},
"workspaces": {
Expand Down
Loading
Loading