Skip to content

[Patch] Fix #399 Sidenav specs update #415

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

Merged
merged 2 commits into from
Nov 8, 2021
Merged

[Patch] Fix #399 Sidenav specs update #415

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
4291e62
[Minor] Select component update
Oct 25, 2021
d1e7ca2
[Patch] Fix #399 Sidenav component specs update
Oct 28, 2021
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
29 changes: 14 additions & 15 deletions docs/src/pages/components/cdk-components/sidenav/examples/compound.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,21 @@ import { DxcSidenav } from "@dxc-technology/halstack-react";
import { useState } from "react";

const code = `() => {
const linkClick = () => {
console.log("click");
};
const linkClick = () => {
console.log("click");
};

return (
<DxcSidenav>
<DxcSidenav.Title>My sidenav</DxcSidenav.Title>
<p>This is a sidenav.</p>
<DxcSidenav.Subtitle>Components</DxcSidenav.Subtitle>
<DxcSidenav.Link href="#">Button</DxcSidenav.Link>
<DxcSidenav.Link href="#">Date</DxcSidenav.Link>
<DxcSidenav.Subtitle>Guidelines</DxcSidenav.Subtitle>
<DxcSidenav.Link onClick={linkClick}>Layout</DxcSidenav.Link>
<DxcSidenav.Link onClick={linkClick}>Footer</DxcSidenav.Link>
</DxcSidenav>
);
return (
<DxcSidenav padding="large">
<DxcSidenav.Title>My sidenav</DxcSidenav.Title>
<DxcSidenav.Subtitle>Components</DxcSidenav.Subtitle>
<DxcSidenav.Link href="#">Button</DxcSidenav.Link>
<DxcSidenav.Link href="#">Date</DxcSidenav.Link>
<DxcSidenav.Subtitle>Guidelines</DxcSidenav.Subtitle>
<DxcSidenav.Link onClick={linkClick}>Layout</DxcSidenav.Link>
<DxcSidenav.Link onClick={linkClick}>Footer</DxcSidenav.Link>
</DxcSidenav>
);
}`;

const scope = {
Expand Down
31 changes: 18 additions & 13 deletions docs/src/pages/themeBuilder/themes/AdvancedTheme.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -643,8 +643,8 @@
"disabledColorOnDark": "#575757",
"errorColor": "#D0011B",
"errorColorOnDark": "#FE344F",
"focusColor": "#005FCC",
"focusColorOnDark": "#1682FF",
"focusColor": "#0095ff",
"focusColorOnDark": "#0095ff",
"labelFontColor": "#000000",
"labelFontColorOnDark": "#ffffff",
"labelFontSize": "1rem",
Expand Down Expand Up @@ -689,39 +689,44 @@
"valueFontSize": "1rem",
"valueFontStyle": "normal",
"valueFontWeight": "400",
"valueIconColor": "#000000",
"valueIconColorOnDark": "#ffffff",
"valueIconSize": "20px",
"valueIconSpacing": "12px",
"arrowColor": "#000000",
"arrowColorOnDark": "#ffffff"
},
"sidenav": {
"backgroundColor": "#F8F8F8",
"arrowContainerColor": "#D9D9D9",
"backgroundColor": "#f2f2f2",
"arrowContainerColor": "#e6e6e6",
"arrowColor": "#000000",
"titleFontFamily": "Open Sans, sans-serif",
"titleFontSize": "1.5rem",
"titleFontStyle": "normal",
"titleFontWeight": "400",
"titleFontColor": "#000000de",
"titleFontColor": "#000000",
"titleFontTextTransform": "none",
"titleFontLetterSpacing": "0",
"subtitleFontFamily": "Open Sans, sans-serif",
"subtitleFontSize": "0.75rem",
"subtitleFontSize": "1rem",
"subtitleFontStyle": "normal",
"subtitleFontWeight": "400",
"subtitleFontColor": "#00000099",
"subtitleFontColor": "#4d4d4d",
"subtitleFontTextTransform": "uppercase",
"subtitleFontLetterSpacing": "0.1em",
"subtitleFontLetterSpacing": "0.05em",
"linkFontFamily": "Open Sans, sans-serif",
"linkFontSize": "0.875rem",
"linkFontStyle": "normal",
"linkFontWeight": "400",
"linkFontColor": "#00000099",
"linkFontColor": "#4d4d4d",
"linkFontTextTransform": "none",
"linkFontLetterSpacing": "0.025em",
"linkTextDecoration": "none",
"linkMarginTop": "6px",
"linkMarginRight": "18px",
"linkMarginBottom": "6px",
"linkMarginLeft": "18px",
"linkMarginTop": "4px",
"linkMarginBottom": "4px",
"linkMarginRight": "16px",
"linkMarginLeft": "16px",
"linkFocusColor": "#0095ff",
"scrollBarThumbColor": "#66666626",
"scrollBarTrackColor": "transparent"
},
Expand Down
5 changes: 5 additions & 0 deletions docs/src/pages/themeBuilder/themes/schemas/Advanced.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -687,6 +687,10 @@
"valueFontSize": "length",
"valueFontStyle": "fStyle",
"valueFontWeight": "fWeight",
"valueIconColor": "color",
"valueIconColorOnDark": "color",
"valueIconSize": "length",
"valueIconSpacing": "length",
"arrowColor": "color",
"arrowColorOnDark": "color",
"activeOptionBackgroundColor": "color",
Expand Down Expand Up @@ -722,6 +726,7 @@
"linkMarginRight": "length",
"linkMarginBottom": "length",
"linkMarginLeft": "length",
"linkFocusColor": "color",
"scrollBarThumbColor": "color",
"scrollBarTrackColor": "color"
},
Expand Down
81 changes: 43 additions & 38 deletions lib/src/common/variables.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -583,7 +583,7 @@ export const componentTokens = {
disabledColor: globalTokens.lighterBlack,
disabledColorOnDark: "#575757",
errorColor: globalTokens.red,
errorColorOnDark: "#FE344F",
errorColorOnDark: globalTokens.hal_red_l_60,
optionBackgroundColor: globalTokens.white,
optionBorderColor: globalTokens.black,
optionBorderThickness: "0px",
Expand Down Expand Up @@ -804,89 +804,94 @@ export const componentTokens = {
},
select: {
fontFamily: globalTokens.type_sans,
assistiveTextFontColor: globalTokens.black,
assistiveTextFontColorOnDark: globalTokens.white,
assistiveTextFontColor: globalTokens.hal_black,
assistiveTextFontColorOnDark: globalTokens.hal_white,
assistiveTextFontSize: globalTokens.type_scale_01,
assistiveTextFontStyle: globalTokens.type_normal,
assistiveTextFontWeight: globalTokens.type_regular,
labelFontColor: globalTokens.black,
labelFontColorOnDark: globalTokens.white,
labelFontColor: globalTokens.hal_black,
labelFontColorOnDark: globalTokens.hal_white,
labelFontSize: globalTokens.type_scale_03,
labelFontStyle: globalTokens.type_normal,
labelFontWeight: globalTokens.type_regular,
disabledColor: globalTokens.lighterBlack,
disabledColorOnDark: "#575757",
errorColor: globalTokens.red,
errorColorOnDark: "#FE344F",
optionBackgroundColor: globalTokens.white,
optionBorderColor: globalTokens.black,
errorColorOnDark: globalTokens.hal_red_l_60,
optionBackgroundColor: globalTokens.hal_white,
optionBorderColor: globalTokens.hal_black,
optionBorderThickness: "0px",
optionBorderStyle: "solid",
optionFontColor: globalTokens.black,
optionFontColorOnDark: globalTokens.white,
optionFontColor: globalTokens.hal_black,
optionFontColorOnDark: globalTokens.hal_white,
optionFontSize: globalTokens.type_scale_root,
optionFontStyle: globalTokens.type_normal,
optionFontWeight: globalTokens.type_regular,
optionPaddingBottom: "6px",
optionPaddingTop: "6px",
scrollBarThumbColor: globalTokens.darkGrey,
scrollBarThumbColor: globalTokens.hal_grey_s_40,
scrollBarTrackColor: globalTokens.lightGrey,
optionIconColor: globalTokens.black,
optionIconColorOnDark: globalTokens.white,
optionIconColor: globalTokens.hal_black,
optionIconColorOnDark: globalTokens.hal_white,
optionIconSpacing: "12px",
optionIconSize: "20px",
optionCheckboxSpacing: "12px",
hoverOptionBackgroundColor: globalTokens.lightWhite,
hoverOptionBackgroundColorOnDark: globalTokens.mediumGrey,
hoverOptionBackgroundColor: globalTokens.hal_grey_l_95,
hoverOptionBackgroundColorOnDark: globalTokens.hal_grey_l_75,
activeOptionBackgroundColor: globalTokens.hal_grey_l_80,
activeOptionBackgroundColorOnDark: globalTokens.hal_grey_l_80,
selectedOptionBackgroundColor: globalTokens.lightGrey,
selectedOptionBackgroundColorOnDark: globalTokens.lightGrey,
underlineColor: globalTokens.black,
underlineColorOnDark: globalTokens.white,
underlineFocusColor: globalTokens.black,
underlineFocusColorOnDark: globalTokens.white,
underlineColor: globalTokens.hal_black,
underlineColorOnDark: globalTokens.hal_white,
underlineFocusColor: globalTokens.hal_black,
underlineFocusColorOnDark: globalTokens.hal_white,
underlineThickness: "1px",
valueFontColor: globalTokens.black,
valueFontColorOnDark: globalTokens.white,
valueFontColor: globalTokens.hal_black,
valueFontColorOnDark: globalTokens.hal_white,
valueFontSize: globalTokens.type_scale_03,
valueFontStyle: globalTokens.type_normal,
valueFontWeight: globalTokens.type_regular,
arrowColor: globalTokens.black,
arrowColorOnDark: globalTokens.white,
focusColor: globalTokens.blue,
focusColorOnDark: "#1682FF",
valueIconColor: globalTokens.hal_black,
valueIconColorOnDark: globalTokens.hal_white,
valueIconSize: "20px",
valueIconSpacing: "12px",
arrowColor: globalTokens.hal_black,
arrowColorOnDark: globalTokens.hal_white,
focusColor: globalTokens.hal_blue_l_50,
focusColorOnDark: globalTokens.hal_blue_l_50,
},
sidenav: {
backgroundColor: globalTokens.lighterGrey,
arrowContainerColor: globalTokens.lightGrey,
arrowColor: globalTokens.black,
backgroundColor: globalTokens.hal_grey_l_95,
arrowContainerColor: globalTokens.hal_grey_l_90,
arrowColor: globalTokens.hal_black,
titleFontFamily: globalTokens.type_sans,
titleFontSize: globalTokens.type_scale_05,
titleFontStyle: globalTokens.type_normal,
titleFontWeight: globalTokens.type_regular,
titleFontColor: "#000000de",
titleFontColor: globalTokens.hal_black,
titleFontTextTransform: "none",
titleFontLetterSpacing: globalTokens.type_spacing_normal,
subtitleFontFamily: globalTokens.type_sans,
subtitleFontSize: globalTokens.type_scale_01,
subtitleFontSize: globalTokens.type_scale_03,
subtitleFontStyle: globalTokens.type_normal,
subtitleFontWeight: globalTokens.type_regular,
subtitleFontColor: "#00000099",
subtitleFontColor: globalTokens.color_grey_800,
subtitleFontTextTransform: globalTokens.type_uppercase,
subtitleFontLetterSpacing: globalTokens.type_spacing_wide_03,
subtitleFontLetterSpacing: globalTokens.type_spacing_wide_02,
linkFontFamily: globalTokens.type_sans,
linkFontSize: globalTokens.type_scale_02,
linkFontStyle: globalTokens.type_normal,
linkFontWeight: globalTokens.type_regular,
linkFontColor: "#00000099",
linkFontColor: globalTokens.color_grey_800,
linkFontTextTransform: "none",
linkFontLetterSpacing: globalTokens.type_spacing_wide_01,
linkTextDecoration: globalTokens.type_no_line,
linkMarginTop: "6px",
linkMarginRight: "18px",
linkMarginBottom: "6px",
linkMarginLeft: "18px",
linkMarginTop: "4px",
linkMarginBottom: "4px",
linkMarginRight: "16px",
linkMarginLeft: "16px",
linkFocusColor: globalTokens.hal_blue_l_50,
scrollBarThumbColor: "#66666626",
scrollBarTrackColor: globalTokens.transparent,
},
Expand Down Expand Up @@ -1103,7 +1108,7 @@ export const componentTokens = {
disabledColor: globalTokens.lighterBlack,
disabledColorOnDark: "#575757",
errorColor: globalTokens.red,
errorColorOnDark: "#FE344F",
errorColorOnDark: globalTokens.hal_red_l_60,
scrollBarThumbColor: globalTokens.darkGrey,
scrollBarThumbColorOnDark: globalTokens.white,
scrollBarTrackColor: globalTokens.lightGrey,
Expand Down
68 changes: 34 additions & 34 deletions lib/src/layout/ApplicationLayout.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,39 +137,39 @@ const DxcApplicationLayout = ({ children }) => {

return (
<ThemeProvider theme={colorsTheme.sidenav}>
<ApplicationLayoutContainer ref={ref}>
<HeaderContainer>{header}</HeaderContainer>
<BodyContainer>
<ContentContainer>
<SideNavArrowContainer isSideNavVisible={isSideNavVisible}>
{sideNav}
<ArrowContainer>
{sideNav && (displayArrow || isResponsive) && (
<ArrowTrigger tabIndex={0} onClick={handleSidenav} isSideNavVisible={isSideNavVisible}>
<ArrowIcon />
</ArrowTrigger>
)}
</ArrowContainer>
</SideNavArrowContainer>
<MainBodyContainer>
<MainContent
sideNav={sideNav}
mode={isResponsive ? "overlay" : sideNavMode}
isSideNavVisible={isSideNavVisible}
>
{main}
</MainContent>
<FooterContainer
sideNav={sideNav}
mode={isResponsive ? "overlay" : sideNavMode}
isSideNavVisible={isSideNavVisible}
>
{footer}
</FooterContainer>
</MainBodyContainer>
</ContentContainer>
</BodyContainer>
</ApplicationLayoutContainer>
<ApplicationLayoutContainer ref={ref}>
<HeaderContainer>{header}</HeaderContainer>
<BodyContainer>
<ContentContainer>
<SideNavArrowContainer isSideNavVisible={isSideNavVisible}>
{sideNav}
<ArrowContainer>
{sideNav && (displayArrow || isResponsive) && (
<ArrowTrigger tabIndex={0} onClick={handleSidenav} isSideNavVisible={isSideNavVisible}>
<ArrowIcon />
</ArrowTrigger>
)}
</ArrowContainer>
</SideNavArrowContainer>
<MainBodyContainer>
<MainContent
sideNav={sideNav}
mode={isResponsive ? "overlay" : sideNavMode}
isSideNavVisible={isSideNavVisible}
>
{main}
</MainContent>
<FooterContainer
sideNav={sideNav}
mode={isResponsive ? "overlay" : sideNavMode}
isSideNavVisible={isSideNavVisible}
>
{footer}
</FooterContainer>
</MainBodyContainer>
</ContentContainer>
</BodyContainer>
</ApplicationLayoutContainer>
</ThemeProvider>
);
};
Expand All @@ -186,7 +186,7 @@ const ApplicationLayoutContainer = styled.div`
top: 64px;
bottom: 0;
left: 0;
right:0;
right: 0;
`;

const HeaderContainer = styled.div`
Expand Down
7 changes: 3 additions & 4 deletions lib/src/link/Link.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,16 +161,15 @@ const LinkText = styled.div`
const LinkIcon = styled.img`
width: ${(props) => props.theme.iconSize};
height: ${(props) => props.theme.iconSize};
${(props) => (props.iconPosition === "before" ? "margin-right" : "margin-left")}: ${(props) =>
props.theme.iconSpacing};
${(props) => `${(props.iconPosition === "before" ? "margin-right" : "margin-left")}: ${props.theme.iconSpacing}`};
`;

const LinkIconContainer = styled.div`
width: ${(props) => props.theme.iconSize};
height: ${(props) => props.theme.iconSize};
${(props) => (props.iconPosition === "before" ? "margin-right" : "margin-left")}: ${(props) =>
props.theme.iconSpacing};
${(props) => `${(props.iconPosition === "before" ? "margin-right" : "margin-left")}: ${props.theme.iconSpacing}`};
overflow: hidden;

img,
svg {
height: 100%;
Expand Down
Loading