huanld/speckle-server
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

feat(viewer): proper filter resetting for colors

Browse Source
This commit is contained in:
Dimitrie Stefanescu
2022-08-23 08:20:49 +03:00
parent 6e7c55c2d5
commit e5fe470044
1 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/viewer/src/modules/filtering/FilteringManager.ts
+4 -13
View File
@@ -171,22 +171,18 @@ export class FilteringManager {
public setColorFilter(prop: PropertyInfo) {
if (prop.type === 'number') {
this.ColorStringFilterState = null
this.ColorNumericFilterState = new ColorNumericFilterState()
return this.setNumericColorFilter(prop as NumericPropertyInfo)
}
if (prop.type === 'string') {
this.ColorNumericFilterState = null
this.ColorStringFilterState = new ColorStringFilterState()
return this.setStringColorFilter(prop as StringPropertyInfo)
}
}
private setNumericColorFilter(numProp: NumericPropertyInfo) {
this.ColorStringFilterState = null
// if (
// this.ColorNumericFilterState?.currentProp?.key === numProp.key &&
// this.ColorNumericFilterState?.currentProp?.passMin === numProp.passMin &&
// this.ColorNumericFilterState?.currentProp?.passMax === numProp.passMax
// ) {
// return this.setFilters()
// }
this.ColorNumericFilterState.currentProp = numProp
const passMin = numProp.passMin || numProp.min
@@ -222,11 +218,6 @@ export class FilteringManager {
}
private setStringColorFilter(stringProp: StringPropertyInfo) {
this.ColorNumericFilterState = null
if (this.ColorStringFilterState?.currentProp?.key === stringProp.key) {
return this.setFilters()
}
this.ColorStringFilterState.currentProp = stringProp
const valueGroupColors: ValueGroupColorItemStringProps[] = []