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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix build and broken imports #5620

Merged
merged 5 commits into from
Sep 19, 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
33 changes: 33 additions & 0 deletions .changeset/cold-lemons-roll.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
---
"@gradio/accordion": minor
"@gradio/annotatedimage": minor
"@gradio/app": minor
"@gradio/audio": minor
"@gradio/chatbot": minor
"@gradio/checkbox": minor
"@gradio/checkboxgroup": minor
"@gradio/code": minor
"@gradio/colorpicker": minor
"@gradio/dataframe": minor
"@gradio/dropdown": minor
"@gradio/fallback": minor
"@gradio/file": minor
"@gradio/gallery": minor
"@gradio/highlightedtext": minor
"@gradio/html": minor
"@gradio/image": minor
"@gradio/json": minor
"@gradio/label": minor
"@gradio/markdown": minor
"@gradio/model3d": minor
"@gradio/number": minor
"@gradio/plot": minor
"@gradio/radio": minor
"@gradio/slider": minor
"@gradio/statustracker": minor
"@gradio/textbox": minor
"@gradio/video": minor
"gradio": minor
---

feat:fix build and broken imports
6 changes: 5 additions & 1 deletion js/accordion/static/StaticAccordion.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,11 @@
</script>

<Block {elem_id} {elem_classes} {visible}>
<StatusTracker i18n={gradio.i18n} {...loading_status} />
<StatusTracker
autoscroll={gradio.autoscroll}
i18n={gradio.i18n}
{...loading_status}
/>

<Accordion {label} {open}>
<Column>
Expand Down
6 changes: 5 additions & 1 deletion js/annotatedimage/static/AnnotatedImage.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,11 @@
{scale}
{min_width}
>
<StatusTracker i18n={gradio.i18n} {...loading_status} />
<StatusTracker
autoscroll={gradio.autoscroll}
i18n={gradio.i18n}
{...loading_status}
/>
<BlockLabel
{show_label}
Icon={Image}
Expand Down
5 changes: 2 additions & 3 deletions js/app/src/Blocks.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
component_map,
fallback_component_map
} from "./components/directory";
import { create_loading_status_store, app_state } from "./stores";
import { create_loading_status_store } from "./stores";
import type { LoadingStatusCollection } from "./stores";

import type {
Expand Down Expand Up @@ -48,8 +48,6 @@

let loading_status = create_loading_status_store();

$: app_state.update((s) => ({ ...s, autoscroll }));

let rootNode: ComponentMeta = {
id: layout.id,
type: "column",
Expand Down Expand Up @@ -744,6 +742,7 @@
on:mount={handle_mount}
on:destroy={({ detail }) => handle_destroy(detail)}
{version}
{autoscroll}
/>
{/if}
</div>
Expand Down
1 change: 1 addition & 0 deletions js/app/src/Index.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -335,6 +335,7 @@
translucent={true}
{loading_text}
i18n={$_}
{autoscroll}
>
<!-- todo: translate message text -->
<div class="error" slot="error">
Expand Down
2 changes: 2 additions & 0 deletions js/app/src/MountComponents.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
export let target: any;
export let theme_mode: any;
export let version: any;
export let autoscroll: boolean;

const dispatch = createEventDispatcher<{ mount: never }>();
onMount(() => {
Expand All @@ -27,4 +28,5 @@
{target}
{theme_mode}
{version}
{autoscroll}
/>
3 changes: 2 additions & 1 deletion js/app/src/Render.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
export let target: HTMLElement;
export let theme_mode: ThemeMode;
export let version: string;
export let autoscroll: boolean;

const dispatch = createEventDispatcher<{ mount: number; destroy: number }>();
let filtered_children: ComponentMeta[] = [];
Expand Down Expand Up @@ -77,7 +78,7 @@
{...props}
{theme_mode}
{root}
gradio={new Gradio(id, target, theme_mode, version, root)}
gradio={new Gradio(id, target, theme_mode, version, root, autoscroll)}
>
{#if children && children.length}
{#each children as { component, id: each_id, props, children: _children, has_modes } (each_id)}
Expand Down
5 changes: 4 additions & 1 deletion js/app/src/gradio_helper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,23 @@ export class Gradio<T extends Record<string, any> = Record<string, any>> {
i18n: typeof x;
#el: HTMLElement;
root: string;
autoscroll: boolean;

constructor(
id: number,
el: HTMLElement,
theme: string,
version: string,
root: string
root: string,
autoscroll: boolean
) {
this.#id = id;
this.theme = theme;
this.version = version;
this.#el = el;
this.i18n = get(format);
this.root = root;
this.autoscroll = autoscroll;
}

dispatch<E extends keyof T>(event_name: E, data?: T[E]): void {
Expand Down
1 change: 0 additions & 1 deletion js/app/src/stores.ts
Original file line number Diff line number Diff line change
Expand Up @@ -163,4 +163,3 @@ export function create_loading_status_store(): LoadingStatusStore {
}

export type LoadingStatusType = ReturnType<typeof create_loading_status_store>;
export const app_state = writable({ autoscroll: false });
6 changes: 5 additions & 1 deletion js/audio/interactive/InteractiveAudio.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,11 @@
{scale}
{min_width}
>
<StatusTracker i18n={gradio.i18n} {...loading_status} />
<StatusTracker
autoscroll={gradio.autoscroll}
i18n={gradio.i18n}
{...loading_status}
/>
<Audio
{label}
{show_label}
Expand Down
6 changes: 5 additions & 1 deletion js/audio/static/StaticAudio.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,11 @@
{scale}
{min_width}
>
<StatusTracker i18n={gradio.i18n} {...loading_status} />
<StatusTracker
autoscroll={gradio.autoscroll}
i18n={gradio.i18n}
{...loading_status}
/>

<StaticAudio
i18n={gradio.i18n}
Expand Down
1 change: 1 addition & 0 deletions js/chatbot/static/StaticChatbot.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@
>
{#if loading_status}
<StatusTracker
autoscroll={gradio.autoscroll}
i18n={gradio.i18n}
{...loading_status}
show_progress={loading_status.show_progress === "hidden"
Expand Down
6 changes: 5 additions & 1 deletion js/checkbox/interactive/InteractiveCheckbox.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,11 @@
</script>

<Block {visible} {elem_id} {elem_classes} {container} {scale} {min_width}>
<StatusTracker i18n={gradio.i18n} {...loading_status} />
<StatusTracker
autoscroll={gradio.autoscroll}
i18n={gradio.i18n}
{...loading_status}
/>

{#if info}
<Info>{info}</Info>
Expand Down
6 changes: 5 additions & 1 deletion js/checkbox/static/StaticCheckbox.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,11 @@
</script>

<Block {visible} {elem_id} {elem_classes} {container} {scale} {min_width}>
<StatusTracker i18n={gradio.i18n} {...loading_status} />
<StatusTracker
autoscroll={gradio.autoscroll}
i18n={gradio.i18n}
{...loading_status}
/>

{#if info}
<Info>{info}</Info>
Expand Down
6 changes: 5 additions & 1 deletion js/checkboxgroup/interactive/InteractiveCheckboxgroup.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,11 @@
{scale}
{min_width}
>
<StatusTracker i18n={gradio.i18n} {...loading_status} />
<StatusTracker
autoscroll={gradio.autoscroll}
i18n={gradio.i18n}
{...loading_status}
/>

<CheckboxGroup
bind:value
Expand Down
6 changes: 5 additions & 1 deletion js/checkboxgroup/static/StaticCheckboxgroup.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,11 @@
{scale}
{min_width}
>
<StatusTracker i18n={gradio.i18n} {...loading_status} />
<StatusTracker
autoscroll={gradio.autoscroll}
i18n={gradio.i18n}
{...loading_status}
/>

<CheckboxGroup
bind:value
Expand Down
6 changes: 5 additions & 1 deletion js/code/interactive/InteractiveCode.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,11 @@
</script>

<Block variant={"solid"} padding={false} {elem_id} {elem_classes} {visible}>
<StatusTracker i18n={gradio.i18n} {...loading_status} />
<StatusTracker
autoscroll={gradio.autoscroll}
i18n={gradio.i18n}
{...loading_status}
/>

<BlockLabel Icon={CodeIcon} {show_label} {label} float={false} />

Expand Down
6 changes: 5 additions & 1 deletion js/code/static/StaticCode.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,11 @@
</script>

<Block variant={"solid"} padding={false} {elem_id} {elem_classes} {visible}>
<StatusTracker i18n={gradio.i18n} {...loading_status} />
<StatusTracker
autoscroll={gradio.autoscroll}
i18n={gradio.i18n}
{...loading_status}
/>

<BlockLabel Icon={CodeIcon} {show_label} {label} float={false} />

Expand Down
6 changes: 5 additions & 1 deletion js/colorpicker/interactive/InteractiveColorpicker.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,11 @@
</script>

<Block {visible} {elem_id} {elem_classes} {container} {scale} {min_width}>
<StatusTracker i18n={gradio.i18n} {...loading_status} />
<StatusTracker
autoscroll={gradio.autoscroll}
i18n={gradio.i18n}
{...loading_status}
/>

<Colorpicker
bind:value
Expand Down
6 changes: 5 additions & 1 deletion js/colorpicker/static/StaticColorpicker.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,11 @@
</script>

<Block {visible} {elem_id} {elem_classes} {container} {scale} {min_width}>
<StatusTracker i18n={gradio.i18n} {...loading_status} />
<StatusTracker
autoscroll={gradio.autoscroll}
i18n={gradio.i18n}
{...loading_status}
/>

<Colorpicker
bind:value
Expand Down
6 changes: 5 additions & 1 deletion js/dataframe/interactive/InteractiveDataframe.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,11 @@
{min_width}
allow_overflow={false}
>
<StatusTracker {...loading_status} />
<StatusTracker
autoscroll={gradio.autoscroll}
{...loading_status}
i18n={gradio.i18n}
/>
<Table
{label}
{row_count}
Expand Down
6 changes: 5 additions & 1 deletion js/dataframe/static/StaticDataframe.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,11 @@
{min_width}
allow_overflow={false}
>
<StatusTracker i18n={gradio.i18n} {...loading_status} />
<StatusTracker
autoscroll={gradio.autoscroll}
i18n={gradio.i18n}
{...loading_status}
/>
<Table
{root}
{label}
Expand Down
6 changes: 5 additions & 1 deletion js/dropdown/interactive/InteractiveDropdown.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,11 @@
{scale}
{min_width}
>
<StatusTracker i18n={gradio.i18n} {...loading_status} />
<StatusTracker
autoscroll={gradio.autoscroll}
i18n={gradio.i18n}
{...loading_status}
/>

{#if multiselect}
<Multiselect
Expand Down
6 changes: 5 additions & 1 deletion js/dropdown/static/StaticDropdown.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,11 @@
{scale}
{min_width}
>
<StatusTracker i18n={gradio.i18n} {...loading_status} />
<StatusTracker
autoscroll={gradio.autoscroll}
i18n={gradio.i18n}
{...loading_status}
/>

{#if multiselect}
<Multiselect
Expand Down
6 changes: 5 additions & 1 deletion js/fallback/interactive/InteractiveFallback.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,11 @@
</script>

<Block {visible} {elem_id} {elem_classes} {container} {scale} {min_width}>
<StatusTracker i18n={gradio.i18n} {...loading_status} />
<StatusTracker
autoscroll={gradio.autoscroll}
i18n={gradio.i18n}
{...loading_status}
/>

<JsonView json={value} />
</Block>
6 changes: 5 additions & 1 deletion js/fallback/static/StaticFallback.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,11 @@
</script>

<Block {visible} {elem_id} {elem_classes} {container} {scale} {min_width}>
<StatusTracker i18n={gradio.i18n} {...loading_status} />
<StatusTracker
autoscroll={gradio.autoscroll}
i18n={gradio.i18n}
{...loading_status}
/>

<JsonView json={value} />
</Block>
1 change: 1 addition & 0 deletions js/file/interactive/InteractiveFile.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@
allow_overflow={false}
>
<StatusTracker
autoscroll={gradio.autoscroll}
i18n={gradio.i18n}
{...loading_status}
status={pending_upload
Expand Down
1 change: 1 addition & 0 deletions js/file/static/StaticFile.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@
allow_overflow={false}
>
<StatusTracker
autoscroll={gradio.autoscroll}
i18n={gradio.i18n}
{...loading_status}
status={pending_upload
Expand Down
6 changes: 5 additions & 1 deletion js/gallery/static/StaticGallery.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,11 @@
allow_overflow={false}
height={typeof height === "number" ? height : undefined}
>
<StatusTracker i18n={gradio.i18n} {...loading_status} />
<StatusTracker
autoscroll={gradio.autoscroll}
i18n={gradio.i18n}
{...loading_status}
/>
<Gallery
on:select={(e) => gradio.dispatch("select", e.detail)}
on:share={(e) => gradio.dispatch("share", e.detail)}
Expand Down
Loading
Loading