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.

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

Improve markdown styling #38

Merged
merged 2 commits into from
Jan 22, 2023
Merged

Improve markdown styling #38

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
56a9f62
Code spans in headers should match font size
EddieAbbondanzio Jan 22, 2023
9f11f86
Invalid urls crash editor
EddieAbbondanzio Jan 22, 2023
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
135 changes: 71 additions & 64 deletions packages/marqus-desktop/src/renderer/components/Markdown.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,36 +60,31 @@ export function Markdown(props: MarkdownProps): JSX.Element {
let align: ImageAlign | undefined = undefined;

if (props.src != null) {
let url: URL;
// Assume links with no protocol are http
if (getProtocol(props.src) == null) {
url = new URL(`http://${props.src}`);
} else {
url = new URL(props.src);
}

const originalParams = new URLSearchParams(url.search);
let url = tryGetURL(props.src);
if (url != null) {
const originalParams = new URLSearchParams(url.search);

url.search = "";
url.searchParams.set("noteId", noteId);
url.search = "";
url.searchParams.set("noteId", noteId);

title = url.pathname;
src = url.href;
title = url.pathname;
src = url.href;

if (originalParams.has("height")) {
height = originalParams.get("height")!;
}
if (originalParams.has("width")) {
width = originalParams.get("width")!;
}
if (originalParams.has("height")) {
height = originalParams.get("height")!;
}
if (originalParams.has("width")) {
width = originalParams.get("width")!;
}

if (originalParams.has("align")) {
const rawAlign = originalParams.get("align");
if (
rawAlign != null &&
["left", "right", "center"].includes(rawAlign)
) {
align = rawAlign as ImageAlign;
if (originalParams.has("align")) {
const rawAlign = originalParams.get("align");
if (
rawAlign != null &&
["left", "right", "center"].includes(rawAlign)
) {
align = rawAlign as ImageAlign;
}
}
}
}
Expand All @@ -115,50 +110,46 @@ export function Markdown(props: MarkdownProps): JSX.Element {
let href: string;
let target = "";
let onClick: ((ev: MouseEvent) => void) | undefined;
let url: URL;
// Assume links with no protocol are http
if (getProtocol(props.href) == null) {
url = new URL(`http://${props.href}`);
} else {
url = new URL(props.href);
}

switch (url.protocol) {
case `${Protocol.Attachment}:`:
url.searchParams.set("noteId", noteId);
href = url.href;

onClick = (ev: MouseEvent) => {
ev.preventDefault();
void window.ipc("notes.openAttachmentFile", href);
};
break;

case "note:":
onClick = (ev: MouseEvent) => {
ev.preventDefault();

const decodedHref = decodeURI(url.href);
void store.dispatch("editor.openTab", {
note: decodedHref,
active: decodedHref,
});
};
break;

default:
href = url.href;
target = "_blank";
break;
const url = tryGetURL(props.href);

if (url) {
switch (url.protocol) {
case `${Protocol.Attachment}:`:
url.searchParams.set("noteId", noteId);
href = url.href;

onClick = (ev: MouseEvent) => {
ev.preventDefault();
void window.ipc("notes.openAttachmentFile", href);
};
break;

case "note:":
onClick = (ev: MouseEvent) => {
ev.preventDefault();

const decodedHref = decodeURI(url.href);
void store.dispatch("editor.openTab", {
note: decodedHref,
active: decodedHref,
});
};
break;

default:
href = url.href;
target = "_blank";
break;
}
}

return (
<Link
{...otherProps}
target={target}
href={url.href}
href={url?.href}
onClick={onClick}
title={url.href}
title={url?.href}
>
{children}
</Link>
Expand Down Expand Up @@ -198,6 +189,22 @@ export function Markdown(props: MarkdownProps): JSX.Element {
);
}

function tryGetURL(src: string): URL | null {
try {
let url: URL;
// Assume links with no protocol are http
if (getProtocol(src) == null) {
url = new URL(`http://${src}`);
} else {
url = new URL(src);
}

return url;
} catch (err) {
return null;
}
}

const StyledScrollable = styled(Scrollable)`
overflow-x: hidden !important;

Expand Down Expand Up @@ -312,7 +319,7 @@ const CodeBlock = styled.pre`

const CodeSpan = styled.code`
font-family: monospace;
font-size: 1.6rem;
font-size: max(inherit, 1.6rem);
background-color: ${OpenColor.gray[3]}!important;
border-radius: 2px;
padding: 2px 4px;
Expand Down