Skip to content

Commit c124943

Browse files
Vinzent03Vinzent03
committed
fix: use proper tree structure on Obsidian 1.3.1
close #512
1 parent a0a34ea commit c124943

File tree

9 files changed

+62
-45
lines changed

9 files changed

+62
-45
lines changed

‎src/ui/history/components/logComponent.svelte

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,14 @@
2222
</script>
2323

2424
<main>
25-
<div class="staged nav-folder" class:is-collapsed={isCollapsed}>
25+
<div class="tree-item nav-folder" class:is-collapsed={isCollapsed}>
2626
<div
27-
class="nav-folder-title"
27+
class="tree-item-self is-clickable nav-folder-title"
2828
on:click={() => (isCollapsed = !isCollapsed)}
2929
>
30-
<div class="nav-folder-collapse-indicator collapse-icon">
30+
<div
31+
class="tree-item-icon nav-folder-collapse-indicator collapse-icon"
32+
>
3133
<svg
3234
xmlns="http://www.w3.org/2000/svg"
3335
width="24"
@@ -49,7 +51,7 @@
4951
</div>
5052
{/if}
5153
<div
52-
class="nav-folder-title-content"
54+
class="tree-item-inner nav-folder-title-content"
5355
aria-label={log.message}
5456
aria-label-position={side}
5557
>
@@ -59,7 +61,7 @@
5961
</div>
6062
{#if !isCollapsed}
6163
<div
62-
class="nav-folder-children"
64+
class="tree-item-children nav-folder-children"
6365
transition:slide|local={{ duration: 150 }}
6466
>
6567
{#if showTree}

‎src/ui/history/components/logFileComponent.svelte

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,14 @@
4141
on:click|stopPropagation={showDiff}
4242
on:auxclick|stopPropagation={showDiff}
4343
on:focus
44-
class="nav-file"
44+
class="tree-item nav-file"
4545
>
4646
<div
47-
class="nav-file-title"
47+
class="tree-item-self is-clickable nav-file-title"
4848
aria-label-position={side}
4949
aria-label={diff.vault_path}
5050
>
51-
<div class="nav-file-title-content">
51+
<div class="tree-item-inner nav-file-title-content">
5252
{getDisplayPath(diff.vault_path)}
5353
</div>
5454
<div class="git-tools">

‎src/ui/history/components/logTreeComponent.svelte

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,12 @@
2424
<LogFileComponent diff={entity.data} {view} />
2525
</div>
2626
{:else}
27-
<div class="nav-folder" class:is-collapsed={closed[entity.title]}>
27+
<div
28+
class="tree-item nav-folder"
29+
class:is-collapsed={closed[entity.title]}
30+
>
2831
<div
29-
class="nav-folder-title"
32+
class="tree-item-self is-clickable nav-folder-title"
3033
aria-label-position={side}
3134
aria-label={entity.vaultPath}
3235
on:click={() => fold(entity)}
@@ -35,7 +38,9 @@
3538
data-icon="folder"
3639
style="padding-right: 5px; display: flex; "
3740
/>
38-
<div class="nav-folder-collapse-indicator collapse-icon">
41+
<div
42+
class="tree-item-icon nav-folder-collapse-indicator collapse-icon"
43+
>
3944
<svg
4045
xmlns="http://www.w3.org/2000/svg"
4146
width="24"
@@ -50,14 +55,14 @@
5055
><path d="M3 8L12 17L21 8" /></svg
5156
>
5257
</div>
53-
<div class="nav-folder-title-content">
58+
<div class="tree-item-inner nav-folder-title-content">
5459
{entity.title}
5560
</div>
5661
</div>
5762

5863
{#if !closed[entity.title]}
5964
<div
60-
class="nav-folder-children"
65+
class="tree-item-children nav-folder-children"
6166
transition:slide|local={{ duration: 150 }}
6267
>
6368
<svelte:self hierarchy={entity} {plugin} {view} />

‎src/ui/history/historyView.svelte

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<script lang="ts">
22
import { setIcon } from "obsidian";
3-
import ObsidianGit from "src/main";
43
import { SimpleGit } from "src/gitManager/simpleGit";
4+
import ObsidianGit from "src/main";
55
import { LogEntry } from "src/types";
66
import { onDestroy } from "svelte";
77
import LogComponent from "./components/logComponent.svelte";
@@ -81,8 +81,8 @@
8181

8282
<div class="nav-files-container" style="position: relative;">
8383
{#if logs}
84-
<div class="nav-folder mod-root">
85-
<div class="nav-folder-children">
84+
<div class="tree-item nav-folder mod-root">
85+
<div class="tree-item-children nav-folder-children">
8686
{#each logs as log}
8787
<LogComponent {view} {showTree} {log} {plugin} />
8888
{/each}

‎src/ui/sourceControl/components/fileComponent.svelte

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,10 @@
8080
on:click|stopPropagation={showDiff}
8181
on:auxclick|stopPropagation={showDiff}
8282
on:focus
83-
class="nav-file"
83+
class="tree-item nav-file"
8484
>
8585
<div
86-
class="nav-file-title"
86+
class="tree-item-self is-clickable nav-file-title"
8787
aria-label-position={side}
8888
aria-label={change.vault_path}
8989
>
@@ -92,7 +92,7 @@
9292
bind:this={buttons[3]}
9393
style="padding-right: 5px; display: flex;"
9494
/> -->
95-
<div class="nav-file-title-content">
95+
<div class="tree-item-inner nav-file-title-content">
9696
{getDisplayPath(change.vault_path)}
9797
</div>
9898
<div class="git-tools">

‎src/ui/sourceControl/components/pulledFileComponent.svelte

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@
3030
on:click|stopPropagation={open}
3131
on:auxclick|stopPropagation={open}
3232
on:focus
33-
class="nav-file"
33+
class="tree-item nav-file"
3434
>
3535
<!-- svelte-ignore a11y-unknown-aria-attribute -->
3636
<div
37-
class="nav-file-title"
37+
class="tree-item-self is-clickable nav-file-title"
3838
aria-label-position={side}
3939
aria-label={change.vault_path}
4040
>
41-
<div class="nav-file-title-content">
41+
<div class="tree-item-inner nav-file-title-content">
4242
{getDisplayPath(change.vault_path)}
4343
</div>
4444
<div class="git-tools">

‎src/ui/sourceControl/components/stagedFileComponent.svelte

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,14 +56,14 @@
5656
on:focus
5757
on:click|stopPropagation={showDiff}
5858
on:auxclick|stopPropagation={showDiff}
59-
class="nav-file"
59+
class="tree-item nav-file"
6060
>
6161
<div
62-
class="nav-file-title"
62+
class="tree-item-self is-clickable nav-file-title"
6363
aria-label-position={side}
6464
aria-label={change.vault_path}
6565
>
66-
<div class="nav-file-title-content">
66+
<div class="tree-item-inner nav-file-title-content">
6767
{getDisplayPath(change.vault_path)}
6868
</div>
6969
<div class="git-tools">

‎src/ui/sourceControl/components/treeComponent.svelte

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,19 +70,21 @@
7070
{:else}
7171
<div
7272
on:click={() => fold(entity)}
73-
class="nav-folder"
73+
class="tree-item nav-folder"
7474
class:is-collapsed={closed[entity.title]}
7575
>
7676
<div
77-
class="nav-folder-title"
77+
class="tree-item-self is-clickable nav-folder-title"
7878
aria-label-position={side}
7979
aria-label={entity.vaultPath}
8080
>
8181
<div
8282
data-icon="folder"
8383
style="padding-right: 5px; display: flex; "
8484
/>
85-
<div class="nav-folder-collapse-indicator collapse-icon">
85+
<div
86+
class="tree-item-icon nav-folder-collapse-indicator collapse-icon"
87+
>
8688
<svg
8789
xmlns="http://www.w3.org/2000/svg"
8890
width="24"
@@ -97,7 +99,7 @@
9799
><path d="M3 8L12 17L21 8" /></svg
98100
>
99101
</div>
100-
<div class="nav-folder-title-content">
102+
<div class="tree-item-inner nav-folder-title-content">
101103
{entity.title}
102104
</div>
103105
<div class="git-tools">
@@ -190,7 +192,7 @@
190192

191193
{#if !closed[entity.title]}
192194
<div
193-
class="nav-folder-children"
195+
class="tree-item-children nav-folder-children"
194196
transition:slide|local={{ duration: 150 }}
195197
>
196198
<svelte:self

‎src/ui/sourceControl/sourceControl.svelte

Lines changed: 23 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -281,18 +281,18 @@
281281

282282
<div class="nav-files-container" style="position: relative;">
283283
{#if status && stagedHierarchy && changeHierarchy}
284-
<div class="nav-folder mod-root">
285-
<div class="nav-folder-children">
284+
<div class="tree-item nav-folder mod-root">
285+
<div class="tree-item-children nav-folder-children">
286286
<div
287-
class="staged nav-folder"
287+
class="staged tree-item nav-folder"
288288
class:is-collapsed={!stagedOpen}
289289
>
290290
<div
291-
class="nav-folder-title"
291+
class="tree-item-self is-clickable nav-folder-title"
292292
on:click={() => (stagedOpen = !stagedOpen)}
293293
>
294294
<div
295-
class="nav-folder-collapse-indicator collapse-icon"
295+
class="tree-item-icon nav-folder-collapse-indicator collapse-icon"
296296
>
297297
<svg
298298
xmlns="http://www.w3.org/2000/svg"
@@ -308,7 +308,9 @@
308308
><path d="M3 8L12 17L21 8" /></svg
309309
>
310310
</div>
311-
<div class="nav-folder-title-content">
311+
<div
312+
class="tree-item-inner nav-folder-title-content"
313+
>
312314
Staged Changes
313315
</div>
314316

@@ -347,7 +349,7 @@
347349
</div>
348350
{#if stagedOpen}
349351
<div
350-
class="nav-folder-children"
352+
class="tree-item-children nav-folder-children"
351353
transition:slide|local={{ duration: 150 }}
352354
>
353355
{#if showTree}
@@ -376,10 +378,10 @@
376378
>
377379
<div
378380
on:click={() => (changesOpen = !changesOpen)}
379-
class="nav-folder-title"
381+
class="tree-item-self is-clickable nav-folder-title"
380382
>
381383
<div
382-
class="nav-folder-collapse-indicator collapse-icon"
384+
class="tree-item-icon nav-folder-collapse-indicator collapse-icon"
383385
>
384386
<svg
385387
xmlns="http://www.w3.org/2000/svg"
@@ -396,7 +398,11 @@
396398
>
397399
</div>
398400

399-
<div class="nav-folder-title-content">Changes</div>
401+
<div
402+
class="tree-item-inner nav-folder-title-content"
403+
>
404+
Changes
405+
</div>
400406
<div class="git-tools">
401407
<div class="buttons">
402408
<div
@@ -460,7 +466,7 @@
460466
</div>
461467
{#if changesOpen}
462468
<div
463-
class="nav-folder-children"
469+
class="tree-item-children nav-folder-children"
464470
transition:slide|local={{ duration: 150 }}
465471
>
466472
{#if showTree}
@@ -490,13 +496,13 @@
490496
class:is-collapsed={!lastPulledFilesOpen}
491497
>
492498
<div
493-
class="nav-folder-title"
499+
class="tree-item-self is-clickable nav-folder-title"
494500
on:click={() =>
495501
(lastPulledFilesOpen =
496502
!lastPulledFilesOpen)}
497503
>
498504
<div
499-
class="nav-folder-collapse-indicator collapse-icon"
505+
class="tree-item-icon nav-folder-collapse-indicator collapse-icon"
500506
>
501507
<svg
502508
xmlns="http://www.w3.org/2000/svg"
@@ -513,7 +519,9 @@
513519
>
514520
</div>
515521

516-
<div class="nav-folder-title-content">
522+
<div
523+
class="tree-item-inner nav-folder-title-content"
524+
>
517525
Recently Pulled Files
518526
</div>
519527

@@ -523,7 +531,7 @@
523531
</div>
524532
{#if lastPulledFilesOpen}
525533
<div
526-
class="nav-folder-children"
534+
class="tree-item-children nav-folder-children"
527535
transition:slide|local={{ duration: 150 }}
528536
>
529537
{#if showTree}

0 commit comments

Comments
 (0)