From 43313d81f1f3dcb9674b51ef4bfb4b3378994b6a Mon Sep 17 00:00:00 2001 From: klotske Date: Sat, 14 Jan 2023 02:17:40 +0300 Subject: [PATCH] Fix merge conflict & rename props --- website/src/components/Survey/LabelRadioGroup.tsx | 8 ++++---- website/src/components/Survey/LabelSliderGroup.tsx | 10 +++++----- website/src/components/Tasks/LabelTask.tsx | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/website/src/components/Survey/LabelRadioGroup.tsx b/website/src/components/Survey/LabelRadioGroup.tsx index 918976ed..b4b8385e 100644 --- a/website/src/components/Survey/LabelRadioGroup.tsx +++ b/website/src/components/Survey/LabelRadioGroup.tsx @@ -5,7 +5,7 @@ import { colors } from "src/styles/Theme/colors"; interface LabelRadioGroupProps { labelIDs: Array; onChange: (sliderValues: number[]) => unknown; - isDisabled?: boolean; + isEditable?: boolean; } export const LabelRadioGroup = (props: LabelRadioGroupProps) => { @@ -30,7 +30,7 @@ export const LabelRadioGroup = (props: LabelRadioGroupProps) => { { text: "No", value: 0 }, { text: "Yes", value: 1 }, ]} - isDisabled={props.isDisabled} + isEditable={props.isEditable} interactionFlag={interactionFlag} /> ))} @@ -49,7 +49,7 @@ interface LabelRadioItemProps { labelValue: number; clickHandler: (newVal: number) => unknown; states: ButtonState[]; - isDisabled: boolean; + isEditable: boolean; interactionFlag: boolean; } @@ -69,7 +69,7 @@ const LabelRadioItem = (props: LabelRadioItemProps) => { {props.states.map((item, idx) => (