Merge pull request #3557 from serlo/fix/blank-alternative-answer-safa…

…ri-focus-bug fix(plugin-blanks): alternative answers safari focus bug
serlo · Mar 26, 2024 · 2f4aa03 · 2f4aa03
2 parents 3e9c0de + 763f610
commit 2f4aa03
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/packages/editor/src/plugins/blanks-exercise/blank-renderer.tsx b/packages/editor/src/plugins/blanks-exercise/blank-renderer.tsx
@@ -154,6 +154,7 @@ export function BlankRenderer(props: BlankRendererProps) {
   }
 
   function handleAlternativeAnswerAdd() {
+    ReactEditor.blur(editor)
     setCorrectAnswers([...correctAnswers, { answer: '' }])
   }
 

diff --git a/packages/editor/src/store/focus/slice.ts b/packages/editor/src/store/focus/slice.ts
@@ -24,9 +24,9 @@ export const focusSlice = createSlice({
     },
     focusPrevious(state, action: PayloadAction<ChildTreeNode | null>) {
       if (!state || !action.payload) return state
-      const next = findPreviousChildTreeNode(action.payload, state)
-      if (!next) return state
-      return next
+      const previous = findPreviousChildTreeNode(action.payload, state)
+      if (!previous) return state
+      return previous
     },
   },
   extraReducers: (builder) => {
-Original file line number
+Diff line change
@@ Expand Up / @@ -154,6 +154,7 @@ export function BlankRenderer(props: BlankRendererProps) { @@
       }
       function handleAlternativeAnswerAdd() {
+        ReactEditor.blur(editor)
         setCorrectAnswers([...correctAnswers, { answer: '' }])
       }
@@ Expand Down @@