From 098a4018d76dff85a904c9aee16d2a2b0f873d3c Mon Sep 17 00:00:00 2001 From: Abubakar Abid Date: Sat, 27 Jan 2024 09:30:28 -0800 Subject: [PATCH 01/10] handle null examples --- js/audio/Example.svelte | 4 +- js/checkbox/Example.svelte | 4 +- js/code/Example.svelte | 4 +- js/colorpicker/Example.svelte | 5 +- js/dropdown/Example.svelte | 4 +- js/file/Example.svelte | 4 +- js/fileexplorer/Example.svelte | 16 +- js/image/Example.svelte | 9 +- js/image/shared/Image.svelte | 6 + js/markdown/Example.svelte | 4 +- js/model3D/Example.svelte | 4 +- js/number/Example.svelte | 4 +- js/radio/Example.svelte | 12 +- js/simpledropdown/Example.svelte | 4 +- js/simpleimage/Example.svelte | 21 ++- js/simpletextbox/Example.svelte | 4 +- js/textbox/Example.svelte | 4 +- js/video/Example.svelte | 2 +- pnpm-lock.yaml | 273 +++++++++++++++++-------------- 19 files changed, 218 insertions(+), 170 deletions(-) diff --git a/js/audio/Example.svelte b/js/audio/Example.svelte index 6b6a4a08c938f..1ebb90d67dd34 100644 --- a/js/audio/Example.svelte +++ b/js/audio/Example.svelte @@ -1,5 +1,5 @@ @@ -9,7 +9,7 @@ class:gallery={type === "gallery"} class:selected > - {value} + {value ? value : ""} \ No newline at end of file diff --git a/js/markdown/Example.svelte b/js/markdown/Example.svelte index fa8f1b800ea77..40f17abb052be 100644 --- a/js/markdown/Example.svelte +++ b/js/markdown/Example.svelte @@ -1,7 +1,7 @@ @@ -9,7 +9,7 @@ class:gallery={type === "gallery"} class:selected > - {value} + {value ? value : ""} diff --git a/js/simpletextbox/Example.svelte b/js/simpletextbox/Example.svelte index 1fdf7500fa285..e8e8130c2987f 100644 --- a/js/simpletextbox/Example.svelte +++ b/js/simpletextbox/Example.svelte @@ -1,7 +1,7 @@ -
{#if value} - + {/if}
@@ -29,7 +29,7 @@ .container.selected { border-color: var(--border-color-accent); } - .border.table{ + .border.table { border: 2px solid var(--border-color-primary); } diff --git a/js/image/shared/Image.svelte b/js/image/shared/Image.svelte index 4e00ef6698226..6284cef568a74 100644 --- a/js/image/shared/Image.svelte +++ b/js/image/shared/Image.svelte @@ -40,4 +40,4 @@ img { object-fit: cover; } - \ No newline at end of file + diff --git a/js/radio/Example.svelte b/js/radio/Example.svelte index b3550a0427d3e..9a1a056b213e0 100644 --- a/js/radio/Example.svelte +++ b/js/radio/Example.svelte @@ -4,8 +4,8 @@ export let selected = false; export let choices: [string, string | number][]; - let name_string: string - + let name_string: string; + if (value === null) { name_string = ""; } else { From 1385f82ec57aee3feacb16b3c5fb6bcec4d1c6cb Mon Sep 17 00:00:00 2001 From: Abubakar Abid Date: Mon, 29 Jan 2024 10:04:24 -0800 Subject: [PATCH 05/10] merge conflict --- pnpm-lock.yaml | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 699f5d18e2879..78b73ee3b512e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1361,13 +1361,8 @@ importers: js/simpleimage: dependencies: '@gradio/atoms': -<<<<<<< HEAD - specifier: 0.4.1 - version: 0.4.1(svelte@3.59.2) -======= specifier: workspace:^ version: link:../atoms ->>>>>>> main '@gradio/client': specifier: workspace:^ version: link:../../client/js @@ -1375,19 +1370,6 @@ importers: specifier: workspace:^ version: link:../icons '@gradio/statustracker': -<<<<<<< HEAD - specifier: 0.4.3 - version: 0.4.3(svelte@3.59.2) - '@gradio/upload': - specifier: 0.6.1 - version: 0.6.1(svelte@3.59.2) - '@gradio/utils': - specifier: 0.2.0 - version: 0.2.0(svelte@3.59.2) - '@gradio/wasm': - specifier: 0.5.0 - version: 0.5.0 -======= specifier: workspace:^ version: link:../statustracker '@gradio/upload': @@ -1399,7 +1381,6 @@ importers: '@gradio/wasm': specifier: workspace:^ version: link:../wasm ->>>>>>> main cropperjs: specifier: ^1.5.12 version: 1.5.12 From 9c9bbf3e6dfc0b47b39540473ae2700bb243e54a Mon Sep 17 00:00:00 2001 From: Abubakar Abid Date: Mon, 29 Jan 2024 10:19:59 -0800 Subject: [PATCH 06/10] fixes --- js/dataset/Index.svelte | 46 +++++++++++++++++++++-------------------- js/video/Example.svelte | 40 ++++++++++++++++++----------------- 2 files changed, 45 insertions(+), 41 deletions(-) diff --git a/js/dataset/Index.svelte b/js/dataset/Index.svelte index d3b2cb74484bd..f9aed558450ec 100644 --- a/js/dataset/Index.svelte +++ b/js/dataset/Index.svelte @@ -129,28 +129,30 @@ {#if gallery} {:else} diff --git a/js/video/Example.svelte b/js/video/Example.svelte index 935a2c48d083a..305f343988f6f 100644 --- a/js/video/Example.svelte +++ b/js/video/Example.svelte @@ -20,25 +20,27 @@ } -{#if playable()} -
-
-{:else} -
{value ? value : ""}
+{#if value} + {#if playable()} +
+
+ {:else} +
{value}
+ {/if} {/if}