@medplum/react 0.9.18 → 0.9.21

package/dist/cjs/index.js

@@ -22,10 +22,10 @@
     }
 
     function Input(props) {
-        const className = 'medplum-input'; // + (props.size ? ' ' + props.size : '');
+        const className = 'medplum-input';
         const issues = getIssuesForExpression(props.outcome, props.name);
         const invalid = issues && issues.length > 0;
-        return (React__default["default"].createElement("input", { id: props.name, name: props.name, type: getInputType(props.type), size: props.size, step: props.step, className: className, defaultValue: props.defaultValue || '', required: props.required, autoCapitalize: props.autoCapitalize, autoComplete: props.autoComplete, autoFocus: props.autoFocus, ref: props.inputRef, "aria-invalid": invalid, "aria-describedby": invalid ? props.name + '-errors' : '', placeholder: props.placeholder, "data-testid": props.testid, disabled: props.disabled, onChange: (e) => {
+        return (React__default["default"].createElement("input", { id: props.name, name: props.name, type: getInputType(props.type), size: props.size, step: props.step, className: className, style: props.style, defaultValue: props.defaultValue || '', required: props.required, autoCapitalize: props.autoCapitalize, autoComplete: props.autoComplete, autoFocus: props.autoFocus, ref: props.inputRef, "aria-invalid": invalid, "aria-describedby": invalid ? props.name + '-errors' : '', placeholder: props.placeholder, "data-testid": props.testid, disabled: props.disabled, onChange: (e) => {
                 if (props.onChange) {
                     props.onChange(e.currentTarget.value);
                 }
@@ -287,7 +287,7 @@
                 props.onChange(newValues);
             }
         }
-        return (React__default["default"].createElement("table", null,
+        return (React__default["default"].createElement("table", { style: { width: '100%' } },
             React__default["default"].createElement("colgroup", null,
                 React__default["default"].createElement("col", { width: "90%" }),
                 React__default["default"].createElement("col", { width: "10%" })),
@@ -713,6 +713,14 @@
             .join('');
     }
 
+    function CheckboxFormSection(props) {
+        return (React__default["default"].createElement("div", { className: "medplum-checkbox-form-section" },
+            React__default["default"].createElement("div", { className: "medplum-checkbox-form-section-checkbox-container" }, props.children),
+            React__default["default"].createElement("div", { className: "medplum-checkbox-form-section-details-container" },
+                React__default["default"].createElement("label", { htmlFor: props.htmlFor }, props.title),
+                React__default["default"].createElement("p", null, props.description))));
+    }
+
     const DEFAULT_IGNORED_PROPERTIES = [
         'meta',
         'implicitRules',
@@ -726,9 +734,9 @@
     function FormSection(props) {
         const issues = getIssuesForExpression(props.outcome, props.htmlFor);
         const invalid = issues && issues.length > 0;
-        return (React__default["default"].createElement("fieldset", null,
+        return (React__default["default"].createElement("fieldset", { className: "medplum-form-section" },
             props.title && React__default["default"].createElement("label", { htmlFor: props.htmlFor }, props.title),
-            props.description && React__default["default"].createElement("small", null, props.description),
+            props.description && React__default["default"].createElement("p", null, props.description),
             props.children,
             invalid && (React__default["default"].createElement("div", { id: props.htmlFor + '-errors', className: "medplum-input-error" }, issues === null || issues === void 0 ? void 0 : issues.map((issue) => {
                 var _a, _b;
@@ -736,6 +744,50 @@
             })))));
     }
 
+    function ResourceForm(props) {
+        const medplum = useMedplum();
+        const defaultValue = useResource(props.defaultValue);
+        const [schema, setSchema] = React.useState();
+        const [value, setValue] = React.useState();
+        React.useEffect(() => {
+            if (defaultValue) {
+                setValue(JSON.parse(JSON.stringify(defaultValue)));
+                medplum.requestSchema(defaultValue.resourceType).then(setSchema);
+            }
+        }, [medplum, defaultValue]);
+        if (!schema || !value) {
+            return React__default["default"].createElement("div", null, "Loading...");
+        }
+        return (React__default["default"].createElement("form", { noValidate: true, autoComplete: "off", onSubmit: (e) => {
+                e.preventDefault();
+                if (props.onSubmit) {
+                    props.onSubmit(value);
+                }
+            } },
+            React__default["default"].createElement(FormSection, { title: "Resource Type" },
+                React__default["default"].createElement(Input, { name: "resourceType", defaultValue: value.resourceType, disabled: true })),
+            React__default["default"].createElement(FormSection, { title: "ID" },
+                React__default["default"].createElement(Input, { name: "id", defaultValue: value.id, disabled: true })),
+            React__default["default"].createElement(BackboneElementInput, { typeName: value.resourceType, defaultValue: value, outcome: props.outcome, onChange: setValue }),
+            React__default["default"].createElement(Button, { type: "submit", size: "large" }, "OK"),
+            props.onDelete && (React__default["default"].createElement(Button, { type: "button", size: "large", onClick: () => {
+                    props.onDelete(value);
+                } }, "Delete"))));
+    }
+    function setPropertyValue(obj, key, propName, elementDefinition, value) {
+        const types = elementDefinition.type;
+        if (types.length > 1) {
+            for (const type of types) {
+                const compoundKey = key.replace('[x]', core.capitalize(type.code));
+                if (compoundKey in obj) {
+                    delete obj[compoundKey];
+                }
+            }
+        }
+        obj[propName] = value;
+        return obj;
+    }
+
     function DescriptionList(props) {
         return React__default["default"].createElement("dl", { className: 'medplum-description-list' + (props.compact ? ' compact' : '') }, props.children);
     }
@@ -824,6 +876,18 @@
         return React__default["default"].createElement(React__default["default"].Fragment, null, builder.join('').trim());
     }
 
+    function ContactDetailDisplay(props) {
+        var _a;
+        const contactDetail = props.value;
+        if (!contactDetail) {
+            return null;
+        }
+        return (React__default["default"].createElement(React__default["default"].Fragment, null,
+            contactDetail.name,
+            contactDetail.name && ': ', (_a = contactDetail.telecom) === null || _a === void 0 ? void 0 :
+            _a.map((telecom, index) => (React__default["default"].createElement(ContactPointDisplay, { key: 'telecom-' + index, value: telecom })))));
+    }
+
     function DateTimeDisplay(props) {
         if (!props.value) {
             return null;
@@ -972,6 +1036,8 @@
                 return React__default["default"].createElement(CodeableConceptDisplay, { value: value });
             case core.PropertyType.Coding:
                 return React__default["default"].createElement(CodingDisplay, { value: value });
+            case core.PropertyType.ContactDetail:
+                return React__default["default"].createElement(ContactDetailDisplay, { value: value });
             case core.PropertyType.ContactPoint:
                 return React__default["default"].createElement(ContactPointDisplay, { value: value });
             case core.PropertyType.HumanName:
@@ -1037,6 +1103,15 @@
         return (React__default["default"].createElement(Input, { name: props.name, type: "text", placeholder: "Annotation text", defaultValue: value.text, onChange: setText }));
     }
 
+    function Checkbox(props) {
+        const className = 'medplum-checkbox';
+        return (React__default["default"].createElement("input", { id: props.name, name: props.name, className: className, type: "checkbox", value: "true", defaultChecked: !!props.defaultValue, required: props.required, ref: props.inputRef, "data-testid": props.testid, disabled: props.disabled, onChange: (e) => {
+                if (props.onChange) {
+                    props.onChange(e.currentTarget.checked);
+                }
+            } }));
+    }
+
     function CodeableConceptInput(props) {
         const medplum = useMedplum();
         let defaultValue = undefined;
@@ -1132,19 +1207,34 @@
         const ref = React.useRef();
         ref.current = contactPoint;
         function setContactPointWrapper(newValue) {
+            if (newValue && Object.keys(newValue).length === 0) {
+                newValue = undefined;
+            }
             setContactPoint(newValue);
             if (props.onChange) {
                 props.onChange(newValue);
             }
         }
         function setSystem(system) {
-            setContactPointWrapper(Object.assign(Object.assign({}, ref.current), { system: system ? system : undefined }));
+            const newValue = Object.assign(Object.assign({}, ref.current), { system });
+            if (!system) {
+                delete newValue.system;
+            }
+            setContactPointWrapper(newValue);
         }
         function setUse(use) {
-            setContactPointWrapper(Object.assign(Object.assign({}, ref.current), { use: use ? use : undefined }));
+            const newValue = Object.assign(Object.assign({}, ref.current), { use });
+            if (!use) {
+                delete newValue.use;
+            }
+            setContactPointWrapper(newValue);
         }
         function setValue(value) {
-            setContactPointWrapper(Object.assign(Object.assign({}, ref.current), { value: value ? value : undefined }));
+            const newValue = Object.assign(Object.assign({}, ref.current), { value });
+            if (!value) {
+                delete newValue.value;
+            }
+            setContactPointWrapper(newValue);
         }
         return (React__default["default"].createElement(InputRow, null,
             React__default["default"].createElement(Select, { defaultValue: contactPoint === null || contactPoint === void 0 ? void 0 : contactPoint.system, onChange: setSystem, testid: "system" },
@@ -1165,6 +1255,36 @@
             React__default["default"].createElement(Input, { placeholder: "Value", defaultValue: contactPoint === null || contactPoint === void 0 ? void 0 : contactPoint.value, onChange: setValue })));
     }
 
+    function ContactDetailInput(props) {
+        var _a;
+        const [contactPoint, setContactDetail] = React.useState(props.defaultValue);
+        const ref = React.useRef();
+        ref.current = contactPoint;
+        function setContactDetailWrapper(newValue) {
+            setContactDetail(newValue);
+            if (props.onChange) {
+                props.onChange(newValue);
+            }
+        }
+        function setName(name) {
+            const newValue = Object.assign(Object.assign({}, ref.current), { name });
+            if (!name) {
+                delete newValue.name;
+            }
+            setContactDetailWrapper(newValue);
+        }
+        function setTelecom(telecom) {
+            const newValue = Object.assign(Object.assign({}, ref.current), { telecom: telecom && [telecom] });
+            if (!telecom) {
+                delete newValue.telecom;
+            }
+            setContactDetailWrapper(newValue);
+        }
+        return (React__default["default"].createElement(InputRow, null,
+            React__default["default"].createElement(Input, { name: props.name + '-name', placeholder: "Name", style: { width: 180 }, defaultValue: contactPoint === null || contactPoint === void 0 ? void 0 : contactPoint.name, onChange: setName }),
+            React__default["default"].createElement(ContactPointInput, { name: props.name + '-telecom', defaultValue: (_a = contactPoint === null || contactPoint === void 0 ? void 0 : contactPoint.telecom) === null || _a === void 0 ? void 0 : _a[0], onChange: setTelecom })));
+    }
+
     /**
      * The DateTimeInput component is a wrapper around the HTML5 input type="datetime-local".
      * The main purpose is to reconcile time zones.
@@ -1223,7 +1343,7 @@
     }
 
     function TextArea(props) {
-        const className = 'medplum-textarea';
+        const className = 'medplum-textarea' + (props.monospace ? ' monospace' : '');
         const issues = getIssuesForExpression(props.outcome, props.name);
         const invalid = issues && issues.length > 0;
         return (React__default["default"].createElement("textarea", { id: props.name, name: props.name, className: className, defaultValue: props.defaultValue || '', required: props.required, autoComplete: props.autoComplete, autoFocus: props.autoFocus, ref: props.inputRef, "aria-invalid": invalid, "aria-describedby": invalid ? props.name + '-errors' : '', placeholder: props.placeholder, "data-testid": props.testid, style: props.style, onChange: (e) => {
@@ -1234,7 +1354,7 @@
     }
 
     function ExtensionInput(props) {
-        return (React__default["default"].createElement(TextArea, { testid: "extension-input", name: props.name, defaultValue: core.stringify(props.defaultValue), onChange: (newValue) => {
+        return (React__default["default"].createElement(TextArea, { testid: "extension-input", name: props.name, defaultValue: core.stringify(props.defaultValue), monospace: true, onChange: (newValue) => {
                 if (props.onChange) {
                     props.onChange(JSON.parse(newValue));
                 }
@@ -1457,35 +1577,34 @@
                 props.onChange(newValues);
             }
         }
-        return (React__default["default"].createElement("div", null,
-            React__default["default"].createElement("table", { style: { width: '100%' } },
-                React__default["default"].createElement("colgroup", null,
-                    React__default["default"].createElement("col", { width: "90%" }),
-                    React__default["default"].createElement("col", { width: "10%" })),
-                React__default["default"].createElement("tbody", null,
-                    values.map((v, index) => (React__default["default"].createElement("tr", { key: `${index}-${values.length}` },
-                        React__default["default"].createElement("td", null,
-                            React__default["default"].createElement(ResourcePropertyInput, { arrayElement: true, property: props.property, name: props.name + '.' + index, defaultValue: v, onChange: (newValue) => {
-                                    const copy = [...valuesRef.current];
-                                    copy[index] = newValue;
-                                    setValuesWrapper(copy);
-                                } })),
-                        React__default["default"].createElement("td", { style: { textAlign: 'right' } },
-                            React__default["default"].createElement(Button, { onClick: (e) => {
-                                    killEvent(e);
-                                    const copy = [...valuesRef.current];
-                                    copy.splice(index, 1);
-                                    setValuesWrapper(copy);
-                                } }, "Remove"))))),
-                    React__default["default"].createElement("tr", null,
-                        React__default["default"].createElement("td", null),
-                        React__default["default"].createElement("td", { style: { textAlign: 'right' } },
-                            React__default["default"].createElement(Button, { onClick: (e) => {
-                                    killEvent(e);
-                                    const copy = [...valuesRef.current];
-                                    copy.push(undefined);
-                                    setValuesWrapper(copy);
-                                } }, "Add")))))));
+        return (React__default["default"].createElement("table", { style: { width: '100%', borderCollapse: 'collapse' } },
+            React__default["default"].createElement("colgroup", null,
+                React__default["default"].createElement("col", { width: "90%" }),
+                React__default["default"].createElement("col", { width: "10%" })),
+            React__default["default"].createElement("tbody", null,
+                values.map((v, index) => (React__default["default"].createElement("tr", { key: `${index}-${values.length}` },
+                    React__default["default"].createElement("td", null,
+                        React__default["default"].createElement(ResourcePropertyInput, { arrayElement: true, property: props.property, name: props.name + '.' + index, defaultValue: v, onChange: (newValue) => {
+                                const copy = [...valuesRef.current];
+                                copy[index] = newValue;
+                                setValuesWrapper(copy);
+                            } })),
+                    React__default["default"].createElement("td", { style: { textAlign: 'right' } },
+                        React__default["default"].createElement(Button, { onClick: (e) => {
+                                killEvent(e);
+                                const copy = [...valuesRef.current];
+                                copy.splice(index, 1);
+                                setValuesWrapper(copy);
+                            } }, "Remove"))))),
+                React__default["default"].createElement("tr", null,
+                    React__default["default"].createElement("td", null),
+                    React__default["default"].createElement("td", { style: { textAlign: 'right' } },
+                        React__default["default"].createElement(Button, { onClick: (e) => {
+                                killEvent(e);
+                                const copy = [...valuesRef.current];
+                                copy.push(undefined);
+                                setValuesWrapper(copy);
+                            } }, "Add"))))));
     }
 
     function ResourcePropertyInput(props) {
@@ -1529,6 +1648,7 @@
                 } }))));
     }
     function ElementDefinitionTypeInput(props) {
+        var _a;
         const property = props.property;
         const propertyType = props.elementDefinitionType.code;
         const name = props.name;
@@ -1560,7 +1680,11 @@
             case core.PropertyType.code:
                 return React__default["default"].createElement(CodeInput, { property: property, name: name, defaultValue: value, onChange: props.onChange });
             case core.PropertyType.boolean:
-                return (React__default["default"].createElement("input", { type: "checkbox", name: name, "data-testid": name, defaultChecked: !!value, value: "true", onChange: (e) => props.onChange && props.onChange(e.target.value === 'true') }));
+                return (React__default["default"].createElement(Checkbox, { name: name, testid: name, defaultValue: !!value, onChange: (newValue) => {
+                        if (props.onChange) {
+                            props.onChange(newValue);
+                        }
+                    } }));
             case core.PropertyType.markdown:
                 return React__default["default"].createElement(TextArea, { name: name, testid: name, defaultValue: value, onChange: props.onChange });
             // 2.24.0.2 Complex Types
@@ -1575,6 +1699,8 @@
                 return React__default["default"].createElement(CodeableConceptInput, { property: property, name: name, defaultValue: value, onChange: props.onChange });
             case core.PropertyType.Coding:
                 return React__default["default"].createElement(CodingInput, { property: property, name: name, defaultValue: value, onChange: props.onChange });
+            case core.PropertyType.ContactDetail:
+                return React__default["default"].createElement(ContactDetailInput, { name: name, defaultValue: value, onChange: props.onChange });
             case core.PropertyType.ContactPoint:
                 return React__default["default"].createElement(ContactPointInput, { name: name, defaultValue: value, onChange: props.onChange });
             case core.PropertyType.Extension:
@@ -1594,7 +1720,7 @@
             case core.PropertyType.Reference:
                 return (React__default["default"].createElement(ReferenceInput, { name: name, defaultValue: value, targetTypes: getTargetTypes(property), onChange: props.onChange }));
             default:
-                return (React__default["default"].createElement(BackboneElementInput, { property: property, name: name, defaultValue: value, onChange: props.onChange, outcome: props.outcome }));
+                return (React__default["default"].createElement(BackboneElementInput, { typeName: core.buildTypeName((_a = property.path) === null || _a === void 0 ? void 0 : _a.split('.')), defaultValue: value, onChange: props.onChange, outcome: props.outcome }));
         }
     }
     function getTargetTypes(property) {
@@ -1602,65 +1728,8 @@
         return (_c = (_b = (_a = property === null || property === void 0 ? void 0 : property.type) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.targetProfile) === null || _c === void 0 ? void 0 : _c.map((p) => p.split('/').pop());
     }
 
-    function ResourceForm(props) {
-        const medplum = useMedplum();
-        const defaultValue = useResource(props.defaultValue);
-        const [schema, setSchema] = React.useState();
-        const [value, setValue] = React.useState();
-        React.useEffect(() => {
-            if (defaultValue) {
-                setValue(JSON.parse(JSON.stringify(defaultValue)));
-                medplum.requestSchema(defaultValue.resourceType).then(setSchema);
-            }
-        }, [medplum, defaultValue]);
-        if (!schema || !value) {
-            return React__default["default"].createElement("div", null, "Loading...");
-        }
-        const typeSchema = schema.types[value.resourceType];
-        const typedValue = { type: value.resourceType, value };
-        return (React__default["default"].createElement("form", { noValidate: true, autoComplete: "off", onSubmit: (e) => {
-                e.preventDefault();
-                if (props.onSubmit) {
-                    props.onSubmit(value);
-                }
-            } },
-            React__default["default"].createElement(FormSection, { title: "Resource Type" },
-                React__default["default"].createElement(Input, { name: "resourceType", defaultValue: value.resourceType, disabled: true })),
-            React__default["default"].createElement(FormSection, { title: "ID" },
-                React__default["default"].createElement(Input, { name: "id", defaultValue: value.id, disabled: true })),
-            Object.entries(typeSchema.properties).map((entry) => {
-                const key = entry[0];
-                if (key === 'id' || DEFAULT_IGNORED_PROPERTIES.indexOf(key) >= 0) {
-                    return null;
-                }
-                const property = entry[1];
-                const [propertyValue, propertyType] = getValueAndType(typedValue, key);
-                return (React__default["default"].createElement(FormSection, { key: key, title: core.getPropertyDisplayName(key), description: property.definition, htmlFor: key, outcome: props.outcome },
-                    React__default["default"].createElement(ResourcePropertyInput, { property: property, name: key, defaultValue: propertyValue, defaultPropertyType: propertyType, outcome: props.outcome, onChange: (newValue, propName) => {
-                            setValue(setPropertyValue(value, key, propName !== null && propName !== void 0 ? propName : key, entry[1], newValue));
-                        } })));
-            }),
-            React__default["default"].createElement(Button, { type: "submit", size: "large" }, "OK"),
-            props.onDelete && (React__default["default"].createElement(Button, { type: "button", size: "large", onClick: () => {
-                    props.onDelete(value);
-                } }, "Delete"))));
-    }
-    function setPropertyValue(obj, key, propName, elementDefinition, value) {
-        const types = elementDefinition.type;
-        if (types.length > 1) {
-            for (const type of types) {
-                const compoundKey = key.replace('[x]', core.capitalize(type.code));
-                if (compoundKey in obj) {
-                    delete obj[compoundKey];
-                }
-            }
-        }
-        obj[propName] = value;
-        return obj;
-    }
-
     function BackboneElementInput(props) {
-        var _a, _b;
+        var _a;
         const [value, setValue] = React.useState((_a = props.defaultValue) !== null && _a !== void 0 ? _a : {});
         function setValueWrapper(newValue) {
             setValue(newValue);
@@ -1668,13 +1737,14 @@
                 props.onChange(newValue);
             }
         }
-        const typeName = core.buildTypeName((_b = props.property.path) === null || _b === void 0 ? void 0 : _b.split('.'));
+        const typeName = props.typeName;
         const typeSchema = core.globalSchema.types[typeName];
         if (!typeSchema) {
             return React__default["default"].createElement("div", null,
                 typeName,
                 "\u00A0not implemented");
         }
+        const typedValue = { type: typeName, value };
         return (React__default["default"].createElement(React__default["default"].Fragment, null, Object.entries(typeSchema.properties).map((entry) => {
             const key = entry[0];
             if (key === 'id' || DEFAULT_IGNORED_PROPERTIES.indexOf(key) >= 0) {
@@ -1684,7 +1754,13 @@
             if (!property.type) {
                 return null;
             }
-            const [propertyValue, propertyType] = getValueAndType(value, key);
+            const [propertyValue, propertyType] = getValueAndType(typedValue, key);
+            if (property.type.length === 1 && property.type[0].code === 'boolean') {
+                return (React__default["default"].createElement(CheckboxFormSection, { key: key, title: core.getPropertyDisplayName(key), description: property.definition, htmlFor: key },
+                    React__default["default"].createElement(ResourcePropertyInput, { property: property, name: key, defaultValue: propertyValue, defaultPropertyType: propertyType, outcome: props.outcome, onChange: (newValue, propName) => {
+                            setValueWrapper(setPropertyValue(value, key, propName !== null && propName !== void 0 ? propName : key, entry[1], newValue));
+                        } })));
+            }
             return (React__default["default"].createElement(FormSection, { key: key, title: core.getPropertyDisplayName(key), description: property.definition, htmlFor: key, outcome: props.outcome },
                 React__default["default"].createElement(ResourcePropertyInput, { property: property, name: key, defaultValue: propertyValue, defaultPropertyType: propertyType, outcome: props.outcome, onChange: (newValue, propName) => {
                         setValueWrapper(setPropertyValue(value, key, propName !== null && propName !== void 0 ? propName : key, entry[1], newValue));
@@ -2108,8 +2184,7 @@
                 setHistory({});
                 return;
             }
-            const batchRequest = buildSearchRequests(resource);
-            medplum.post('fhir/R4', batchRequest).then(handleBatchResponse);
+            medplum.executeBatch(buildSearchRequests(resource)).then(handleBatchResponse);
         }, [medplum, resource, buildSearchRequests]);
         React.useEffect(() => {
             loadTimeline();
@@ -3202,7 +3277,7 @@
                         }
                     } }));
             case core.SearchParameterType.BOOLEAN:
-                return (React__default["default"].createElement("input", { type: "checkbox", name: name, "data-testid": name, defaultChecked: props.defaultValue === 'true', value: "true", onChange: (e) => props.onChange(e.target.checked ? 'true' : 'false') }));
+                return (React__default["default"].createElement(Checkbox, { name: name, testid: name, defaultValue: props.defaultValue === 'true', onChange: (newValue) => props.onChange(newValue.toString()) }));
             case core.SearchParameterType.DATE:
                 return React__default["default"].createElement(Input, { type: "date", testid: name, defaultValue: props.defaultValue, onChange: props.onChange });
             case core.SearchParameterType.DATETIME:
@@ -3898,7 +3973,7 @@
     function HeaderSearchInput(props) {
         const medplum = useMedplum();
         return (React__default["default"].createElement(Autocomplete, { loadOptions: (input, signal) => __awaiter(this, void 0, void 0, function* () {
-                return getResourcesFromResponse((yield medplum.graphql(buildGraphQLQuery(input), { signal })), input);
+                return getResourcesFromResponse((yield medplum.graphql(buildGraphQLQuery(input), undefined, undefined, { signal })), input);
             }), getId: (item) => {
                 return item.id;
             }, getIcon: (item) => React__default["default"].createElement(Avatar, { value: item }), getDisplay: (item) => React__default["default"].createElement(ResourceName, { value: item }), getHelpText: (item) => {
@@ -4472,8 +4547,24 @@
             setResponseItems(newResponseItems);
             props.onChange(newResponseItems);
         }
-        return (React__default["default"].createElement(React__default["default"].Fragment, null, props.items.map((item, index) => item.type === exports.QuestionnaireItemType.group ? (React__default["default"].createElement(QuestionnaireFormItem, { key: item.linkId, item: item, onChange: (newResponseItem) => setResponseItem(index, newResponseItem) })) : (React__default["default"].createElement(FormSection, { key: item.linkId, htmlFor: item.linkId, title: item.text || '' },
-            React__default["default"].createElement(QuestionnaireFormItem, { item: item, onChange: (newResponseItem) => setResponseItem(index, newResponseItem) }))))));
+        return (React__default["default"].createElement(React__default["default"].Fragment, null, props.items.map((item, index) => {
+            if (item.type === exports.QuestionnaireItemType.display) {
+                return React__default["default"].createElement("p", { key: item.linkId }, item.text);
+            }
+            if (item.type === exports.QuestionnaireItemType.group) {
+                return (React__default["default"].createElement(QuestionnaireFormItem, { key: item.linkId, item: item, onChange: (newResponseItem) => setResponseItem(index, newResponseItem) }));
+            }
+            if (item.type === exports.QuestionnaireItemType.boolean) {
+                const initial = item.initial && item.initial.length > 0 ? item.initial[0] : undefined;
+                return (React__default["default"].createElement(CheckboxFormSection, { key: item.linkId, title: item.text, htmlFor: item.linkId },
+                    React__default["default"].createElement(Checkbox, { name: item.linkId, defaultValue: initial === null || initial === void 0 ? void 0 : initial.valueBoolean, onChange: (newValue) => setResponseItem(index, {
+                            linkId: item.linkId,
+                            answer: [{ valueBoolean: newValue }],
+                        }) })));
+            }
+            return (React__default["default"].createElement(FormSection, { key: item.linkId, htmlFor: item.linkId, title: item.text || '' },
+                React__default["default"].createElement(QuestionnaireFormItem, { item: item, onChange: (newResponseItem) => setResponseItem(index, newResponseItem) })));
+        })));
     }
     function QuestionnaireFormItem(props) {
         const item = props.item;
@@ -4504,7 +4595,7 @@
                     React__default["default"].createElement("h3", null, item.text),
                     item.item && React__default["default"].createElement(QuestionnaireFormItemArray, { items: item.item, onChange: onChangeItem })));
             case exports.QuestionnaireItemType.boolean:
-                return (React__default["default"].createElement("input", { type: "checkbox", id: name, name: name, value: "true", defaultChecked: initial === null || initial === void 0 ? void 0 : initial.valueBoolean, onChange: (e) => onChangeAnswer({ valueBoolean: e.currentTarget.checked }) }));
+                return (React__default["default"].createElement(Checkbox, { name: name, defaultValue: initial === null || initial === void 0 ? void 0 : initial.valueBoolean, onChange: (newValue) => onChangeAnswer({ valueBoolean: newValue }) }));
             case exports.QuestionnaireItemType.decimal:
                 return (React__default["default"].createElement(Input, { type: "number", step: "any", name: name, defaultValue: initial === null || initial === void 0 ? void 0 : initial.valueDecimal, onChange: (newValue) => onChangeAnswer({ valueDecimal: parseFloat(newValue) }) }));
             case exports.QuestionnaireItemType.integer:
@@ -4521,31 +4612,64 @@
                 return (React__default["default"].createElement(TextArea, { name: name, defaultValue: initial === null || initial === void 0 ? void 0 : initial.valueString, onChange: (newValue) => onChangeAnswer({ valueString: newValue }) }));
             case exports.QuestionnaireItemType.url:
                 return (React__default["default"].createElement(Input, { type: "url", name: name, defaultValue: initial === null || initial === void 0 ? void 0 : initial.valueUri, onChange: (newValue) => onChangeAnswer({ valueUri: newValue }) }));
-            case exports.QuestionnaireItemType.choice:
-            case exports.QuestionnaireItemType.openChoice:
-                return (React__default["default"].createElement("div", null, item.answerOption &&
-                    item.answerOption.map((option, index) => {
-                        const valueElementDefinition = core.globalSchema.types['QuestionnaireItemAnswerOption'].properties['value[x]'];
-                        const optionValue = core.getTypedPropertyValue({ type: 'QuestionnaireItemAnswerOption', value: option }, 'value');
-                        const initialValue = core.getTypedPropertyValue({ type: 'QuestionnaireItemInitial', value: initial }, 'value');
-                        const propertyName = 'value' + core.capitalize(optionValue.type);
-                        const optionName = `${name}-option-${index}`;
-                        return (React__default["default"].createElement("div", { key: optionName, className: "medplum-questionnaire-option-row" },
-                            React__default["default"].createElement("div", { className: "medplum-questionnaire-option-checkbox" },
-                                React__default["default"].createElement("input", { type: "radio", id: optionName, name: name, value: optionValue.value, defaultChecked: initialValue && core.stringify(optionValue) === core.stringify(initialValue), onChange: () => onChangeAnswer({ [propertyName]: optionValue.value }) })),
-                            React__default["default"].createElement("div", null,
-                                React__default["default"].createElement("label", { htmlFor: optionName },
-                                    React__default["default"].createElement(ResourcePropertyDisplay, { property: valueElementDefinition, propertyType: optionValue.type, value: optionValue.value })))));
-                    })));
             case exports.QuestionnaireItemType.attachment:
                 return (React__default["default"].createElement(AttachmentInput, { name: name, defaultValue: initial === null || initial === void 0 ? void 0 : initial.valueAttachment, onChange: (newValue) => onChangeAnswer({ valueAttachment: newValue }) }));
             case exports.QuestionnaireItemType.reference:
                 return (React__default["default"].createElement(ReferenceInput, { name: name, defaultValue: initial === null || initial === void 0 ? void 0 : initial.valueReference, onChange: (newValue) => onChangeAnswer({ valueReference: newValue }) }));
             case exports.QuestionnaireItemType.quantity:
                 return (React__default["default"].createElement(QuantityInput, { name: name, defaultValue: initial === null || initial === void 0 ? void 0 : initial.valueQuantity, onChange: (newValue) => onChangeAnswer({ valueQuantity: newValue }) }));
+            case exports.QuestionnaireItemType.choice:
+            case exports.QuestionnaireItemType.openChoice:
+                if (isDropDownChoice(item)) {
+                    return (React__default["default"].createElement(QuestionnaireChoiceDropDownInput, { name: name, item: item, initial: initial, onChangeAnswer: onChangeAnswer }));
+                }
+                else {
+                    return (React__default["default"].createElement(QuestionnaireChoiceRadioInput, { name: name, item: item, initial: initial, onChangeAnswer: onChangeAnswer }));
+                }
         }
         return null;
     }
+    function QuestionnaireChoiceDropDownInput(props) {
+        const { name, item, initial } = props;
+        const valueElementDefinition = core.globalSchema.types['QuestionnaireItemAnswerOption'].properties['value[x]'];
+        const initialValue = core.getTypedPropertyValue({ type: 'QuestionnaireItemInitial', value: initial }, 'value');
+        return (React__default["default"].createElement("select", { id: name, name: name, className: "medplum-select", onChange: (e) => {
+                const index = e.currentTarget.selectedIndex;
+                if (index === 0) {
+                    props.onChangeAnswer({});
+                    return;
+                }
+                const option = item.answerOption[index - 1];
+                const optionValue = core.getTypedPropertyValue({ type: 'QuestionnaireItemAnswerOption', value: option }, 'value');
+                const propertyName = 'value' + core.capitalize(optionValue.type);
+                props.onChangeAnswer({ [propertyName]: optionValue.value });
+            } },
+            React__default["default"].createElement("option", null),
+            item.answerOption &&
+                item.answerOption.map((option, index) => {
+                    const optionValue = core.getTypedPropertyValue({ type: 'QuestionnaireItemAnswerOption', value: option }, 'value');
+                    const optionName = `${name}-option-${index}`;
+                    return (React__default["default"].createElement("option", { key: optionName, value: optionValue.value, selected: initialValue && core.stringify(optionValue) === core.stringify(initialValue) },
+                        React__default["default"].createElement(ResourcePropertyDisplay, { property: valueElementDefinition, propertyType: optionValue.type, value: optionValue.value })));
+                })));
+    }
+    function QuestionnaireChoiceRadioInput(props) {
+        const { name, item, initial, onChangeAnswer } = props;
+        const valueElementDefinition = core.globalSchema.types['QuestionnaireItemAnswerOption'].properties['value[x]'];
+        const initialValue = core.getTypedPropertyValue({ type: 'QuestionnaireItemInitial', value: initial }, 'value');
+        return (React__default["default"].createElement(React__default["default"].Fragment, null, item.answerOption &&
+            item.answerOption.map((option, index) => {
+                const optionValue = core.getTypedPropertyValue({ type: 'QuestionnaireItemAnswerOption', value: option }, 'value');
+                const propertyName = 'value' + core.capitalize(optionValue.type);
+                const optionName = `${name}-option-${index}`;
+                return (React__default["default"].createElement("div", { key: optionName, className: "medplum-questionnaire-option-row" },
+                    React__default["default"].createElement("div", { className: "medplum-questionnaire-option-checkbox" },
+                        React__default["default"].createElement("input", { type: "radio", id: optionName, name: name, value: optionValue.value, defaultChecked: initialValue && core.stringify(optionValue) === core.stringify(initialValue), onChange: () => onChangeAnswer({ [propertyName]: optionValue.value }) })),
+                    React__default["default"].createElement("div", null,
+                        React__default["default"].createElement("label", { htmlFor: optionName },
+                            React__default["default"].createElement(ResourcePropertyDisplay, { property: valueElementDefinition, propertyType: optionValue.type, value: optionValue.value })))));
+            })));
+    }
     function buildInitialResponse(questionnaire) {
         const response = {
             resourceType: 'QuestionnaireResponse',
@@ -4571,6 +4695,14 @@
         // have the same properties.
         return Object.assign({}, answer);
     }
+    function isDropDownChoice(item) {
+        var _a;
+        return !!((_a = item.extension) === null || _a === void 0 ? void 0 : _a.some((e) => {
+            var _a, _b, _c;
+            return e.url === 'http://hl7.org/fhir/StructureDefinition/questionnaire-itemControl' &&
+                ((_c = (_b = (_a = e.valueCodeableConcept) === null || _a === void 0 ? void 0 : _a.coding) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.code) === 'drop-down';
+        }));
+    }
 
     function QuestionnaireBuilder(props) {
         const medplum = useMedplum();
@@ -4784,7 +4916,7 @@
         const [responseBundle, setResponseBundle] = React.useState();
         React.useEffect(() => {
             if (requestGroup && !startedLoading) {
-                medplum.post('fhir/R4', buildBatchRequest(requestGroup)).then(setResponseBundle);
+                medplum.executeBatch(buildBatchRequest(requestGroup)).then(setResponseBundle);
                 setStartedLoading(true);
             }
         }, [medplum, requestGroup, startedLoading]);
@@ -5201,7 +5333,7 @@
 
     function GoogleButton(props) {
         const medplum = useMedplum();
-        const { handleAuthResponse } = props;
+        const { handleGoogleCredential } = props;
         const googleClientId = getGoogleClientId(props.googleClientId);
         const parentRef = React.useRef(null);
         const [scriptLoaded, setScriptLoaded] = React.useState(typeof google !== 'undefined');
@@ -5215,7 +5347,7 @@
             if (!initialized) {
                 google.accounts.id.initialize({
                     client_id: googleClientId,
-                    callback: (response) => medplum.startGoogleLogin(response).then(handleAuthResponse),
+                    callback: handleGoogleCredential,
                 });
                 setInitialized(true);
             }
@@ -5223,7 +5355,7 @@
                 google.accounts.id.renderButton(parentRef.current, {});
                 setButtonRendered(true);
             }
-        }, [medplum, googleClientId, initialized, scriptLoaded, parentRef, buttonRendered, handleAuthResponse]);
+        }, [medplum, googleClientId, initialized, scriptLoaded, parentRef, buttonRendered, handleGoogleCredential]);
         if (!googleClientId) {
             return null;
         }
@@ -5254,19 +5386,24 @@
                 setMemberships(response.memberships);
             }
             if (response.code) {
-                medplum
-                    .processCode(response.code)
-                    .then(() => {
-                    if (props.onSuccess) {
-                        props.onSuccess();
-                    }
-                })
-                    .catch(console.log);
+                if (props.onCode) {
+                    props.onCode(response.code);
+                }
+                else {
+                    medplum
+                        .processCode(response.code)
+                        .then(() => {
+                        if (props.onSuccess) {
+                            props.onSuccess();
+                        }
+                    })
+                        .catch(console.log);
+                }
             }
         }
         return (React__default["default"].createElement(Document, { width: 450 }, (() => {
             if (!login) {
-                return (React__default["default"].createElement(AuthenticationForm, { googleClientId: props.googleClientId, onForgotPassword: props.onForgotPassword, onRegister: props.onRegister, handleAuthResponse: handleAuthResponse }, props.children));
+                return (React__default["default"].createElement(AuthenticationForm, { clientId: props.clientId, scope: props.scope, nonce: props.nonce, googleClientId: props.googleClientId, onForgotPassword: props.onForgotPassword, onRegister: props.onRegister, handleAuthResponse: handleAuthResponse }, props.children));
             }
             else if (memberships) {
                 return React__default["default"].createElement(ProfileForm, { login: login, memberships: memberships, handleAuthResponse: handleAuthResponse });
@@ -5283,6 +5420,9 @@
         return (React__default["default"].createElement(Form, { style: { maxWidth: 400 }, onSubmit: (formData) => {
                 medplum
                     .startLogin({
+                    clientId: props.clientId,
+                    scope: props.scope,
+                    nonce: props.nonce,
                     email: formData.email,
                     password: formData.password,
                     remember: formData.remember === 'true',
@@ -5309,7 +5449,18 @@
                 React__default["default"].createElement("div", null,
                     React__default["default"].createElement(Button, { type: "submit", testid: "submit" }, "Sign in"))),
             React__default["default"].createElement("div", { className: "medplum-signin-google-container" },
-                React__default["default"].createElement(GoogleButton, { googleClientId: props.googleClientId, handleAuthResponse: props.handleAuthResponse }))));
+                React__default["default"].createElement(GoogleButton, { googleClientId: props.googleClientId, handleGoogleCredential: (response) => {
+                        medplum
+                            .startGoogleLogin({
+                            clientId: props.clientId,
+                            scope: props.scope,
+                            nonce: props.nonce,
+                            googleClientId: response.clientId,
+                            googleCredential: response.credential,
+                        })
+                            .then(props.handleAuthResponse)
+                            .catch(setOutcome);
+                    } }))));
     }
     function ProfileForm(props) {
         const medplum = useMedplum();
@@ -5390,9 +5541,13 @@
     exports.Avatar = Avatar;
     exports.BackboneElementInput = BackboneElementInput;
     exports.Button = Button;
+    exports.Checkbox = Checkbox;
+    exports.CheckboxFormSection = CheckboxFormSection;
     exports.CodeInput = CodeInput;
     exports.CodeableConceptDisplay = CodeableConceptDisplay;
     exports.CodeableConceptInput = CodeableConceptInput;
+    exports.ContactDetailDisplay = ContactDetailDisplay;
+    exports.ContactDetailInput = ContactDetailInput;
     exports.ContactPointDisplay = ContactPointDisplay;
     exports.ContactPointInput = ContactPointInput;
     exports.DateTimeDisplay = DateTimeDisplay;