style(components): rename disabled to is-disabled (#6475)

* style(components): [pagination] rename disabled to is-disabled

* style(components): [slider] rename disabled to is-disabled

* style(components): [pagination] rename active to is-active

* refactor(components): [calendar] use namespace hooks

* fix(components): [pagination] fix test error
This commit is contained in:
blackie
2022-03-10 23:57:07 +08:00
committed by GitHub
parent 8929151b85
commit c35dfec666
6 changed files with 40 additions and 18 deletions

View File

@@ -155,10 +155,10 @@ export default defineComponent({
if (type === 'current') {
const date = getFormattedDate(text, type)
if (date.isSame(props.selectedDay, 'day')) {
classes.push('is-selected')
classes.push(nsDay.is('selected'))
}
if (date.isSame(now, 'day')) {
classes.push('is-today')
classes.push(nsDay.is('today'))
}
}
return classes

View File

@@ -15,7 +15,9 @@ const assertElementsExistence = (
}
const assertCurrent = (wrapper, page) => {
expect(wrapper.find('.el-pager li.active.number').text()).toBe(String(page))
expect(wrapper.find('.el-pager li.is-active.number').text()).toBe(
String(page)
)
}
const assertPages = (wrapper, total) => {
expect(wrapper.find('.el-pagination .el-pager li:last-child').text()).toBe(

View File

@@ -2,7 +2,10 @@
<ul :class="nsPager.b()" @click="onPagerClick" @keyup.enter="onEnter">
<li
v-if="pageCount > 0"
:class="{ active: currentPage === 1, disabled }"
:class="[
nsPager.is('active', currentPage === 1),
nsPager.is('disabled', disabled),
]"
class="number"
:aria-current="currentPage === 1"
tabindex="0"
@@ -11,7 +14,12 @@
</li>
<li
v-if="showPrevMore"
:class="['more', 'btn-quickprev', nsIcon.b(), { disabled }]"
:class="[
'more',
'btn-quickprev',
nsIcon.b(),
nsPager.is('disabled', disabled),
]"
@mouseenter="onMouseenter('left')"
@mouseleave="quickPrevHover = false"
>
@@ -21,7 +29,10 @@
<li
v-for="pager in pagers"
:key="pager"
:class="{ active: currentPage === pager, disabled }"
:class="[
nsPager.is('active', currentPage === pager),
nsPager.is('disabled', disabled),
]"
class="number"
:aria-current="currentPage === pager"
tabindex="0"
@@ -30,7 +41,12 @@
</li>
<li
v-if="showNextMore"
:class="['more', 'btn-quicknext', nsIcon.b(), { disabled }]"
:class="[
'more',
'btn-quicknext',
nsIcon.b(),
nsPager.is('disabled', disabled),
]"
@mouseenter="onMouseenter('right')"
@mouseleave="quickNextHover = false"
>
@@ -39,7 +55,10 @@
</li>
<li
v-if="pageCount > 1"
:class="{ active: currentPage === pageCount, disabled }"
:class="[
nsPager.is('active', currentPage === pageCount),
nsPager.is('disabled', disabled),
]"
class="number"
:aria-current="currentPage === pageCount"
tabindex="0"

View File

@@ -12,7 +12,8 @@
ref="slider"
:class="[
ns.e('runway'),
{ 'show-input': showInput && !range, disabled: sliderDisabled },
{ 'show-input': showInput && !range },
ns.is('disabled', sliderDisabled),
]"
:style="runwayStyle"
@click="onSliderClick"

View File

@@ -92,7 +92,7 @@
}
}
.#{$namespace}-pager li.disabled {
.#{$namespace}-pager li.is-disabled {
color: var(--el-text-color-placeholder);
cursor: not-allowed;
}
@@ -111,7 +111,7 @@
min-width: 24px;
}
.arrow.disabled {
.arrow.is-disabled {
visibility: hidden;
}
@@ -228,7 +228,7 @@
min-width: 32px;
border-radius: 2px;
&.disabled {
&.is-disabled {
color: var(--el-text-color-placeholder);
background-color: var(--el-disabled-bg-color);
}
@@ -253,12 +253,12 @@
}
}
.#{$namespace}-pager li:not(.disabled) {
.#{$namespace}-pager li:not(.is-disabled) {
&:hover {
color: var(--el-pagination-hover-color);
}
&.active {
&.is-active {
background-color: var(--el-color-primary);
color: var(--el-color-white);
font-weight: bold;
@@ -311,7 +311,7 @@
line-height: 32px;
color: var(--el-pagination-button-color);
&.disabled {
&.is-disabled {
color: var(--el-text-color-placeholder);
cursor: not-allowed;
}
@@ -321,7 +321,7 @@
}
}
&.active + li {
&.is-active + li {
border-left: 0;
}
@@ -333,7 +333,7 @@
color: var(--el-pagination-hover-color);
}
&.active {
&.is-active {
color: var(--el-pagination-hover-color);
cursor: default;
}

View File

@@ -38,7 +38,7 @@ $slider-height: map.merge(
width: auto;
}
&.disabled {
&.is-disabled {
cursor: default;
.#{$namespace}-slider__bar {