Merge remote-tracking branch 'origin/master' into fix/component-focus-removed
This commit is contained in:
commit
eef0d68791
2 changed files with 7 additions and 1 deletions
|
@ -1,5 +1,5 @@
|
||||||
{
|
{
|
||||||
"version": "2.7.10",
|
"version": "2.7.11",
|
||||||
"npmClient": "yarn",
|
"npmClient": "yarn",
|
||||||
"packages": [
|
"packages": [
|
||||||
"packages/backend-core",
|
"packages/backend-core",
|
||||||
|
|
|
@ -204,6 +204,12 @@
|
||||||
})
|
})
|
||||||
return columns
|
return columns
|
||||||
.sort((a, b) => {
|
.sort((a, b) => {
|
||||||
|
if (a.divider) {
|
||||||
|
return a
|
||||||
|
}
|
||||||
|
if (b.divider) {
|
||||||
|
return b
|
||||||
|
}
|
||||||
const orderA = a.order || Number.MAX_SAFE_INTEGER
|
const orderA = a.order || Number.MAX_SAFE_INTEGER
|
||||||
const orderB = b.order || Number.MAX_SAFE_INTEGER
|
const orderB = b.order || Number.MAX_SAFE_INTEGER
|
||||||
const nameA = getDisplayName(a)
|
const nameA = getDisplayName(a)
|
||||||
|
|
Loading…
Reference in a new issue