Remove from configuration and add focus to JS

Author: kean

ios/Sources/GutenbergKit/Sources/EditorConfiguration.swift

@@ -16,9 +16,6 @@ public struct EditorConfiguration: Sendable {
     public let shouldUsePlugins: Bool
     /// Toggles visibility of the title field
     public let shouldHideTitle: Bool
-    /// If enabled, the editor automatically becomes focused when initialized
-    /// with an empty content.
-    public let shouldAutoFocus: Bool
     /// Root URL for the site
     public let siteURL: String
     /// Root URL for the site API
@@ -45,7 +42,6 @@ public struct EditorConfiguration: Sendable {
         shouldUseThemeStyles: Bool,
         shouldUsePlugins: Bool,
         shouldHideTitle: Bool,
-        shouldAutoFocus: Bool,
         siteURL: String,
         siteApiRoot: String,
         siteApiNamespace: [String],
@@ -62,7 +58,6 @@ public struct EditorConfiguration: Sendable {
         self.shouldUseThemeStyles = shouldUseThemeStyles
         self.shouldUsePlugins = shouldUsePlugins
         self.shouldHideTitle = shouldHideTitle
-        self.shouldAutoFocus = shouldAutoFocus
         self.siteURL = siteURL
         self.siteApiRoot = siteApiRoot
         self.siteApiNamespace = siteApiNamespace
@@ -82,7 +77,6 @@ public struct EditorConfiguration: Sendable {
             shouldUseThemeStyles: shouldUseThemeStyles,
             shouldUsePlugins: shouldUsePlugins,
             shouldHideTitle: shouldHideTitle,
-            shouldAutoFocus: shouldAutoFocus,
             siteURL: siteURL,
             siteApiRoot: siteApiRoot,
             siteApiNamespace: siteApiNamespace,
@@ -113,7 +107,6 @@ public struct EditorConfigurationBuilder {
     private var shouldUseThemeStyles: Bool
     private var shouldUsePlugins: Bool
     private var shouldHideTitle: Bool
-    private var shouldAutoFocus: Bool
     private var siteURL: String
     private var siteApiRoot: String
     private var siteApiNamespace: [String]
@@ -131,7 +124,6 @@ public struct EditorConfigurationBuilder {
         shouldUseThemeStyles: Bool = false,
         shouldUsePlugins: Bool = false,
         shouldHideTitle: Bool = false,
-        shouldAutoFocus: Bool = true,
         siteURL: String = "",
         siteApiRoot: String = "",
         siteApiNamespace: [String] = [],
@@ -148,7 +140,6 @@ public struct EditorConfigurationBuilder {
         self.shouldUseThemeStyles = shouldUseThemeStyles
         self.shouldUsePlugins = shouldUsePlugins
         self.shouldHideTitle = shouldHideTitle
-        self.shouldAutoFocus = shouldAutoFocus
         self.siteURL = siteURL
         self.siteApiRoot = siteApiRoot
         self.siteApiNamespace = siteApiNamespace
@@ -201,12 +192,6 @@ public struct EditorConfigurationBuilder {
         return copy
     }
 
-    public func setShouldAutoFocus(_ shouldAutoFocus: Bool) -> EditorConfigurationBuilder {
-        var copy = self
-        copy.shouldAutoFocus = shouldAutoFocus
-        return copy
-    }
-
     public func setSiteUrl(_ siteUrl: String) -> EditorConfigurationBuilder {
         var copy = self
         copy.siteURL = siteUrl
@@ -286,7 +271,6 @@ public struct EditorConfigurationBuilder {
             shouldUseThemeStyles: shouldUseThemeStyles,
             shouldUsePlugins: shouldUsePlugins,
             shouldHideTitle: shouldHideTitle,
-            shouldAutoFocus: shouldAutoFocus,
             siteURL: siteURL,
             siteApiRoot: siteApiRoot,
             siteApiNamespace: siteApiNamespace,

ios/Sources/GutenbergKit/Sources/EditorViewController.swift

@@ -321,25 +321,11 @@ public final class EditorViewController: UIViewController, GutenbergEditorContro
         print("gutenbergkit-measure_editor-first-render:", duration)
         delegate?.editorDidLoad(self)
 
-        if configuration.shouldAutoFocus, configuration.content.isEmpty {
-            autoFocusEditor()
+        if configuration.content.isEmpty {
+            evaluate("editor.focus();")
         }
     }
 
-    // MARK: - Helpers
-
-    private func autoFocusEditor() {
-        evaluate("""
-        (function() {
-            const editable = document.querySelector('[contenteditable="true"]');
-            if (editable) {
-                editable.focus();
-                editable.click();
-            }
-        })();
-        """)
-    }
-
     // MARK: - Warmup
 
     /// Calls this at any moment before showing the actual editor. The warmup

src/components/editor/use-host-bridge.js

@@ -108,6 +108,14 @@ export function useHostBridge( post, editorRef ) {
 			);
 		};
 
+		window.editor.focus = () => {
+			const editable = document.querySelector('[contenteditable="true"]');
+			if (editable) {
+				editable.focus();
+				editable.click();
+			}
+		};
+
 		window.editor.appendTextAtCursor = ( text ) => {
 			const selectedBlockClientId = getSelectedBlockClientId();