skandha-facets 0.12.1 → 0.13.0

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.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/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "skandha-facets",
-  "version": "0.12.1",
+  "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;
 }