From fb944f9c489e8b12a383459da4bc4abf0089a8aa Mon Sep 17 00:00:00 2001
From: Thomas Ricouard <ricouard77@gmail.com>
Date: Sun, 21 Jan 2024 11:13:47 +0100
Subject: [PATCH] Editor: Cleanup focus state

---
 .../StatusKit/Editor/Components/AccessoryView.swift   |  1 -
 .../Sources/StatusKit/Editor/EditorView.swift         |  2 +-
 .../StatusKit/Sources/StatusKit/Editor/MainView.swift | 11 +++--------
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/Packages/StatusKit/Sources/StatusKit/Editor/Components/AccessoryView.swift b/Packages/StatusKit/Sources/StatusKit/Editor/Components/AccessoryView.swift
index 04a40d15..69bd11a4 100644
--- a/Packages/StatusKit/Sources/StatusKit/Editor/Components/AccessoryView.swift
+++ b/Packages/StatusKit/Sources/StatusKit/Editor/Components/AccessoryView.swift
@@ -16,7 +16,6 @@ extension StatusEditor {
     @Environment(CurrentInstance.self) private var currentInstance
     @Environment(\.colorScheme) private var colorScheme
 
-    @FocusState<UUID?>.Binding var isSpoilerTextFocused: UUID?
     let focusedSEVM: ViewModel
     @Binding var followUpSEVMs: [ViewModel]
 
diff --git a/Packages/StatusKit/Sources/StatusKit/Editor/EditorView.swift b/Packages/StatusKit/Sources/StatusKit/Editor/EditorView.swift
index 912462ad..fbfe9afc 100644
--- a/Packages/StatusKit/Sources/StatusKit/Editor/EditorView.swift
+++ b/Packages/StatusKit/Sources/StatusKit/Editor/EditorView.swift
@@ -24,7 +24,7 @@ extension StatusEditor {
     @Binding var followUpSEVMs: [ViewModel]
     @Binding var editingMediaContainer: MediaContainer?
 
-    @FocusState<UUID?>.Binding var isSpoilerTextFocused: UUID?
+    @FocusState<UUID?> var isSpoilerTextFocused: UUID?
     @FocusState<EditorFocusState?>.Binding var editorFocusState: EditorFocusState?
     let assignedFocusState: EditorFocusState
     let isMain: Bool
diff --git a/Packages/StatusKit/Sources/StatusKit/Editor/MainView.swift b/Packages/StatusKit/Sources/StatusKit/Editor/MainView.swift
index 1dae9f34..01468738 100644
--- a/Packages/StatusKit/Sources/StatusKit/Editor/MainView.swift
+++ b/Packages/StatusKit/Sources/StatusKit/Editor/MainView.swift
@@ -20,7 +20,6 @@ extension StatusEditor {
     @State private var presentationDetent: PresentationDetent = .large
     @State private var mainSEVM: ViewModel
     @State private var followUpSEVMs: [ViewModel] = []
-    @FocusState private var isSpoilerTextFocused: UUID? // connect CoreEditor and StatusEditorAccessoryView
     @State private var editingMediaContainer: MediaContainer?
     @State private var scrollID: UUID?
 
@@ -49,9 +48,8 @@ extension StatusEditor {
             }
             EditorView(
               viewModel: mainSEVM,
-              followUpSEVMs: $followUpSEVMs,
+              followUpSEVMs: $followUpSEVMs, 
               editingMediaContainer: $editingMediaContainer,
-              isSpoilerTextFocused: $isSpoilerTextFocused,
               editorFocusState: $editorFocusState,
               assignedFocusState: .main,
               isMain: true
@@ -65,7 +63,6 @@ extension StatusEditor {
                 viewModel: sevm,
                 followUpSEVMs: $followUpSEVMs,
                 editingMediaContainer: $editingMediaContainer,
-                isSpoilerTextFocused: $isSpoilerTextFocused,
                 editorFocusState: $editorFocusState,
                 assignedFocusState: .followUp(index: sevm.id),
                 isMain: false
@@ -86,15 +83,13 @@ extension StatusEditor {
         }
         #if os(visionOS)
         .ornament(attachmentAnchor: .scene(.leading)) {
-          AccessoryView(isSpoilerTextFocused: $isSpoilerTextFocused,
-                        focusedSEVM: focusedSEVM,
+          AccessoryView(focusedSEVM: focusedSEVM,
                         followUpSEVMs: $followUpSEVMs)
         }
         #else
         .safeAreaInset(edge: .bottom) {
           if presentationDetent == .large || presentationDetent == .medium {
-            AccessoryView(isSpoilerTextFocused: $isSpoilerTextFocused,
-                          focusedSEVM: focusedSEVM,
+            AccessoryView(focusedSEVM: focusedSEVM,
                           followUpSEVMs: $followUpSEVMs)
           }
         }