Skip to content

fix slider reversal #1723

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

Merged
joepavitt merged 2 commits into from
Jun 2, 2025
Merged

fix slider reversal #1723

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
812e407
fix: ensure numeric values for slider props to avoid string compariso…
Steve-Mcl May 30, 2025
beb1b29
update tests to avoid regression on slider reversal
Steve-Mcl May 30, 2025
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 cypress/fixtures/flows/dashboard-slider.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
"topic": "topic",
"topicType": "str",
"thumbLabel": true,
"min": 0,
"min": "20",
"max": "100",
"step": 1,
"className": "",
Expand Down
24 changes: 20 additions & 4 deletions cypress/tests/widgets/slider.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,17 @@ describe('Node-RED Dashboard 2.0 - Slider', () => {
cy.visit('/dashboard/page1')
})

it('is loaded correctly', () => {
cy.get('#nrdb-ui-widget-dashboard-ui-slider').contains('My Slider')
cy.get('#nrdb-ui-widget-dashboard-ui-slider').find('.v-slider-thumb').should('have.attr', 'aria-valuemin', '20')
cy.get('#nrdb-ui-widget-dashboard-ui-slider').find('.v-slider-thumb').should('have.attr', 'aria-valuemax', '100')
// upon first load, the slider should be at its minimum value
cy.get('#nrdb-ui-widget-dashboard-ui-slider').find('.v-slider-thumb').should('have.attr', 'aria-valuenow', '20')
// to verify the slider orientation, with the slider being horizontal, the thumb should be on the left side
// which is denoted by style="--v-slider-thumb-position: 0%""
cy.get('#nrdb-ui-widget-dashboard-ui-slider').find('.v-slider-thumb').should('have.attr', 'style', '--v-slider-thumb-position: 0%; --v-slider-thumb-size: 20px;')
})

it('is labelled correctly', () => {
cy.get('#nrdb-ui-widget-dashboard-ui-slider').contains('My Slider')
})
Expand All @@ -17,8 +28,8 @@ describe('Node-RED Dashboard 2.0 - Slider', () => {
it('emits a value, and updates, when clicked', () => {
cy.resetContext()
cy.clickAndWait(cy.get('.v-slider__container'))
cy.get('#nrdb-ui-widget-dashboard-ui-slider').find('.v-slider-thumb').should('have.attr', 'aria-valuenow', 50)
cy.checkOutput('msg.payload', 50)
cy.get('#nrdb-ui-widget-dashboard-ui-slider').find('.v-slider-thumb').should('have.attr', 'aria-valuenow', 60) // halfway between 20 and 100
cy.checkOutput('msg.payload', 60)
})
})

Expand All @@ -29,11 +40,16 @@ describe('Node-RED Dashboard 2.0 - Slider (Dynamic Properties)', () => {
})

it('include "labels"', () => {
// first set the slider to a known value
cy.clickAndWait(cy.get('.v-slider__container'))
cy.get('#nrdb-ui-widget-dashboard-ui-slider').find('.v-slider-thumb').should('have.attr', 'aria-valuenow', 60) // halfway between 20 and 100
cy.checkOutput('msg.payload', 60)
// now change the label only
cy.clickAndWait(cy.get('#nrdb-ui-widget-dashboard-ui-button-dynamic-label'))
// check the label is updated
cy.get('#nrdb-ui-widget-dashboard-ui-slider').contains('Dynamic Slider Label')
// shouldn't have changed hte value as we're only setting label
cy.checkOutput('msg.payload', 50)
// shouldn't have changed the value as we're only setting label
cy.checkOutput('msg.payload', 60)
})

it('include "min"', () => {
Expand Down
8 changes: 4 additions & 4 deletions ui/src/widgets/ui-slider/UISlider.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,16 +77,16 @@ export default {
return this.getProperty('showTicks')
},
min: function () {
return Math.min(this.getProperty('min'), this.getProperty('max'))
return Math.min(+this.getProperty('min'), +this.getProperty('max'))
},
step: function () {
return this.getProperty('step')
return +this.getProperty('step')
},
max: function () {
return Math.max(this.getProperty('min'), this.getProperty('max'))
return Math.max(+this.getProperty('min'), +this.getProperty('max'))
},
isReverse: function () {
return this.getProperty('min') > this.getProperty('max')
return +this.getProperty('min') > +this.getProperty('max')
},
iconPrepend: function () {
const icon = this.getProperty('iconPrepend')
Expand Down