Skip to content

Commit 8706342

Browse files
committed
remove now deletes current page for vertical sample as well
1 parent fdae282 commit 8706342

File tree

2 files changed

+15
-4
lines changed

2 files changed

+15
-4
lines changed

Example/Source/Controllers/HorizontalController/HorizontalController.swift

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ class HorizontalController {
1717

1818
lazy var removeCurrentPageAction: (() -> Void)? = { [weak self] in
1919
guard let strongSelf = self else { return }
20-
guard let currentPageIndex = strongSelf.slideController.content.index(where: { strongSelf.slideController.currentModel === $0 }) else {
20+
guard let currentPageIndex = strongSelf.slideController.content
21+
.index(where: { strongSelf.slideController.currentModel === $0 }) else {
2122
return
2223
}
2324
strongSelf.slideController.removeAtIndex(index: currentPageIndex)
@@ -26,7 +27,10 @@ class HorizontalController {
2627
lazy var insertAction: (() -> Void)? = { [weak self] in
2728
guard let strongSelf = self else { return }
2829
let page = SlideLifeCycleObjectBuilder<ColorPageLifeCycleObject>(object: ColorPageLifeCycleObject())
29-
let index = strongSelf.slideController.content.count == 0 ? 0 : strongSelf.slideController.content.count - 1
30+
guard let index = strongSelf.slideController.content
31+
.index(where: { strongSelf.slideController.currentModel === $0 }) else {
32+
return
33+
}
3034
strongSelf.slideController.insert(object: page, index: index)
3135
strongSelf.addedPagesCount += 1
3236

Example/Source/Controllers/VerticalController/VerticalController.swift

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,20 @@ class VerticalController {
1616

1717
private lazy var removeAction: (() -> Void)? = { [weak self] in
1818
guard let strongSelf = self else { return }
19-
strongSelf.slideController.removeAtIndex(index: 0)
19+
guard let index = strongSelf.slideController.content
20+
.index(where: { strongSelf.slideController.currentModel === $0 }) else {
21+
return
22+
}
23+
strongSelf.slideController.removeAtIndex(index: index)
2024
}
2125

2226
private lazy var insertAction: (() -> Void)? = { [weak self] in
2327
guard let strongSelf = self else { return }
2428
let page = SlideLifeCycleObjectBuilder<ColorPageLifeCycleObject>()
25-
let index = strongSelf.slideController.content.count == 0 ? 0 : strongSelf.slideController.content.count - 1
29+
guard let index = strongSelf.slideController.content
30+
.index(where: { strongSelf.slideController.currentModel === $0 }) else {
31+
return
32+
}
2633
strongSelf.slideController.insert(object: page, index: index)
2734
}
2835

0 commit comments

Comments
 (0)