(chore) Bump @carbon/react and @carbon/charts

openmrs · Sep 14, 2023 · 7f925ee · 7f925ee
1 parent 3f7080e
commit 7f925ee
Show file tree

Hide file tree

Showing 18 changed files with 292 additions and 166 deletions.
diff --git a/packages/apps/esm-devtools-app/package.json b/packages/apps/esm-devtools-app/package.json
@@ -50,6 +50,6 @@
     "webpack": "^5.88.0"
   },
   "dependencies": {
-    "@carbon/react": "^1.12.0"
+    "@carbon/react": "^1.37.0"
   }
 }
diff --git a/...s/esm-devtools-app/src/declarations.d.tsx → ...ps/esm-devtools-app/src/declarations.d.ts b/...s/esm-devtools-app/src/declarations.d.tsx → ...ps/esm-devtools-app/src/declarations.d.ts
@@ -1,3 +1,5 @@
+declare module "@carbon/react";
+
 declare namespace JSX {
   interface IntrinsicElements {
     "import-map-overrides-list": any;
@@ -13,3 +15,5 @@ declare module "*.scss" {
   const styles: any;
   export default styles;
 }
+
+declare type SideNavProps = {};
diff --git a/packages/apps/esm-implementer-tools-app/package.json b/packages/apps/esm-implementer-tools-app/package.json
@@ -38,7 +38,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@carbon/react": "^1.12.0",
+    "@carbon/react": "^1.37.0",
     "lodash-es": "^4.17.21"
   },
   "peerDependencies": {

diff --git a/...lementer-tools-app/src/declarations.d.tsx → ...plementer-tools-app/src/declarations.d.ts b/...lementer-tools-app/src/declarations.d.tsx → ...plementer-tools-app/src/declarations.d.ts
@@ -1,2 +1,3 @@
 declare module "*.css";
 declare module "*.scss";
+declare module "@carbon/react";
diff --git a/packages/apps/esm-login-app/package.json b/packages/apps/esm-login-app/package.json
@@ -38,7 +38,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@carbon/react": "^1.12.0",
+    "@carbon/react": "^1.37.0",
     "lodash-es": "^4.17.21"
   },
   "peerDependencies": {

diff --git a/...apps/esm-login-app/src/declarations.d.tsx → .../apps/esm-login-app/src/declarations.d.ts b/...apps/esm-login-app/src/declarations.d.tsx → .../apps/esm-login-app/src/declarations.d.ts
@@ -4,3 +4,5 @@ declare type Observable<T> = import("rxjs").Observable<T>;
 
 declare module "*.css";
 declare module "*.scss";
+declare module "@carbon/react";
+declare type SideNavProps = {};
diff --git a/packages/apps/esm-offline-tools-app/package.json b/packages/apps/esm-offline-tools-app/package.json
@@ -38,7 +38,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@carbon/react": "^1.12.0",
+    "@carbon/react": "^1.37.0",
     "lodash-es": "^4.17.21",
     "swr": "^2.0.1"
   },

diff --git a/packages/apps/esm-offline-tools-app/src/declarations.d.ts b/packages/apps/esm-offline-tools-app/src/declarations.d.ts
@@ -1,3 +1,7 @@
 declare module "*.svg";
 declare module "*.css";
 declare module "*.scss";
+
+declare module "@carbon/react";
+declare type SideNavProps = {};
+declare type TileProps = {};
diff --git a/packages/apps/esm-offline-tools-app/src/offline-actions/offline-actions-table.component.tsx b/packages/apps/esm-offline-tools-app/src/offline-actions/offline-actions-table.component.tsx
@@ -3,9 +3,7 @@ import { useTranslation } from "react-i18next";
 import {
   Button,
   DataTable,
-  DataTableHeader,
   DataTableSkeleton,
-  FilterRowsData,
   Layer,
   Link,
   Pagination,
@@ -38,11 +36,7 @@ export interface SyncItemWithPatient {
   patient?: fhir.Patient;
 }
 
-export type OfflineActionsTableHeaders =
-  | "createdOn"
-  | "patient"
-  | "action"
-  | "error";
+type OfflineActionsTableHeaders = "createdOn" | "patient" | "action" | "error";
 
 export interface OfflineActionsTableProps {
   data?: Array<SyncItemWithPatient>;
@@ -65,8 +59,13 @@ const OfflineActionsTable: React.FC<OfflineActionsTableProps> = ({
   const [pageSize, setPageSize] = useState(10);
   const { results, currentPage, goTo } = usePagination(data);
   const layout = useLayoutType();
+
   const toolbarItemSize = isDesktop(layout) ? "sm" : undefined;
-  const defaultHeaders: Array<DataTableHeader<OfflineActionsTableHeaders>> = [
+
+  const defaultHeaders: Array<{
+    key: OfflineActionsTableHeaders;
+    header: string;
+  }> = [
     {
       key: "createdOn",
       header: t("offlineActionsTableCreatedOn", "Date & Time"),
@@ -280,7 +279,7 @@ function filterTableRows({
   inputValue,
   // @ts-ignore `getCellId` is not in the types, but present in Carbon.
   getCellId,
-}: FilterRowsData) {
+}) {
   return rowIds.filter((rowId) =>
     headers.some(({ key }) => {
       const cellId = getCellId(rowId, key);

diff --git a/packages/apps/esm-offline-tools-app/src/offline-patients/offline-patient-table.component.tsx b/packages/apps/esm-offline-tools-app/src/offline-patients/offline-patient-table.component.tsx
@@ -2,10 +2,7 @@ import React, { useMemo, useState } from "react";
 import {
   Button,
   DataTable,
-  DataTableCustomRenderProps,
   DataTableSkeleton,
-  DenormalizedRow,
-  FilterRowsData,
   Layer,
   Search,
   SearchSkeleton,
@@ -53,6 +50,7 @@ const OfflinePatientTable: React.FC<OfflinePatientTableProps> = ({
   isInteractive,
   showHeader,
 }) => {
+  // TODO: Restore @carbon/react type annotations
   const { t } = useTranslation();
   const layout = useLayoutType();
   const offlinePatientsSwr = useOfflinePatientsWithEntries();
@@ -64,9 +62,7 @@ const OfflinePatientTable: React.FC<OfflinePatientTableProps> = ({
   const headers = useOfflinePatientTableHeaders();
   const rows = useOfflinePatientTableRows(syncingPatientUuids);
 
-  const handleUpdateSelectedPatientsClick = async (
-    selectedRows: ReadonlyArray<DenormalizedRow>
-  ) => {
+  const handleUpdateSelectedPatientsClick = async (selectedRows) => {
     const selectedPatientUuids = selectedRows.map((row) => row.id);
     setSyncingPatientUuids(selectedPatientUuids);
     await syncSelectedOfflinePatients(selectedPatientUuids).finally(() =>
@@ -77,9 +73,7 @@ const OfflinePatientTable: React.FC<OfflinePatientTableProps> = ({
     offlineRegisteredPatientsSwr.mutate();
   };
 
-  const handleRemovePatientsFromOfflineListClick = async (
-    selectedRows: ReadonlyArray<DenormalizedRow>
-  ) => {
+  const handleRemovePatientsFromOfflineListClick = async (selectedRows) => {
     const closeModal = showModal("offline-tools-confirmation-modal", {
       title: t(
         "offlinePatientsTableDeleteConfirmationModalTitle",
@@ -138,7 +132,7 @@ const OfflinePatientTable: React.FC<OfflinePatientTableProps> = ({
           getSelectionProps,
           onInputChange,
           selectedRows,
-        }: DataTableCustomRenderProps) => (
+        }) => (
           <TableContainer
             className={styles.tableContainer}
             {...getTableContainerProps()}
@@ -254,7 +248,7 @@ function filterTableRows({
   inputValue,
   // @ts-ignore `getCellId` is not in the types, but present in Carbon.
   getCellId,
-}: FilterRowsData) {
+}) {
   return rowIds.filter((rowId) =>
     headers.some(({ key }) => {
       const cellId = getCellId(rowId, key);

diff --git a/packages/apps/esm-primary-navigation-app/package.json b/packages/apps/esm-primary-navigation-app/package.json
@@ -38,7 +38,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@carbon/react": "^1.12.0",
+    "@carbon/react": "^1.37.0",
     "lodash-es": "^4.17.21"
   },
   "peerDependencies": {

diff --git a/packages/apps/esm-primary-navigation-app/src/declarations.d.ts b/packages/apps/esm-primary-navigation-app/src/declarations.d.ts
@@ -0,0 +1,7 @@
+declare module "*.css";
+declare module "*.scss";
+declare module "@carbon/react";
+declare type HeaderPanelProps = {};
+declare type SideNavProps = {
+  isChildOfHeader: boolean;
+};
diff --git a/packages/apps/esm-primary-navigation-app/src/declarations.d.tsx b/packages/apps/esm-primary-navigation-app/src/declarations.d.tsx
diff --git a/packages/framework/esm-framework/docs/API.md b/packages/framework/esm-framework/docs/API.md
@@ -62,6 +62,7 @@
 - [formatDate](API.md#formatdate)
 - [formatDatetime](API.md#formatdatetime)
 - [formatTime](API.md#formattime)
+- [getLocale](API.md#getlocale)
 - [isOmrsDateStrict](API.md#isomrsdatestrict)
 - [isOmrsDateToday](API.md#isomrsdatetoday)
 - [parseDate](API.md#parsedate)
@@ -818,6 +819,16 @@ and *must* only be used once within that `<ExtensionSlot>`.
 
 ___
 
+### OpenmrsDatePicker
+
+• `Const` **OpenmrsDatePicker**: `React.FC`<`OpenmrsDatePickerProps`\>
+
+#### Defined in
+
+[packages/framework/esm-styleguide/src/datepicker/openmrs/openmrs-date-picker.component.tsx:41](https://github.com/openmrs/openmrs-esm-core/blob/main/packages/framework/esm-styleguide/src/datepicker/openmrs/openmrs-date-picker.component.tsx#L41)
+
+___
+
 ### backendDependencies
 
 • `Const` **backendDependencies**: `Object`
@@ -839,7 +850,7 @@ ___
 
 ### LeftNavMenu
 
-• `Const` **LeftNavMenu**: `ForwardRefExoticComponent`<`Pick`<`SideNavProps`, `string` \| `number` \| `symbol`\> & `RefAttributes`<`HTMLElement`\>\>
+• `Const` **LeftNavMenu**: `ForwardRefExoticComponent`<`RefAttributes`<`HTMLElement`\>\>
 
 #### Defined in
 
@@ -1969,6 +1980,20 @@ Formats the input as a time, according to the current locale.
 
 ___
 
+### getLocale
+
+▸ **getLocale**(): `string`
+
+#### Returns
+
+`string`
+
+#### Defined in
+
+[packages/framework/esm-utils/src/omrs-dates.ts:269](https://github.com/openmrs/openmrs-esm-core/blob/main/packages/framework/esm-utils/src/omrs-dates.ts#L269)
+
+___
+
 ### isOmrsDateStrict
 
 ▸ **isOmrsDateStrict**(`omrsPayloadString`): `boolean`
@@ -2383,7 +2408,7 @@ An array of extensions assigned to the named slot
 
 #### Defined in
 
-[packages/framework/esm-extensions/src/extensions.ts:373](https://github.com/openmrs/openmrs-esm-core/blob/main/packages/framework/esm-extensions/src/extensions.ts#L373)
+[packages/framework/esm-extensions/src/extensions.ts:375](https://github.com/openmrs/openmrs-esm-core/blob/main/packages/framework/esm-extensions/src/extensions.ts#L375)
 
 ___
 

diff --git a/packages/framework/esm-styleguide/package.json b/packages/framework/esm-styleguide/package.json
@@ -40,8 +40,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@carbon/charts": "^1.6.3",
-    "@carbon/react": "^1.12.0",
+    "@carbon/charts": "^1.12.0",
+    "@carbon/react": "^1.37.0",
     "@internationalized/date": "^3.2.0",
     "@react-spectrum/datepicker": "^3.5.0",
     "@react-spectrum/provider": "^3.7.1",

diff --git a/packages/framework/esm-styleguide/src/declarations.d.ts b/packages/framework/esm-styleguide/src/declarations.d.ts
@@ -1,6 +1,8 @@
+declare module "@carbon/react";
 declare module "*.svg" {
   const content: string;
   export = content;
 }
 declare module "*.css";
 declare module "*.scss";
+declare type SideNavProps = {};
diff --git a/packages/shell/esm-app-shell/package.json b/packages/shell/esm-app-shell/package.json
@@ -34,7 +34,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@carbon/react": "^1.12.0",
+    "@carbon/react": "^1.37.0",
     "@openmrs/esm-framework": "5.1.0",
     "@openmrs/esm-styleguide": "5.1.0",
     "dayjs": "^1.10.4",