@hisptz/dhis2-scorecard 1.0.8 → 1.0.10

package/dist/esm/components/ScorecardTable/components/MetaFooterCell.js

@@ -1,24 +1,22 @@
 import { jsx } from 'react/jsx-runtime';
 import { DataTableCell } from '@dhis2/ui';
 import i18n from '@dhis2/d2-i18n';
-import { useScorecardStateSelectorValue } from '../../../state';
+import { useMemo } from 'react';
 
-function MetaFooterCell() {
-  const itemNumber = useScorecardStateSelectorValue([
-    "options",
-    "itemNumber"
-  ]);
+function MetaFooterCell({
+  column,
+  table
+}) {
+  const colSpan = useMemo(() => {
+    return table.getVisibleLeafColumns().findIndex(({ id }) => id === column.id) + 1;
+  }, [table.getVisibleLeafColumns(), column.id]);
   return /* @__PURE__ */ jsx(
     DataTableCell,
     {
       bordered: true,
-      width: "300px",
-      style: {
-        width: "fit-content",
-        minWidth: 300
-      },
+      width: `${column.getSize()}px`,
       align: "center",
-      colSpan: itemNumber ? "3" : "2",
+      colSpan: colSpan.toString(),
       fixed: true,
       left: "0",
       children: /* @__PURE__ */ jsx("b", { style: { padding: "8px 0" }, children: i18n.t("Average") })

package/dist/esm/components/ScorecardTable/components/MetaFooterCell.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../src/components/ScorecardTable/components/MetaFooterCell.tsx"],"names":[],"mappings":"AAyBG;AAzBH,SAAS,qBAAqB;AAC9B,OAAO,UAAU;AACjB,SAAS,sCAAsC;AAExC,SAAS,iBAAiB;AAChC,QAAM,aAAa,+BAAwC;AAAA,IAC1D;AAAA,IACA;AAAA,EACD,CAAC;AAED,SACC;AAAA,IAAC;AAAA;AAAA,MACA,UAAQ;AAAA,MACR,OAAM;AAAA,MACN,OAAO;AAAA,QACN,OAAO;AAAA,QACP,UAAU;AAAA,MACX;AAAA,MACA,OAAM;AAAA,MACN,SAAS,aAAa,MAAM;AAAA,MAC5B,OAAK;AAAA,MAGL,MAAK;AAAA,MAEL,8BAAC,OAAE,OAAO,EAAE,SAAS,QAAQ,GAAI,eAAK,EAAE,SAAS,GAAE;AAAA;AAAA,EACpD;AAEF","sourcesContent":["import { DataTableCell } from \"@dhis2/ui\";\nimport i18n from \"@dhis2/d2-i18n\";\nimport { useScorecardStateSelectorValue } from \"../../../state\";\n\nexport function MetaFooterCell() {\n\tconst itemNumber = useScorecardStateSelectorValue<boolean>([\n\t\t\"options\",\n\t\t\"itemNumber\",\n\t]);\n\n\treturn (\n\t\t<DataTableCell\n\t\t\tbordered\n\t\t\twidth=\"300px\"\n\t\t\tstyle={{\n\t\t\t\twidth: \"fit-content\",\n\t\t\t\tminWidth: 300,\n\t\t\t}}\n\t\t\talign=\"center\"\n\t\t\tcolSpan={itemNumber ? \"3\" : \"2\"}\n\t\t\tfixed\n\t\t\t/*\n      // @ts-ignore */\n\t\t\tleft=\"0\"\n\t\t>\n\t\t\t<b style={{ padding: \"8px 0\" }}>{i18n.t(\"Average\")}</b>\n\t\t</DataTableCell>\n\t);\n}\n"]}
+{"version":3,"sources":["../../../../../src/components/ScorecardTable/components/MetaFooterCell.tsx"],"names":[],"mappings":"AA6BG;AA7BH,SAAS,qBAAqB;AAC9B,OAAO,UAAU;AAGjB,SAAS,eAAe;AAEjB,SAAS,eAAe;AAAA,EAC9B;AAAA,EACA;AACD,GAA2C;AAC1C,QAAM,UAAU,QAAQ,MAAM;AAC7B,WACC,MACE,sBAAsB,EACtB,UAAU,CAAC,EAAE,GAAG,MAAM,OAAO,OAAO,EAAE,IAAI;AAAA,EAE9C,GAAG,CAAC,MAAM,sBAAsB,GAAG,OAAO,EAAE,CAAC;AAE7C,SACC;AAAA,IAAC;AAAA;AAAA,MACA,UAAQ;AAAA,MACR,OAAO,GAAG,OAAO,QAAQ,CAAC;AAAA,MAC1B,OAAM;AAAA,MACN,SAAS,QAAQ,SAAS;AAAA,MAC1B,OAAK;AAAA,MAGL,MAAK;AAAA,MAEL,8BAAC,OAAE,OAAO,EAAE,SAAS,QAAQ,GAAI,eAAK,EAAE,SAAS,GAAE;AAAA;AAAA,EACpD;AAEF","sourcesContent":["import { DataTableCell } from \"@dhis2/ui\";\nimport i18n from \"@dhis2/d2-i18n\";\nimport type { ScorecardTableData } from \"../../../schemas/config\";\nimport type { HeaderContext } from \"@tanstack/react-table\";\nimport { useMemo } from \"react\";\n\nexport function MetaFooterCell({\n\tcolumn,\n\ttable,\n}: HeaderContext<ScorecardTableData, any>) {\n\tconst colSpan = useMemo(() => {\n\t\treturn (\n\t\t\ttable\n\t\t\t\t.getVisibleLeafColumns()\n\t\t\t\t.findIndex(({ id }) => id === column.id) + 1\n\t\t);\n\t}, [table.getVisibleLeafColumns(), column.id]);\n\n\treturn (\n\t\t<DataTableCell\n\t\t\tbordered\n\t\t\twidth={`${column.getSize()}px`}\n\t\t\talign=\"center\"\n\t\t\tcolSpan={colSpan.toString()}\n\t\t\tfixed\n\t\t\t/*\n      // @ts-ignore */\n\t\t\tleft=\"0\"\n\t\t>\n\t\t\t<b style={{ padding: \"8px 0\" }}>{i18n.t(\"Average\")}</b>\n\t\t</DataTableCell>\n\t);\n}\n"]}

package/dist/esm/components/StateProvider.js

@@ -1,13 +1,14 @@
 import { jsx } from 'react/jsx-runtime';
 import { useCallback } from 'react';
-import { RecoilRoot } from 'recoil';
+import { useRecoilCallback, RecoilRoot } from 'recoil';
 import { scorecardStateAtom } from '../state';
 import { getInitialStateFromConfig } from '../utils';
 
 function ScorecardStateProvider({
   children,
   initialState,
-  config
+  config,
+  withRecoilRoot
 }) {
   const initState = useCallback(
     ({ set }) => {
@@ -18,7 +19,22 @@ function ScorecardStateProvider({
     },
     [initialState, config]
   );
-  return /* @__PURE__ */ jsx(RecoilRoot, { initializeState: initState, children });
+  const initializeStateWithoutRecoil = useRecoilCallback(
+    ({ set, snapshot }) => (initialState2) => {
+      if (snapshot.getLoadable(scorecardStateAtom).contents === null) {
+        set(scorecardStateAtom, initialState2);
+      }
+    }
+  );
+  if (!withRecoilRoot) {
+    initializeStateWithoutRecoil(
+      initialState ?? getInitialStateFromConfig(config)
+    );
+  }
+  if (withRecoilRoot) {
+    return /* @__PURE__ */ jsx(RecoilRoot, { initializeState: initState, children });
+  }
+  return children;
 }
 
 export { ScorecardStateProvider };

package/dist/esm/components/StateProvider.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/components/StateProvider.tsx"],"names":[],"mappings":"AA2BQ;AA1BR,SAAyB,mBAAmB;AAC5C,SAA0B,kBAAkB;AAC5C,SAAS,0BAA0B;AACnC,SAAS,iCAAiC;AAQnC,SAAS,uBAAuB;AAAA,EACtC;AAAA,EACA;AAAA,EACA;AACD,GAAgC;AAC/B,QAAM,YAAY;AAAA,IACjB,CAAC,EAAE,IAAI,MAAuB;AAC7B;AAAA,QACC;AAAA,QACA,gBAAgB,0BAA0B,MAAM;AAAA,MACjD;AAAA,IACD;AAAA,IACA,CAAC,cAAc,MAAM;AAAA,EACtB;AAEA,SAAO,oBAAC,cAAW,iBAAiB,WAAY,UAAS;AAC1D","sourcesContent":["import type { ScorecardConfig, ScorecardState } from \"../schemas/config\";\nimport { type ReactNode, useCallback } from \"react\";\nimport { MutableSnapshot, RecoilRoot } from \"recoil\";\nimport { scorecardStateAtom } from \"../state\";\nimport { getInitialStateFromConfig } from \"../utils\";\n\nexport interface ScorecardStateProviderProps {\n\tinitialState?: ScorecardState;\n\tconfig: ScorecardConfig;\n\tchildren: ReactNode;\n}\n\nexport function ScorecardStateProvider({\n\tchildren,\n\tinitialState,\n\tconfig,\n}: ScorecardStateProviderProps) {\n\tconst initState = useCallback(\n\t\t({ set }: MutableSnapshot) => {\n\t\t\tset(\n\t\t\t\tscorecardStateAtom,\n\t\t\t\tinitialState ?? getInitialStateFromConfig(config),\n\t\t\t);\n\t\t},\n\t\t[initialState, config],\n\t);\n\n\treturn <RecoilRoot initializeState={initState}>{children}</RecoilRoot>;\n}\n"]}
+{"version":3,"sources":["../../../src/components/StateProvider.tsx"],"names":["initialState"],"mappings":"AA8CS;AA7CT,SAAyB,mBAAmB;AAC5C,SAA0B,YAAY,yBAAyB;AAC/D,SAAS,0BAA0B;AACnC,SAAS,iCAAiC;AASnC,SAAS,uBAAuB;AAAA,EACtC;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACD,GAAgC;AAC/B,QAAM,YAAY;AAAA,IACjB,CAAC,EAAE,IAAI,MAAuB;AAC7B;AAAA,QACC;AAAA,QACA,gBAAgB,0BAA0B,MAAM;AAAA,MACjD;AAAA,IACD;AAAA,IACA,CAAC,cAAc,MAAM;AAAA,EACtB;AACA,QAAM,+BAA+B;AAAA,IACpC,CAAC,EAAE,KAAK,SAAS,MAChB,CAACA,kBAAiC;AACjC,UACC,SAAS,YAAY,kBAAkB,EAAE,aAAa,MACrD;AACD,YAAI,oBAAoBA,aAAY;AAAA,MACrC;AAAA,IACD;AAAA,EACF;AAEA,MAAI,CAAC,gBAAgB;AACpB;AAAA,MACC,gBAAgB,0BAA0B,MAAM;AAAA,IACjD;AAAA,EACD;AAEA,MAAI,gBAAgB;AACnB,WAAO,oBAAC,cAAW,iBAAiB,WAAY,UAAS;AAAA,EAC1D;AAEA,SAAO;AACR","sourcesContent":["import type { ScorecardConfig, ScorecardState } from \"../schemas/config\";\nimport { type ReactNode, useCallback } from \"react\";\nimport { MutableSnapshot, RecoilRoot, useRecoilCallback } from \"recoil\";\nimport { scorecardStateAtom } from \"../state\";\nimport { getInitialStateFromConfig } from \"../utils\";\n\nexport interface ScorecardStateProviderProps {\n\tinitialState?: ScorecardState;\n\tconfig: ScorecardConfig;\n\tchildren: ReactNode;\n\twithRecoilRoot?: boolean;\n}\n\nexport function ScorecardStateProvider({\n\tchildren,\n\tinitialState,\n\tconfig,\n\twithRecoilRoot,\n}: ScorecardStateProviderProps) {\n\tconst initState = useCallback(\n\t\t({ set }: MutableSnapshot) => {\n\t\t\tset(\n\t\t\t\tscorecardStateAtom,\n\t\t\t\tinitialState ?? getInitialStateFromConfig(config),\n\t\t\t);\n\t\t},\n\t\t[initialState, config],\n\t);\n\tconst initializeStateWithoutRecoil = useRecoilCallback(\n\t\t({ set, snapshot }) =>\n\t\t\t(initialState: ScorecardState) => {\n\t\t\t\tif (\n\t\t\t\t\tsnapshot.getLoadable(scorecardStateAtom).contents === null\n\t\t\t\t) {\n\t\t\t\t\tset(scorecardStateAtom, initialState);\n\t\t\t\t}\n\t\t\t},\n\t);\n\n\tif (!withRecoilRoot) {\n\t\tinitializeStateWithoutRecoil(\n\t\t\tinitialState ?? getInitialStateFromConfig(config),\n\t\t);\n\t}\n\n\tif (withRecoilRoot) {\n\t\treturn <RecoilRoot initializeState={initState}>{children}</RecoilRoot>;\n\t}\n\n\treturn children;\n}\n"]}

package/dist/types/components/ScorecardHeader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ScorecardHeader.d.ts","sourceRoot":"","sources":["../../../src/components/ScorecardHeader.tsx"],"names":[],"mappings":"AAQA,wBAAgB,eAAe,mDAoE9B"}
+{"version":3,"file":"ScorecardHeader.d.ts","sourceRoot":"","sources":["../../../src/components/ScorecardHeader.tsx"],"names":[],"mappings":"AASA,wBAAgB,eAAe,mDAoE9B"}

package/dist/types/components/ScorecardPrint/components/ScorecardDownloadButton.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ScorecardDownloadButton.d.ts","sourceRoot":"","sources":["../../../../../src/components/ScorecardPrint/components/ScorecardDownloadButton.tsx"],"names":[],"mappings":"AAmFA,wBAAgB,uBAAuB,4CAgCtC"}
+{"version":3,"file":"ScorecardDownloadButton.d.ts","sourceRoot":"","sources":["../../../../../src/components/ScorecardPrint/components/ScorecardDownloadButton.tsx"],"names":[],"mappings":"AAoFA,wBAAgB,uBAAuB,4CAgCtC"}

package/dist/types/components/ScorecardPrint/components/ScorecardPreviewArea.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ScorecardPreviewArea.d.ts","sourceRoot":"","sources":["../../../../../src/components/ScorecardPrint/components/ScorecardPreviewArea.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAQ,KAAK,SAAS,EAAE,MAAM,OAAO,CAAC;AAQpD,eAAO,MAAM,oBAAoB;gBAGpB,UAAU,cAAc,CAAC;EA4BpC,CAAC"}
+{"version":3,"file":"ScorecardPreviewArea.d.ts","sourceRoot":"","sources":["../../../../../src/components/ScorecardPrint/components/ScorecardPreviewArea.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAQ,KAAK,SAAS,EAAE,MAAM,OAAO,CAAC;AAapD,eAAO,MAAM,oBAAoB;gBAGpB,UAAU,cAAc,CAAC;EA2CpC,CAAC"}

package/dist/types/components/ScorecardTable/components/DataFooterCell.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DataFooterCell.d.ts","sourceRoot":"","sources":["../../../../../src/components/ScorecardTable/components/DataFooterCell.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,KAAK,EAEX,wBAAwB,EACxB,kBAAkB,EAClB,MAAM,yBAAyB,CAAC;AA6IjC,wBAAgB,cAAc,CAAC,EAC9B,KAAK,EACL,MAAM,GACN,EAAE,aAAa,CAAC,kBAAkB,EAAE,wBAAwB,CAAC,2CA0B7D"}
+{"version":3,"file":"DataFooterCell.d.ts","sourceRoot":"","sources":["../../../../../src/components/ScorecardTable/components/DataFooterCell.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,KAAK,EAEX,wBAAwB,EACxB,kBAAkB,EAClB,MAAM,yBAAyB,CAAC;AAmJjC,wBAAgB,cAAc,CAAC,EAC9B,KAAK,EACL,MAAM,GACN,EAAE,aAAa,CAAC,kBAAkB,EAAE,wBAAwB,CAAC,2CA0B7D"}

package/dist/types/components/ScorecardTable/components/MetaFooterCell.d.ts

@@ -1,2 +1,4 @@
-export declare function MetaFooterCell(): import("react/jsx-runtime").JSX.Element;
+import type { ScorecardTableData } from "../../../schemas/config";
+import type { HeaderContext } from "@tanstack/react-table";
+export declare function MetaFooterCell({ column, table, }: HeaderContext<ScorecardTableData, any>): import("react/jsx-runtime").JSX.Element;
 //# sourceMappingURL=MetaFooterCell.d.ts.map

package/dist/types/components/ScorecardTable/components/MetaFooterCell.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MetaFooterCell.d.ts","sourceRoot":"","sources":["../../../../../src/components/ScorecardTable/components/MetaFooterCell.tsx"],"names":[],"mappings":"AAIA,wBAAgB,cAAc,4CAwB7B"}
+{"version":3,"file":"MetaFooterCell.d.ts","sourceRoot":"","sources":["../../../../../src/components/ScorecardTable/components/MetaFooterCell.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAG3D,wBAAgB,cAAc,CAAC,EAC9B,MAAM,EACN,KAAK,GACL,EAAE,aAAa,CAAC,kBAAkB,EAAE,GAAG,CAAC,2CAuBxC"}

package/dist/types/components/StateProvider.d.ts

@@ -4,6 +4,7 @@ export interface ScorecardStateProviderProps {
     initialState?: ScorecardState;
     config: ScorecardConfig;
     children: ReactNode;
+    withRecoilRoot?: boolean;
 }
-export declare function ScorecardStateProvider({ children, initialState, config, }: ScorecardStateProviderProps): import("react/jsx-runtime").JSX.Element;
+export declare function ScorecardStateProvider({ children, initialState, config, withRecoilRoot, }: ScorecardStateProviderProps): string | number | boolean | Iterable<ReactNode> | import("react/jsx-runtime").JSX.Element | null | undefined;
 //# sourceMappingURL=StateProvider.d.ts.map

package/dist/types/components/StateProvider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"StateProvider.d.ts","sourceRoot":"","sources":["../../../src/components/StateProvider.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACzE,OAAO,EAAE,KAAK,SAAS,EAAe,MAAM,OAAO,CAAC;AAKpD,MAAM,WAAW,2BAA2B;IAC3C,YAAY,CAAC,EAAE,cAAc,CAAC;IAC9B,MAAM,EAAE,eAAe,CAAC;IACxB,QAAQ,EAAE,SAAS,CAAC;CACpB;AAED,wBAAgB,sBAAsB,CAAC,EACtC,QAAQ,EACR,YAAY,EACZ,MAAM,GACN,EAAE,2BAA2B,2CAY7B"}
+{"version":3,"file":"StateProvider.d.ts","sourceRoot":"","sources":["../../../src/components/StateProvider.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACzE,OAAO,EAAE,KAAK,SAAS,EAAe,MAAM,OAAO,CAAC;AAKpD,MAAM,WAAW,2BAA2B;IAC3C,YAAY,CAAC,EAAE,cAAc,CAAC;IAC9B,MAAM,EAAE,eAAe,CAAC;IACxB,QAAQ,EAAE,SAAS,CAAC;IACpB,cAAc,CAAC,EAAE,OAAO,CAAC;CACzB;AAED,wBAAgB,sBAAsB,CAAC,EACtC,QAAQ,EACR,YAAY,EACZ,MAAM,EACN,cAAc,GACd,EAAE,2BAA2B,gHAgC7B"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hisptz/dhis2-scorecard",
-  "version": "1.0.8",
+  "version": "1.0.10",
   "main": "./dist/index.js",
   "module": "./dist/esm/index.js",
   "types": "./dist/types/index.d.ts",
@@ -46,8 +46,8 @@
     "tsup": "^8.0.1",
     "typescript": "^5.3.3",
     "usehooks-ts": "^2.9.2",
-    "@repo/typescript-config": "0.0.0",
-    "@repo/eslint-config": "0.0.0"
+    "@repo/eslint-config": "0.0.0",
+    "@repo/typescript-config": "0.0.0"
   },
   "dependencies": {
     "@tanstack/react-table": "^8.19.3",
@@ -57,13 +57,14 @@
     "react-dnd": "^16.0.1",
     "react-dnd-html5-backend": "^16.0.1",
     "react-error-boundary": "^4.0.12",
+    "react-jsx-parser": "^2.2.0",
     "react-to-print": "^3.0.1",
     "recoil": "^0.7.7",
     "xlsx": "^0.18.5",
     "zod": "^3.23.8",
-    "@hisptz/dhis2-utils": "2.0.8",
     "@hisptz/dhis2-analytics": "2.0.46",
-    "@hisptz/dhis2-ui": "2.0.27"
+    "@hisptz/dhis2-ui": "2.0.27",
+    "@hisptz/dhis2-utils": "2.0.8"
   },
   "peerDependencies": {
     "@dhis2/app-runtime": "^3.10.2",
@@ -73,7 +74,7 @@
     "classnames": "^2.5.1",
     "eslint": "^8.56.0",
     "lodash": "^4.17.21",
-    "react": "^18.2.0",
+    "react": "^18",
     "styled-jsx": "^5.1.2",
     "tsup": "^8.0.1",
     "typescript": "^5.3.3",