skandha-facets 0.8.1 → 0.10.0

package/Addition.d.ts

@@ -1,11 +1,11 @@
-import { AdditionCbs, GenericObjectT } from './AdditionCbs';
+import { GenericObjectT } from './AdditionCbs';
 export type { AdditionCbs } from './AdditionCbs';
 export declare class Addition<ValueT = any> {
     static className: () => string;
     item?: ValueT;
     parentId?: string;
-    add(values: GenericObjectT): (cbs: AdditionCbs<ValueT>['add']) => void;
-    confirm(): (cbs: AdditionCbs<ValueT>['confirm']) => void;
-    cancel(): (cbs: AdditionCbs<ValueT>['cancel']) => void;
+    add(values: GenericObjectT): Promise<void>;
+    confirm(): Promise<void>;
+    cancel(): Promise<void>;
     _reset(): void;
 }

package/Addition.js

@@ -4,7 +4,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-import { host, maybe } from 'aspiration';
+import { getCallbacks, host } from 'aspiration';
 import { data, operation } from 'skandha';
 export class Addition {
     constructor() {
@@ -22,23 +22,24 @@ export class Addition {
         });
     }
     add(values) {
-        return (cbs) => {
-            maybe(cbs.storeLocation).bind(cbs)();
-            this.item = cbs.createItem();
-            maybe(cbs.highlightNewItem).bind(cbs)();
-        };
+        const cbs = getCallbacks(this);
+        cbs.storeLocation && cbs.storeLocation();
+        return Promise.resolve(cbs.createItem()).then((item) => {
+            this.item = item;
+            cbs.highlightNewItem && cbs.highlightNewItem();
+        });
     }
     confirm() {
-        return (cbs) => {
-            cbs.confirm();
+        const cbs = getCallbacks(this);
+        return Promise.resolve(cbs.confirm()).then(() => {
             this._reset();
-        };
+        });
     }
     cancel() {
-        return (cbs) => {
-            this._reset();
-            maybe(cbs.restoreLocation).bind(cbs)();
-        };
+        const cbs = getCallbacks(this);
+        return Promise.resolve(this._reset()).then(() => {
+            cbs.restoreLocation && cbs.restoreLocation();
+        });
     }
     _reset() {
         this.item = undefined;

package/AdditionCbs.d.ts

@@ -1,19 +1,19 @@
-import { Cbs } from "aspiration";
+import { Cbs } from 'aspiration';
 export declare type GenericObjectT = any;
-export declare class Addition_add<ValueT = any> extends Cbs {
+export interface Addition_add<ValueT> extends Cbs {
     values: GenericObjectT;
     storeLocation(): void;
     createItem(): ValueT;
     highlightNewItem(): void;
 }
-export declare class Addition_confirm extends Cbs {
+export interface Addition_confirm extends Cbs {
     confirm(): void;
 }
-export declare class Addition_cancel extends Cbs {
+export interface Addition_cancel extends Cbs {
     restoreLocation(): void;
 }
-export declare type AdditionCbs<ValueT = any> = {
+export interface AdditionCbs<ValueT = any> {
     add: Addition_add<ValueT>;
     confirm: Addition_confirm;
     cancel: Addition_cancel;
-};
+}

package/AdditionCbs.js

@@ -1,23 +1 @@
-import { stub, Cbs } from "aspiration";
-export class Addition_add extends Cbs {
-    constructor() {
-        super(...arguments);
-        Object.defineProperty(this, "values", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-    }
-    storeLocation() { }
-    createItem() {
-        return stub();
-    }
-    highlightNewItem() { }
-}
-export class Addition_confirm extends Cbs {
-    confirm() { }
-}
-export class Addition_cancel extends Cbs {
-    restoreLocation() { }
-}
+export {};

package/Deletion.d.ts

@@ -1,6 +1,5 @@
-import { DeletionCbs } from './DeletionCbs';
 export type { DeletionCbs } from './DeletionCbs';
 export declare class Deletion {
     static className: () => string;
-    delete(itemIds: string[]): (cbs: DeletionCbs['delete']) => any;
+    delete(itemIds: string[]): Promise<any>;
 }

package/Deletion.js

@@ -4,13 +4,12 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-import { host } from 'aspiration';
+import { getCallbacks, host } from 'aspiration';
 import { operation } from 'skandha';
 export class Deletion {
     delete(itemIds) {
-        return (cbs) => {
-            return cbs.deleteItems();
-        };
+        const cbs = getCallbacks(this);
+        return Promise.resolve(cbs.deleteItems());
     }
 }
 Object.defineProperty(Deletion, "className", {

package/DeletionCbs.d.ts

@@ -1,7 +1,7 @@
 import { Cbs } from 'aspiration';
-export declare class Deletion_delete extends Cbs {
+export interface Deletion_delete extends Cbs {
     itemIds: string[];
-    deleteItems(): any;
+    deleteItems(): Promise<any>;
 }
 export declare type DeletionCbs = {
     delete: Deletion_delete;

package/DeletionCbs.js

@@ -1,13 +1 @@
-import { Cbs, stub } from 'aspiration';
-export class Deletion_delete extends Cbs {
-    constructor() {
-        super(...arguments);
-        Object.defineProperty(this, "itemIds", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: stub()
-        });
-    }
-    deleteItems() { }
-}
+export {};

package/DragAndDrop.d.ts

@@ -1,10 +1,9 @@
-import { DragAndDropCbs } from './DragAndDropCbs';
 import { DropPositionT } from './Insertion';
 export type { DragAndDropCbs } from './DragAndDropCbs';
 export declare class DragAndDrop {
     static className: () => string;
     hoverPosition?: DropPositionT;
-    drop(dropPosition: DropPositionT): (cbs: DragAndDropCbs['drop']) => void;
+    drop(dropPosition: DropPositionT): Promise<void>;
     setHoverPosition(x?: DropPositionT): void;
     handle(itemId: string): {
         draggable: boolean;
@@ -14,3 +13,18 @@ export declare class DragAndDrop {
         onDrop: () => void;
     };
 }
+export declare type DragHandlersT = {
+    draggable?: boolean;
+    onDragStart?: (event: any) => void;
+    onDragOver?: (event: any) => void;
+    onDragEnd?: (event: any) => void;
+    onDrop?: (event: any) => void;
+};
+export declare function dragState(hoverPosition: any, itemId: string): "before" | "after" | "none";
+export declare function dragHandlers<T extends DragHandlersT>(props: T): {
+    draggable: boolean | undefined;
+    onDragStart: ((event: any) => void) | undefined;
+    onDragOver: ((event: any) => void) | undefined;
+    onDrop: ((event: any) => void) | undefined;
+    onDragEnd: ((event: any) => void) | undefined;
+};

package/DragAndDrop.js

@@ -4,9 +4,15 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-import { host } from 'aspiration';
+import { getCallbacks, host } from 'aspiration';
 import { data, operation } from 'skandha';
 import { isBefore } from './internal/utils';
+import { selectionIsInsertedOnDragAndDrop } from './policies/selectionIsInsertedOnDragAndDrop';
+const dropDefaultCbs = (dragAndDrop) => ({
+    drop: function () {
+        selectionIsInsertedOnDragAndDrop(dragAndDrop, this.dropPosition);
+    },
+});
 export class DragAndDrop {
     constructor() {
         Object.defineProperty(this, "hoverPosition", {
@@ -17,9 +23,8 @@ export class DragAndDrop {
         });
     }
     drop(dropPosition) {
-        return (cbs) => {
-            cbs.drop();
-        };
+        const cbs = getCallbacks(this);
+        return Promise.resolve(cbs.drop());
     }
     setHoverPosition(x) {
         this.hoverPosition = x;
@@ -40,8 +45,9 @@ export class DragAndDrop {
             },
             onDrop: () => {
                 if (this.hoverPosition) {
-                    this.drop(this.hoverPosition);
-                    this.setHoverPosition(undefined);
+                    this.drop(this.hoverPosition).then(() => {
+                        this.setHoverPosition(undefined);
+                    });
                 }
             },
         };
@@ -58,8 +64,24 @@ __decorate([
 ], DragAndDrop.prototype, "hoverPosition", void 0);
 __decorate([
     operation,
-    host(['dropPosition'])
+    host(['dropPosition'], dropDefaultCbs)
 ], DragAndDrop.prototype, "drop", null);
 __decorate([
     operation({ log: false })
 ], DragAndDrop.prototype, "setHoverPosition", null);
+export function dragState(hoverPosition, itemId) {
+    return (hoverPosition === null || hoverPosition === void 0 ? void 0 : hoverPosition.targetItemId) === itemId
+        ? (hoverPosition === null || hoverPosition === void 0 ? void 0 : hoverPosition.isBefore)
+            ? 'before'
+            : 'after'
+        : 'none';
+}
+export function dragHandlers(props) {
+    return {
+        draggable: props.draggable,
+        onDragStart: props.onDragStart,
+        onDragOver: props.onDragOver,
+        onDrop: props.onDrop,
+        onDragEnd: props.onDragEnd,
+    };
+}

package/DragAndDropCbs.d.ts

@@ -1,9 +1,9 @@
-import { Cbs } from "aspiration";
-import { DropPositionT } from "./Insertion";
-export declare class DragAndDrop_drop extends Cbs {
+import { Cbs } from 'aspiration';
+import { DropPositionT } from './Insertion';
+export interface DragAndDrop_drop extends Cbs {
     dropPosition: DropPositionT;
     drop(): void;
 }
-export declare type DragAndDropCbs = {
+export interface DragAndDropCbs {
     drop: DragAndDrop_drop;
-};
+}

package/DragAndDropCbs.js

@@ -1,13 +1 @@
-import { stub, Cbs } from "aspiration";
-export class DragAndDrop_drop extends Cbs {
-    constructor() {
-        super(...arguments);
-        Object.defineProperty(this, "dropPosition", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: stub()
-        });
-    }
-    drop() { }
-}
+export {};

package/Editing.d.ts

@@ -1,9 +1,8 @@
-import { EditingCbs } from './EditingCbs';
 export type { EditingCbs } from './EditingCbs';
 export declare class Editing {
     static className: () => string;
     isEditing: boolean;
-    save(values: any): (cbs: EditingCbs['save']) => void;
-    cancel(): (cbs: EditingCbs['cancel']) => void;
-    enable(): (cbs: EditingCbs['enable']) => void;
+    save(values: any): Promise<void>;
+    cancel(): void;
+    enable(): void;
 }

package/Editing.js

@@ -4,7 +4,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-import { host, maybe } from 'aspiration';
+import { getCallbacks, host } from 'aspiration';
 import { data, operation } from 'skandha';
 export class Editing {
     constructor() {
@@ -16,21 +16,17 @@ export class Editing {
         });
     }
     save(values) {
-        return (cbs) => {
-            cbs.saveItem();
+        const cbs = getCallbacks(this);
+        return Promise.resolve(cbs.saveItem()).then(() => {
             this.isEditing = false;
-            maybe(cbs.refreshView).bind(cbs)();
-        };
+            cbs.refreshView && cbs.refreshView();
+        });
     }
     cancel() {
-        return (cbs) => {
-            this.isEditing = false;
-        };
+        this.isEditing = false;
     }
     enable() {
-        return (cbs) => {
-            this.isEditing = true;
-        };
+        this.isEditing = true;
     }
 }
 Object.defineProperty(Editing, "className", {

package/EditingCbs.d.ts

@@ -1,15 +1,15 @@
-import { Cbs } from "aspiration";
-export declare class Editing_save extends Cbs {
+import type { Cbs } from 'aspiration';
+export interface Editing_save extends Cbs {
     values: any;
-    saveItem(): void;
+    saveItem(): Promise<any>;
     refreshView(): void;
 }
-export declare class Editing_cancel extends Cbs {
+export interface Editing_cancel extends Cbs {
 }
-export declare class Editing_enable extends Cbs {
+export interface Editing_enable extends Cbs {
 }
-export declare type EditingCbs = {
+export interface EditingCbs {
     save: Editing_save;
     cancel: Editing_cancel;
     enable: Editing_enable;
-};
+}

package/EditingCbs.js

@@ -1,18 +1 @@
-import { Cbs } from "aspiration";
-export class Editing_save extends Cbs {
-    constructor() {
-        super(...arguments);
-        Object.defineProperty(this, "values", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-    }
-    saveItem() { }
-    refreshView() { }
-}
-export class Editing_cancel extends Cbs {
-}
-export class Editing_enable extends Cbs {
-}
+export {};

package/Filtering.d.ts

@@ -1,13 +1,11 @@
-import { GetterT } from 'skandha';
-import { FilteringCbs, FilterT } from './FilteringCbs';
+import { FilterT } from './FilteringCbs';
 export type { FilteringCbs } from './FilteringCbs';
 export declare class Filtering<ValueT = any> {
     static className: () => string;
     isEnabled: boolean;
-    filter: FilterT;
+    filter: FilterT<ValueT>;
     inputItems: Array<ValueT>;
-    get filteredItems(): any[];
-    apply(filter: FilterT): (cbs: FilteringCbs['apply']) => void;
-    setEnabled(flag: boolean): (cbs: FilteringCbs['setEnabled']) => void;
+    get filteredItems(): ValueT[];
+    apply(filter: FilterT<ValueT>): void;
+    setEnabled(flag: boolean): void;
 }
-export declare const filteringUsesInputItems: (getItems: GetterT, transform?: Function) => (ctr: any) => void;

package/Filtering.js

@@ -5,7 +5,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 import { host, stub } from 'aspiration';
-import { data, mapDataToFacet, operation } from 'skandha';
+import { data, operation } from 'skandha';
 export class Filtering {
     constructor() {
         Object.defineProperty(this, "isEnabled", {
@@ -24,22 +24,18 @@ export class Filtering {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: stub()
+            value: stub
         });
     }
     get filteredItems() {
         return this.isEnabled ? this.filter(this.inputItems) : this.inputItems;
     }
     apply(filter) {
-        return (cbs) => {
-            this.filter = filter;
-            this.setEnabled(true);
-        };
+        this.filter = filter;
+        this.setEnabled(true);
     }
     setEnabled(flag) {
-        return (cbs) => {
-            this.isEnabled = flag;
-        };
+        this.isEnabled = flag;
     }
 }
 Object.defineProperty(Filtering, "className", {
@@ -68,4 +64,3 @@ __decorate([
     operation,
     host(['flag'])
 ], Filtering.prototype, "setEnabled", null);
-export const filteringUsesInputItems = (getItems, transform) => mapDataToFacet([Filtering, 'inputItems'], getItems, transform);

package/FilteringCbs.d.ts

@@ -1,12 +1,12 @@
-import { Cbs } from "aspiration";
-export declare type FilterT = (x: any) => Array<any>;
-export declare class Filtering_apply extends Cbs {
-    filter: FilterT;
+import { Cbs } from 'aspiration';
+export declare type FilterT<ValueT> = (x: ValueT[]) => ValueT[];
+export interface Filtering_apply<ValueT> extends Cbs {
+    filter: FilterT<ValueT>;
 }
-export declare class Filtering_setEnabled extends Cbs {
+export interface Filtering_setEnabled<ValueT> extends Cbs {
     flag: boolean;
 }
-export declare type FilteringCbs = {
-    apply: Filtering_apply;
-    setEnabled: Filtering_setEnabled;
-};
+export interface FilteringCbs<ValueT = any> {
+    apply: Filtering_apply<ValueT>;
+    setEnabled: Filtering_setEnabled<ValueT>;
+}

package/FilteringCbs.js

@@ -1,23 +1 @@
-import { stub, Cbs } from "aspiration";
-export class Filtering_apply extends Cbs {
-    constructor() {
-        super(...arguments);
-        Object.defineProperty(this, "filter", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: stub()
-        });
-    }
-}
-export class Filtering_setEnabled extends Cbs {
-    constructor() {
-        super(...arguments);
-        Object.defineProperty(this, "flag", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: stub()
-        });
-    }
-}
+export {};

package/Highlight.d.ts

@@ -1,10 +1,7 @@
-import { GetterT } from 'skandha';
-import { HighlightCbs } from './HighlightCbs';
 export type { HighlightCbs } from './HighlightCbs';
 export declare class Highlight<ValueT = any> {
     static className: () => string;
     id: string | undefined;
     item?: ValueT;
-    highlightItem(id: string): (cbs: HighlightCbs['highlightItem']) => void;
+    highlightItem(id: string | undefined): void;
 }
-export declare const highlightUsesItemLookUpTable: (getItemById: GetterT) => (ctr: any) => void;

package/Highlight.js

@@ -4,8 +4,9 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-import { host, maybe } from 'aspiration';
-import { data, getm, mapDatasToFacet, operation, output, } from 'skandha';
+import { getCallbacks, host } from 'aspiration';
+import { data, operation, output } from 'skandha';
+const highlightItemDefaultCbs = (highlight) => ({});
 export class Highlight {
     constructor() {
         Object.defineProperty(this, "id", {
@@ -22,10 +23,9 @@ export class Highlight {
         });
     }
     highlightItem(id) {
-        return (cbs) => {
-            this.id = id;
-            maybe(cbs.scrollItemIntoView).bind(cbs)();
-        };
+        const cbs = getCallbacks(this);
+        this.id = id;
+        cbs.scrollItemIntoView && cbs.scrollItemIntoView();
     }
 }
 Object.defineProperty(Highlight, "className", {
@@ -42,12 +42,5 @@ __decorate([
 ], Highlight.prototype, "item", void 0);
 __decorate([
     operation,
-    host(['id'])
+    host(['id'], highlightItemDefaultCbs)
 ], Highlight.prototype, "highlightItem", null);
-export const highlightUsesItemLookUpTable = (getItemById) => mapDatasToFacet([Highlight, 'item'], [
-    //
-    getItemById,
-    getm([Highlight, 'id']),
-], (itemById, id) => {
-    return itemById[id];
-});

package/HighlightCbs.d.ts

@@ -1,8 +1,8 @@
-import { Cbs } from "aspiration";
-export declare class Highlight_highlightItem extends Cbs {
+import { Cbs } from 'aspiration';
+export interface Highlight_highlightItem extends Cbs {
     id: string;
     scrollItemIntoView(): void;
 }
-export declare type HighlightCbs = {
+export interface HighlightCbs {
     highlightItem: Highlight_highlightItem;
-};
+}

package/HighlightCbs.js

@@ -1,13 +1 @@
-import { Cbs, stub } from "aspiration";
-export class Highlight_highlightItem extends Cbs {
-    constructor() {
-        super(...arguments);
-        Object.defineProperty(this, "id", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: stub()
-        });
-    }
-    scrollItemIntoView() { }
-}
+export {};

package/Insertion.d.ts

@@ -1,11 +1,9 @@
-import { GetterT } from 'skandha';
-import { DragT, InsertionCbs } from './InsertionCbs';
+import { DragT } from './InsertionCbs';
 export type { DragT, DropPositionT, InsertionCbs } from './InsertionCbs';
 export declare type DragSourceT = (ctr: any) => DragT | undefined;
 export declare class Insertion<ValueT = any> {
     static className: () => string;
     inputItems: Array<ValueT>;
     preview: Array<ValueT>;
-    insertItems(drag: DragT): (cbs: InsertionCbs['insertItems']) => void;
+    insertItems(drag: DragT): Promise<any>;
 }
-export declare const insertionUsesInputItems: (getItems: GetterT, transform?: Function) => (ctr: any) => void;

package/Insertion.js

@@ -4,8 +4,8 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-import { host, stub } from 'aspiration';
-import { input, mapDataToFacet, operation, output } from 'skandha';
+import { getCallbacks, host, stub } from 'aspiration';
+import { input, operation, output } from 'skandha';
 import { getPreview } from './lib/getPreview';
 export class Insertion {
     constructor() {
@@ -13,22 +13,22 @@ export class Insertion {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: stub()
+            value: stub
         });
         Object.defineProperty(this, "preview", {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: stub()
+            value: stub
         });
     }
     insertItems(drag) {
-        return (cbs) => {
-            if (this.inputItems) {
-                const preview = getPreview(this.inputItems, drag.targetItemId, drag.isBefore, drag.payload);
-                cbs.insertItems(preview);
-            }
-        };
+        const cbs = getCallbacks(this);
+        if (this.inputItems) {
+            const preview = getPreview(this.inputItems, drag.targetItemId, drag.isBefore, drag.payload);
+            return Promise.resolve(cbs.insertItems(preview));
+        }
+        return Promise.resolve();
     }
 }
 Object.defineProperty(Insertion, "className", {
@@ -47,4 +47,3 @@ __decorate([
     operation,
     host(['drag'])
 ], Insertion.prototype, "insertItems", null);
-export const insertionUsesInputItems = (getItems, transform) => mapDataToFacet([Insertion, 'inputItems'], getItems, transform);

package/InsertionCbs.d.ts

@@ -1,4 +1,4 @@
-import { Cbs } from "aspiration";
+import { Cbs } from 'aspiration';
 export declare type DropPositionT = {
     isBefore: boolean;
     targetItemId: string;
@@ -6,10 +6,10 @@ export declare type DropPositionT = {
 export declare type DragT = DropPositionT & {
     payload: any;
 };
-export declare class Insertion_insertItems<ValueT = any> extends Cbs {
+export interface Insertion_insertItems<ValueT> extends Cbs {
     drag: DragT;
-    insertItems(preview: Array<ValueT>): void;
+    insertItems(preview: Array<ValueT>): Promise<any>;
+}
+export interface InsertionCbs<ValueT = any> {
+    insertItems: Insertion_insertItems<ValueT>;
 }
-export declare type InsertionCbs = {
-    insertItems: Insertion_insertItems;
-};

package/InsertionCbs.js

@@ -1,13 +1 @@
-import { Cbs, stub } from "aspiration";
-export class Insertion_insertItems extends Cbs {
-    constructor() {
-        super(...arguments);
-        Object.defineProperty(this, "drag", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: stub()
-        });
-    }
-    insertItems(preview) { }
-}
+export {};

package/Labelling.d.ts

@@ -1,11 +1,9 @@
-import { GetterT } from 'skandha';
-import { IdsByLabelT, ItemsByLabelT, LabellingCbs, LabelValueT } from './LabellingCbs';
+import { IdsByLabelT, ItemsByLabelT, LabelValueT } from './LabellingCbs';
 export type { LabellingCbs } from './LabellingCbs';
 export declare class Labelling {
     static className: () => string;
     idsByLabel: IdsByLabelT;
     ids: (label: string) => any[];
     itemsByLabel: ItemsByLabelT;
-    setLabel(labelValue: LabelValueT): (cbs: LabellingCbs['setLabel']) => void;
+    setLabel(labelValue: LabelValueT): Promise<any>;
 }
-export declare const labellingActsOnItems: (getItemById: GetterT) => (ctr: any) => void;

package/Labelling.js

@@ -4,9 +4,8 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-import { host, stub } from 'aspiration';
-import { data, getm, input, mapDatasToFacet, operation, } from 'skandha';
-import { lookUp } from './internal/utils';
+import { getCallbacks, host, stub } from 'aspiration';
+import { data, input, operation } from 'skandha';
 export class Labelling {
     constructor() {
         Object.defineProperty(this, "idsByLabel", {
@@ -25,22 +24,22 @@ export class Labelling {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: stub()
+            value: stub
         });
     }
     setLabel(labelValue) {
-        return (cbs) => {
-            const { label, id, flag } = labelValue;
-            this.idsByLabel[label] = this.idsByLabel[label] || [];
-            if (flag && !this.idsByLabel[label].includes(id)) {
-                this.idsByLabel[label].push(id);
-                cbs.saveIds(label, this.idsByLabel[label]);
-            }
-            if (!flag && this.idsByLabel[label].includes(id)) {
-                this.idsByLabel[label] = this.idsByLabel[label].filter((x) => x !== id);
-                cbs.saveIds(label, this.idsByLabel[label]);
-            }
-        };
+        const cbs = getCallbacks(this);
+        const { label, id, flag } = labelValue;
+        this.idsByLabel[label] = this.idsByLabel[label] || [];
+        if (flag && !this.idsByLabel[label].includes(id)) {
+            this.idsByLabel[label].push(id);
+            return Promise.resolve(cbs.saveIds(label, this.idsByLabel[label]));
+        }
+        if (!flag && this.idsByLabel[label].includes(id)) {
+            this.idsByLabel[label] = this.idsByLabel[label].filter((x) => x !== id);
+            return Promise.resolve(cbs.saveIds(label, this.idsByLabel[label]));
+        }
+        return Promise.resolve();
     }
 }
 Object.defineProperty(Labelling, "className", {
@@ -59,10 +58,3 @@ __decorate([
     operation,
     host(['labelValue'])
 ], Labelling.prototype, "setLabel", null);
-export const labellingActsOnItems = (getItemById) => {
-    return mapDatasToFacet([Labelling, 'itemsByLabel'], [
-        //
-        getItemById,
-        getm([Labelling, 'idsByLabel']),
-    ], (itemById, idsByLabel) => Object.fromEntries(Object.entries(idsByLabel).map(([label, ids]) => lookUp(ids, itemById))));
-};

package/LabellingCbs.d.ts

@@ -1,4 +1,4 @@
-import { Cbs } from "aspiration";
+import { Cbs } from 'aspiration';
 export declare type LabelValueT = {
     label: string;
     id: string;
@@ -10,10 +10,10 @@ export declare type IdsByLabelT = {
 export declare type ItemsByLabelT = {
     [label: string]: Array<any>;
 };
-export declare class Labelling_setLabel extends Cbs {
+export interface Labelling_setLabel extends Cbs {
     labelValue: LabelValueT;
-    saveIds(label: string, ids: string[]): void;
+    saveIds(label: string, ids: string[]): Promise<any>;
 }
-export declare type LabellingCbs = {
+export interface LabellingCbs {
     setLabel: Labelling_setLabel;
-};
+}

package/LabellingCbs.js

@@ -1,13 +1 @@
-import { Cbs, stub } from "aspiration";
-export class Labelling_setLabel extends Cbs {
-    constructor() {
-        super(...arguments);
-        Object.defineProperty(this, "labelValue", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: stub()
-        });
-    }
-    saveIds(label, ids) { }
-}
+export {};

package/Selection.d.ts

@@ -1,5 +1,4 @@
-import { GetterT } from 'skandha';
-import { SelectionCbs, SelectionParamsT } from './SelectionCbs';
+import { SelectionParamsT } from './SelectionCbs';
 export type { SelectionCbs, SelectionParamsT } from './SelectionCbs';
 export declare class Selection<ValueT = any> {
     static className: () => string;
@@ -7,8 +6,6 @@ export declare class Selection<ValueT = any> {
     ids: Array<string>;
     anchorId?: string;
     items: Array<ValueT>;
-    selectItem(selectionParams: SelectionParamsT): (cbs: SelectionCbs['selectItem']) => void;
+    selectItem(selectionParams: SelectionParamsT): void;
 }
 export declare function handleSelectItem(facet: Selection, { itemId, isShift, isCtrl }: SelectionParamsT): void;
-export declare const selectionUsesItemLookUpTable: (getItemById: GetterT) => (ctr: any) => void;
-export declare const selectionUsesSelectableIds: (getIds: GetterT, transform?: ((x: any) => string[]) | undefined) => (ctr: any) => void;

package/Selection.js

@@ -4,9 +4,9 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-import { host, stub } from 'aspiration';
-import { data, getm, input, mapDatasToFacet, mapDataToFacet, operation, output, } from 'skandha';
-import { lookUp, range } from './internal/utils';
+import { getCallbacks, host, stub } from 'aspiration';
+import { data, input, operation, output } from 'skandha';
+import { range } from './internal/utils';
 const selectItemDefaultCbs = (selection) => ({
     selectItem: function () {
         handleSelectItem(selection, this.selectionParams);
@@ -18,7 +18,7 @@ export class Selection {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: stub()
+            value: stub
         });
         Object.defineProperty(this, "ids", {
             enumerable: true,
@@ -36,13 +36,12 @@ export class Selection {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: stub()
+            value: stub
         });
     }
     selectItem(selectionParams) {
-        return (cbs) => {
-            cbs.selectItem();
-        };
+        const cbs = getCallbacks(this);
+        cbs.selectItem();
     }
 }
 Object.defineProperty(Selection, "className", {
@@ -98,11 +97,3 @@ export function handleSelectItem(facet, { itemId, isShift, isCtrl }) {
         facet.anchorId = itemId;
     }
 }
-export const selectionUsesItemLookUpTable = (getItemById) => mapDatasToFacet([Selection, 'items'], [
-    //
-    getItemById,
-    getm([Selection, 'ids']),
-], (itemById, ids) => {
-    return lookUp(ids, itemById);
-});
-export const selectionUsesSelectableIds = (getIds, transform) => mapDataToFacet([Selection, 'selectableIds'], getIds, transform);

package/SelectionCbs.d.ts

@@ -1,14 +1,14 @@
-import { Cbs } from "aspiration";
+import { Cbs } from 'aspiration';
 export declare type SelectionParamsT = {
     itemId: string | undefined;
     isShift?: boolean;
     isCtrl?: boolean;
     context?: any;
 };
-export declare class Selection_selectItem extends Cbs {
+export interface Selection_selectItem extends Cbs {
     selectionParams: SelectionParamsT;
     selectItem(): void;
 }
-export declare type SelectionCbs = {
+export interface SelectionCbs {
     selectItem: Selection_selectItem;
-};
+}

package/SelectionCbs.js

@@ -1,13 +1 @@
-import { Cbs, stub } from "aspiration";
-export class Selection_selectItem extends Cbs {
-    constructor() {
-        super(...arguments);
-        Object.defineProperty(this, "selectionParams", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: stub()
-        });
-    }
-    selectItem() { }
-}
+export {};

package/handlers/ClickToSelectItems.d.ts

@@ -11,3 +11,13 @@ export declare class ClickToSelectItems {
         onMouseUp: (e: any) => void;
     };
 }
+export declare type ClickHandlersT = {
+    onClick?: any;
+    onMouseDown?: any;
+    onMouseUp?: any;
+};
+export declare function clickHandlers<T extends ClickHandlersT>(props: T): {
+    onClick: any;
+    onMouseDown: any;
+    onMouseUp: any;
+};

package/handlers/ClickToSelectItems.js

@@ -44,3 +44,10 @@ export class ClickToSelectItems {
         };
     }
 }
+export function clickHandlers(props) {
+    return {
+        onClick: props.onClick,
+        onMouseDown: props.onMouseDown,
+        onMouseUp: props.onMouseUp,
+    };
+}

package/index.d.ts

@@ -1,4 +1 @@
-export { selectionUsesItemLookUpTable, selectionUsesSelectableIds, } from "./Selection";
-export { highlightUsesItemLookUpTable } from "./Highlight";
-export { filteringUsesInputItems } from "./Filtering";
-export { insertionUsesInputItems } from "./Insertion";
+export {};

package/index.js

@@ -1,4 +1 @@
-export { selectionUsesItemLookUpTable, selectionUsesSelectableIds, } from "./Selection";
-export { highlightUsesItemLookUpTable } from "./Highlight";
-export { filteringUsesInputItems } from "./Filtering";
-export { insertionUsesInputItems } from "./Insertion";
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "skandha-facets",
-  "version": "0.8.1",
+  "version": "0.10.0",
   "description": "Facets for use with the skandha library",
   "main": "index.js",
   "repository": "https://github.com/mnieber/skandha-facets.git",
@@ -9,8 +9,8 @@
   "types": "index.d.ts",
   "prepublish": "tsc",
   "peerDependencies": {
-    "skandha": ">=0.7.0",
-    "aspiration": ">=0.3.0"
+    "skandha": ">=0.10.1",
+    "aspiration": ">=0.4.0"
   },
   "devDependencies": {
     "typescript": "^4.0.3"

package/policies/insertionPreviewUsesDragSources.d.ts

@@ -1,2 +1,2 @@
-import { DragSourceT } from "../Insertion";
-export declare const insertionPreviewUsesDragSources: (dragSources: DragSourceT[]) => (ctr: any) => void;
+import { DragSourceT } from '../Insertion';
+export declare const insertionPreviewUsesDragSources: (dragSources: DragSourceT[], ctr: any) => (inputItems: any[]) => any[];

package/policies/insertionPreviewUsesDragSources.js

@@ -1,13 +1,8 @@
-import { Insertion } from "../Insertion";
-import { findMap } from "../internal/utils";
-import { getPreview } from "../lib/getPreview";
-import { mapDataToFacet, getf, getc } from "skandha";
-export const insertionPreviewUsesDragSources = (dragSources) => mapDataToFacet([Insertion, "preview"], getf(Insertion), (insertion) => {
-    const ctr = getc(insertion);
+import { findMap } from '../internal/utils';
+import { getPreview } from '../lib/getPreview';
+export const insertionPreviewUsesDragSources = (dragSources, ctr) => (inputItems) => {
     const drag = findMap((dragSource) => dragSource(ctr), dragSources);
-    const inputItems = insertion.inputItems;
-    const preview = drag
+    return drag
         ? getPreview(inputItems !== null && inputItems !== void 0 ? inputItems : [], drag.targetItemId, drag.isBefore, drag.payload)
         : inputItems !== null && inputItems !== void 0 ? inputItems : [];
-    return preview;
-});
+};