Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(ui5-slider): up and down arrow behavior in RTL mode #10038

Open
wants to merge 5 commits into
base: release-1.24
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions packages/main/src/SliderBase.ts
Original file line number Diff line number Diff line change
Expand Up @@ -609,16 +609,14 @@ abstract class SliderBase extends UI5Element {
}

_handleActionKeyPressBase(e: KeyboardEvent, affectedPropName: string) {
const isUpAction = SliderBase._isIncreaseValueAction(e);
const isUpAction = SliderBase._isIncreaseValueAction(e, this.directionStart);
const isBigStep = SliderBase._isBigStepAction(e);

const currentValue = this[affectedPropName as keyof SliderBase] as number;
const min = this._effectiveMin;
const max = this._effectiveMax;

// We need to take into consideration the effective direction of the slider - rtl or ltr.
// While in ltr, the left arrow key decreases the value, in rtl it should actually increase it.
let step = this.effectiveDir === "rtl" ? -this._effectiveStep : this._effectiveStep;
let step = this._effectiveStep;

// If the action key corresponds to a long step and the slider has more than 10 normal steps,
// make a jump of 1/10th of the Slider's length, otherwise just use the normal step property.
Expand All @@ -635,11 +633,19 @@ abstract class SliderBase extends UI5Element {
return isUpAction ? step : step * -1;
}

static _isDecreaseValueAction(e: KeyboardEvent) {
static _isDecreaseValueAction(e: KeyboardEvent, directionStart: DirectionStart) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was not able to find this function to be called anywhere in the project. I've tested in the test page to put breakpoint in it and aslo it's not called. Do we still need it?

if (directionStart === "right") {
isDown(e) || isDownCtrl(e) || isRight(e) || isRightCtrl(e) || isMinus(e) || isPageDown(e);
}

return isDown(e) || isDownCtrl(e) || isLeft(e) || isLeftCtrl(e) || isMinus(e) || isPageDown(e);
}

static _isIncreaseValueAction(e: KeyboardEvent) {
static _isIncreaseValueAction(e: KeyboardEvent, directionStart: DirectionStart) {
if (directionStart === "right") {
return isUp(e) || isUpCtrl(e) || isLeft(e) || isLeftCtrl(e) || isPlus(e) || isPageUp(e);
}

return isUp(e) || isUpCtrl(e) || isRight(e) || isRightCtrl(e) || isPlus(e) || isPageUp(e);
}

Expand Down
21 changes: 20 additions & 1 deletion packages/main/test/specs/Slider.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ describe("Properties synchronization and normalization", () => {
assert.strictEqual((await slider.getProperty("_labels"))[0], "-20", "Initial slider start label is -20.");
assert.strictEqual((await slider.getProperty("_labels"))[labelLength - 1], "20", "Initial slider end label is 20.");

// simulate the synchronous update of min and max made programatically
// simulate the synchronous update of min and max made programatically
await browser.executeAsync(done => {
const slider = document.getElementById("slider-tickmarks-labels");
slider.min = 0;
Expand Down Expand Up @@ -492,6 +492,25 @@ describe("Testing resize handling and RTL support", () => {
assert.strictEqual(await slider.getProperty("value"), 1, "Slider current value should be 1");
});

it("Testing RTL KBH support - arrow up and down", async () => {
const slider = await browser.$("#basic-slider-rtl");
const sliderHandle = await slider.shadow$(".ui5-slider-handle");

await slider.setProperty("value", 0);
assert.strictEqual((await sliderHandle.getCSSProperty("right")).value, "0px", "Initially if no value is set, the Slider handle is at the right of the Slider");

await slider.keys("ArrowUp");
await slider.keys("ArrowUp");

assert.strictEqual(await sliderHandle.getAttribute("style"), "right: 20%;", "Slider handle should be 20% from the right of the slider");
assert.strictEqual(await slider.getProperty("value"), 2, "Slider current value should be 2");

await slider.keys("ArrowDown");

assert.strictEqual(await sliderHandle.getAttribute("style"), "right: 10%;", "Slider handle should be 10% from the right of the slider");
assert.strictEqual(await slider.getProperty("value"), 1, "Slider current value should be 1");
});

it("Should hide all labels except the first and the last one, if there is not enough space for all of them", async () => {
const slider = await browser.$("#slider-tickmarks-tooltips-labels");

Expand Down