From 02a0ed46648a5ff6c574bb76648a69fcce869639 Mon Sep 17 00:00:00 2001 From: Sebastian Martinez Date: Wed, 2 Feb 2022 13:37:58 +0100 Subject: [PATCH] Fix Icon behaviour with empty clickhandler Signed-off-by: Sebastian Martinez Signed-off-by: Alexis Sellier --- package-lock.json | 24 +++++++++---------- package.json | 4 ++-- src/Icon.svelte | 18 +++++++------- src/base/projects/Commit/CommitTeaser.svelte | 2 +- .../projects/SourceBrowser/Changeset.svelte | 6 +++-- .../projects/SourceBrowser/FileDiff.svelte | 6 ++--- 6 files changed, 31 insertions(+), 29 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9e8fd96f4..631a12d38 100644 --- a/package-lock.json +++ b/package-lock.json @@ -30,7 +30,7 @@ "multihashes": "^4.0.2", "pure-svg-code": "^1.0.6", "sanitize-html": "^2.6.1", - "svelte": "^3.44.3", + "svelte": "^3.46.3", "svelte-preprocess": "^4.7.2", "svelte-routing": "^1.6.0" }, @@ -47,7 +47,7 @@ "eslint": "^7.28.0", "eslint-plugin-svelte3": "^3.2.0", "radicle-svelte-unit-test": "^1.0.0", - "svelte-check": "^1.5.2", + "svelte-check": "^2.4.1", "typescript": "^4.2.4", "vite": "^2.7.13", "vite-plugin-istanbul": "^2.4.0", @@ -10525,16 +10525,16 @@ } }, "node_modules/svelte-check": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/svelte-check/-/svelte-check-1.6.0.tgz", - "integrity": "sha512-nQTlbFJWhwoeLY5rkhgbjzGQSwk5F1pRdEXait0EFaQSrE/iJF+PIjrQlk0BjL/ogk9HaR9ZI0DQSYrl7jl3IQ==", + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/svelte-check/-/svelte-check-2.4.1.tgz", + "integrity": "sha512-xhf3ShP5rnRwBokrgTBJ/0cO9QIc1DAVu1NWNRTfCDsDBNjGmkS3HgitgUadRuoMKj1+irZR/yHJ+Uqobnkbrw==", "dev": true, "dependencies": { - "chalk": "^4.0.0", "chokidar": "^3.4.1", - "glob": "^7.1.6", + "fast-glob": "^3.2.7", "import-fresh": "^3.2.1", "minimist": "^1.2.5", + "picocolors": "^1.0.0", "sade": "^1.7.4", "source-map": "^0.7.3", "svelte-preprocess": "^4.0.0", @@ -19426,16 +19426,16 @@ "integrity": "sha512-mTOXvv74CVQqJHqoIZDprVfRKVVmYNadXP0VKnOEA54223kLGCr1nMrifS4Zx29qMt/xRB38Eq1D7dDH/fM8fQ==" }, "svelte-check": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/svelte-check/-/svelte-check-1.6.0.tgz", - "integrity": "sha512-nQTlbFJWhwoeLY5rkhgbjzGQSwk5F1pRdEXait0EFaQSrE/iJF+PIjrQlk0BjL/ogk9HaR9ZI0DQSYrl7jl3IQ==", + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/svelte-check/-/svelte-check-2.4.1.tgz", + "integrity": "sha512-xhf3ShP5rnRwBokrgTBJ/0cO9QIc1DAVu1NWNRTfCDsDBNjGmkS3HgitgUadRuoMKj1+irZR/yHJ+Uqobnkbrw==", "dev": true, "requires": { - "chalk": "^4.0.0", "chokidar": "^3.4.1", - "glob": "^7.1.6", + "fast-glob": "^3.2.7", "import-fresh": "^3.2.1", "minimist": "^1.2.5", + "picocolors": "^1.0.0", "sade": "^1.7.4", "source-map": "^0.7.3", "svelte-preprocess": "^4.0.0", diff --git a/package.json b/package.json index 7064d5475..5a841cf0e 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "eslint": "^7.28.0", "eslint-plugin-svelte3": "^3.2.0", "radicle-svelte-unit-test": "^1.0.0", - "svelte-check": "^1.5.2", + "svelte-check": "^2.4.1", "typescript": "^4.2.4", "vite": "^2.7.13", "vite-plugin-istanbul": "^2.4.0", @@ -54,7 +54,7 @@ "multihashes": "^4.0.2", "pure-svg-code": "^1.0.6", "sanitize-html": "^2.6.1", - "svelte": "^3.44.3", + "svelte": "^3.46.3", "svelte-preprocess": "^4.7.2", "svelte-routing": "^1.6.0" } diff --git a/src/Icon.svelte b/src/Icon.svelte index fd7fd0916..c6d00afc1 100644 --- a/src/Icon.svelte +++ b/src/Icon.svelte @@ -4,7 +4,6 @@ export let height: number | null = null; export let inline = false; export let fill = false; - export let clickHandler: (() => void) | undefined = undefined; const icons = [ { @@ -52,7 +51,7 @@ svg.fill { fill: currentColor; } - svg.inline { + span.inline, svg.inline { height: 1.6rem; } svg.clickable { @@ -61,11 +60,12 @@ {#if svg} - - {@html svg.data} - + + + {@html svg.data} + + {/if} diff --git a/src/base/projects/Commit/CommitTeaser.svelte b/src/base/projects/Commit/CommitTeaser.svelte index 92611efc7..76afdb4f5 100644 --- a/src/base/projects/Commit/CommitTeaser.svelte +++ b/src/base/projects/Commit/CommitTeaser.svelte @@ -68,6 +68,6 @@
{commit.committer.name} {formatCommitTime(commit.committerTime)} - browseCommit(commit.sha1)} width={17} inline fill /> + browseCommit(commit.sha1)} />
diff --git a/src/base/projects/SourceBrowser/Changeset.svelte b/src/base/projects/SourceBrowser/Changeset.svelte index c0c0db48f..11e8cc6cf 100644 --- a/src/base/projects/SourceBrowser/Changeset.svelte +++ b/src/base/projects/SourceBrowser/Changeset.svelte @@ -73,7 +73,8 @@

{path}

created - dispatch("browse", path)} name="browse" width={20} inline fill /> + dispatch("browse", path)} /> {/each} {#each diff.deleted as path (path)} @@ -82,7 +83,8 @@

{path}

deleted - dispatch("browse", path)} name="browse" width={20} inline fill /> + dispatch("browse", path)} /> {/each} diff --git a/src/base/projects/SourceBrowser/FileDiff.svelte b/src/base/projects/SourceBrowser/FileDiff.svelte index cad1c6d85..86e562318 100644 --- a/src/base/projects/SourceBrowser/FileDiff.svelte +++ b/src/base/projects/SourceBrowser/FileDiff.svelte @@ -3,7 +3,7 @@ import Icon from "@app/Icon.svelte"; import { lineNumberL, lineNumberR, lineSign } from "@app/diff"; import type { FileDiff } from "@app/diff"; - + const dispatch = createEventDispatcher(); export let file: FileDiff; @@ -109,10 +109,10 @@
- +

{file.path}

- dispatch("browse", file.path)} name="browse" width={20} inline fill /> + dispatch("browse", file.path)} />
{#if !collapsed}