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.

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

fix: relative paths in image src #15

Merged
merged 1 commit into from
Jan 4, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
105 changes: 88 additions & 17 deletions samples/tothom.md
Original file line number Diff line number Diff line change
@@ -1,27 +1,39 @@
# Tothom

- [Hello World!](#hello-world)
- [Interpolation](#interpolation)
- [Multiline](#multiline)
- [Code blocks](#code-blocks)
- [Executable](#executable)
- [Interpolation](#interpolation)
- [Multiline](#multiline)
- [Non-executable](#non-executable)
- [Compatibility](#compatibility)
- [Unordered Lists](#unordered-lists)
- [Ordered Lists](#ordered-lists)
- [Task lists](#task-lists)
- [Formatting](#formatting)
- [Lists](#lists)
- [Ordered lists](#ordered-lists)
- [Bullet lists](#bullet-lists)
- [Nested lists](#nested-lists)
- [Task lists](#task-lists)
- [Links](#links)
- [Tables](#tables)
- [Images](#images)
- [Other](#other)
- [Blockquote](#blockquote)
- [Horizontal line](#horizontal-line)

## Hello World!
## Code blocks

### Executable

```sh
echo 'Hello World!'
```

## Interpolation
### Interpolation

```sh
echo "Current directory is $PWD"
```

## Multiline
### Multiline

```sh
cat <<EOF
Expand All @@ -31,26 +43,85 @@ code block
EOF
```

### Non-executable

```yaml
obj:
arr:
- item 1
- item 2
str: value
num: 1
bool: true
```

## Compatibility

### Unordered Lists
### Formatting

- Item 1
- Item 2
- Item 3
**Bold**, _italic_, _**both**_, ~~strikethrough~~, <sub>subscript</sub>, <sup>superscript</sup>, <key>⌘</key>.

### Ordered Lists
### Lists

#### Ordered lists

1. Item 1
2. Item 2
3. Item 3

### Task lists
1) Item 1
2) Item 2
3) Item 3

#### Bullet lists

* Item 1
* Item 2
* Item 3

- Item 1
- Item 2
- Item 3

#### Nested lists

1. First list item
- First nested list item
- Second nested list item

#### Task lists

- [x] Item 1
- [ ] Item 2
- [x] Item 2
- [ ] Item 3

### Links

External [link](https://marketplace.visualstudio.com/items?itemName=guicassolato.tothom).
- External [link](https://marketplace.visualstudio.com/items?itemName=guicassolato.tothom).
- Linkified URL: https://github.com/guicassolato/tothom.
- Local [link](./hello-world.md).
- Indirect [link][1].

[1]: https://github.com/guicassolato/tothom

### Tables

| Left | Center | Right |
| ------ | :----: | -----: |
| Cell 1 | Cell 2 | Cell 3 |

### Images

![Tothom](../resources/tothom.png)

### Other

#### Blockquote

> Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

#### Horizontal line

---

***
21 changes: 19 additions & 2 deletions src/tothom.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,17 @@ export class Tothom {
if (!panel) {
const title = `Preview: ${utils.resourceName(resource)}`;

var localResourceRoots = [this._extensionUri];
if (vscode.workspace.workspaceFolders && vscode.workspace.workspaceFolders[0]) {
localResourceRoots.push(vscode.workspace.workspaceFolders[0].uri);
}

panel = vscode.window.createWebviewPanel(WEBVIEW_PANEL_TYPE, title, vscode.ViewColumn.Active, {
enableScripts: true,
enableFindWidget: true,
retainContextWhenHidden: true,
localResourceRoots: [
this._extensionUri
this._extensionUri,
]
});
panel.onDidDispose(() => this._views.delete(resource));
Expand Down Expand Up @@ -79,9 +84,20 @@ export class Tothom {
return webview.asWebviewUri(vscode.Uri.joinPath(this._extensionUri, 'media', filePath));
};

private sanitizeHtmlLocalPaths = (webview: vscode.Webview, uri: vscode.Uri, htmlContent: string): string => {
const uriBasePath = vscode.Uri.file(utils.resourceDir(uri)).path;
return htmlContent.replace(/<img(.+)src="([^"]+)"/g, (_: string, attrs: string, src: string): string => {
const newSrc = src.startsWith('.') ? webview.asWebviewUri(vscode.Uri.file(uriBasePath + '/' + src)) : src;
return `<img${attrs}src="${newSrc}"`;
});
};

private renderHtmlContent = (webview: vscode.Webview, uri: vscode.Uri, htmlContent: string): string => {
const cspSrc = webview.cspSource;
const nonce = utils.getNonce();
const baseHref = utils.resourceDir(uri);
const baseTag = `<base href="${baseHref}${baseHref.endsWith('/') ? '' : '/'}"/>`;
const sanitizedHtmlContent = this.sanitizeHtmlLocalPaths(webview, uri, htmlContent);

let colorScheme: string = "";
switch (this._config.get('colorScheme')) {
Expand All @@ -106,11 +122,12 @@ export class Tothom {
<link rel="stylesheet" href="${this.mediaFilePath(webview, 'tothom.css')}"/>
<link rel="stylesheet" href="${this.mediaFilePath(webview, 'github-markdown.css')}"/>
<link rel="stylesheet" href="${this.mediaFilePath(webview, 'highlight-js.css')}"/>
${baseTag}
<script defer="true" src="https://use.fontawesome.com/releases/v5.3.1/js/all.js"></script>
</head>
<body class="tothom-body ${colorScheme}" data-uri="${uri}">
<div class="tothom-content">
${htmlContent}
${sanitizedHtmlContent}
</div>
<script nonce="${nonce}" src="${this.mediaFilePath(webview, 'main.js')}"/>
</body>
Expand Down
6 changes: 5 additions & 1 deletion src/utils.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as vscode from 'vscode';
import { basename } from 'path';
import { basename, dirname } from 'path';
import { readFileSync } from 'fs';

export const resourceFromUri = (uri: vscode.Uri): vscode.Uri => {
Expand All @@ -14,6 +14,10 @@ export const resourceName = (resource: vscode.Uri): string => {
return basename(resource.path);
};

export const resourceDir = (resource: vscode.Uri): string => {
return dirname(resource.path);
};

export const readFileContent = (resource: vscode.Uri): string => {
return readFileSync(resource.fsPath, 'utf8');
};
Expand Down