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(range): bug js boucle infinie et step désactivé [DS-3739, DS-3777] #931

Merged
merged 2 commits into from
May 29, 2024
Merged
Show file tree
Hide file tree
Changes from all 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
4 changes: 4 additions & 0 deletions src/component/range/example/index.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,8 @@

<%- sample(getText('sample.disabled', 'range'), './sample/range.ejs', { range: {disabled: true, min: 0, max: 100, value: 50}}, true); %>

<%- sample(getText('sample.step-disabled', 'range'), './sample/range-step.ejs', { range: {disabled: true, min: 0, step: 10, max: 100, value: 50}}, true); %>

<%- sample(getText('sample.double-disabled', 'range'), './sample/range-double.ejs', { range: {disabled: true, min: 0, max: 100, value: 20, value2: 80}}, true); %>

<%- sample(getText('sample.error', 'range'), './sample/range.ejs', { range: {error: true, min: 0, max: 100, value: 50}}, true); %>
1 change: 1 addition & 0 deletions src/component/range/example/sample/range.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ data.min = range.min ?? 0;
data.max = range.max ?? 100;
if (range.indicators === false) data.indicators = range.indicators;
data.value = range.value || (data.min + data.max) / 2;
data.value2 = range.value2;
if (range.size) data.size = range.size;
if (range.step) data.step = range.step;
if (range.prefix) data.prefix = range.prefix;
Expand Down
2 changes: 2 additions & 0 deletions src/component/range/i18n/fr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,7 @@ sample:
double-step: Curseur double avec étapes
double-step-sm: Curseur double avec étapes taille SM
disabled: Curseur désactivé
step-disabled: Curseur avec étape désactivé
double-disabled: Curseur double désactivé
prefix-suffix: Curseur avec préfixe et suffixe
error: Curseur avec erreur
1 change: 1 addition & 0 deletions src/component/range/script/range/range-input.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ class RangeInput extends api.core.Instance {
setValue (value) {
if (parseFloat(this.node.value) > value) {
this.node.value = value;
this.dispatch('change', undefined, true);
this.change();
}
}
Expand Down
1 change: 1 addition & 0 deletions src/component/range/script/range/range-input2.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ class RangeInput2 extends RangeInput {
setValue (value) {
if (parseFloat(this.node.value) < value) {
this.node.value = value;
this.dispatch('change', undefined, true);
this.change();
}
}
Expand Down
1 change: 1 addition & 0 deletions src/component/range/script/range/range-model.js
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ class RangeModelStep extends RangeModel {
super._update();
const steps = this._rangeWidth / this._step;
this._stepWidth = this._innerWidth / steps;
if (this._stepWidth < 1 || !isFinite(this._stepWidth)) this._stepWidth = 4;
while (this._stepWidth < 4) this._stepWidth *= 2;
}
}
Expand Down
1 change: 1 addition & 0 deletions src/component/range/style/_scheme.scss
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@

@include after {
@include color.background-image(default grey, (legacy:$legacy), $range-progress-gradient);
@include color.box-shadow(disabled grey, (legacy:$legacy), left-10-in right-10-in);
}
}
}
Expand Down
2 changes: 2 additions & 0 deletions src/component/range/template/ejs/range.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@

* range.value (number, optional) : valeur initiale du curseur

* range.value2 (number, optional) : 2eme valeur initiale pour le curseur double

* range.step (number, optional) : pas du curseur

* range.prefix (string, optional) : texte avant la valeur du curseur
Expand Down