Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 35 additions & 8 deletions src/useSet.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,44 @@ const useSet = <K>(initialSet = new Set<K>()): [Set<K>, Actions<K>] => {
const [set, setSet] = useState(initialSet);

const stableActions = useMemo<StableActions<K>>(() => {
const add = (item: K) => setSet((prevSet) => new Set([...Array.from(prevSet), item]));
const add = (item: K) =>
setSet((prevSet) => {
if (prevSet.has(item)) return prevSet;

const newSet = new Set(prevSet);
newSet.add(item);
return newSet;
});

const remove = (item: K) =>
setSet((prevSet) => new Set(Array.from(prevSet).filter((i) => i !== item)));
setSet((prevSet) => {
if (!prevSet.has(item)) return prevSet;

const newSet = new Set(prevSet);
newSet.delete(item);
return newSet;
});

const toggle = (item: K) =>
setSet((prevSet) =>
prevSet.has(item)
? new Set(Array.from(prevSet).filter((i) => i !== item))
: new Set([...Array.from(prevSet), item])
);
setSet((prevSet) => {
const newSet = new Set(prevSet);
if (newSet.has(item)) {
newSet.delete(item);
} else {
newSet.add(item);
}
return newSet;
});

const reset = () => setSet(initialSet);

const clear = () =>
setSet((prevSet) => {
if (prevSet.size === 0) return prevSet;
return new Set();
});

return { add, remove, toggle, reset: () => setSet(initialSet), clear: () => setSet(new Set()) };
return { add, remove, toggle, reset, clear };
}, [setSet]);

const utils = {
Expand Down
4 changes: 4 additions & 0 deletions tests/useSet.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -76,13 +76,15 @@ it('should add a new key', () => {

it('should work if setting existing key', () => {
const { result } = setUp(new Set(['oldKey']));
const initialSet = result.current[0];
const [, utils] = result.current;

act(() => {
utils.add('oldKey');
});

expect(result.current[0]).toEqual(new Set(['oldKey']));
expect(result.current[0]).toBe(initialSet);
});

it('should remove existing key', () => {
Expand Down Expand Up @@ -120,13 +122,15 @@ it('should add a new key on toggle', () => {

it('should do nothing if removing non-existing key', () => {
const { result } = setUp(new Set(['a', 'b']));
const initialSet = result.current[0];
const [, utils] = result.current;

act(() => {
utils.remove('nonExisting');
});

expect(result.current[0]).toEqual(new Set(['a', 'b']));
expect(result.current[0]).toBe(initialSet);
});

it('should reset to initial set provided', () => {
Expand Down