Skip to content

bump svelte-split-pane #1031

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Dec 17, 2024
Merged

bump svelte-split-pane #1031

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c7bdc02
bump svelte-split-pane
Rich-Harris Dec 16, 2024
957578b
fix
Rich-Harris Dec 17, 2024
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
2 changes: 1 addition & 1 deletion apps/svelte.dev/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"@lezer/common": "^1.0.4",
"@lezer/javascript": "^1.4.7",
"@lezer/lr": "^1.3.10",
"@rich_harris/svelte-split-pane": "^1.1.3",
"@rich_harris/svelte-split-pane": "^2.0.0",
"@shikijs/twoslash": "^1.22.0",
"@sveltejs/amp": "^1.1.4",
"@sveltejs/repl": "workspace:*",
Expand Down
120 changes: 64 additions & 56 deletions apps/svelte.dev/src/routes/tutorial/[...slug]/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,71 +262,79 @@

<div class="top" class:offset={show_editor}>
<SplitPane id="main" type="horizontal" min="360px" max="50%" pos="33%">
<section slot="a" class="content">
<Sidebar
bind:sidebar
exercise={data.exercise}
on:select={(e) => {
navigate_to_file(e.detail.file);
}}
/>
</section>

<section slot="b">
{#snippet a()}
<section class="content">
<Sidebar
bind:sidebar
exercise={data.exercise}
on:select={(e) => {
navigate_to_file(e.detail.file);
}}
/>
</section>
{/snippet}

{#snippet b()}
<SplitPane type="vertical" min="100px" max="-4.1rem" pos="50%">
<section slot="a">
{#snippet a()}
<SplitPane
id="editor"
type={mobile ? 'vertical' : 'horizontal'}
min="120px"
max="300px"
pos="200px"
>
<section slot="a" class="navigator">
{#if mobile}
<button class="file" onclick={() => (show_filetree = !show_filetree)}>
{workspace.current.name.replace(
data.exercise.scope.prefix,
data.exercise.scope.name + '/'
) ?? 'Files'}
</button>
{:else}
<Filetree exercise={data.exercise} {workspace} />
{/if}
</section>

<section slot="b" class="editor-container">
<Editor
{workspace}
autocomplete_filter={(file) => {
return (
file.name.startsWith('/src') &&
file.name.startsWith(data.exercise.scope.prefix) &&
file.name !== '/src/__client.js' &&
file.name !== '/src/app.html'
);
}}
/>
<ImageViewer selected={workspace.current} />

{#if mobile && show_filetree}
<div class="mobile-filetree">
<Filetree mobile exercise={data.exercise} {workspace} />
</div>
{/if}
</section>
{#snippet a()}
<section class="navigator">
{#if mobile}
<button class="file" onclick={() => (show_filetree = !show_filetree)}>
{workspace.current.name.replace(
data.exercise.scope.prefix,
data.exercise.scope.name + '/'
) ?? 'Files'}
</button>
{:else}
<Filetree exercise={data.exercise} {workspace} />
{/if}
</section>
{/snippet}

{#snippet b()}
<section class="editor-container">
<Editor
{workspace}
autocomplete_filter={(file) => {
return (
file.name.startsWith('/src') &&
file.name.startsWith(data.exercise.scope.prefix) &&
file.name !== '/src/__client.js' &&
file.name !== '/src/app.html'
);
}}
/>
<ImageViewer selected={workspace.current} />

{#if mobile && show_filetree}
<div class="mobile-filetree">
<Filetree mobile exercise={data.exercise} {workspace} />
</div>
{/if}
</section>
{/snippet}
</SplitPane>
</section>

<section slot="b" class="preview">
{#if needs_webcontainers(page.data.exercise)}
<Output exercise={data.exercise} {paused} {workspace} />
{:else}
<OutputRollup />
{/if}
</section>
{/snippet}

{#snippet b()}
<section class="preview">
{#if needs_webcontainers(page.data.exercise)}
<Output exercise={data.exercise} {paused} {workspace} />
{:else}
<OutputRollup />
{/if}
</section>
{/snippet}
</SplitPane>
</section>
{/snippet}
</SplitPane>
</div>

Expand Down Expand Up @@ -446,7 +454,7 @@
--pos: 5.4rem !important;
}

:global([data-pane]) :global(.divider) {
:global([data-pane]) :global(svelte-split-pane-divider) {
cursor: default;
}
}
Expand Down
2 changes: 1 addition & 1 deletion packages/repl/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
"@jridgewell/sourcemap-codec": "^1.4.15",
"@replit/codemirror-lang-svelte": "^6.0.0",
"@replit/codemirror-vim": "^6.0.14",
"@rich_harris/svelte-split-pane": "^1.1.3",
"@rich_harris/svelte-split-pane": "^2.0.0",
"@rollup/browser": "^4.17.2",
"@sveltejs/site-kit": "workspace:*",
"@sveltejs/svelte-json-tree": "^2.2.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/repl/src/lib/Output/Output.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@
{#if embedded}
<Editor workspace={js_workspace} />
{:else}
<PaneWithPanel pos="50%" panel="Compiler options">
<PaneWithPanel pos="50%" max="-4.2rem" panel="Compiler options">
<div slot="main">
<Editor workspace={js_workspace} />
</div>
Expand Down
43 changes: 23 additions & 20 deletions packages/repl/src/lib/Output/PaneWithPanel.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
<script lang="ts">
import { spring } from 'svelte/motion';
import { SplitPane } from '@rich_harris/svelte-split-pane';
import type { ComponentProps } from 'svelte';
import { SplitPane, type Length } from '@rich_harris/svelte-split-pane';

const UNIT_REGEX = /(\d+)(?:(px|rem|%|em))/i;

export let panel: string;

export let pos: Exclude<ComponentProps<SplitPane>['pos'], undefined> = '90%';
export let pos: Length = '90%';

$: previous_pos = Math.min(+pos.replace(UNIT_REGEX, '$1'), 70);

let max: Exclude<ComponentProps<SplitPane>['max'], undefined> = '90%';
export let max: Length = '90%';

// we can't bind to the spring itself, but we
// can still use the spring to drive `pos`
Expand All @@ -32,26 +31,30 @@
driver.set(previous_pos);
} else {
previous_pos = numeric_pos;
driver.set(+max.replace(UNIT_REGEX, '$1'));
driver.set(100);
}
};
</script>

<SplitPane {max} min="10%" type="vertical" bind:pos priority="max">
<section slot="a">
<slot name="main" />
</section>

<section slot="b">
<div class="panel-header">
<button class="panel-heading" on:click={toggle}>{panel}</button>
<slot name="panel-header" />
</div>

<div class="panel-body">
<slot name="panel-body" />
</div>
</section>
<SplitPane {max} min="10%" type="vertical" bind:pos>
{#snippet a()}
<section>
<slot name="main" />
</section>
{/snippet}

{#snippet b()}
<section>
<div class="panel-header">
<button class="panel-heading" on:click={toggle}>{panel}</button>
<slot name="panel-header" />
</div>

<div class="panel-body">
<slot name="panel-body" />
</div>
</section>
{/snippet}
</SplitPane>

<style>
Expand Down
2 changes: 1 addition & 1 deletion packages/repl/src/lib/Output/Viewer.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@

<div class="iframe-container">
{#if !onLog}
<PaneWithPanel pos="90%" panel="Console">
<PaneWithPanel pos="100%" max="-4.2rem" panel="Console">
<div slot="main">
{@render main()}
</div>
Expand Down
46 changes: 25 additions & 21 deletions packages/repl/src/lib/Repl.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,25 +175,29 @@
min="100px"
max="-4.1rem"
>
<section slot="a">
<ComponentSelector {runes} {onchange} {workspace} {can_migrate} />

<Editor {workspace} />
</section>

<section slot="b" style="height: 100%;">
<Output
status={status_visible ? status : null}
{embedded}
{relaxed}
{can_escape}
{injectedJS}
{injectedCSS}
{previewTheme}
{workspace}
runtimeError={status_visible ? runtime_error : null}
/>
</section>
{#snippet a()}
<section>
<ComponentSelector {runes} {onchange} {workspace} {can_migrate} />

<Editor {workspace} />
</section>
{/snippet}

{#snippet b()}
<section>
<Output
status={status_visible ? status : null}
{embedded}
{relaxed}
{can_escape}
{injectedJS}
{injectedCSS}
{previewTheme}
{workspace}
runtimeError={status_visible ? runtime_error : null}
/>
</section>
{/snippet}
</SplitPane>
</div>

Expand Down Expand Up @@ -237,7 +241,7 @@
}
}

[data-pane='main'] > .divider::after {
[data-pane='main'] > svelte-split-pane-divider::after {
height: calc(100% - var(--sk-pane-controls-height));
top: var(--sk-pane-controls-height);
}
Expand Down Expand Up @@ -269,7 +273,7 @@
--pos: 5.4rem !important;
}

[data-pane] .divider {
[data-pane] svelte-split-pane-divider {
cursor: default;
}
}
Expand Down
2 changes: 1 addition & 1 deletion packages/site-kit/src/lib/styles/utils/dividers.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.divider {
svelte-split-pane-divider {
z-index: 2;
&::after {
background-color: var(--sk-border) !important;
Expand Down
16 changes: 8 additions & 8 deletions pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading