Merge remote-tracking branch 'origin' into alpha

dhis2 · Nov 19, 2024 · 1824fb1 · 1824fb1
2 parents cf1d56b + 698c552
commit 1824fb1
Show file tree

Hide file tree

Showing 125 changed files with 4,405 additions and 2,275 deletions.
diff --git a/collections/forms/package.json b/collections/forms/package.json
@@ -30,8 +30,8 @@
         "build": "d2-app-scripts build"
     },
     "peerDependencies": {
-        "react": "^16.13",
-        "react-dom": "^16.13"
+        "react": "^16.13 || ^18",
+        "react-dom": "^16.13 || ^18"
     },
     "dependencies": {
         "@dhis2/prop-types": "^3.1.2",
@@ -54,8 +54,8 @@
         "types"
     ],
     "devDependencies": {
-        "react": "16.13",
-        "react-dom": "16.13"
+        "react": "^18.3.1",
+        "react-dom": "^18.3.1"
     },
     "types": "types"
 }
diff --git a/collections/ui/API.md b/collections/ui/API.md
@@ -782,6 +782,7 @@ import { Input } from '@dhis2/ui'
 |---|---|---|---|---|
 |autoComplete|string|||The [native `autocomplete` attribute](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input#attr-autocomplete)|
 |className|string||||
+|clearable|boolean|||Makes the input field clearable|
 |dataTest|string|`'dhis2-uicore-input'`|||
 |dense|boolean|||Makes the input smaller|
 |disabled|boolean|||Disables the input|
@@ -792,6 +793,7 @@ import { Input } from '@dhis2/ui'
 |min|string|||The [native `min` attribute](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input#attr-min), for use when `type` is `'number'`|
 |name|string|||Name associated with the input. Passed to event handler callbacks in object|
 |placeholder|string|||Placeholder text for the input|
+|prefixIcon|element|||Add prefix icon|
 |readOnly|boolean|||Makes the input read-only|
 |role|string|||Sets a role attribute on the input|
 |step|string|||The [native `step` attribute](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input#attr-step), for use when `type` is `'number'`|
@@ -800,6 +802,7 @@ import { Input } from '@dhis2/ui'
 |valid|custom|||Applies 'valid' appearance for validation feedback. Mutually exclusive with `error` and `warning` props|
 |value|string|||Value in the input. Can be used to control the component (recommended). Passed to event handler callbacks in object|
 |warning|custom|||Applies 'warning' appearance for validation feedback. Mutually exclusive with `valid` and `error` props|
+|width|string|||Defines the width of the input. Can be any valid CSS measurement|
 |onBlur|function|||Called with signature `({ name: string, value: string }, event)`|
 |onChange|function|||Called with signature `({ name: string, value: string }, event)`|
 |onFocus|function|||Called with signature `({ name: string, value: string }, event)`|
@@ -823,6 +826,7 @@ import { InputField } from '@dhis2/ui'
 |---|---|---|---|---|
 |autoComplete|string|||The [native `autocomplete` attribute](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input#attr-autocomplete)|
 |className|string||||
+|clearable|boolean|||Makes the input field clearable|
 |dataTest|string|`'dhis2-uiwidgets-inputfield'`|||
 |dense|boolean|||Makes the input smaller|
 |disabled|boolean|||Disables the input|
@@ -836,6 +840,7 @@ import { InputField } from '@dhis2/ui'
 |min|string|||The [native `min` attribute](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input#attr-min), for use when `type` is `'number'`|
 |name|string|||Name associated with the input. Passed to event handler callbacks in object|
 |placeholder|string|||Placeholder text for the input|
+|prefixIcon|element|||Add prefix icon|
 |readOnly|boolean|||Makes the input read-only|
 |required|boolean|||Indicates this input is required|
 |step|string|||The [native `step` attribute](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input#attr-step), for use when `type` is `'number'`|
@@ -2002,13 +2007,14 @@ import { SharingDialog } from '@dhis2/ui'
 |---|---|---|---|---|
 |id|string||*|The id of the object to share|
 |type|DIALOG_TYPES_LIST||*|The type of object to share|
+|dataSharing|boolean|`false`||Whether to expose the ability to set data sharing (in addition to metadata sharing)|
 |dataTest|string|`'dhis2-uicore-sharingdialog'`|||
-|initialSharingSettings|{<br/>  "allowPublic": "boolean",<br/>  "groups": "objectOf",<br/>  "name": "string",<br/>  "public": "import {\n    ACCESS_NONE,\n    ACCESS_VIEW_ONLY,\n    ACCESS_VIEW_AND_EDIT,\n    DIALOG_TYPES_LIST,\n} from './constants.js' │ import {\n    ACCESS_NONE,\n    ACCESS_VIEW_ONLY,\n    ACCESS_VIEW_AND_EDIT,\n    DIALOG_TYPES_LIST,\n} from './constants.js' │ import {\n    ACCESS_NONE,\n    ACCESS_VIEW_ONLY,\n    ACCESS_VIEW_AND_EDIT,\n    DIALOG_TYPES_LIST,\n} from './constants.js'",<br/>  "users": "objectOf"<br/>}|`{
+|initialSharingSettings|{<br/>  "allowPublic": "boolean",<br/>  "groups": "objectOf",<br/>  "name": "string",<br/>  "public": "{<br/>  \"data\": \"import {\\n    ACCESS_NONE,\\n    ACCESS_VIEW_ONLY,\\n    ACCESS_VIEW_AND_EDIT,\\n    DIALOG_TYPES_LIST,\\n} from './constants.js' │ import {\\n    ACCESS_NONE,\\n    ACCESS_VIEW_ONLY,\\n    ACCESS_VIEW_AND_EDIT,\\n    DIALOG_TYPES_LIST,\\n} from './constants.js' │ import {\\n    ACCESS_NONE,\\n    ACCESS_VIEW_ONLY,\\n    ACCESS_VIEW_AND_EDIT,\\n    DIALOG_TYPES_LIST,\\n} from './constants.js'\",<br/>  \"metadata\": \"import {\\n    ACCESS_NONE,\\n    ACCESS_VIEW_ONLY,\\n    ACCESS_VIEW_AND_EDIT,\\n    DIALOG_TYPES_LIST,\\n} from './constants.js' │ import {\\n    ACCESS_NONE,\\n    ACCESS_VIEW_ONLY,\\n    ACCESS_VIEW_AND_EDIT,\\n    DIALOG_TYPES_LIST,\\n} from './constants.js' │ import {\\n    ACCESS_NONE,\\n    ACCESS_VIEW_ONLY,\\n    ACCESS_VIEW_AND_EDIT,\\n    DIALOG_TYPES_LIST,\\n} from './constants.js'\"<br/>} │ import {\n    ACCESS_NONE,\n    ACCESS_VIEW_ONLY,\n    ACCESS_VIEW_AND_EDIT,\n    DIALOG_TYPES_LIST,\n} from './constants.js' │ import {\n    ACCESS_NONE,\n    ACCESS_VIEW_ONLY,\n    ACCESS_VIEW_AND_EDIT,\n    DIALOG_TYPES_LIST,\n} from './constants.js' │ import {\n    ACCESS_NONE,\n    ACCESS_VIEW_ONLY,\n    ACCESS_VIEW_AND_EDIT,\n    DIALOG_TYPES_LIST,\n} from './constants.js'",<br/>  "users": "objectOf"<br/>}|`{
     name: '',
     allowPublic: true,
-    public: ACCESS_NONE,
-    groups: {},
-    users: {},
+    public: { data: ACCESS_NONE, metadata: ACCESS_NONE },
+    groups: [],
+    users: [],
 }`||Used to seed the component with data to show whilst loading|
 |onClose|function|`() => {}`|||
 |onError|function|`() => {}`|||

diff --git a/collections/ui/package.json b/collections/ui/package.json
@@ -74,15 +74,15 @@
     "peerDependencies": {
         "@dhis2/app-runtime": "^3",
         "@dhis2/d2-i18n": "^1",
-        "react": "^16.13",
-        "react-dom": "^16.13",
+        "react": "^16.13 || ^18",
+        "react-dom": "^16.13 || ^18",
         "styled-jsx": "^4"
     },
     "devDependencies": {
         "@dhis2/app-runtime": "^3.9.0",
         "@dhis2/d2-i18n": "^1.1.0",
-        "react": "16.13",
-        "react-dom": "16.13",
+        "react": "^18.3.1",
+        "react-dom": "^18.3.1",
         "styled-jsx": "^4.0.1"
     },
     "files": [

diff --git a/components/alert/package.json b/components/alert/package.json
@@ -27,8 +27,8 @@
         "test": "d2-app-scripts test --jestConfig ../../jest.config.shared.js"
     },
     "peerDependencies": {
-        "react": "^16.13",
-        "react-dom": "^16.13",
+        "react": "^16.13 || ^18",
+        "react-dom": "^16.13 || ^18",
         "styled-jsx": "^4"
     },
     "dependencies": {
@@ -44,8 +44,8 @@
         "types"
     ],
     "devDependencies": {
-        "react": "16.13",
-        "react-dom": "16.13",
+        "react": "^18.3.1",
+        "react-dom": "^18.3.1",
         "styled-jsx": "^4.0.1"
     },
     "types": "types"

diff --git a/components/box/package.json b/components/box/package.json
@@ -27,8 +27,8 @@
         "test": "d2-app-scripts test --jestConfig ../../jest.config.shared.js"
     },
     "peerDependencies": {
-        "react": "^16.13",
-        "react-dom": "^16.13",
+        "react": "^16.13 || ^18",
+        "react-dom": "^16.13 || ^18",
         "styled-jsx": "^4"
     },
     "dependencies": {
@@ -42,8 +42,8 @@
         "types"
     ],
     "devDependencies": {
-        "react": "16.13",
-        "react-dom": "16.13",
+        "react": "^18.3.1",
+        "react-dom": "^18.3.1",
         "styled-jsx": "^4.0.1"
     },
     "types": "types"

diff --git a/components/button/package.json b/components/button/package.json
@@ -27,8 +27,8 @@
         "test": "d2-app-scripts test --jestConfig ../../jest.config.shared.js"
     },
     "peerDependencies": {
-        "react": "^16.13",
-        "react-dom": "^16.13",
+        "react": "^16.13 || ^18",
+        "react-dom": "^16.13 || ^18",
         "styled-jsx": "^4"
     },
     "dependencies": {
@@ -46,8 +46,8 @@
         "types"
     ],
     "devDependencies": {
-        "react": "16.13",
-        "react-dom": "16.13",
+        "react": "^18.3.1",
+        "react-dom": "^18.3.1",
         "styled-jsx": "^4.0.1"
     },
     "types": "types"

diff --git a/components/button/src/split-button/split-button.test.js b/components/button/src/split-button/split-button.test.js
@@ -1,6 +1,5 @@
 import { render, fireEvent, cleanup, waitFor } from '@testing-library/react'
 import React from 'react'
-import '@testing-library/jest-dom/extend-expect'
 import { SplitButton } from './split-button.js'
 
 describe('SplitButton', () => {

diff --git a/components/calendar/package.json b/components/calendar/package.json
@@ -28,8 +28,8 @@
     },
     "peerDependencies": {
         "@dhis2/d2-i18n": "^1",
-        "react": "^16.13",
-        "react-dom": "^16.13",
+        "react": "^16.13 || ^18",
+        "react-dom": "^16.13 || ^18",
         "styled-jsx": "^4"
     },
     "dependencies": {
@@ -51,8 +51,8 @@
     ],
     "devDependencies": {
         "@dhis2/d2-i18n": "^1.1.0",
-        "react": "16.13",
-        "react-dom": "16.13",
+        "react": "^18.3.1",
+        "react-dom": "^18.3.1",
         "styled-jsx": "^4.0.1"
     },
     "types": "types"

diff --git a/components/card/package.json b/components/card/package.json
@@ -27,8 +27,8 @@
         "test": "d2-app-scripts test --jestConfig ../../jest.config.shared.js"
     },
     "peerDependencies": {
-        "react": "^16.13",
-        "react-dom": "^16.13",
+        "react": "^16.13 || ^18",
+        "react-dom": "^16.13 || ^18",
         "styled-jsx": "^4"
     },
     "dependencies": {
@@ -42,8 +42,8 @@
         "types"
     ],
     "devDependencies": {
-        "react": "16.13",
-        "react-dom": "16.13",
+        "react": "^18.3.1",
+        "react-dom": "^18.3.1",
         "styled-jsx": "^4.0.1"
     },
     "types": "types"

diff --git a/components/center/package.json b/components/center/package.json
@@ -27,8 +27,8 @@
         "test": "d2-app-scripts test --jestConfig ../../jest.config.shared.js"
     },
     "peerDependencies": {
-        "react": "^16.13",
-        "react-dom": "^16.13",
+        "react": "^16.13 || ^18",
+        "react-dom": "^16.13 || ^18",
         "styled-jsx": "^4"
     },
     "dependencies": {
@@ -42,8 +42,8 @@
         "types"
     ],
     "devDependencies": {
-        "react": "16.13",
-        "react-dom": "16.13",
+        "react": "^18.3.1",
+        "react-dom": "^18.3.1",
         "styled-jsx": "^4.0.1"
     },
     "types": "types"

diff --git a/components/checkbox/package.json b/components/checkbox/package.json
@@ -27,8 +27,8 @@
         "test": "d2-app-scripts test --jestConfig ../../jest.config.shared.js"
     },
     "peerDependencies": {
-        "react": "^16.13",
-        "react-dom": "^16.13",
+        "react": "^16.13 || ^18",
+        "react-dom": "^16.13 || ^18",
         "styled-jsx": "^4"
     },
     "dependencies": {
@@ -44,8 +44,8 @@
         "types"
     ],
     "devDependencies": {
-        "react": "16.13",
-        "react-dom": "16.13",
+        "react": "^18.3.1",
+        "react-dom": "^18.3.1",
         "styled-jsx": "^4.0.1"
     },
     "types": "types"

diff --git a/components/chip/package.json b/components/chip/package.json
@@ -27,8 +27,8 @@
         "test": "d2-app-scripts test --jestConfig ../../jest.config.shared.js"
     },
     "peerDependencies": {
-        "react": "^16.13",
-        "react-dom": "^16.13",
+        "react": "^16.13 || ^18",
+        "react-dom": "^16.13 || ^18",
         "styled-jsx": "^4"
     },
     "dependencies": {
@@ -42,8 +42,8 @@
         "types"
     ],
     "devDependencies": {
-        "react": "16.13",
-        "react-dom": "16.13",
+        "react": "^18.3.1",
+        "react-dom": "^18.3.1",
         "styled-jsx": "^4.0.1"
     },
     "types": "types"

diff --git a/components/cover/package.json b/components/cover/package.json
@@ -27,8 +27,8 @@
         "test": "d2-app-scripts test --jestConfig ../../jest.config.shared.js"
     },
     "peerDependencies": {
-        "react": "^16.13",
-        "react-dom": "^16.13",
+        "react": "^16.13 || ^18",
+        "react-dom": "^16.13 || ^18",
         "styled-jsx": "^4"
     },
     "dependencies": {
@@ -42,8 +42,8 @@
         "types"
     ],
     "devDependencies": {
-        "react": "16.13",
-        "react-dom": "16.13",
+        "react": "^18.3.1",
+        "react-dom": "^18.3.1",
         "styled-jsx": "^4.0.1"
     },
     "types": "types"

diff --git a/components/css/package.json b/components/css/package.json
@@ -27,8 +27,8 @@
         "test": "d2-app-scripts test --jestConfig ../../jest.config.shared.js"
     },
     "peerDependencies": {
-        "react": "^16.13",
-        "react-dom": "^16.13",
+        "react": "^16.13 || ^18",
+        "react-dom": "^16.13 || ^18",
         "styled-jsx": "^4"
     },
     "dependencies": {
@@ -42,8 +42,8 @@
         "types"
     ],
     "devDependencies": {
-        "react": "16.13",
-        "react-dom": "16.13",
+        "react": "^18.3.1",
+        "react-dom": "^18.3.1",
         "styled-jsx": "^4.0.1"
     },
     "types": "types"

diff --git a/components/divider/package.json b/components/divider/package.json
@@ -27,8 +27,8 @@
         "test": "d2-app-scripts test --jestConfig ../../jest.config.shared.js"
     },
     "peerDependencies": {
-        "react": "^16.13",
-        "react-dom": "^16.13",
+        "react": "^16.13 || ^18",
+        "react-dom": "^16.13 || ^18",
         "styled-jsx": "^4"
     },
     "dependencies": {
@@ -42,8 +42,8 @@
         "types"
     ],
     "devDependencies": {
-        "react": "16.13",
-        "react-dom": "16.13",
+        "react": "^18.3.1",
+        "react-dom": "^18.3.1",
         "styled-jsx": "^4.0.1"
     },
     "types": "types"

diff --git a/components/field/package.json b/components/field/package.json
@@ -27,8 +27,8 @@
         "test": "d2-app-scripts test --jestConfig ../../jest.config.shared.js"
     },
     "peerDependencies": {
-        "react": "^16.13",
-        "react-dom": "^16.13",
+        "react": "^16.13 || ^18",
+        "react-dom": "^16.13 || ^18",
         "styled-jsx": "^4"
     },
     "dependencies": {
@@ -45,8 +45,8 @@
         "types"
     ],
     "devDependencies": {
-        "react": "16.13",
-        "react-dom": "16.13",
+        "react": "^18.3.1",
+        "react-dom": "^18.3.1",
         "styled-jsx": "^4.0.1"
     },
     "types": "types"

diff --git a/components/file-input/package.json b/components/file-input/package.json
@@ -28,8 +28,8 @@
     },
     "peerDependencies": {
         "@dhis2/d2-i18n": "^1.1.0",
-        "react": "^16.13",
-        "react-dom": "^16.13",
+        "react": "^16.13 || ^18",
+        "react-dom": "^16.13 || ^18",
         "styled-jsx": "^4"
     },
     "dependencies": {
@@ -50,8 +50,8 @@
     ],
     "devDependencies": {
         "@dhis2/d2-i18n": "^1.1.0",
-        "react": "16.13",
-        "react-dom": "16.13",
+        "react": "^18.3.1",
+        "react-dom": "^18.3.1",
         "styled-jsx": "^4.0.1"
     },
     "types": "types"