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

make all component SSR compatible #9187

Merged
merged 18 commits into from
Aug 31, 2024
Merged
Show file tree
Hide file tree
Changes from 9 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
20 changes: 20 additions & 0 deletions .changeset/itchy-goats-kiss.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---
"@gradio/annotatedimage": patch
"@gradio/audio": patch
"@gradio/chatbot": patch
"@gradio/code": patch
"@gradio/dataframe": patch
"@gradio/dataset": patch
"@gradio/dropdown": patch
"@gradio/file": patch
"@gradio/imageeditor": patch
"@gradio/markdown": patch
"@gradio/model3d": patch
"@gradio/nativeplot": patch
"@gradio/paramviewer": patch
"@gradio/wasm": patch
"@self/component-test": patch
"gradio": patch
---

feat:make all component SSR compatible
1 change: 0 additions & 1 deletion js/annotatedimage/Index.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,6 @@
display: block;
width: 100%;
height: auto;
position: absolute;
}
.container {
display: flex;
Expand Down
15 changes: 9 additions & 6 deletions js/audio/Index.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

import type { FileData } from "@gradio/client";
import type { LoadingStatus } from "@gradio/statustracker";
import { afterUpdate } from "svelte";
import { afterUpdate, onMount } from "svelte";

import StaticAudio from "./static/StaticAudio.svelte";
import InteractiveAudio from "./interactive/InteractiveAudio.svelte";
Expand Down Expand Up @@ -95,9 +95,14 @@

let waveform_settings: Record<string, any>;

let color_accent = getComputedStyle(
document.documentElement
).getPropertyValue("--color-accent");
let color_accent = "#fff";

onMount(() => {
color_accent = getComputedStyle(document?.documentElement).getPropertyValue(
"--color-accent"
);
set_trim_region_colour();
});

$: waveform_settings = {
height: 50,
Expand Down Expand Up @@ -129,8 +134,6 @@
);
}

set_trim_region_colour();

function handle_error({ detail }: CustomEvent<string>): void {
const [level, status] = detail.includes("Invalid file type")
? ["warning", "complete"]
Expand Down
44 changes: 24 additions & 20 deletions js/audio/player/AudioPlayer.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,11 @@
data-testid={label ? "waveform-" + label : "unlabelled-audio"}
>
<div class="waveform-container">
<div id="waveform" bind:this={container} />
<div
id="waveform"
bind:this={container}
style:height={container ? null : "58px"}
/>
</div>

<div class="timestamps">
Expand All @@ -181,25 +185,25 @@
</div>
</div>

{#if waveform}
<WaveformControls
{container}
{waveform}
{playing}
{audio_duration}
{i18n}
{interactive}
{handle_trim_audio}
bind:mode
bind:trimDuration
bind:show_volume_slider
show_redo={interactive}
{handle_reset_value}
{waveform_options}
{trim_region_settings}
{editable}
/>
{/if}
<!-- {#if waveform} -->
<WaveformControls
{container}
{waveform}
{playing}
{audio_duration}
{i18n}
{interactive}
{handle_trim_audio}
bind:mode
bind:trimDuration
bind:show_volume_slider
show_redo={interactive}
{handle_reset_value}
{waveform_options}
{trim_region_settings}
{editable}
/>
<!-- {/if} -->
</div>
{/if}

Expand Down
4 changes: 2 additions & 2 deletions js/audio/shared/VolumeControl.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

export let currentVolume = 1;
export let show_volume_slider = false;
export let waveform: WaveSurfer;
export let waveform: WaveSurfer | undefined;

let volumeElement: HTMLInputElement;

Expand Down Expand Up @@ -37,7 +37,7 @@
on:input={(e) => {
if (e.target instanceof HTMLInputElement) {
currentVolume = parseFloat(e.target.value);
waveform.setVolume(currentVolume);
waveform?.setVolume(currentVolume);
}
}}
/>
Expand Down
20 changes: 12 additions & 8 deletions js/audio/shared/WaveformControls.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import VolumeLevels from "./VolumeLevels.svelte";
import VolumeControl from "./VolumeControl.svelte";

export let waveform: WaveSurfer;
export let waveform: WaveSurfer | undefined;
export let audio_duration: number;
export let i18n: I18nFormatter;
export let playing: boolean;
Expand All @@ -30,7 +30,7 @@
let playbackSpeeds = [0.5, 1, 1.5, 2];
let playbackSpeed = playbackSpeeds[1];

let trimRegion: RegionsPlugin;
let trimRegion: RegionsPlugin | null = null;
let activeRegion: Region | null = null;

let leftRegionHandle: HTMLDivElement | null;
Expand All @@ -39,7 +39,10 @@

let currentVolume = 1;

$: trimRegion = waveform.registerPlugin(RegionsPlugin.create());
$: trimRegion =
container && waveform
? waveform.registerPlugin(RegionsPlugin.create())
: null;

$: trimRegion?.on("region-out", (region) => {
region.play();
Expand All @@ -56,7 +59,8 @@
});

const addTrimRegion = (): void => {
activeRegion = trimRegion.addRegion({
if (!trimRegion) return;
activeRegion = trimRegion?.addRegion({
start: audio_duration / 4,
end: audio_duration / 2,
...trim_region_settings
Expand Down Expand Up @@ -190,7 +194,7 @@
(playbackSpeeds.indexOf(playbackSpeed) + 1) % playbackSpeeds.length
];

waveform.setPlaybackRate(playbackSpeed);
waveform?.setPlaybackRate(playbackSpeed);
}}
>
<span>{playbackSpeed}x</span>
Expand All @@ -205,7 +209,7 @@
waveform_options.skip_length
)} seconds`}
on:click={() =>
waveform.skip(
waveform?.skip(
get_skip_rewind_amount(audio_duration, waveform_options.skip_length) *
-1
)}
Expand All @@ -214,7 +218,7 @@
</button>
<button
class="play-pause-button icon"
on:click={() => waveform.playPause()}
on:click={() => waveform?.playPause()}
aria-label={playing ? i18n("audio.pause") : i18n("audio.play")}
>
{#if playing}
Expand All @@ -230,7 +234,7 @@
waveform_options.skip_length
)} seconds"
on:click={() =>
waveform.skip(
waveform?.skip(
get_skip_rewind_amount(audio_duration, waveform_options.skip_length)
)}
>
Expand Down
1 change: 1 addition & 0 deletions js/chatbot/Index.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@
_fetch={gradio.client.fetch}
load_component={gradio.load_component}
msg_format={type}
root={gradio.root}
/>
</div>
</Block>
Expand Down
23 changes: 16 additions & 7 deletions js/chatbot/shared/ChatBot.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
createEventDispatcher,
type SvelteComponent,
type ComponentType,
tick
tick,
onMount
} from "svelte";
import { ShareButton } from "@gradio/atoms";
import { Image } from "@gradio/image/shared";
Expand Down Expand Up @@ -96,13 +97,19 @@
export let placeholder: string | null = null;
export let upload: Client["upload"];
export let msg_format: "tuples" | "messages" = "tuples";
export let root: string;

let target = document.querySelector("div.gradio-container");
let target: HTMLElement | null = null;

onMount(() => {
target = document.querySelector("div.gradio-container");
adjust_text_size();
});

let div: HTMLDivElement;
let autoscroll: boolean;

$: adjust_text_size = () => {
function adjust_text_size(): void {
let style = getComputedStyle(document.body);
let body_text_size = style.getPropertyValue("--body-text-size");
let updated_text_size;
Expand All @@ -126,9 +133,7 @@
"--chatbot-body-text-size",
updated_text_size + "px"
);
};

$: adjust_text_size();
}

const dispatch = createEventDispatcher<{
change: undefined;
Expand All @@ -142,6 +147,7 @@
});

async function scroll(): Promise<void> {
if (!div) return;
await tick();
requestAnimationFrame(() => {
if (autoscroll) {
Expand All @@ -158,6 +164,7 @@
scroll();
}
afterUpdate(() => {
if (!div) return;
div.querySelectorAll("img").forEach((n) => {
n.addEventListener("click", (e) => {
const target = e.target as HTMLImageElement;
Expand Down Expand Up @@ -369,6 +376,7 @@
{render_markdown}
{line_breaks}
on:load={scroll}
{root}
/>
</MessageBox>
{:else}
Expand All @@ -379,6 +387,7 @@
{render_markdown}
{line_breaks}
on:load={scroll}
{root}
/>
{/if}
{:else if message.type === "component" && message.content.component in _components}
Expand Down Expand Up @@ -432,7 +441,7 @@
{/if}
{:else if placeholder !== null}
<center>
<Markdown message={placeholder} {latex_delimiters} />
<Markdown message={placeholder} {latex_delimiters} {root} />
</center>
{/if}
</div>
Expand Down
7 changes: 5 additions & 2 deletions js/code/Index.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
export let value_is_output = false;
export let language = "";
export let lines = 5;
export let target: HTMLElement;
export let elem_id = "";
export let elem_classes: string[] = [];
export let visible = true;
Expand All @@ -40,7 +39,7 @@

export let interactive: boolean;

let dark_mode = target.classList.contains("dark");
let dark_mode = gradio.theme === "dark";

function handle_change(): void {
gradio.dispatch("change", value);
Expand All @@ -52,9 +51,13 @@
value_is_output = false;
});
$: value, handle_change();

const is_browser = typeof window !== "undefined";
const default_lines = interactive ? lines : 10.35;
</script>

<Block
height={is_browser ? undefined : default_lines * 25 + 4}
variant={"solid"}
padding={false}
{elem_id}
Expand Down
3 changes: 3 additions & 0 deletions js/component-test/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@
"@sveltejs/adapter-auto": "^3.0.0",
"@sveltejs/kit": "^2.0.0"
},
"dependencies": {
"@gradio/video": "workspace:^"
},
"type": "module",
"private": "true"
}
4 changes: 4 additions & 0 deletions js/component-test/src/defs.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
declare module "*.glb" {
const src: string;
export default src;
}
Loading
Loading