@dosgato/dialog 0.0.57 → 0.0.59

package/dist/tree/treestore.d.ts

@@ -1,4 +1,4 @@
-import { ActiveStore } from '@txstate-mws/svelte-store';
+import { ActiveStore, Store } from '@txstate-mws/svelte-store';
 import type { IconifyIcon } from '@iconify/svelte';
 import type { SvelteComponent } from 'svelte';
 export declare const TREE_STORE_CONTEXT: {};
@@ -18,7 +18,6 @@ export interface ITreeStore<T extends TreeItemFromDB> {
     loading?: boolean;
     rootItems?: TypedTreeItem<T>[];
     itemsById: Record<string, TypedTreeItem<T> | undefined>;
-    filter?: string;
     focused?: TypedTreeItem<T>;
     selected: Map<string, TypedTreeItem<T>>;
     selectedItems: TypedTreeItem<T>[];
@@ -51,7 +50,7 @@ export declare class TreeStore<T extends TreeItemFromDB> extends ActiveStore<ITr
     fetchChildren: FetchChildrenFn<T>;
     treeElement?: HTMLElement;
     rootItems: import("@txstate-mws/svelte-store").DerivedStore<TypedTreeItem<T>[] | undefined, ITreeStore<T>>;
-    filterTerm: import("@txstate-mws/svelte-store").DerivedStore<string | undefined, ITreeStore<T>>;
+    filterTerm: Store<string>;
     filteredRootItems: import("svelte/store").Readable<TypedTreeItem<T>[] | undefined>;
     draggable: import("@txstate-mws/svelte-store").DerivedStore<boolean, ITreeStore<T>>;
     dragging: import("@txstate-mws/svelte-store").DerivedStore<boolean, ITreeStore<T>>;
@@ -83,13 +82,16 @@ export declare class TreeStore<T extends TreeItemFromDB> extends ActiveStore<ITr
     trigger(): void;
     fetch(item?: TypedTreeItem<T>): Promise<TypedTreeItem<T>[]>;
     refresh(item?: TypedTreeItem<T>, skipNotify?: boolean): Promise<void>;
-    filter(term: string | undefined, notify?: boolean): void;
+    filter(term: string | undefined): void;
     focus(item: TypedTreeItem<T> | undefined, notify?: boolean): void;
     select(item: TypedTreeItem<T>, { clear, notify, toggle }: {
         clear?: boolean | undefined;
         notify?: boolean | undefined;
         toggle?: boolean | undefined;
     }): void;
+    setSelected(items: TypedTreeItem<T>[], { notify }: {
+        notify?: boolean | undefined;
+    }): void;
     selectById(id: string, { clear, notify, toggle }: {
         clear?: boolean | undefined;
         notify?: boolean | undefined;

package/dist/tree/treestore.js

@@ -1,25 +1,35 @@
-import { ActiveStore, derivedStore } from '@txstate-mws/svelte-store';
+import { ActiveStore, derivedStore, Store } from '@txstate-mws/svelte-store';
 import { derived } from 'svelte/store';
-import { hashid, isBlank, keyby, toArray } from 'txstate-utils';
+import { hashid, isBlank, isNotBlank, keyby, toArray } from 'txstate-utils';
 export const TREE_STORE_CONTEXT = {};
 export class TreeStore extends ActiveStore {
     fetchChildren;
     treeElement;
     rootItems = derivedStore(this, 'rootItems');
-    filterTerm = derivedStore(this, 'filter');
+    filterTerm = new Store('');
     filteredRootItems = derived([this.rootItems, this.filterTerm], ([rootItems, filter]) => {
         if (!this.searchableFn || !rootItems?.length || isBlank(filter))
             return this.value.rootItems;
         const ret = [];
+        const newselected = [];
+        let foundfocus = false;
         for (const itm of this.value.rootItems ?? []) {
             let found = false;
             for (const val of this.searchableFn(itm)) {
                 if (val.toLocaleLowerCase().startsWith(filter))
                     found = true;
             }
-            if (found)
+            if (found) {
+                if (this.value.selected.has(itm.id))
+                    newselected.push(itm);
+                if (this.value.focused?.id === itm.id)
+                    foundfocus = true;
                 ret.push(itm);
+            }
         }
+        if (!foundfocus)
+            this.focus(ret[0]);
+        this.setSelected(newselected, {});
         return ret;
     });
     draggable = derivedStore(this, v => v.draggable && !v.loading);
@@ -142,10 +152,8 @@ export class TreeStore extends ActiveStore {
         await this.refreshPromise;
         this.refreshPromise = undefined;
     }
-    filter(term, notify = true) {
-        this.value.filter = term?.toLocaleLowerCase();
-        if (notify)
-            this.trigger();
+    filter(term) {
+        this.filterTerm.set(term?.toLocaleLowerCase() ?? '');
     }
     focus(item, notify = true) {
         this.value.focused = item;
@@ -169,6 +177,13 @@ export class TreeStore extends ActiveStore {
         if (notify)
             this.trigger();
     }
+    setSelected(items, { notify = true }) {
+        this.value.selected.clear();
+        for (const itm of items)
+            this.value.selected.set(itm.id, itm);
+        if (notify)
+            this.trigger();
+    }
     selectById(id, { clear = false, notify = true, toggle = false }) {
         const item = this.value.itemsById[id];
         if (item)
@@ -380,12 +395,11 @@ export const lazyObserver = typeof IntersectionObserver !== 'undefined'
     }, { rootMargin: '500px' })
     : undefined;
 export function transformSearchable(searchable) {
-    console.log('transformSearchable', searchable);
     return searchable == null
         ? undefined
         : (typeof searchable === 'function'
-            ? (itm) => toArray(searchable(itm))
+            ? (itm) => toArray(searchable(itm)).filter(isNotBlank)
             : (Array.isArray(searchable)
-                ? (itm) => searchable.map(k => itm[k])
-                : (itm) => [itm[searchable]]));
+                ? (itm) => searchable.map(k => itm[k]).filter(isNotBlank)
+                : (itm) => isNotBlank(itm[searchable]) ? [itm[searchable]] : []));
 }

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.57",
+  "version": "0.0.59",
   "scripts": {
     "prepublishOnly": "svelte-package",
     "dev": "vite dev --force",