@medplum/react 0.9.18 → 0.9.19

package/dist/cjs/defaulttheme.css

@@ -6,7 +6,9 @@
   --medplum-navbar-textbox: rgba(255, 255, 255, 0.2);
   --medplum-navbar-placeholder: rgba(255, 255, 255, 0.6);
   --medplum-shadow: rgba(0, 0, 0, 0.1);
-  /* font sizes */
+  /* fonts */
+  --medplum-font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Helvetica, Arial, sans-serif, Apple Color Emoji, Segoe UI Emoji;
+  --medplum-monospace-font-family: SFMono-Regular, Consolas, Liberation Mono, Menlo, monospace;
   --medplum-font-small: 12px;
   --medplum-font-normal: 13px;
   --medplum-font-big: 18px;
@@ -184,7 +186,7 @@
 
 html {
   height: 100%;
-  font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Helvetica, Arial, sans-serif, Apple Color Emoji, Segoe UI Emoji;
+  font-family: var(--medplum-font-family);
   position: relative;
 }
 
@@ -216,14 +218,14 @@ input[type='tel'],
 input[type='text'],
 input[type='time'],
 input[type='url'],
-select {
-  font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Helvetica, Arial, sans-serif, Apple Color Emoji, Segoe UI Emoji;
+select,
+textarea {
+  font-family: var(--medplum-font-family);
 }
 
 code,
-pre,
-textarea {
-  font-family: SFMono-Regular, Consolas, Liberation Mono, Menlo, monospace;
+pre {
+  font-family: var(--medplum-monospace-font-family);
 }
 
 a {

package/dist/cjs/index.js

@@ -22,7 +22,7 @@
     }
 
     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) => {
@@ -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);
     }
@@ -1037,6 +1089,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;
@@ -1223,7 +1284,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 +1295,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 +1518,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 +1589,7 @@
                 } }))));
     }
     function ElementDefinitionTypeInput(props) {
+        var _a;
         const property = props.property;
         const propertyType = props.elementDefinitionType.code;
         const name = props.name;
@@ -1560,7 +1621,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
@@ -1594,7 +1659,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 +1667,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 +1676,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 +1693,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));
@@ -3202,7 +3217,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 +3913,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 +4487,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 +4535,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:
@@ -5390,6 +5421,8 @@
     exports.Avatar = Avatar;
     exports.BackboneElementInput = BackboneElementInput;
     exports.Button = Button;
+    exports.Checkbox = Checkbox;
+    exports.CheckboxFormSection = CheckboxFormSection;
     exports.CodeInput = CodeInput;
     exports.CodeableConceptDisplay = CodeableConceptDisplay;
     exports.CodeableConceptInput = CodeableConceptInput;