Version 5

src/HotkeysProvider.tsx

@@ -30,44 +30,31 @@ interface Props {
 }
 
 export const HotkeysProvider = ({ initiallyActiveScopes = ['*'], children }: Props) => {
-  const [internalActiveScopes, setInternalActiveScopes] = useState(
-    initiallyActiveScopes?.length > 0 ? initiallyActiveScopes : ['*']
-  )
+  const [internalActiveScopes, setInternalActiveScopes] = useState(initiallyActiveScopes)
   const [boundHotkeys, setBoundHotkeys] = useState<Hotkey[]>([])
-
   const enableScope = useCallback((scope: string) => {
     setInternalActiveScopes((prev) => {
       if (prev.includes('*')) {
         return [scope]
       }
-
       return Array.from(new Set([...prev, scope]))
     })
   }, [])
 
   const disableScope = useCallback((scope: string) => {
     setInternalActiveScopes((prev) => {
-      if (prev.filter((s) => s !== scope).length === 0) {
-        return ['*']
-      } else {
-        return prev.filter((s) => s !== scope)
-      }
+      return prev.filter((s) => s !== scope)
     })
   }, [])
 
   const toggleScope = useCallback((scope: string) => {
     setInternalActiveScopes((prev) => {
       if (prev.includes(scope)) {
-        if (prev.filter((s) => s !== scope).length === 0) {
-          return ['*']
-        } else {
-          return prev.filter((s) => s !== scope)
-        }
+        return prev.filter((s) => s !== scope)
       } else {
         if (prev.includes('*')) {
           return [scope]
         }
-
         return Array.from(new Set([...prev, scope]))
       }
     })

tests/HotkeysProvider.test.tsx

@@ -1,3 +1,4 @@
+import React from 'react'
 import { render, act, renderHook } from '@testing-library/react'
 import { HotkeysProvider, useHotkeysContext, useHotkeys } from '../src'
 import { ReactNode } from 'react'
@@ -21,17 +22,6 @@ test('should default to wildcard scope', () => {
   expect(result.current.enabledScopes).toEqual(['*'])
 })
 
-test('should default to wildcard scope if empty array is provided as initialActiveScopes', () => {
-  const wrapper = ({ children }: { children: ReactNode }) => (
-    <HotkeysProvider initiallyActiveScopes={[]}>{children}</HotkeysProvider>
-  )
-  const { result } = renderHook(() => useHotkeysContext(), {
-    wrapper,
-  })
-
-  expect(result.current.enabledScopes).toEqual(['*'])
-})
-
 test('should return active scopes and scope modifying functions', () => {
   const { result } = renderHook(() => useHotkeysContext(), {
     wrapper: HotkeysProvider,
@@ -55,24 +45,6 @@ test('should activate scope by calling activateScope', () => {
   expect(result.current.enabledScopes).toEqual(['foo'])
 })
 
-test('should reactivate wildcard scope if all other scopes are deactivated', () => {
-  const { result } = renderHook(() => useHotkeysContext(), {
-    wrapper: HotkeysProvider,
-  })
-
-  act(() => {
-    result.current.enableScope('foo')
-  })
-
-  expect(result.current.enabledScopes).toEqual(['foo'])
-
-  act(() => {
-    result.current.disableScope('foo')
-  })
-
-  expect(result.current.enabledScopes).toEqual(['*'])
-})
-
 test('should return multiple scopes if different scopes are activated', () => {
   const { result } = renderHook(() => useHotkeysContext(), {
     wrapper: HotkeysProvider,
@@ -128,7 +100,7 @@ test('should toggle scope by calling toggleScope', () => {
     result.current.toggleScope('foo')
   })
 
-  expect(result.current.enabledScopes).toEqual(['*'])
+  expect(result.current.enabledScopes).toEqual([])
 
   act(() => {
     result.current.toggleScope('foo')
@@ -137,7 +109,7 @@ test('should toggle scope by calling toggleScope', () => {
   expect(result.current.enabledScopes).toEqual(['foo'])
 })
 
-test('should keep wildcard scope active when all is the only active scope and gets deactivated', () => {
+test('should be able to disable wildcard like any other scope', () => {
   const { result } = renderHook(() => useHotkeysContext(), {
     wrapper: HotkeysProvider,
   })
@@ -146,7 +118,7 @@ test('should keep wildcard scope active when all is the only active scope and ge
     result.current.disableScope('*')
   })
 
-  expect(result.current.enabledScopes).toEqual(['*'])
+  expect(result.current.enabledScopes).toEqual([])
 })
 
 test('should return initially set scopes', () => {
@@ -239,3 +211,24 @@ test('should return descriptions for bound hotkeys', () => {
 
   expect(result.current.hotkeys[0].description).toEqual('bar')
 })
+
+test('should have no active scopes after deactivating all current scopes', () => {
+  const { result } = renderHook(() => useHotkeysContext(), {
+    wrapper: HotkeysProvider,
+  })
+  act(() => {
+    result.current.enableScope('foo')
+  })
+  act(() => {
+    result.current.enableScope('bar')
+  })
+  expect(result.current.enabledScopes).toEqual(['foo', 'bar'])
+  act(() => {
+    result.current.disableScope('foo')
+  })
+  act(() => {
+    result.current.disableScope('bar')
+  })
+
+  expect(result.current.enabledScopes).toEqual([])
+})