marketing-shibata50/cmux
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: require pinned ids in sidebar drop planner (#1505)

Browse source 
Co-authored-by: Lawrence Chen <lawrencecchen@users.noreply.github.com>
This commit is contained in:
Lawrence Chen 2026-03-15 21:48:51 -07:00 • committed by GitHub
parent 7a9a6a550c
commit 3b507d361f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 23 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Sources/ContentView.swift
View file

@ -11578,7 +11578,7 @@ enum SidebarDropPlanner {
draggedTabId: UUID?,
targetTabId: UUID?,
tabIds: [UUID],
pinnedTabIds: Set<UUID> = [],
pinnedTabIds: Set<UUID>,
pointerY: CGFloat? = nil,
targetHeight: CGFloat? = nil
) -> SidebarDropIndicator? {
@ -11619,7 +11619,7 @@ enum SidebarDropPlanner {
targetTabId: UUID?,
indicator: SidebarDropIndicator?,
tabIds: [UUID],
pinnedTabIds: Set<UUID> = []
pinnedTabIds: Set<UUID>
) -> Int? {
guard let fromIndex = tabIds.firstIndex(of: draggedTabId) else { return nil }

29
cmuxTests/CmuxWebViewKeyEquivalentTests.swift
View file

@ -7166,14 +7166,16 @@ final class SidebarDropPlannerTests: XCTestCase {
SidebarDropPlanner.indicator(
draggedTabId: first,
targetTabId: first,
tabIds: tabIds
tabIds: tabIds,
pinnedTabIds: []
)
)
XCTAssertNil(
SidebarDropPlanner.indicator(
draggedTabId: third,
targetTabId: nil,
tabIds: tabIds
tabIds: tabIds,
pinnedTabIds: []
)
)
}
@ -7184,14 +7186,16 @@ final class SidebarDropPlannerTests: XCTestCase {
SidebarDropPlanner.indicator(
draggedTabId: only,
targetTabId: nil,
tabIds: [only]
tabIds: [only],
pinnedTabIds: []
)
)
XCTAssertNil(
SidebarDropPlanner.indicator(
draggedTabId: only,
targetTabId: only,
tabIds: [only]
tabIds: [only],
pinnedTabIds: []
)
)
}
@ -7205,7 +7209,8 @@ final class SidebarDropPlannerTests: XCTestCase {
let indicator = SidebarDropPlanner.indicator(
draggedTabId: second,
targetTabId: nil,
tabIds: tabIds
tabIds: tabIds,
pinnedTabIds: []
)
XCTAssertEqual(indicator?.tabId, nil)
XCTAssertEqual(indicator?.edge, .bottom)
@ -7221,7 +7226,8 @@ final class SidebarDropPlannerTests: XCTestCase {
draggedTabId: second,
targetTabId: nil,
indicator: SidebarDropIndicator(tabId: nil, edge: .bottom),
tabIds: tabIds
tabIds: tabIds,
pinnedTabIds: []
)
XCTAssertEqual(index, 2)
}
@ -7236,7 +7242,8 @@ final class SidebarDropPlannerTests: XCTestCase {
SidebarDropPlanner.indicator(
draggedTabId: second,
targetTabId: second,
tabIds: tabIds
tabIds: tabIds,
pinnedTabIds: []
)
)
}
@ -7252,6 +7259,7 @@ final class SidebarDropPlannerTests: XCTestCase {
draggedTabId: first,
targetTabId: second,
tabIds: tabIds,
pinnedTabIds: [],
pointerY: 2,
targetHeight: 40
)
@ -7268,6 +7276,7 @@ final class SidebarDropPlannerTests: XCTestCase {
draggedTabId: first,
targetTabId: second,
tabIds: tabIds,
pinnedTabIds: [],
pointerY: 38,
targetHeight: 40
)
@ -7278,7 +7287,8 @@ final class SidebarDropPlannerTests: XCTestCase {
draggedTabId: first,
targetTabId: second,
indicator: indicator,
tabIds: tabIds
tabIds: tabIds,
pinnedTabIds: []
),
1
)
@ -7294,6 +7304,7 @@ final class SidebarDropPlannerTests: XCTestCase {
draggedTabId: third,
targetTabId: first,
tabIds: tabIds,
pinnedTabIds: [],
pointerY: 38,
targetHeight: 40
)
@ -7301,6 +7312,7 @@ final class SidebarDropPlannerTests: XCTestCase {
draggedTabId: third,
targetTabId: second,
tabIds: tabIds,
pinnedTabIds: [],
pointerY: 2,
targetHeight: 40
)
@ -7322,6 +7334,7 @@ final class SidebarDropPlannerTests: XCTestCase {
draggedTabId: third,
targetTabId: second,
tabIds: tabIds,
pinnedTabIds: [],
pointerY: 38,
targetHeight: 40
)