Add auto-focus

Author: kean

ios/Sources/GutenbergKit/Sources/EditorConfiguration.swift

@@ -16,6 +16,9 @@ public struct EditorConfiguration {
     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
@@ -42,6 +45,7 @@ public struct EditorConfiguration {
         shouldUseThemeStyles: Bool,
         shouldUsePlugins: Bool,
         shouldHideTitle: Bool,
+        shouldAutoFocus: Bool,
         siteURL: String,
         siteApiRoot: String,
         siteApiNamespace: [String],
@@ -58,6 +62,7 @@ public struct EditorConfiguration {
         self.shouldUseThemeStyles = shouldUseThemeStyles
         self.shouldUsePlugins = shouldUsePlugins
         self.shouldHideTitle = shouldHideTitle
+        self.shouldAutoFocus = shouldAutoFocus
         self.siteURL = siteURL
         self.siteApiRoot = siteApiRoot
         self.siteApiNamespace = siteApiNamespace
@@ -77,6 +82,7 @@ public struct EditorConfiguration {
             shouldUseThemeStyles: shouldUseThemeStyles,
             shouldUsePlugins: shouldUsePlugins,
             shouldHideTitle: shouldHideTitle,
+            shouldAutoFocus: shouldAutoFocus,
             siteURL: siteURL,
             siteApiRoot: siteApiRoot,
             siteApiNamespace: siteApiNamespace,
@@ -107,6 +113,7 @@ 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]
@@ -124,6 +131,7 @@ public struct EditorConfigurationBuilder {
         shouldUseThemeStyles: Bool = false,
         shouldUsePlugins: Bool = false,
         shouldHideTitle: Bool = false,
+        shouldAutoFocus: Bool = true,
         siteURL: String = "",
         siteApiRoot: String = "",
         siteApiNamespace: [String] = [],
@@ -140,6 +148,7 @@ public struct EditorConfigurationBuilder {
         self.shouldUseThemeStyles = shouldUseThemeStyles
         self.shouldUsePlugins = shouldUsePlugins
         self.shouldHideTitle = shouldHideTitle
+        self.shouldAutoFocus = shouldAutoFocus
         self.siteURL = siteURL
         self.siteApiRoot = siteApiRoot
         self.siteApiNamespace = siteApiNamespace
@@ -192,6 +201,12 @@ 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
@@ -271,6 +286,7 @@ public struct EditorConfigurationBuilder {
             shouldUseThemeStyles: shouldUseThemeStyles,
             shouldUsePlugins: shouldUsePlugins,
             shouldHideTitle: shouldHideTitle,
+            shouldAutoFocus: shouldAutoFocus,
             siteURL: siteURL,
             siteApiRoot: siteApiRoot,
             siteApiNamespace: siteApiNamespace,

ios/Sources/GutenbergKit/Sources/EditorViewController.swift

@@ -86,33 +86,6 @@ public final class EditorViewController: UIViewController, GutenbergEditorContro
             setUpEditor()
             loadEditor()
         }
-
-        // TODO: register it when editor is loaded
-//        service.$rawBlockTypesResponseData.compactMap({ $0 }).sink { [weak self] data in
-//            guard let self else { return }
-//            assert(Thread.isMainThread)
-//
-//        }.store(in: &cancellables)
-    }
-
-    // TODO: move
-    private func registerBlockTypes(data: Data) async {
-        guard let string = String(data: data, encoding: .utf8),
-            let escapedString = string.addingPercentEncoding(withAllowedCharacters: .alphanumerics) else {
-            assertionFailure("invalid block types")
-            return
-        }
-        do {
-            // TODO: simplify this
-            try await webView.evaluateJavaScript("""
-                const blockTypes = JSON.parse(decodeURIComponent('\(escapedString)'));
-                editor.registerBlocks(blockTypes);
-                "done";
-                """)
-        } catch {
-            NSLog("failed to register blocks \(error)")
-            // TOOD: relay to the client
-        }
     }
 
     private func setUpEditor() {
@@ -347,6 +320,24 @@ public final class EditorViewController: UIViewController, GutenbergEditorContro
         let duration = CFAbsoluteTimeGetCurrent() - timestampInit
         print("gutenbergkit-measure_editor-first-render:", duration)
         delegate?.editorDidLoad(self)
+
+        if configuration.shouldAutoFocus, configuration.content.isEmpty {
+            autoFocusEditor()
+        }
+    }
+
+    // MARK: - Helpers
+
+    private func autoFocusEditor() {
+        evaluate("""
+        (function() {
+            const editable = document.querySelector('[contenteditable="true"]');
+            if (editable) {
+                editable.focus();
+                editable.click();
+            }
+        })();
+        """)
     }
 
     // MARK: - Warmup