mirror of
https://github.com/scm-manager/scm-manager.git
synced 2025-11-10 07:25:44 +01:00
Add keyboard navigation to repository overview list (#2146)
A new api is introduced to allow focus-based list iteration through keyboard shortcuts. The api is initially considered closed and only used in the repository overview. Co-authored-by: Eduard Heimbuch <eduard.heimbuch@cloudogu.com>
This commit is contained in:
committed by
GitHub
parent
7b933c6821
commit
e74d0c9c8b
240
scm-ui/ui-shortcuts/src/iterator/keyboardIterator.test.tsx
Normal file
240
scm-ui/ui-shortcuts/src/iterator/keyboardIterator.test.tsx
Normal file
@@ -0,0 +1,240 @@
|
||||
/*
|
||||
* MIT License
|
||||
*
|
||||
* Copyright (c) 2020-present Cloudogu GmbH and Contributors
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to deal
|
||||
* in the Software without restriction, including without limitation the rights
|
||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
* copies of the Software, and to permit persons to whom the Software is
|
||||
* furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in all
|
||||
* copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
* SOFTWARE.
|
||||
*/
|
||||
|
||||
import { renderHook } from "@testing-library/react-hooks";
|
||||
import React, { FC } from "react";
|
||||
import { KeyboardIteratorContextProvider, useKeyboardIteratorCallback } from "./keyboardIterator";
|
||||
import { render } from "@testing-library/react";
|
||||
import { ShortcutDocsContextProvider } from "../useShortcutDocs";
|
||||
import Mousetrap from "mousetrap";
|
||||
|
||||
jest.mock("react-i18next", () => ({
|
||||
useTranslation: () => [jest.fn()],
|
||||
}));
|
||||
|
||||
const Wrapper: FC<{ initialIndex?: number }> = ({ children, initialIndex }) => {
|
||||
return (
|
||||
<ShortcutDocsContextProvider>
|
||||
<KeyboardIteratorContextProvider initialIndex={initialIndex}>{children}</KeyboardIteratorContextProvider>
|
||||
</ShortcutDocsContextProvider>
|
||||
);
|
||||
};
|
||||
|
||||
const DocsWrapper: FC = ({ children }) => <ShortcutDocsContextProvider>{children}</ShortcutDocsContextProvider>;
|
||||
|
||||
const createWrapper =
|
||||
(initialIndex?: number): FC =>
|
||||
({ children }) =>
|
||||
<Wrapper initialIndex={initialIndex}>{children}</Wrapper>;
|
||||
|
||||
const Item: FC<{ callback: () => void }> = ({ callback }) => {
|
||||
useKeyboardIteratorCallback(callback);
|
||||
return <li>example</li>;
|
||||
};
|
||||
|
||||
const List: FC<{ callbacks: Array<() => void> }> = ({ callbacks }) => {
|
||||
return (
|
||||
<ul data-testid="list">
|
||||
{callbacks.map((cb, idx) => (
|
||||
<Item key={idx} callback={cb} />
|
||||
))}
|
||||
</ul>
|
||||
);
|
||||
};
|
||||
|
||||
describe("shortcutIterator", () => {
|
||||
beforeEach(() => Mousetrap.reset());
|
||||
|
||||
it("should not call callback upon registration", () => {
|
||||
const callback = jest.fn();
|
||||
|
||||
renderHook(() => useKeyboardIteratorCallback(callback), {
|
||||
wrapper: Wrapper,
|
||||
});
|
||||
|
||||
expect(callback).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it("should not throw if not inside keyboard iterator context", () => {
|
||||
const callback = jest.fn();
|
||||
|
||||
const { result, unmount } = renderHook(() => useKeyboardIteratorCallback(callback), {
|
||||
wrapper: DocsWrapper,
|
||||
});
|
||||
|
||||
unmount();
|
||||
|
||||
expect(result.error).toBeUndefined();
|
||||
});
|
||||
|
||||
it("should call last callback upon pressing forward in initial state", async () => {
|
||||
const callback = jest.fn();
|
||||
const callback2 = jest.fn();
|
||||
const callback3 = jest.fn();
|
||||
|
||||
render(
|
||||
<Wrapper>
|
||||
<List callbacks={[callback, callback2, callback3]} />
|
||||
</Wrapper>
|
||||
);
|
||||
|
||||
Mousetrap.trigger("j");
|
||||
|
||||
expect(callback).not.toHaveBeenCalled();
|
||||
expect(callback2).not.toHaveBeenCalled();
|
||||
expect(callback3).toHaveBeenCalledTimes(1);
|
||||
});
|
||||
|
||||
it("should call first callback once upon pressing backward in initial state", async () => {
|
||||
const callback = jest.fn();
|
||||
const callback2 = jest.fn();
|
||||
const callback3 = jest.fn();
|
||||
|
||||
render(
|
||||
<Wrapper>
|
||||
<List callbacks={[callback, callback2, callback3]} />
|
||||
</Wrapper>
|
||||
);
|
||||
|
||||
Mousetrap.trigger("k");
|
||||
Mousetrap.trigger("k");
|
||||
|
||||
expect(callback).toHaveBeenCalledTimes(1);
|
||||
expect(callback2).not.toHaveBeenCalled();
|
||||
expect(callback3).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it("should not allow moving past the end of the callback array", async () => {
|
||||
const callback = jest.fn();
|
||||
const callback2 = jest.fn();
|
||||
const callback3 = jest.fn();
|
||||
|
||||
render(
|
||||
<Wrapper initialIndex={1}>
|
||||
<List callbacks={[callback, callback2, callback3]} />
|
||||
</Wrapper>
|
||||
);
|
||||
|
||||
Mousetrap.trigger("j");
|
||||
Mousetrap.trigger("j");
|
||||
|
||||
expect(callback).not.toHaveBeenCalled();
|
||||
expect(callback2).not.toHaveBeenCalled();
|
||||
expect(callback3).toHaveBeenCalledTimes(1);
|
||||
});
|
||||
|
||||
it("should move to existing index when active index is at the end and last callback is deregistered", async () => {
|
||||
const callback = jest.fn();
|
||||
const callback2 = jest.fn();
|
||||
const callback3 = jest.fn();
|
||||
|
||||
const { rerender } = render(<List callbacks={[callback, callback2, callback3]} />, {
|
||||
wrapper: createWrapper(2),
|
||||
});
|
||||
|
||||
expect(callback).not.toHaveBeenCalled();
|
||||
expect(callback2).not.toHaveBeenCalled();
|
||||
expect(callback3).not.toHaveBeenCalled();
|
||||
|
||||
rerender(<List callbacks={[callback, callback2]} />);
|
||||
|
||||
expect(callback).not.toHaveBeenCalled();
|
||||
expect(callback2).toHaveBeenCalledTimes(1);
|
||||
expect(callback3).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it("should move to existing index when active index is at the beginning and first callback is deregistered", async () => {
|
||||
const callback = jest.fn();
|
||||
const callback2 = jest.fn();
|
||||
const callback3 = jest.fn();
|
||||
|
||||
const { rerender } = render(<List callbacks={[callback, callback2, callback3]} />, {
|
||||
wrapper: createWrapper(0),
|
||||
});
|
||||
|
||||
expect(callback).not.toHaveBeenCalled();
|
||||
expect(callback2).not.toHaveBeenCalled();
|
||||
expect(callback3).not.toHaveBeenCalled();
|
||||
|
||||
rerender(<List callbacks={[callback2, callback3]} />);
|
||||
|
||||
expect(callback).not.toHaveBeenCalled();
|
||||
expect(callback2).toHaveBeenCalledTimes(1);
|
||||
expect(callback3).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it("should move to existing index when active index is at the end and first callback is deregistered", async () => {
|
||||
const callback = jest.fn();
|
||||
const callback2 = jest.fn();
|
||||
const callback3 = jest.fn();
|
||||
|
||||
const { rerender } = render(<List callbacks={[callback, callback2, callback3]} />, {
|
||||
wrapper: createWrapper(2),
|
||||
});
|
||||
|
||||
expect(callback).not.toHaveBeenCalled();
|
||||
expect(callback2).not.toHaveBeenCalled();
|
||||
expect(callback3).not.toHaveBeenCalled();
|
||||
|
||||
rerender(<List callbacks={[callback, callback2]} />);
|
||||
|
||||
expect(callback).not.toHaveBeenCalled();
|
||||
expect(callback2).toHaveBeenCalledTimes(1);
|
||||
expect(callback3).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it("should not move on deregistration if iterator is not active", async () => {
|
||||
const callback = jest.fn();
|
||||
const callback2 = jest.fn();
|
||||
const callback3 = jest.fn();
|
||||
|
||||
const { rerender } = render(<List callbacks={[callback, callback2, callback3]} />, {
|
||||
wrapper: createWrapper(),
|
||||
});
|
||||
|
||||
expect(callback).not.toHaveBeenCalled();
|
||||
expect(callback2).not.toHaveBeenCalled();
|
||||
expect(callback3).not.toHaveBeenCalled();
|
||||
|
||||
rerender(<List callbacks={[callback, callback2]} />);
|
||||
|
||||
expect(callback).not.toHaveBeenCalled();
|
||||
expect(callback2).not.toHaveBeenCalled();
|
||||
expect(callback3).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it("should not explode if the last item in the list is removed", async () => {
|
||||
const callback = jest.fn();
|
||||
|
||||
const { rerender } = render(<List callbacks={[callback]} />, {
|
||||
wrapper: createWrapper(),
|
||||
});
|
||||
|
||||
expect(callback).not.toHaveBeenCalled();
|
||||
|
||||
rerender(<List callbacks={[]} />);
|
||||
|
||||
expect(callback).not.toHaveBeenCalled();
|
||||
});
|
||||
});
|
||||
150
scm-ui/ui-shortcuts/src/iterator/keyboardIterator.tsx
Normal file
150
scm-ui/ui-shortcuts/src/iterator/keyboardIterator.tsx
Normal file
@@ -0,0 +1,150 @@
|
||||
/*
|
||||
* MIT License
|
||||
*
|
||||
* Copyright (c) 2020-present Cloudogu GmbH and Contributors
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to deal
|
||||
* in the Software without restriction, including without limitation the rights
|
||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
* copies of the Software, and to permit persons to whom the Software is
|
||||
* furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in all
|
||||
* copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
* SOFTWARE.
|
||||
*/
|
||||
|
||||
import React, { FC, useCallback, useContext, useEffect, useMemo, useRef } from "react";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { useShortcut } from "../index";
|
||||
|
||||
type Callback = () => void;
|
||||
|
||||
type KeyboardIteratorContextType = {
|
||||
register: (callback: Callback) => number;
|
||||
deregister: (index: number) => void;
|
||||
};
|
||||
|
||||
const KeyboardIteratorContext = React.createContext<KeyboardIteratorContextType>({
|
||||
register: () => {
|
||||
if (process.env.NODE_ENV === "development") {
|
||||
// eslint-disable-next-line no-console
|
||||
console.warn("Keyboard iterator targets have to be declared inside a KeyboardIterator");
|
||||
}
|
||||
return 0;
|
||||
},
|
||||
deregister: () => {
|
||||
if (process.env.NODE_ENV === "development") {
|
||||
// eslint-disable-next-line no-console
|
||||
console.warn("Keyboard iterator targets have to be declared inside a KeyboardIterator");
|
||||
}
|
||||
},
|
||||
});
|
||||
|
||||
export const KeyboardIteratorContextProvider: FC<{ initialIndex?: number }> = ({ children, initialIndex = -1 }) => {
|
||||
const [t] = useTranslation("commons");
|
||||
const callbacks = useRef<Array<Callback>>([]);
|
||||
const activeIndex = useRef<number>(initialIndex);
|
||||
const executeCallback = useCallback((index: number) => callbacks.current[index](), []);
|
||||
|
||||
const navigateBackward = useCallback(() => {
|
||||
if (activeIndex.current === -1) {
|
||||
activeIndex.current = 0;
|
||||
executeCallback(activeIndex.current);
|
||||
} else if (activeIndex.current > 0) {
|
||||
activeIndex.current -= 1;
|
||||
executeCallback(activeIndex.current);
|
||||
}
|
||||
}, [executeCallback]);
|
||||
|
||||
const navigateForward = useCallback(() => {
|
||||
if (activeIndex.current === -1) {
|
||||
activeIndex.current = callbacks.current.length - 1;
|
||||
executeCallback(activeIndex.current);
|
||||
} else if (activeIndex.current < callbacks.current.length - 1) {
|
||||
activeIndex.current += 1;
|
||||
executeCallback(activeIndex.current);
|
||||
}
|
||||
}, [executeCallback]);
|
||||
|
||||
const value = useMemo(
|
||||
() => ({
|
||||
register: (callback: () => void) => callbacks.current.push(callback) - 1,
|
||||
deregister: (index: number) => {
|
||||
callbacks.current.splice(index, 1);
|
||||
if (callbacks.current.length === 0) {
|
||||
activeIndex.current = -1;
|
||||
} else if (activeIndex.current === index || activeIndex.current >= callbacks.current.length) {
|
||||
if (activeIndex.current > 0) {
|
||||
activeIndex.current -= 1;
|
||||
}
|
||||
executeCallback(activeIndex.current);
|
||||
}
|
||||
},
|
||||
}),
|
||||
[executeCallback]
|
||||
);
|
||||
|
||||
useShortcut("k", navigateBackward, {
|
||||
description: t("shortcuts.iterator.previous"),
|
||||
});
|
||||
|
||||
useShortcut("j", navigateForward, {
|
||||
description: t("shortcuts.iterator.next"),
|
||||
});
|
||||
|
||||
useShortcut("tab", () => {
|
||||
activeIndex.current = -1;
|
||||
|
||||
return true;
|
||||
});
|
||||
|
||||
return <KeyboardIteratorContext.Provider value={value}>{children}</KeyboardIteratorContext.Provider>;
|
||||
};
|
||||
|
||||
export const useKeyboardIteratorCallback = (callback: Callback) => {
|
||||
const { register, deregister } = useContext(KeyboardIteratorContext);
|
||||
useEffect(() => {
|
||||
const index = register(callback);
|
||||
return () => deregister(index);
|
||||
}, [callback, register, deregister]);
|
||||
};
|
||||
|
||||
/**
|
||||
* Use the {@link React.RefObject} returned from this hook to register a target to the nearest enclosing {@link KeyboardIterator}.
|
||||
*
|
||||
* @example
|
||||
* const ref = useKeyboardIteratorTarget();
|
||||
* const target = <button ref={ref}>My Iteration Target</button>
|
||||
*/
|
||||
export function useKeyboardIteratorTarget(): React.RefCallback<HTMLElement> {
|
||||
const ref = useRef<HTMLElement>();
|
||||
const callback = useCallback(() => ref.current?.focus(), []);
|
||||
const refCallback: React.RefCallback<HTMLElement> = useCallback((el) => {
|
||||
if (el) {
|
||||
ref.current = el;
|
||||
}
|
||||
}, []);
|
||||
useKeyboardIteratorCallback(callback);
|
||||
return refCallback;
|
||||
}
|
||||
|
||||
/**
|
||||
* Allows keyboard users to iterate through a list of items, defined by enclosed {@link useKeyboardIteratorTarget} invocations.
|
||||
*
|
||||
* The order is determined by the render order of the target hooks.
|
||||
*
|
||||
* Press `k` to navigate backwards and `j` to navigate forward.
|
||||
* Pressing `tab` will reset the iterator to its initial state.
|
||||
*/
|
||||
export const KeyboardIterator: FC = ({ children }) => (
|
||||
<KeyboardIteratorContextProvider>{children}</KeyboardIteratorContextProvider>
|
||||
);
|
||||
Reference in New Issue
Block a user