Skip to content

Commit

Permalink
feat(Slider): the step attribute supports decimals (#1990)
Browse files Browse the repository at this point in the history
* feat(Slider): the step attribute supports decimals

* fix(slider): resolve emit same value

---------

Co-authored-by: leejimqiu <leejimqiu@gmail.com>
  • Loading branch information
anlyyao and LeeJim authored May 12, 2023
1 parent 87bd5e6 commit 27016c4
Show file tree
Hide file tree
Showing 8 changed files with 25 additions and 19 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ exports[`ImageViewer ImageViewer base demo works fine 1`] = `
size="large"
theme="primary"
variant="outline"
bind:tap="clickHandle"
bind:tap="onClick"
>
基础图片预览
</t-button>
Expand All @@ -34,12 +34,12 @@ exports[`ImageViewer ImageViewer delete demo works fine 1`] = `
size="large"
theme="primary"
variant="outline"
bind:tap="clickHandle"
bind:tap="onClick"
>
带操作图片预览
</t-button>
<t-toast
id="t-toast"
<t-action-sheet
id="t-action-sheet"
/>
<t-image-viewer
closeBtn="{{false}}"
Expand Down
2 changes: 2 additions & 0 deletions src/slider/__test__/__snapshots__/demo.test.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ exports[`Slider Slider base demo works fine 1`] = `
<base>
<t-slider
defaultValue="{{23}}"
step="{{0.1}}"
bind:change="handleChange"
/>
</base>
`;
Expand Down
2 changes: 2 additions & 0 deletions src/slider/__test__/__virtualHostSnapshot__/demo.test.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ exports[`Slider Slider base demo works fine 1`] = `
<base>
<t-slider
defaultValue="{{23}}"
step="{{0.1}}"
bind:change="handleChange"
/>
</base>
`;
Expand Down
3 changes: 0 additions & 3 deletions src/slider/__test__/index.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -239,8 +239,5 @@ describe('slider', () => {

comp.setData({ value: 101 });
expect($slider.instance.data._value).toBe(100);

comp.setData({ value: 'undefined' });
expect($slider.instance.data._value).toBe(0);
});
});
8 changes: 7 additions & 1 deletion src/slider/_example/base/index.js
Original file line number Diff line number Diff line change
@@ -1 +1,7 @@
Component({});
Component({
methods: {
handleChange(e) {
console.log(e.detail.value);
},
},
});
2 changes: 1 addition & 1 deletion src/slider/_example/base/index.wxml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<t-slider default-value="{{23}}" />
<t-slider default-value="{{23}}" step="{{0.1}}" bind:change="handleChange" />
16 changes: 9 additions & 7 deletions src/slider/slider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,8 @@ export default class Slider extends SuperComponent {
};

triggerValue(value?: SliderValue) {
if (this.preval === value) return;
this.preval = value;
this._trigger('change', {
value: trimValue(value, this.properties),
});
Expand Down Expand Up @@ -212,11 +214,12 @@ export default class Slider extends SuperComponent {

stepValue(value: number): number {
const { step, min, max } = this.properties;

if (Number(step) < 1 || Number(step) > Number(max) - Number(min)) return value;

const closestStep = trimSingleValue(Math.round(value / Number(step)) * Number(step), Number(min), Number(max));

const decimal = String(step).indexOf('.') > -1 ? String(step).length - String(step).indexOf('.') - 1 : 0;
const closestStep = trimSingleValue(
Number((Math.round(value / Number(step)) * Number(step)).toFixed(decimal)),
Number(min),
Number(max),
);
return closestStep as number;
}

Expand All @@ -236,13 +239,12 @@ export default class Slider extends SuperComponent {
const { pageX } = touch;
const currentLeft = pageX - initialLeft;
let value = 0;

if (currentLeft <= 0) {
value = Number(min);
} else if (currentLeft >= maxRange) {
value = Number(max);
} else {
value = Math.round((currentLeft / maxRange) * (Number(max) - Number(min)) + Number(min));
value = (currentLeft / maxRange) * (Number(max) - Number(min)) + Number(min);
}
return this.stepValue(value);
}
Expand Down
3 changes: 0 additions & 3 deletions src/slider/tool.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@
* @return {number}
*/
export const trimSingleValue = (value: any, min: number, max: number): number => {
if (typeof value !== 'number') {
return min;
}
if (value < min) {
return min;
}
Expand Down

0 comments on commit 27016c4

Please sign in to comment.