Skip to content

fix: Align code to the top when line wrapping is activated #101

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

Open
jperals wants to merge 1 commit into
base: main
Choose a base branch
from
+19 −11
Open

fix: Align code to the top when line wrapping is activated #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 9 additions & 6 deletions pages/code-view/with-line-wrapping.page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0

import { Box, SpaceBetween } from "@cloudscape-design/components";
import { Box, Button, SpaceBetween } from "@cloudscape-design/components";

import { CodeView } from "../../lib/components";
import cppHighlight from "../../lib/components/code-view/highlight/cpp";
import { ScreenshotArea } from "../screenshot-area";

const longLine = `LoremipsumdolorsitametconsecteturadipiscingelitCurabitursagittismetusidornarebibendumLoremipsumdolorsitametconsecteturadipiscingelitCurabitursagittismetusidornarebibendumLoremipsumdolorsitametconsecteturadipiscingelitCurabitursagittismetusidornarebibendumLoremipsumdolorsitametconsecteturadipiscingelitCurabitursagittismetusidornarebibendumLoremipsumdolorsitametconsecteturadipiscingelitCurabitursagittismetusidornarebibendumLoremipsumdolorsitametconsecteturadipiscingelitCurabitursagittismetusidornarebibendumLoremipsumdolorsitametconsecteturadipiscingelitCurabitursagittismetusidornarebibendumLoremipsumdolorsitametconsecteturadipiscingelitCurabitursagittismetusidornarebibendum`;
const copyButton = <Button ariaLabel="Copy code" iconName="copy"></Button>;

export default function CodeViewPage() {
return (
<ScreenshotArea>
Expand Down Expand Up @@ -40,11 +43,11 @@ export default function CodeViewPage() {
content={`void UserQuery(map<string, vector<string> > &svmap) {\n string queryName;\n cout << "Please enter a family name you want to query: ";\n cin >> queryName;\n int i = 0;\n for (map<string, vector<string> >::iterator itr = svmap.begin(), mapEnd = svmap.end(); itr != mapEnd; ++itr) {\n i++;\n if (itr->first == queryName) {\n cout << "The " << itr->first << " family has " << itr->second.size() << " children: ";\n for (vector<string>::iterator itrvec = itr->second.begin(), vecEnd = itr->second.end(); itrvec != vecEnd; ++itrvec)\n cout << *itrvec << " ";\n break;\n }\n }\n if (i >= svmap.size())\n cout << "Sorry, the " << queryName << " family is not found." << endl;\n}`}
/>
<Box>Long word</Box>
<CodeView
wrapLines={true}
lineNumbers={true}
content={`LoremipsumdolorsitametconsecteturadipiscingelitCurabitursagittismetusidornarebibendumLoremipsumdolorsitametconsecteturadipiscingelitCurabitursagittismetusidornarebibendumLoremipsumdolorsitametconsecteturadipiscingelitCurabitursagittismetusidornarebibendumLoremipsumdolorsitametconsecteturadipiscingelitCurabitursagittismetusidornarebibendumLoremipsumdolorsitametconsecteturadipiscingelitCurabitursagittismetusidornarebibendumLoremipsumdolorsitametconsecteturadipiscingelitCurabitursagittismetusidornarebibendumLoremipsumdolorsitametconsecteturadipiscingelitCurabitursagittismetusidornarebibendumLoremipsumdolorsitametconsecteturadipiscingelitCurabitursagittismetusidornarebibendum`}
/>
<CodeView wrapLines={true} lineNumbers={true} content={longLine} />
<Box>Wrapping, line numbers, actions, short line</Box>
<CodeView lineNumbers={true} wrapLines={true} content={`# Hello World`} actions={copyButton} />
<Box>Wrapping, line numbers, actions, long line</Box>
<CodeView lineNumbers={true} wrapLines={true} content={longLine} actions={copyButton} />
</SpaceBetween>
</ScreenshotArea>
);
Expand Down
15 changes: 10 additions & 5 deletions src/code-view/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,18 +39,13 @@ $color-background-code-view-dark: #282c34;
}
}

.code-table-with-actions.code-table-with-line-wrapping {
padding-inline-end: cs.$space-static-xxl;
}

.screenreader-only {
position: absolute;
inset-block-start: -9999px;
inset-inline-start: -9999px;
}

.line-number {
vertical-align: text-top;
white-space: nowrap;
position: sticky;
inset-inline-start: 0;
Expand Down Expand Up @@ -84,6 +79,16 @@ $color-background-code-view-dark: #282c34;
}
}

.code-table-with-line-wrapping {
.line-number,
.code-line {
vertical-align: text-top;
}
&.code-table-with-actions {
padding-inline-end: cs.$space-static-xxl;
}
}

.actions {
position: absolute;
inset-block-start: cs.$space-scaled-xs;
Expand Down
Loading