Merge branch 'master' of github.com:dhis2/ui into alpha-update

dhis2 · Aug 26, 2024 · 5f23c82 · 5f23c82
2 parents eb816a5 + 18a230e
commit 5f23c82
Show file tree

Hide file tree

Showing 63 changed files with 3,203 additions and 3,332 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## [9.11.3](https://github.com/dhis2/ui/compare/v9.11.2...v9.11.3) (2024-08-21)
+
+
+### Bug Fixes
+
+* select-field not showing in correct place ([#1400](https://github.com/dhis2/ui/issues/1400)) ([d97d640](https://github.com/dhis2/ui/commit/d97d640f92c1c42dbc92e46771b6a58870add895))
+
 ## [9.11.2](https://github.com/dhis2/ui/compare/v9.11.1...v9.11.2) (2024-08-18)
 
 
@@ -11,9 +18,6 @@
 
 ### Bug Fixes
 
-* bump multi calendar library version in calendar component  ([#1576](https://github.com/dhis2/ui/issues/1576)) ([5f2b13d](https://github.com/dhis2/ui/commit/5f2b13dc3abfd2396c83c39fb399d3c7e0d1dffe))
-
-# [9.9.0-alpha.5](https://github.com/dhis2/ui/compare/v9.9.0-alpha.4...v9.9.0-alpha.5) (2024-08-08)
 * fix publishing to npm ([#1577](https://github.com/dhis2/ui/issues/1577)) ([1889a7b](https://github.com/dhis2/ui/commit/1889a7baf0ad1b6709272be61094da80cad65fe1))
 * get rid of storybook references in docs ([1904b17](https://github.com/dhis2/ui/commit/1904b172bfde066a17a0edf82c196959ba35c8bb))
 * get storybook 8 working ([8c6be62](https://github.com/dhis2/ui/commit/8c6be62c2df9261109df12e51c7dc2339b59eedf))
@@ -27,26 +31,13 @@
 
 ### Features
 
-* memorize calendar container component to improve perfromance ([#1575](https://github.com/dhis2/ui/issues/1575)) ([0d00a19](https://github.com/dhis2/ui/commit/0d00a19663147b24acc0513aa8958d630ffed94c))
-
-# [9.9.0-alpha.4](https://github.com/dhis2/ui/compare/v9.9.0-alpha.3...v9.9.0-alpha.4) (2024-08-07)
-
-
-### Features
-
-* verify date input only on blur on calendar input, close calendar popup on blur as well ([d8b0d1c](https://github.com/dhis2/ui/commit/d8b0d1cd2fd93a88413f0f73ad216783e6dd3ff7))
-
-# [9.9.0-alpha.3](https://github.com/dhis2/ui/compare/v9.9.0-alpha.2...v9.9.0-alpha.3) (2024-08-01)
 * implement accessible flyout menu and handle submenus ([#1495](https://github.com/dhis2/ui/issues/1495)) ([73d1f7e](https://github.com/dhis2/ui/commit/73d1f7e062ad393a156b3b439b590c5927f0fc9d))
 
 ## [9.10.3](https://github.com/dhis2/ui/compare/v9.10.2...v9.10.3) (2024-07-24)
 
 
 ### Bug Fixes
 
-* bump multi calendar library version in calendar ([#1566](https://github.com/dhis2/ui/issues/1566)) ([d205016](https://github.com/dhis2/ui/commit/d205016ae9f51eb286007762d99549325199cedc))
-
-# [9.9.0-alpha.2](https://github.com/dhis2/ui/compare/v9.9.0-alpha.1...v9.9.0-alpha.2) (2024-08-01)
 * **translations:** sync translations from transifex (master) ([b7d3ec6](https://github.com/dhis2/ui/commit/b7d3ec6a91d7fd54c9220364c678f71c9daa14eb))
 
 ## [9.10.2](https://github.com/dhis2/ui/compare/v9.10.1...v9.10.2) (2024-07-15)
@@ -72,9 +63,6 @@
 
 ### Features
 
-* support editable input | min & max dates | dd-mm-yyyy format in CalendarInput ([#1504](https://github.com/dhis2/ui/issues/1504)) ([99a78f5](https://github.com/dhis2/ui/commit/99a78f5caec83529af26a11a2dd4d93fface30b4))
-
-# [9.9.0-alpha.1](https://github.com/dhis2/ui/compare/v9.8.1...v9.9.0-alpha.1) (2024-06-17)
 * **menu:** memoise menu's childrenToRender function and add valid role checks ([#1539](https://github.com/dhis2/ui/issues/1539)) ([bddbdae](https://github.com/dhis2/ui/commit/bddbdaeb63180b80a4352a256e7916ab75f633e9))
 * **TabBar:** accessibility improvements for TabBar & Tab ([#1468](https://github.com/dhis2/ui/issues/1468)) ([b095f5a](https://github.com/dhis2/ui/commit/b095f5a90688b7e95338622137c71b2305fd9fe7))
 

diff --git a/collections/forms/i18n/en.pot b/collections/forms/i18n/en.pot
@@ -5,8 +5,8 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"POT-Creation-Date: 2024-08-20T17:05:51.905Z\n"
-"PO-Revision-Date: 2024-08-20T17:05:51.906Z\n"
+"POT-Creation-Date: 2024-07-17T14:10:05.852Z\n"
+"PO-Revision-Date: 2024-07-17T14:10:05.853Z\n"
 
 msgid "Upload file"
 msgstr "Upload file"

diff --git a/collections/forms/package.json b/collections/forms/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@dhis2/ui-forms",
-    "version": "9.11.2",
+    "version": "9.11.3",
     "main": "./build/cjs/index.js",
     "module": "./build/es/index.js",
     "sideEffects": [
@@ -35,15 +35,15 @@
     },
     "dependencies": {
         "@dhis2/prop-types": "^3.1.2",
-        "@dhis2-ui/button": "9.11.2",
-        "@dhis2-ui/checkbox": "9.11.2",
-        "@dhis2-ui/field": "9.11.2",
-        "@dhis2-ui/file-input": "9.11.2",
-        "@dhis2-ui/input": "9.11.2",
-        "@dhis2-ui/radio": "9.11.2",
-        "@dhis2-ui/select": "9.11.2",
-        "@dhis2-ui/switch": "9.11.2",
-        "@dhis2-ui/text-area": "9.11.2",
+        "@dhis2-ui/button": "9.11.3",
+        "@dhis2-ui/checkbox": "9.11.3",
+        "@dhis2-ui/field": "9.11.3",
+        "@dhis2-ui/file-input": "9.11.3",
+        "@dhis2-ui/input": "9.11.3",
+        "@dhis2-ui/radio": "9.11.3",
+        "@dhis2-ui/select": "9.11.3",
+        "@dhis2-ui/switch": "9.11.3",
+        "@dhis2-ui/text-area": "9.11.3",
         "classnames": "^2.3.1",
         "final-form": "^4.20.2",
         "prop-types": "^15.7.2",

diff --git a/collections/ui/package.json b/collections/ui/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@dhis2/ui",
-    "version": "9.11.2",
+    "version": "9.11.3",
     "main": "./build/cjs/index.js",
     "module": "./build/es/index.js",
     "exports": {
@@ -21,54 +21,54 @@
         "build": "d2-app-scripts build"
     },
     "dependencies": {
-        "@dhis2-ui/alert": "9.11.2",
-        "@dhis2-ui/box": "9.11.2",
-        "@dhis2-ui/button": "9.11.2",
-        "@dhis2-ui/calendar": "9.9.0-alpha.6",
-        "@dhis2-ui/card": "9.11.2",
-        "@dhis2-ui/center": "9.11.2",
-        "@dhis2-ui/checkbox": "9.11.2",
-        "@dhis2-ui/chip": "9.11.2",
-        "@dhis2-ui/cover": "9.11.2",
-        "@dhis2-ui/css": "9.11.2",
-        "@dhis2-ui/divider": "9.11.2",
-        "@dhis2-ui/field": "9.11.2",
-        "@dhis2-ui/file-input": "9.11.2",
-        "@dhis2-ui/header-bar": "9.11.2",
-        "@dhis2-ui/help": "9.11.2",
-        "@dhis2-ui/input": "9.11.2",
-        "@dhis2-ui/intersection-detector": "9.11.2",
-        "@dhis2-ui/label": "9.11.2",
-        "@dhis2-ui/layer": "9.11.2",
-        "@dhis2-ui/legend": "9.11.2",
-        "@dhis2-ui/loader": "9.11.2",
-        "@dhis2-ui/logo": "9.11.2",
-        "@dhis2-ui/menu": "9.11.2",
-        "@dhis2-ui/modal": "9.11.2",
-        "@dhis2-ui/node": "9.11.2",
-        "@dhis2-ui/notice-box": "9.11.2",
-        "@dhis2-ui/organisation-unit-tree": "9.11.2",
-        "@dhis2-ui/pagination": "9.11.2",
-        "@dhis2-ui/popover": "9.11.2",
-        "@dhis2-ui/popper": "9.11.2",
-        "@dhis2-ui/portal": "9.11.2",
-        "@dhis2-ui/radio": "9.11.2",
-        "@dhis2-ui/required": "9.11.2",
-        "@dhis2-ui/segmented-control": "9.11.2",
-        "@dhis2-ui/select": "9.11.2",
-        "@dhis2-ui/selector-bar": "9.11.2",
-        "@dhis2-ui/sharing-dialog": "9.11.2",
-        "@dhis2-ui/switch": "9.11.2",
-        "@dhis2-ui/tab": "9.11.2",
-        "@dhis2-ui/table": "9.11.2",
-        "@dhis2-ui/tag": "9.11.2",
-        "@dhis2-ui/text-area": "9.11.2",
-        "@dhis2-ui/tooltip": "9.11.2",
-        "@dhis2-ui/transfer": "9.11.2",
-        "@dhis2-ui/user-avatar": "9.11.2",
-        "@dhis2/ui-constants": "9.11.2",
-        "@dhis2/ui-forms": "9.11.2",
-        "@dhis2/ui-icons": "9.11.2",
+        "@dhis2-ui/alert": "9.11.3",
+        "@dhis2-ui/box": "9.11.3",
+        "@dhis2-ui/button": "9.11.3",
+        "@dhis2-ui/calendar": "9.11.3",
+        "@dhis2-ui/card": "9.11.3",
+        "@dhis2-ui/center": "9.11.3",
+        "@dhis2-ui/checkbox": "9.11.3",
+        "@dhis2-ui/chip": "9.11.3",
+        "@dhis2-ui/cover": "9.11.3",
+        "@dhis2-ui/css": "9.11.3",
+        "@dhis2-ui/divider": "9.11.3",
+        "@dhis2-ui/field": "9.11.3",
+        "@dhis2-ui/file-input": "9.11.3",
+        "@dhis2-ui/header-bar": "9.11.3",
+        "@dhis2-ui/help": "9.11.3",
+        "@dhis2-ui/input": "9.11.3",
+        "@dhis2-ui/intersection-detector": "9.11.3",
+        "@dhis2-ui/label": "9.11.3",
+        "@dhis2-ui/layer": "9.11.3",
+        "@dhis2-ui/legend": "9.11.3",
+        "@dhis2-ui/loader": "9.11.3",
+        "@dhis2-ui/logo": "9.11.3",
+        "@dhis2-ui/menu": "9.11.3",
+        "@dhis2-ui/modal": "9.11.3",
+        "@dhis2-ui/node": "9.11.3",
+        "@dhis2-ui/notice-box": "9.11.3",
+        "@dhis2-ui/organisation-unit-tree": "9.11.3",
+        "@dhis2-ui/pagination": "9.11.3",
+        "@dhis2-ui/popover": "9.11.3",
+        "@dhis2-ui/popper": "9.11.3",
+        "@dhis2-ui/portal": "9.11.3",
+        "@dhis2-ui/radio": "9.11.3",
+        "@dhis2-ui/required": "9.11.3",
+        "@dhis2-ui/segmented-control": "9.11.3",
+        "@dhis2-ui/select": "9.11.3",
+        "@dhis2-ui/selector-bar": "9.11.3",
+        "@dhis2-ui/sharing-dialog": "9.11.3",
+        "@dhis2-ui/switch": "9.11.3",
+        "@dhis2-ui/tab": "9.11.3",
+        "@dhis2-ui/table": "9.11.3",
+        "@dhis2-ui/tag": "9.11.3",
+        "@dhis2-ui/text-area": "9.11.3",
+        "@dhis2-ui/tooltip": "9.11.3",
+        "@dhis2-ui/transfer": "9.11.3",
+        "@dhis2-ui/user-avatar": "9.11.3",
+        "@dhis2/ui-constants": "9.11.3",
+        "@dhis2/ui-forms": "9.11.3",
+        "@dhis2/ui-icons": "9.11.3",
         "prop-types": "^15.7.2"
     },
     "peerDependencies": {

diff --git a/components/alert/package.json b/components/alert/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@dhis2-ui/alert",
-    "version": "9.11.2",
+    "version": "9.11.3",
     "description": "UI Alert",
     "repository": {
         "type": "git",
@@ -33,9 +33,9 @@
     },
     "dependencies": {
         "@dhis2/prop-types": "^3.1.2",
-        "@dhis2-ui/portal": "9.11.2",
-        "@dhis2/ui-constants": "9.11.2",
-        "@dhis2/ui-icons": "9.11.2",
+        "@dhis2-ui/portal": "9.11.3",
+        "@dhis2/ui-constants": "9.11.3",
+        "@dhis2/ui-icons": "9.11.3",
         "classnames": "^2.3.1",
         "prop-types": "^15.7.2"
     },

diff --git a/components/box/package.json b/components/box/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@dhis2-ui/box",
-    "version": "9.11.2",
+    "version": "9.11.3",
     "description": "UI Box",
     "repository": {
         "type": "git",
@@ -33,7 +33,7 @@
     },
     "dependencies": {
         "@dhis2/prop-types": "^3.1.2",
-        "@dhis2/ui-constants": "9.11.2",
+        "@dhis2/ui-constants": "9.11.3",
         "classnames": "^2.3.1",
         "prop-types": "^15.7.2"
     },

diff --git a/components/button/package.json b/components/button/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@dhis2-ui/button",
-    "version": "9.11.2",
+    "version": "9.11.3",
     "description": "UI Button",
     "repository": {
         "type": "git",
@@ -33,11 +33,11 @@
     },
     "dependencies": {
         "@dhis2/prop-types": "^3.1.2",
-        "@dhis2-ui/layer": "9.11.2",
-        "@dhis2-ui/loader": "9.11.2",
-        "@dhis2-ui/popper": "9.11.2",
-        "@dhis2/ui-constants": "9.11.2",
-        "@dhis2/ui-icons": "9.11.2",
+        "@dhis2-ui/layer": "9.11.3",
+        "@dhis2-ui/loader": "9.11.3",
+        "@dhis2-ui/popper": "9.11.3",
+        "@dhis2/ui-constants": "9.11.3",
+        "@dhis2/ui-icons": "9.11.3",
         "classnames": "^2.3.1",
         "prop-types": "^15.7.2"
     },

diff --git a/components/calendar/i18n/en.pot b/components/calendar/i18n/en.pot
@@ -5,14 +5,17 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"POT-Creation-Date: 2024-08-17T14:54:18.072Z\n"
-"PO-Revision-Date: 2024-08-17T14:54:18.073Z\n"
+"POT-Creation-Date: 2024-06-20T08:43:03.143Z\n"
+"PO-Revision-Date: 2024-06-20T08:43:03.143Z\n"
 
 msgid "Go to previous year"
 msgstr "Go to previous year"
 
 msgid "Go to next year"
 msgstr "Go to next year"
 
+msgid "Pick a date"
+msgstr "Pick a date"
+
 msgid "Clear"
 msgstr "Clear"
diff --git a/components/calendar/package.json b/components/calendar/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@dhis2-ui/calendar",
-    "version": "9.9.0-alpha.6",
+    "version": "9.11.3",
     "description": "UI Calendar",
     "repository": {
         "type": "git",
@@ -33,15 +33,15 @@
         "styled-jsx": "^4"
     },
     "dependencies": {
-        "@dhis2-ui/button": "9.11.2",
-        "@dhis2-ui/card": "9.11.2",
-        "@dhis2-ui/input": "9.11.2",
-        "@dhis2-ui/layer": "9.11.2",
-        "@dhis2-ui/popper": "9.11.2",
-        "@dhis2/multi-calendar-dates": "^1.0.0-alpha.29",
+        "@dhis2-ui/button": "9.11.3",
+        "@dhis2-ui/card": "9.11.3",
+        "@dhis2-ui/input": "9.11.3",
+        "@dhis2-ui/layer": "9.11.3",
+        "@dhis2-ui/popper": "9.11.3",
+        "@dhis2/multi-calendar-dates": "^1.2.3",
         "@dhis2/prop-types": "^3.1.2",
-        "@dhis2/ui-constants": "9.11.2",
-        "@dhis2/ui-icons": "9.11.2",
+        "@dhis2/ui-constants": "9.11.3",
+        "@dhis2/ui-icons": "9.11.3",
         "classnames": "^2.3.1",
         "prop-types": "^15.7.2"
     },

diff --git a/components/calendar/src/calendar-input/calendar-input.js b/components/calendar/src/calendar-input/calendar-input.js
@@ -112,7 +112,7 @@ export const CalendarInput = ({
         <>
             <div className="calendar-input-wrapper" ref={ref}>
                 <InputField
-                    label="Pick a date"
+                    label={i18n.t('Pick a date')}
                     {...rest}
                     type="text"
                     onFocus={onFocus}

diff --git a/components/card/package.json b/components/card/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@dhis2-ui/card",
-    "version": "9.11.2",
+    "version": "9.11.3",
     "description": "UI Card",
     "repository": {
         "type": "git",
@@ -33,7 +33,7 @@
     },
     "dependencies": {
         "@dhis2/prop-types": "^3.1.2",
-        "@dhis2/ui-constants": "9.11.2",
+        "@dhis2/ui-constants": "9.11.3",
         "classnames": "^2.3.1",
         "prop-types": "^15.7.2"
     },

diff --git a/components/center/package.json b/components/center/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@dhis2-ui/center",
-    "version": "9.11.2",
+    "version": "9.11.3",
     "description": "UI Center",
     "repository": {
         "type": "git",
@@ -33,7 +33,7 @@
     },
     "dependencies": {
         "@dhis2/prop-types": "^3.1.2",
-        "@dhis2/ui-constants": "9.11.2",
+        "@dhis2/ui-constants": "9.11.3",
         "classnames": "^2.3.1",
         "prop-types": "^15.7.2"
     },

diff --git a/components/checkbox/package.json b/components/checkbox/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@dhis2-ui/checkbox",
-    "version": "9.11.2",
+    "version": "9.11.3",
     "description": "UI Checkbox",
     "repository": {
         "type": "git",
@@ -33,9 +33,9 @@
     },
     "dependencies": {
         "@dhis2/prop-types": "^3.1.2",
-        "@dhis2-ui/field": "9.11.2",
-        "@dhis2-ui/required": "9.11.2",
-        "@dhis2/ui-constants": "9.11.2",
+        "@dhis2-ui/field": "9.11.3",
+        "@dhis2-ui/required": "9.11.3",
+        "@dhis2/ui-constants": "9.11.3",
         "classnames": "^2.3.1",
         "prop-types": "^15.7.2"
     },