@openmrs/esm-form-engine-lib 4.0.1-pre.2275 → 4.1.0

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.
@@ -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,CA+DlD,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"}
@@ -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.filter((answer)=>!answer.isHidden).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/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@openmrs/esm-form-engine-lib",
3
- "version": "4.0.1-pre.2275",
3
+ "version": "4.1.0",
4
4
  "description": "React Form Engine for O3",
5
5
  "main": "dist/index.js",
6
6
  "module": "dist/index.js",
@@ -101,6 +101,5 @@
101
101
  "*.{ts,tsx}": "eslint --cache --fix --max-warnings 0",
102
102
  "*.{css,scss,ts,tsx}": "prettier --write --list-different"
103
103
  },
104
- "packageManager": "yarn@4.10.3",
105
- "stableVersion": "4.0.0"
104
+ "packageManager": "yarn@4.10.3"
106
105
  }
@@ -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,16 +64,14 @@ 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
63
- .filter((answer) => !answer.isHidden)
64
- .map((option, index) => (
65
- <Switch
66
- name={option.concept || option.value}
67
- text={t(option.label)}
68
- key={index}
69
- disabled={field.isDisabled}
70
- />
71
- ))}
67
+ {visibleAnswers.map((option, index) => (
68
+ <Switch
69
+ name={option.concept || option.value}
70
+ text={t(option.label)}
71
+ key={index}
72
+ disabled={field.isDisabled}
73
+ />
74
+ ))}
72
75
  </CdsContentSwitcher>
73
76
  </FormGroup>
74
77
  )