Skip to content

Commit

Permalink
style: format
Browse files Browse the repository at this point in the history
  • Loading branch information
@Vinzent03
Vinzent03 committed Sep 19, 2022
1 parent 271ec02 commit 9282c60
Show file tree
Hide file tree
Showing 5 changed files with 683 additions and 664 deletions.
347 changes: 169 additions & 178 deletions src/ui/sidebar/components/fileComponent.svelte
View file
Original file line number Diff line number Diff line change
@@ -1,198 +1,189 @@
<script lang="ts">
import {
requireApiVersion,
setIcon,
Workspace,
WorkspaceLeaf,
} from "obsidian";
import {
hoverPreview,
openOrSwitch,
openView,
} from "obsidian-community-lib";
import { DIFF_VIEW_CONFIG } from "src/constants";
import { GitManager } from "src/gitManager";
import { FileStatusResult } from "src/types";
import { DiscardModal } from "src/ui/modals/discardModal";
import { getNewLeaf } from "src/utils";
import GitView from "../sidebarView";
import { setIcon } from "obsidian";
import { hoverPreview, openOrSwitch } from "obsidian-community-lib";
import { DIFF_VIEW_CONFIG } from "src/constants";
import { GitManager } from "src/gitManager";
import { FileStatusResult } from "src/types";
import { DiscardModal } from "src/ui/modals/discardModal";
import { getNewLeaf } from "src/utils";
import GitView from "../sidebarView";
export let change: FileStatusResult;
export let view: GitView;
export let manager: GitManager;
let buttons: HTMLElement[] = [];
$: side = (view.leaf.getRoot() as any).side == "left" ? "right" : "left";
export let change: FileStatusResult;
export let view: GitView;
export let manager: GitManager;
let buttons: HTMLElement[] = [];
$: side = (view.leaf.getRoot() as any).side == "left" ? "right" : "left";
window.setTimeout(
() => buttons.forEach((b) => setIcon(b, b.getAttr("data-icon"), 16)),
0
);
window.setTimeout(
() => buttons.forEach((b) => setIcon(b, b.getAttr("data-icon"), 16)),
0
);
function hover(event: MouseEvent) {
//Don't show previews of config- or hidden files.
if (
!change.path.startsWith(view.app.vault.configDir) ||
!change.path.startsWith(".")
) {
hoverPreview(
event,
view as any,
change.vault_path.split("/").last().replace(".md", "")
);
}
}
function hover(event: MouseEvent) {
//Don't show previews of config- or hidden files.
if (
!change.path.startsWith(view.app.vault.configDir) ||
!change.path.startsWith(".")
) {
hoverPreview(
event,
view as any,
change.vault_path.split("/").last().replace(".md", "")
);
}
}
function open(event: MouseEvent) {
if (
!(
change.path.startsWith(view.app.vault.configDir) ||
change.path.startsWith(".") ||
change.working_dir === "D"
)
) {
openOrSwitch(change.vault_path, event);
}
}
function open(event: MouseEvent) {
if (
!(
change.path.startsWith(view.app.vault.configDir) ||
change.path.startsWith(".") ||
change.working_dir === "D"
)
) {
openOrSwitch(change.vault_path, event);
}
}
function stage() {
manager.stage(change.path, false).finally(() => {
dispatchEvent(new CustomEvent("git-refresh"));
});
}
function stage() {
manager.stage(change.path, false).finally(() => {
dispatchEvent(new CustomEvent("git-refresh"));
});
}
function showDiff(event: MouseEvent) {
getNewLeaf(event).setViewState({
type: DIFF_VIEW_CONFIG.type,
active: true,
state: {
file: change.path,
staged: false,
},
});
}
function showDiff(event: MouseEvent) {
getNewLeaf(event).setViewState({
type: DIFF_VIEW_CONFIG.type,
active: true,
state: {
file: change.path,
staged: false,
},
});
}
function discard() {
const deleteFile = change.working_dir == "U";
new DiscardModal(view.app, deleteFile, change.vault_path)
.myOpen()
.then((shouldDiscard) => {
if (shouldDiscard === true) {
if (deleteFile) {
view.app.vault.adapter
.remove(change.vault_path)
.finally(() => {
dispatchEvent(new CustomEvent("git-refresh"));
});
} else {
manager.discard(change.path).finally(() => {
dispatchEvent(new CustomEvent("git-refresh"));
});
}
}
});
}
function discard() {
const deleteFile = change.working_dir == "U";
new DiscardModal(view.app, deleteFile, change.vault_path)
.myOpen()
.then((shouldDiscard) => {
if (shouldDiscard === true) {
if (deleteFile) {
view.app.vault.adapter
.remove(change.vault_path)
.finally(() => {
dispatchEvent(new CustomEvent("git-refresh"));
});
} else {
manager.discard(change.path).finally(() => {
dispatchEvent(new CustomEvent("git-refresh"));
});
}
}
});
}
</script>

<!-- TODO: Fix arai-label for left sidebar and if it's too long -->
<main on:mouseover={hover} on:click|self={showDiff} on:focus>
<!-- svelte-ignore a11y-unknown-aria-attribute -->
<span
class="path"
aria-label-position={side}
aria-label={change.vault_path.split("/").last() != change.vault_path
? change.vault_path
: ""}
on:click|self={showDiff}
>
{change.vault_path.split("/").last().replace(".md", "")}
</span>
<div class="tools">
<div class="buttons">
{#if view.app.vault.getAbstractFileByPath(change.vault_path)}
<div
data-icon="go-to-file"
aria-label="Open File"
bind:this={buttons[1]}
on:click={open}
/>
{/if}
<div
data-icon="skip-back"
aria-label="Discard"
bind:this={buttons[0]}
on:click={discard}
/>
<div
data-icon="plus"
aria-label="Stage"
bind:this={buttons[2]}
on:click={stage}
/>
</div>
<span class="type" data-type={change.working_dir}
>{change.working_dir}</span
>
</div>
<!-- svelte-ignore a11y-unknown-aria-attribute -->
<span
class="path"
aria-label-position={side}
aria-label={change.vault_path.split("/").last() != change.vault_path
? change.vault_path
: ""}
on:click|self={showDiff}
>
{change.vault_path.split("/").last().replace(".md", "")}
</span>
<div class="tools">
<div class="buttons">
{#if view.app.vault.getAbstractFileByPath(change.vault_path)}
<div
data-icon="go-to-file"
aria-label="Open File"
bind:this={buttons[1]}
on:click={open}
/>
{/if}
<div
data-icon="skip-back"
aria-label="Discard"
bind:this={buttons[0]}
on:click={discard}
/>
<div
data-icon="plus"
aria-label="Stage"
bind:this={buttons[2]}
on:click={stage}
/>
</div>
<span class="type" data-type={change.working_dir}
>{change.working_dir}</span
>
</div>
</main>

<style lang="scss">
main {
cursor: pointer;
background-color: var(--background-secondary);
border-radius: 4px;
width: 98%;
display: flex;
justify-content: space-between;
font-size: 0.8rem;
margin-bottom: 2px;
main {
cursor: pointer;
background-color: var(--background-secondary);
border-radius: 4px;
width: 98%;
display: flex;
justify-content: space-between;
font-size: 0.8rem;
margin-bottom: 2px;
.path {
color: var(--text-muted);
white-space: nowrap;
max-width: 75%;
overflow: hidden;
text-overflow: ellipsis;
}
.path {
color: var(--text-muted);
white-space: nowrap;
max-width: 75%;
overflow: hidden;
text-overflow: ellipsis;
}
&:hover .path {
color: var(--text-normal);
transition: all 200ms;
}
&:hover .path {
color: var(--text-normal);
transition: all 200ms;
}
.tools {
display: flex;
align-items: center;
.tools {
display: flex;
align-items: center;
.type {
height: 16px;
width: 16px;
margin: 0;
display: flex;
align-items: center;
justify-content: center;
&[data-type="M"] {
color: orange;
}
&[data-type="D"] {
color: red;
}
}
.buttons {
display: flex;
> * {
color: var(--text-faint);
height: 16px;
width: 16px;
margin: 0;
transition: all 0.2s;
border-radius: 2px;
margin-right: 1px;
&:hover {
color: var(--text-normal);
background-color: var(--interactive-accent);
}
}
}
}
}
.type {
height: 16px;
width: 16px;
margin: 0;
display: flex;
align-items: center;
justify-content: center;
&[data-type="M"] {
color: orange;
}
&[data-type="D"] {
color: red;
}
}
.buttons {
display: flex;
> * {
color: var(--text-faint);
height: 16px;
width: 16px;
margin: 0;
transition: all 0.2s;
border-radius: 2px;
margin-right: 1px;
&:hover {
color: var(--text-normal);
background-color: var(--interactive-accent);
}
}
}
}
}
</style>
1 change: 0 additions & 1 deletion src/ui/sidebar/components/pulledFileComponent.svelte
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<script lang="ts">
import { setIcon, Workspace } from "obsidian";
import { hoverPreview, openOrSwitch } from "obsidian-community-lib";
import { FileStatusResult } from "src/types";
import GitView from "../sidebarView";
Expand Down
2 changes: 1 addition & 1 deletion src/ui/sidebar/components/stagedFileComponent.svelte
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script lang="ts">
import { FileView, setIcon, TAbstractFile } from "obsidian";
import { setIcon } from "obsidian";
import { hoverPreview, openOrSwitch } from "obsidian-community-lib";
import { DIFF_VIEW_CONFIG } from "src/constants";
import { GitManager } from "src/gitManager";
Expand Down
Loading

0 comments on commit 9282c60

Please sign in to comment.