Skip to content

Commit 661349f

Browse files
authored
Merge pull request #1967 from dxc-technology/gomezivann/site-updates
Site updates
2 parents 74dd241 + 09653a9 commit 661349f

File tree

8 files changed

+142
-137
lines changed

8 files changed

+142
-137
lines changed

website/package-lock.json

Lines changed: 127 additions & 126 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

website/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"lint": "next lint"
99
},
1010
"dependencies": {
11-
"@dxc-technology/halstack-react": "12.0.2",
11+
"@dxc-technology/halstack-react": "next",
1212
"@radix-ui/react-popover": "^1.0.7",
1313
"@types/styled-components": "5.1.29",
1414
"cross-env": "^7.0.3",

website/pages/_app.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ const MyApp = ({ Component, pageProps }: AppPropsWithLayout) => {
117117
>
118118
{label}
119119
{status && status !== "stable" && (
120-
<StatusBadge componentStatus status={status} />
120+
<StatusBadge hasTitle status={status} />
121121
)}
122122
</DxcApplicationLayout.SideNav.Link>
123123
</Link>

website/pages/overview/component-lifecycle.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import Head from "next/head";
2-
import ComponentLifecyclePage from "../../screens/principles/component-lifecycle/ComponentLifecyclePage";
2+
import ComponentLifecyclePage from "../../screens/overview/component-lifecycle/ComponentLifecyclePage";
33

44
const ComponentLifecycle = () => {
55
return (
66
<>
77
<Head>
8-
<title>Component Lifecycle — Halstack Design System</title>
8+
<title>Component lifecycle — Halstack Design System</title>
99
</Head>
1010
<ComponentLifecyclePage></ComponentLifecyclePage>
1111
</>

website/screens/common/StatusBadge.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { DxcBadge } from "@dxc-technology/halstack-react";
22
import { ComponentStatus } from "./pagesList";
33

44
type StatusBadgeProps = {
5-
componentStatus?: boolean;
5+
hasTitle?: boolean;
66
status: ComponentStatus | "required";
77
};
88

@@ -40,11 +40,11 @@ const getBadgeTitle = (status: StatusBadgeProps["status"]) => {
4040
}
4141
};
4242

43-
const StatusBadge = ({ componentStatus = false, status }: StatusBadgeProps) => (
43+
const StatusBadge = ({ hasTitle = false, status }: StatusBadgeProps) => (
4444
<DxcBadge
4545
label={status[0].toUpperCase() + status.slice(1)}
4646
color={getBadgeColor(status)}
47-
title={componentStatus ? getBadgeTitle(status) : undefined}
47+
title={hasTitle ? getBadgeTitle(status) : undefined}
4848
size="small"
4949
/>
5050
);

website/screens/components/contextual-menu/code/ContextualMenuCodePage.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ const itemTypeString = `{
1313
icon?: string | SVG;
1414
label: string;
1515
onSelect?: () => void;
16+
selectedByDefault?: boolean;
1617
}`;
1718

1819
const groupItemTypeString = `{
@@ -23,7 +24,7 @@ const groupItemTypeString = `{
2324
}`;
2425

2526
const sectionTypeString = `{
26-
items: (Item | GroupItem)[];
27+
items: (Item | GroupItem)[];
2728
title?: string
2829
}`;
2930

website/screens/components/contextual-menu/usage/ContextualMenuUsagePage.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import {
22
DxcParagraph,
33
DxcFlex,
44
DxcBulletedList,
5-
DxcLink,
65
} from "@dxc-technology/halstack-react";
76
import DocFooter from "@/common/DocFooter";
87
import QuickNavContainer from "@/common/QuickNavContainer";
@@ -45,6 +44,10 @@ const sections = [
4544
Use our Badge component as a complement to the menu items to show
4645
the status of any navigable section.
4746
</DxcBulletedList.Item>
47+
<DxcBulletedList.Item>
48+
We strongly recommend only selecting by default the first option
49+
of the menu. Any other option may become unintuitive for the user.
50+
</DxcBulletedList.Item>
4851
</DxcBulletedList>
4952
),
5053
},

website/screens/principles/component-lifecycle/ComponentLifecyclePage.tsx renamed to website/screens/overview/component-lifecycle/ComponentLifecyclePage.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ const sections = [
2424
even withdrawn to meet ever-evolving standards and user requirements.
2525
</DxcParagraph>
2626
<DxcParagraph>
27-
Each of the stages can be understood as milestones that summarize the
27+
Each of the states can be understood as milestones that summarize the
2828
maturity lifecycle of the components in Halstack and have their
2929
implications or requirements which need to be fulfilled to move from
3030
one to another. This process is non-linear, which means that a
@@ -226,7 +226,7 @@ const ComponentLifecyclePage = () => {
226226
startHeadingLevel={2}
227227
></QuickNavContainer>
228228
</QuickNavContainerLayout>
229-
<DocFooter githubLink="https://github.com/dxc-technology/halstack-react/blob/master/website/screens/principles/component-lifecycle/ComponentLifecyclePage.tsx" />
229+
<DocFooter githubLink="https://github.com/dxc-technology/halstack-react/blob/master/website/screens/overview/component-lifecycle/ComponentLifecyclePage.tsx" />
230230
</DxcFlex>
231231
);
232232
};

0 commit comments

Comments
 (0)