Skip to content

Update string truncation behavior #125

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
j-f1 wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Update string truncation behavior #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dddecb8
Update demo to use the styles from style.css
j-f1 Oct 9, 2020
46151de
Update string formatting to allow copying the entire string even if i…
j-f1 Oct 9, 2020
47f623e
Make the trucation ellipsis more obvious
j-f1 Oct 9, 2020
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
104 changes: 1 addition & 103 deletions demo.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,38 +1,8 @@
<html>
<link rel="stylesheet" href="https://unpkg.com/[email protected]/css/tachyons.min.css"/>
<script src='https://cdn.jsdelivr.net/npm/[email protected]/dist/immutable.min.js'></script>
<link rel="stylesheet" href="src/style.css"/>
<style>
:root {
--syntax_normal: #1b1e23;
--syntax_comment: #a9b0bc;
--syntax_number: #20a5ba;
--syntax_keyword: #c30771;
--syntax_atom: #10a778;
--syntax_string: #008ec4;
--syntax_error: #ffbedc;
--syntax_unknown_variable: #838383;
--syntax_known_variable: #005f87;
--syntax_matchbracket: #20bbfc;
--syntax_key: #6636b4;
--selection: #d7d4f0;
--mono_fonts: 14px/1.5 Menlo, Consolas, monospace;
}

.observablehq--expanded,
.observablehq--collapsed,
.observablehq--function,
.observablehq--import,
.observablehq--string:before,
.observablehq--string:after,
.observablehq--gray {
color: var(--syntax_normal);
}

.observablehq--collapsed,
.observablehq--inspect a {
cursor: pointer;
}

.observablehq--caret {
margin-right: 4px;
vertical-align: middle;
Expand All @@ -53,69 +23,6 @@
color: #222;
}

.observablehq--field {
text-indent: -1em;
margin-left: 1em;
}

.observablehq--empty {
color: var(--syntax_comment);
}

a[href],
.observablehq--keyword,
.observablehq--blue {
color: #3182bd;
}

.observablehq--forbidden,
.observablehq--pink {
color: #e377c2;
}

.observablehq--orange {
color: #e6550d;
}

.observablehq--null,
.observablehq--undefined,
.observablehq--boolean {
color: var(--syntax_atom);
}

.observablehq--bigint,
.observablehq--number,
.observablehq--date,
.observablehq--regexp,
.observablehq--symbol,
.observablehq--green {
color: var(--syntax_number);
}

.observablehq--index,
.observablehq--key {
color: var(--syntax_key);
}

.observablehq--prototype-key {
color: #aaa;
}

.observablehq--empty {
font-style: oblique;
}

.observablehq--string,
.observablehq--purple {
color: var(--syntax_string);
}

/* Note: Tachyons' dark-red */
.observablehq--error,
.observablehq--red {
color: #e7040f;
}

.observablehq {
position: relative;
margin: 17px -10px;
Expand All @@ -126,22 +33,13 @@
}

.observablehq--inspect {
font: var(--mono_fonts);
overflow-x: auto;
display: block;
padding: 6px 0;
white-space: pre;
}

.observablehq--error {
border-left-color: #e7040f;
}

.observablehq--error .observablehq--inspect {
word-break: break-all;
white-space: pre-wrap;
}

.observablehq--running,
.observablehq--changed {
border-left-color: hsl(217, 13%, 70%);
Expand Down
21 changes: 18 additions & 3 deletions src/formatString.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const NEWLINE_LIMIT = 20;
export default function formatString(string, shallow, expanded, name) {
if (shallow === false) {
// String has fewer escapes displayed with double quotes
if (count(string, /["\n]/g) <= count(string, /`|\${/g)) {
if (count(string, /["\n]/g) <= count(string, /`|\$\{/g)) {
const span = document.createElement("span");
if (name) span.appendChild(inspectName(name));
const textValue = span.appendChild(document.createElement("span"));
Expand Down Expand Up @@ -43,8 +43,23 @@ export default function formatString(string, shallow, expanded, name) {
if (name) span.appendChild(inspectName(name));
const textValue = span.appendChild(document.createElement("span"));
textValue.className = "observablehq--string";
textValue.textContent = JSON.stringify(string.length > 100 ?
`${string.slice(0, 50)}…${string.slice(-49)}` : string);
const encoded = JSON.stringify(string);
if (encoded.length <= 100) {
textValue.textContent = encoded;
} else {
textValue.appendChild(document.createTextNode(encoded.slice(0, 50)));

const truncated = document.createElement("span");
truncated.className = "observablehq--truncated";
truncated.textContent = encoded.slice(50, -49);
textValue.appendChild(truncated);

const ellipsis = document.createElement("span");
ellipsis.className = "observablehq--ellipsis";
textValue.appendChild(ellipsis);

textValue.appendChild(document.createTextNode(encoded.slice(-49)));
}
return span;
}

Expand Down
8 changes: 8 additions & 0 deletions src/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,3 +100,11 @@
word-break: break-all;
white-space: pre-wrap;
}

.observablehq--truncated {
font-size: 0;
}
.observablehq--ellipsis::after {
content: "\2022\2022\2022";
color: var(--syntax_normal);
}