Skip to content

Commit 6a284ea

Browse files
James feeling thermometer updates (#193)
* update feeling thermometer text * fix slider over anchoring * update test
1 parent 8cbf91a commit 6a284ea

File tree

14 files changed

+73
-50
lines changed

14 files changed

+73
-50
lines changed
Loading
Loading

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@watts-lab/surveys",
3-
"version": "1.17.2",
3+
"version": "1.17.4",
44
"description": "",
55
"main": "dist/index.js",
66
"module": "dist/index.js",

src/customQuestionTypes/labeledRange.css

Lines changed: 26 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,6 @@
33
/* stop from overflowing sides and triggering horizontal scrollbar */
44
}
55

6-
.slider {
7-
-webkit-appearance: none;
8-
-moz-appearance: none;
9-
appearance: none;
10-
background: transparent;
11-
cursor: pointer;
12-
13-
padding-left: 2%;
14-
padding-right: 2%;
15-
border: 0;
16-
/* remove bottom border line */
17-
width: 100%;
18-
}
19-
206
.sliderLabels {
217
display: flex;
228
width: 100%;
@@ -33,23 +19,37 @@
3319
overflow-wrap: break-word;
3420
}
3521

36-
.slider::-webkit-slider-runnable-track {
22+
input.sv-text[type="range"] {
23+
-webkit-appearance: none;
24+
-moz-appearance: none;
25+
appearance: none;
26+
background: transparent;
27+
cursor: pointer;
28+
29+
padding-left: 2%;
30+
padding-right: 2%;
31+
border: 0;
32+
/* remove bottom border line */
33+
width: 100%;
34+
}
35+
36+
input.sv-text[type="range"]::-webkit-slider-runnable-track {
3737
width: 100%;
3838
height: 5px;
3939
background: #ddd;
4040
border: none;
4141
border-radius: 3px;
4242
}
4343

44-
.slider::-moz-range-track {
44+
input.sv-text[type="range"]::-moz-range-track {
4545
width: 100%;
4646
height: 5px;
4747
background: #ddd;
4848
border: none;
4949
border-radius: 3px;
5050
}
5151

52-
.slider::-webkit-slider-thumb {
52+
input.sv-text[type="range"]::-webkit-slider-thumb {
5353
-webkit-appearance: none;
5454
border: none;
5555
height: 20px;
@@ -60,7 +60,7 @@
6060
visibility: hidden;
6161
}
6262

63-
.slider::-moz-range-thumb {
63+
input.sv-text[type="range"]::-moz-range-thumb {
6464
border: none;
6565
height: 20px;
6666
width: 16px;
@@ -69,30 +69,26 @@
6969
visibility: hidden;
7070
}
7171

72-
.slider.sliderClicked::-webkit-slider-thumb {
72+
input.sv-text.sliderClicked[type="range"]::-webkit-slider-thumb {
7373
visibility: visible;
7474
}
7575

76-
.slider.sliderClicked::-moz-range-thumb {
76+
input.sv-text.sliderClicked[type="range"]::-moz-range-thumb {
7777
visibility: visible;
7878
}
7979

80-
.slider:focus {
80+
input.sv-text[type="range"]:focus {
8181
outline: none;
8282
}
8383

84-
.slider:focus::-webkit-slider-runnable-track {
84+
input.sv-text[type="range"]:focus::-webkit-slider-runnable-track {
8585
background: #ccc;
8686
}
8787

88-
.slider:focus::-moz-range-track {
88+
input.sv-text[type="range"]:focus::-moz-range-track {
8989
background: #ccc;
9090
}
9191

92-
/* ----------------added styles to make required changes by Amir Rahman from upwork---------------- */
93-
94-
/* to resolve the issue : https://github.com/Watts-Lab/surveys/issues/110 */
95-
9692
.sliderLabel {
9793
width: 0px;
9894
left: 0px;
@@ -141,6 +137,6 @@ datalist.sliderLabels {
141137
width: 100%;
142138
}
143139

144-
.active {
145-
font-weight: bold;
146-
}
140+
/* .active { */
141+
/* font-weight: bold; */
142+
/* } */

src/customQuestionTypes/labeledRange.js

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -90,23 +90,24 @@ export function labeledRange(SurveyJS) {
9090
el.appendChild(dl);
9191

9292
slider.setAttribute("list", dl.id);
93-
slider.classList.add("slider");
93+
// slider.classList.add("slider");
9494

9595
if (question.showProgressBar) slider.classList.add("progressBar");
9696

97-
slider.addEventListener("mousedown", () =>
98-
slider.classList.add("sliderClicked")
99-
);
97+
slider.addEventListener("mousedown", () => {
98+
// slider.classList.add("slider");
99+
slider.classList.add("sliderClicked");
100+
});
100101

101102
// added additionally for highlighting label
102-
let last = null;
103-
slider.addEventListener("input", (e) => {
104-
let val = e.target.value;
105-
last?.classList.remove("active");
106-
const activeEl = dl.querySelector(`[value='${val}']`);
107-
activeEl?.classList.add("active");
108-
last = activeEl;
109-
});
103+
// let last = null;
104+
// slider.addEventListener("input", (e) => {
105+
// let val = e.target.value;
106+
// last?.classList.remove("active");
107+
// const activeEl = dl.querySelector(`[value='${val}']`);
108+
// activeEl?.classList.add("active");
109+
// last = activeEl;
110+
// });
110111
},
111112
};
112113

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
import React from "react";
2+
import { PartisanFeelingThermometerUS } from "../../src/index";
3+
4+
describe("PartisanFeelingThermometerUS", () => {
5+
it("loads", () => {
6+
cy.viewport("macbook-11");
7+
cy.mount(<PartisanFeelingThermometerUS />);
8+
cy.viewport("macbook-11");
9+
});
10+
});

surveys/partisanFeelingThermometerUS/partisanFeelingThermometerUS.json

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,15 @@
2626
"step": 1,
2727
"valueLabels": [
2828
{ "value": 0, "text": "0: Very cold or unfavorable" },
29-
{ "value": 25, "text": "" },
29+
{ "value": 10, "text": "" },
30+
{ "value": 20, "text": "" },
31+
{ "value": 30, "text": "" },
32+
{ "value": 40, "text": "" },
3033
{ "value": 50, "text": "50: Neutral" },
31-
{ "value": 75, "text": "" },
34+
{ "value": 60, "text": "" },
35+
{ "value": 70, "text": "" },
36+
{ "value": 80, "text": "" },
37+
{ "value": 90, "text": "" },
3238
{ "value": 100, "text": "100: Very warm or favorable" }
3339
]
3440
},
@@ -43,9 +49,15 @@
4349
"step": 1,
4450
"valueLabels": [
4551
{ "value": 0, "text": "0: Very cold or unfavorable" },
46-
{ "value": 25, "text": "" },
52+
{ "value": 10, "text": "" },
53+
{ "value": 20, "text": "" },
54+
{ "value": 30, "text": "" },
55+
{ "value": 40, "text": "" },
4756
{ "value": 50, "text": "50: Neutral" },
48-
{ "value": 75, "text": "" },
57+
{ "value": 60, "text": "" },
58+
{ "value": 70, "text": "" },
59+
{ "value": 80, "text": "" },
60+
{ "value": 90, "text": "" },
4961
{ "value": 100, "text": "100: Very warm or favorable" }
5062
]
5163
}
Loading
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"survey":"163f58cdc566f42014cecd7d4f02caac094bd194","score":"150210b7aba45083a2483b58e028c525b2e1fde7"}
1+
{"survey":"53b6a48f3d80efcc1f8c1a8a165b60d363771d32","score":"150210b7aba45083a2483b58e028c525b2e1fde7"}

surveys/politicalPartyUS/page1.png

7.3 KB
Loading

0 commit comments

Comments
 (0)