Merge branch 'alpha' into bump/multi-calendar

dhis2 · Oct 11, 2024 · 8cfefb6 · 8cfefb6
2 parents 3291638 + 8658d5b
commit 8cfefb6
Show file tree

Hide file tree

Showing 55 changed files with 294 additions and 285 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+# [10.0.0-alpha.3](https://github.com/dhis2/ui/compare/v10.0.0-alpha.2...v10.0.0-alpha.3) (2024-10-09)
+
+
+### Bug Fixes
+
+* **calendar:** fix minor type issues ([#1588](https://github.com/dhis2/ui/issues/1588)) ([21e60a6](https://github.com/dhis2/ui/commit/21e60a6a275ab5cc4a1048e4dfb53183a4f92bd3))
+
 # [10.0.0-alpha.2](https://github.com/dhis2/ui/compare/v10.0.0-alpha.1...v10.0.0-alpha.2) (2024-10-07)
 
 

diff --git a/collections/forms/package.json b/collections/forms/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@dhis2/ui-forms",
-    "version": "10.0.0-alpha.2",
+    "version": "10.0.0-alpha.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": "10.0.0-alpha.2",
-        "@dhis2-ui/checkbox": "10.0.0-alpha.2",
-        "@dhis2-ui/field": "10.0.0-alpha.2",
-        "@dhis2-ui/file-input": "10.0.0-alpha.2",
-        "@dhis2-ui/input": "10.0.0-alpha.2",
-        "@dhis2-ui/radio": "10.0.0-alpha.2",
-        "@dhis2-ui/select": "10.0.0-alpha.2",
-        "@dhis2-ui/switch": "10.0.0-alpha.2",
-        "@dhis2-ui/text-area": "10.0.0-alpha.2",
+        "@dhis2-ui/button": "10.0.0-alpha.3",
+        "@dhis2-ui/checkbox": "10.0.0-alpha.3",
+        "@dhis2-ui/field": "10.0.0-alpha.3",
+        "@dhis2-ui/file-input": "10.0.0-alpha.3",
+        "@dhis2-ui/input": "10.0.0-alpha.3",
+        "@dhis2-ui/radio": "10.0.0-alpha.3",
+        "@dhis2-ui/select": "10.0.0-alpha.3",
+        "@dhis2-ui/switch": "10.0.0-alpha.3",
+        "@dhis2-ui/text-area": "10.0.0-alpha.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": "10.0.0-alpha.2",
+    "version": "10.0.0-alpha.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": "10.0.0-alpha.2",
-        "@dhis2-ui/box": "10.0.0-alpha.2",
-        "@dhis2-ui/button": "10.0.0-alpha.2",
-        "@dhis2-ui/calendar": "10.0.0-alpha.2",
-        "@dhis2-ui/card": "10.0.0-alpha.2",
-        "@dhis2-ui/center": "10.0.0-alpha.2",
-        "@dhis2-ui/checkbox": "10.0.0-alpha.2",
-        "@dhis2-ui/chip": "10.0.0-alpha.2",
-        "@dhis2-ui/cover": "10.0.0-alpha.2",
-        "@dhis2-ui/css": "10.0.0-alpha.2",
-        "@dhis2-ui/divider": "10.0.0-alpha.2",
-        "@dhis2-ui/field": "10.0.0-alpha.2",
-        "@dhis2-ui/file-input": "10.0.0-alpha.2",
-        "@dhis2-ui/header-bar": "10.0.0-alpha.2",
-        "@dhis2-ui/help": "10.0.0-alpha.2",
-        "@dhis2-ui/input": "10.0.0-alpha.2",
-        "@dhis2-ui/intersection-detector": "10.0.0-alpha.2",
-        "@dhis2-ui/label": "10.0.0-alpha.2",
-        "@dhis2-ui/layer": "10.0.0-alpha.2",
-        "@dhis2-ui/legend": "10.0.0-alpha.2",
-        "@dhis2-ui/loader": "10.0.0-alpha.2",
-        "@dhis2-ui/logo": "10.0.0-alpha.2",
-        "@dhis2-ui/menu": "10.0.0-alpha.2",
-        "@dhis2-ui/modal": "10.0.0-alpha.2",
-        "@dhis2-ui/node": "10.0.0-alpha.2",
-        "@dhis2-ui/notice-box": "10.0.0-alpha.2",
-        "@dhis2-ui/organisation-unit-tree": "10.0.0-alpha.2",
-        "@dhis2-ui/pagination": "10.0.0-alpha.2",
-        "@dhis2-ui/popover": "10.0.0-alpha.2",
-        "@dhis2-ui/popper": "10.0.0-alpha.2",
-        "@dhis2-ui/portal": "10.0.0-alpha.2",
-        "@dhis2-ui/radio": "10.0.0-alpha.2",
-        "@dhis2-ui/required": "10.0.0-alpha.2",
-        "@dhis2-ui/segmented-control": "10.0.0-alpha.2",
-        "@dhis2-ui/select": "10.0.0-alpha.2",
-        "@dhis2-ui/selector-bar": "10.0.0-alpha.2",
-        "@dhis2-ui/sharing-dialog": "10.0.0-alpha.2",
-        "@dhis2-ui/switch": "10.0.0-alpha.2",
-        "@dhis2-ui/tab": "10.0.0-alpha.2",
-        "@dhis2-ui/table": "10.0.0-alpha.2",
-        "@dhis2-ui/tag": "10.0.0-alpha.2",
-        "@dhis2-ui/text-area": "10.0.0-alpha.2",
-        "@dhis2-ui/tooltip": "10.0.0-alpha.2",
-        "@dhis2-ui/transfer": "10.0.0-alpha.2",
-        "@dhis2-ui/user-avatar": "10.0.0-alpha.2",
-        "@dhis2/ui-constants": "10.0.0-alpha.2",
-        "@dhis2/ui-forms": "10.0.0-alpha.2",
-        "@dhis2/ui-icons": "10.0.0-alpha.2",
+        "@dhis2-ui/alert": "10.0.0-alpha.3",
+        "@dhis2-ui/box": "10.0.0-alpha.3",
+        "@dhis2-ui/button": "10.0.0-alpha.3",
+        "@dhis2-ui/calendar": "10.0.0-alpha.3",
+        "@dhis2-ui/card": "10.0.0-alpha.3",
+        "@dhis2-ui/center": "10.0.0-alpha.3",
+        "@dhis2-ui/checkbox": "10.0.0-alpha.3",
+        "@dhis2-ui/chip": "10.0.0-alpha.3",
+        "@dhis2-ui/cover": "10.0.0-alpha.3",
+        "@dhis2-ui/css": "10.0.0-alpha.3",
+        "@dhis2-ui/divider": "10.0.0-alpha.3",
+        "@dhis2-ui/field": "10.0.0-alpha.3",
+        "@dhis2-ui/file-input": "10.0.0-alpha.3",
+        "@dhis2-ui/header-bar": "10.0.0-alpha.3",
+        "@dhis2-ui/help": "10.0.0-alpha.3",
+        "@dhis2-ui/input": "10.0.0-alpha.3",
+        "@dhis2-ui/intersection-detector": "10.0.0-alpha.3",
+        "@dhis2-ui/label": "10.0.0-alpha.3",
+        "@dhis2-ui/layer": "10.0.0-alpha.3",
+        "@dhis2-ui/legend": "10.0.0-alpha.3",
+        "@dhis2-ui/loader": "10.0.0-alpha.3",
+        "@dhis2-ui/logo": "10.0.0-alpha.3",
+        "@dhis2-ui/menu": "10.0.0-alpha.3",
+        "@dhis2-ui/modal": "10.0.0-alpha.3",
+        "@dhis2-ui/node": "10.0.0-alpha.3",
+        "@dhis2-ui/notice-box": "10.0.0-alpha.3",
+        "@dhis2-ui/organisation-unit-tree": "10.0.0-alpha.3",
+        "@dhis2-ui/pagination": "10.0.0-alpha.3",
+        "@dhis2-ui/popover": "10.0.0-alpha.3",
+        "@dhis2-ui/popper": "10.0.0-alpha.3",
+        "@dhis2-ui/portal": "10.0.0-alpha.3",
+        "@dhis2-ui/radio": "10.0.0-alpha.3",
+        "@dhis2-ui/required": "10.0.0-alpha.3",
+        "@dhis2-ui/segmented-control": "10.0.0-alpha.3",
+        "@dhis2-ui/select": "10.0.0-alpha.3",
+        "@dhis2-ui/selector-bar": "10.0.0-alpha.3",
+        "@dhis2-ui/sharing-dialog": "10.0.0-alpha.3",
+        "@dhis2-ui/switch": "10.0.0-alpha.3",
+        "@dhis2-ui/tab": "10.0.0-alpha.3",
+        "@dhis2-ui/table": "10.0.0-alpha.3",
+        "@dhis2-ui/tag": "10.0.0-alpha.3",
+        "@dhis2-ui/text-area": "10.0.0-alpha.3",
+        "@dhis2-ui/tooltip": "10.0.0-alpha.3",
+        "@dhis2-ui/transfer": "10.0.0-alpha.3",
+        "@dhis2-ui/user-avatar": "10.0.0-alpha.3",
+        "@dhis2/ui-constants": "10.0.0-alpha.3",
+        "@dhis2/ui-forms": "10.0.0-alpha.3",
+        "@dhis2/ui-icons": "10.0.0-alpha.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": "10.0.0-alpha.2",
+    "version": "10.0.0-alpha.3",
     "description": "UI Alert",
     "repository": {
         "type": "git",
@@ -33,9 +33,9 @@
     },
     "dependencies": {
         "@dhis2/prop-types": "^3.1.2",
-        "@dhis2-ui/portal": "10.0.0-alpha.2",
-        "@dhis2/ui-constants": "10.0.0-alpha.2",
-        "@dhis2/ui-icons": "10.0.0-alpha.2",
+        "@dhis2-ui/portal": "10.0.0-alpha.3",
+        "@dhis2/ui-constants": "10.0.0-alpha.3",
+        "@dhis2/ui-icons": "10.0.0-alpha.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": "10.0.0-alpha.2",
+    "version": "10.0.0-alpha.3",
     "description": "UI Box",
     "repository": {
         "type": "git",
@@ -33,7 +33,7 @@
     },
     "dependencies": {
         "@dhis2/prop-types": "^3.1.2",
-        "@dhis2/ui-constants": "10.0.0-alpha.2",
+        "@dhis2/ui-constants": "10.0.0-alpha.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": "10.0.0-alpha.2",
+    "version": "10.0.0-alpha.3",
     "description": "UI Button",
     "repository": {
         "type": "git",
@@ -33,11 +33,11 @@
     },
     "dependencies": {
         "@dhis2/prop-types": "^3.1.2",
-        "@dhis2-ui/layer": "10.0.0-alpha.2",
-        "@dhis2-ui/loader": "10.0.0-alpha.2",
-        "@dhis2-ui/popper": "10.0.0-alpha.2",
-        "@dhis2/ui-constants": "10.0.0-alpha.2",
-        "@dhis2/ui-icons": "10.0.0-alpha.2",
+        "@dhis2-ui/layer": "10.0.0-alpha.3",
+        "@dhis2-ui/loader": "10.0.0-alpha.3",
+        "@dhis2-ui/popper": "10.0.0-alpha.3",
+        "@dhis2/ui-constants": "10.0.0-alpha.3",
+        "@dhis2/ui-icons": "10.0.0-alpha.3",
         "classnames": "^2.3.1",
         "prop-types": "^15.7.2"
     },

diff --git a/components/calendar/package.json b/components/calendar/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@dhis2-ui/calendar",
-    "version": "10.0.0-alpha.2",
+    "version": "10.0.0-alpha.3",
     "description": "UI Calendar",
     "repository": {
         "type": "git",
@@ -33,15 +33,15 @@
         "styled-jsx": "^4"
     },
     "dependencies": {
-        "@dhis2-ui/button": "10.0.0-alpha.2",
-        "@dhis2-ui/card": "10.0.0-alpha.2",
-        "@dhis2-ui/input": "10.0.0-alpha.2",
-        "@dhis2-ui/layer": "10.0.0-alpha.2",
-        "@dhis2-ui/popper": "10.0.0-alpha.2",
-        "@dhis2/multi-calendar-dates": "2.0.0-alpha.3",
+        "@dhis2-ui/button": "10.0.0-alpha.3",
+        "@dhis2-ui/card": "10.0.0-alpha.3",
+        "@dhis2-ui/input": "10.0.0-alpha.3",
+        "@dhis2-ui/layer": "10.0.0-alpha.3",
+        "@dhis2-ui/popper": "10.0.0-alpha.3",
+        "@dhis2/multi-calendar-dates": "2.0.0-alpha.2",
         "@dhis2/prop-types": "^3.1.2",
-        "@dhis2/ui-constants": "10.0.0-alpha.2",
-        "@dhis2/ui-icons": "10.0.0-alpha.2",
+        "@dhis2/ui-constants": "10.0.0-alpha.3",
+        "@dhis2/ui-icons": "10.0.0-alpha.3",
         "classnames": "^2.3.1",
         "prop-types": "^15.7.2"
     },

diff --git a/components/calendar/types/index.d.ts b/components/calendar/types/index.d.ts
@@ -20,6 +20,11 @@ export interface CalendarProps {
      * the size of a single cell in the table forming the calendar
      */
     cellSize?: string
+
+    /**
+     * Add a "clear" button to delete the selected date
+     */
+    clearable?: boolean
     /**
      * the currently selected date using an iso-like format YYYY-MM-DD, in the calendar system provided (not iso8601)
      */
@@ -52,10 +57,7 @@ export interface CalendarProps {
 
 export const Calendar: React.FC<CalendarProps>
 
-export type CalendarInputProps = Omit<
-    InputFieldProps,
-    'label' | 'type' | 'value'
-> &
+export type CalendarInputProps = Omit<InputFieldProps, 'type' | 'value'> &
     CalendarProps
 
 export const CalendarInput: React.FC<CalendarInputProps>
diff --git a/components/card/package.json b/components/card/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@dhis2-ui/card",
-    "version": "10.0.0-alpha.2",
+    "version": "10.0.0-alpha.3",
     "description": "UI Card",
     "repository": {
         "type": "git",
@@ -33,7 +33,7 @@
     },
     "dependencies": {
         "@dhis2/prop-types": "^3.1.2",
-        "@dhis2/ui-constants": "10.0.0-alpha.2",
+        "@dhis2/ui-constants": "10.0.0-alpha.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": "10.0.0-alpha.2",
+    "version": "10.0.0-alpha.3",
     "description": "UI Center",
     "repository": {
         "type": "git",
@@ -33,7 +33,7 @@
     },
     "dependencies": {
         "@dhis2/prop-types": "^3.1.2",
-        "@dhis2/ui-constants": "10.0.0-alpha.2",
+        "@dhis2/ui-constants": "10.0.0-alpha.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": "10.0.0-alpha.2",
+    "version": "10.0.0-alpha.3",
     "description": "UI Checkbox",
     "repository": {
         "type": "git",
@@ -33,9 +33,9 @@
     },
     "dependencies": {
         "@dhis2/prop-types": "^3.1.2",
-        "@dhis2-ui/field": "10.0.0-alpha.2",
-        "@dhis2-ui/required": "10.0.0-alpha.2",
-        "@dhis2/ui-constants": "10.0.0-alpha.2",
+        "@dhis2-ui/field": "10.0.0-alpha.3",
+        "@dhis2-ui/required": "10.0.0-alpha.3",
+        "@dhis2/ui-constants": "10.0.0-alpha.3",
         "classnames": "^2.3.1",
         "prop-types": "^15.7.2"
     },

diff --git a/components/chip/package.json b/components/chip/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@dhis2-ui/chip",
-    "version": "10.0.0-alpha.2",
+    "version": "10.0.0-alpha.3",
     "description": "UI Chip",
     "repository": {
         "type": "git",
@@ -33,7 +33,7 @@
     },
     "dependencies": {
         "@dhis2/prop-types": "^3.1.2",
-        "@dhis2/ui-constants": "10.0.0-alpha.2",
+        "@dhis2/ui-constants": "10.0.0-alpha.3",
         "classnames": "^2.3.1",
         "prop-types": "^15.7.2"
     },

diff --git a/components/cover/package.json b/components/cover/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@dhis2-ui/cover",
-    "version": "10.0.0-alpha.2",
+    "version": "10.0.0-alpha.3",
     "description": "UI Cover",
     "repository": {
         "type": "git",
@@ -33,7 +33,7 @@
     },
     "dependencies": {
         "@dhis2/prop-types": "^3.1.2",
-        "@dhis2/ui-constants": "10.0.0-alpha.2",
+        "@dhis2/ui-constants": "10.0.0-alpha.3",
         "classnames": "^2.3.1",
         "prop-types": "^15.7.2"
     },

diff --git a/components/css/package.json b/components/css/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@dhis2-ui/css",
-    "version": "10.0.0-alpha.2",
+    "version": "10.0.0-alpha.3",
     "description": "UI CSS",
     "repository": {
         "type": "git",
@@ -33,7 +33,7 @@
     },
     "dependencies": {
         "@dhis2/prop-types": "^3.1.2",
-        "@dhis2/ui-constants": "10.0.0-alpha.2",
+        "@dhis2/ui-constants": "10.0.0-alpha.3",
         "classnames": "^2.3.1",
         "prop-types": "^15.7.2"
     },

diff --git a/components/divider/package.json b/components/divider/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@dhis2-ui/divider",
-    "version": "10.0.0-alpha.2",
+    "version": "10.0.0-alpha.3",
     "description": "UI Divider",
     "repository": {
         "type": "git",
@@ -33,7 +33,7 @@
     },
     "dependencies": {
         "@dhis2/prop-types": "^3.1.2",
-        "@dhis2/ui-constants": "10.0.0-alpha.2",
+        "@dhis2/ui-constants": "10.0.0-alpha.3",
         "classnames": "^2.3.1",
         "prop-types": "^15.7.2"
     },