@medplum/react 2.0.0 → 2.0.2

package/dist/esm/useResource/useResource.mjs

@@ -19,6 +19,9 @@ const system = {
 function useResource(value) {
     const medplum = useMedplum();
     const [resource, setResource] = useState(getInitialResource(medplum, value));
+    useEffect(() => {
+        setResource(getInitialResource(medplum, value));
+    }, [medplum, value]);
     useEffect(() => {
         let subscribed = true;
         if (!resource && value && 'reference' in value && value.reference) {

package/dist/esm/useResource/useResource.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"useResource.mjs","sources":["../../../src/useResource/useResource.ts"],"sourcesContent":["import { MedplumClient } from '@medplum/core';\nimport { Device, Reference, Resource } from '@medplum/fhirtypes';\nimport { useEffect, useState } from 'react';\nimport { useMedplum } from '../MedplumProvider/MedplumProvider';\n\nconst system: Device = {\n  resourceType: 'Device',\n  id: 'system',\n  deviceName: [\n    {\n      name: 'System',\n    },\n  ],\n};\n\n/**\n * React Hook to use a FHIR reference.\n * Handles the complexity of resolving references and caching resources.\n * @param value The resource or reference to resource.\n * @returns The resolved resource.\n */\nexport function useResource<T extends Resource>(value: Reference<T> | T | undefined): T | undefined {\n  const medplum = useMedplum();\n  const [resource, setResource] = useState<T | undefined>(getInitialResource(medplum, value));\n\n  useEffect(() => {\n    let subscribed = true;\n\n    if (!resource && value && 'reference' in value && value.reference) {\n      medplum\n        .readReference(value as Reference<T>)\n        .then((r) => {\n          if (subscribed) {\n            setResource(r);\n          }\n        })\n        .catch(() => setResource(undefined));\n    }\n\n    return (() => (subscribed = false)) as () => void;\n  }, [medplum, resource, value]);\n\n  return resource;\n}\n\n/**\n * Returns the initial resource value based on the input value.\n * If the input value is a resource, returns the resource.\n * If the input value is a reference to system, returns the system resource.\n * If the input value is a reference to a resource available in the cache, returns the resource.\n * Otherwise, returns undefined.\n * @param medplum The medplum client.\n * @param value The resource or reference to resource.\n * @returns An initial resource if available; undefined otherwise.\n */\nfunction getInitialResource<T extends Resource>(\n  medplum: MedplumClient,\n  value: Reference<T> | T | undefined\n): T | undefined {\n  if (!value) {\n    return undefined;\n  }\n\n  if ('resourceType' in value) {\n    return value;\n  }\n\n  if ('reference' in value) {\n    if (value.reference === 'system') {\n      return system as T;\n    }\n\n    return medplum.getCachedReference(value);\n  }\n\n  return undefined;\n}\n"],"names":[],"mappings":";;;AAKA,MAAM,MAAM,GAAW;AACrB,IAAA,YAAY,EAAE,QAAQ;AACtB,IAAA,EAAE,EAAE,QAAQ;AACZ,IAAA,UAAU,EAAE;AACV,QAAA;AACE,YAAA,IAAI,EAAE,QAAQ;AACf,SAAA;AACF,KAAA;CACF,CAAC;AAEF;;;;;AAKG;AACG,SAAU,WAAW,CAAqB,KAAmC,EAAA;AACjF,IAAA,MAAM,OAAO,GAAG,UAAU,EAAE,CAAC;AAC7B,IAAA,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,CAAgB,kBAAkB,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC;IAE5F,SAAS,CAAC,MAAK;QACb,IAAI,UAAU,GAAG,IAAI,CAAC;AAEtB,QAAA,IAAI,CAAC,QAAQ,IAAI,KAAK,IAAI,WAAW,IAAI,KAAK,IAAI,KAAK,CAAC,SAAS,EAAE;YACjE,OAAO;iBACJ,aAAa,CAAC,KAAqB,CAAC;AACpC,iBAAA,IAAI,CAAC,CAAC,CAAC,KAAI;AACV,gBAAA,IAAI,UAAU,EAAE;oBACd,WAAW,CAAC,CAAC,CAAC,CAAC;AAChB,iBAAA;AACH,aAAC,CAAC;iBACD,KAAK,CAAC,MAAM,WAAW,CAAC,SAAS,CAAC,CAAC,CAAC;AACxC,SAAA;QAED,QAAQ,OAAO,UAAU,GAAG,KAAK,CAAC,EAAgB;KACnD,EAAE,CAAC,OAAO,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC;AAE/B,IAAA,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED;;;;;;;;;AASG;AACH,SAAS,kBAAkB,CACzB,OAAsB,EACtB,KAAmC,EAAA;IAEnC,IAAI,CAAC,KAAK,EAAE;AACV,QAAA,OAAO,SAAS,CAAC;AAClB,KAAA;IAED,IAAI,cAAc,IAAI,KAAK,EAAE;AAC3B,QAAA,OAAO,KAAK,CAAC;AACd,KAAA;IAED,IAAI,WAAW,IAAI,KAAK,EAAE;AACxB,QAAA,IAAI,KAAK,CAAC,SAAS,KAAK,QAAQ,EAAE;AAChC,YAAA,OAAO,MAAW,CAAC;AACpB,SAAA;AAED,QAAA,OAAO,OAAO,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;AAC1C,KAAA;AAED,IAAA,OAAO,SAAS,CAAC;AACnB;;;;"}
+{"version":3,"file":"useResource.mjs","sources":["../../../src/useResource/useResource.ts"],"sourcesContent":["import { MedplumClient } from '@medplum/core';\nimport { Device, Reference, Resource } from '@medplum/fhirtypes';\nimport { useEffect, useState } from 'react';\nimport { useMedplum } from '../MedplumProvider/MedplumProvider';\n\nconst system: Device = {\n  resourceType: 'Device',\n  id: 'system',\n  deviceName: [\n    {\n      name: 'System',\n    },\n  ],\n};\n\n/**\n * React Hook to use a FHIR reference.\n * Handles the complexity of resolving references and caching resources.\n * @param value The resource or reference to resource.\n * @returns The resolved resource.\n */\nexport function useResource<T extends Resource>(value: Reference<T> | T | undefined): T | undefined {\n  const medplum = useMedplum();\n  const [resource, setResource] = useState<T | undefined>(getInitialResource(medplum, value));\n\n  useEffect(() => {\n    setResource(getInitialResource(medplum, value));\n  }, [medplum, value]);\n\n  useEffect(() => {\n    let subscribed = true;\n\n    if (!resource && value && 'reference' in value && value.reference) {\n      medplum\n        .readReference(value as Reference<T>)\n        .then((r) => {\n          if (subscribed) {\n            setResource(r);\n          }\n        })\n        .catch(() => setResource(undefined));\n    }\n\n    return (() => (subscribed = false)) as () => void;\n  }, [medplum, resource, value]);\n\n  return resource;\n}\n\n/**\n * Returns the initial resource value based on the input value.\n * If the input value is a resource, returns the resource.\n * If the input value is a reference to system, returns the system resource.\n * If the input value is a reference to a resource available in the cache, returns the resource.\n * Otherwise, returns undefined.\n * @param medplum The medplum client.\n * @param value The resource or reference to resource.\n * @returns An initial resource if available; undefined otherwise.\n */\nfunction getInitialResource<T extends Resource>(\n  medplum: MedplumClient,\n  value: Reference<T> | T | undefined\n): T | undefined {\n  if (!value) {\n    return undefined;\n  }\n\n  if ('resourceType' in value) {\n    return value;\n  }\n\n  if ('reference' in value) {\n    if (value.reference === 'system') {\n      return system as T;\n    }\n\n    return medplum.getCachedReference(value);\n  }\n\n  return undefined;\n}\n"],"names":[],"mappings":";;;AAKA,MAAM,MAAM,GAAW;AACrB,IAAA,YAAY,EAAE,QAAQ;AACtB,IAAA,EAAE,EAAE,QAAQ;AACZ,IAAA,UAAU,EAAE;AACV,QAAA;AACE,YAAA,IAAI,EAAE,QAAQ;AACf,SAAA;AACF,KAAA;CACF,CAAC;AAEF;;;;;AAKG;AACG,SAAU,WAAW,CAAqB,KAAmC,EAAA;AACjF,IAAA,MAAM,OAAO,GAAG,UAAU,EAAE,CAAC;AAC7B,IAAA,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,CAAgB,kBAAkB,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC;IAE5F,SAAS,CAAC,MAAK;QACb,WAAW,CAAC,kBAAkB,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC;AAClD,KAAC,EAAE,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC;IAErB,SAAS,CAAC,MAAK;QACb,IAAI,UAAU,GAAG,IAAI,CAAC;AAEtB,QAAA,IAAI,CAAC,QAAQ,IAAI,KAAK,IAAI,WAAW,IAAI,KAAK,IAAI,KAAK,CAAC,SAAS,EAAE;YACjE,OAAO;iBACJ,aAAa,CAAC,KAAqB,CAAC;AACpC,iBAAA,IAAI,CAAC,CAAC,CAAC,KAAI;AACV,gBAAA,IAAI,UAAU,EAAE;oBACd,WAAW,CAAC,CAAC,CAAC,CAAC;AAChB,iBAAA;AACH,aAAC,CAAC;iBACD,KAAK,CAAC,MAAM,WAAW,CAAC,SAAS,CAAC,CAAC,CAAC;AACxC,SAAA;QAED,QAAQ,OAAO,UAAU,GAAG,KAAK,CAAC,EAAgB;KACnD,EAAE,CAAC,OAAO,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC;AAE/B,IAAA,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED;;;;;;;;;AASG;AACH,SAAS,kBAAkB,CACzB,OAAsB,EACtB,KAAmC,EAAA;IAEnC,IAAI,CAAC,KAAK,EAAE;AACV,QAAA,OAAO,SAAS,CAAC;AAClB,KAAA;IAED,IAAI,cAAc,IAAI,KAAK,EAAE;AAC3B,QAAA,OAAO,KAAK,CAAC;AACd,KAAA;IAED,IAAI,WAAW,IAAI,KAAK,EAAE;AACxB,QAAA,IAAI,KAAK,CAAC,SAAS,KAAK,QAAQ,EAAE;AAChC,YAAA,OAAO,MAAW,CAAC;AACpB,SAAA;AAED,QAAA,OAAO,OAAO,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;AAC1C,KAAA;AAED,IAAA,OAAO,SAAS,CAAC;AACnB;;;;"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@medplum/react",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "description": "Medplum React Component Library",
   "author": "Medplum <hello@medplum.com>",
   "license": "Apache-2.0",
@@ -20,38 +20,38 @@
   },
   "devDependencies": {
     "@emotion/react": "11.10.5",
-    "@mantine/core": "5.10.0",
-    "@mantine/hooks": "5.10.0",
-    "@mantine/notifications": "5.10.0",
+    "@mantine/core": "5.10.3",
+    "@mantine/hooks": "5.10.3",
+    "@mantine/notifications": "5.10.3",
     "@medplum/core": "*",
     "@medplum/definitions": "*",
     "@medplum/fhirtypes": "*",
     "@medplum/mock": "*",
+    "@storybook/addon-actions": "6.5.16",
+    "@storybook/addon-essentials": "6.5.16",
+    "@storybook/addon-links": "6.5.16",
+    "@storybook/builder-webpack5": "6.5.16",
+    "@storybook/manager-webpack5": "6.5.16",
+    "@storybook/react": "6.5.16",
+    "@svgr/rollup": "6.5.1",
     "@tabler/icons": "1.119.0",
-    "@storybook/addon-actions": "6.5.15",
-    "@storybook/addon-essentials": "6.5.15",
-    "@storybook/addon-links": "6.5.15",
-    "@storybook/builder-webpack5": "6.5.15",
-    "@storybook/manager-webpack5": "6.5.15",
-    "@storybook/react": "6.5.15",
-    "@testing-library/dom": "8.19.1",
+    "@testing-library/dom": "8.20.0",
     "@testing-library/jest-dom": "5.16.5",
     "@testing-library/react": "13.4.0",
-    "@types/jest": "29.2.5",
-    "@types/node": "18.11.18",
-    "@types/react": "18.0.26",
+    "@types/jest": "29.4.0",
+    "@types/node": "18.11.19",
+    "@types/react": "18.0.27",
     "@types/react-dom": "18.0.10",
     "@types/react-router-dom": "5.3.3",
     "dotenv-webpack": "8.0.1",
     "identity-obj-proxy": "3.0.0",
-    "jest": "29.3.1",
-    "jest-each": "29.3.1",
+    "jest": "29.4.1",
+    "jest-each": "29.4.1",
     "html-webpack-plugin": "5.5.0",
     "react": "18.2.0",
     "react-dom": "18.2.0",
-    "react-router-dom": "6.6.1",
-    "rimraf": "3.0.2",
-    "typescript": "4.9.4"
+    "rimraf": "4.1.2",
+    "typescript": "4.9.5"
   },
   "peerDependencies": {
     "@emotion/react": "^11.10.4",
@@ -59,10 +59,8 @@
     "@mantine/hooks": "^5.4.0",
     "@mantine/notifications": "^5.4.0",
     "@medplum/core": "*",
-    "@tabler/icons": "^1.100.0",
     "react": "^17.0.2 || ^18.0.0",
-    "react-dom": "^17.0.2 || ^18.0.0",
-    "react-router-dom": "^6.2.2"
+    "react-dom": "^17.0.2 || ^18.0.0"
   },
   "peerDependenciesMeta": {
     "@emotion/react": {
@@ -76,9 +74,6 @@
     },
     "@mantine/notifications": {
       "optional": true
-    },
-    "@tabler/icons": {
-      "optional": true
     }
   },
   "main": "dist/cjs/index.cjs",

package/rollup.config.mjs

@@ -1,110 +0,0 @@
-import resolve from '@rollup/plugin-node-resolve';
-import replace from '@rollup/plugin-replace';
-import terser from '@rollup/plugin-terser';
-import typescript from '@rollup/plugin-typescript';
-import dotenv from 'dotenv';
-import { mkdirSync, writeFileSync } from 'fs';
-import peerDepsExternal from 'rollup-plugin-peer-deps-external';
-
-dotenv.config();
-
-const extensions = ['.ts', '.tsx'];
-
-const globals = {
-  '@mantine/core': 'mantine.core',
-  '@mantine/hooks': 'mantine.hooks',
-  '@mantine/notifications': 'mantine.notifications',
-  '@mantine/react': 'mantine.react',
-  '@medplum/core': 'medplum.core',
-  '@medplum/mock': 'medplum.mock',
-  '@tabler/icons': 'tabler.icons',
-  react: 'React',
-  'react-dom': 'ReactDOM',
-  'react-router-dom': 'ReactRouterDOM',
-};
-
-const sourcemapPathTransform = (path) => path.replaceAll('\\', '/').replaceAll('../../../src', '../../src');
-
-export default [
-  {
-    input: 'src/index.ts',
-    output: [
-      {
-        file: 'dist/cjs/index.cjs',
-        format: 'umd',
-        name: 'medplum.react',
-        sourcemap: true,
-        sourcemapPathTransform,
-        globals,
-      },
-      {
-        file: 'dist/cjs/index.min.cjs',
-        format: 'umd',
-        name: 'medplum.react',
-        plugins: [terser({ sourceMap: true})],
-        sourcemapPathTransform,
-        globals,
-      },
-    ],
-    plugins: [
-      replace({
-        preventAssignment: true,
-        values: {
-          'process.env.NODE_ENV': '"production"',
-          'process.env.GOOGLE_AUTH_ORIGINS': `"${process.env.GOOGLE_AUTH_ORIGINS}"`,
-          'process.env.GOOGLE_CLIENT_ID': `"${process.env.GOOGLE_CLIENT_ID}"`,
-        },
-      }),
-      peerDepsExternal(),
-      resolve({ extensions }),
-      typescript({ tsconfig: 'tsconfig.cjs.json', resolveJsonModule: true }),
-      {
-        buildEnd: () => {
-          mkdirSync('./dist/cjs', { recursive: true });
-          writeFileSync('./dist/cjs/package.json', '{"type": "commonjs"}');
-        },
-      },
-    ],
-    external: Object.keys(globals),
-  },
-  {
-    input: 'src/index.ts',
-    output: [
-      {
-        dir: 'dist/esm',
-        entryFileNames: '[name].mjs',
-        format: 'esm',
-        preserveModules: true,
-        preserveModulesRoot: 'src',
-        sourcemap: true,
-        sourcemapPathTransform,
-      },
-      {
-        file: 'dist/esm/index.min.mjs',
-        format: 'esm',
-        plugins: [terser({ sourceMap: true})],
-        sourcemapPathTransform,
-      },
-    ],
-    plugins: [
-      replace({
-        preventAssignment: true,
-        values: {
-          'process.env.NODE_ENV': '"production"',
-          'process.env.GOOGLE_AUTH_ORIGINS': `"${process.env.GOOGLE_AUTH_ORIGINS}"`,
-          'process.env.GOOGLE_CLIENT_ID': `"${process.env.GOOGLE_CLIENT_ID}"`,
-        },
-      }),
-      peerDepsExternal(),
-      resolve({ extensions }),
-      typescript({ tsconfig: 'tsconfig.esm.json', resolveJsonModule: true }),
-      {
-        buildEnd: () => {
-          mkdirSync('./dist/esm', { recursive: true });
-          writeFileSync('./dist/esm/package.json', '{"type": "module"}');
-        },
-      },
-    ],
-    external: Object.keys(globals),
-  },
-];