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.

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

[IOPLT-154] chore: adds fonts variation for legacy typography components #66

Merged
merged 8 commits into from
Sep 15, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
36 changes: 24 additions & 12 deletions example/src/pages/MainScreen.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ import {
H1,
LabelSmall,
VSpacer,
ListItemNav
ListItemNav,
useIOExperimentalDesign,
ListItemSwitch
} from "@pagopa/io-app-design-system";
import APP_ROUTES from "../navigation/routes";
import { AppParamsList } from "../navigation/params";
Expand Down Expand Up @@ -54,7 +56,7 @@ const DESIGN_SYSTEM_SECTION_DATA = [

const MainScreen = (props: Props) => {
const theme = useIOTheme();

const { isExperimental, setExperimental } = useIOExperimentalDesign();
const renderDSNavItem = ({
item: { title, route }
}: {
Expand Down Expand Up @@ -85,16 +87,26 @@ const MainScreen = (props: Props) => {
const renderDSSectionFooter = () => <VSpacer size={24} />;

return (
<SectionList
keyExtractor={(item, index) => `${item.route}-${index}`}
stickySectionHeadersEnabled={false}
contentContainerStyle={IOStyles.horizontalContentPadding}
renderSectionHeader={renderDSSection}
renderSectionFooter={renderDSSectionFooter}
renderItem={renderDSNavItem}
ItemSeparatorComponent={() => <Divider />}
sections={DESIGN_SYSTEM_SECTION_DATA}
/>
<>
<View style={IOStyles.horizontalContentPadding}>
<ListItemSwitch
label="Abilita Design Sperimentale"
value={isExperimental}
onSwitchValueChange={setExperimental}
/>
<VSpacer size={4} />
</View>
<SectionList
keyExtractor={(item, index) => `${item.route}-${index}`}
stickySectionHeadersEnabled={false}
contentContainerStyle={IOStyles.horizontalContentPadding}
renderSectionHeader={renderDSSection}
renderSectionFooter={renderDSSectionFooter}
renderItem={renderDSNavItem}
ItemSeparatorComponent={() => <Divider />}
sections={DESIGN_SYSTEM_SECTION_DATA}
/>
</>
);
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@ exports[`Test Banner Components Banner Snapshot 1`] = `
<Text
color="blueIO-850"
defaultColor="black"
defaultWeight="Regular"
font="ReadexPro"
defaultWeight="SemiBold"
font="TitilliumWeb"
fontStyle={
{
"fontSize": 16,
Expand All @@ -88,13 +88,13 @@ exports[`Test Banner Components Banner Snapshot 1`] = `
},
{
"color": "#031344",
"fontFamily": "Readex Pro",
"fontFamily": "Titillium Web",
"fontStyle": "normal",
"fontWeight": "400",
"fontWeight": "600",
},
]
}
weight="Regular"
weight="SemiBold"
>
Banner title
</Text>
Expand Down
4 changes: 2 additions & 2 deletions src/components/buttons/ButtonExtendedOutline.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import Animated, {
withSpring
} from "react-native-reanimated";
import { IOIcons, Icon } from "../icons";
import { H4, LabelSmall } from "../typography";
import { H6, LabelSmall } from "../typography";
import { IOScaleValues, IOSpringValues, IOColors, IOStyles } from "../../core";

type Props = {
Expand Down Expand Up @@ -88,7 +88,7 @@ export const ButtonExtendedOutline = ({
>
<Animated.View style={[styles.button, animatedStyle]}>
<View style={IOStyles.flex}>
<H4>{label}</H4>
<H6>{label}</H6>
{description && (
<LabelSmall weight="Regular" color={"bluegreyDark"}>
{description}
Expand Down
1 change: 1 addition & 0 deletions src/components/buttons/ButtonOutline.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -325,6 +325,7 @@ export const ButtonOutline = ({
style={[
buttonStyles.button,
buttonStylesLocal.buttonWithBorder,
buttonStyles.buttonSizeDefault,
iconPosition === "end" && { flexDirection: "row-reverse" },
disabled
? {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,29 +69,29 @@ exports[`Test Buttons Components ButtonExtendedOutline Snapshot 1`] = `
<Text
color="black"
defaultColor="black"
defaultWeight="Regular"
font="ReadexPro"
defaultWeight="SemiBold"
font="TitilliumWeb"
fontStyle={
{
"fontSize": 20,
"lineHeight": 30,
"fontSize": 16,
"lineHeight": 24,
}
}
style={
[
{
"fontSize": 20,
"lineHeight": 30,
"fontSize": 16,
"lineHeight": 24,
},
{
"color": "#0E0F13",
"fontFamily": "Readex Pro",
"fontFamily": "Titillium Web",
"fontStyle": "normal",
"fontWeight": "400",
"fontWeight": "600",
},
]
}
weight="Regular"
weight="SemiBold"
>
label
</Text>
Expand Down Expand Up @@ -311,6 +311,9 @@ exports[`Test Buttons Components ButtonOutline Snapshot 1`] = `
{
"borderWidth": 1,
},
{
"height": 40,
},
false,
{
"backgroundColor": "rgba(0,115,230,0)",
Expand Down Expand Up @@ -428,9 +431,9 @@ exports[`Test Buttons Components ButtonSolid Snapshot 1`] = `
<Text
color="white"
defaultColor="white"
defaultWeight="Regular"
defaultWeight="Bold"
ellipsizeMode="tail"
font="ReadexPro"
font="TitilliumWeb"
fontStyle={
{
"fontSize": 16,
Expand All @@ -447,13 +450,13 @@ exports[`Test Buttons Components ButtonSolid Snapshot 1`] = `
},
{
"color": "#FFFFFF",
"fontFamily": "Readex Pro",
"fontFamily": "Titillium Web",
"fontStyle": "normal",
"fontWeight": "400",
"fontWeight": "700",
},
]
}
weight="Regular"
weight="Bold"
>
label
</Text>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -249,8 +249,8 @@ exports[`Test List Item Components ListItemInfo Snapshot 1`] = `
<Text
color="black"
defaultColor="black"
defaultWeight="Regular"
font="ReadexPro"
defaultWeight="SemiBold"
font="TitilliumWeb"
fontStyle={
{
"fontSize": 16,
Expand All @@ -266,13 +266,13 @@ exports[`Test List Item Components ListItemInfo Snapshot 1`] = `
},
{
"color": "#0E0F13",
"fontFamily": "Readex Pro",
"fontFamily": "Titillium Web",
"fontStyle": "normal",
"fontWeight": "400",
"fontWeight": "600",
},
]
}
weight="Regular"
weight="SemiBold"
>
testValue
</Text>
Expand Down Expand Up @@ -384,8 +384,8 @@ exports[`Test List Item Components ListItemInfoCopy Snapshot 1`] = `
<Text
color="blueIO-500"
defaultColor="black"
defaultWeight="Regular"
font="ReadexPro"
defaultWeight="SemiBold"
font="TitilliumWeb"
fontStyle={
{
"fontSize": 16,
Expand All @@ -401,13 +401,13 @@ exports[`Test List Item Components ListItemInfoCopy Snapshot 1`] = `
},
{
"color": "#0B3EE3",
"fontFamily": "Readex Pro",
"fontFamily": "Titillium Web",
"fontStyle": "normal",
"fontWeight": "400",
"fontWeight": "600",
},
]
}
weight="Regular"
weight="SemiBold"
>
testValue
</Text>
Expand Down Expand Up @@ -555,8 +555,8 @@ exports[`Test List Item Components ListItemNav Snapshot 1`] = `
<Text
color="black"
defaultColor="black"
defaultWeight="Regular"
font="ReadexPro"
defaultWeight="SemiBold"
font="TitilliumWeb"
fontStyle={
{
"fontSize": 16,
Expand All @@ -571,13 +571,13 @@ exports[`Test List Item Components ListItemNav Snapshot 1`] = `
},
{
"color": "#0E0F13",
"fontFamily": "Readex Pro",
"fontFamily": "Titillium Web",
"fontStyle": "normal",
"fontWeight": "400",
"fontWeight": "600",
},
]
}
weight="Regular"
weight="SemiBold"
>
testValue
</Text>
Expand Down Expand Up @@ -787,8 +787,8 @@ exports[`Test List Item Components ListItemNavAlert Snapshot 1`] = `
<Text
color="black"
defaultColor="black"
defaultWeight="Regular"
font="ReadexPro"
defaultWeight="SemiBold"
font="TitilliumWeb"
fontStyle={
{
"fontSize": 16,
Expand All @@ -803,13 +803,13 @@ exports[`Test List Item Components ListItemNavAlert Snapshot 1`] = `
},
{
"color": "#0E0F13",
"fontFamily": "Readex Pro",
"fontFamily": "Titillium Web",
"fontStyle": "normal",
"fontWeight": "400",
"fontWeight": "600",
},
]
}
weight="Regular"
weight="SemiBold"
>
testValue
</Text>
Expand Down
20 changes: 15 additions & 5 deletions src/components/typography/ButtonText.tsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
import { IOColors } from "src/core/IOColors";
import { IOFontFamily, IOFontWeight } from "../../utils/fonts";
import { useIOExperimentalDesign } from "../../core";
import { useTypographyFactory } from "./Factory";
import { ExternalTypographyProps, TypographyProps } from "./common";

export type ButtonTextAllowedColors = Extract<
IOColors,
"white" | "blueIO-500" | "grey-700"
>;
type AllowedWeight = Extract<IOFontWeight, "SemiBold" | "Regular">;
type AllowedWeight = Extract<IOFontWeight, "SemiBold" | "Regular" | "Bold">;

type ButtonTextProps = ExternalTypographyProps<
TypographyProps<AllowedWeight, ButtonTextAllowedColors>
Expand All @@ -20,16 +21,25 @@ const buttonTextDefaultColor: ButtonTextAllowedColors = "white";
const buttonTextFontName: IOFontFamily = "ReadexPro";
const buttonTextDefaultWeight: AllowedWeight = "Regular";

// TODO: Remove this when legacy look is deprecated https://pagopa.atlassian.net/browse/IOPLT-153
const legacyTextFontName: IOFontFamily = "TitilliumWeb";
const legacyTextDefaultWeight: AllowedWeight = "Bold";

/**
* `ButtonText` typographic style
*/
export const ButtonText = (props: ButtonTextProps) =>
useTypographyFactory<AllowedWeight, ButtonTextAllowedColors>({
export const ButtonText = (props: ButtonTextProps) => {
const { isExperimental } = useIOExperimentalDesign();

return useTypographyFactory<AllowedWeight, ButtonTextAllowedColors>({
...props,
defaultWeight: buttonTextDefaultWeight,
defaultWeight: isExperimental
? buttonTextDefaultWeight
: legacyTextDefaultWeight,
defaultColor: buttonTextDefaultColor,
font: buttonTextFontName,
font: isExperimental ? buttonTextFontName : legacyTextFontName,
fontStyle: {
fontSize: buttonTextFontSize
}
});
};
14 changes: 10 additions & 4 deletions src/components/typography/Caption.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { IOTheme } from "../../core/IOColors";
import { IOTheme, useIOExperimentalDesign } from "../../core";
import { FontFamily, IOFontWeight } from "../../utils/fonts";
import { useTypographyFactory } from "./Factory";
import { ExternalTypographyProps, TypographyProps } from "./common";
Expand All @@ -15,17 +15,23 @@ const font: FontFamily = "ReadexPro";
const defaultColor: AllowedColors = "black";
const defaultWeight: AllowedWeight = "Regular";

// TODO: Remove this when legacy look is deprecated https://pagopa.atlassian.net/browse/IOPLT-153
const legacyFont: FontFamily = "TitilliumWeb";

/**
* `Caption` typographic style
*/
export const Caption = (props: CaptionProps) =>
useTypographyFactory<AllowedWeight, AllowedColors>({
export const Caption = (props: CaptionProps) => {
const { isExperimental } = useIOExperimentalDesign();

return useTypographyFactory<AllowedWeight, AllowedColors>({
...props,
defaultWeight,
defaultColor,
font,
font: isExperimental ? font : legacyFont,
fontStyle: {
fontSize: captionFontSize,
textTransform: "uppercase"
}
});
};
Loading