Update package

PreternaturalAI · Jun 26, 2024 · f5425c0 · f5425c0
1 parent 1783eef
commit f5425c0
Show file tree

Hide file tree

Showing 6 changed files with 84 additions and 51 deletions.
diff --git a/Package.swift b/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:5.9
+// swift-tools-version:5.10
 
 import PackageDescription
 

diff --git a/Sources/Intramodular/Interactivity/_ChatItemViewActions.swift b/Sources/Intramodular/Interactivity/_ChatItemViewActions.swift
@@ -6,6 +6,10 @@ import Swallow
 import SwiftUIX
 import SwiftUIZ
 
+extension ChatView {
+
+}
+
 public struct _ChatViewActions: Initiable, MergeOperatable {
     var onEdit: ((AnyChatItemIdentifier, AnyChatItemContent) -> Void)?
     var onDelete: ((AnyChatItemIdentifier) -> Void)?

diff --git a/Sources/Intramodular/Message List/ChatMessageList.swift b/Sources/Intramodular/Message List/ChatMessageList.swift
@@ -12,32 +12,32 @@ public struct ChatMessageList<Data: RandomAccessCollection>: View where Data.Ele
     private var _chatViewActions = _ChatViewActions()
 
     private enum ImplementationStrategy {
-        case a
-        case b
-        case c
+        case a // LazyVStack + ScrollView
+        case b // SwiftUI.List
+        case c // SwiftUIX.CocoaList
     }
 
     /// Whether `SwiftUI`'s official `List` implementation is garbage.
     private var _isOfficialImplementationStillFucked: Bool {
-        true
+        false
     }
 
     private var implementationStrategy: ImplementationStrategy {
-        #if os(macOS)
+#if os(macOS)
         if _isOfficialImplementationStillFucked {
             ImplementationStrategy.c // SwiftUIX.CocoaList
         } else {
             ImplementationStrategy.b // SwiftUI.List
         }
-        #elseif os(iOS) || os(visionOS)
+#elseif os(iOS) || os(visionOS)
         ImplementationStrategy.a // LazyVStack + ScrollView
-        #endif
+#endif
     }
-
+    
     init<C: View>(_content: () -> C) {
         self._content = _content().eraseToAnyView()
     }
-                
+
     public var body: some View {
         switch implementationStrategy {
             case .a:
@@ -80,7 +80,7 @@ extension ChatMessageList {
             }
         }
     }
-
+    
     public init<Content: View>(
         _ data: Data,
         content: @escaping (Data.Element) -> Content

diff --git a/Sources/Intramodular/Message List/_AnyChatItemPlaceholderContent.swift b/Sources/Intramodular/Message List/_AnyChatItemPlaceholderContent.swift
@@ -2,7 +2,7 @@
 // Copyright (c) Vatsal Manot
 //
 
-import SwiftUI
+import SwiftUIZ
 
 public struct _AnyChatItemPlaceholderContent: View {
     @Environment(\.userInterfaceIdiom) var userInterfaceIdiom

diff --git a/Sources/Intramodular/Message List/_ChatMessageListB.swift b/Sources/Intramodular/Message List/_ChatMessageListB.swift
@@ -14,47 +14,74 @@ public struct _ChatMessageListB<Content: View>: View {
         self.content = content()
     }
 
+    private enum Subviews {
+        case lastItem
+    }
+
     public var body: some View {
-        ScrollViewReader { scrollView in
-            _VariadicViewAdapter(content) { (content: _SwiftUI_VariadicView<Content>) in
-                let lastItem: AnyChatItemIdentifier? = content.children.last?[trait: \._chatItemConfiguration]?.id
-
-                makeList(content: content, scrollView: scrollView)
-                    .modifier(
-                        __LazyMessagesVStackScrollBehavior(
-                            scrollView: scrollView,
-                            lastItem: lastItem
-                        )
-                    )
+        _VariadicViewAdapter(content) { (content: _SwiftUI_VariadicView<Content>) in
+            let lastItem: AnyChatItemIdentifier? = content.children.last?[trait: \._chatItemConfiguration]?.id
+
+            ScrollViewReader { scrollView in
+                List {
+                    _ForEachSubview(
+                        enumerating: content,
+                        trait: \._chatItemConfiguration,
+                        id: \.id
+                    ) { (index: Int, subview: _VariadicViewChildren.Subview, item: _ChatItemIdentity) in
+                        _SwiftUI_UnaryViewAdaptor {
+                            subview
+                                .modifier(
+                                    __LazyMessagesVStackStackItem(
+                                        index: index,
+                                        id: item.id,
+                                        role: item.role.erasedAsAnyHashable,
+                                        isLast: index == content.children.count,
+                                        scrollView: scrollView
+                                    )
+                                )
+                                .modifier(_ExpandAndAlignChatItem(item: item))
+                        }
+                        .modifier(_StipAllListItemStyling(insetsIncluded: false))
+                        .id(item.id)
+                    }
+                }
+                ._stripAllListOrListItemStyling()
+                .modifier(_ChatMessageListB_ScrollBehavior(scrollView: scrollView, lastItem: lastItem))
             }
         }
-        ._SwiftUIX_defaultScrollAnchor(.bottom)
     }
+}
+
+fileprivate struct _ChatMessageListB_ScrollBehavior: ViewModifier {
+    let scrollView: ScrollViewProxy
+    let lastItem: AnyChatItemIdentifier?
 
-    private func makeList(
-        content: _SwiftUI_VariadicView<Content>,
-        scrollView: ScrollViewProxy
-    ) -> some View {
-        List {
-            _ForEachSubview(
-                enumerating: content,
-                trait: \._chatItemConfiguration
-            ) { (index: Int, subview: _VariadicViewChildren.Subview, item: _ChatItemIdentity) in
-                subview
-                    .modifier(
-                        __LazyMessagesVStackStackItem(
-                            index: index,
-                            id: item.id,
-                            role: item.role.erasedAsAnyHashable,
-                            isLast: index == content.children.count,
-                            scrollView: scrollView
-                        )
-                    )
-                    .modifier(_ExpandAndAlignChatItem(item: item))
-                    ._noListItemModification()
+    func body(content: Content) -> some View {
+        content
+            .onAppearOnce {
+                guard let lastItem else {
+                    return
+                }
+
+                withoutAnimation(after: .milliseconds(200)) {
+                    scrollView.scrollTo(lastItem, anchor: .bottom)
+
+                    withoutAnimation(after: .milliseconds(200)) {
+                        scrollView.scrollTo(lastItem, anchor: .bottom)
+                    }
+                }
+            }
+            .withChangePublisher(for: lastItem) { lastItem in
+                lastItem
+                    .compactMap({ $0 })
+                    .removeDuplicates()
+                    .debounce(for: .milliseconds(200), scheduler: DispatchQueue.main)
+                    .sink { id in
+                        withAnimation {
+                            scrollView.scrollTo(id, anchor: .bottom)
+                        }
+                    }
             }
-        }
-        .listStyle(.plain)
-        ._noListItemModification()
     }
 }
diff --git a/Sources/Intramodular/Message List/_LazyMessagesVStack.swift b/Sources/Intramodular/Message List/_LazyMessagesVStack.swift
@@ -3,7 +3,9 @@
 //
 
 @_spi(Internal) import SwiftUIX
+import SwiftUIZ
 
+@View(.dynamic)
 public struct _LazyMessagesVStack<Content: View>: View {
     @Environment(\._chatViewPreferences) var chatView
 
@@ -109,14 +111,14 @@ struct __LazyMessagesVStackStackItem: Identifiable, ViewModifier {
     let isLast: Bool?
     let scrollView: ScrollViewProxy?
 
+    @ViewStorage var isActive: Bool = false
+
     func body(content: Content) -> some View {
         content
             .environment(\._chatItemConfiguration, _ChatItemConfiguration(id: id, actions: _chatViewActions))
             .contentShape(Rectangle())
             .padding(.top, index == 0 ? 12 : 0)
             .padding(.bottom, 4)
-            .onChangeOfFrame { _ in
-                scrollView?.scrollTo(id, anchor: .bottom)
-            }
+            .geometryGroup()
     }
 }