Skip to content

Commit e7130cc

Browse files
committed
Add tests for focus and keyboard handling
1 parent 12233d3 commit e7130cc

File tree

3 files changed

+574
-9
lines changed

3 files changed

+574
-9
lines changed

packages/base/src/Keys.js

-1
Original file line numberDiff line numberDiff line change
@@ -212,5 +212,4 @@ export {
212212
isPageDownShift,
213213
isPageUpShiftCtrl,
214214
isPageDownShiftCtrl,
215-
getCtrlKey,
216215
};

packages/main/src/RangeSlider.js

+13-8
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import {
55
isHome,
66
isEnd,
77
} from "@ui5/webcomponents-base/dist/Keys.js";
8-
8+
import ResizeHandler from "@ui5/webcomponents-base/dist/delegate/ResizeHandler.js";
99
import SliderBase from "./SliderBase.js";
1010
import RangeSliderTemplate from "./generated/templates/RangeSliderTemplate.lit.js";
1111

@@ -107,6 +107,8 @@ class RangeSlider extends SliderBase {
107107
this._sliderStartHandle = this.shadowRoot.querySelector(".ui5-slider-handle--start");
108108
this._sliderEndHandle = this.shadowRoot.querySelector(".ui5-slider-handle--end");
109109
this._sliderProgress = this.shadowRoot.querySelector(".ui5-slider-progress");
110+
111+
ResizeHandler.register(this, this._resizeHandler);
110112
}
111113

112114
get tooltipStartValue() {
@@ -455,6 +457,11 @@ class RangeSlider extends SliderBase {
455457
*/
456458
_setAffectedValue(valuePropAffectedByInteraction) {
457459
this._valueAffected = valuePropAffectedByInteraction;
460+
461+
// If the values have been swapped reset the reversed flag
462+
if (this._areValuesReversed()) {
463+
this._setValuesAreReversed();
464+
}
458465
}
459466

460467
_getAffectedValue() {
@@ -487,7 +494,7 @@ class RangeSlider extends SliderBase {
487494
* @private
488495
*/
489496
_focusInnerElement() {
490-
const isReversed = this._getAreValuesReversed();
497+
const isReversed = this._areValuesReversed();
491498
const affectedValue = this._getAffectedValue();
492499

493500
if (this._inCurrentRange || !affectedValue) {
@@ -496,12 +503,10 @@ class RangeSlider extends SliderBase {
496503

497504
if ((affectedValue === "startValue" && !isReversed) || (affectedValue === "endValue" && isReversed)) {
498505
this._sliderStartHandle.focus();
499-
this._switchReversedValues();
500506
}
501507

502508
if ((affectedValue === "endValue" && !isReversed) || (affectedValue === "startValue" && isReversed)) {
503509
this._sliderEndHandle.focus();
504-
this._switchReversedValues();
505510
}
506511
}
507512

@@ -627,7 +632,7 @@ class RangeSlider extends SliderBase {
627632
this.endValue = this.startValue;
628633
this.startValue = prevEndValue;
629634

630-
this._switchReversedValues();
635+
this._setValuesAreReversed();
631636
this._focusInnerElement();
632637
}
633638

@@ -636,7 +641,7 @@ class RangeSlider extends SliderBase {
636641
this.startValue = this.endValue;
637642
this.endValue = prevStartValue;
638643

639-
this._switchReversedValues();
644+
this._setValuesAreReversed();
640645
this._focusInnerElement();
641646
}
642647
}
@@ -649,11 +654,11 @@ class RangeSlider extends SliderBase {
649654
*
650655
* @private
651656
*/
652-
_switchReversedValues() {
657+
_setValuesAreReversed() {
653658
this._reversedValues = !this._reversedValues;
654659
}
655660

656-
_getAreValuesReversed(areValuesReversed) {
661+
_areValuesReversed() {
657662
return this._reversedValues;
658663
}
659664

0 commit comments

Comments
 (0)