prepare the reuse of dropdownButton from ToSelectElement

pharo-graphics · Oct 27, 2024 · e362838 · e362838
1 parent b1d4032
commit e362838
Show file tree

Hide file tree

Showing 5 changed files with 104 additions and 57 deletions.
diff --git a/src/BaselineOfToplo/BaselineOfToplo.class.st b/src/BaselineOfToplo/BaselineOfToplo.class.st
@@ -134,7 +134,7 @@ BaselineOfToplo >> registerPackages: spec [
 			   #'Toplo-Widget-Menu' #'Toplo-Widget-Pane' #'Toplo-Widget-Segmented' ) ].
 
 	spec package: #'Toplo-Widget-Select' with: [
-		spec requires: #( #Toplo #'Toplo-Widget-List' #'Toplo-Widget-Album'
+		spec requires: #( #Toplo #'Toplo-Widget-DropdownButton' #'Toplo-Widget-List' #'Toplo-Widget-Album'
 			   #'Toplo-Widget-Button' #'Toplo-Widget-Image'
 			   #'Toplo-Widget-Menu' #'Toplo-Widget-Tag' #'Toplo-Theme' ) ].
 

diff --git a/src/Toplo-Widget-DropdownButton/TToDropdownInnerContainerElement.trait.st b/src/Toplo-Widget-DropdownButton/TToDropdownInnerContainerElement.trait.st
@@ -0,0 +1,44 @@
+Trait {
+	#name : #TToDropdownInnerContainerElement,
+	#category : #'Toplo-Widget-DropdownButton'
+}
+
+{ #category : #'t - dropdown inner container' }
+TToDropdownInnerContainerElement >> dropdownButton [ 
+
+	^ self explicitRequirement 
+]
+
+{ #category : #'t - dropdown inner container' }
+TToDropdownInnerContainerElement >> dropdownButton: aDropdownButton [
+
+	^ self explicitRequirement 
+]
+
+{ #category : #'t - dropdown inner container' }
+TToDropdownInnerContainerElement >> onSelectionChangedInPopupListElement: anEvent [
+
+	self refreshFromPopupListSelection.
+	self requestLayout
+]
+
+{ #category : #'t - dropdown inner container' }
+TToDropdownInnerContainerElement >> popupWindowManager [
+
+	^ self dropdownButton popupWindowManager
+]
+
+{ #category : #'t - dropdown inner container' }
+TToDropdownInnerContainerElement >> refreshFromPopupListSelection [
+
+	^ self explicitRequirement 
+]
+
+{ #category : #'t - dropdown inner container' }
+TToDropdownInnerContainerElement >> windowManager [
+
+	self
+		deprecated: 'Use #popupWindowManager'
+		transformWith: '`@rcvr windowManager' -> '`@rcvr popupWindowManager'.
+	^ self selectElement popupWindowManager
+]
diff --git a/src/Toplo-Widget-Select/TToSelectInnerContainerElement.trait.st b/src/Toplo-Widget-Select/TToSelectInnerContainerElement.trait.st
@@ -37,42 +37,21 @@ TToSelectInnerContainerElement >> newFilterTextField [
 	^ ToSelectFilterTextField new on: self selectElement
 ]
 
-{ #category : #'t - select inner container' }
-TToSelectInnerContainerElement >> onSelectionChangedInPopupListElement: anEvent [
-
-	self refreshFromPopupListSelection.
-	self requestLayout
-]
-
-{ #category : #'t - select inner container' }
-TToSelectInnerContainerElement >> popupWindowManager [
-
-	^ self selectElement popupWindowManager
-]
-
-{ #category : #'t - select inner container' }
-TToSelectInnerContainerElement >> refreshFromPopupListSelection [
-
-	^ self explicitRequirement 
-]
-
 { #category : #'t - select inner container' }
 TToSelectInnerContainerElement >> selectElement [
 
-	^ self explicitRequirement 
+	self
+		deprecated: 'Use #dropdownButton instead'
+		transformWith: '`@rcvr selectElement' -> '`@rcvr dropdownButton'.
+	^ self dropdownButton
 ]
 
 { #category : #'t - select inner container' }
 TToSelectInnerContainerElement >> selectElement: aSelectElement [
 
-	self explicitRequirement 
-]
-
-{ #category : #'t - select inner container' }
-TToSelectInnerContainerElement >> windowManager [
-
 	self
-		deprecated: 'Use #popupWindowManager'
-		transformWith: '`@rcvr windowManager' -> '`@rcvr popupWindowManager'.
-	^ self selectElement popupWindowManager
+		deprecated: 'Use #dropdownButton: instead'
+		transformWith: '`@rcvr selectElement: `@arg' -> '`@rcvr dropdownButton: `@arg'.
+	self dropdownButton: aSelectElement
+
 ]
diff --git a/src/Toplo-Widget-Select/ToMultiSelectBarElement.class.st b/src/Toplo-Widget-Select/ToMultiSelectBarElement.class.st
@@ -1,14 +1,14 @@
 Class {
 	#name : #ToMultiSelectBarElement,
 	#superclass : #ToTagBarElement,
-	#traits : 'TToSelectInnerContainerElement',
-	#classTraits : 'TToSelectInnerContainerElement classTrait',
+	#traits : 'TToDropdownInnerContainerElement + TToSelectInnerContainerElement',
+	#classTraits : 'TToDropdownInnerContainerElement classTrait + TToSelectInnerContainerElement classTrait',
 	#instVars : [
-		'selectElement',
 		'maxSelectedCount',
 		'keepPickOrder',
 		'pickCount',
-		'filterTextField'
+		'filterTextField',
+		'dropdownButton'
 	],
 	#category : #'Toplo-Widget-Select-Multi'
 }
@@ -30,7 +30,7 @@ ToMultiSelectBarElement >> assertMaxSelectedCount: aNumber [
 { #category : #'accessing - selection' }
 ToMultiSelectBarElement >> checkHideSelectionFromListElement [
 
-	selectElement hideSelected ifFalse: [ ^ self ].
+	dropdownButton hideSelected ifFalse: [ ^ self ].
 	self popupListElement hideSelection
 ]
 
@@ -44,26 +44,38 @@ ToMultiSelectBarElement >> checkMaxSelectedCount [
 	groupeSM := self popupListElement groupSelectionModel.
 	sM := self popupListElement selectionModel.
 
-	selectElement updateSelectedCountLabel.
-	selectedCount := selectElement selectionModel selectedIndexesCount.
+	dropdownButton updateSelectedCountLabel.
+	selectedCount := dropdownButton selectionModel selectedIndexesCount.
 
 	"self assertMaxSelectedCount: selectedIndexCount."
 	self sieve withLocalAndOriginalIndexDo: [ :d :localIndex :originalIndex |
 		(groupeSM containsIndex: localIndex) ifFalse: [
 			selectedCount < maxSelectedCount
 				ifTrue: [ disabledSM deselectIndex: localIndex ]
 				ifFalse: [
-					(selectElement selectionModel containsIndex: originalIndex)
+					(dropdownButton selectionModel containsIndex: originalIndex)
 						ifFalse: [ disabledSM selectIndex: localIndex ] ].
 			" to transfer the selection to the sieve selection model "
 			sM
 				transferSelectionFromIndex: localIndex
 				toIndex: originalIndex
-				in: selectElement selectionModel ] ].
+				in: dropdownButton selectionModel ] ].
 
 	self popupListElement notifyDataSourceChanged
 ]
 
+{ #category : #'t - dropdown inner container' }
+ToMultiSelectBarElement >> dropdownButton [ 
+
+	^ dropdownButton 
+]
+
+{ #category : #'t - dropdown inner container' }
+ToMultiSelectBarElement >> dropdownButton: aDropdownButton [
+
+	dropdownButton := aDropdownButton
+]
+
 { #category : #layout }
 ToMultiSelectBarElement >> extentChanged [
 
@@ -160,7 +172,7 @@ ToMultiSelectBarElement >> maxSelectedCount: aNumber [
 ToMultiSelectBarElement >> popupListElement [
 
 
-	^ selectElement popupListElement
+	^ dropdownButton popupListElement
 ]
 
 { #category : #'t - select inner container' }
@@ -178,7 +190,7 @@ ToMultiSelectBarElement >> refreshFromPopupListSelection [
 	" rebuild the current bar nodes according to the selection in the popup list "
 
 	| previousTagModels newTagModels |
-	selectElement showHidePlaceholder.
+	dropdownButton showHidePlaceholder.
 	" copy the previous tag models "
 	previousTagModels := self dataAccessor asOrderedCollection.
 	newTagModels := OrderedCollection new.
@@ -191,9 +203,9 @@ ToMultiSelectBarElement >> refreshFromPopupListSelection [
 			previousTagModels addAll: last items ] ].
 
 	" reconstruct the item list. ensure the reuse of pre-existing items"
-	selectElement selectionModel selectedIndexesDo: [ :idx |
+	dropdownButton selectionModel selectedIndexesDo: [ :idx |
 		| new previous data |
-		data := selectElement sieve originalData at: idx.
+		data := dropdownButton sieve originalData at: idx.
 		previous := previousTagModels
 			            detect: [ :item | item data = data ]
 			            ifNone: [  ].
@@ -221,17 +233,17 @@ ToMultiSelectBarElement >> refreshFromPopupListSelection [
 { #category : #'t - select inner container' }
 ToMultiSelectBarElement >> selectElement [
 
-	^ selectElement
+	^ dropdownButton
 ]
 
 { #category : #'t - select inner container' }
 ToMultiSelectBarElement >> selectElement: aSelectElement [
 
-	selectElement := aSelectElement
+	dropdownButton := aSelectElement
 ]
 
 { #category : #accessing }
 ToMultiSelectBarElement >> sieve [
 
-	^ selectElement sieve
+	^ dropdownButton sieve
 ]
diff --git a/src/Toplo-Widget-Select/ToSingleSelectInnerContainerElement.class.st b/src/Toplo-Widget-Select/ToSingleSelectInnerContainerElement.class.st
@@ -1,17 +1,17 @@
 Class {
 	#name : #ToSingleSelectInnerContainerElement,
 	#superclass : #ToElement,
-	#traits : 'TToSelectInnerContainerElement',
-	#classTraits : 'TToSelectInnerContainerElement classTrait',
+	#traits : 'TToDropdownInnerContainerElement + TToSelectInnerContainerElement',
+	#classTraits : 'TToDropdownInnerContainerElement classTrait + TToSelectInnerContainerElement classTrait',
 	#instVars : [
-		'selectElement',
 		'fakeDataView',
 		'dataView',
 		'dataViewFactory',
 		'dataViewBuilder',
 		'fakeDataItem',
 		'currentSelectedIndex',
-		'filterTextField'
+		'filterTextField',
+		'dropdownButton'
 	],
 	#category : #'Toplo-Widget-Select-Single'
 }
@@ -46,6 +46,18 @@ ToSingleSelectInnerContainerElement >> defaultLayout [
 	^ BlLinearLayout horizontal
 ]
 
+{ #category : #'t - dropdown inner container' }
+ToSingleSelectInnerContainerElement >> dropdownButton [ 
+
+	^ dropdownButton 
+]
+
+{ #category : #'t - dropdown inner container' }
+ToSingleSelectInnerContainerElement >> dropdownButton: aDropdownButton [
+
+	dropdownButton := aDropdownButton
+]
+
 { #category : #accessing }
 ToSingleSelectInnerContainerElement >> fakeDataItem: aData [
 
@@ -74,8 +86,8 @@ ToSingleSelectInnerContainerElement >> initialize [
 		hMatchParent;
 		constraintsDo: [ :c | c linear vertical alignCenter ].
 
-	dataViewFactory := selectElement defaultDataViewFactory.
-	dataViewBuilder := selectElement defaultDataViewBuilder.
+	dataViewFactory := dropdownButton defaultDataViewFactory.
+	dataViewBuilder := dropdownButton defaultDataViewBuilder.
 
 	self installDataView.
 	self installFakeDataView.
@@ -129,10 +141,10 @@ ToSingleSelectInnerContainerElement >> refresh [
 ToSingleSelectInnerContainerElement >> refreshFromPopupListSelection [
 
 	| selectedIndex dataItem selectionModel originalData changedEvent |
-	selectElement showHidePlaceholder.
+	dropdownButton showHidePlaceholder.
 
 	" No data to select from, just do nothing here "
-	selectElement popupListElement dataAccessor ifEmpty: [ ^ self ].
+	dropdownButton popupListElement dataAccessor ifEmpty: [ ^ self ].
 
 	selectionModel := self popupWindowManager sieve selectionModel.
 	originalData := self popupWindowManager sieve originalData.
@@ -155,7 +167,7 @@ ToSingleSelectInnerContainerElement >> refreshFromPopupListSelection [
 	changedEvent := ToSelectChangedEvent new.
 	changedEvent selectedData: dataItem.
 	changedEvent selectedIndex: selectedIndex.
-	selectElement dispatchEvent: changedEvent
+	dropdownButton dispatchEvent: changedEvent
 ]
 
 { #category : #initialization }
@@ -175,13 +187,13 @@ ToSingleSelectInnerContainerElement >> sample: aDataItem [
 { #category : #'t - select inner container' }
 ToSingleSelectInnerContainerElement >> selectElement [
 
-	^ selectElement
+	^ dropdownButton
 ]
 
 { #category : #'t - select inner container' }
 ToSingleSelectInnerContainerElement >> selectElement: aSelectElement [
 
-	selectElement := aSelectElement
+	dropdownButton := aSelectElement
 ]
 
 { #category : #initialization }