@dhis2-ui/table 10.16.3-alpha.1 → 10.16.4

package/build/es/stacked-table/stacked-table.js

@@ -3,13 +3,12 @@ import React from 'react';
 import { extractHeaderLabels } from './extract-header-labels.js';
 import { Provider } from './table-context.js';
 import { Table } from './table.js';
-export const StackedTable = _ref => {
-  let {
-    children,
-    className,
-    dataTest = 'dhis2-uicore-stackedtable',
-    headerLabels
-  } = _ref;
+export const StackedTable = ({
+  children,
+  className,
+  dataTest = 'dhis2-uicore-stackedtable',
+  headerLabels
+}) => {
   const contextHeaderLabels = extractHeaderLabels(children);
   const context = {
     headerLabels: headerLabels || contextHeaderLabels

package/build/es/stacked-table/stacked-table.test.js

@@ -9,29 +9,20 @@ import { StackedTableHead } from './stacked-table-head.js';
 import { StackedTableRowHead } from './stacked-table-row-head.js';
 import { StackedTableRow } from './stacked-table-row.js';
 import { StackedTable } from './stacked-table.js';
-const Table = _ref => {
-  let {
-    headerLabels,
-    bodyLabels
-  } = _ref;
-  return /*#__PURE__*/React.createElement(StackedTable, null, /*#__PURE__*/React.createElement(StackedTableHead, null, /*#__PURE__*/React.createElement(StackedTableRowHead, null, headerLabels.map((_ref2, index) => {
-    let {
-      label,
-      ...props
-    } = _ref2;
-    return /*#__PURE__*/React.createElement(StackedTableCellHead, _extends({}, props, {
-      key: label + index
-    }), label);
-  }))), /*#__PURE__*/React.createElement(StackedTableBody, null, /*#__PURE__*/React.createElement(StackedTableRow, null, bodyLabels.map(_ref3 => {
-    let {
-      label,
-      ...props
-    } = _ref3;
-    return /*#__PURE__*/React.createElement(StackedTableCell, _extends({}, props, {
-      key: label
-    }), label);
-  }))));
-};
+const Table = ({
+  headerLabels,
+  bodyLabels
+}) => /*#__PURE__*/React.createElement(StackedTable, null, /*#__PURE__*/React.createElement(StackedTableHead, null, /*#__PURE__*/React.createElement(StackedTableRowHead, null, headerLabels.map(({
+  label,
+  ...props
+}, index) => /*#__PURE__*/React.createElement(StackedTableCellHead, _extends({}, props, {
+  key: label + index
+}), label)))), /*#__PURE__*/React.createElement(StackedTableBody, null, /*#__PURE__*/React.createElement(StackedTableRow, null, bodyLabels.map(({
+  label,
+  ...props
+}) => /*#__PURE__*/React.createElement(StackedTableCell, _extends({}, props, {
+  key: label
+}), label)))));
 describe('StackedTable', () => {
   const headerLabels = [{
     label: 'First name',

package/build/es/stacked-table/table.js

@@ -2,20 +2,17 @@ import _JSXStyle from "styled-jsx/style";
 import { colors } from '@dhis2/ui-constants';
 import PropTypes from 'prop-types';
 import React from 'react';
-export const Table = _ref => {
-  let {
-    children,
-    className,
-    dataTest
-  } = _ref;
-  return /*#__PURE__*/React.createElement("table", {
-    "data-test": dataTest,
-    className: _JSXStyle.dynamic([["4278890465", [colors.white, colors.grey900]]]) + " " + (className || "")
-  }, children, /*#__PURE__*/React.createElement(_JSXStyle, {
-    id: "4278890465",
-    dynamic: [colors.white, colors.grey900]
-  }, [`table.__jsx-style-dynamic-selector{display:block;border:0;background-color:${colors.white};min-width:100%;text-align:left;border-collapse:collapse;vertical-align:top;color:${colors.grey900};}`]));
-};
+export const Table = ({
+  children,
+  className,
+  dataTest
+}) => /*#__PURE__*/React.createElement("table", {
+  "data-test": dataTest,
+  className: _JSXStyle.dynamic([["4278890465", [colors.white, colors.grey900]]]) + " " + (className || "")
+}, children, /*#__PURE__*/React.createElement(_JSXStyle, {
+  id: "4278890465",
+  dynamic: [colors.white, colors.grey900]
+}, [`table.__jsx-style-dynamic-selector{display:block;border:0;background-color:${colors.white};min-width:100%;text-align:left;border-collapse:collapse;vertical-align:top;color:${colors.grey900};}`]));
 Table.propTypes = {
   children: PropTypes.node.isRequired,
   className: PropTypes.string,

package/build/es/table/table-body.js

@@ -1,18 +1,15 @@
 import PropTypes from 'prop-types';
 import React from 'react';
-export const TableBody = _ref => {
-  let {
-    children,
-    className,
-    dataTest = 'dhis2-uicore-tablebody',
-    role
-  } = _ref;
-  return /*#__PURE__*/React.createElement("tbody", {
-    className: className,
-    "data-test": dataTest,
-    role: role
-  }, children);
-};
+export const TableBody = ({
+  children,
+  className,
+  dataTest = 'dhis2-uicore-tablebody',
+  role
+}) => /*#__PURE__*/React.createElement("tbody", {
+  className: className,
+  "data-test": dataTest,
+  role: role
+}, children);
 TableBody.propTypes = {
   /** Should be `<TableRow>` components */
   children: PropTypes.node,

package/build/es/table/table-cell-head.js

@@ -4,28 +4,25 @@ import PropTypes from 'prop-types';
 import React from 'react';
 const tableCellHeadStyles = ["th.jsx-3181834369{border-bottom:1px solid #e8edf2;font-size:14px;line-height:18px;padding:13px 12px;height:45px;}", "th.jsx-3181834369:dir(rtl){text-align:right;}", ".dense.jsx-3181834369{padding:9px 12px;height:36px;}"];
 tableCellHeadStyles.__hash = "3181834369";
-export const TableCellHead = _ref => {
-  let {
-    role,
-    colSpan,
-    rowSpan,
-    dense,
-    children,
-    className,
-    dataTest = 'dhis2-uicore-tablecellhead'
-  } = _ref;
-  return /*#__PURE__*/React.createElement("th", {
-    colSpan: colSpan,
-    rowSpan: rowSpan,
-    "data-test": dataTest,
-    role: role,
-    className: `jsx-${tableCellHeadStyles.__hash}` + " " + (cx({
-      dense
-    }, className) || "")
-  }, children, /*#__PURE__*/React.createElement(_JSXStyle, {
-    id: tableCellHeadStyles.__hash
-  }, tableCellHeadStyles));
-};
+export const TableCellHead = ({
+  role,
+  colSpan,
+  rowSpan,
+  dense,
+  children,
+  className,
+  dataTest = 'dhis2-uicore-tablecellhead'
+}) => /*#__PURE__*/React.createElement("th", {
+  colSpan: colSpan,
+  rowSpan: rowSpan,
+  "data-test": dataTest,
+  role: role,
+  className: `jsx-${tableCellHeadStyles.__hash}` + " " + (cx({
+    dense
+  }, className) || "")
+}, children, /*#__PURE__*/React.createElement(_JSXStyle, {
+  id: tableCellHeadStyles.__hash
+}, tableCellHeadStyles));
 TableCellHead.propTypes = {
   children: PropTypes.node,
   className: PropTypes.string,

package/build/es/table/table-cell.js

@@ -4,28 +4,25 @@ import PropTypes from 'prop-types';
 import React from 'react';
 const tableCellStyles = ["td.jsx-2229340108{border-bottom:1px solid #e8edf2;font-size:14px;line-height:18px;padding:13px 12px;height:45px;}", "td.jsx-2229340108:dir(rtl){text-align:right;}", ".dense.jsx-2229340108{padding:9px 12px;height:36px;}"];
 tableCellStyles.__hash = "2229340108";
-export const TableCell = _ref => {
-  let {
-    role,
-    className,
-    children,
-    colSpan,
-    rowSpan,
-    dense,
-    dataTest = 'dhis2-uicore-tablecell'
-  } = _ref;
-  return /*#__PURE__*/React.createElement("td", {
-    colSpan: colSpan,
-    rowSpan: rowSpan,
-    "data-test": dataTest,
-    role: role,
-    className: `jsx-${tableCellStyles.__hash}` + " " + (cx({
-      dense
-    }, className) || "")
-  }, children, /*#__PURE__*/React.createElement(_JSXStyle, {
-    id: tableCellStyles.__hash
-  }, tableCellStyles));
-};
+export const TableCell = ({
+  role,
+  className,
+  children,
+  colSpan,
+  rowSpan,
+  dense,
+  dataTest = 'dhis2-uicore-tablecell'
+}) => /*#__PURE__*/React.createElement("td", {
+  colSpan: colSpan,
+  rowSpan: rowSpan,
+  "data-test": dataTest,
+  role: role,
+  className: `jsx-${tableCellStyles.__hash}` + " " + (cx({
+    dense
+  }, className) || "")
+}, children, /*#__PURE__*/React.createElement(_JSXStyle, {
+  id: tableCellStyles.__hash
+}, tableCellStyles));
 TableCell.propTypes = {
   children: PropTypes.node,
   className: PropTypes.string,

package/build/es/table/table-foot.js

@@ -1,18 +1,15 @@
 import PropTypes from 'prop-types';
 import React from 'react';
-export const TableFoot = _ref => {
-  let {
-    children,
-    className,
-    dataTest = 'dhis2-uicore-tablefoot',
-    role
-  } = _ref;
-  return /*#__PURE__*/React.createElement("tfoot", {
-    className: className,
-    "data-test": dataTest,
-    role: role
-  }, children);
-};
+export const TableFoot = ({
+  children,
+  className,
+  dataTest = 'dhis2-uicore-tablefoot',
+  role
+}) => /*#__PURE__*/React.createElement("tfoot", {
+  className: className,
+  "data-test": dataTest,
+  role: role
+}, children);
 TableFoot.propTypes = {
   /** Should be `<TableRow>` components */
   children: PropTypes.node,

package/build/es/table/table-head.js

@@ -1,18 +1,15 @@
 import PropTypes from 'prop-types';
 import React from 'react';
-export const TableHead = _ref => {
-  let {
-    children,
-    className,
-    dataTest = 'dhis2-uicore-tablehead',
-    role
-  } = _ref;
-  return /*#__PURE__*/React.createElement("thead", {
-    className: className,
-    "data-test": dataTest,
-    role: role
-  }, children);
-};
+export const TableHead = ({
+  children,
+  className,
+  dataTest = 'dhis2-uicore-tablehead',
+  role
+}) => /*#__PURE__*/React.createElement("thead", {
+  className: className,
+  "data-test": dataTest,
+  role: role
+}, children);
 TableHead.propTypes = {
   /** Should be `<TableRowHead>` components */
   children: PropTypes.node,

package/build/es/table/table-row-head.js

@@ -1,21 +1,18 @@
 import PropTypes from 'prop-types';
 import React from 'react';
 import { TableRow } from './table-row.js';
-export const TableRowHead = _ref => {
-  let {
-    role,
-    children,
-    className,
-    dataTest = 'dhis2-uicore-tablerowhead',
-    suppressZebraStriping
-  } = _ref;
-  return /*#__PURE__*/React.createElement(TableRow, {
-    className: className,
-    dataTest: dataTest,
-    suppressZebraStriping: suppressZebraStriping,
-    role: role
-  }, children);
-};
+export const TableRowHead = ({
+  role,
+  children,
+  className,
+  dataTest = 'dhis2-uicore-tablerowhead',
+  suppressZebraStriping
+}) => /*#__PURE__*/React.createElement(TableRow, {
+  className: className,
+  dataTest: dataTest,
+  suppressZebraStriping: suppressZebraStriping,
+  role: role
+}, children);
 TableRowHead.propTypes = {
   /** Should be `<TableCellHead>` components */
   children: PropTypes.node,

package/build/es/table/table-row.js

@@ -6,15 +6,14 @@ import React, { useContext } from 'react';
 import { TableContext } from './table-context.js';
 const tableRowStyles = [".zebraStriping.jsx-3124144591:nth-child(even){background:#fbfcfd;}"];
 tableRowStyles.__hash = "3124144591";
-export const TableRow = _ref => {
-  let {
-    role,
-    children,
-    className,
-    dataTest = 'dhis2-uicore-tablerow',
-    suppressZebraStriping,
-    ...rest
-  } = _ref;
+export const TableRow = ({
+  role,
+  children,
+  className,
+  dataTest = 'dhis2-uicore-tablerow',
+  suppressZebraStriping,
+  ...rest
+}) => {
   const {
     suppressZebraStriping: suppressZebraStripingFromContext
   } = useContext(TableContext);

package/build/es/table/table.js

@@ -4,26 +4,23 @@ import React from 'react';
 import { Provider } from './table-context.js';
 const tableStyles = ["table.jsx-2430604489{border:1px solid #e8edf2;background-color:#ffffff;min-width:100%;text-align:left;border-collapse:collapse;vertical-align:top;}"];
 tableStyles.__hash = "2430604489";
-export const Table = _ref => {
-  let {
-    role,
-    children,
-    className,
-    dataTest = 'dhis2-uicore-table',
+export const Table = ({
+  role,
+  children,
+  className,
+  dataTest = 'dhis2-uicore-table',
+  suppressZebraStriping
+}) => /*#__PURE__*/React.createElement(Provider, {
+  value: {
     suppressZebraStriping
-  } = _ref;
-  return /*#__PURE__*/React.createElement(Provider, {
-    value: {
-      suppressZebraStriping
-    }
-  }, /*#__PURE__*/React.createElement("table", {
-    "data-test": dataTest,
-    role: role,
-    className: `jsx-${tableStyles.__hash}` + " " + (className || "")
-  }, children, /*#__PURE__*/React.createElement(_JSXStyle, {
-    id: tableStyles.__hash
-  }, tableStyles)));
-};
+  }
+}, /*#__PURE__*/React.createElement("table", {
+  "data-test": dataTest,
+  role: role,
+  className: `jsx-${tableStyles.__hash}` + " " + (className || "")
+}, children, /*#__PURE__*/React.createElement(_JSXStyle, {
+  id: tableStyles.__hash
+}, tableStyles)));
 Table.propTypes = {
   /** Should be `<TableHead>`, `<TableBody>`, and `<TableFoot>` components */
   children: PropTypes.node,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@dhis2-ui/table",
-    "version": "10.16.3-alpha.1",
+    "version": "10.16.4",
     "description": "UI Table",
     "repository": {
         "type": "git",
@@ -34,8 +34,8 @@
     },
     "dependencies": {
         "@dhis2/prop-types": "^3.1.2",
-        "@dhis2/ui-constants": "10.16.3-alpha.1",
-        "@dhis2/ui-icons": "10.16.3-alpha.1",
+        "@dhis2/ui-constants": "10.16.4",
+        "@dhis2/ui-icons": "10.16.4",
         "classnames": "^2.3.1",
         "prop-types": "^15.7.2"
     },

package/src/locales/index.js

@@ -25,20 +25,53 @@ import uz_UZ_CyrlTranslations from './uz_UZ_Cyrl/translations.json'
 import zhTranslations from './zh/translations.json'
 
 const namespace = 'default'
-i18n.addResources('ar', namespace, arTranslations)
-i18n.addResources('cs', namespace, csTranslations)
-i18n.addResources('en', namespace, enTranslations)
-i18n.addResources('es', namespace, esTranslations)
-i18n.addResources('es_419', namespace, es_419Translations)
-i18n.addResources('fr', namespace, frTranslations)
-i18n.addResources('km', namespace, kmTranslations)
-i18n.addResources('lo', namespace, loTranslations)
-i18n.addResources('nb', namespace, nbTranslations)
-i18n.addResources('nl', namespace, nlTranslations)
-i18n.addResources('pt', namespace, ptTranslations)
-i18n.addResources('ru', namespace, ruTranslations)
-i18n.addResources('uk', namespace, ukTranslations)
-i18n.addResources('uz_UZ_Cyrl', namespace, uz_UZ_CyrlTranslations)
-i18n.addResources('zh', namespace, zhTranslations)
+
+// Use 'deep' = true and 'overwrite' = false to add to, but not overwrite,
+// custom translations from the datastore (added by the app adapter)
+
+i18n.addResourceBundle('ar', namespace, arTranslations, true, false)
+i18n.addResourceBundle('ar', namespace, arTranslations, true, false)
+
+i18n.addResourceBundle('cs', namespace, csTranslations, true, false)
+i18n.addResourceBundle('cs', namespace, csTranslations, true, false)
+
+i18n.addResourceBundle('en', namespace, enTranslations, true, false)
+i18n.addResourceBundle('en', namespace, enTranslations, true, false)
+
+i18n.addResourceBundle('es', namespace, esTranslations, true, false)
+i18n.addResourceBundle('es', namespace, esTranslations, true, false)
+
+i18n.addResourceBundle('es_419', namespace, es_419Translations, true, false)
+i18n.addResourceBundle('es-419', namespace, es_419Translations, true, false)
+
+i18n.addResourceBundle('fr', namespace, frTranslations, true, false)
+i18n.addResourceBundle('fr', namespace, frTranslations, true, false)
+
+i18n.addResourceBundle('km', namespace, kmTranslations, true, false)
+i18n.addResourceBundle('km', namespace, kmTranslations, true, false)
+
+i18n.addResourceBundle('lo', namespace, loTranslations, true, false)
+i18n.addResourceBundle('lo', namespace, loTranslations, true, false)
+
+i18n.addResourceBundle('nb', namespace, nbTranslations, true, false)
+i18n.addResourceBundle('nb', namespace, nbTranslations, true, false)
+
+i18n.addResourceBundle('nl', namespace, nlTranslations, true, false)
+i18n.addResourceBundle('nl', namespace, nlTranslations, true, false)
+
+i18n.addResourceBundle('pt', namespace, ptTranslations, true, false)
+i18n.addResourceBundle('pt', namespace, ptTranslations, true, false)
+
+i18n.addResourceBundle('ru', namespace, ruTranslations, true, false)
+i18n.addResourceBundle('ru', namespace, ruTranslations, true, false)
+
+i18n.addResourceBundle('uk', namespace, ukTranslations, true, false)
+i18n.addResourceBundle('uk', namespace, ukTranslations, true, false)
+
+i18n.addResourceBundle('uz_UZ_Cyrl', namespace, uz_UZ_CyrlTranslations, true, false)
+i18n.addResourceBundle('uz-Cyrl-UZ', namespace, uz_UZ_CyrlTranslations, true, false)
+
+i18n.addResourceBundle('zh', namespace, zhTranslations, true, false)
+i18n.addResourceBundle('zh', namespace, zhTranslations, true, false)
 
 export default i18n