luisgulo/focalboard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed sorting icons (#611)

Browse source
This commit is contained in:
Harshil Sharma 2021-06-23 13:43:41 +05:30 committed by GitHub
parent 1021b199a8
commit 0b38fc4f98
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
webapp/src/components/table/__snapshots__/table.test.tsx.snap
View file

@ -43,7 +43,7 @@ exports[`components/table/Table should match snapshot 1`] = `
>
Property 1
<svg
class="SortUpIcon Icon"
class="SortDownIcon Icon"
viewBox="0 0 100 100"
xmlns="http://www.w3.org/2000/svg"
>
@ -51,7 +51,7 @@ exports[`components/table/Table should match snapshot 1`] = `
points="50,20 50,80"
/>
<polyline
points="30,40 50,20 70,40"
points="30,60 50,80 70,60"
/>
</svg>
</span>
@ -77,7 +77,7 @@ exports[`components/table/Table should match snapshot 1`] = `
>
Property 2
<svg
class="SortDownIcon Icon"
class="SortUpIcon Icon"
viewBox="0 0 100 100"
xmlns="http://www.w3.org/2000/svg"
>
@ -85,7 +85,7 @@ exports[`components/table/Table should match snapshot 1`] = `
points="50,20 50,80"
/>
<polyline
points="30,60 50,80 70,60"
points="30,40 50,20 70,40"
/>
</svg>
</span>
@ -225,7 +225,7 @@ exports[`components/table/Table should match snapshot with GroupBy 1`] = `
>
Property 1
<svg
class="SortUpIcon Icon"
class="SortDownIcon Icon"
viewBox="0 0 100 100"
xmlns="http://www.w3.org/2000/svg"
>
@ -233,7 +233,7 @@ exports[`components/table/Table should match snapshot with GroupBy 1`] = `
points="50,20 50,80"
/>
<polyline
points="30,40 50,20 70,40"
points="30,60 50,80 70,60"
/>
</svg>
</span>
@ -259,7 +259,7 @@ exports[`components/table/Table should match snapshot with GroupBy 1`] = `
>
Property 2
<svg
class="SortDownIcon Icon"
class="SortUpIcon Icon"
viewBox="0 0 100 100"
xmlns="http://www.w3.org/2000/svg"
>
@ -267,7 +267,7 @@ exports[`components/table/Table should match snapshot with GroupBy 1`] = `
points="50,20 50,80"
/>
<polyline
points="30,60 50,80 70,60"
points="30,40 50,20 70,40"
/>
</svg>
</span>
@ -390,7 +390,7 @@ exports[`components/table/Table should match snapshot, read-only 1`] = `
>
Property 1
<svg
class="SortUpIcon Icon"
class="SortDownIcon Icon"
viewBox="0 0 100 100"
xmlns="http://www.w3.org/2000/svg"
>
@ -398,7 +398,7 @@ exports[`components/table/Table should match snapshot, read-only 1`] = `
points="50,20 50,80"
/>
<polyline
points="30,40 50,20 70,40"
points="30,60 50,80 70,60"
/>
</svg>
</span>
@ -420,7 +420,7 @@ exports[`components/table/Table should match snapshot, read-only 1`] = `
>
Property 2
<svg
class="SortDownIcon Icon"
class="SortUpIcon Icon"
viewBox="0 0 100 100"
xmlns="http://www.w3.org/2000/svg"
>
@ -428,7 +428,7 @@ exports[`components/table/Table should match snapshot, read-only 1`] = `
points="50,20 50,80"
/>
<polyline
points="30,60 50,80 70,60"
points="30,40 50,20 70,40"
/>
</svg>
</span>

4
webapp/src/components/table/table.tsx
View file

@ -215,7 +215,7 @@ const Table = (props: Props) => {
const titleSortOption = activeView.sortOptions.find((o) => o.propertyId === Constants.titleColumnId)
let titleSorted: 'up' | 'down' | 'none' = 'none'
if (titleSortOption) {
titleSorted = titleSortOption.reversed ? 'up' : 'down'
titleSorted = titleSortOption.reversed ? 'down' : 'up'
}
return (
@ -253,7 +253,7 @@ const Table = (props: Props) => {
let sorted: 'up' | 'down' | 'none' = 'none'
const sortOption = activeView.sortOptions.find((o) => o.propertyId === template.id)
if (sortOption) {
sorted = sortOption.reversed ? 'up' : 'down'
sorted = sortOption.reversed ? 'down' : 'up'
}
return (

2
webapp/src/components/viewHeader/viewHeaderSortMenu.tsx
View file

@ -66,7 +66,7 @@ const ViewHeaderSortMenu = React.memo((props: Props) => {
if (activeView.sortOptions.length > 0) {
const sortOption = activeView.sortOptions[0]
if (sortOption.propertyId === option.id) {
rightIcon = sortOption.reversed ? <SortUpIcon/> : <SortDownIcon/>
rightIcon = sortOption.reversed ? <SortDownIcon/> : <SortUpIcon/>
}
}
return (