@ovok/native 1.6.4 → 1.6.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (13) hide show
  1. package/lib/commonjs/modules/ui/components/urine-test-result.js +41 -18
  2. package/lib/commonjs/modules/ui/components/urine-test-result.js.map +1 -1
  3. package/lib/module/modules/ui/components/urine-test-result.js +41 -18
  4. package/lib/module/modules/ui/components/urine-test-result.js.map +1 -1
  5. package/lib/typescript/commonjs/src/modules/ui/components/urine-test-result.d.ts +2 -1
  6. package/lib/typescript/commonjs/src/modules/ui/components/urine-test-result.d.ts.map +1 -1
  7. package/lib/typescript/commonjs/src/modules/ui/types.d.ts +10 -0
  8. package/lib/typescript/commonjs/src/modules/ui/types.d.ts.map +1 -1
  9. package/lib/typescript/module/src/modules/ui/components/urine-test-result.d.ts +2 -1
  10. package/lib/typescript/module/src/modules/ui/components/urine-test-result.d.ts.map +1 -1
  11. package/lib/typescript/module/src/modules/ui/types.d.ts +10 -0
  12. package/lib/typescript/module/src/modules/ui/types.d.ts.map +1 -1
  13. package/package.json +1 -1
package/lib/commonjs/modules/ui/components/urine-test-result.js CHANGED
@@ -23,6 +23,7 @@ const UrineTestResult = ({
23
23
  measurement,
24
24
  showOnlyMeasured = false,
25
25
  labelForAnalyte = (_key, fallback) => fallback,
26
+ accessibilityLabelForAnalyte = (_key, fallback) => fallback,
26
27
  testID,
27
28
  ...uiProps
28
29
  }) => {
@@ -32,6 +33,34 @@ const UrineTestResult = ({
32
33
  } = (0, _useOvokUi.useOvokUi)(uiProps);
33
34
  const Card = slots.Card ?? _reactNativePaper.Card;
34
35
  const Text = slots.Text ?? _reactNativePaper.Text;
36
+ const AnalyteRow = slots.UrineAnalyteRow ?? (({
37
+ accessibilityLabel,
38
+ name,
39
+ rangeLabel,
40
+ theme: rowTheme,
41
+ value
42
+ }) => /*#__PURE__*/(0, _jsxRuntime.jsxs)(_reactNative.View, {
43
+ accessible: true,
44
+ accessibilityLabel: accessibilityLabel,
45
+ accessibilityRole: "text",
46
+ style: styles.row,
47
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(_reactNative.View, {
48
+ style: styles.grow,
49
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(Text, {
50
+ theme: rowTheme,
51
+ children: name
52
+ }), rangeLabel && /*#__PURE__*/(0, _jsxRuntime.jsx)(Text, {
53
+ theme: rowTheme,
54
+ style: {
55
+ color: rangeLabel === "Within usual range" ? rowTheme.colors.primary : rowTheme.colors.error
56
+ },
57
+ children: rangeLabel
58
+ })]
59
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(Text, {
60
+ theme: rowTheme,
61
+ children: value
62
+ })]
63
+ }));
35
64
  const catalog = _index.measurementFieldCatalog[_core.MeasurementTypeKey.urineAnalysis] ?? _index.measurementFieldCatalog[_core.MeasurementTypeKey.uricAcid] ?? {};
36
65
  const rows = _core.URINE_ANALYTE_DEFINITIONS.filter(({
37
66
  key
@@ -59,25 +88,19 @@ const UrineTestResult = ({
59
88
  const value = measurement[key];
60
89
  const definition = catalog[key];
61
90
  const measured = typeof value === "number";
91
+ const name = labelForAnalyte(key, display);
92
+ const formattedValue = measured ? formatValue(value, unit, definition) : "Not measured";
62
93
  const inUsualRange = measured && definition?.normalMin !== undefined && definition.normalMax !== undefined ? value >= definition.normalMin && value <= definition.normalMax : undefined;
63
- return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_reactNative.View, {
64
- style: styles.row,
65
- children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(_reactNative.View, {
66
- style: styles.grow,
67
- children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(Text, {
68
- theme: theme,
69
- children: labelForAnalyte(key, display)
70
- }), inUsualRange !== undefined && /*#__PURE__*/(0, _jsxRuntime.jsx)(Text, {
71
- theme: theme,
72
- style: {
73
- color: inUsualRange ? theme.colors.primary : theme.colors.error
74
- },
75
- children: inUsualRange ? "Within usual range" : "Outside usual range"
76
- })]
77
- }), /*#__PURE__*/(0, _jsxRuntime.jsx)(Text, {
78
- theme: theme,
79
- children: measured ? formatValue(value, unit, definition) : "Not measured"
80
- })]
94
+ const rangeLabel = inUsualRange === undefined ? undefined : inUsualRange ? "Within usual range" : "Outside usual range";
95
+ const defaultAccessibilityLabel = [name, formattedValue, inUsualRange === false ? "outside the usual range" : undefined].filter(Boolean).join(", ");
96
+ return /*#__PURE__*/(0, _jsxRuntime.jsx)(AnalyteRow, {
97
+ accessibilityLabel: accessibilityLabelForAnalyte(key, defaultAccessibilityLabel),
98
+ analyteKey: key,
99
+ isOutsideUsualRange: inUsualRange === false,
100
+ name: name,
101
+ rangeLabel: rangeLabel,
102
+ theme: theme,
103
+ value: formattedValue
81
104
  }, key);
82
105
  })]
83
106
  })
package/lib/commonjs/modules/ui/components/urine-test-result.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"names":["_core","require","_reactNative","_reactNativePaper","_index","_useOvokUi","_jsxRuntime","formatValue","value","unit","definition","qualitative","negativeAtZero","UrineTestResult","measurement","showOnlyMeasured","labelForAnalyte","_key","fallback","testID","uiProps","theme","slots","useOvokUi","Card","PaperCard","Text","PaperText","catalog","measurementFieldCatalog","MeasurementTypeKey","urineAnalysis","uricAcid","rows","URINE_ANALYTE_DEFINITIONS","filter","key","jsx","style","borderRadius","children","jsxs","View","styles","content","variant","map","display","measured","inUsualRange","normalMin","undefined","normalMax","row","grow","color","colors","primary","error","exports","StyleSheet","create","gap","padding","flex","alignItems","flexDirection"],"sourceRoot":"../../../../../src","sources":["modules/ui/components/urine-test-result.tsx"],"mappings":";;;;;;AAAA,IAAAA,KAAA,GAAAC,OAAA;AAKA,IAAAC,YAAA,GAAAD,OAAA;AACA,IAAAE,iBAAA,GAAAF,OAAA;AAEA,IAAAG,MAAA,GAAAH,OAAA;AAEA,IAAAI,UAAA,GAAAJ,OAAA;AAA2C,IAAAK,WAAA,GAAAL,OAAA;AAS3C,MAAMM,WAAW,GAAGA,CAClBC,KAAa,EACbC,IAAwB,EACxBC,UAAyB,KACd;EACX,IAAIA,UAAU,EAAEC,WAAW,EAAE;IAC3B,OAAOH,KAAK,KAAK,CAAC,GAAG,UAAU,GAAG,UAAU;EAC9C;EAEA,IAAIE,UAAU,EAAEE,cAAc,IAAIJ,KAAK,KAAK,CAAC,EAAE;IAC7C,OAAO,UAAU;EACnB;EAEA,OAAO,GAAGA,KAAK,GAAGC,IAAI,GAAG,IAAIA,IAAI,EAAE,GAAG,EAAE,EAAE;AAC5C,CAAC;AAEM,MAAMI,eAAe,GAAGA,CAAC;EAC9BC,WAAW;EACXC,gBAAgB,GAAG,KAAK;EACxBC,eAAe,GAAGA,CAACC,IAAI,EAAEC,QAAQ,KAAKA,QAAQ;EAC9CC,MAAM;EACN,GAAGC;AACiB,CAAC,KAAK;EAC1B,MAAM;IAAEC,KAAK;IAAEC;EAAM,CAAC,GAAG,IAAAC,oBAAS,EAACH,OAAO,CAAC;EAC3C,MAAMI,IAAI,GAAGF,KAAK,CAACE,IAAI,IAAIC,sBAAS;EACpC,MAAMC,IAAI,GAAGJ,KAAK,CAACI,IAAI,IAAIC,sBAAS;EAEpC,MAAMC,OAAO,GAAGC,8BAAuB,CAACC,wBAAkB,CAACC,aAAa,CAAC,IACpEF,8BAAuB,CAACC,wBAAkB,CAACE,QAAQ,CAAC,IACpD,CAAC,CAAC;EAEP,MAAMC,IAAI,GAAGC,+BAAyB,CAACC,MAAM,CAAC,CAAC;IAAEC;EAAI,CAAC,KAAK;IACzD,MAAM5B,KAAK,GAAGM,WAAW,CAACsB,GAAG,CAAC;IAE9B,OAAO,CAACrB,gBAAgB,IAAI,OAAOP,KAAK,KAAK,QAAQ;EACvD,CAAC,CAAC;EAEF,oBACE,IAAAF,WAAA,CAAA+B,GAAA,EAACb,IAAI;IAACH,KAAK,EAAEA,KAAM;IAACF,MAAM,EAAEA,MAAO;IAACmB,KAAK,EAAE;MAAEC,YAAY,EAAElB,KAAK,CAACkB,YAAY,CAAC,CAAC;IAAE,CAAE;IAAAC,QAAA,eACjF,IAAAlC,WAAA,CAAAmC,IAAA,EAACvC,YAAA,CAAAwC,IAAI;MAACJ,KAAK,EAAEK,MAAM,CAACC,OAAQ;MAAAJ,QAAA,gBAC1B,IAAAlC,WAAA,CAAA+B,GAAA,EAACX,IAAI;QAACL,KAAK,EAAEA,KAAM;QAACwB,OAAO,EAAC,aAAa;QAAAL,QAAA,EAAC;MAAiB,CAAM,CAAC,EACjEP,IAAI,CAACa,GAAG,CAAC,CAAC;QAAEV,GAAG;QAAEW,OAAO;QAAEtC;MAAK,CAAC,KAAK;QACpC,MAAMD,KAAK,GAAGM,WAAW,CAACsB,GAAG,CAAC;QAC9B,MAAM1B,UAAU,GAAGkB,OAAO,CAACQ,GAAG,CAAC;QAC/B,MAAMY,QAAQ,GAAG,OAAOxC,KAAK,KAAK,QAAQ;QAE1C,MAAMyC,YAAY,GAAGD,QAAQ,IAAItC,UAAU,EAAEwC,SAAS,KAAKC,SAAS,IAAIzC,UAAU,CAAC0C,SAAS,KAAKD,SAAS,GACtG3C,KAAK,IAAIE,UAAU,CAACwC,SAAS,IAAI1C,KAAK,IAAIE,UAAU,CAAC0C,SAAS,GAC9DD,SAAS;QAEb,oBACE,IAAA7C,WAAA,CAAAmC,IAAA,EAACvC,YAAA,CAAAwC,IAAI;UAAWJ,KAAK,EAAEK,MAAM,CAACU,GAAI;UAAAb,QAAA,gBAChC,IAAAlC,WAAA,CAAAmC,IAAA,EAACvC,YAAA,CAAAwC,IAAI;YAACJ,KAAK,EAAEK,MAAM,CAACW,IAAK;YAAAd,QAAA,gBACvB,IAAAlC,WAAA,CAAA+B,GAAA,EAACX,IAAI;cAACL,KAAK,EAAEA,KAAM;cAAAmB,QAAA,EAAExB,eAAe,CAACoB,GAAG,EAAEW,OAAO;YAAC,CAAO,CAAC,EACzDE,YAAY,KAAKE,SAAS,iBACzB,IAAA7C,WAAA,CAAA+B,GAAA,EAACX,IAAI;cAACL,KAAK,EAAEA,KAAM;cAACiB,KAAK,EAAE;gBAAEiB,KAAK,EAAEN,YAAY,GAAG5B,KAAK,CAACmC,MAAM,CAACC,OAAO,GAAGpC,KAAK,CAACmC,MAAM,CAACE;cAAM,CAAE;cAAAlB,QAAA,EAC5FS,YAAY,GAAG,oBAAoB,GAAG;YAAqB,CACxD,CACP;UAAA,CACG,CAAC,eACP,IAAA3C,WAAA,CAAA+B,GAAA,EAACX,IAAI;YAACL,KAAK,EAAEA,KAAM;YAAAmB,QAAA,EAAEQ,QAAQ,GAAGzC,WAAW,CAACC,KAAK,EAAEC,IAAI,EAAEC,UAAU,CAAC,GAAG;UAAc,CAAO,CAAC;QAAA,GATpF0B,GAUL,CAAC;MAEX,CAAC,CAAC;IAAA,CACE;EAAC,CACH,CAAC;AAEX,CAAC;AAACuB,OAAA,CAAA9C,eAAA,GAAAA,eAAA;AAEF,MAAM8B,MAAM,GAAGiB,uBAAU,CAACC,MAAM,CAAC;EAC/BjB,OAAO,EAAE;IAAEkB,GAAG,EAAE,EAAE;IAAEC,OAAO,EAAE;EAAG,CAAC;EACjCT,IAAI,EAAE;IAAEU,IAAI,EAAE;EAAE,CAAC;EACjBX,GAAG,EAAE;IAAEY,UAAU,EAAE,YAAY;IAAEC,aAAa,EAAE,KAAK;IAAEJ,GAAG,EAAE;EAAE;AAChE,CAAC,CAAC","ignoreList":[]}
1
+ {"version":3,"names":["_core","require","_reactNative","_reactNativePaper","_index","_useOvokUi","_jsxRuntime","formatValue","value","unit","definition","qualitative","negativeAtZero","UrineTestResult","measurement","showOnlyMeasured","labelForAnalyte","_key","fallback","accessibilityLabelForAnalyte","testID","uiProps","theme","slots","useOvokUi","Card","PaperCard","Text","PaperText","AnalyteRow","UrineAnalyteRow","accessibilityLabel","name","rangeLabel","rowTheme","jsxs","View","accessible","accessibilityRole","style","styles","row","children","grow","jsx","color","colors","primary","error","catalog","measurementFieldCatalog","MeasurementTypeKey","urineAnalysis","uricAcid","rows","URINE_ANALYTE_DEFINITIONS","filter","key","borderRadius","content","variant","map","display","measured","formattedValue","inUsualRange","normalMin","undefined","normalMax","defaultAccessibilityLabel","Boolean","join","analyteKey","isOutsideUsualRange","exports","StyleSheet","create","gap","padding","flex","alignItems","flexDirection"],"sourceRoot":"../../../../../src","sources":["modules/ui/components/urine-test-result.tsx"],"mappings":"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","ignoreList":[]}
package/lib/module/modules/ui/components/urine-test-result.js CHANGED
@@ -19,6 +19,7 @@ export const UrineTestResult = ({
19
19
  measurement,
20
20
  showOnlyMeasured = false,
21
21
  labelForAnalyte = (_key, fallback) => fallback,
22
+ accessibilityLabelForAnalyte = (_key, fallback) => fallback,
22
23
  testID,
23
24
  ...uiProps
24
25
  }) => {
@@ -28,6 +29,34 @@ export const UrineTestResult = ({
28
29
  } = useOvokUi(uiProps);
29
30
  const Card = slots.Card ?? PaperCard;
30
31
  const Text = slots.Text ?? PaperText;
32
+ const AnalyteRow = slots.UrineAnalyteRow ?? (({
33
+ accessibilityLabel,
34
+ name,
35
+ rangeLabel,
36
+ theme: rowTheme,
37
+ value
38
+ }) => /*#__PURE__*/_jsxs(View, {
39
+ accessible: true,
40
+ accessibilityLabel: accessibilityLabel,
41
+ accessibilityRole: "text",
42
+ style: styles.row,
43
+ children: [/*#__PURE__*/_jsxs(View, {
44
+ style: styles.grow,
45
+ children: [/*#__PURE__*/_jsx(Text, {
46
+ theme: rowTheme,
47
+ children: name
48
+ }), rangeLabel && /*#__PURE__*/_jsx(Text, {
49
+ theme: rowTheme,
50
+ style: {
51
+ color: rangeLabel === "Within usual range" ? rowTheme.colors.primary : rowTheme.colors.error
52
+ },
53
+ children: rangeLabel
54
+ })]
55
+ }), /*#__PURE__*/_jsx(Text, {
56
+ theme: rowTheme,
57
+ children: value
58
+ })]
59
+ }));
31
60
  const catalog = measurementFieldCatalog[MeasurementTypeKey.urineAnalysis] ?? measurementFieldCatalog[MeasurementTypeKey.uricAcid] ?? {};
32
61
  const rows = URINE_ANALYTE_DEFINITIONS.filter(({
33
62
  key
@@ -55,25 +84,19 @@ export const UrineTestResult = ({
55
84
  const value = measurement[key];
56
85
  const definition = catalog[key];
57
86
  const measured = typeof value === "number";
87
+ const name = labelForAnalyte(key, display);
88
+ const formattedValue = measured ? formatValue(value, unit, definition) : "Not measured";
58
89
  const inUsualRange = measured && definition?.normalMin !== undefined && definition.normalMax !== undefined ? value >= definition.normalMin && value <= definition.normalMax : undefined;
59
- return /*#__PURE__*/_jsxs(View, {
60
- style: styles.row,
61
- children: [/*#__PURE__*/_jsxs(View, {
62
- style: styles.grow,
63
- children: [/*#__PURE__*/_jsx(Text, {
64
- theme: theme,
65
- children: labelForAnalyte(key, display)
66
- }), inUsualRange !== undefined && /*#__PURE__*/_jsx(Text, {
67
- theme: theme,
68
- style: {
69
- color: inUsualRange ? theme.colors.primary : theme.colors.error
70
- },
71
- children: inUsualRange ? "Within usual range" : "Outside usual range"
72
- })]
73
- }), /*#__PURE__*/_jsx(Text, {
74
- theme: theme,
75
- children: measured ? formatValue(value, unit, definition) : "Not measured"
76
- })]
90
+ const rangeLabel = inUsualRange === undefined ? undefined : inUsualRange ? "Within usual range" : "Outside usual range";
91
+ const defaultAccessibilityLabel = [name, formattedValue, inUsualRange === false ? "outside the usual range" : undefined].filter(Boolean).join(", ");
92
+ return /*#__PURE__*/_jsx(AnalyteRow, {
93
+ accessibilityLabel: accessibilityLabelForAnalyte(key, defaultAccessibilityLabel),
94
+ analyteKey: key,
95
+ isOutsideUsualRange: inUsualRange === false,
96
+ name: name,
97
+ rangeLabel: rangeLabel,
98
+ theme: theme,
99
+ value: formattedValue
77
100
  }, key);
78
101
  })]
79
102
  })
package/lib/module/modules/ui/components/urine-test-result.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"names":["MeasurementTypeKey","URINE_ANALYTE_DEFINITIONS","StyleSheet","View","Card","PaperCard","Text","PaperText","measurementFieldCatalog","useOvokUi","jsx","_jsx","jsxs","_jsxs","formatValue","value","unit","definition","qualitative","negativeAtZero","UrineTestResult","measurement","showOnlyMeasured","labelForAnalyte","_key","fallback","testID","uiProps","theme","slots","catalog","urineAnalysis","uricAcid","rows","filter","key","style","borderRadius","children","styles","content","variant","map","display","measured","inUsualRange","normalMin","undefined","normalMax","row","grow","color","colors","primary","error","create","gap","padding","flex","alignItems","flexDirection"],"sourceRoot":"../../../../../src","sources":["modules/ui/components/urine-test-result.tsx"],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"names":["MeasurementTypeKey","URINE_ANALYTE_DEFINITIONS","StyleSheet","View","Card","PaperCard","Text","PaperText","measurementFieldCatalog","useOvokUi","jsx","_jsx","jsxs","_jsxs","formatValue","value","unit","definition","qualitative","negativeAtZero","UrineTestResult","measurement","showOnlyMeasured","labelForAnalyte","_key","fallback","accessibilityLabelForAnalyte","testID","uiProps","theme","slots","AnalyteRow","UrineAnalyteRow","accessibilityLabel","name","rangeLabel","rowTheme","accessible","accessibilityRole","style","styles","row","children","grow","color","colors","primary","error","catalog","urineAnalysis","uricAcid","rows","filter","key","borderRadius","content","variant","map","display","measured","formattedValue","inUsualRange","normalMin","undefined","normalMax","defaultAccessibilityLabel","Boolean","join","analyteKey","isOutsideUsualRange","create","gap","padding","flex","alignItems","flexDirection"],"sourceRoot":"../../../../../src","sources":["modules/ui/components/urine-test-result.tsx"],"mappings":"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","ignoreList":[]}
package/lib/typescript/commonjs/src/modules/ui/components/urine-test-result.d.ts CHANGED
@@ -4,7 +4,8 @@ export interface UrineTestResultProps extends OvokUiProps {
4
4
  measurement: UrineAnalyzeMeasurement;
5
5
  showOnlyMeasured?: boolean;
6
6
  labelForAnalyte?: (key: string, fallback: string) => string;
7
+ accessibilityLabelForAnalyte?: (key: string, fallback: string) => string;
7
8
  testID?: string;
8
9
  }
9
- export declare const UrineTestResult: ({ measurement, showOnlyMeasured, labelForAnalyte, testID, ...uiProps }: UrineTestResultProps) => import("react").JSX.Element;
10
+ export declare const UrineTestResult: ({ measurement, showOnlyMeasured, labelForAnalyte, accessibilityLabelForAnalyte, testID, ...uiProps }: UrineTestResultProps) => import("react").JSX.Element;
10
11
  //# sourceMappingURL=urine-test-result.d.ts.map
package/lib/typescript/commonjs/src/modules/ui/components/urine-test-result.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"urine-test-result.d.ts","sourceRoot":"","sources":["../../../../../../../src/modules/ui/components/urine-test-result.tsx"],"names":[],"mappings":"AAAA,OAAO,EAGL,uBAAuB,EACxB,MAAM,YAAY,CAAC;AAKpB,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAGvC,MAAM,WAAW,oBAAqB,SAAQ,WAAW;IACvD,WAAW,EAAE,uBAAuB,CAAC;IACrC,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,eAAe,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,KAAK,MAAM,CAAC;IAC5D,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAkBD,eAAO,MAAM,eAAe,GAAI,wEAM7B,oBAAoB,gCA6CtB,CAAC"}
1
+ {"version":3,"file":"urine-test-result.d.ts","sourceRoot":"","sources":["../../../../../../../src/modules/ui/components/urine-test-result.tsx"],"names":[],"mappings":"AAAA,OAAO,EAGL,uBAAuB,EACxB,MAAM,YAAY,CAAC;AAKpB,OAAO,EAAE,WAAW,EAAwB,MAAM,UAAU,CAAC;AAG7D,MAAM,WAAW,oBAAqB,SAAQ,WAAW;IACvD,WAAW,EAAE,uBAAuB,CAAC;IACrC,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,eAAe,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,KAAK,MAAM,CAAC;IAC5D,4BAA4B,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,KAAK,MAAM,CAAC;IACzE,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAkBD,eAAO,MAAM,eAAe,GAAI,sGAO7B,oBAAoB,gCAmGtB,CAAC"}
package/lib/typescript/commonjs/src/modules/ui/types.d.ts CHANGED
@@ -10,6 +10,15 @@ export type OvokThemeOverride = Partial<Omit<OvokTheme, "colors" | "fonts">> & {
10
10
  colors?: Partial<OvokTheme["colors"]>;
11
11
  fonts?: Partial<OvokTheme["fonts"]>;
12
12
  };
13
+ export interface UrineAnalyteRowProps {
14
+ analyteKey: string;
15
+ name: string;
16
+ value: string;
17
+ rangeLabel?: string;
18
+ isOutsideUsualRange: boolean;
19
+ accessibilityLabel: string;
20
+ theme: OvokTheme;
21
+ }
13
22
  export interface OvokUiSlots {
14
23
  Button: React.ComponentType<React.ComponentProps<typeof PaperButton>>;
15
24
  Card: React.ComponentType<React.ComponentProps<typeof PaperCard>>;
@@ -17,6 +26,7 @@ export interface OvokUiSlots {
17
26
  Switch: React.ComponentType<React.ComponentProps<typeof PaperSwitch>>;
18
27
  TextInput: React.ComponentType<React.ComponentProps<typeof PaperTextInput>>;
19
28
  ActivityIndicator: React.ComponentType<React.ComponentProps<typeof PaperActivityIndicator>>;
29
+ UrineAnalyteRow: React.ComponentType<UrineAnalyteRowProps>;
20
30
  }
21
31
  export interface OvokUiProps {
22
32
  /** A partial theme is merged with the active react-native-paper theme. */
package/lib/typescript/commonjs/src/modules/ui/types.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../../src/modules/ui/types.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,iBAAiB,IAAI,sBAAsB,EAC3C,MAAM,IAAI,WAAW,EACrB,IAAI,IAAI,SAAS,EACjB,MAAM,IAAI,WAAW,EACrB,IAAI,IAAI,SAAS,EACjB,SAAS,IAAI,cAAc,EAC5B,MAAM,oBAAoB,CAAC;AAE5B,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAGnD,MAAM,MAAM,SAAS,GAAG,QAAQ,GAAG;IACjC,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,CAAC;IACnC,YAAY,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,CAAC;IACxC,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,GAAG,OAAO,CAAC,CAAC,GAAG;IAC7E,MAAM,CAAC,EAAE,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC;IACtC,KAAK,CAAC,EAAE,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;CACrC,CAAC;AAEF,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,WAAW,CAAC,CAAC,CAAC;IACtE,IAAI,EAAE,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,SAAS,CAAC,CAAC,CAAC;IAClE,IAAI,EAAE,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,SAAS,CAAC,CAAC,CAAC;IAClE,MAAM,EAAE,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,WAAW,CAAC,CAAC,CAAC;IACtE,SAAS,EAAE,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,cAAc,CAAC,CAAC,CAAC;IAC5E,iBAAiB,EAAE,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,sBAAsB,CAAC,CAAC,CAAC;CAC7F;AAED,MAAM,WAAW,WAAW;IAE1B,0EAA0E;IAC1E,KAAK,CAAC,EAAE,iBAAiB,CAAC;IAE1B,sEAAsE;IACtE,KAAK,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;CAC9B"}
1
+ {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../../src/modules/ui/types.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,iBAAiB,IAAI,sBAAsB,EAC3C,MAAM,IAAI,WAAW,EACrB,IAAI,IAAI,SAAS,EACjB,MAAM,IAAI,WAAW,EACrB,IAAI,IAAI,SAAS,EACjB,SAAS,IAAI,cAAc,EAC5B,MAAM,oBAAoB,CAAC;AAE5B,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAGnD,MAAM,MAAM,SAAS,GAAG,QAAQ,GAAG;IACjC,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,CAAC;IACnC,YAAY,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,CAAC;IACxC,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,GAAG,OAAO,CAAC,CAAC,GAAG;IAC7E,MAAM,CAAC,EAAE,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC;IACtC,KAAK,CAAC,EAAE,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;CACrC,CAAC;AAEF,MAAM,WAAW,oBAAoB;IACnC,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,mBAAmB,EAAE,OAAO,CAAC;IAC7B,kBAAkB,EAAE,MAAM,CAAC;IAC3B,KAAK,EAAE,SAAS,CAAC;CAClB;AAED,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,WAAW,CAAC,CAAC,CAAC;IACtE,IAAI,EAAE,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,SAAS,CAAC,CAAC,CAAC;IAClE,IAAI,EAAE,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,SAAS,CAAC,CAAC,CAAC;IAClE,MAAM,EAAE,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,WAAW,CAAC,CAAC,CAAC;IACtE,SAAS,EAAE,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,cAAc,CAAC,CAAC,CAAC;IAC5E,iBAAiB,EAAE,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,sBAAsB,CAAC,CAAC,CAAC;IAC5F,eAAe,EAAE,KAAK,CAAC,aAAa,CAAC,oBAAoB,CAAC,CAAC;CAC5D;AAED,MAAM,WAAW,WAAW;IAE1B,0EAA0E;IAC1E,KAAK,CAAC,EAAE,iBAAiB,CAAC;IAE1B,sEAAsE;IACtE,KAAK,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;CAC9B"}
package/lib/typescript/module/src/modules/ui/components/urine-test-result.d.ts CHANGED
@@ -4,7 +4,8 @@ export interface UrineTestResultProps extends OvokUiProps {
4
4
  measurement: UrineAnalyzeMeasurement;
5
5
  showOnlyMeasured?: boolean;
6
6
  labelForAnalyte?: (key: string, fallback: string) => string;
7
+ accessibilityLabelForAnalyte?: (key: string, fallback: string) => string;
7
8
  testID?: string;
8
9
  }
9
- export declare const UrineTestResult: ({ measurement, showOnlyMeasured, labelForAnalyte, testID, ...uiProps }: UrineTestResultProps) => import("react").JSX.Element;
10
+ export declare const UrineTestResult: ({ measurement, showOnlyMeasured, labelForAnalyte, accessibilityLabelForAnalyte, testID, ...uiProps }: UrineTestResultProps) => import("react").JSX.Element;
10
11
  //# sourceMappingURL=urine-test-result.d.ts.map
package/lib/typescript/module/src/modules/ui/components/urine-test-result.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"urine-test-result.d.ts","sourceRoot":"","sources":["../../../../../../../src/modules/ui/components/urine-test-result.tsx"],"names":[],"mappings":"AAAA,OAAO,EAGL,uBAAuB,EACxB,MAAM,YAAY,CAAC;AAKpB,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAGvC,MAAM,WAAW,oBAAqB,SAAQ,WAAW;IACvD,WAAW,EAAE,uBAAuB,CAAC;IACrC,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,eAAe,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,KAAK,MAAM,CAAC;IAC5D,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAkBD,eAAO,MAAM,eAAe,GAAI,wEAM7B,oBAAoB,gCA6CtB,CAAC"}
1
+ {"version":3,"file":"urine-test-result.d.ts","sourceRoot":"","sources":["../../../../../../../src/modules/ui/components/urine-test-result.tsx"],"names":[],"mappings":"AAAA,OAAO,EAGL,uBAAuB,EACxB,MAAM,YAAY,CAAC;AAKpB,OAAO,EAAE,WAAW,EAAwB,MAAM,UAAU,CAAC;AAG7D,MAAM,WAAW,oBAAqB,SAAQ,WAAW;IACvD,WAAW,EAAE,uBAAuB,CAAC;IACrC,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,eAAe,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,KAAK,MAAM,CAAC;IAC5D,4BAA4B,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,KAAK,MAAM,CAAC;IACzE,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAkBD,eAAO,MAAM,eAAe,GAAI,sGAO7B,oBAAoB,gCAmGtB,CAAC"}
package/lib/typescript/module/src/modules/ui/types.d.ts CHANGED
@@ -10,6 +10,15 @@ export type OvokThemeOverride = Partial<Omit<OvokTheme, "colors" | "fonts">> & {
10
10
  colors?: Partial<OvokTheme["colors"]>;
11
11
  fonts?: Partial<OvokTheme["fonts"]>;
12
12
  };
13
+ export interface UrineAnalyteRowProps {
14
+ analyteKey: string;
15
+ name: string;
16
+ value: string;
17
+ rangeLabel?: string;
18
+ isOutsideUsualRange: boolean;
19
+ accessibilityLabel: string;
20
+ theme: OvokTheme;
21
+ }
13
22
  export interface OvokUiSlots {
14
23
  Button: React.ComponentType<React.ComponentProps<typeof PaperButton>>;
15
24
  Card: React.ComponentType<React.ComponentProps<typeof PaperCard>>;
@@ -17,6 +26,7 @@ export interface OvokUiSlots {
17
26
  Switch: React.ComponentType<React.ComponentProps<typeof PaperSwitch>>;
18
27
  TextInput: React.ComponentType<React.ComponentProps<typeof PaperTextInput>>;
19
28
  ActivityIndicator: React.ComponentType<React.ComponentProps<typeof PaperActivityIndicator>>;
29
+ UrineAnalyteRow: React.ComponentType<UrineAnalyteRowProps>;
20
30
  }
21
31
  export interface OvokUiProps {
22
32
  /** A partial theme is merged with the active react-native-paper theme. */
package/lib/typescript/module/src/modules/ui/types.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../../src/modules/ui/types.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,iBAAiB,IAAI,sBAAsB,EAC3C,MAAM,IAAI,WAAW,EACrB,IAAI,IAAI,SAAS,EACjB,MAAM,IAAI,WAAW,EACrB,IAAI,IAAI,SAAS,EACjB,SAAS,IAAI,cAAc,EAC5B,MAAM,oBAAoB,CAAC;AAE5B,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAGnD,MAAM,MAAM,SAAS,GAAG,QAAQ,GAAG;IACjC,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,CAAC;IACnC,YAAY,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,CAAC;IACxC,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,GAAG,OAAO,CAAC,CAAC,GAAG;IAC7E,MAAM,CAAC,EAAE,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC;IACtC,KAAK,CAAC,EAAE,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;CACrC,CAAC;AAEF,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,WAAW,CAAC,CAAC,CAAC;IACtE,IAAI,EAAE,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,SAAS,CAAC,CAAC,CAAC;IAClE,IAAI,EAAE,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,SAAS,CAAC,CAAC,CAAC;IAClE,MAAM,EAAE,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,WAAW,CAAC,CAAC,CAAC;IACtE,SAAS,EAAE,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,cAAc,CAAC,CAAC,CAAC;IAC5E,iBAAiB,EAAE,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,sBAAsB,CAAC,CAAC,CAAC;CAC7F;AAED,MAAM,WAAW,WAAW;IAE1B,0EAA0E;IAC1E,KAAK,CAAC,EAAE,iBAAiB,CAAC;IAE1B,sEAAsE;IACtE,KAAK,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;CAC9B"}
1
+ {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../../src/modules/ui/types.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,iBAAiB,IAAI,sBAAsB,EAC3C,MAAM,IAAI,WAAW,EACrB,IAAI,IAAI,SAAS,EACjB,MAAM,IAAI,WAAW,EACrB,IAAI,IAAI,SAAS,EACjB,SAAS,IAAI,cAAc,EAC5B,MAAM,oBAAoB,CAAC;AAE5B,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAGnD,MAAM,MAAM,SAAS,GAAG,QAAQ,GAAG;IACjC,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,CAAC;IACnC,YAAY,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,CAAC;IACxC,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,GAAG,OAAO,CAAC,CAAC,GAAG;IAC7E,MAAM,CAAC,EAAE,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC;IACtC,KAAK,CAAC,EAAE,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;CACrC,CAAC;AAEF,MAAM,WAAW,oBAAoB;IACnC,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,mBAAmB,EAAE,OAAO,CAAC;IAC7B,kBAAkB,EAAE,MAAM,CAAC;IAC3B,KAAK,EAAE,SAAS,CAAC;CAClB;AAED,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,WAAW,CAAC,CAAC,CAAC;IACtE,IAAI,EAAE,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,SAAS,CAAC,CAAC,CAAC;IAClE,IAAI,EAAE,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,SAAS,CAAC,CAAC,CAAC;IAClE,MAAM,EAAE,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,WAAW,CAAC,CAAC,CAAC;IACtE,SAAS,EAAE,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,cAAc,CAAC,CAAC,CAAC;IAC5E,iBAAiB,EAAE,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,sBAAsB,CAAC,CAAC,CAAC;IAC5F,eAAe,EAAE,KAAK,CAAC,aAAa,CAAC,oBAAoB,CAAC,CAAC;CAC5D;AAED,MAAM,WAAW,WAAW;IAE1B,0EAA0E;IAC1E,KAAK,CAAC,EAAE,iBAAiB,CAAC;IAE1B,sEAAsE;IACtE,KAAK,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;CAC9B"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@ovok/native",
3
- "version": "1.6.4",
3
+ "version": "1.6.5",
4
4
  "description": "React native component sdk for OVOK",
5
5
  "source": "./src/index.tsx",
6
6
  "main": "./lib/commonjs/index.js",