@rdlabo/ionic-theme-ios27 1.2.1 → 2.0.0-beta.pr304.sha56daf151ad80

package/ios/Sources/IonicNativeUIShellPlugin/IonicNativeUIShellPlugin.swift

@@ -1,396 +0,0 @@
-import Capacitor
-import UIKit
-import WebKit
-
-@objc(IonicNativeUIShellPlugin)
-public class IonicNativeUIShellPlugin: CAPPlugin, CAPBridgedPlugin, UITabBarDelegate {
-    public let identifier = "IonicNativeUIShellPlugin"
-    public let jsName = "IonicNativeUIShell"
-    public let pluginMethods: [CAPPluginMethod] = [
-        CAPPluginMethod(name: "configure", returnType: CAPPluginReturnPromise),
-        CAPPluginMethod(name: "getWebViewMetrics", returnType: CAPPluginReturnPromise),
-        CAPPluginMethod(name: "update", returnType: CAPPluginReturnPromise),
-        CAPPluginMethod(name: "clear", returnType: CAPPluginReturnPromise)
-    ]
-    private var host: ShellHost?
-    private var verticalBars: ShellVerticalBarsControlling?
-    private var controls: [String: UIView] = [:]
-    private var searchControllers: [String: ShellSearchControlling] = [:]
-    private var fingerprints: [String: ShellControl] = [:]
-    private let rendering = ShellRendering()
-    private var revision = 0
-    private var sequence = 0
-    private var keyboardVisible = false
-    private var pendingTabSelections: [String: ShellTabBar.PendingSelection] = [:]
-    private var pendingTabExpiryWorks: [String: DispatchWorkItem] = [:]
-    private var restoreTopEdge: (() -> Void)?
-    private var observers: [NSObjectProtocol] = []
-    private var lastWebViewRadius: Double?
-
-    public override func load() {
-        for name in [UIApplication.didEnterBackgroundNotification, UIResponder.keyboardWillChangeFrameNotification, UIResponder.keyboardWillHideNotification,
-                     UIDevice.orientationDidChangeNotification] {
-            observers.append(NotificationCenter.default.addObserver(forName: name, object: nil, queue: .main) { [weak self] notification in
-                guard let self else { return }
-                let keyboard = name == UIResponder.keyboardWillChangeFrameNotification || name == UIResponder.keyboardWillHideNotification
-                if keyboard {
-                    if name == UIResponder.keyboardWillHideNotification { self.keyboardVisible = false }
-                    else if let window = self.bridge?.webView?.window,
-                            let frame = notification.userInfo?[UIResponder.keyboardFrameEndUserInfoKey] as? CGRect {
-                        let local = window.convert(frame, from: window.screen.coordinateSpace)
-                        let overlap = window.bounds.intersection(local)
-                        self.keyboardVisible = !overlap.isNull && overlap.width > 0 && overlap.height > 0
-                    }
-                }
-                if !keyboard {
-                    self.host?.isHidden = true
-                    self.verticalBars?.view.isHidden = true
-                }
-                var searchOwnsKeyboard = self.verticalBars?.ownsKeyboardChrome == true
-                self.searchControllers.values.forEach { controller in
-                    if controller.ownsKeyboardChrome { searchOwnsKeyboard = true }
-                    if !keyboard { controller.surface.isHidden = true }
-                }
-                if keyboard {
-                    if !searchOwnsKeyboard {
-                        self.bridge?.triggerWindowJSEvent(eventName: "nativeUIShellRefresh")
-                    }
-                } else if name == UIDevice.orientationDidChangeNotification {
-                    self.notifyWebViewMetricsChange()
-                }
-            })
-        }
-        for name in [UIApplication.didBecomeActiveNotification, UIResponder.keyboardDidHideNotification,
-                     UIDevice.orientationDidChangeNotification] {
-            observers.append(NotificationCenter.default.addObserver(forName: name, object: nil, queue: .main) { [weak self] _ in
-                if name == UIResponder.keyboardDidHideNotification { self?.keyboardVisible = false }
-                self?.bridge?.triggerWindowJSEvent(eventName: "nativeUIShellRefresh", data: name == UIApplication.didBecomeActiveNotification ? "{\"retireSearch\":true}" : "{}")
-                if name == UIApplication.didBecomeActiveNotification { self?.notifyWebViewMetricsChange() }
-            })
-        }
-    }
-
-    deinit {
-        observers.forEach(NotificationCenter.default.removeObserver)
-    }
-
-    private func webViewMetrics() -> JSObject? {
-        guard #available(iOS 26.0, *), let webView = bridge?.webView else { return nil }
-        webView.layoutIfNeeded()
-        return ["radius": Double(webView.effectiveRadius(corner: .topLeft))]
-    }
-
-    private func notifyWebViewMetricsChange() {
-        let metrics = webViewMetrics() ?? ["radius": 0]
-        let radius = metrics["radius"] as? Double ?? 0
-        guard radius != lastWebViewRadius else { return }
-        lastWebViewRadius = radius
-        notifyListeners("webViewMetricsChange", data: metrics)
-    }
-
-    @objc func getWebViewMetrics(_ call: CAPPluginCall) {
-        DispatchQueue.main.async { [weak self] in
-            call.resolve(self?.webViewMetrics() ?? ["radius": 0])
-        }
-    }
-
-    @objc func configure(_ call: CAPPluginCall) {
-        DispatchQueue.main.async { [weak self] in
-            // A new JS context starts revision numbering again (live reload / navigation).
-            self?.restoreTopEdge?()
-            self?.restoreTopEdge = nil
-            self?.removeControls()
-            self?.revision = 0
-            if #available(iOS 26.0, *) {
-                self?.bridge?.webView?.layoutIfNeeded()
-                // Ionic already paints the header edge; a second native effect can
-                // add a dark scrim when the OS and Web themes differ.
-                if call.getBool("verticalBarsOnly") != true, let effect = self?.bridge?.webView?.scrollView.topEdgeEffect {
-                    let hidden = effect.isHidden
-                    effect.isHidden = true
-                    self?.restoreTopEdge = { [weak effect] in effect?.isHidden = hidden }
-                }
-                call.resolve(["supported": true])
-            }
-            else { call.resolve(["supported": false]) }
-        }
-    }
-
-    @objc func clear(_ call: CAPPluginCall) {
-        DispatchQueue.main.async { [weak self] in
-            guard let self else { call.resolve(); return }
-            let next = call.getInt("revision") ?? 0
-            if next >= self.revision {
-                self.revision = next
-                self.restoreTopEdge?()
-                self.restoreTopEdge = nil
-                self.removeControls()
-            }
-            call.resolve()
-        }
-    }
-
-    private func removeControl(_ id: String, duration: TimeInterval = 0) {
-        searchControllers.removeValue(forKey: id)?.detach()
-        if let control = controls.removeValue(forKey: id) { ShellCrossfade.retire(control, duration: duration) }
-        fingerprints.removeValue(forKey: id)
-        pendingTabSelections.removeValue(forKey: id)
-        pendingTabExpiryWorks.removeValue(forKey: id)?.cancel()
-    }
-
-    private func removeControls(duration: TimeInterval = 0) {
-        Array(controls.keys).forEach { removeControl($0, duration: duration) }
-        host?.removeFromSuperview()
-        host = nil
-        verticalBars?.detach()
-        verticalBars = nil
-        rendering.clear()
-        pendingTabSelections.removeAll()
-        pendingTabExpiryWorks.values.forEach { $0.cancel() }
-        pendingTabExpiryWorks.removeAll()
-    }
-
-    private func syncTabBar(_ tabBar: UITabBar, id: String, node: ShellControl) {
-        var pending = pendingTabSelections[id]
-        ShellTabBar.update(tabBar, node: node, rendering: rendering, pendingSelection: &pending)
-        if let pending {
-            pendingTabSelections[id] = pending
-        } else {
-            pendingTabSelections.removeValue(forKey: id)
-            pendingTabExpiryWorks.removeValue(forKey: id)?.cancel()
-        }
-    }
-
-    private func schedulePendingTabExpiry(_ id: String, until: CFAbsoluteTime) {
-        pendingTabExpiryWorks[id]?.cancel()
-        let delay = max(0, until - CFAbsoluteTimeGetCurrent()) + 0.02
-        let work = DispatchWorkItem { [weak self] in
-            guard let self else { return }
-            self.pendingTabExpiryWorks.removeValue(forKey: id)
-            guard let pending = self.pendingTabSelections[id],
-                  CFAbsoluteTimeGetCurrent() >= pending.until,
-                  let tabBar = self.controls[id] as? UITabBar,
-                  let node = self.fingerprints[id] else { return }
-            self.syncTabBar(tabBar, id: id, node: node)
-        }
-        pendingTabExpiryWorks[id] = work
-        DispatchQueue.main.asyncAfter(deadline: .now() + delay, execute: work)
-    }
-
-    @objc func update(_ call: CAPPluginCall) {
-        DispatchQueue.main.async { [weak self] in
-            guard let self else { call.reject("Plugin released"); return }
-            guard #available(iOS 26.0, *) else { call.reject("Requires iOS 26"); return }
-            let next = call.getInt("revision") ?? 0
-            guard next > self.revision else { call.resolve(["revision": self.revision]); return }
-            guard let webView = self.bridge?.webView, let parent = webView.superview else {
-                call.reject("WebView unavailable"); return
-            }
-            // Decode and validate the entire batch before changing visible controls.
-            guard let snapshot = try? call.decode(ShellSnapshot.self), snapshot.isValid else {
-                call.reject("Invalid control snapshot"); return
-            }
-            self.notifyWebViewMetricsChange()
-            let duration = ShellCrossfade.duration(snapshot.transitionDuration)
-            let existing = Set(self.controls.keys)
-            let verticalBars = snapshot.controls.filter { $0.placement == .verticalBars }
-            let snapshots = snapshot.controls.filter { $0.placement != .verticalBars }
-            let verticalSearchActive = verticalBars.contains { $0.search.map { $0.available && $0.active } ?? false }
-            let width = snapshot.viewportWidth
-            self.revision = next
-            if snapshots.isEmpty && verticalBars.isEmpty {
-                self.removeControls(duration: duration)
-                call.resolve(["revision": next]); return
-            }
-            let scale = webView.bounds.width / width
-            let retained = Set(snapshots.map(\.id))
-            for id in Array(self.controls.keys) where !retained.contains(id) {
-                self.removeControl(id, duration: duration)
-            }
-            var rejectedControls: [String] = []
-            var fabs: [(ShellFab, ShellControl)] = []
-            var searches: [(ShellSearchControlling, ShellControl, CGRect, CGRect, UIView?, Bool)] = []
-            var rejectedSearches: [String] = []
-            if verticalBars.isEmpty || (self.keyboardVisible && !verticalSearchActive) {
-                self.verticalBars?.detach()
-                self.verticalBars = nil
-                if self.keyboardVisible { rejectedControls.append(contentsOf: verticalBars.map(\.id)) }
-            } else if let owner = self.bridge?.viewController {
-                let rail = self.verticalBars ?? ShellVerticalBarsController(
-                    activate: { [weak self] id in self?.activate(id) },
-                    changed: { [weak self] id, phase, value, composing, valueVersion in
-                        self?.searchChanged(id, phase: phase, value: value, composing: composing, valueVersion: valueVersion) ?? 0
-                    })
-                self.verticalBars = rail
-                rail.attach(to: owner, in: owner.view)
-                if let frame = snapshot.verticalBarFrame {
-                    rail.view.frame = webView.convert(frame.rect.applying(CGAffineTransform(scaleX: scale, y: scale)), to: owner.view)
-                } else {
-                    rail.view.frame = owner.view.bounds
-                }
-                rail.apply(verticalBars, rendering: self.rendering, edge: snapshot.verticalBarEdge ?? "right")
-                rail.view.isHidden = false
-            } else {
-                rejectedControls.append(contentsOf: verticalBars.map(\.id))
-            }
-            if snapshots.isEmpty {
-                self.host?.removeFromSuperview()
-                self.host = nil
-                call.resolve(["revision": next, "rejectedControls": rejectedControls])
-                return
-            }
-            let host = self.host ?? ShellHost()
-            self.host = host
-            host.frame = parent.bounds
-            host.autoresizingMask = [.flexibleWidth, .flexibleHeight]
-            host.backgroundColor = .clear
-            host.isAccessibilityElement = false
-            UIView.performWithoutAnimation {
-                if host.superview !== parent { parent.addSubview(host) }
-                for node in snapshots {
-                    let id = node.id
-                    let previous = self.controls[id]
-                    let previousBounds = previous?.bounds
-                    let previousCenter = previous?.center
-                    let reject = {
-                        // Keep the old cover until JS paints Web and omits this ID.
-                        if let previous, self.controls[id] === previous {
-                            previous.bounds = previousBounds!
-                            previous.center = previousCenter!
-                            previous.layoutIfNeeded()
-                        } else { self.removeControl(id) }
-                        rejectedControls.append(id)
-                    }
-                    // Only native search owns its keyboard; other controls return to Web.
-                    if self.keyboardVisible && self.searchControllers[id]?.ownsKeyboard != true {
-                        reject(); continue
-                    }
-                    let local = node.frame.rect
-                    let bounds = webView.convert(CGRect(x: local.minX * scale, y: local.minY * scale,
-                                                       width: local.width * scale, height: local.height * scale), to: parent)
-                    if let search = node.search {
-                        guard let owner = self.bridge?.viewController else { rejectedSearches.append(id); continue }
-                        let controller: ShellSearchControlling
-                        let previousCover = self.controls[id]
-                        let replacing = self.searchControllers[id]
-                        if let existing = replacing { controller = existing }
-                        else {
-                            // Keep the ordinary UITabBar cover until the search controller applies.
-                            controller = ShellSearchController()
-                            controller.activate = { [weak self] id in self?.activate(id) }
-                            controller.changed = { [weak self] id, phase, value, composing, valueVersion in
-                                self?.searchChanged(id, phase: phase, value: value, composing: composing, valueVersion: valueVersion) ?? 0
-                            }
-                            controller.attach(to: owner, in: owner.view)
-                            self.searchControllers[id] = controller
-                            self.controls[id] = controller.surface
-                        }
-                        let trigger = search.trigger.frame.rect
-                        let searchBarFrame = webView.convert(CGRect(x: webView.bounds.minX + local.minX * scale,
-                            y: webView.bounds.minY + local.minY * scale, width: local.width * scale, height: local.height * scale), to: owner.view)
-                        let triggerFrame = webView.convert(CGRect(x: webView.bounds.minX + trigger.minX * scale,
-                            y: webView.bounds.minY + trigger.minY * scale, width: trigger.width * scale, height: trigger.height * scale), to: owner.view)
-                        searches.append((controller, node, searchBarFrame, triggerFrame, previousCover, replacing == nil))
-                        continue
-                    } else if self.searchControllers[id] != nil {
-                        self.removeControl(id)
-                    }
-                    if self.fingerprints[id] != node {
-                        if node.kind == ShellFab.kind {
-                            let fab = (self.controls[id] as? ShellFab) ?? ShellFab()
-                            if fab.superview == nil { host.addSubview(fab) }
-                            self.controls[id] = fab
-                            fabs.append((fab, node))
-                        } else if let segment = self.controls[id] as? ShellSegment, node.kind == ShellSegment.kind {
-                            segment.update(node, scale: scale, rendering: self.rendering)
-                        } else if let tabBar = self.controls[id] as? UITabBar, node.kind == ShellTabBar.kind {
-                            self.syncTabBar(tabBar, id: id, node: node)
-                        } else {
-                            guard let control = ShellComponents.make(node, scale: scale, rendering: self.rendering, tabDelegate: self,
-                                activate: { [weak self] id in self?.activate(id) }) else { reject(); continue }
-                            self.controls.removeValue(forKey: id)?.removeFromSuperview()
-                            self.controls[id] = control
-                            host.addSubview(control)
-                        }
-                        self.fingerprints[id] = node
-                    } else if let tabBar = self.controls[id] as? UITabBar, self.pendingTabSelections[id] != nil {
-                        // Resolve an in-flight native tap even when other fingerprint fields are unchanged.
-                        self.syncTabBar(tabBar, id: id, node: node)
-                    }
-                    guard let control = self.controls[id] else { reject(); continue }
-                    if let tabBar = control as? UITabBar {
-                        guard ShellTabBar.fit(tabBar, node: node, bounds: bounds) else { reject(); continue }
-                    } else if control.frame != bounds {
-                        control.frame = bounds
-                    }
-                    control.overrideUserInterfaceStyle = node.dark ? .dark : .light
-                }
-                host.isHidden = false
-                host.layoutIfNeeded()
-            }
-            // FABs update in place. Only icon content animates; the glass surface
-            // and Ionic's staggered child visibility keep their own identities.
-            for (fab, node) in fabs {
-                fab.apply(node, scale: scale, rendering: self.rendering, activate: { [weak self] id in self?.activate(id) })
-            }
-            for (controller, node, frame, triggerFrame, previousCover, created) in searches {
-                let id = node.id
-                let webFrame = webView.convert(webView.bounds, to: controller.surface.superview)
-                if !controller.apply(node, webFrame: webFrame, barFrame: frame, triggerFrame: triggerFrame, rendering: self.rendering) {
-                    if created {
-                        self.searchControllers.removeValue(forKey: id)
-                        controller.detach()
-                        if let previousCover, previousCover.superview != nil {
-                            self.controls[id] = previousCover
-                        } else {
-                            self.controls.removeValue(forKey: id)?.removeFromSuperview()
-                            self.fingerprints.removeValue(forKey: id)
-                            self.pendingTabSelections[id] = nil
-                            self.pendingTabExpiryWorks.removeValue(forKey: id)?.cancel()
-                        }
-                    } else {
-                        self.removeControl(id)
-                    }
-                    rejectedSearches.append(id)
-                } else {
-                    if created, let previousCover, previousCover !== controller.surface {
-                        previousCover.removeFromSuperview()
-                    }
-                    controller.surface.isHidden = self.keyboardVisible && !controller.ownsKeyboard
-                }
-            }
-            for (id, control) in self.controls where !existing.contains(id) && self.searchControllers[id] == nil {
-                ShellCrossfade.enter(control, duration: duration)
-            }
-            let complete = { call.resolve(["revision": next, "rejectedSearches": rejectedSearches, "rejectedControls": rejectedControls]) }
-            if let coordinator = searches.first?.0.transitionCoordinator,
-               coordinator.animate(alongsideTransition: nil, completion: { _ in complete() }) { return }
-            complete()
-
-        }
-    }
-
-    public func tabBar(_ tabBar: UITabBar, didSelect item: UITabBarItem) {
-        guard item.isEnabled, let itemId = item.accessibilityIdentifier else { return }
-        if let controlId = controls.first(where: { $0.value === tabBar })?.key {
-            let pending = ShellTabBar.PendingSelection.start(itemId)
-            pendingTabSelections[controlId] = pending
-            schedulePendingTabExpiry(controlId, until: pending.until)
-        }
-        activate(itemId)
-    }
-
-    private func searchChanged(_ id: String, phase: ShellSearchPhase, value: String,
-                               composing: Bool, valueVersion: Int) -> Int {
-        sequence += 1
-        notifyListeners("search", data: ["id": id, "phase": phase.rawValue, "value": value,
-            "composing": composing, "valueVersion": valueVersion, "sequence": sequence, "revision": revision])
-        return sequence
-    }
-
-    private func activate(_ id: String) {
-        sequence += 1
-        notifyListeners("activate", data: ["id": id, "revision": revision, "sequence": sequence])
-
-    }
-}

package/ios/Sources/IonicNativeUIShellPlugin/Shared/ShellCrossfade.swift

@@ -1,35 +0,0 @@
-import UIKit
-
-@MainActor enum ShellCrossfade {
-    static func duration(_ milliseconds: Double?) -> TimeInterval {
-        UIAccessibility.isReduceMotionEnabled ? 0 : (milliseconds ?? 0) / 1000
-    }
-
-    static func enter(_ view: UIView, duration: TimeInterval) {
-        guard duration > 0 else { return }
-        view.alpha = 0
-        UIView.animate(withDuration: duration, delay: 0, options: [.curveEaseInOut, .allowUserInteraction]) {
-            view.alpha = 1
-        }
-    }
-
-    static func retire(_ view: UIView, duration: TimeInterval) {
-        // The outgoing copy is visual only: it cannot keep accepting actions or
-        // VoiceOver focus once the Web source has been restored.
-        if duration > 0, let host = view.superview, let parent = host.superview,
-           !view.isHidden, !host.isHidden, let copy = view.snapshotView(afterScreenUpdates: false) {
-            copy.frame = host.convert(view.frame, to: parent)
-            copy.alpha = CGFloat(view.layer.presentation()?.opacity ?? Float(view.alpha))
-            copy.isUserInteractionEnabled = false
-            copy.isAccessibilityElement = false
-            copy.accessibilityElementsHidden = true
-            parent.insertSubview(copy, aboveSubview: host)
-            UIView.animate(withDuration: duration, delay: 0, options: [.curveEaseInOut]) {
-                copy.alpha = 0
-            } completion: { _ in
-                copy.removeFromSuperview()
-            }
-        }
-        view.removeFromSuperview()
-    }
-}

package/ios/Sources/IonicNativeUIShellPlugin/Shared/ShellHost.swift

@@ -1,8 +0,0 @@
-import UIKit
-
-final class ShellHost: UIView {
-    override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? {
-        let hit = super.hitTest(point, with: event)
-        return hit === self ? nil : hit
-    }
-}

package/ios/Sources/IonicNativeUIShellPlugin/Shared/ShellRendering.swift

@@ -1,27 +0,0 @@
-import UIKit
-
-final class ShellRendering {
-    private var images: [String: UIImage] = [:]
-    func clear() { images.removeAll() }
-
-    func image(_ item: ShellItemContent) -> UIImage? {
-        guard let data = item.icon, let width = item.iconWidth, width > 0 else { return nil }
-        let template = item.iconTemplate == true
-        let key = (template ? "template:" : "original:") + data
-        if let cached = images[key] { return cached }
-        guard let bytes = Data(base64Encoded: data), let raw = UIImage(data: bytes), let cg = raw.cgImage else { return nil }
-        let result = UIImage(cgImage: cg, scale: CGFloat(cg.width) / width, orientation: .up)
-            .withRenderingMode(template ? .alwaysTemplate : .alwaysOriginal)
-        if images.count >= 128 { images.removeAll() }
-        images[key] = result
-        return result
-    }
-
-    func color(_ css: String?) -> UIColor {
-        guard let css else { return .label }
-        let numbers = css.components(separatedBy: CharacterSet(charactersIn: "0123456789.").inverted).compactMap(Double.init)
-        guard numbers.count >= 3 else { return .label }
-        return UIColor(red: numbers[0] / 255, green: numbers[1] / 255, blue: numbers[2] / 255,
-                       alpha: numbers.count > 3 ? numbers[3] : 1)
-    }
-}

package/ios/Sources/IonicNativeUIShellPlugin/Shared/ShellSnapshot.swift

@@ -1,135 +0,0 @@
-import Foundation
-import CoreGraphics
-
-enum ShellComponent: String, Decodable {
-    case button = "ion-button", buttons = "ion-buttons"
-    case backButton = "ion-back-button", menuButton = "ion-menu-button"
-    case tabBar = "ion-tab-bar", segment = "ion-segment", fab = "ion-fab"
-}
-
-struct ShellSnapshot: Decodable {
-    let revision: Int
-    let transitionDuration: Double?
-    let viewportWidth: Double
-    let verticalBarFrame: ShellFrame?
-    let verticalBarEdge: String?
-    let controls: [ShellControl]
-
-    var isValid: Bool {
-        revision >= 0 && (transitionDuration.map { $0.isFinite && $0 >= 0 && $0 <= 500 } ?? true) && viewportWidth.isFinite && viewportWidth > 0 && controls.count <= 100 &&
-        (verticalBarFrame.map { $0.isValid } ?? true) &&
-        (verticalBarEdge == nil || verticalBarEdge == "left" || verticalBarEdge == "right") &&
-        Set(controls.map(\.id)).count == controls.count && controls.allSatisfy(\.isValid)
-    }
-}
-
-// Frames and content decode from the same flat wire object. Keeping them separate
-// lets FABs compare artwork without treating movement or visibility as new content.
-struct ShellFrame: Decodable, Equatable {
-    let x: Double
-    let y: Double
-    let width: Double
-    let height: Double
-    var rect: CGRect { CGRect(x: x, y: y, width: width, height: height) }
-    var isValid: Bool { [x, y, width, height].allSatisfy(\.isFinite) && width > 0 && height > 0 }
-}
-
-struct ShellControl: Decodable, Equatable {
-    enum Placement: String, Decodable { case verticalBars = "vertical-bars" }
-    enum ToolbarSlot: String, Decodable { case start, end }
-    let id: String
-    let kind: ShellComponent
-    let placement: Placement?
-    let toolbarSlot: ToolbarSlot?
-    let frame: ShellFrame
-    let items: [ShellItem]
-    let dark: Bool
-    let rtl: Bool
-    let tabBarAnchor: ShellTabBar.Anchor?
-    let search: ShellSearch?
-
-    private enum CodingKeys: String, CodingKey { case id, kind, placement, toolbarSlot, items, dark, rtl, tabBarAnchor, search }
-
-    init(from decoder: Decoder) throws {
-        let values = try decoder.container(keyedBy: CodingKeys.self)
-        id = try values.decode(String.self, forKey: .id)
-        kind = try values.decode(ShellComponent.self, forKey: .kind)
-        placement = try values.decodeIfPresent(Placement.self, forKey: .placement)
-        toolbarSlot = try values.decodeIfPresent(ToolbarSlot.self, forKey: .toolbarSlot)
-        frame = try ShellFrame(from: decoder)
-        items = try values.decode([ShellItem].self, forKey: .items)
-        dark = try values.decode(Bool.self, forKey: .dark)
-        rtl = try values.decode(Bool.self, forKey: .rtl)
-        tabBarAnchor = try values.decodeIfPresent(ShellTabBar.Anchor.self, forKey: .tabBarAnchor)
-        search = try values.decodeIfPresent(ShellSearch.self, forKey: .search)
-    }
-
-    var isValid: Bool {
-        ShellComponents.supported.contains(kind) && !id.isEmpty && frame.isValid && !items.isEmpty && items.count <= 30 &&
-        (!ShellButton.kinds.contains(kind) || items.count == 1) &&
-        (toolbarSlot == nil || (placement == .verticalBars && [.button, .buttons, .menuButton].contains(kind))) &&
-        Set(items.map(\.id)).count == items.count && items.allSatisfy(\.isValid) &&
-        (tabBarAnchor.map { kind == .tabBar && $0.isValid } ?? true) &&
-        (search.map { kind == .tabBar && $0.isValid } ?? true)
-    }
-}
-
-struct ShellItem: Decodable, Equatable {
-    let frame: ShellFrame
-    let content: ShellItemContent
-    let visible: Bool?
-    var id: String { content.id }
-
-    private enum CodingKeys: String, CodingKey { case visible }
-
-    init(from decoder: Decoder) throws {
-        frame = try ShellFrame(from: decoder)
-        content = try ShellItemContent(from: decoder)
-        visible = try decoder.container(keyedBy: CodingKeys.self).decodeIfPresent(Bool.self, forKey: .visible)
-    }
-
-    var isValid: Bool { frame.isValid && content.isValid }
-}
-
-struct ShellBadge: Decodable, Equatable {
-    let value: String
-    let color: String
-    let textColor: String
-}
-
-struct ShellItemContent: Decodable, Equatable {
-    enum IconPosition: String, Decodable { case leading, trailing, top }
-    enum ButtonFill: String, Decodable { case clear, solid, outline }
-    let id: String
-    var label: String
-    let accessibilityLabel: String
-    let disabled: Bool
-    let selected: Bool
-    let fontSize: Double
-    let fontWeight: Double
-    let color: String
-    let buttonFill: ButtonFill?
-    let backgroundColor: String?
-    let borderColor: String?
-    let borderWidth: CGFloat?
-    let badge: ShellBadge?
-    var icon: String?
-    var iconWidth: Double?
-    var iconHeight: Double?
-    let iconPosition: IconPosition?
-    let imagePadding: Double?
-    let contentInsetLeading: Double?
-    let contentInsetTrailing: Double?
-    let iconTemplate: Bool?
-    let closeIcon: String?
-    let closeIconWidth: Double?
-    let closeIconHeight: Double?
-    let iconTransition: Double?
-
-    var isValid: Bool {
-        !id.isEmpty && fontSize.isFinite && fontSize >= 0 && fontWeight.isFinite &&
-        [iconWidth, iconHeight, closeIconWidth, closeIconHeight].compactMap { $0 }.allSatisfy { $0.isFinite && $0 > 0 } &&
-        [imagePadding, contentInsetLeading, contentInsetTrailing].compactMap { $0 }.allSatisfy { $0.isFinite } &&
-        (iconTransition.map { $0.isFinite && $0 >= 0 } ?? true)
-    }
-}