Skip to content
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
52 changes: 52 additions & 0 deletions dev/vscode-table/561-col-runtime-error.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>VSCode Elements</title>
<link
rel="stylesheet"
href="/node_modules/@vscode/codicons/dist/codicon.css"
id="vscode-codicon-stylesheet"
>
<script
type="module"
src="/node_modules/@vscode-elements/webview-playground/dist/index.js"
></script>
<script type="module" src="/dist/main.js"></script>
<script>
const logEvents = (selector, eventType) => {
document.querySelector(selector).addEventListener(eventType, (ev) => {
console.log(ev);
});
};
</script>
</head>

<body>
<h1>Component demo</h1>
<main>
<vscode-demo>
<vscode-table>
<vscode-table-header>
<vscode-table-header-cell>col 1</vscode-table-header-cell>
<vscode-table-header-cell>col 2</vscode-table-header-cell>
<vscode-table-header-cell>col 3</vscode-table-header-cell>
</vscode-table-header>
<vscode-table-body>
<vscode-table-row>
<vscode-table-cell>cell 1.1</vscode-table-cell>
<vscode-table-cell>cell 2.1</vscode-table-cell>
<vscode-table-cell>cell 3.1</vscode-table-cell>
</vscode-table-row>
<vscode-table-row>
<vscode-table-cell>cell 1.2</vscode-table-cell>
<vscode-table-cell>cell 2.2</vscode-table-cell>
<vscode-table-cell>cell 3.2</vscode-table-cell>
</vscode-table-row>
</vscode-table-body>
</vscode-table>
</vscode-demo>
</main>
</body>
</html>
21 changes: 18 additions & 3 deletions src/includes/VscElement.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,27 @@ import {LitElement} from 'lit';
const VERSION = '2.4.0';
const CONFIG_KEY = '__vscodeElements_disableRegistryWarning__';

const warn = (message: string, componentInstance?: VscElement) => {
const prefix = '[VSCode Elements] ';

if (componentInstance) {
// eslint-disable-next-line no-console
console.warn(`${prefix}${message}\n%o`, componentInstance);
} else {
// eslint-disable-next-line no-console
console.warn(`${message}\n%o`, componentInstance);
}
};

export class VscElement extends LitElement {
/** VSCode Elements version */
get version(): string {
return VERSION;
}

warn(message: string) {
warn(message, this);
}
}

type CustomElementClass = Omit<typeof HTMLElement, 'new'>;
Expand Down Expand Up @@ -48,9 +64,8 @@ export const customElement = (tagName: string) => {
message += `is already registered by the same version of VSCode Elements (${VERSION}).`;
}

// eslint-disable-next-line no-console
console.warn(
`[VSCode Elements] ${tagName} ${message}\nTo suppress this warning, set window.${CONFIG_KEY} to true`
warn(
`The custom element "${tagName}" ${message}\nTo suppress this warning, set window.${CONFIG_KEY} to true`
);
};
};
4 changes: 4 additions & 0 deletions src/includes/helpers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,7 @@ export function getDefaultEditorFontStack() {
return 'monospace';
}
}

export function logMessage(msg: string) {
return `[VSCode Elements] ${msg}`;
}
8 changes: 2 additions & 6 deletions src/includes/vscode-select/vscode-select-base.ts
Original file line number Diff line number Diff line change
Expand Up @@ -91,14 +91,10 @@ export class VscodeSelectBase extends VscElement {
let fm: FilterMethod;

if (validValues.includes(val as FilterMethod)) {
// this._filter = val as FilterMethod;
fm = val;
} else {
// this._filter = 'fuzzy';
// eslint-disable-next-line no-console
console.warn(
`[VSCode Webview Elements] Invalid filter: "${val}", fallback to default. Valid values are: "contains", "fuzzy", "startsWith", "startsWithPerm".`,
this
this.warn(
`Invalid filter: "${val}", fallback to default. Valid values are: "contains", "fuzzy", "startsWith", "startsWithPerm".`
);
fm = 'fuzzy';
}
Expand Down
5 changes: 2 additions & 3 deletions src/vscode-icon/vscode-icon.ts
Original file line number Diff line number Diff line change
Expand Up @@ -86,12 +86,11 @@ export class VscodeIcon extends VscElement {

if (!linkElement) {
let msg =
'[VSCode Elements] To use the Icon component, the codicons.css file must be included in the page with the id `vscode-codicon-stylesheet`! ';
'To use the Icon component, the codicons.css file must be included in the page with the id "vscode-codicon-stylesheet"! ';
msg +=
'See https://vscode-elements.github.io/components/icon/ for more details.';

// eslint-disable-next-line no-console
console.warn(msg);
this.warn(msg);
}

return {nonce, href};
Expand Down
7 changes: 7 additions & 0 deletions src/vscode-table/vscode-table.ts
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,13 @@ export class VscodeTable extends VscElement {
*/
@property({type: Array})
set columns(val: string[]) {
if (!Array.isArray(val)) {
this.warn('Invalid value for "columns": expected an array.');
this._columns = [];

return;
}

this._columns = val;

if (this.isConnected) {
Expand Down