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.

Sign up for GitHub

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): implement tooltips with Popover API #10994

Closed
wants to merge 1 commit into from
Closed

fix(ui5-slider): implement tooltips with Popover API #10994

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion packages/main/src/InputTemplate.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export default function InputTemplate(this: Input, hooks?: { preContent: Templat
style={this.styles.innerInput}
type={this.inputNativeType}
inner-input
inner-input-with-icon={this.icon.length}
inner-input-with-icon={!!this.icon.length}
disabled={this.disabled}
readonly={this._readonly}
value={this._innerValue}
Expand Down
197 changes: 26 additions & 171 deletions packages/main/src/RangeSlider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,10 +223,6 @@ class RangeSlider extends SliderBase implements IFormInputElement {
this.update(affectedValue, this.startValue, this.endValue);
}

if (this.editableTooltip) {
this._saveInputValues();
}

if (!this.isCurrentStateOutdated()) {
return;
}
Expand Down Expand Up @@ -281,9 +277,7 @@ class RangeSlider extends SliderBase implements IFormInputElement {
this._endValueInitial = this.endValue;
}

if (this.showTooltip) {
this._tooltipVisibility = SliderBase.TOOLTIP_VISIBILITY.VISIBLE;
}
this._tooltipsOpen = this.showTooltip;
}

/**
Expand All @@ -307,41 +301,8 @@ class RangeSlider extends SliderBase implements IFormInputElement {
this._startValueInitial = undefined;
this._endValueInitial = undefined;

if (this.showTooltip && !(e.relatedTarget as HTMLInputElement)?.hasAttribute("ui5-input")) {
this._tooltipVisibility = SliderBase.TOOLTIP_VISIBILITY.HIDDEN;
}
}

_onInputFocusOut(e: FocusEvent) {
const tooltipInput = e.target as Input;
const oppositeTooltipInput: Input = tooltipInput.hasAttribute("data-sap-ui-start-value") ? this.shadowRoot!.querySelector("[ui5-input][data-sap-ui-end-value]")! : this.shadowRoot!.querySelector("[ui5-input][data-sap-ui-start-value]")!;
const relatedTarget = e.relatedTarget as HTMLElement;

if (this.startValue > this.endValue) {
this._areInputValuesSwapped = true;
oppositeTooltipInput.focus();
return;
}

if (tooltipInput.hasAttribute("data-sap-ui-start-value")) {
this._setAffectedValue("startValue");
} else {
this._setAffectedValue("endValue");
}

if (!this._areInputValuesSwapped || !this.shadowRoot!.contains(relatedTarget)) {
this._tooltipVisibility = SliderBase.TOOLTIP_VISIBILITY.HIDDEN;
}

this._updateValueFromInput(e);
this._updateInputValue();
this.update(this._valueAffected, parseFloat(this._lastValidStartValue), parseFloat(this._lastValidEndValue));

const isTooltipInputValueValid = parseFloat(tooltipInput.value) >= this.min && parseFloat(tooltipInput.value) <= this.max;

if (!isTooltipInputValueValid) {
tooltipInput.value = tooltipInput.hasAttribute("data-sap-ui-start-value") ? this._lastValidStartValue : this._lastValidEndValue;
tooltipInput.valueState = "None";
if (this.showTooltip && !(e.relatedTarget as HTMLInputElement)?.hasAttribute("ui5-slider-tooltip")) {
this._tooltipsOpen = false;
}
}

Expand Down Expand Up @@ -487,7 +448,7 @@ class RangeSlider extends SliderBase implements IFormInputElement {

// If step is 0 no interaction is available because there is no constant
// (equal for all user environments) quantitative representation of the value
if (this.disabled || this._effectiveStep === 0 || (e.target as HTMLElement).hasAttribute("ui5-input")) {
if (this.disabled || this._effectiveStep === 0 || (e.target as HTMLElement).hasAttribute("ui5-slider-tooltip")) {
return;
}

Expand Down Expand Up @@ -542,7 +503,7 @@ class RangeSlider extends SliderBase implements IFormInputElement {
e.preventDefault();

// If 'step' is 0 no interaction is available as there is no constant quantitative representation of the value
if (this.disabled || this._effectiveStep === 0 || (e.target as HTMLElement).hasAttribute("ui5-input")) {
if (this.disabled || this._effectiveStep === 0) {
return;
}

Expand Down Expand Up @@ -583,11 +544,7 @@ class RangeSlider extends SliderBase implements IFormInputElement {
this.update(undefined, newValues[0], newValues[1]);
}

_handleUp(e: MouseEvent) {
if ((e.target as HTMLElement).hasAttribute("ui5-input")) {
return;
}

_handleUp() {
this._setAffectedValueByFocusedElement();
this._setAffectedValue(undefined);

Expand All @@ -603,30 +560,30 @@ class RangeSlider extends SliderBase implements IFormInputElement {
this._endValueAtBeginningOfAction = undefined;
}

_updateValueFromInput(e: Event) {
if (this._areInputValuesSwapped) {
return;
}
// _updateValueFromInput(e: Event) {
// if (this._areInputValuesSwapped) {
// return;
// }

const input = e.target as HTMLInputElement;
const inputValue = parseFloat(input.value);
const isValueValid = inputValue >= this._effectiveMin && inputValue <= this._effectiveMax;
// const input = e.target as HTMLInputElement;
// const inputValue = parseFloat(input.value);
// const isValueValid = inputValue >= this._effectiveMin && inputValue <= this._effectiveMax;

if (!isValueValid) {
return;
}
// if (!isValueValid) {
// return;
// }

if (input.hasAttribute("data-sap-ui-start-value")) {
this.startValue = inputValue;
return;
}
// if (input.hasAttribute("data-sap-ui-start-value")) {
// this.startValue = inputValue;
// return;
// }

this.endValue = inputValue;
// this.endValue = inputValue;

if (this.startValue > this.endValue) {
this._areInputValuesSwapped = true;
}
}
// if (this.startValue > this.endValue) {
// this._areInputValuesSwapped = true;
// }
// }

/**
* Determines where the press occured and which values of the Range Slider
Expand Down Expand Up @@ -722,10 +679,6 @@ class RangeSlider extends SliderBase implements IFormInputElement {
* @protected
*/
focusInnerElement() {
if (this.editableTooltip && this._tooltipVisibility === SliderBase.TOOLTIP_VISIBILITY.HIDDEN) {
return;
}

const isReversed = this._areValuesReversed();
const affectedValue = this._valueAffected;

Expand Down Expand Up @@ -841,102 +794,7 @@ class RangeSlider extends SliderBase implements IFormInputElement {
}
}

_onInputKeydown(e: KeyboardEvent): void {
const targetedInput = e.target as Input;
const startValueInput = this.shadowRoot!.querySelector("[ui5-input][data-sap-ui-start-value]") as Input;
const endValueInput = this.shadowRoot!.querySelector("[ui5-input][data-sap-ui-end-value]") as Input;

const startValue = parseFloat(startValueInput.value);
const endValue = parseFloat(endValueInput.value);
const affectedValue = targetedInput.hasAttribute("data-sap-ui-start-value") ? "startValue" : "endValue";

super._onInputKeydown(e);

if (isEnter(e) && startValue > endValue) {
const swappedInput = affectedValue === "startValue" ? endValueInput : startValueInput;
const isValueValid = parseFloat(targetedInput.value) >= this.min && parseFloat(startValueInput.value) <= this.max;

if (!isValueValid) {
targetedInput.valueState = "Negative";
return;
}

this._isEndValueValid = parseFloat(endValueInput.value) >= this.min && parseFloat(endValueInput.value) <= this.max;

this._areInputValuesSwapped = true;
this._setAffectedValue(affectedValue === "startValue" ? "endValue" : "startValue");

startValueInput.value = this._getFormattedValue(this.endValue.toString());
endValueInput.value = this._getFormattedValue(this.startValue.toString());
swappedInput.focus();

return;
}

this._setAffectedValue(affectedValue);
}

_updateInputValue() {
const startValueInput = this.shadowRoot!.querySelector("[ui5-input][data-sap-ui-start-value]") as Input;
const endValueInput = this.shadowRoot!.querySelector("[ui5-input][data-sap-ui-end-value]") as Input;

if (!startValueInput && !endValueInput) {
return;
}

this._isStartValueValid = parseFloat(startValueInput.value) >= this.min && parseFloat(startValueInput.value) <= this.max;
this._isEndValueValid = parseFloat(endValueInput.value) >= this.min && parseFloat(endValueInput.value) <= this.max;

if (!this._isStartValueValid) {
startValueInput.valueState = "Negative";
return;
}

if (!this._isEndValueValid) {
endValueInput.valueState = "Negative";
return;
}

this._lastValidStartValue = startValueInput.value;
this._lastValidEndValue = endValueInput.value;

startValueInput.valueState = "None";
endValueInput.valueState = "None";
}

_saveInputValues() {
const startValueInput = this.shadowRoot!.querySelector("[ui5-input][data-sap-ui-start-value]") as Input;
const endValueInput = this.shadowRoot!.querySelector("[ui5-input][data-sap-ui-end-value]") as Input;

if (this.editableTooltip && startValueInput && endValueInput) {
const inputStartValue = parseFloat(startValueInput.value);
const inputEndValue = parseFloat(endValueInput.value);

const isStartValueValid = inputStartValue >= this.min && inputStartValue <= this.max;
const isEndValueValid = inputEndValue >= this.min && inputEndValue <= this.max;

if (this._isUserInteraction) {
startValueInput.value = isStartValueValid ? this._getFormattedValue(this.startValue.toString()) : this._getFormattedValue(this._lastValidStartValue);
endValueInput.value = isEndValueValid ? this._getFormattedValue(this.endValue.toString()) : this._getFormattedValue(this._lastValidEndValue);

this.startValue = parseFloat(this._getFormattedValue(this.startValue.toString()));
this.endValue = parseFloat(this._getFormattedValue(this.endValue.toString()));

this.syncUIAndState();
this._updateHandlesAndRange(0);
this.update(this._valueAffected, this.startValue, this.endValue);
return;
}

this._lastValidStartValue = isStartValueValid ? this._getFormattedValue(inputStartValue.toString()) : this._getFormattedValue(this._lastValidStartValue);
this._lastValidEndValue = isEndValueValid ? this._getFormattedValue(inputEndValue.toString()) : this._getFormattedValue(this._lastValidEndValue);

if (startValueInput.valueState !== "Negative" && endValueInput.valueState !== "Negative") {
startValueInput.value = isStartValueValid ? this._getFormattedValue(inputStartValue.toString()) : this._getFormattedValue(this._lastValidStartValue);
endValueInput.value = isEndValueValid ? this._getFormattedValue(inputEndValue.toString()) : this._getFormattedValue(this._lastValidEndValue);
}
}
}
_onInputKeydown(): void {}

_getFormattedValue(value: string) {
const valueNumber = parseFloat(value);
Expand Down Expand Up @@ -1067,9 +925,6 @@ class RangeSlider extends SliderBase implements IFormInputElement {
"width": `100%`,
[this.directionStart]: `-${this._labelWidth / 2}%`,
},
tooltip: {
"visibility": `${this._tooltipVisibility}`,
},
};
}
}
Expand Down
63 changes: 24 additions & 39 deletions packages/main/src/RangeSliderTemplate.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import type RangeSlider from "./RangeSlider.js";
import Icon from "./Icon.js";
import Input from "./Input.js";
import SliderBaseTemplate from "./SliderBaseTemplate.js";
import SliderTooltip from "./SliderTooltip.js";

export default function RangeSliderTemplate(this: RangeSlider) {
return SliderBaseTemplate.call(this, {
Expand Down Expand Up @@ -67,26 +68,6 @@ export function handles(this: RangeSlider) {
slider-icon
></Icon>
</div>

{this.showTooltip &&
<div class="ui5-slider-tooltip ui5-slider-tooltip--start" style={this.styles.tooltip}>
{this.editableTooltip ?
<Input
type="Number"
value={this.startValue.toString()}
accessibleNameRef="ui5-slider-InputLabel"
onFocusOut={this._onInputFocusOut}
onKeyDown={this._onInputKeydown}
onChange={this._onInputChange}
onInput={this._onInputInput}
data-sap-ui-start-value
tabIndex={-1}
></Input>
:
<span class="ui5-slider-tooltip-value">{this.tooltipStartValue}</span>
}
</div>
}
</div>
<div class="ui5-slider-handle-container" style={this.styles.endHandle} part="handle-container">
<div class="ui5-slider-handle ui5-slider-handle--end"
Expand All @@ -110,25 +91,29 @@ export function handles(this: RangeSlider) {
></Icon>
</div>

{this.showTooltip &&
<div class="ui5-slider-tooltip ui5-slider-tooltip--end" style={this.styles.tooltip}>
{this.editableTooltip ?
<Input
type="Number"
value={this.endValue.toString()}
accessibleNameRef="ui5-slider-InputLabel"
onFocusOut={this._onInputFocusOut}
onKeyDown={this._onInputKeydown}
onChange={this._onInputChange}
onInput={this._onInputInput}
data-sap-ui-end-value
tabIndex={-1}
></Input>
:
<span class="ui5-slider-tooltip-value">{this.tooltipEndValue}</span>
}
</div>
}
<SliderTooltip
open={this._tooltipsOpen}
value={this.startValue.toString()}
min={this.min}
max={this.max}
editable={this.editableTooltip}
followRef={this.shadowRoot?.querySelector(".ui5-slider-handle--start") as HTMLElement}
onChange={this._onTooltipChange}
// onForwardFocus={this._onTooltopForwardFocus}
>
</SliderTooltip>

<SliderTooltip
open={this._tooltipsOpen}
value={this.endValue.toString()}
min={this.min}
max={this.max}
editable={this.editableTooltip}
followRef={this.shadowRoot?.querySelector(".ui5-slider-handle--end") as HTMLElement}
onChange={this._onTooltipChange}
// onForwardFocus={this._onTooltopForwardFocus}
>
</SliderTooltip>
</div>
</>);
}
Loading
Loading