Skip to content

Commit 8b9255d

Browse files
committed
update routing
1 parent 0ba753f commit 8b9255d

File tree

3 files changed

+22
-14
lines changed

3 files changed

+22
-14
lines changed

src/lib/menus/channel-menu.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { CheckMenuItem, Menu, MenuItem, PredefinedMenuItem } from "@tauri-apps/api/menu";
22
import { goto } from "$app/navigation";
3+
import { page } from "$app/state";
34
import { app } from "$lib/app.svelte";
45
import type { SplitDirection, SplitParent } from "$lib/managers/split-manager.svelte";
56
import type { Channel } from "$lib/models/channel.svelte";
@@ -17,6 +18,8 @@ async function splitItem(channel: Channel, direction: SplitDirection) {
1718

1819
if (!app.focused) return;
1920

21+
app.splits.root ??= app.focused.id;
22+
2023
const node: SplitParent = {
2124
direction: direction === "up" || direction === "down" ? "vertical" : "horizontal",
2225
first: channel.id,
@@ -29,6 +32,10 @@ async function splitItem(channel: Channel, direction: SplitDirection) {
2932
}
3033

3134
app.splits.insert(app.focused.id, channel.id, node);
35+
36+
if (page.route.id !== "/(main)/channels/split") {
37+
await goto("/channels/split");
38+
}
3239
},
3340
});
3441
}
Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,7 @@
11
<script lang="ts">
2-
import { app } from "$lib/app.svelte.js";
3-
import SplitNode from "$lib/components/split/SplitNode.svelte";
4-
import SplitView from "$lib/components/split/SplitView.svelte";
2+
import Channel from "$lib/components/Channel.svelte";
53
64
const { data } = $props();
7-
8-
$effect(() => {
9-
app.splits.root = data.channel.id;
10-
});
115
</script>
126

13-
<div class="h-full">
14-
{#if app.splits.root}
15-
<SplitNode node={app.splits.root} />
16-
{:else}
17-
<SplitView id="blank" />
18-
{/if}
19-
</div>
7+
<Channel channel={data.channel} />
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<script lang="ts">
2+
import { app } from "$lib/app.svelte.js";
3+
import SplitNode from "$lib/components/split/SplitNode.svelte";
4+
import SplitView from "$lib/components/split/SplitView.svelte";
5+
</script>
6+
7+
<div class="h-full">
8+
{#if app.splits.root}
9+
<SplitNode node={app.splits.root} />
10+
{:else}
11+
<SplitView id="blank" />
12+
{/if}
13+
</div>

0 commit comments

Comments
 (0)