refactor: implement focus change

chakra-ui · Aug 16, 2023 · c5ae307 · c5ae307
1 parent e541829
commit c5ae307
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/packages/machines/accordion/src/accordion.machine.ts b/packages/machines/accordion/src/accordion.machine.ts
@@ -110,10 +110,10 @@ export function machine(userContext: UserDefinedContext) {
           triggerEl?.focus()
         },
         setFocusedValue(ctx, evt) {
-          ctx.focusedValue = evt.value
+          set.focusedValue(ctx, evt.value)
         },
         clearFocusedValue(ctx) {
-          ctx.focusedValue = null
+          set.focusedValue(ctx, null)
         },
         setValue(ctx, evt) {
           set.value(ctx, evt.value)
@@ -134,7 +134,7 @@ const invoke = {
     ctx.onChange?.({ value: ctx.value })
   },
   focusChange(ctx: MachineContext) {
-    ctx.onFocusChange?.({ focusedValue: ctx.focusedValue })
+    ctx.onFocusChange?.({ value: ctx.focusedValue })
   },
 }
 
@@ -145,5 +145,6 @@ const set = {
   },
   focusedValue(ctx: MachineContext, value: string | null) {
     ctx.focusedValue = value
+    invoke.focusChange(ctx)
   },
 }
diff --git a/packages/machines/accordion/src/accordion.types.ts b/packages/machines/accordion/src/accordion.types.ts
@@ -13,7 +13,7 @@ export type ChangeDetails = {
 }
 
 export type FocusChangeDetails = {
-  focusedValue: string | null
+  value: string | null
 }
 
 type PublicContext = DirectionProperty &