skandha-facets 0.12.0 → 0.13.0

package/facets/Deletion.d.ts

@@ -2,6 +2,8 @@ import { DefineCbs } from 'aspiration';
 export declare class Deletion {
     static className: () => string;
     disabled?: boolean;
+    isDeleting: boolean;
+    setIsDeleting(isDeleting: boolean): void;
     delete(args: {
         itemIds: string[];
         moveToTrash?: boolean;

package/facets/Deletion.js

@@ -14,10 +14,23 @@ class Deletion {
             writable: true,
             value: undefined
         });
+        Object.defineProperty(this, "isDeleting", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: false
+        });
+    }
+    setIsDeleting(isDeleting) {
+        this.isDeleting = isDeleting;
     }
     delete(args) {
         const cbs = getCallbacks(this);
-        return Promise.resolve(cbs.deleteItems());
+        this.setIsDeleting(true);
+        return Promise.resolve(cbs.deleteItems()).then((response) => {
+            this.setIsDeleting(false);
+            return response;
+        });
     }
 }
 Object.defineProperty(Deletion, "className", {
@@ -29,6 +42,12 @@ Object.defineProperty(Deletion, "className", {
 __decorate([
     data
 ], Deletion.prototype, "disabled", void 0);
+__decorate([
+    data
+], Deletion.prototype, "isDeleting", void 0);
+__decorate([
+    operation({ log: false })
+], Deletion.prototype, "setIsDeleting", null);
 __decorate([
     operation,
     withCbs()

package/facets/DragAndDrop.d.ts

@@ -2,9 +2,11 @@ import { DefineCbs } from 'aspiration';
 import { HoverPositionT } from './Hovering';
 export declare class DragAndDrop {
     static className: () => string;
+    isDropping: boolean;
+    setIsDropping(isDropping: boolean): void;
     drop(args: {
         hoverPosition: HoverPositionT;
-    }): Promise<void>;
+    }): Promise<any>;
 }
 type Cbs = {
     drop: {

package/facets/DragAndDrop.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 { getCallbacks, withCbs } from 'aspiration';
-import { operation } from 'skandha';
+import { data, operation } from 'skandha';
 import { selectionIsInsertedOnDragAndDrop } from '../policies/selectionIsInsertedOnDragAndDrop';
 const dropDefaultCbs = (dragAndDrop) => ({
     drop: function () {
@@ -13,9 +13,24 @@ const dropDefaultCbs = (dragAndDrop) => ({
     },
 });
 class DragAndDrop {
+    constructor() {
+        Object.defineProperty(this, "isDropping", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: false
+        });
+    }
+    setIsDropping(isDropping) {
+        this.isDropping = isDropping;
+    }
     drop(args) {
         const cbs = getCallbacks(this);
-        return Promise.resolve(cbs.drop());
+        this.setIsDropping(true);
+        return Promise.resolve(cbs.drop()).then((response) => {
+            this.setIsDropping(false);
+            return response;
+        });
     }
 }
 Object.defineProperty(DragAndDrop, "className", {
@@ -24,6 +39,12 @@ Object.defineProperty(DragAndDrop, "className", {
     writable: true,
     value: () => 'DragAndDrop'
 });
+__decorate([
+    data
+], DragAndDrop.prototype, "isDropping", void 0);
+__decorate([
+    operation({ log: false })
+], DragAndDrop.prototype, "setIsDropping", null);
 __decorate([
     operation,
     withCbs(dropDefaultCbs)

package/facets/DragAndDropUIConnector.d.ts

@@ -28,4 +28,3 @@ export declare function dragAndDropUIHandlers<T extends DragAndDropUIPropsT>(pro
     onDrop: ((event: any) => void) | undefined;
     onDragEnd: ((event: any) => void) | undefined;
 };
-export declare function createDragAndDropUIConnector(dragAndDrop: DragAndDrop, hovering: Hovering): DragAndDropUIConnector;

package/facets/DragAndDropUIConnector.js

@@ -53,9 +53,3 @@ export function dragAndDropUIHandlers(props) {
         onDragEnd: props.onDragEnd,
     };
 }
-export function createDragAndDropUIConnector(dragAndDrop, hovering) {
-    return new DragAndDropUIConnector({
-        dragAndDrop,
-        hovering,
-    });
-}

package/facets/Edit.d.ts

@@ -2,7 +2,9 @@ import { DefineCbs } from 'aspiration';
 export declare class Edit {
     static className: () => string;
     isEditing: boolean;
+    isSaving: boolean;
     reset(): void;
+    setIsSaving(isSaving: boolean): void;
     save(args: {
         values: any;
     }): Promise<any>;

package/facets/Edit.js

@@ -14,14 +14,25 @@ class Edit {
             writable: true,
             value: false
         });
+        Object.defineProperty(this, "isSaving", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: false
+        });
     }
     reset() {
         this.isEditing = false;
     }
+    setIsSaving(isSaving) {
+        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;
         });
     }
@@ -49,9 +60,15 @@ Object.defineProperty(Edit, "className", {
 __decorate([
     data
 ], Edit.prototype, "isEditing", void 0);
+__decorate([
+    data
+], Edit.prototype, "isSaving", void 0);
 __decorate([
     operation
 ], Edit.prototype, "reset", null);
+__decorate([
+    operation({ log: false })
+], Edit.prototype, "setIsSaving", null);
 __decorate([
     operation,
     withCbs()

package/facets/Highlight.d.ts

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

package/facets/Highlight.js

@@ -15,7 +15,7 @@ class Highlight {
             writable: true,
             value: stub
         });
-        Object.defineProperty(this, "id", {
+        Object.defineProperty(this, "itemId", {
             enumerable: true,
             configurable: true,
             writable: true,
@@ -28,9 +28,9 @@ class Highlight {
             value: void 0
         });
     }
-    highlightItem(args) {
+    set(args) {
         const cbs = getCallbacks(this);
-        this.id = args.id;
+        this.itemId = args.itemId;
         cbs.scrollItemIntoView && cbs.scrollItemIntoView();
     }
 }
@@ -45,12 +45,12 @@ __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);
+], Highlight.prototype, "set", null);
 export { Highlight };

package/facets/HighlightUIConnector.d.ts

@@ -20,7 +20,6 @@ export type HighlightUIPropsT = {
 export declare function highlightUIHandlers<T extends HighlightUIPropsT>(props: T): {
     onMouseDown: any;
 };
-export declare function createHighlightUIConnector(highlight: Highlight): HighlightUIConnector;
 export declare const createHighlightKeyHandlers: (highlight: Highlight, options?: {
     keyDown?: string;
     keyUp?: string;

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) {
@@ -39,16 +39,11 @@ export function highlightUIHandlers(props) {
         onMouseDown: props.onMouseDown,
     };
 }
-export function createHighlightUIConnector(highlight) {
-    return new HighlightUIConnector({
-        highlight,
-    });
-}
 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)
@@ -62,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

@@ -3,8 +3,10 @@ import { HoverPositionT } from './Hovering';
 export type DragSourceT = (ctr: any) => HoverPositionT | undefined;
 export declare class Insertion<T = any> {
     static className: () => string;
+    isInserting: boolean;
     inputItems: Array<T>;
     preview: Array<T>;
+    setIsInserting(isInserting: boolean): void;
     insertItems(args: {
         hoverPosition: HoverPositionT;
     }): Promise<any>;

package/facets/Insertion.js

@@ -5,10 +5,16 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 import { getCallbacks, stub, withCbs } from 'aspiration';
-import { input, operation, output } from 'skandha';
+import { data, input, operation, output } from 'skandha';
 import { getPreview } from '../lib/getPreview';
 class Insertion {
     constructor() {
+        Object.defineProperty(this, "isInserting", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: false
+        });
         Object.defineProperty(this, "inputItems", {
             enumerable: true,
             configurable: true,
@@ -22,11 +28,18 @@ class Insertion {
             value: stub
         });
     }
+    setIsInserting(isInserting) {
+        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));
+            return Promise.resolve(cbs.insertItems(preview)).then((response) => {
+                this.setIsInserting(false);
+                return response;
+            });
         }
         return Promise.resolve();
     }
@@ -37,12 +50,18 @@ Object.defineProperty(Insertion, "className", {
     writable: true,
     value: () => 'Insertion'
 });
+__decorate([
+    data
+], Insertion.prototype, "isInserting", void 0);
 __decorate([
     input
 ], Insertion.prototype, "inputItems", void 0);
 __decorate([
     output
 ], Insertion.prototype, "preview", void 0);
+__decorate([
+    operation({ log: false })
+], Insertion.prototype, "setIsInserting", null);
 __decorate([
     operation,
     withCbs()

package/facets/Selection.d.ts

@@ -2,7 +2,7 @@ import { DefineCbs } from 'aspiration';
 export declare class Selection<T = any> {
     static className: () => string;
     selectableIds: Array<string>;
-    ids: Array<string>;
+    itemIds: Array<string>;
     anchorId?: string;
     items: Array<T>;
     selectItem(args: {

package/facets/Selection.js

@@ -20,7 +20,7 @@ class Selection {
             writable: true,
             value: stub
         });
-        Object.defineProperty(this, "ids", {
+        Object.defineProperty(this, "itemIds", {
             enumerable: true,
             configurable: true,
             writable: true,
@@ -55,7 +55,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);
@@ -69,11 +69,11 @@ __decorate([
 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,15 +83,15 @@ 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)) {

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

@@ -2,10 +2,11 @@ export { Addition, type AdditionCbs } from './facets/Addition';
 export { Deletion, type DeletionCbs } from './facets/Deletion';
 export { Display } from './facets/Display';
 export { DragAndDrop, type DragAndDropCbs } from './facets/DragAndDrop';
-export { createDragAndDropUIConnector, dragAndDropUIHandlers, type DragAndDropUIConnectorT, type DragAndDropUIPropsT, } from './facets/DragAndDropUIConnector';
+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 { createHighlightKeyHandlers, createHighlightUIConnector, highlightUIHandlers, type HighlightUIConnectorT, type HighlightUIPropsT, } from './facets/HighlightUIConnector';
+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';

package/index.js

@@ -2,10 +2,11 @@ export { Addition } from './facets/Addition';
 export { Deletion } from './facets/Deletion';
 export { Display } from './facets/Display';
 export { DragAndDrop } from './facets/DragAndDrop';
-export { createDragAndDropUIConnector, dragAndDropUIHandlers, } from './facets/DragAndDropUIConnector';
+export { DragAndDropUIConnector, dragAndDropUIHandlers, } from './facets/DragAndDropUIConnector';
 export { Edit } from './facets/Edit';
+export { Filtering } from './facets/Filtering';
 export { Highlight } from './facets/Highlight';
-export { createHighlightKeyHandlers, createHighlightUIConnector, highlightUIHandlers, } from './facets/HighlightUIConnector';
+export { HighlightUIConnector, createHighlightKeyHandlers, highlightUIHandlers, } from './facets/HighlightUIConnector';
 export { Hovering } from './facets/Hovering';
 export { Insertion } from './facets/Insertion';
 export { Selection, handleSelectItem, } from './facets/Selection';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "skandha-facets",
-  "version": "0.12.0",
+  "version": "0.13.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.13.0",
+    "aspiration": ">=0.5.2"
   },
   "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;
 }