@dosgato/dialog 0.0.73 → 0.0.75

package/dist/chooser/ChooserStore.js

@@ -117,10 +117,10 @@ export function cleanUrl(url) {
 }
 export function humanFileType(mime, extension) {
     if (mime.startsWith('image/') || mime.startsWith('video/'))
-        return mime;
-    if (mime.startsWith('text/'))
-        return 'text - ' + extension;
+        return mime.split(';')[0];
     if (extension === 'js')
         return 'javascript';
+    if (mime.startsWith('text/'))
+        return 'text - ' + extension;
     return extension;
 }

package/dist/tree/Tree.svelte

@@ -146,7 +146,8 @@ afterUpdate(() => {
         }
     }
 });
-$: myRootItems = $store && $filteredRootItems;
+$: myRootItemIds = $store && $filteredRootItems;
+$: myRootItems = $store?.rootItems?.filter(r => myRootItemIds.has(r.id)) ?? [];
 </script>
 
 <svelte:window on:mouseup={headerDragEnd} />

package/dist/tree/treestore.d.ts

@@ -31,7 +31,7 @@ export interface ITreeStore<T extends TreeItemFromDB> {
 }
 export type FetchChildrenFn<T extends TreeItemFromDB> = (item?: TypedTreeItem<T>) => Promise<T[]>;
 export type DragEligibleFn<T extends TreeItemFromDB> = (selectedItems: TypedTreeItem<T>[], userWantsCopy: boolean) => boolean;
-export type DropEffectFn<T extends TreeItemFromDB> = (selectedItems: TypedTreeItem<T>[], dropTarget: TypedTreeItem<T>, above: boolean, userWantsCopy: boolean) => 'move' | 'copy' | 'none';
+export type DropEffectFn<T extends TreeItemFromDB> = (selectedItems: TypedTreeItem<T>[], dropTarget: TypedTreeItem<T>, above: boolean, userWantsCopy: boolean, dragging: boolean) => 'move' | 'copy' | 'none';
 export type MoveHandlerFn<T extends TreeItemFromDB> = (selectedItems: TypedTreeItem<T>[], dropTarget: TypedTreeItem<T>, above: boolean) => boolean | Promise<boolean>;
 export type CopyHandlerFn<T extends TreeItemFromDB> = (selectedItems: TypedTreeItem<T>[], dropTarget: TypedTreeItem<T>, above: boolean, userWantsRecursive: boolean | undefined) => boolean | Promise<boolean>;
 export type SearchableFn<T extends TreeItemFromDB> = (item: TypedTreeItem<T>) => string[];
@@ -58,7 +58,7 @@ export declare class TreeStore<T extends TreeItemFromDB> extends ActiveStore<ITr
     treeElement?: HTMLElement;
     rootItems: import("@txstate-mws/svelte-store").DerivedStore<TypedTreeItem<T>[] | undefined, ITreeStore<T>>;
     filterTerm: Store<string>;
-    filteredRootItems: import("svelte/store").Readable<TypedTreeItem<T>[] | undefined>;
+    filteredRootItems: import("svelte/store").Readable<Set<string>>;
     draggable: import("@txstate-mws/svelte-store").DerivedStore<boolean, ITreeStore<T>>;
     dragging: import("@txstate-mws/svelte-store").DerivedStore<boolean, ITreeStore<T>>;
     selectedUndraggable: import("@txstate-mws/svelte-store").DerivedStore<boolean | undefined, ITreeStore<T>>;

package/dist/tree/treestore.js

@@ -9,8 +9,8 @@ export class TreeStore extends ActiveStore {
     filterTerm = new Store('');
     filteredRootItems = derived([this.rootItems, this.filterTerm], ([rootItems, filter]) => {
         if (!this.searchableFn || !rootItems?.length || isBlank(filter))
-            return this.value.rootItems;
-        const ret = [];
+            return new Set(this.value.rootItems?.map(r => r.id));
+        const ret = new Set();
         const newselected = [];
         let foundfocus = false;
         for (const itm of this.value.rootItems ?? []) {
@@ -24,7 +24,7 @@ export class TreeStore extends ActiveStore {
                     newselected.push(itm);
                 if (this.value.focused?.id === itm.id)
                     foundfocus = true;
-                ret.push(itm);
+                ret.add(itm.id);
             }
         }
         if (!foundfocus)
@@ -203,9 +203,7 @@ export class TreeStore extends ActiveStore {
     }
     async openAndRefresh(item, notify = true) {
         await this.refresh(item, true);
-        const newItem = this.value.itemsById[item.id];
-        newItem.open = !!newItem.children?.length;
-        item.open = newItem.open;
+        item.open = !!item.children?.length;
         if (notify)
             this.trigger();
     }
@@ -226,7 +224,6 @@ export class TreeStore extends ActiveStore {
     async viewUnder(item) {
         if (item)
             await this.open(item);
-        this.trigger();
     }
     dragStart(item) {
         if (this.value.dragging || !this.value.draggable)
@@ -305,7 +302,7 @@ export class TreeStore extends ActiveStore {
         return !this.dragEligibleHandler || this.dragEligibleHandler(selectedItems, userWantsCopy);
     }
     _dropEffect(item, droppedItems, above, userWantsCopy) {
-        const handlerAnswer = this.dropEffectHandler?.(Array.from(droppedItems.values()), item, above, userWantsCopy) ?? 'move';
+        const handlerAnswer = this.dropEffectHandler?.(Array.from(droppedItems.values()), item, above, userWantsCopy, this.value.dragging) ?? 'move';
         if (handlerAnswer === 'none')
             return 'none';
         if (handlerAnswer === 'move') {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dosgato/dialog",
   "description": "A component library for building forms that edit a JSON document.",
-  "version": "0.0.73",
+  "version": "0.0.75",
   "scripts": {
     "prepublishOnly": "svelte-package",
     "dev": "vite dev --force",