@openmrs/esm-form-engine-lib 4.0.1-pre.2274 → 4.0.1-pre.2278

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. package/dist/components/inputs/content-switcher/content-switcher.component.d.ts.map +1 -1
  2. package/dist/components/inputs/content-switcher/content-switcher.component.js +6 -3
  3. package/dist/components/inputs/multi-select/multi-select.component.js +2 -2
  4. package/package.json +1 -1
  5. package/src/components/inputs/content-switcher/content-switcher.component.tsx +8 -3
  6. package/src/components/inputs/multi-select/multi-select.component.tsx +2 -2
package/dist/components/inputs/content-switcher/content-switcher.component.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"content-switcher.component.d.ts","sourceRoot":"","sources":["../../../../src/components/inputs/content-switcher/content-switcher.component.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA+B,MAAM,OAAO,CAAC;AAMpD,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAM1D,QAAA,MAAM,eAAe,EAAE,KAAK,CAAC,EAAE,CAAC,mBAAmB,CA6DlD,CAAC;AAEF,eAAe,eAAe,CAAC"}
1
+ {"version":3,"file":"content-switcher.component.d.ts","sourceRoot":"","sources":["../../../../src/components/inputs/content-switcher/content-switcher.component.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA+B,MAAM,OAAO,CAAC;AAMpD,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAM1D,QAAA,MAAM,eAAe,EAAE,KAAK,CAAC,EAAE,CAAC,mBAAmB,CAkElD,CAAC;AAEF,eAAe,eAAe,CAAC"}
package/dist/components/inputs/content-switcher/content-switcher.component.js CHANGED
@@ -16,10 +16,13 @@ const ContentSwitcher = ({ field, value, errors, warnings, setFieldValue })=>{
16
16
  }, [
17
17
  setFieldValue
18
18
  ]);
19
- const selectedIndex = useMemo(()=>field.questionOptions.answers.findIndex((option)=>option.concept == value), [
20
- value,
19
+ const visibleAnswers = useMemo(()=>field.questionOptions.answers.filter((answer)=>!answer.isHidden), [
21
20
  field.questionOptions.answers
22
21
  ]);
22
+ const selectedIndex = useMemo(()=>visibleAnswers.findIndex((option)=>option.concept == value), [
23
+ value,
24
+ visibleAnswers
25
+ ]);
23
26
  const isInline = useMemo(()=>{
24
27
  if ([
25
28
  'view',
@@ -57,7 +60,7 @@ const ContentSwitcher = ({ field, value, errors, warnings, setFieldValue })=>{
57
60
  selectedIndex: selectedIndex,
58
61
  className: styles.selectedOption,
59
62
  size: "md"
60
- }, field.questionOptions.answers.map((option, index)=>/*#__PURE__*/ React.createElement(Switch, {
63
+ }, visibleAnswers.map((option, index)=>/*#__PURE__*/ React.createElement(Switch, {
61
64
  name: option.concept || option.value,
62
65
  text: t(option.label),
63
66
  key: index,
package/dist/components/inputs/multi-select/multi-select.component.js CHANGED
@@ -110,11 +110,11 @@ const MultiSelect = ({ field, value, errors, warnings, setFieldValue })=>{
110
110
  field: field
111
111
  }),
112
112
  readOnly: isTrue(field.readonly)
113
- }, field.questionOptions.answers?.map((value, index)=>{
113
+ }, selectOptions?.map((value, index)=>{
114
114
  return /*#__PURE__*/ React.createElement(Checkbox, {
115
115
  className: styles.checkbox,
116
116
  checked: initiallyCheckedQuestionItems.some((item)=>item === value.concept),
117
- disabled: value.disable?.isDisabled,
117
+ disabled: value.disabled,
118
118
  id: `${field.id}-${value.concept}`,
119
119
  key: `${field.id}-${value.concept}-${index}`,
120
120
  labelText: t(value.label),
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@openmrs/esm-form-engine-lib",
3
- "version": "4.0.1-pre.2274",
3
+ "version": "4.0.1-pre.2278",
4
4
  "description": "React Form Engine for O3",
5
5
  "main": "dist/index.js",
6
6
  "module": "dist/index.js",
package/src/components/inputs/content-switcher/content-switcher.component.tsx CHANGED
@@ -21,9 +21,14 @@ const ContentSwitcher: React.FC<FormFieldInputProps> = ({ field, value, errors,
21
21
  [setFieldValue],
22
22
  );
23
23
 
24
+ const visibleAnswers = useMemo(
25
+ () => field.questionOptions.answers.filter((answer) => !answer.isHidden),
26
+ [field.questionOptions.answers],
27
+ );
28
+
24
29
  const selectedIndex = useMemo(
25
- () => field.questionOptions.answers.findIndex((option) => option.concept == value),
26
- [value, field.questionOptions.answers],
30
+ () => visibleAnswers.findIndex((option) => option.concept == value),
31
+ [value, visibleAnswers],
27
32
  );
28
33
 
29
34
  const isInline = useMemo(() => {
@@ -59,7 +64,7 @@ const ContentSwitcher: React.FC<FormFieldInputProps> = ({ field, value, errors,
59
64
  selectedIndex={selectedIndex}
60
65
  className={styles.selectedOption}
61
66
  size="md">
62
- {field.questionOptions.answers.map((option, index) => (
67
+ {visibleAnswers.map((option, index) => (
63
68
  <Switch
64
69
  name={option.concept || option.value}
65
70
  text={t(option.label)}
package/src/components/inputs/multi-select/multi-select.component.tsx CHANGED
@@ -110,12 +110,12 @@ const MultiSelect: React.FC<FormFieldInputProps> = ({ field, value, errors, warn
110
110
  />
111
111
  ) : (
112
112
  <CheckboxGroup legendText={<FieldLabel field={field} />} readOnly={isTrue(field.readonly)}>
113
- {field.questionOptions.answers?.map((value, index) => {
113
+ {selectOptions?.map((value, index) => {
114
114
  return (
115
115
  <Checkbox
116
116
  className={styles.checkbox}
117
117
  checked={initiallyCheckedQuestionItems.some((item) => item === value.concept)}
118
- disabled={value.disable?.isDisabled}
118
+ disabled={value.disabled}
119
119
  id={`${field.id}-${value.concept}`}
120
120
  key={`${field.id}-${value.concept}-${index}`}
121
121
  labelText={t(value.label)}