Skip to content

Commit cfc9999

Browse files
authored
Merge pull request #63 from abdel-17/cleanup
chore: cleanup
2 parents 8bf23e3 + d555425 commit cfc9999

File tree

15 files changed

+268
-255
lines changed

15 files changed

+268
-255
lines changed

packages/svelte-file-tree/package.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@
3434
"svelte": "^5.20.0"
3535
},
3636
"dependencies": {
37-
"esm-env": "^1.2.2",
38-
"svelte-signals": "^0.0.2"
37+
"esm-env": "^1.2.2"
3938
},
4039
"devDependencies": {
4140
"@sveltejs/kit": "^2.20.4",

packages/svelte-file-tree/src/lib/components/Tree/Tree.svelte renamed to packages/svelte-file-tree/src/lib/components/Tree.svelte

+1-1
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@
110110
<div {...rest} bind:this={ref} {id} role="tree" aria-multiselectable="true">
111111
{#each treeState.items() as i (i.node.id)}
112112
<TreeItemProvider {treeState} item={i}>
113-
{#if i.visible()}
113+
{#if i.visible}
114114
{@render item({ item: i })}
115115
{/if}
116116
</TreeItemProvider>

packages/svelte-file-tree/src/lib/components/TreeItem/TreeItem.svelte renamed to packages/svelte-file-tree/src/lib/components/TreeItem.svelte

+12-14
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,9 @@
33
import { DEV } from "esm-env";
44
import { flushSync, getContext, hasContext, setContext } from "svelte";
55
import type { EventHandler } from "svelte/elements";
6-
import { getTreeItemProviderContext } from "../Tree/TreeItemProvider.svelte";
7-
import type { TreeItemPosition } from "../Tree/state.svelte.js";
8-
import type { TreeItemState } from "../Tree/types.js";
9-
import { createDragState } from "./state.svelte.js";
10-
import type { TreeItemChildrenSnippetArgs, TreeItemProps } from "./types.js";
6+
import { getTreeItemProviderContext } from "./TreeItemProvider.svelte";
7+
import { createTreeItemDragState, type TreeItemPosition } from "./state.svelte.js";
8+
import type { TreeItemChildrenSnippetArgs, TreeItemProps, TreeItemState } from "./types.js";
119
1210
const CONTEXT_KEY = Symbol("TreeItem");
1311
@@ -50,7 +48,7 @@
5048
}: TreeItemProps = $props();
5149
5250
const { dropPosition, canDrop, getLatestDropPosition, updateDropPosition, clearDropPosition } =
53-
createDragState({
51+
createTreeItemDragState({
5452
draggedId: treeState.draggedId,
5553
item,
5654
});
@@ -73,7 +71,7 @@
7371
return;
7472
}
7573
76-
if (item().disabled()) {
74+
if (item().disabled) {
7775
return;
7876
}
7977
@@ -84,7 +82,7 @@
8482
break;
8583
}
8684
87-
if (!item().expanded()) {
85+
if (!item().expanded) {
8886
treeState.expandedIds().add(node.id);
8987
break;
9088
}
@@ -95,7 +93,7 @@
9593
break;
9694
}
9795
case "ArrowLeft": {
98-
if (item().node.type === "folder" && item().expanded()) {
96+
if (item().node.type === "folder" && item().expanded) {
9997
treeState.expandedIds().delete(item().node.id);
10098
break;
10199
}
@@ -270,7 +268,7 @@
270268
break;
271269
}
272270
case "F2": {
273-
if (item().editable()) {
271+
if (item().editable) {
274272
editing = true;
275273
}
276274
break;
@@ -312,7 +310,7 @@
312310
};
313311
314312
const handleClick: EventHandler<MouseEvent, HTMLElement> = (event) => {
315-
if (item().disabled()) {
313+
if (item().disabled) {
316314
return;
317315
}
318316
@@ -327,7 +325,7 @@
327325
};
328326
329327
const handleDragStart: EventHandler<DragEvent, HTMLElement> = (event) => {
330-
if (item().disabled()) {
328+
if (item().disabled) {
331329
return;
332330
}
333331
@@ -402,8 +400,8 @@
402400
bind:this={ref}
403401
id={treeState.getItemElementId(item().node.id)}
404402
role="treeitem"
405-
aria-selected={item().selected()}
406-
aria-expanded={hasChildren(item()) ? item().expanded() : undefined}
403+
aria-selected={item().selected}
404+
aria-expanded={hasChildren(item()) ? item().expanded : undefined}
407405
aria-level={item().depth + 1}
408406
aria-posinset={item().index + 1}
409407
aria-setsize={item().parent?.node.children.length ?? treeState.tree().children.length}

packages/svelte-file-tree/src/lib/components/TreeItem/state.svelte.ts

-86
This file was deleted.

packages/svelte-file-tree/src/lib/components/TreeItem/types.ts

-31
This file was deleted.

packages/svelte-file-tree/src/lib/components/TreeItemInput/TreeItemInput.svelte renamed to packages/svelte-file-tree/src/lib/components/TreeItemInput.svelte

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
import { composeEventHandlers } from "$lib/internal/helpers.js";
33
import type { Action } from "svelte/action";
44
import type { EventHandler } from "svelte/elements";
5-
import { getTreeItemProviderContext } from "../Tree/TreeItemProvider.svelte";
6-
import { getTreeItemContext } from "../TreeItem/TreeItem.svelte";
5+
import { getTreeItemContext } from "./TreeItem.svelte";
6+
import { getTreeItemProviderContext } from "./TreeItemProvider.svelte";
77
import type { TreeItemInputProps } from "./types.js";
88
99
const { treeState, item } = getTreeItemProviderContext();

packages/svelte-file-tree/src/lib/components/TreeItemInput/types.ts

-6
This file was deleted.

0 commit comments

Comments
 (0)