From cada145f5e67a47e20680c837f11ae04a84b0220 Mon Sep 17 00:00:00 2001 From: Garric Nahapetian Date: Tue, 20 Dec 2022 15:33:57 -0800 Subject: [PATCH] Add viewDidLoad to AppKit defaults --- .../UIFramework/UIFramework+DefaultAppKit.swift | 10 ++++++++++ .../UIFrameworkDefaultsTests/testDefaultsAppKit.1.txt | 4 ++-- .../testDecodingWithDefaults.AppKit.txt | 4 ++-- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/Sources/XcodeTemplateGeneratorLibrary/UIFramework/UIFramework+DefaultAppKit.swift b/Sources/XcodeTemplateGeneratorLibrary/UIFramework/UIFramework+DefaultAppKit.swift index 8de7eba56..304cef4ff 100644 --- a/Sources/XcodeTemplateGeneratorLibrary/UIFramework/UIFramework+DefaultAppKit.swift +++ b/Sources/XcodeTemplateGeneratorLibrary/UIFramework/UIFramework+DefaultAppKit.swift @@ -10,6 +10,11 @@ extension UIFramework { private enum Defaults { static let viewControllerMethods: String = """ + override func viewDidLoad() { + super.viewDidLoad() + update(with: initialState) + } + override func viewWillAppear() { super.viewWillAppear() observe(viewState).store(in: &cancellables) @@ -22,6 +27,11 @@ extension UIFramework { """ static let viewControllerMethodsForRootNode: String = """ + override func viewDidLoad() { + super.viewDidLoad() + update(with: initialState) + } + override func viewWillAppear() { super.viewWillAppear() observe(viewState).store(in: &cancellables) diff --git a/Tests/XcodeTemplateGeneratorLibraryTests/__Snapshots__/UIFrameworkDefaultsTests/testDefaultsAppKit.1.txt b/Tests/XcodeTemplateGeneratorLibraryTests/__Snapshots__/UIFrameworkDefaultsTests/testDefaultsAppKit.1.txt index 6c5578d85..67d42d66a 100644 --- a/Tests/XcodeTemplateGeneratorLibraryTests/__Snapshots__/UIFrameworkDefaultsTests/testDefaultsAppKit.1.txt +++ b/Tests/XcodeTemplateGeneratorLibraryTests/__Snapshots__/UIFrameworkDefaultsTests/testDefaultsAppKit.1.txt @@ -1,5 +1,5 @@ ▿ UIFramework - framework: Framework.appKit - - viewControllerMethods: "override func viewWillAppear() {\n super.viewWillAppear()\n observe(viewState).store(in: &cancellables)\n}\n\noverride func viewWillDisappear() {\n super.viewWillDisappear()\n cancellables.removeAll()\n}" - - viewControllerMethodsForRootNode: "override func viewWillAppear() {\n super.viewWillAppear()\n observe(viewState).store(in: &cancellables)\n}\n\noverride func viewDidAppear() {\n super.viewDidAppear()\n receiver?.viewDidAppear()\n}\n\noverride func viewWillDisappear() {\n super.viewWillDisappear()\n cancellables.removeAll()\n}" + - viewControllerMethods: "override func viewDidLoad() {\n super.viewDidLoad()\n update(with: initialState)\n}\n\noverride func viewWillAppear() {\n super.viewWillAppear()\n observe(viewState).store(in: &cancellables)\n}\n\noverride func viewWillDisappear() {\n super.viewWillDisappear()\n cancellables.removeAll()\n}" + - viewControllerMethodsForRootNode: "override func viewDidLoad() {\n super.viewDidLoad()\n update(with: initialState)\n}\n\noverride func viewWillAppear() {\n super.viewWillAppear()\n observe(viewState).store(in: &cancellables)\n}\n\noverride func viewDidAppear() {\n super.viewDidAppear()\n receiver?.viewDidAppear()\n}\n\noverride func viewWillDisappear() {\n super.viewWillDisappear()\n cancellables.removeAll()\n}" - viewControllerProperties: "" diff --git a/Tests/XcodeTemplateGeneratorLibraryTests/__Snapshots__/UIFrameworkTests/testDecodingWithDefaults.AppKit.txt b/Tests/XcodeTemplateGeneratorLibraryTests/__Snapshots__/UIFrameworkTests/testDecodingWithDefaults.AppKit.txt index 6c5578d85..67d42d66a 100644 --- a/Tests/XcodeTemplateGeneratorLibraryTests/__Snapshots__/UIFrameworkTests/testDecodingWithDefaults.AppKit.txt +++ b/Tests/XcodeTemplateGeneratorLibraryTests/__Snapshots__/UIFrameworkTests/testDecodingWithDefaults.AppKit.txt @@ -1,5 +1,5 @@ ▿ UIFramework - framework: Framework.appKit - - viewControllerMethods: "override func viewWillAppear() {\n super.viewWillAppear()\n observe(viewState).store(in: &cancellables)\n}\n\noverride func viewWillDisappear() {\n super.viewWillDisappear()\n cancellables.removeAll()\n}" - - viewControllerMethodsForRootNode: "override func viewWillAppear() {\n super.viewWillAppear()\n observe(viewState).store(in: &cancellables)\n}\n\noverride func viewDidAppear() {\n super.viewDidAppear()\n receiver?.viewDidAppear()\n}\n\noverride func viewWillDisappear() {\n super.viewWillDisappear()\n cancellables.removeAll()\n}" + - viewControllerMethods: "override func viewDidLoad() {\n super.viewDidLoad()\n update(with: initialState)\n}\n\noverride func viewWillAppear() {\n super.viewWillAppear()\n observe(viewState).store(in: &cancellables)\n}\n\noverride func viewWillDisappear() {\n super.viewWillDisappear()\n cancellables.removeAll()\n}" + - viewControllerMethodsForRootNode: "override func viewDidLoad() {\n super.viewDidLoad()\n update(with: initialState)\n}\n\noverride func viewWillAppear() {\n super.viewWillAppear()\n observe(viewState).store(in: &cancellables)\n}\n\noverride func viewDidAppear() {\n super.viewDidAppear()\n receiver?.viewDidAppear()\n}\n\noverride func viewWillDisappear() {\n super.viewWillDisappear()\n cancellables.removeAll()\n}" - viewControllerProperties: ""