Skip to content

Commit ff94f17

Browse files
intitniintitni
committed
Fix typo
1 parent 7efe060 commit ff94f17

File tree

4 files changed

+48
-48
lines changed

4 files changed

+48
-48
lines changed

‎Core/Sources/Service/GUI/GraphicalUserInterfaceController.swift‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,17 @@ struct GUI: ReducerProtocol {
1616
var suggestionWidgetState = WidgetFeature.State()
1717

1818
var chatTabGroup: ChatPanelFeature.ChatTabGroup {
19-
get { suggestionWidgetState.chatPanelState.chatTapGroup }
20-
set { suggestionWidgetState.chatPanelState.chatTapGroup = newValue }
19+
get { suggestionWidgetState.chatPanelState.chatTabGroup }
20+
set { suggestionWidgetState.chatPanelState.chatTabGroup = newValue }
2121
}
2222

2323
#if canImport(ChatTabPersistent)
2424
var persistentState: ChatTabPersistent.State {
2525
get {
26-
.init(chatTabInfo: suggestionWidgetState.chatPanelState.chatTapGroup.tabInfo)
26+
.init(chatTabInfo: chatTabGroup.tabInfo)
2727
}
2828
set {
29-
suggestionWidgetState.chatPanelState.chatTapGroup.tabInfo = newValue.chatTabInfo
29+
chatTabGroup.tabInfo = newValue.chatTabInfo
3030
}
3131
}
3232
#endif

‎Core/Sources/SuggestionWidget/ChatWindowView.swift‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ struct ChatWindowView: View {
2323
OverallState(
2424
isPanelDisplayed: $0.isPanelDisplayed,
2525
colorScheme: $0.colorScheme,
26-
selectedTabId: $0.chatTapGroup.selectedTabId
26+
selectedTabId: $0.chatTabGroup.selectedTabId
2727
)
2828
}
2929
) { viewStore in
@@ -165,9 +165,9 @@ struct ChatTabBar: View {
165165
WithViewStore(
166166
store,
167167
observe: { TabBarState(
168-
tabInfo: $0.chatTapGroup.tabInfo,
169-
selectedTabId: $0.chatTapGroup.selectedTabId
170-
?? $0.chatTapGroup.tabInfo.first?.id ?? ""
168+
tabInfo: $0.chatTabGroup.tabInfo,
169+
selectedTabId: $0.chatTabGroup.selectedTabId
170+
?? $0.chatTabGroup.tabInfo.first?.id ?? ""
171171
) }
172172
) { viewStore in
173173
HStack(spacing: 0) {
@@ -217,7 +217,7 @@ struct ChatTabBar: View {
217217
@ViewBuilder
218218
var createButton: some View {
219219
Menu {
220-
WithViewStore(store, observe: { $0.chatTapGroup.tabCollection }) { viewStore in
220+
WithViewStore(store, observe: { $0.chatTabGroup.tabCollection }) { viewStore in
221221
ForEach(0..<viewStore.state.endIndex, id: \.self) { index in
222222
switch viewStore.state[index] {
223223
case let .kind(kind):
@@ -321,9 +321,9 @@ struct ChatTabContainer: View {
321321
store,
322322
observe: {
323323
TabContainerState(
324-
tabInfo: $0.chatTapGroup.tabInfo,
325-
selectedTabId: $0.chatTapGroup.selectedTabId
326-
?? $0.chatTapGroup.tabInfo.first?.id ?? ""
324+
tabInfo: $0.chatTabGroup.tabInfo,
325+
selectedTabId: $0.chatTabGroup.selectedTabId
326+
?? $0.chatTabGroup.tabInfo.first?.id ?? ""
327327
)
328328
}
329329
) { viewStore in
@@ -424,7 +424,7 @@ struct ChatWindowView_Previews: PreviewProvider {
424424
ChatWindowView(
425425
store: .init(
426426
initialState: .init(
427-
chatTapGroup: .init(
427+
chatTabGroup: .init(
428428
tabInfo: [
429429
.init(id: "1", title: "Fake"),
430430
.init(id: "2", title: "Empty-2"),

‎Core/Sources/SuggestionWidget/FeatureReducers/ChatPanelFeature.swift‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public struct ChatPanelFeature: ReducerProtocol {
4545
}
4646

4747
public struct State: Equatable {
48-
public var chatTapGroup = ChatTabGroup()
48+
public var chatTabGroup = ChatTabGroup()
4949
var colorScheme: ColorScheme = .light
5050
var isPanelDisplayed = false
5151
var chatPanelInASeparateWindow = false
@@ -90,7 +90,7 @@ public struct ChatPanelFeature: ReducerProtocol {
9090
}
9191

9292
case .closeActiveTabClicked:
93-
if let id = state.chatTapGroup.selectedTabId {
93+
if let id = state.chatTabGroup.selectedTabId {
9494
return .run { send in
9595
await send(.closeTabButtonClicked(id: id))
9696
}
@@ -121,95 +121,95 @@ public struct ChatPanelFeature: ReducerProtocol {
121121
}
122122

123123
case let .updateChatTabInfo(chatTabInfo):
124-
let previousSelectedIndex = state.chatTapGroup.tabInfo
125-
.firstIndex(where: { $0.id == state.chatTapGroup.selectedTabId })
126-
state.chatTapGroup.tabInfo = chatTabInfo
127-
if !chatTabInfo.contains(where: { $0.id == state.chatTapGroup.selectedTabId }) {
124+
let previousSelectedIndex = state.chatTabGroup.tabInfo
125+
.firstIndex(where: { $0.id == state.chatTabGroup.selectedTabId })
126+
state.chatTabGroup.tabInfo = chatTabInfo
127+
if !chatTabInfo.contains(where: { $0.id == state.chatTabGroup.selectedTabId }) {
128128
if let previousSelectedIndex {
129129
let proposedSelectedIndex = previousSelectedIndex - 1
130130
if proposedSelectedIndex >= 0,
131131
proposedSelectedIndex < chatTabInfo.endIndex
132132
{
133-
state.chatTapGroup.selectedTabId = chatTabInfo[proposedSelectedIndex].id
133+
state.chatTabGroup.selectedTabId = chatTabInfo[proposedSelectedIndex].id
134134
} else {
135-
state.chatTapGroup.selectedTabId = chatTabInfo.first?.id
135+
state.chatTabGroup.selectedTabId = chatTabInfo.first?.id
136136
}
137137
} else {
138-
state.chatTapGroup.selectedTabId = nil
138+
state.chatTabGroup.selectedTabId = nil
139139
}
140140
}
141141
return .none
142142

143143
case let .closeTabButtonClicked(id):
144-
let firstIndex = state.chatTapGroup.tabInfo.firstIndex { $0.id == id }
144+
let firstIndex = state.chatTabGroup.tabInfo.firstIndex { $0.id == id }
145145
let nextIndex = {
146146
guard let firstIndex else { return 0 }
147147
let nextIndex = firstIndex - 1
148148
return max(nextIndex, 0)
149149
}()
150-
state.chatTapGroup.tabInfo.removeAll { $0.id == id }
151-
if state.chatTapGroup.tabInfo.isEmpty {
150+
state.chatTabGroup.tabInfo.removeAll { $0.id == id }
151+
if state.chatTabGroup.tabInfo.isEmpty {
152152
state.isPanelDisplayed = false
153153
}
154-
if nextIndex < state.chatTapGroup.tabInfo.count {
155-
state.chatTapGroup.selectedTabId = state.chatTapGroup.tabInfo[nextIndex].id
154+
if nextIndex < state.chatTabGroup.tabInfo.count {
155+
state.chatTabGroup.selectedTabId = state.chatTabGroup.tabInfo[nextIndex].id
156156
} else {
157-
state.chatTapGroup.selectedTabId = nil
157+
state.chatTabGroup.selectedTabId = nil
158158
}
159159
return .none
160160

161161
case .createNewTapButtonHovered:
162-
state.chatTapGroup.tabCollection = chatTabBuilderCollection()
162+
state.chatTabGroup.tabCollection = chatTabBuilderCollection()
163163
return .none
164164

165165
case .createNewTapButtonClicked:
166166
return .none // handled elsewhere
167167

168168
case let .tabClicked(id):
169-
guard state.chatTapGroup.tabInfo.contains(where: { $0.id == id }) else {
170-
state.chatTapGroup.selectedTabId = nil
169+
guard state.chatTabGroup.tabInfo.contains(where: { $0.id == id }) else {
170+
state.chatTabGroup.selectedTabId = nil
171171
return .none
172172
}
173-
state.chatTapGroup.selectedTabId = id
173+
state.chatTabGroup.selectedTabId = id
174174
return .none
175175

176176
case let .appendAndSelectTab(tab):
177-
guard !state.chatTapGroup.tabInfo.contains(where: { $0.id == tab.id })
177+
guard !state.chatTabGroup.tabInfo.contains(where: { $0.id == tab.id })
178178
else { return .none }
179-
state.chatTapGroup.tabInfo.append(tab)
180-
state.chatTapGroup.selectedTabId = tab.id
179+
state.chatTabGroup.tabInfo.append(tab)
180+
state.chatTabGroup.selectedTabId = tab.id
181181
return .none
182182

183183
case .switchToNextTab:
184-
let selectedId = state.chatTapGroup.selectedTabId
185-
guard let index = state.chatTapGroup.tabInfo
184+
let selectedId = state.chatTabGroup.selectedTabId
185+
guard let index = state.chatTabGroup.tabInfo
186186
.firstIndex(where: { $0.id == selectedId })
187187
else { return .none }
188188
let nextIndex = index + 1
189-
if nextIndex >= state.chatTapGroup.tabInfo.endIndex {
189+
if nextIndex >= state.chatTabGroup.tabInfo.endIndex {
190190
return .none
191191
}
192-
let targetId = state.chatTapGroup.tabInfo[nextIndex].id
193-
state.chatTapGroup.selectedTabId = targetId
192+
let targetId = state.chatTabGroup.tabInfo[nextIndex].id
193+
state.chatTabGroup.selectedTabId = targetId
194194
return .none
195195

196196
case .switchToPreviousTab:
197-
let selectedId = state.chatTapGroup.selectedTabId
198-
guard let index = state.chatTapGroup.tabInfo
197+
let selectedId = state.chatTabGroup.selectedTabId
198+
guard let index = state.chatTabGroup.tabInfo
199199
.firstIndex(where: { $0.id == selectedId })
200200
else { return .none }
201201
let previousIndex = index - 1
202-
if previousIndex < 0 || previousIndex >= state.chatTapGroup.tabInfo.endIndex {
202+
if previousIndex < 0 || previousIndex >= state.chatTabGroup.tabInfo.endIndex {
203203
return .none
204204
}
205-
let targetId = state.chatTapGroup.tabInfo[previousIndex].id
206-
state.chatTapGroup.selectedTabId = targetId
205+
let targetId = state.chatTabGroup.tabInfo[previousIndex].id
206+
state.chatTabGroup.selectedTabId = targetId
207207
return .none
208208

209209
case .chatTab:
210210
return .none
211211
}
212-
}.forEach(\.chatTapGroup.tabInfo, action: /Action.chatTab) {
212+
}.forEach(\.chatTabGroup.tabInfo, action: /Action.chatTab) {
213213
ChatTabItem()
214214
}
215215
}

‎Core/Sources/SuggestionWidget/FeatureReducers/WidgetFeature.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public struct WidgetFeature: ReducerProtocol {
6363
}
6464
return false
6565
}(),
66-
isContentEmpty: chatPanelState.chatTapGroup.tabInfo.isEmpty
66+
isContentEmpty: chatPanelState.chatTabGroup.tabInfo.isEmpty
6767
&& panelState.sharedPanelState.content == nil,
6868
isChatPanelDetached: chatPanelState.chatPanelInASeparateWindow,
6969
isChatOpen: chatPanelState.isPanelDisplayed,
@@ -485,7 +485,7 @@ public struct WidgetFeature: ReducerProtocol {
485485

486486
case .updateWindowOpacity:
487487
let isChatPanelDetached = state.chatPanelState.chatPanelInASeparateWindow
488-
let hasChat = !state.chatPanelState.chatTapGroup.tabInfo.isEmpty
488+
let hasChat = !state.chatPanelState.chatTabGroup.tabInfo.isEmpty
489489

490490
return .run { _ in
491491
Task { @MainActor in

0 commit comments

Comments
 (0)