skandha-facets 0.8.0 → 0.8.1

package/Filtering.d.ts

@@ -5,8 +5,8 @@ export declare class Filtering<ValueT = any> {
     static className: () => string;
     isEnabled: boolean;
     filter: FilterT;
-    inputItems?: Array<ValueT>;
-    get filteredItems(): any[] | undefined;
+    inputItems: Array<ValueT>;
+    get filteredItems(): any[];
     apply(filter: FilterT): (cbs: FilteringCbs['apply']) => void;
     setEnabled(flag: boolean): (cbs: FilteringCbs['setEnabled']) => void;
 }

package/Filtering.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 } from 'aspiration';
+import { host, stub } from 'aspiration';
 import { data, mapDataToFacet, operation } from 'skandha';
 export class Filtering {
     constructor() {
@@ -24,7 +24,7 @@ export class Filtering {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: void 0
+            value: stub()
         });
     }
     get filteredItems() {

package/Insertion.d.ts

@@ -4,8 +4,8 @@ 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>;
+    inputItems: Array<ValueT>;
+    preview: Array<ValueT>;
     insertItems(drag: DragT): (cbs: InsertionCbs['insertItems']) => void;
 }
 export declare const insertionUsesInputItems: (getItems: GetterT, transform?: Function) => (ctr: any) => void;

package/Insertion.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 } from 'aspiration';
+import { host, stub } from 'aspiration';
 import { input, mapDataToFacet, operation, output } from 'skandha';
 import { getPreview } from './lib/getPreview';
 export class Insertion {
@@ -13,13 +13,13 @@ export class Insertion {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: void 0
+            value: stub()
         });
         Object.defineProperty(this, "preview", {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: void 0
+            value: stub()
         });
     }
     insertItems(drag) {

package/Labelling.d.ts

@@ -5,7 +5,7 @@ export declare class Labelling {
     static className: () => string;
     idsByLabel: IdsByLabelT;
     ids: (label: string) => any[];
-    itemsByLabel?: ItemsByLabelT;
+    itemsByLabel: ItemsByLabelT;
     setLabel(labelValue: LabelValueT): (cbs: LabellingCbs['setLabel']) => void;
 }
 export declare const labellingActsOnItems: (getItemById: GetterT) => (ctr: any) => void;

package/Labelling.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 } from 'aspiration';
+import { host, stub } from 'aspiration';
 import { data, getm, input, mapDatasToFacet, operation, } from 'skandha';
 import { lookUp } from './internal/utils';
 export class Labelling {
@@ -25,7 +25,7 @@ export class Labelling {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: void 0
+            value: stub()
         });
     }
     setLabel(labelValue) {

package/Selection.d.ts

@@ -3,10 +3,10 @@ import { SelectionCbs, SelectionParamsT } from './SelectionCbs';
 export type { SelectionCbs, SelectionParamsT } from './SelectionCbs';
 export declare class Selection<ValueT = any> {
     static className: () => string;
-    selectableIds?: Array<string>;
+    selectableIds: Array<string>;
     ids: Array<string>;
     anchorId?: string;
-    items?: Array<ValueT>;
+    items: Array<ValueT>;
     selectItem(selectionParams: SelectionParamsT): (cbs: SelectionCbs['selectItem']) => void;
 }
 export declare function handleSelectItem(facet: Selection, { itemId, isShift, isCtrl }: SelectionParamsT): void;

package/Selection.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 } from 'aspiration';
+import { host, stub } from 'aspiration';
 import { data, getm, input, mapDatasToFacet, mapDataToFacet, operation, output, } from 'skandha';
 import { lookUp, range } from './internal/utils';
 const selectItemDefaultCbs = (selection) => ({
@@ -18,7 +18,7 @@ export class Selection {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: void 0
+            value: stub()
         });
         Object.defineProperty(this, "ids", {
             enumerable: true,
@@ -36,7 +36,7 @@ export class Selection {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: void 0
+            value: stub()
         });
     }
     selectItem(selectionParams) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "skandha-facets",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "description": "Facets for use with the skandha library",
   "main": "index.js",
   "repository": "https://github.com/mnieber/skandha-facets.git",

package/policies/highlightIsCorrectedOnFilterChange.d.ts

@@ -1,2 +1,4 @@
-import { Filtering } from "../Filtering";
+import { Filtering } from '../Filtering';
+import { Highlight } from '../Highlight';
 export declare function highlightIsCorrectedOnFilterChange(facet: Filtering): void;
+export declare function correctHighlight(highlight: Highlight, inputItemIds: any[], filteredItemIds: any[]): void;

package/policies/highlightIsCorrectedOnFilterChange.js

@@ -1,5 +1,23 @@
-import { getf, getc } from "skandha";
-import { Highlight } from "../Highlight";
+import { getc, getf } from 'skandha';
+import { Highlight } from '../Highlight';
+export function highlightIsCorrectedOnFilterChange(facet) {
+    var _a;
+    if (facet.isEnabled) {
+        correctHighlight(getf(Highlight, getc(facet)), (facet.inputItems || []).map((x) => x.id), ((_a = facet.filteredItems) !== null && _a !== void 0 ? _a : []).map((x) => x.id));
+    }
+}
+export function correctHighlight(highlight, inputItemIds, filteredItemIds) {
+    if (highlight.id &&
+        inputItemIds.includes(highlight.id) &&
+        !filteredItemIds.includes(highlight.id)) {
+        const highlightedItemIdx = inputItemIds.indexOf(highlight.id);
+        const newIdx = _findNeighbourIdx(filteredItemIds, inputItemIds, highlightedItemIdx, inputItemIds.length, 1) ||
+            _findNeighbourIdx(filteredItemIds, inputItemIds, highlightedItemIdx, -1, -1);
+        if (newIdx) {
+            highlight.highlightItem(inputItemIds[newIdx.result]);
+        }
+    }
+}
 function _findNeighbourIdx(filteredItems, allItems, beginIndex, endIndex, step) {
     for (var idx = beginIndex; idx !== endIndex; idx += step) {
         if (filteredItems.includes(allItems[idx])) {
@@ -8,23 +26,3 @@ function _findNeighbourIdx(filteredItems, allItems, beginIndex, endIndex, step)
     }
     return undefined;
 }
-export function highlightIsCorrectedOnFilterChange(facet) {
-    var _a;
-    const ctr = getc(facet);
-    if (facet.isEnabled) {
-        const highlight = getf(Highlight, ctr).id;
-        const inputItems = facet.inputItems;
-        const filteredItemIds = ((_a = facet.filteredItems) !== null && _a !== void 0 ? _a : []).map((x) => x.id);
-        const inputIds = (inputItems || []).map((x) => x.id);
-        if (highlight &&
-            inputIds.includes(highlight) &&
-            !filteredItemIds.includes(highlight)) {
-            const highlightedItemIdx = inputIds.indexOf(highlight);
-            const newIdx = _findNeighbourIdx(filteredItemIds, inputIds, highlightedItemIdx, inputIds.length, 1) ||
-                _findNeighbourIdx(filteredItemIds, inputIds, highlightedItemIdx, -1, -1);
-            if (newIdx) {
-                getf(Highlight, ctr).highlightItem(inputIds[newIdx.result]);
-            }
-        }
-    }
-}