Merging in from feature/horizon

Author: reabbotted

.swiftlint.yml

@@ -20,6 +20,7 @@ included: # paths to include during linting. `--path` is ignored if present.
   - Horizon
   - Parent
   - TestsFoundation
+  - packages/HorizonUI/Sources/HorizonUI
   - scripts/swift
 excluded: # paths to ignore during linting. Takes precedence over `included`.
 

Canvas.xcworkspace/contents.xcworkspacedata

@@ -0,0 +1,22 @@
+//
+// This file is part of Canvas.
+// Copyright (C) 2025-present  Instructure, Inc.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+//
+
+public protocol DebugDescriptionProvider {
+    /// The non-localized string representation of an entity for debugging / analytics purposes.
+    var debugDescription: String { get }
+}

Canvas.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -112,6 +112,16 @@ extension AppEnvironment {
 
         return .shared
     }
+
+    /// This method returns an `AppEnvironmentOverride` using the given `baseURL`s host if it
+    /// doesn't match the one on `AppEnvironment.shared`.
+    static func resolved(for baseURL: URL?) -> AppEnvironment {
+        guard
+            let baseURL,
+            let components = URLComponents(url: baseURL, resolvingAgainstBaseURL: false)
+        else { return .shared }
+        return resolved(for: components)
+    }
 }
 
 // MARK: - Utils

Core/Core/Common/CommonModels/Analytics/DebugDescriptionProvider.swift

@@ -230,11 +230,6 @@ public struct SessionDefaults: Equatable {
     }
 
     // MARK: - Grades
-    public var selectedGradingPeriodIdsByCourseIDs: [String: String]? {
-        get { self["selectedGradingPeriodIdsByCourseIDs"] as? [String: String] }
-        set { self["selectedGradingPeriodIdsByCourseIDs"] = newValue }
-    }
-
     public var selectedSortByOptionIDs: [String: String]? {
         get { self["selectedSortByOptionIDs"] as? [String: String] }
         set { self["selectedSortByOptionIDs"] = newValue }

Core/Core/Common/CommonModels/AppEnvironment/AppEnvironmentOverride.swift

@@ -24,17 +24,23 @@ import UIKit
  View controllers implementing this protocol can provide a default view for such situations.
  */
 public protocol DefaultViewProvider: UIViewController {
-    var defaultViewRoute: DefaultViewRouteParameters? { get set }
+    var defaultViewRoute: DefaultViewRouteParameters? { get }
+    func setDefaultViewRoute(_ route: DefaultViewRouteParameters?)
 }
 
-public struct DefaultViewRouteParameters {
+public struct DefaultViewRouteParameters: ExpressibleByStringLiteral {
     let url: String
     let userInfo: [String: Any]?
 
     public init(url: String, userInfo: [String: Any]? = nil) {
         self.url = url
         self.userInfo = userInfo
     }
+
+    public init(stringLiteral value: StringLiteralType) {
+        self.url = value
+        self.userInfo = nil
+    }
 }
 
 extension UIViewController {

Core/Core/Common/CommonModels/AppEnvironment/SessionDefaults.swift

@@ -180,7 +180,11 @@ open class Router {
         #endif
 
         // block disabled course tab urls
-        if let courseTabUrlInteractor, let url = url.url, !courseTabUrlInteractor.isAllowedUrl(url, userInfo: userInfo) {
+        if env.app == .student,
+           let courseTabUrlInteractor,
+           let url = url.url,
+           !courseTabUrlInteractor.isAllowedUrl(url, userInfo: userInfo) {
+
             let snackBarViewModel = from.findSnackBarViewModel()
             snackBarViewModel?.showSnack(
                 String(localized: "That page has been disabled for this course.", bundle: .core),

Core/Core/Common/CommonModels/Router/DefaultViewProvider.swift

@@ -166,6 +166,8 @@ open class CoreWebView: WKWebView {
             guard let src = message.body as? String else { return }
             self?.loadFrame(src: src)
         }
+
+        registerForTraitChanges()
     }
 
     @discardableResult
@@ -363,6 +365,18 @@ open class CoreWebView: WKWebView {
             fileLoadCompletion?(.init(error: error))
         }
     }
+
+    private func registerForTraitChanges() {
+        let traits = [UITraitUserInterfaceStyle.self]
+        registerForTraitChanges(traits) { (self: CoreWebView, _) in
+            self.updateInterfaceStyle()
+        }
+    }
+
+    func updateInterfaceStyle() {
+        let traitCollection = viewController?.traitCollection ?? traitCollection
+        themeSwitcher?.updateUserInterfaceStyle(with: traitCollection.userInterfaceStyle)
+    }
 }
 
 // MARK: - WKNavigationDelegate
@@ -409,7 +423,7 @@ extension CoreWebView: WKNavigationDelegate {
         // involved (like Zoom and Microsoft).
         // When there's additional JavaScript code behind an LTI Button (like DBQ Online), we don't want to
         // handle those cases here, because `createWebViewWith` already opened a new popup window.
-        if let tools = LTITools(link: action.request.url, navigationType: action.navigationType),
+        if let tools = LTITools(link: action.request.url, navigationType: action.navigationType, env: env),
             let from = linkDelegate?.routeLinksFrom {
             tools.presentTool(from: from, animated: true)
             return decisionHandler(.cancel)
@@ -704,14 +718,6 @@ extension CoreWebView {
         themeSwitcher?.updateUserInterfaceStyle(with: .current)
         activateFullScreenSupport()
     }
-
-    public override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
-        super.traitCollectionDidChange(previousTraitCollection)
-        let traitCollection = viewController?.traitCollection ?? traitCollection
-        guard previousTraitCollection?.userInterfaceStyle != traitCollection.userInterfaceStyle else { return }
-
-        themeSwitcher?.updateUserInterfaceStyle(with: traitCollection.userInterfaceStyle)
-    }
 }
 
 // MARK: Offline parsing

Core/Core/Common/CommonModels/Router/Router.swift

@@ -145,12 +145,12 @@ final class CoreWebViewThemeSwitcherLive: CoreWebViewThemeSwitcher {
     private func updateOverrideUserInterfaceStyle() {
         let currentStyle: UIUserInterfaceStyle = isThemeDark ? (isInverted ? .light : .dark) : .light
 
-        // When `overrideUserInterfaceStyle != .unspecified` the `traitCollectionDidChange()` method is not called,
-        // so we need to observe it from the outside. This problem may go away once minimum deployment target is set to iOS17.
+        /// Though we are registered to user interface changes In CoreWebView and updateUserInterfaceStyle should be triggered
+        /// on trait changes, but it's not happening when overrideUserInterfaceStyle is not unspecified, so we still need this workaround.
+        /// Latest check was with iOS 18.4.
         if host?.overrideUserInterfaceStyle == .unspecified && currentStyle != .unspecified {
             addUserInterfaceStyleDidChangeObserver()
         }
-
         // override style, based on current settings
         host?.overrideUserInterfaceStyle = currentStyle