Fix notebook page closing tests + add tests

src/Toplo-Incubator/ToNotebook.class.st

@@ -129,7 +129,9 @@ ToNotebook >> refreshOnPageIsCloseableChange: aPage [
 			| but |
 			but := ToButton new.
 			but icon: (ToImage new innerImage: (Smalltalk ui icons iconNamed: #windowClose)).
-			but whenClickedDo: [ self removePage: aPage ].
+			but whenClickedDo: [ :evt |
+				evt consumed: true.
+				self removePage: aPage ].
 			aPage titleElement addChild: but as: #closeButton ]
 		ifFalse: [
 			aPage titleElement removeChildNamed: #closeButton ]
@@ -157,17 +159,20 @@ ToNotebook >> removeBodyElement [
 { #category : #api }
 ToNotebook >> removePage: aPage [
 
-	aPage isSelected ifTrue: [
-		aPage isSelected: false ].
-
+	| pageIndex |
+	aPage isSelected ifTrue: [ 
+		pageIndex := pages indexOf: aPage ].
 	header removeChild: aPage titleElement.
-
-	self flag: #todo. "Unsubscribe from aPage"
-
+	aPage isSelected: false.
 	pages remove: aPage.
+	self flag: #todo. "Unsubscribe from aPage"
+
+	pageIndex ifNil: [ ^self ].
+	pages ifEmpty: [ ^self ].
 
-	(selectedPage isNil and: [ pages isNotEmpty ])
-		ifTrue: [ pages last isSelected: true ]
+	((pages size < pageIndex)
+		ifTrue: [ pages last ]
+		ifFalse: [ pages at: pageIndex ]) isSelected: true
 ]
 
 { #category : #api }

src/Toplo-Incubator/ToNotebookTest.class.st

@@ -56,7 +56,28 @@ ToNotebookTest >> testBodyFactoryIsValuedOnSelect [
 ]
 
 { #category : #tests }
-ToNotebookTest >> testClosePage [
+ToNotebookTest >> testCloseLastPage [
+
+	| redPage |
+	redPage := notebook
+		addPageTitle: 'Red'
+		body: (BlElement new
+			background: Color red;
+			yourself).
+	redPage isCloseable: true.
+
+	self waitTestingSpaces.
+	self assert: (notebook pages includes: redPage).
+	self assert: redPage isSelected.
+
+	BlSpace simulateClickOn: redPage closeButton.
+	self waitTestingSpaces.
+	self assert: notebook pages isEmpty.
+
+]
+
+{ #category : #tests }
+ToNotebookTest >> testCloseSelectedPage [
 
 	| redPage greenPage |
 	redPage := notebook
@@ -74,6 +95,7 @@ ToNotebookTest >> testClosePage [
 
 	self waitTestingSpaces.
 	self assert: (notebook pages includes: redPage).
+	self assert: redPage isSelected.
 
 	BlSpace simulateClickOn: redPage closeButton.
 	self waitTestingSpaces.
@@ -82,6 +104,35 @@ ToNotebookTest >> testClosePage [
 
 ]
 
+{ #category : #tests }
+ToNotebookTest >> testCloseUnselectedPage [
+
+	| redPage greenPage |
+	redPage := notebook
+		addPageTitle: 'Red'
+		body: (BlElement new
+			background: Color red;
+			yourself).
+	redPage isCloseable: true.
+
+	greenPage := notebook
+		addPageTitle: 'Green'
+		body: (BlElement new
+			background: Color green;
+			yourself).
+	greenPage isCloseable: true.
+
+	self waitTestingSpaces.
+	self assert: (notebook pages includes: redPage).
+	self assert: redPage isSelected.
+
+	BlSpace simulateClickOn: greenPage closeButton.
+	self waitTestingSpaces.
+	self deny: (notebook pages includes: greenPage).
+	self assert: redPage isSelected.
+
+]
+
 { #category : #tests }
 ToNotebookTest >> testDefaultBodyIsTransparent [