skandha-facets 0.12.1 → 0.14.0

package/facets/Addition.d.ts

@@ -1,7 +1,20 @@
-import { DefineCbs } from 'aspiration';
+import { CallbackMap } from 'aspiration';
 export type GenericObjectT = any;
 export declare class Addition<T = any> {
     static className: () => string;
+    callbackMap: CallbackMap<{
+        add: {
+            stageAdd?: () => void;
+            createItem?: () => T;
+            highlightNewItem?: () => void;
+        };
+        cancel: {
+            unstageAdd(parentId: string | undefined): void;
+        };
+        confirm: {
+            confirmAdd(): void;
+        };
+    }>;
     item?: T;
     parentId?: string;
     setParentId(parentId?: string): void;
@@ -9,22 +22,7 @@ export declare class Addition<T = any> {
     add(args: {
         values?: GenericObjectT;
     }): any;
-    confirm(): Promise<void>;
-    cancel(): void;
+    confirm(): any;
+    cancel(): any;
     _reset(): void;
 }
-type Cbs<T> = {
-    add: {
-        stageAdd(): void;
-        createItem(): T;
-        highlightNewItem(): void;
-    };
-    cancel: {
-        unstageAdd(parentId: string | undefined): void;
-    };
-    confirm: {
-        confirmAdd(): void;
-    };
-};
-export type AdditionCbs<T = any> = DefineCbs<Addition<T>, Cbs<T>>;
-export {};

package/facets/Addition.js

@@ -4,10 +4,16 @@ 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 { getCallbacks, withCbs } from 'aspiration';
+import { withCbs } from 'aspiration';
 import { data, operation } from 'skandha';
 class Addition {
     constructor() {
+        Object.defineProperty(this, "callbackMap", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: {}
+        });
         Object.defineProperty(this, "item", {
             enumerable: true,
             configurable: true,
@@ -28,28 +34,31 @@ class Addition {
         this.item = item;
     }
     add(args) {
-        var _a;
-        const cbs = getCallbacks(this);
-        cbs.stageAdd && cbs.stageAdd();
-        const newItem = (_a = args.values) !== null && _a !== void 0 ? _a : cbs.createItem();
-        this.setItem(newItem);
-        cbs.highlightNewItem && cbs.highlightNewItem();
-        return newItem;
+        return withCbs(this.callbackMap, 'add', args, (cbs) => {
+            var _a;
+            cbs.stageAdd && cbs.stageAdd();
+            const newItem = (_a = args.values) !== null && _a !== void 0 ? _a : cbs.createItem();
+            this.setItem(newItem);
+            cbs.highlightNewItem && cbs.highlightNewItem();
+            return newItem;
+        });
     }
     confirm() {
-        const cbs = getCallbacks(this);
-        const result = cbs.confirmAdd ? cbs.confirmAdd() : undefined;
-        return Promise.resolve(result).then(() => {
-            this._reset();
+        return withCbs(this.callbackMap, 'confirm', {}, (cbs) => {
+            const result = cbs.confirmAdd ? cbs.confirmAdd() : undefined;
+            return Promise.resolve(result).then(() => {
+                this._reset();
+            });
         });
     }
     cancel() {
-        const cbs = getCallbacks(this);
-        if (this.item) {
-            const parentId = this.parentId;
-            this._reset();
-            cbs.unstageAdd && cbs.unstageAdd(parentId);
-        }
+        return withCbs(this.callbackMap, 'cancel', {}, (cbs) => {
+            if (this.item) {
+                const parentId = this.parentId;
+                this._reset();
+                cbs.unstageAdd && cbs.unstageAdd(parentId);
+            }
+        });
     }
     _reset() {
         this.setItem(undefined);
@@ -75,16 +84,13 @@ __decorate([
     operation({ log: false })
 ], Addition.prototype, "setItem", null);
 __decorate([
-    operation,
-    withCbs()
+    operation
 ], Addition.prototype, "add", null);
 __decorate([
-    operation,
-    withCbs()
+    operation
 ], Addition.prototype, "confirm", null);
 __decorate([
-    operation,
-    withCbs()
+    operation
 ], Addition.prototype, "cancel", null);
 __decorate([
     operation({ log: false })

package/facets/Deletion.d.ts

@@ -1,18 +1,15 @@
-import { DefineCbs } from 'aspiration';
+import { type CallbackMap } from 'aspiration';
 export declare class Deletion {
     static className: () => string;
-    disabled?: boolean;
+    callbackMap: CallbackMap<{
+        delete: {
+            deleteItems: () => {};
+        };
+    }>;
     isDeleting: boolean;
     setIsDeleting(isDeleting: boolean): void;
     delete(args: {
         itemIds: string[];
         moveToTrash?: boolean;
-    }): Promise<any>;
+    }): any;
 }
-type Cbs = {
-    delete: {
-        deleteItems(): any;
-    };
-};
-export type DeletionCbs = DefineCbs<Deletion, Cbs>;
-export {};

package/facets/Deletion.js

@@ -4,15 +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 { getCallbacks, withCbs } from 'aspiration';
+import { withCbs } from 'aspiration';
 import { data, operation } from 'skandha';
 class Deletion {
     constructor() {
-        Object.defineProperty(this, "disabled", {
+        Object.defineProperty(this, "callbackMap", {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: undefined
+            value: {}
         });
         Object.defineProperty(this, "isDeleting", {
             enumerable: true,
@@ -25,11 +25,12 @@ class Deletion {
         this.isDeleting = isDeleting;
     }
     delete(args) {
-        const cbs = getCallbacks(this);
-        this.setIsDeleting(true);
-        return Promise.resolve(cbs.deleteItems()).then((response) => {
-            this.setIsDeleting(false);
-            return response;
+        return withCbs(this.callbackMap, 'delete', args, (cbs) => {
+            this.setIsDeleting(true);
+            return Promise.resolve(cbs.deleteItems()).then((response) => {
+                this.setIsDeleting(false);
+                return response;
+            });
         });
     }
 }
@@ -39,9 +40,6 @@ Object.defineProperty(Deletion, "className", {
     writable: true,
     value: () => 'Deletion'
 });
-__decorate([
-    data
-], Deletion.prototype, "disabled", void 0);
 __decorate([
     data
 ], Deletion.prototype, "isDeleting", void 0);
@@ -49,7 +47,6 @@ __decorate([
     operation({ log: false })
 ], Deletion.prototype, "setIsDeleting", null);
 __decorate([
-    operation,
-    withCbs()
+    operation
 ], Deletion.prototype, "delete", null);
 export { Deletion };

package/facets/Display.js

@@ -4,8 +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 { stub } from 'aspiration';
-import { data, output } from 'skandha';
+import { data, output, stub } from 'skandha';
 import { listToItemById } from '../internal/utils';
 class Display {
     constructor() {

package/facets/DragAndDrop.d.ts

@@ -1,17 +1,22 @@
-import { DefineCbs } from 'aspiration';
+import { type CallbackMap, type Cbs } from 'aspiration';
 import { HoverPositionT } from './Hovering';
+export declare const defaultCallbackMap: (dragAndDrop: DragAndDrop) => {
+    drop: {
+        drop: (this: Cbs<DragAndDrop['drop']>) => void;
+    };
+};
 export declare class DragAndDrop {
     static className: () => string;
+    callbackMap_: CallbackMap<{
+        drop?: {
+            drop?: (() => void) | undefined;
+        } | undefined;
+    }>;
+    get callbackMap(): typeof this.callbackMap_;
+    set callbackMap(cbs: typeof this.callbackMap_);
     isDropping: boolean;
     setIsDropping(isDropping: boolean): void;
     drop(args: {
         hoverPosition: HoverPositionT;
-    }): Promise<any>;
+    }): any;
 }
-type Cbs = {
-    drop: {
-        drop(): void;
-    };
-};
-export type DragAndDropCbs = DefineCbs<DragAndDrop, Cbs>;
-export {};

package/facets/DragAndDrop.js

@@ -4,16 +4,24 @@ 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 { getCallbacks, withCbs } from 'aspiration';
+import { mergeDeepLeft, withCbs } from 'aspiration';
 import { data, operation } from 'skandha';
 import { selectionIsInsertedOnDragAndDrop } from '../policies/selectionIsInsertedOnDragAndDrop';
-const dropDefaultCbs = (dragAndDrop) => ({
-    drop: function () {
-        selectionIsInsertedOnDragAndDrop(dragAndDrop, this.args.hoverPosition);
+export const defaultCallbackMap = (dragAndDrop) => ({
+    drop: {
+        drop: function () {
+            selectionIsInsertedOnDragAndDrop(dragAndDrop, this.args.hoverPosition);
+        },
     },
 });
 class DragAndDrop {
     constructor() {
+        Object.defineProperty(this, "callbackMap_", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: {}
+        });
         Object.defineProperty(this, "isDropping", {
             enumerable: true,
             configurable: true,
@@ -21,15 +29,22 @@ class DragAndDrop {
             value: false
         });
     }
+    get callbackMap() {
+        return this.callbackMap_;
+    }
+    set callbackMap(cbs) {
+        this.callbackMap_ = mergeDeepLeft(cbs, defaultCallbackMap(this));
+    }
     setIsDropping(isDropping) {
         this.isDropping = isDropping;
     }
     drop(args) {
-        const cbs = getCallbacks(this);
-        this.setIsDropping(true);
-        return Promise.resolve(cbs.drop()).then((response) => {
-            this.setIsDropping(false);
-            return response;
+        return withCbs(this.callbackMap, 'drop', args, (cbs) => {
+            this.setIsDropping(true);
+            return Promise.resolve(cbs.drop()).then((response) => {
+                this.setIsDropping(false);
+                return response;
+            });
         });
     }
 }
@@ -46,7 +61,6 @@ __decorate([
     operation({ log: false })
 ], DragAndDrop.prototype, "setIsDropping", null);
 __decorate([
-    operation,
-    withCbs(dropDefaultCbs)
+    operation
 ], DragAndDrop.prototype, "drop", null);
 export { DragAndDrop };

package/facets/Edit.d.ts

@@ -1,25 +1,24 @@
-import { DefineCbs } from 'aspiration';
+import { CallbackMap } from 'aspiration';
 export declare class Edit {
     static className: () => string;
+    callbackMap: CallbackMap<{
+        save: {
+            saveItem: () => any;
+        };
+        cancel?: {
+            onCancel?: (() => void) | undefined;
+        } | undefined;
+        enable?: {
+            onEnable?: (() => void) | undefined;
+        } | undefined;
+    }>;
     isEditing: boolean;
     isSaving: boolean;
     reset(): void;
     setIsSaving(isSaving: boolean): void;
     save(args: {
         values: any;
-    }): Promise<any>;
-    cancel(): void;
-    enable(): void;
+    }): any;
+    cancel(): any;
+    enable(): any;
 }
-export type Cbs = {
-    save: {
-        saveItem(): any;
-    };
-    cancel: {
-        onCancel(): void;
-    };
-    enable: {
-        onEnable(): void;
-    };
-};
-export type EditCbs = DefineCbs<Edit, Cbs>;

package/facets/Edit.js

@@ -4,10 +4,16 @@ 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 { getCallbacks, withCbs } from 'aspiration';
+import { withCbs } from 'aspiration';
 import { data, operation } from 'skandha';
 class Edit {
     constructor() {
+        Object.defineProperty(this, "callbackMap", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: {}
+        });
         Object.defineProperty(this, "isEditing", {
             enumerable: true,
             configurable: true,
@@ -28,27 +34,30 @@ class Edit {
         this.isSaving = isSaving;
     }
     save(args) {
-        const cbs = getCallbacks(this);
-        this.setIsSaving(true);
-        return Promise.resolve(cbs.saveItem()).then((savedObj) => {
-            this.reset();
-            this.setIsSaving(false);
-            return savedObj;
+        return withCbs(this.callbackMap, 'save', args, (cbs) => {
+            this.setIsSaving(true);
+            return Promise.resolve(cbs.saveItem()).then((savedObj) => {
+                this.reset();
+                this.setIsSaving(false);
+                return savedObj;
+            });
         });
     }
     cancel() {
-        const cbs = getCallbacks(this);
-        if (this.isEditing) {
-            this.reset();
-            cbs.onCancel && cbs.onCancel();
-        }
+        return withCbs(this.callbackMap, 'cancel', {}, (cbs) => {
+            if (this.isEditing) {
+                this.reset();
+                (cbs === null || cbs === void 0 ? void 0 : cbs.onCancel) && cbs.onCancel();
+            }
+        });
     }
     enable() {
-        const cbs = getCallbacks(this);
-        if (!this.isEditing) {
-            this.isEditing = true;
-            cbs.onEnable && cbs.onEnable();
-        }
+        return withCbs(this.callbackMap, 'enable', {}, (cbs) => {
+            if (!this.isEditing) {
+                this.isEditing = true;
+                (cbs === null || cbs === void 0 ? void 0 : cbs.onEnable) && cbs.onEnable();
+            }
+        });
     }
 }
 Object.defineProperty(Edit, "className", {
@@ -70,15 +79,12 @@ __decorate([
     operation({ log: false })
 ], Edit.prototype, "setIsSaving", null);
 __decorate([
-    operation,
-    withCbs()
+    operation
 ], Edit.prototype, "save", null);
 __decorate([
-    operation,
-    withCbs()
+    operation
 ], Edit.prototype, "cancel", null);
 __decorate([
-    operation,
-    withCbs()
+    operation
 ], Edit.prototype, "enable", null);
 export { Edit };

package/facets/Filtering.d.ts

@@ -1,7 +1,8 @@
-import { DefineCbs } from 'aspiration';
+import { type CallbackMap } from 'aspiration';
 export type FilterT<T> = (x: T[]) => T[];
 export declare class Filtering<T = any> {
     static className: () => string;
+    callbackMap: CallbackMap<{}>;
     isEnabled: boolean;
     filter: FilterT<T>;
     inputItems: Array<T>;
@@ -13,9 +14,3 @@ export declare class Filtering<T = any> {
         flag: boolean;
     }): void;
 }
-type Cbs<T> = {
-    apply: {};
-    setEnabled: {};
-};
-export type FilteringCbs<T = any> = DefineCbs<Filtering<T>, Cbs<T>>;
-export {};

package/facets/Filtering.js

@@ -4,10 +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 { stub, withCbs } from 'aspiration';
-import { data, operation } from 'skandha';
+import { data, operation, stub } from 'skandha';
 class Filtering {
     constructor() {
+        Object.defineProperty(this, "callbackMap", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: {}
+        });
         Object.defineProperty(this, "isEnabled", {
             enumerable: true,
             configurable: true,
@@ -57,11 +62,9 @@ __decorate([
     data
 ], Filtering.prototype, "filteredItems", null);
 __decorate([
-    operation,
-    withCbs()
+    operation
 ], Filtering.prototype, "apply", null);
 __decorate([
-    operation,
-    withCbs()
+    operation
 ], Filtering.prototype, "setEnabled", null);
 export { Filtering };

package/facets/Highlight.d.ts

@@ -1,17 +1,15 @@
-import { DefineCbs } from 'aspiration';
+import { type CallbackMap } from 'aspiration';
 export declare class Highlight<T = any> {
     static className: () => string;
+    callbackMap: CallbackMap<{
+        set: {
+            scrollItemIntoView?: () => void;
+        };
+    }>;
     highlightableIds: Array<string>;
-    id: string | undefined;
+    itemId: string | undefined;
     item?: T;
-    highlightItem(args: {
-        id: string | undefined;
-    }): void;
+    set(args: {
+        itemId: string | undefined;
+    }): any;
 }
-type Cbs<T> = {
-    highlightItem: {
-        scrollItemIntoView(): void;
-    };
-};
-export type HighlightCbs<T = any> = DefineCbs<Highlight<T>, Cbs<T>>;
-export {};

package/facets/Highlight.js

@@ -4,18 +4,23 @@ 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 { getCallbacks, stub, withCbs } from 'aspiration';
-import { data, input, operation, output } from 'skandha';
-const highlightItemDefaultCbs = (highlight) => ({});
+import { withCbs } from 'aspiration';
+import { data, input, operation, output, stub } from 'skandha';
 class Highlight {
     constructor() {
+        Object.defineProperty(this, "callbackMap", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: {}
+        });
         Object.defineProperty(this, "highlightableIds", {
             enumerable: true,
             configurable: true,
             writable: true,
             value: stub
         });
-        Object.defineProperty(this, "id", {
+        Object.defineProperty(this, "itemId", {
             enumerable: true,
             configurable: true,
             writable: true,
@@ -28,10 +33,11 @@ class Highlight {
             value: void 0
         });
     }
-    highlightItem(args) {
-        const cbs = getCallbacks(this);
-        this.id = args.id;
-        cbs.scrollItemIntoView && cbs.scrollItemIntoView();
+    set(args) {
+        return withCbs(this.callbackMap, 'set', args, (cbs) => {
+            this.itemId = args.itemId;
+            cbs.scrollItemIntoView && cbs.scrollItemIntoView();
+        });
     }
 }
 Object.defineProperty(Highlight, "className", {
@@ -45,12 +51,11 @@ __decorate([
 ], Highlight.prototype, "highlightableIds", void 0);
 __decorate([
     data
-], Highlight.prototype, "id", void 0);
+], Highlight.prototype, "itemId", void 0);
 __decorate([
     output
 ], Highlight.prototype, "item", void 0);
 __decorate([
-    operation,
-    withCbs(highlightItemDefaultCbs)
-], Highlight.prototype, "highlightItem", null);
+    operation
+], Highlight.prototype, "set", null);
 export { Highlight };

package/facets/HighlightUIConnector.js

@@ -17,11 +17,11 @@ export class HighlightUIConnector {
         this._handleMouseDown = this._createMouseDownHandler();
     }
     _highlight(e, itemId) {
-        this.props.highlight.highlightItem({ id: itemId });
+        this.props.highlight.set({ itemId });
     }
     _createMouseDownHandler() {
         return (e, itemId) => {
-            const isHighlighted = this.props.highlight.id === itemId;
+            const isHighlighted = this.props.highlight.itemId === itemId;
             if (!isHighlighted) {
                 this._highlight(e, itemId);
             }
@@ -31,7 +31,7 @@ export class HighlightUIConnector {
         const mouseHandlers = {
             onMouseDown: (e) => this._handleMouseDown(e, itemId),
         };
-        return Object.assign({ isHighlighted: this.props.highlight.id === itemId }, mouseHandlers);
+        return Object.assign({ isHighlighted: this.props.highlight.itemId === itemId }, mouseHandlers);
     }
 }
 export function highlightUIHandlers(props) {
@@ -43,7 +43,7 @@ export const createHighlightKeyHandlers = (highlight, options) => {
     var _a, _b;
     const down = (_a = options === null || options === void 0 ? void 0 : options.keyDown) !== null && _a !== void 0 ? _a : 'down';
     const up = (_b = options === null || options === void 0 ? void 0 : options.keyUp) !== null && _b !== void 0 ? _b : 'up';
-    const getAnchor = () => highlight.id;
+    const getAnchor = () => highlight.itemId;
     const getHighlightableIds = () => {
         var _a;
         return (options === null || options === void 0 ? void 0 : options.getHighlightableIds)
@@ -57,7 +57,7 @@ export const createHighlightKeyHandlers = (highlight, options) => {
 };
 const highlightNext = (highlight, currentItemId, isDown, highlightableIds) => {
     const highlightItemById = (itemId) => {
-        highlight.highlightItem({ id: itemId });
+        highlight.set({ itemId });
     };
     if (currentItemId !== undefined) {
         pickNeighbour(highlightableIds, currentItemId, isDown, highlightItemById);

package/facets/Insertion.d.ts

@@ -1,20 +1,18 @@
-import { DefineCbs } from 'aspiration';
+import { type CallbackMap } from 'aspiration';
 import { HoverPositionT } from './Hovering';
 export type DragSourceT = (ctr: any) => HoverPositionT | undefined;
 export declare class Insertion<T = any> {
     static className: () => string;
+    callbackMap: CallbackMap<{
+        insertItems: {
+            insertItems: (preview: Array<T>) => any;
+        };
+    }>;
     isInserting: boolean;
     inputItems: Array<T>;
     preview: Array<T>;
     setIsInserting(isInserting: boolean): void;
     insertItems(args: {
         hoverPosition: HoverPositionT;
-    }): Promise<any>;
+    }): any;
 }
-type Cbs<T> = {
-    insertItems: {
-        insertItems(preview: Array<T>): any;
-    };
-};
-export type InsertionCbs<T = any> = DefineCbs<Insertion<T>, Cbs<T>>;
-export {};

package/facets/Insertion.js

@@ -4,11 +4,17 @@ 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 { getCallbacks, stub, withCbs } from 'aspiration';
-import { data, input, operation, output } from 'skandha';
+import { withCbs } from 'aspiration';
+import { data, input, operation, output, stub } from 'skandha';
 import { getPreview } from '../lib/getPreview';
 class Insertion {
     constructor() {
+        Object.defineProperty(this, "callbackMap", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: {}
+        });
         Object.defineProperty(this, "isInserting", {
             enumerable: true,
             configurable: true,
@@ -32,16 +38,17 @@ class Insertion {
         this.isInserting = isInserting;
     }
     insertItems(args) {
-        const cbs = getCallbacks(this);
-        if (this.inputItems) {
-            this.setIsInserting(true);
-            const preview = getPreview(this.inputItems, args.hoverPosition.targetItemId, args.hoverPosition.isBefore, args.hoverPosition.payload);
-            return Promise.resolve(cbs.insertItems(preview)).then((response) => {
-                this.setIsInserting(false);
-                return response;
-            });
-        }
-        return Promise.resolve();
+        return withCbs(this.callbackMap, 'insertItems', args, (cbs) => {
+            if (this.inputItems) {
+                this.setIsInserting(true);
+                const preview = getPreview(this.inputItems, args.hoverPosition.targetItemId, args.hoverPosition.isBefore, args.hoverPosition.payload);
+                return Promise.resolve(cbs.insertItems(preview)).then((response) => {
+                    this.setIsInserting(false);
+                    return response;
+                });
+            }
+            return Promise.resolve();
+        });
     }
 }
 Object.defineProperty(Insertion, "className", {
@@ -63,7 +70,6 @@ __decorate([
     operation({ log: false })
 ], Insertion.prototype, "setIsInserting", null);
 __decorate([
-    operation,
-    withCbs()
+    operation
 ], Insertion.prototype, "insertItems", null);
 export { Insertion };

package/facets/Selection.d.ts

@@ -1,8 +1,15 @@
-import { DefineCbs } from 'aspiration';
+import { type CallbackMap } from 'aspiration';
 export declare class Selection<T = any> {
     static className: () => string;
+    callbackMap_: CallbackMap<{
+        selectItem?: {
+            selectItem: () => void;
+        } | undefined;
+    }>;
+    get callbackMap(): typeof this.callbackMap_;
+    set callbackMap(cbs: typeof this.callbackMap_);
     selectableIds: Array<string>;
-    ids: Array<string>;
+    itemIds: Array<string>;
     anchorId?: string;
     items: Array<T>;
     selectItem(args: {
@@ -10,17 +17,10 @@ export declare class Selection<T = any> {
         isShift?: boolean;
         isCtrl?: boolean;
         context?: any;
-    }): void;
+    }): any;
 }
-type Cbs<T> = {
-    selectItem: {
-        selectItem(): void;
-    };
-};
-export type SelectionCbs<T = any> = DefineCbs<Selection<T>, Cbs<T>>;
 export declare function handleSelectItem(facet: Selection, args: {
     itemId: string | undefined;
     isShift?: boolean;
     isCtrl?: boolean;
 }): void;
-export {};

package/facets/Selection.js

@@ -4,23 +4,24 @@ 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 { getCallbacks, stub, withCbs } from 'aspiration';
-import { data, input, operation, output } from 'skandha';
+import { mergeDeepLeft, withCbs } from 'aspiration';
+import { data, input, operation, output, stub } from 'skandha';
 import { range } from '../internal/utils';
-const selectItemDefaultCbs = (selection) => ({
-    selectItem: function () {
-        handleSelectItem(selection, this.args);
-    },
-});
 class Selection {
     constructor() {
+        Object.defineProperty(this, "callbackMap_", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: {}
+        });
         Object.defineProperty(this, "selectableIds", {
             enumerable: true,
             configurable: true,
             writable: true,
             value: stub
         });
-        Object.defineProperty(this, "ids", {
+        Object.defineProperty(this, "itemIds", {
             enumerable: true,
             configurable: true,
             writable: true,
@@ -39,9 +40,16 @@ class Selection {
             value: stub
         });
     }
+    get callbackMap() {
+        return this.callbackMap_;
+    }
+    set callbackMap(cbs) {
+        this.callbackMap_ = mergeDeepLeft(cbs, defaultCallbackMap(this));
+    }
     selectItem(args) {
-        const cbs = getCallbacks(this);
-        cbs.selectItem();
+        return withCbs(this.callbackMap, 'selectItem', args, (cbs) => {
+            cbs.selectItem();
+        });
     }
 }
 Object.defineProperty(Selection, "className", {
@@ -55,7 +63,7 @@ __decorate([
 ], Selection.prototype, "selectableIds", void 0);
 __decorate([
     data
-], Selection.prototype, "ids", void 0);
+], Selection.prototype, "itemIds", void 0);
 __decorate([
     data
 ], Selection.prototype, "anchorId", void 0);
@@ -63,17 +71,16 @@ __decorate([
     output
 ], Selection.prototype, "items", void 0);
 __decorate([
-    operation,
-    withCbs(selectItemDefaultCbs)
+    operation
 ], Selection.prototype, "selectItem", null);
 export { Selection };
 export function handleSelectItem(facet, args) {
     if (args.itemId === undefined) {
-        facet.ids = [];
+        facet.itemIds = [];
         facet.anchorId = undefined;
         return;
     }
-    const hasItem = facet.ids.includes(args.itemId);
+    const hasItem = facet.itemIds.includes(args.itemId);
     const selectableIds = facet.selectableIds;
     if (!selectableIds) {
         throw Error('logical error');
@@ -83,18 +90,25 @@ export function handleSelectItem(facet, args) {
         const startIdx = selectableIds.indexOf(startItemId);
         const stopIdx = selectableIds.indexOf(args.itemId);
         const idxRange = range(startIdx, stopIdx);
-        facet.ids = idxRange.map((idx) => selectableIds[idx]);
+        facet.itemIds = idxRange.map((idx) => selectableIds[idx]);
     }
     else if (args.isCtrl) {
-        facet.ids = hasItem
-            ? facet.ids.filter((x) => x !== args.itemId)
-            : [...facet.ids, args.itemId];
+        facet.itemIds = hasItem
+            ? facet.itemIds.filter((x) => x !== args.itemId)
+            : [...facet.itemIds, args.itemId];
     }
     else {
-        facet.ids = [args.itemId];
+        facet.itemIds = [args.itemId];
     }
     // Move the anchor
     if (!facet.anchorId || !(args.isCtrl || args.isShift)) {
         facet.anchorId = args.itemId;
     }
 }
+const defaultCallbackMap = (selection) => ({
+    selectItem: {
+        selectItem: function () {
+            handleSelectItem(selection, this.args);
+        },
+    },
+});

package/facets/SelectionUIConnector.js

@@ -44,7 +44,7 @@ export class SelectionUIConnector {
     }
     _createMouseDownHandler() {
         return (e, itemId) => {
-            const isSelected = this.props.selection.ids.includes(itemId);
+            const isSelected = this.props.selection.itemIds.includes(itemId);
             if (!isSelected) {
                 this._selectOnMouseUp = undefined;
                 this._select(e, itemId);
@@ -56,7 +56,7 @@ export class SelectionUIConnector {
     }
     _createMouseUpHandler() {
         return (e, itemId) => {
-            const isSelected = this.props.selection.ids.includes(itemId);
+            const isSelected = this.props.selection.itemIds.includes(itemId);
             // If the item was already selected and we left-click it without the ctrl key,
             // then we want to singly select it.
             if (this._selectOnMouseUp === itemId &&
@@ -71,7 +71,7 @@ export class SelectionUIConnector {
             onMouseDown: (e) => this._handleMouseDown(e, itemId),
             onMouseUp: (e) => this._handleMouseUp(e, itemId),
         };
-        return Object.assign({ isSelected: this.props.selection.ids.includes(itemId) }, mouseHandlers);
+        return Object.assign({ isSelected: this.props.selection.itemIds.includes(itemId) }, mouseHandlers);
     }
 }
 export function selectionUIHandlers(props) {
@@ -84,7 +84,7 @@ export const createSelectionKeyHandlers = (selection, options) => {
     var _a, _b;
     const down = (_a = options === null || options === void 0 ? void 0 : options.keyDown) !== null && _a !== void 0 ? _a : 'down';
     const up = (_b = options === null || options === void 0 ? void 0 : options.keyUp) !== null && _b !== void 0 ? _b : 'up';
-    const getAnchor = () => selection.ids[selection.ids.length - 1];
+    const getAnchor = () => selection.itemIds[selection.itemIds.length - 1];
     const getSelectableIds = () => {
         var _a;
         return (options === null || options === void 0 ? void 0 : options.getSelectableIds)

package/index.d.ts

@@ -1,15 +1,15 @@
-export { Addition, type AdditionCbs } from './facets/Addition';
-export { Deletion, type DeletionCbs } from './facets/Deletion';
+export { Addition } from './facets/Addition';
+export { Deletion } from './facets/Deletion';
 export { Display } from './facets/Display';
-export { DragAndDrop, type DragAndDropCbs } from './facets/DragAndDrop';
+export { DragAndDrop } from './facets/DragAndDrop';
 export { DragAndDropUIConnector, dragAndDropUIHandlers, type DragAndDropUIConnectorT, type DragAndDropUIPropsT, } from './facets/DragAndDropUIConnector';
-export { Edit, type EditCbs } from './facets/Edit';
-export { Filtering, type FilteringCbs } from './facets/Filtering';
-export { Highlight, type HighlightCbs } from './facets/Highlight';
+export { Edit } from './facets/Edit';
+export { Filtering } from './facets/Filtering';
+export { Highlight } from './facets/Highlight';
 export { HighlightUIConnector, createHighlightKeyHandlers, highlightUIHandlers, type HighlightUIConnectorT, type HighlightUIPropsT, } from './facets/HighlightUIConnector';
 export { Hovering, type HoverPositionT } from './facets/Hovering';
-export { Insertion, type InsertionCbs } from './facets/Insertion';
-export { Selection, handleSelectItem, type SelectionCbs, } from './facets/Selection';
+export { Insertion } from './facets/Insertion';
+export { Selection, handleSelectItem } from './facets/Selection';
 export { SelectionUIConnector, createSelectionKeyHandlers, selectionUIHandlers, type SelectionUIConnectorT, type SelectionUIPropsT, } from './facets/SelectionUIConnector';
 export { Store } from './facets/Store';
 export { topOfTheList } from './lib/getPreview';

package/index.js

@@ -9,7 +9,7 @@ export { Highlight } from './facets/Highlight';
 export { HighlightUIConnector, createHighlightKeyHandlers, highlightUIHandlers, } from './facets/HighlightUIConnector';
 export { Hovering } from './facets/Hovering';
 export { Insertion } from './facets/Insertion';
-export { Selection, handleSelectItem, } from './facets/Selection';
+export { Selection, handleSelectItem } from './facets/Selection';
 export { SelectionUIConnector, createSelectionKeyHandlers, selectionUIHandlers, } from './facets/SelectionUIConnector';
 export { Store } from './facets/Store';
 export { topOfTheList } from './lib/getPreview';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "skandha-facets",
-  "version": "0.12.1",
+  "version": "0.14.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.11.0",
-    "aspiration": ">=0.5.0"
+    "skandha": ">=0.14.0",
+    "aspiration": ">=0.6.0"
   },
   "devDependencies": {
     "typescript": "^4.0.3"

package/policies/cancelNewItemOnHighlightChange.d.ts

@@ -1,2 +1,2 @@
 import { Highlight } from '../facets/Highlight';
-export declare function cancelNewItemOnHighlightChange(facet: Highlight, id: string): void;
+export declare function cancelNewItemOnHighlightChange(facet: Highlight, itemId: string): void;

package/policies/cancelNewItemOnHighlightChange.js

@@ -1,10 +1,10 @@
 import { getc, getf } from 'skandha';
 import { Addition } from '../facets/Addition';
-export function cancelNewItemOnHighlightChange(facet, id) {
+export function cancelNewItemOnHighlightChange(facet, itemId) {
     var _a;
     const ctr = getc(facet);
     const addedItemId = (_a = getf(Addition, ctr).item) === null || _a === void 0 ? void 0 : _a.id;
-    if (addedItemId && addedItemId !== id) {
+    if (addedItemId && addedItemId !== itemId) {
         getf(Addition, ctr).cancel();
     }
 }

package/policies/correctHighlight.js

@@ -1,13 +1,13 @@
 export function correctHighlight(highlight, allItemIds, highlightableIds) {
     highlightableIds = highlightableIds !== null && highlightableIds !== void 0 ? highlightableIds : highlight.highlightableIds;
-    if (highlight.id &&
-        allItemIds.includes(highlight.id) &&
-        !highlightableIds.includes(highlight.id)) {
-        const highlightedItemIdx = allItemIds.indexOf(highlight.id);
+    if (highlight.itemId &&
+        allItemIds.includes(highlight.itemId) &&
+        !highlightableIds.includes(highlight.itemId)) {
+        const highlightedItemIdx = allItemIds.indexOf(highlight.itemId);
         const newIdx = _findNeighbourIdx(highlightableIds, allItemIds, highlightedItemIdx, allItemIds.length, 1) ||
             _findNeighbourIdx(highlightableIds, allItemIds, highlightedItemIdx, -1, -1);
-        highlight.highlightItem({
-            id: newIdx ? allItemIds[newIdx.result] : undefined,
+        highlight.set({
+            itemId: newIdx ? allItemIds[newIdx.result] : undefined,
         });
     }
 }

package/policies/highlightFollowsSelection.js

@@ -3,6 +3,6 @@ import { Highlight } from '../facets/Highlight';
 export function highlightFollowsSelection(facet, args) {
     const ctr = getc(facet);
     if (!args.isCtrl && !args.isShift) {
-        getf(Highlight, ctr).highlightItem({ id: args.itemId });
+        getf(Highlight, ctr).set({ itemId: args.itemId });
     }
 }

package/policies/highlightNewItem.js

@@ -3,6 +3,6 @@ import { Highlight } from '../facets/Highlight';
 export function highlightNewItem(facet) {
     const ctr = getc(facet);
     if (facet.item) {
-        getf(Highlight, ctr).highlightItem({ id: facet.item.id });
+        getf(Highlight, ctr).set({ itemId: facet.item.id });
     }
 }

package/policies/newItemsAreAddedBelowTheHighlight.js

@@ -3,5 +3,5 @@ import { Highlight } from '../facets/Highlight';
 import { topOfTheList } from '../lib/getPreview';
 export function newItemsAreAddedBelowTheHighlight(facet) {
     const ctr = getc(facet);
-    facet.parentId = getf(Highlight, ctr).id || topOfTheList;
+    facet.parentId = getf(Highlight, ctr).itemId || topOfTheList;
 }