remove ToObservableCollectionFilterResultEvent, replaced by a resultA…

…ction in ToObservableCollectionFilter
pharo-graphics · Oct 25, 2024 · 5e9469e · 5e9469e
1 parent e235ab5
commit 5e9469e
Show file tree

Hide file tree

Showing 13 changed files with 129 additions and 139 deletions.
diff --git a/src/Toplo-Examples/ToSandBox.class.st b/src/Toplo-Examples/ToSandBox.class.st
@@ -927,6 +927,9 @@ ToSandBox class >> example_EditorWithoutSoftLine [
 { #category : #list }
 ToSandBox class >> example_FilterOnList2WithStatesOfAmerica [
 
+	" When filtered, update the primary selection with filtered items 
+	 - the contents of the list remains unchanged"
+
 	| listElement pane filterField data selector |
 	pane := ToPane new
 		        beVertical;
@@ -939,6 +942,8 @@ ToSandBox class >> example_FilterOnList2WithStatesOfAmerica [
 	filterField margin: (BlInsets all: 2).
 
 	selector := ToObservableCollectionFilter new.
+	selector applicationResultAction: [
+		listElement selecter selectOnlyIndexes: selector selectedIndexes ].
 	listElement dataAccessor addAll: data.
 
 	selector onInstalledIn: listElement dataAccessor.
@@ -950,16 +955,12 @@ ToSandBox class >> example_FilterOnList2WithStatesOfAmerica [
 				 pattern := filterField text asString.
 				 selector pattern: pattern ]).
 
-	listElement dataAccessor addEventHandler: (BlEventHandler
-			 on: ToObservableCollectionFilterResultEvent
-			 do: [ :event |
-				 listElement selecter selectOnlyIndexes:
-					 event filter selectedIndexes ]).
-
 	listElement placeholderBuilder: [ :ph :e |
 		| lab |
-		lab := (ToLabel text: 'No Data') foreground: Color lightGray;
-				        fontSize: 24; yourself.
+		lab := (ToLabel text: 'No Data')
+			       foreground: Color lightGray;
+			       fontSize: 24;
+			       yourself.
 		lab matchParent.
 		ph addChild: lab ].
 
@@ -1904,7 +1905,6 @@ ToSandBox class >> example_SelectMultiFiltrable [
 
 	| select innerWindow newTagFactory |
 	select := ToMultiSelectElement new.
-	select inspect.
 	select nodeWrapping: true.
 	select keepPickOrder: true.
 	select popupListElement selectionOption grouped: false.

diff --git a/src/Toplo-Widget-DropdownButton/ToDropdownEventHandler.class.st b/src/Toplo-Widget-DropdownButton/ToDropdownEventHandler.class.st
@@ -0,0 +1,29 @@
+Class {
+	#name : #ToDropdownEventHandler,
+	#superclass : #ToElementWithPopupEventHandler,
+	#category : #'Toplo-Widget-DropdownButton'
+}
+
+{ #category : #'event handling' }
+ToDropdownEventHandler >> elementAddedToSceneGraphEvent: anEvent [
+
+	| select |
+	select := anEvent currentTarget.
+	select refresh 
+]
+
+{ #category : #'element handlers' }
+ToDropdownEventHandler >> elementExtentChangedEvent: anEvent [
+
+	windowManager currentWindow ifNil: [ ^ self ].
+	windowManager applyPositionHookFromEvent: anEvent.
+	windowManager applySizeHookFromEvent: anEvent
+]
+
+{ #category : #'api - accessing' }
+ToDropdownEventHandler >> eventsToHandle [
+
+	^ super eventsToHandle , {
+		  BlElementAddedToSceneGraphEvent.
+		  BlElementExtentChangedEvent }
+]
diff --git a/src/Toplo-Widget-DropdownButton/ToDropdownPopupWindowManager.class.st b/src/Toplo-Widget-DropdownButton/ToDropdownPopupWindowManager.class.st
@@ -19,12 +19,6 @@ ToDropdownPopupWindowManager >> defaultAutoClosePickOutsideEventClass [
 	^ BlMouseDownOutsideEvent
 ]
 
-{ #category : #'api - hooks' }
-ToDropdownPopupWindowManager >> defaultListElementEventHandler [ 
-
-	^ ToSelectListElementEventHandler new
-]
-
 { #category : #initialization }
 ToDropdownPopupWindowManager >> defaultMaxHeight [
 
@@ -47,7 +41,7 @@ ToDropdownPopupWindowManager >> defaultSizeHook [
 { #category : #accessing }
 ToDropdownPopupWindowManager >> elementEventHandlerClass [ 
 
-	^ ToSelectEventHandler
+	^ ToDropdownEventHandler
 ]
 
 { #category : #accessing }
@@ -107,11 +101,6 @@ ToDropdownPopupWindowManager >> onInstalledIn: anElement [
 	listElement := self newListElement.
 	listElement selectElement: self element.
 	listElement focusability: BlFocusability none.
-
-	listElement addEventHandler: (self defaultListElementEventHandler
-			 select: self element;
-			 yourself).
-
 	self builder: [ :selectWin :request |
 		selectWin root hMatchParent.
 		selectWin root vFitContent.

diff --git a/src/Toplo-Widget-List/ToAbstractListElement.class.st b/src/Toplo-Widget-List/ToAbstractListElement.class.st
@@ -394,6 +394,13 @@ ToAbstractListElement >> offsetPositionRecordsForFilter: aStartPosition itemCoun
 ToAbstractListElement >> onScrolled: aPoint [
 ]
 
+{ #category : #'private - commands' }
+ToAbstractListElement >> onSievedWith: aSieve [
+
+	self dataAccessor onSievedWith: aSieve.
+	self requestLayout
+]
+
 { #category : #'t - element with placeholder' }
 ToAbstractListElement >> placeholderElevation [
 
@@ -511,12 +518,6 @@ ToAbstractListElement >> selectionOption [
 	^ self primarySelectionMode selectionOption
 ]
 
-{ #category : #'private - commands' }
-ToAbstractListElement >> sieveResultWith: aSieve [
-
-	self dataAccessor sieveResultWith: aSieve
-]
-
 { #category : #'accessing selecters' }
 ToAbstractListElement >> unselectableSelecter [
 

diff --git a/src/Toplo-Widget-List/ToListElementSieve.class.st b/src/Toplo-Widget-List/ToListElementSieve.class.st
@@ -10,7 +10,6 @@ Class {
 		'selectionModel',
 		'selecter',
 		'selectionHandler',
-		'sharedHandler',
 		'eventDispatcher',
 		'originalIndexMap',
 		'sieveEventHandler',
@@ -64,34 +63,34 @@ ToListElementSieve >> onInstalledIn: aListElement [
 	selectionModel := aListElement selectionModel copy.
 
 	originalData := aListElement dataAccessor newMirror.
+
 	queryRunner := ToObservableCollectionFilter new.
+	" When a query has occured (because the query pattern has changed), update the list element accordingly then
+	 ask the list to process the appropiate data source command and to update the selection model "
+	queryRunner applicationResultAction: [
+		self updateCurrentData.
+		aListElement onSievedWith: self ].	
 	queryRunner onInstalledIn: originalData.
 
 	" initialization of the current result with the current pattern "
 	self updateCurrentData.
-	sharedHandler := BlSharedEventDistributor new.
-	sharedHandler shareEvents:
-		{ ToObservableCollectionFilterResultEvent }.
-	originalData addEventHandler: sharedHandler.
-	aListElement addEventHandler: sharedHandler.
-
 	selectionHandler := ToSievedListElementEventHandler new.
 	selectionHandler sieve: self.
 	aListElement addEventHandler: selectionHandler.
 
 	sieveEventHandler := ToSieveEventHandler new
 		                     listElement: aListElement;
 		                     yourself.
+	" selectionChangedEventClass: is needed to update the selection 
+	of the list when the selecter is used programmatically.
+	This is the case when a tag in a ToSelect is removed from its remove button"
 	selecter := ToSieveSelecter new
 		            selectionModel: self selectionModel;
 		            selectionChangedEventClass:
 			            ToListPrimarySelectionChangedEvent;
+		            multiple: aListElement isMultipleSelection;
 		            yourself.
 	selecter onInstalledIn: self.
-	selecter
-		enabled: true;
-		multiple: aListElement isMultipleSelection.
-
 	self addEventHandler: sieveEventHandler
 ]
 
@@ -101,13 +100,10 @@ ToListElementSieve >> onUninstalledIn: aListElement [
 
 	aListElement removeEventHandler: selectionHandler.
 	queryRunner onUninstalledIn: originalData.
-	originalData removeEventHandler: sharedHandler.
-	aListElement removeEventHandler: sharedHandler.
 	self removeEventHandler: sieveEventHandler.
 	self removeEventHandler: commandEventHandler.
 	sieveEventHandler := nil.
 	commandEventHandler := nil.
-	sharedHandler := nil.
 	originalData unmirrored.
 	originalData := nil.
 	currentData := nil.

diff --git a/src/Toplo-Widget-List/ToListSelecter.class.st b/src/Toplo-Widget-List/ToListSelecter.class.st
@@ -32,7 +32,7 @@ ToListSelecter >> applyCommand: aCommand [
 	previousModel := selectionModel copy.
 	aCommand applyWithOperator: operator.
 	previousModel = aCommand selectionModel ifTrue: [ ^ self ].
-	self commandApplied: aCommand
+	self onCommandApplied: aCommand
 ]
 
 { #category : #accessing }
@@ -53,25 +53,6 @@ ToListSelecter >> commandApplicationStrategy: aCommandApplicationStrategy [
 	commandApplicationStrategy := aCommandApplicationStrategy
 ]
 
-{ #category : #'command application' }
-ToListSelecter >> commandApplied: aCommand [
-
-	| req |
-	selectionChangedEventClass ifNil: [ ^ self ].
-
-	req := ToListSelectionCommandAppliedEvent new
-		       command: aCommand;
-		       requestedAction: [
-			       element dispatchEvent: (selectionChangedEventClass new
-						        selectionModel: aCommand selectionModel;
-						        touchedIntervals: aCommand intervals;
-						        selectionOption: self selectionOption;
-						        yourself) ];
-		       yourself.
-
-	element dispatchAuthorisationRequest: req
-]
-
 { #category : #testing }
 ToListSelecter >> containsIndex: anIndex [
 
@@ -260,6 +241,25 @@ ToListSelecter >> nextSelectableIndexToScrollTo [
 				  ifFalse: [ 0 ] ]
 ]
 
+{ #category : #'command application' }
+ToListSelecter >> onCommandApplied: aCommand [
+
+	| req |
+	selectionChangedEventClass ifNil: [ ^ self ].
+
+	req := ToListSelectionCommandAppliedEvent new
+		       command: aCommand;
+		       requestedAction: [
+			       element dispatchEvent: (selectionChangedEventClass new
+						        selectionModel: aCommand selectionModel;
+						        touchedIntervals: aCommand intervals;
+						        selectionOption: self selectionOption;
+						        yourself) ];
+		       yourself.
+
+	element dispatchAuthorisationRequest: req
+]
+
 { #category : #'api - hooks' }
 ToListSelecter >> onInstalledIn: anElement [
 
@@ -514,5 +514,6 @@ ToListSelecter >> switchIndexSelection: anIndex [
 ToListSelecter >> updateSelection [
 
 	self selectionModel deselectAll.
+	element ifNil: [ ^ self ].
 	element updateAllSelections
 ]
diff --git a/src/Toplo-Widget-List/ToSievedListElementEventHandler.class.st b/src/Toplo-Widget-List/ToSievedListElementEventHandler.class.st
@@ -23,7 +23,7 @@ ToSievedListElementEventHandler >> buildOriginalIndexMapFrom: aListElement [
 ToSievedListElementEventHandler >> eventsToHandle [
 
 	^ {
-		  ToObservableCollectionFilterResultEvent.
+		 " ToObservableCollectionFilterResultEvent."
 		  BlInfiniteDataSourceChanged.
 		  BlInfiniteDataSourceItemRangeChanged.
 		  BlInfiniteDataSourceItemRangeInserted.
@@ -103,20 +103,6 @@ ToSievedListElementEventHandler >> listSelectionCommandAppliedEvent: aPreNotific
 			 yourself)
 ]
 
-{ #category : #'element handlers' }
-ToSievedListElementEventHandler >> observableCollectionFilterResultEvent: anEvent [
-
-
-	| listElement |
-	listElement := anEvent currentTarget.
-
-	" a query has occured (because the query pattern has changed), update the list element accordingly "
-	sieve updateCurrentData.
-
-	" ask the list to process the appropiate data source command and to update the selection model"
-	listElement sieveResultWith: sieve
-]
-
 { #category : #'api - hooks' }
 ToSievedListElementEventHandler >> onInstalledIn: aListElement [
 

diff --git a/src/Toplo-Widget-Select/ToSelectListElement.class.st b/src/Toplo-Widget-Select/ToSelectListElement.class.st
@@ -7,7 +7,7 @@ Class {
 	#category : #'Toplo-Widget-Select-List'
 }
 
-{ #category : #'as yet unclassified' }
+{ #category : #'private - commands' }
 ToSelectListElement >> applyDataSourceSieveCommand: aDataSourceCommand [
 	" update the selection according to the sieve selection model"
 
@@ -19,19 +19,19 @@ ToSelectListElement >> applyDataSourceSieveCommand: aDataSourceCommand [
 		w visibility: BlVisibility visible ]
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #accessing }
 ToSelectListElement >> groupSelecter [
 
 	^ self groupSelectionMode selecter
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #accessing }
 ToSelectListElement >> groupSelectionMode [
 
 	^ self selectionModeWithEventClass: ToSelectGroupSelectionChangedEvent
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #accessing }
 ToSelectListElement >> groupSelectionModel [
 
 	^ self groupSelecter selectionModel
@@ -47,7 +47,7 @@ ToSelectListElement >> initialize [
 	self primarySelectionMode makeDisabledUnselectable: true
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #accessing }
 ToSelectListElement >> newGroupSelectionMode [
 
 	^ ToSelectListGroupSelectionMode parentMode: self primarySelectionMode
@@ -59,19 +59,19 @@ ToSelectListElement >> newRawSkin [
 	^ ToBasicListElementSkin new
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #accessing }
 ToSelectListElement >> selectElement [
 
 	^ selectElement 
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #accessing }
 ToSelectListElement >> selectElement: aSelectElement [
 
 	selectElement := aSelectElement
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #accessing }
 ToSelectListElement >> sieve [
 
 	^ selectElement sieve

diff --git a/src/Toplo-Widget-Select/ToSingleSelectInnerContainerElement.class.st b/src/Toplo-Widget-Select/ToSingleSelectInnerContainerElement.class.st
@@ -133,15 +133,17 @@ ToSingleSelectInnerContainerElement >> refreshFromPopupListSelection [
 
 	" No data to select from, just do nothing here "
 	selectElement popupListElement dataAccessor ifEmpty: [ ^ self ].
-	
+
 	selectionModel := self popupWindowManager sieve selectionModel.
 	originalData := self popupWindowManager sieve originalData.
 	selectedIndex := selectionModel isEmpty
 		                 ifTrue: [ 0 ]
 		                 ifFalse: [ selectionModel firstIndex ].
 
+	selectedIndex isZero ifFalse: [
+		self filterTextField text: '' asRopedText ].
+	currentSelectedIndex = selectedIndex ifTrue: [ ^ self ].
 	currentSelectedIndex := selectedIndex.
-	self filterTextField text: '' asRopedText.
 
 	dataView removeChildren.