react-arborist 3.10.4 → 3.10.6

package/dist/main/interfaces/tree-api.d.ts

@@ -149,6 +149,19 @@ export declare class TreeApi<T> {
     get matchFn(): (node: NodeApi<T>) => boolean;
     accessChildren(data: T): readonly T[] | null;
     accessId(data: T): string;
+    /**
+     * Resolve an identifier to a node id. Public methods accept an id string, a
+     * NodeApi, or the raw row data; this is the one place that turns any of those
+     * into the string id used internally. Raw data is run through the configured
+     * `idAccessor` so a custom accessor (e.g. `uuid`) is honored everywhere, not
+     * just where nodes were built. A NodeApi already carries its accessor-derived
+     * `id`, so it is used directly rather than re-accessed (the accessor reads the
+     * underlying data, which a NodeApi does not expose under that key). Unlike
+     * `accessId`, an unresolved id comes back as `undefined` rather than throwing,
+     * preserving the previous behavior of the `id`-only lookup.
+     */
+    identify(identity: string | IdObj | T): string;
+    identifyNull(identity: Identity | T): string | null;
     get firstNode(): NodeApi<T>;
     get lastNode(): NodeApi<T>;
     get focusedNode(): NodeApi<T> | null;
@@ -158,7 +171,7 @@ export declare class TreeApi<T> {
     get(id: string | null): NodeApi<T> | null;
     at(index: number): NodeApi<T> | null;
     nodesBetween(startId: string | null, endId: string | null): NodeApi<T>[];
-    indexOf(id: Identity): number | null;
+    indexOf(id: Identity | T): number | null;
     get editingId(): string | null;
     createInternal(): Promise<void>;
     createLeaf(): Promise<void>;
@@ -167,36 +180,36 @@ export declare class TreeApi<T> {
         parentId?: null | string;
         index?: null | number;
     }): Promise<void>;
-    delete(node: Identity | string[] | IdObj[]): Promise<void>;
-    edit(node: string | IdObj): Promise<EditResult>;
-    submit(identity: Identity, value: string): Promise<void>;
+    delete(node: Identity | T | (string | IdObj | T)[]): Promise<void>;
+    edit(node: string | IdObj | T): Promise<EditResult>;
+    submit(identity: Identity | T, value: string): Promise<void>;
     reset(): void;
-    activate(id: Identity): void;
+    activate(id: Identity | T): void;
     private resolveEdit;
     get selectedIds(): Set<string>;
     get selectedNodes(): NodeApi<T>[];
-    focus(node: Identity, opts?: {
+    focus(node: Identity | T, opts?: {
         scroll?: boolean;
     }): void;
     pageUp(): void;
     pageDown(): void;
-    select(node: Identity, opts?: {
+    select(node: Identity | T, opts?: {
         align?: Align;
         focus?: boolean;
     }): void;
-    deselect(node: Identity): void;
-    selectMulti(identity: Identity, opts?: {
+    deselect(node: Identity | T): void;
+    selectMulti(identity: Identity | T, opts?: {
         align?: Align;
         focus?: boolean;
     }): void;
-    selectContiguous(identity: Identity): void;
+    selectContiguous(identity: Identity | T): void;
     deselectAll(): void;
     selectAll(): void;
     private filterSelectableNodes;
     setSelection(args: {
-        ids: (IdObj | string)[] | null;
-        anchor: Identity;
-        mostRecent: Identity;
+        ids: (IdObj | string | T)[] | null;
+        anchor: Identity | T;
+        mostRecent: Identity | T;
     }): void;
     get cursorParentId(): string | null;
     get cursorOverFolder(): boolean;
@@ -208,14 +221,20 @@ export declare class TreeApi<T> {
     drop(): void;
     hideCursor(): void;
     showCursor(cursor: Cursor): void;
-    open(identity: Identity, redraw?: boolean): void;
-    close(identity: Identity, redraw?: boolean): void;
-    toggle(identity: Identity): void;
-    openParents(identity: Identity): void;
+    open(identity: Identity | T, redraw?: boolean): void;
+    close(identity: Identity | T, redraw?: boolean): void;
+    toggle(identity: Identity | T): void;
+    openParents(identity: Identity | T): void;
     openSiblings(node: NodeApi<T>): void;
     openAll(): void;
     closeAll(): void;
-    scrollTo(identity: Identity, align?: Align): Promise<void> | undefined;
+    scrollTo(identity: Identity | T, align?: Align): Promise<void> | undefined;
+    /**
+     * Horizontally scroll the list so the node's indented content is in view.
+     * A no-op when the list doesn't overflow horizontally (the common case), so
+     * it never disturbs scrolling for trees that fit their width.
+     */
+    private scrollToNodeHorizontally;
     get isEditing(): boolean;
     get isFiltered(): boolean;
     get hasFocus(): boolean;
@@ -228,10 +247,10 @@ export declare class TreeApi<T> {
     isDraggable(data: T): boolean;
     isSelectable(data: T): boolean;
     private isActionPossible;
-    isDragging(node: Identity): boolean;
+    isDragging(node: Identity | T): boolean;
     isFocused(id: string): boolean;
     isMatch(node: NodeApi<T>): boolean;
-    willReceiveDrop(node: Identity): boolean;
+    willReceiveDrop(node: Identity | T): boolean;
     onFocus(): void;
     onBlur(): void;
     onItemsRendered(args: ListOnItemsRenderedProps): void;

package/dist/main/interfaces/tree-api.js

@@ -37,6 +37,7 @@ const utils = __importStar(require("../utils"));
 const default_cursor_1 = require("../components/default-cursor");
 const default_row_1 = require("../components/default-row");
 const default_node_1 = require("../components/default-node");
+const node_api_1 = require("./node-api");
 const edit_slice_1 = require("../state/edit-slice");
 const focus_slice_1 = require("../state/focus-slice");
 const create_root_1 = require("../data/create-root");
@@ -47,7 +48,7 @@ const default_drag_preview_1 = require("../components/default-drag-preview");
 const default_container_1 = require("../components/default-container");
 const create_list_1 = require("../data/create-list");
 const create_index_1 = require("../data/create-index");
-const { safeRun, identify, identifyNull } = utils;
+const { safeRun } = utils;
 class TreeApi {
     constructor(store, props, list, listEl) {
         this.store = store;
@@ -189,6 +190,30 @@ class TreeApi {
             throw new Error("Data must contain an 'id' property or props.idAccessor must return a string");
         return id;
     }
+    /**
+     * Resolve an identifier to a node id. Public methods accept an id string, a
+     * NodeApi, or the raw row data; this is the one place that turns any of those
+     * into the string id used internally. Raw data is run through the configured
+     * `idAccessor` so a custom accessor (e.g. `uuid`) is honored everywhere, not
+     * just where nodes were built. A NodeApi already carries its accessor-derived
+     * `id`, so it is used directly rather than re-accessed (the accessor reads the
+     * underlying data, which a NodeApi does not expose under that key). Unlike
+     * `accessId`, an unresolved id comes back as `undefined` rather than throwing,
+     * preserving the previous behavior of the `id`-only lookup.
+     */
+    identify(identity) {
+        if (typeof identity === "string")
+            return identity;
+        if (identity instanceof node_api_1.NodeApi)
+            return identity.id;
+        const get = this.props.idAccessor || "id";
+        return utils.access(identity, get);
+    }
+    identifyNull(identity) {
+        if (identity === null || identity === undefined)
+            return null;
+        return this.identify(identity);
+    }
     /* Node Access */
     get firstNode() {
         var _a;
@@ -244,7 +269,7 @@ class TreeApi {
         return this.visibleNodes.slice(start, end + 1);
     }
     indexOf(id) {
-        const key = utils.identifyNull(id);
+        const key = this.identifyNull(id);
         if (!key)
             return null;
         return this.idToIndex[key];
@@ -287,7 +312,7 @@ class TreeApi {
             if (!node)
                 return;
             const idents = Array.isArray(node) ? node : [node];
-            const ids = idents.map(identify);
+            const ids = idents.map((i) => this.identify(i));
             const nodes = ids.map((id) => this.get(id)).filter((n) => !!n);
             /* Guard against Math.min(...[]) === Infinity when no ids resolve to nodes. */
             const fromIndex = nodes.length ? Math.min(...nodes.map((n) => { var _a; return (_a = n.rowIndex) !== null && _a !== void 0 ? _a : 0; })) : 0;
@@ -297,7 +322,7 @@ class TreeApi {
     }
     edit(node) {
         var _a, _b;
-        const id = identify(node);
+        const id = this.identify(node);
         this.resolveEdit({ cancelled: true });
         this.scrollTo(id);
         this.dispatch((0, edit_slice_1.edit)(id));
@@ -311,7 +336,7 @@ class TreeApi {
             var _a, _b;
             if (!identity)
                 return;
-            const id = identify(identity);
+            const id = this.identify(identity);
             yield safeRun(this.props.onRename, {
                 id,
                 name: value,
@@ -330,7 +355,7 @@ class TreeApi {
         setTimeout(() => this.onFocus()); // Return focus to element;
     }
     activate(id) {
-        const node = this.get(identifyNull(id));
+        const node = this.get(this.identifyNull(id));
         if (!node)
             return;
         safeRun(this.props.onActivate, node);
@@ -364,7 +389,7 @@ class TreeApi {
             this.select(node);
         }
         else {
-            this.dispatch((0, focus_slice_1.focus)(identify(node)));
+            this.dispatch((0, focus_slice_1.focus)(this.identify(node)));
             if (opts.scroll !== false)
                 this.scrollTo(node);
             if (this.focusedNode)
@@ -404,7 +429,7 @@ class TreeApi {
         if (!node)
             return;
         const changeFocus = opts.focus !== false;
-        const id = identify(node);
+        const id = this.identify(node);
         if (changeFocus)
             this.dispatch((0, focus_slice_1.focus)(id));
         if ((_a = this.get(id)) === null || _a === void 0 ? void 0 : _a.isSelectable) {
@@ -422,12 +447,12 @@ class TreeApi {
     deselect(node) {
         if (!node)
             return;
-        const id = identify(node);
+        const id = this.identify(node);
         this.dispatch(selection_slice_1.actions.remove(id));
         safeRun(this.props.onSelect, this.selectedNodes);
     }
     selectMulti(identity, opts = {}) {
-        const node = this.get(identifyNull(identity));
+        const node = this.get(this.identifyNull(identity));
         if (!node)
             return;
         const changeFocus = opts.focus !== false;
@@ -448,11 +473,11 @@ class TreeApi {
         var _a;
         if (!identity)
             return;
-        const id = identify(identity);
+        const id = this.identify(identity);
         this.dispatch((0, focus_slice_1.focus)(id));
         if ((_a = this.get(id)) === null || _a === void 0 ? void 0 : _a.isSelectable) {
             const { anchor, mostRecent } = this.state.nodes.selection;
-            const selectableNodes = this.filterSelectableNodes(this.nodesBetween(anchor, identifyNull(id)));
+            const selectableNodes = this.filterSelectableNodes(this.nodesBetween(anchor, this.identifyNull(id)));
             this.dispatch(selection_slice_1.actions.remove(this.nodesBetween(anchor, mostRecent)));
             this.dispatch(selection_slice_1.actions.add(selectableNodes));
             this.dispatch(selection_slice_1.actions.mostRecent(id));
@@ -481,14 +506,14 @@ class TreeApi {
     }
     filterSelectableNodes(nodes) {
         return nodes
-            .map((n) => this.get(identify(n)))
+            .map((n) => this.get(this.identify(n)))
             .filter((n) => !!n && n.isSelectable);
     }
     setSelection(args) {
         var _a;
-        const ids = new Set((_a = args.ids) === null || _a === void 0 ? void 0 : _a.map(identify));
-        const anchor = identifyNull(args.anchor);
-        const mostRecent = identifyNull(args.mostRecent);
+        const ids = new Set((_a = args.ids) === null || _a === void 0 ? void 0 : _a.map((i) => this.identify(i)));
+        const anchor = this.identifyNull(args.anchor);
+        const mostRecent = this.identifyNull(args.mostRecent);
         this.dispatch(selection_slice_1.actions.set({ ids, anchor, mostRecent }));
         safeRun(this.props.onSelect, this.selectedNodes);
     }
@@ -571,7 +596,7 @@ class TreeApi {
     /* Visibility */
     open(identity, redraw = true) {
         var _a, _b;
-        const id = identifyNull(identity);
+        const id = this.identifyNull(identity);
         if (!id)
             return;
         if (this.isOpen(id))
@@ -583,7 +608,7 @@ class TreeApi {
     }
     close(identity, redraw = true) {
         var _a, _b;
-        const id = identifyNull(identity);
+        const id = this.identifyNull(identity);
         if (!id)
             return;
         if (!this.isOpen(id))
@@ -594,13 +619,13 @@ class TreeApi {
         safeRun(this.props.onToggle, id);
     }
     toggle(identity) {
-        const id = identifyNull(identity);
+        const id = this.identifyNull(identity);
         if (!id)
             return;
         return this.isOpen(id) ? this.close(id) : this.open(id);
     }
     openParents(identity) {
-        const id = identifyNull(identity);
+        const id = this.identifyNull(identity);
         if (!id)
             return;
         const node = utils.dfs(this.root, id);
@@ -648,7 +673,7 @@ class TreeApi {
     scrollTo(identity, align = "smart") {
         if (!identity)
             return;
-        const id = identify(identity);
+        const id = this.identify(identity);
         this.openParents(id);
         return utils
             .waitFor(() => id in this.idToIndex)
@@ -658,11 +683,38 @@ class TreeApi {
             if (index === undefined)
                 return;
             (_a = this.list.current) === null || _a === void 0 ? void 0 : _a.scrollToItem(index, align);
+            /* react-window only scrolls vertically. A deeply nested node is
+               indented by level * indent and can sit past the right edge when rows
+               overflow horizontally, so bring it into view ourselves (#220). */
+            this.scrollToNodeHorizontally(this.get(id));
         })
             .catch(() => {
             // Id: ${id} never appeared in the list.
         });
     }
+    /**
+     * Horizontally scroll the list so the node's indented content is in view.
+     * A no-op when the list doesn't overflow horizontally (the common case), so
+     * it never disturbs scrolling for trees that fit their width.
+     */
+    scrollToNodeHorizontally(node) {
+        const el = this.listEl.current;
+        if (!node || !el)
+            return;
+        const maxScroll = el.scrollWidth - el.clientWidth;
+        if (maxScroll <= 0)
+            return; // nothing to scroll
+        const left = node.level * this.indent;
+        const viewLeft = el.scrollLeft;
+        const viewRight = el.scrollLeft + el.clientWidth;
+        /* The visible range is half-open [viewLeft, viewRight): a pixel at viewRight
+           is already clipped. Only move when the node's indentation falls outside
+           it, aligning its content start to the left edge so the label is revealed,
+           clamped to the list's scrollable range. */
+        if (left < viewLeft || left >= viewRight) {
+            el.scrollLeft = Math.max(0, Math.min(left, maxScroll));
+        }
+    }
     /* State Checks */
     get isEditing() {
         return this.state.nodes.edit.id !== null;
@@ -715,7 +767,7 @@ class TreeApi {
         return !utils.access(data, disabler);
     }
     isDragging(node) {
-        const id = identifyNull(node);
+        const id = this.identifyNull(node);
         if (!id)
             return false;
         return this.state.nodes.drag.id === id;
@@ -727,7 +779,7 @@ class TreeApi {
         return this.matchFn(node);
     }
     willReceiveDrop(node) {
-        const id = identifyNull(node);
+        const id = this.identifyNull(node);
         if (!id)
             return false;
         const { destinationParentId, destinationIndex } = this.state.nodes.drag;

package/dist/main/interfaces/tree-api.test.js

@@ -1,4 +1,13 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const redux_1 = require("redux");
 const root_reducer_1 = require("../state/root-reducer");
@@ -38,6 +47,45 @@ describe("tree.drop() fires onMove (#313)", () => {
         expect(onMove).toHaveBeenCalledWith(expect.objectContaining({ parentId: "folder", index: 0 }));
     });
 });
+describe("custom idAccessor is honored when methods receive raw data (#347)", () => {
+    const uuidData = [{ uuid: "a" }, { uuid: "b" }, { uuid: "c" }];
+    test("select(data) resolves the id through idAccessor", () => {
+        const onSelect = jest.fn();
+        const api = setupApi({ data: uuidData, idAccessor: "uuid", onSelect });
+        api.select(uuidData[1]);
+        expect(api.selectedIds.has("b")).toBe(true);
+        expect(api.selectedNodes.map((n) => n.id)).toEqual(["b"]);
+    });
+    test("focus(data) resolves the id through idAccessor", () => {
+        var _a;
+        const api = setupApi({ data: uuidData, idAccessor: "uuid" });
+        api.focus(uuidData[2]);
+        expect((_a = api.focusedNode) === null || _a === void 0 ? void 0 : _a.id).toBe("c");
+    });
+    test("delete(data) passes the accessor-derived id to onDelete", () => {
+        const onDelete = jest.fn();
+        const api = setupApi({ data: uuidData, idAccessor: "uuid", onDelete });
+        api.delete(uuidData[0]);
+        expect(onDelete).toHaveBeenCalledWith(expect.objectContaining({ ids: ["a"] }));
+    });
+    test("create() focuses the new node by its accessor-derived id", () => __awaiter(void 0, void 0, void 0, function* () {
+        // create() passes the raw row data returned by onCreate straight to
+        // focus/edit/select; before the fix these read `.id` and lost the node.
+        const onCreate = () => ({ uuid: "new" });
+        const api = setupApi({ data: uuidData, idAccessor: "uuid", onCreate });
+        yield api.create();
+        expect(api.state.nodes.focus.id).toBe("new");
+    }));
+    test("a function idAccessor is honored too", () => {
+        const fnData = [{ meta: { key: "x" } }, { meta: { key: "y" } }];
+        const api = setupApi({
+            data: fnData,
+            idAccessor: (d) => d.meta.key,
+        });
+        api.select(fnData[1]);
+        expect(api.selectedIds.has("y")).toBe(true);
+    });
+});
 test("rowHeight defaults to 24", () => {
     const api = setupApi({});
     expect(api.rowHeight).toBe(24);
@@ -119,3 +167,55 @@ describe("onSelect fires exactly once per selection method (#332)", () => {
         expect(onSelect).toHaveBeenCalledTimes(1);
     });
 });
+describe("scrollTo brings a deeply nested node into view horizontally (#220)", () => {
+    // A folder tree where "deep" sits at level 2 (indented 2 * 24 = 48px).
+    const nestedData = [{ id: "root", children: [{ id: "mid", children: [{ id: "deep" }] }] }];
+    // react-window's scrollToItem only scrolls vertically; the horizontal scroll
+    // happens on the outer list element, which we stub here.
+    function setupWithListEl(el) {
+        const store = (0, redux_1.createStore)(root_reducer_1.rootReducer);
+        const list = { current: { scrollToItem: jest.fn() } };
+        const listEl = { current: el };
+        return new tree_api_1.TreeApi(store, { data: nestedData }, list, listEl);
+    }
+    test("scrolls right when the node is past the right edge", () => __awaiter(void 0, void 0, void 0, function* () {
+        const el = { scrollWidth: 500, clientWidth: 40, scrollLeft: 0 };
+        const api = setupWithListEl(el);
+        yield api.scrollTo("deep");
+        // Aligns the node's indentation start (level 2 * indent 24) to the left edge.
+        expect(el.scrollLeft).toBe(48);
+    }));
+    test("scrolls left when the node is past the left edge", () => __awaiter(void 0, void 0, void 0, function* () {
+        const el = { scrollWidth: 500, clientWidth: 100, scrollLeft: 200 };
+        const api = setupWithListEl(el);
+        yield api.scrollTo("deep");
+        expect(el.scrollLeft).toBe(48);
+    }));
+    test("scrolls when the node's start sits exactly on the right edge", () => __awaiter(void 0, void 0, void 0, function* () {
+        // viewRight === left (48): the visible range is half-open, so the content
+        // start is already clipped and must be scrolled into view.
+        const el = { scrollWidth: 500, clientWidth: 48, scrollLeft: 0 };
+        const api = setupWithListEl(el);
+        yield api.scrollTo("deep");
+        expect(el.scrollLeft).toBe(48);
+    }));
+    test("clamps the target to the maximum scrollable distance", () => __awaiter(void 0, void 0, void 0, function* () {
+        // left (48) exceeds maxScroll (60 - 40 = 20), so scrollLeft is clamped.
+        const el = { scrollWidth: 60, clientWidth: 40, scrollLeft: 0 };
+        const api = setupWithListEl(el);
+        yield api.scrollTo("deep");
+        expect(el.scrollLeft).toBe(20);
+    }));
+    test("leaves scroll untouched when the node is already in view", () => __awaiter(void 0, void 0, void 0, function* () {
+        const el = { scrollWidth: 500, clientWidth: 200, scrollLeft: 0 };
+        const api = setupWithListEl(el);
+        yield api.scrollTo("deep");
+        expect(el.scrollLeft).toBe(0);
+    }));
+    test("no-ops when the list does not overflow horizontally", () => __awaiter(void 0, void 0, void 0, function* () {
+        const el = { scrollWidth: 100, clientWidth: 100, scrollLeft: 0 };
+        const api = setupWithListEl(el);
+        yield api.scrollTo("deep");
+        expect(el.scrollLeft).toBe(0);
+    }));
+});

package/dist/main/types/handlers.d.ts

@@ -5,7 +5,7 @@ export type CreateHandler<T> = (args: {
     parentNode: NodeApi<T> | null;
     index: number;
     type: "internal" | "leaf";
-}) => (IdObj | null) | Promise<IdObj | null>;
+}) => (T | IdObj | null) | Promise<T | IdObj | null>;
 export type MoveHandler<T> = (args: {
     dragIds: string[];
     dragNodes: NodeApi<T>[];

package/dist/module/interfaces/tree-api.d.ts

@@ -149,6 +149,19 @@ export declare class TreeApi<T> {
     get matchFn(): (node: NodeApi<T>) => boolean;
     accessChildren(data: T): readonly T[] | null;
     accessId(data: T): string;
+    /**
+     * Resolve an identifier to a node id. Public methods accept an id string, a
+     * NodeApi, or the raw row data; this is the one place that turns any of those
+     * into the string id used internally. Raw data is run through the configured
+     * `idAccessor` so a custom accessor (e.g. `uuid`) is honored everywhere, not
+     * just where nodes were built. A NodeApi already carries its accessor-derived
+     * `id`, so it is used directly rather than re-accessed (the accessor reads the
+     * underlying data, which a NodeApi does not expose under that key). Unlike
+     * `accessId`, an unresolved id comes back as `undefined` rather than throwing,
+     * preserving the previous behavior of the `id`-only lookup.
+     */
+    identify(identity: string | IdObj | T): string;
+    identifyNull(identity: Identity | T): string | null;
     get firstNode(): NodeApi<T>;
     get lastNode(): NodeApi<T>;
     get focusedNode(): NodeApi<T> | null;
@@ -158,7 +171,7 @@ export declare class TreeApi<T> {
     get(id: string | null): NodeApi<T> | null;
     at(index: number): NodeApi<T> | null;
     nodesBetween(startId: string | null, endId: string | null): NodeApi<T>[];
-    indexOf(id: Identity): number | null;
+    indexOf(id: Identity | T): number | null;
     get editingId(): string | null;
     createInternal(): Promise<void>;
     createLeaf(): Promise<void>;
@@ -167,36 +180,36 @@ export declare class TreeApi<T> {
         parentId?: null | string;
         index?: null | number;
     }): Promise<void>;
-    delete(node: Identity | string[] | IdObj[]): Promise<void>;
-    edit(node: string | IdObj): Promise<EditResult>;
-    submit(identity: Identity, value: string): Promise<void>;
+    delete(node: Identity | T | (string | IdObj | T)[]): Promise<void>;
+    edit(node: string | IdObj | T): Promise<EditResult>;
+    submit(identity: Identity | T, value: string): Promise<void>;
     reset(): void;
-    activate(id: Identity): void;
+    activate(id: Identity | T): void;
     private resolveEdit;
     get selectedIds(): Set<string>;
     get selectedNodes(): NodeApi<T>[];
-    focus(node: Identity, opts?: {
+    focus(node: Identity | T, opts?: {
         scroll?: boolean;
     }): void;
     pageUp(): void;
     pageDown(): void;
-    select(node: Identity, opts?: {
+    select(node: Identity | T, opts?: {
         align?: Align;
         focus?: boolean;
     }): void;
-    deselect(node: Identity): void;
-    selectMulti(identity: Identity, opts?: {
+    deselect(node: Identity | T): void;
+    selectMulti(identity: Identity | T, opts?: {
         align?: Align;
         focus?: boolean;
     }): void;
-    selectContiguous(identity: Identity): void;
+    selectContiguous(identity: Identity | T): void;
     deselectAll(): void;
     selectAll(): void;
     private filterSelectableNodes;
     setSelection(args: {
-        ids: (IdObj | string)[] | null;
-        anchor: Identity;
-        mostRecent: Identity;
+        ids: (IdObj | string | T)[] | null;
+        anchor: Identity | T;
+        mostRecent: Identity | T;
     }): void;
     get cursorParentId(): string | null;
     get cursorOverFolder(): boolean;
@@ -208,14 +221,20 @@ export declare class TreeApi<T> {
     drop(): void;
     hideCursor(): void;
     showCursor(cursor: Cursor): void;
-    open(identity: Identity, redraw?: boolean): void;
-    close(identity: Identity, redraw?: boolean): void;
-    toggle(identity: Identity): void;
-    openParents(identity: Identity): void;
+    open(identity: Identity | T, redraw?: boolean): void;
+    close(identity: Identity | T, redraw?: boolean): void;
+    toggle(identity: Identity | T): void;
+    openParents(identity: Identity | T): void;
     openSiblings(node: NodeApi<T>): void;
     openAll(): void;
     closeAll(): void;
-    scrollTo(identity: Identity, align?: Align): Promise<void> | undefined;
+    scrollTo(identity: Identity | T, align?: Align): Promise<void> | undefined;
+    /**
+     * Horizontally scroll the list so the node's indented content is in view.
+     * A no-op when the list doesn't overflow horizontally (the common case), so
+     * it never disturbs scrolling for trees that fit their width.
+     */
+    private scrollToNodeHorizontally;
     get isEditing(): boolean;
     get isFiltered(): boolean;
     get hasFocus(): boolean;
@@ -228,10 +247,10 @@ export declare class TreeApi<T> {
     isDraggable(data: T): boolean;
     isSelectable(data: T): boolean;
     private isActionPossible;
-    isDragging(node: Identity): boolean;
+    isDragging(node: Identity | T): boolean;
     isFocused(id: string): boolean;
     isMatch(node: NodeApi<T>): boolean;
-    willReceiveDrop(node: Identity): boolean;
+    willReceiveDrop(node: Identity | T): boolean;
     onFocus(): void;
     onBlur(): void;
     onItemsRendered(args: ListOnItemsRenderedProps): void;