Update GutenbergKit for the demo app

Author: jkmassel

ios/Demo-iOS/Gutenberg.xcodeproj/project.pbxproj

@@ -122,6 +122,7 @@
 			buildRules = (
 			);
 			dependencies = (
+				245D6BE42EDFCD640076D741 /* PBXTargetDependency */,
 			);
 			fileSystemSynchronizedGroups = (
 				2468525B2EAAC62B00ED1F09 /* Views */,
@@ -197,6 +198,13 @@
 		};
 /* End PBXSourcesBuildPhase section */
 
+/* Begin PBXTargetDependency section */
+		245D6BE42EDFCD640076D741 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			productRef = 245D6BE32EDFCD640076D741 /* GutenbergKit */;
+		};
+/* End PBXTargetDependency section */
+
 /* Begin XCBuildConfiguration section */
 		0C4F59972BEFF4980028BD96 /* Debug */ = {
 			isa = XCBuildConfiguration;
@@ -431,6 +439,10 @@
 			isa = XCSwiftPackageProductDependency;
 			productName = GutenbergKit;
 		};
+		245D6BE32EDFCD640076D741 /* GutenbergKit */ = {
+			isa = XCSwiftPackageProductDependency;
+			productName = GutenbergKit;
+		};
 /* End XCSwiftPackageProductDependency section */
 	};
 	rootObject = 0C4F59832BEFF4970028BD96 /* Project object */;

ios/Demo-iOS/Sources/Views/AppRootView.swift

@@ -41,8 +41,10 @@ struct AppRootView: View {
         .onChange(of: self.selectedConfiguration) { oldValue, newValue in
             switch newValue {
             case .bundledEditor:
-                let config = createBundledConfiguration()
-                activeEditorConfiguration = config
+                activeEditorConfiguration = EditorConfiguration.bundled
+                    .toBuilder()
+                    .setNativeInserterEnabled(self.isNativeInserterEnabled)
+                    .build()
             case .editorConfiguration(let config):
                 self.loadEditorConfiguration(for: config)
             case .none:
@@ -65,9 +67,10 @@ struct AppRootView: View {
     private func loadEditorConfiguration(for config: ConfiguredEditor) {
         Task {
             do {
+                let parsedApiRoot = try ParsedUrl.parse(input: config.siteApiRoot)
                 let client = WordPressAPI(
                     urlSession: .shared,
-                    apiRootUrl: try ParsedUrl.parse(input: config.siteApiRoot),
+                    apiRootUrl: parsedApiRoot,
                     authentication: .authorizationHeader(token: config.authHeader)
                 )
 
@@ -76,16 +79,18 @@ struct AppRootView: View {
                 let canUsePlugins = apiRoot.hasRoute(route: "/wpcom/v2/editor-assets")
                 let canUseEditorStyles = apiRoot.hasRoute(route: "/wp-block-editor/v1/settings")
 
-                self.activeEditorConfiguration = EditorConfigurationBuilder()
-                    .setShouldUseThemeStyles(canUseEditorStyles)
-                    .setShouldUsePlugins(canUsePlugins)
-                    .setSiteUrl(config.siteUrl)
-                    .setSiteApiRoot(config.siteApiRoot)
-                    .setAuthHeader(config.authHeader)
-                    .setNativeInserterEnabled(isNativeInserterEnabled)
-                    .setLogLevel(.debug)
-                    .setEnableNetworkLogging(true)
-                    .build()
+                self.activeEditorConfiguration = EditorConfigurationBuilder(
+                    postType: "post",
+                    siteURL: URL(string: apiRoot.siteUrlString())!,
+                    siteApiRoot: parsedApiRoot.asURL()
+                )
+                .setShouldUseThemeStyles(canUseEditorStyles)
+                .setShouldUsePlugins(canUsePlugins)
+                .setAuthHeader(config.authHeader)
+                .setNativeInserterEnabled(isNativeInserterEnabled)
+                .setLogLevel(.debug)
+                .setEnableNetworkLogging(true)
+                .build()
             } catch {
                 self.hasError = true
                 self.error = AppError(errorDescription: error.localizedDescription)
@@ -97,17 +102,6 @@ struct AppRootView: View {
         configurations.removeAll { $0.id == config.id }
         configurationStorage.saveConfigurations(configurations)
     }
-
-    private func createBundledConfiguration() -> EditorConfiguration {
-        EditorConfigurationBuilder()
-            .setShouldUsePlugins(false)
-            .setSiteUrl("")
-            .setSiteApiRoot("")
-            .setAuthHeader("")
-            .setNativeInserterEnabled(isNativeInserterEnabled)
-            .setEnableNetworkLogging(true)
-            .build()
-    }
 }
 
 struct AppError: LocalizedError {

ios/Demo-iOS/Sources/Views/EditorView.swift

@@ -108,7 +108,6 @@ private struct _EditorView: UIViewControllerRepresentable {
         let viewController = EditorViewController(configuration: configuration)
         viewController.delegate = context.coordinator
         viewController.webView.isInspectable = true
-        viewController.startEditorSetup()
 
         viewModel.perform = { [weak viewController] in
             switch $0 {
@@ -227,6 +226,19 @@ private final class EditorViewModel {
 
 #Preview {
     NavigationStack {
-        EditorView(configuration: .default)
+        EditorView(configuration: .bundled)
     }
 }
+
+extension EditorConfiguration {
+    static let bundled = EditorConfigurationBuilder(
+        postType: "post",
+        siteURL: URL(string: "https://example.com")!,
+        siteApiRoot: URL(string: "https://example.com/wp-json")!
+    )
+    .setShouldUsePlugins(false)
+    .setAuthHeader("")
+    .setNativeInserterEnabled(true)
+    .setIsOfflineModeEnabled(true)
+    .build()
+}