Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -3,38 +3,4 @@
uuid = "3C51FC77-CE2B-4F32-B3F3-96CDC8C1DACC"
type = "0"
version = "2.0">
<Breakpoints>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "84B43BBA-BA2F-45B8-9176-7AEAF325BA43"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Paicord/Common/Login/LoginViewModel.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "19"
endingLineNumber = "19"
landmarkName = "init()"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "87CFA371-3835-4845-A475-D49E941DFDC7"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Paicord/Common/Login/LoginViewModel.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "28"
endingLineNumber = "28"
landmarkName = "init()"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
</Breakpoints>
</Bucket>
6 changes: 6 additions & 0 deletions Paicord/App/PaicordAppState.swift
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,12 @@ final class PaicordAppState {

// MARK: - General
var showingQuickSwitcher: Bool = false

// MARK: - Attachment Viewer
var showingAttachmentViewer: Bool = false
var attachmentViewerAttachments: [DiscordMedia] = []
var attachmentViewerIndex: Int? = nil
var attachmentViewerContextMessage: DiscordChannel.PartialMessage? = nil

// MARK: - Selected Guild & Channel Persistence

Expand Down
1 change: 1 addition & 0 deletions Paicord/App/RootView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ struct RootView: View {
.quickSwitcher()
.sponsorSheet()
.updateSheet()
.attachmentViewer()
.task {
appState.loadPrevGuild()
#if os(iOS)
Expand Down
2 changes: 1 addition & 1 deletion Paicord/Common/Chat/ChatView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ struct ChatView: View {
name: .chatViewShouldScrollToBottom,
object: ["channelId": vm.channelId, "immediate": true]
)
InputBar.inputVMs[vm.channelId]?.uploadItems = []
return .handled
}
.introspect(.scrollView, on: .macOS(.v14...)) { scrollView in
Expand Down Expand Up @@ -204,7 +205,6 @@ struct ChatView: View {
.scrollDismissesKeyboard(.interactively)
.background(theme.common.secondaryBackground)
.ignoresSafeArea(.keyboard, edges: .all)

#if os(macOS)
.onDisappear {
if let observer = scrollObserver {
Expand Down
Loading