Skip to content

Commit

Permalink
Merge branch 'master' into devrel-18-prepare
Browse files Browse the repository at this point in the history
  • Loading branch information
Topener committed Nov 27, 2024
2 parents cf606db + cb730b8 commit 22a5d3b
Show file tree
Hide file tree
Showing 163 changed files with 6,877 additions and 2,849 deletions.
2 changes: 0 additions & 2 deletions .github/CODEOWNERS

This file was deleted.

6 changes: 6 additions & 0 deletions .github/workflows/dhis2-verify-commits.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
with:
node-version: 20.x
- uses: c-hive/gha-yarn-cache@v1
- run: yarn install --frozen-lockfile
- id: commitlint
Expand All @@ -23,6 +26,9 @@ jobs:
- uses: actions/checkout@v2
with:
fetch-depth: 0
- uses: actions/setup-node@v1
with:
node-version: 20.x
- uses: c-hive/gha-yarn-cache@v1
- run: yarn install --frozen-lockfile
- id: commitlint
Expand Down
239 changes: 239 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,146 @@
## [10.1.3](https://github.com/dhis2/ui/compare/v10.1.2...v10.1.3) (2024-11-26)


### Bug Fixes

* add format only to calendar input and not for calendar types ([741fb6c](https://github.com/dhis2/ui/commit/741fb6c84f0ce29ae6a53729cf52a3c05750f80a))
* add format to calendar input props ([bbfbb56](https://github.com/dhis2/ui/commit/bbfbb561ffd9288eccbe37b66b5849c32a0694c0))

## [10.1.2](https://github.com/dhis2/ui/compare/v10.1.1...v10.1.2) (2024-11-26)


### Bug Fixes

* prevent prop-types error by making tabIndex an optional prop ([#1640](https://github.com/dhis2/ui/issues/1640)) ([b57b81c](https://github.com/dhis2/ui/commit/b57b81c190fe874a3318e45aac091b7a1418bd76))

## [10.1.1](https://github.com/dhis2/ui/compare/v10.1.0...v10.1.1) (2024-11-26)


### Bug Fixes

* **menu-item:** tweak active and focused styles ([#1639](https://github.com/dhis2/ui/issues/1639)) ([e6bf884](https://github.com/dhis2/ui/commit/e6bf8842622f2fc32692610877200a978c2ccd8d))

# [10.1.0](https://github.com/dhis2/ui/compare/v10.0.4...v10.1.0) (2024-11-25)


### Features

* **menu-item:** add ariaLabel prop to use if label prop is not a string ([#1638](https://github.com/dhis2/ui/issues/1638)) ([2c1c065](https://github.com/dhis2/ui/commit/2c1c065548841674cea1b6c3abf4da2e01de9083))

## [10.0.4](https://github.com/dhis2/ui/compare/v10.0.3...v10.0.4) (2024-11-25)


### Bug Fixes

* remove redundant wrapper object from onfocus and onblur callbacks ([#1637](https://github.com/dhis2/ui/issues/1637)) ([d259c09](https://github.com/dhis2/ui/commit/d259c097c70fd82568d28142162324c83706005d))

## [10.0.3](https://github.com/dhis2/ui/compare/v10.0.2...v10.0.3) (2024-11-25)


### Bug Fixes

* **calendar:** prevent handleBlur triggering on empty input focus ([#1636](https://github.com/dhis2/ui/issues/1636)) ([32b57bc](https://github.com/dhis2/ui/commit/32b57bc5b33f9c0380ec8d611b0d506b73b845fc))

## [10.0.2](https://github.com/dhis2/ui/compare/v10.0.1...v10.0.2) (2024-11-24)


### Bug Fixes

* **translations:** sync translations from transifex (master) ([595cfba](https://github.com/dhis2/ui/commit/595cfba9ba2ff8784dc178b68d7797103002eee4))

## [10.0.1](https://github.com/dhis2/ui/compare/v10.0.0...v10.0.1) (2024-11-21)


### Bug Fixes

* bump multi-calendar library ([5c21525](https://github.com/dhis2/ui/commit/5c215253ba1131e68114558c1f3945453e96633b))

# [10.0.0](https://github.com/dhis2/ui/compare/v9.15.0...v10.0.0) (2024-11-21)


### Bug Fixes

* update calendar tests for react 18 ([98831a7](https://github.com/dhis2/ui/commit/98831a7ab25b43d3c9424b6e8fbca93b6009cb26))
* update testing-library for selector-bar ([893024d](https://github.com/dhis2/ui/commit/893024db1666610ffc0d6321ae8531f407e7da5e))
* **calendar:** fix minor type issues ([#1588](https://github.com/dhis2/ui/issues/1588)) ([21e60a6](https://github.com/dhis2/ui/commit/21e60a6a275ab5cc4a1048e4dfb53183a4f92bd3))
* **calendar:** stop extra call to validation when choosing from picker ([#1623](https://github.com/dhis2/ui/issues/1623)) ([a1786d5](https://github.com/dhis2/ui/commit/a1786d593f9c3f2cac79dc6f657fa65c71d57690))
* **calendar-input:** trigger onFocus if passed ([#1622](https://github.com/dhis2/ui/issues/1622)) ([293505d](https://github.com/dhis2/ui/commit/293505d6376c57a4cef453096b791137c619ca7e))
* bump multi calendar library version in calendar ([#1566](https://github.com/dhis2/ui/issues/1566)) ([d205016](https://github.com/dhis2/ui/commit/d205016ae9f51eb286007762d99549325199cedc))
* bump multi calendar library version in calendar component ([#1576](https://github.com/dhis2/ui/issues/1576)) ([5f2b13d](https://github.com/dhis2/ui/commit/5f2b13dc3abfd2396c83c39fb399d3c7e0d1dffe))
* bump multi-calendar library ([#1615](https://github.com/dhis2/ui/issues/1615)) ([238de1f](https://github.com/dhis2/ui/commit/238de1f30e4b7bbfe40127ed35e9661ff1543a26))
* bump multi-calendar library ([#1618](https://github.com/dhis2/ui/issues/1618)) ([769c7ae](https://github.com/dhis2/ui/commit/769c7aee5fee159d9eb8eb67cb869ee87367f7fd))
* clear button and arrow alignment issues ([#1609](https://github.com/dhis2/ui/issues/1609)) ([ba0b657](https://github.com/dhis2/ui/commit/ba0b657a798c8f538ee025144d579d862bbd583a))
* stories for calendar validation ([#1616](https://github.com/dhis2/ui/issues/1616)) ([c00a2d6](https://github.com/dhis2/ui/commit/c00a2d62b85c686acb4fc0ad6aea39d839940ee9))
* update multi-calendar library ([6aa01cc](https://github.com/dhis2/ui/commit/6aa01cc9fd0cde91fd8d20716b132fe6518476e9))
* update yarn.lock after deduping ([5c24b02](https://github.com/dhis2/ui/commit/5c24b02782c2e9c530ec857669ba51ff3e5f3768))


### Features

* add aria attributes to loaders ([#1449](https://github.com/dhis2/ui/issues/1449)) ([2832584](https://github.com/dhis2/ui/commit/28325848aac6e1c5244b7a48ed5d8951a0cfa1d3))
* calendar input to work with react final form ([827c3f8](https://github.com/dhis2/ui/commit/827c3f853d24d08b9d1952c72149fc3359ffc34a))
* memorize calendar container component to improve perfromance ([#1575](https://github.com/dhis2/ui/issues/1575)) ([0d00a19](https://github.com/dhis2/ui/commit/0d00a19663147b24acc0513aa8958d630ffed94c))
* merge branch master into branch ([0577074](https://github.com/dhis2/ui/commit/05770745cbe17b8b059162d19fd66cb73eb7dad6))
* merge master into alpha ([7afecf9](https://github.com/dhis2/ui/commit/7afecf9121d573bc96f58f8bb89215440036c970))
* splitButton accessibility improvements ([#1458](https://github.com/dhis2/ui/issues/1458)) ([51a1b14](https://github.com/dhis2/ui/commit/51a1b149ae720703339dc36edc88de70c6798bf8))
* 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))
* use alpha of multi calendar library ([0c6b966](https://github.com/dhis2/ui/commit/0c6b966fca18912e88a13c6822ec68b46208e99a))
* verify date input only on blur on calendar input, close calendar popup on blur as well ([d8b0d1c](https://github.com/dhis2/ui/commit/d8b0d1cd2fd93a88413f0f73ad216783e6dd3ff7))
* **tooltip:** accessibility improvements for tooltip ([#1463](https://github.com/dhis2/ui/issues/1463)) ([f11eabb](https://github.com/dhis2/ui/commit/f11eabb87309efdb6e1d961a461002cdc76664b1))


### Reverts

* Revert "feat(selectionBar): accessibility improvements for SelectionBar (#1475)" ([54498fb](https://github.com/dhis2/ui/commit/54498fbdd8cec448c891855b72691d5613c83a47)), closes [#1475](https://github.com/dhis2/ui/issues/1475)


### BREAKING CHANGES

* multi-calendar hook no longer returns Temporal date

* fix: failing test

# [10.0.0-alpha.8](https://github.com/dhis2/ui/compare/v10.0.0-alpha.7...v10.0.0-alpha.8) (2024-11-21)


### Bug Fixes

* peer dependency issue with npm publish ([#1628](https://github.com/dhis2/ui/issues/1628)) ([1319654](https://github.com/dhis2/ui/commit/13196549eb2450d33d3debcbfa68d0321f8c6358))
* update calendar tests for react 18 ([98831a7](https://github.com/dhis2/ui/commit/98831a7ab25b43d3c9424b6e8fbca93b6009cb26))
* update testing-library for selector-bar ([893024d](https://github.com/dhis2/ui/commit/893024db1666610ffc0d6321ae8531f407e7da5e))
* **translations:** sync translations from transifex (master) ([d89ce94](https://github.com/dhis2/ui/commit/d89ce946b7145851a5c39ede8a4cbbaaa60411ca))
* **translations:** sync translations from transifex (master) ([7f22330](https://github.com/dhis2/ui/commit/7f22330ddfd1af2ac6e0199f4df78abf695200a2))


### Features

* add data sharing to sharing dialog [LIBS-677] ([#1629](https://github.com/dhis2/ui/issues/1629)) ([7e15c7f](https://github.com/dhis2/ui/commit/7e15c7f19becf6fc6657270a3f1ef94d8a48f048))
* make input field clearable and add prefix icon ([#1619](https://github.com/dhis2/ui/issues/1619)) ([7f87fb4](https://github.com/dhis2/ui/commit/7f87fb4ece42e1ba63143369dcefa1c33c65040f))
* update react peer dependency to react@18 ([#1624](https://github.com/dhis2/ui/issues/1624)) ([5d3c2a4](https://github.com/dhis2/ui/commit/5d3c2a4f6fc4683354a5af3d8ec2f8bfd88169f5))

# [10.0.0-alpha.7](https://github.com/dhis2/ui/compare/v10.0.0-alpha.6...v10.0.0-alpha.7) (2024-11-14)


### Bug Fixes

* **sharing-dialog:** add 'route' to SharingType type ([#1617](https://github.com/dhis2/ui/issues/1617)) ([1d9664a](https://github.com/dhis2/ui/commit/1d9664a80410f8ea6a8a4a4a7c3f6acc36a74587))
* revert "fix: select-field not showing in correct place" ([#1614](https://github.com/dhis2/ui/issues/1614)) ([c83de6b](https://github.com/dhis2/ui/commit/c83de6b0a8993ac16a87a3351ec96ff1aa43151b))
* **translations:** sync translations from transifex (master) ([491bf04](https://github.com/dhis2/ui/commit/491bf0477e8990e591b32ebfb32e6837f5e563b3))
* update default props to JS default params ([#1598](https://github.com/dhis2/ui/issues/1598)) ([20e343f](https://github.com/dhis2/ui/commit/20e343fc9e34570dcd8678ddb449d48c5b62a140))


### Features

* merge branch master into branch ([0577074](https://github.com/dhis2/ui/commit/05770745cbe17b8b059162d19fd66cb73eb7dad6))
* **icons:** add link-off icons ([e72be1e](https://github.com/dhis2/ui/commit/e72be1ec672fd16072a33ec057ccc3413713abeb))

# [9.12.0](https://github.com/dhis2/ui/compare/v9.11.8...v9.12.0) (2024-10-29)


### Features

* **icons:** add link-off icons ([e72be1e](https://github.com/dhis2/ui/commit/e72be1ec672fd16072a33ec057ccc3413713abeb))

## [9.11.8](https://github.com/dhis2/ui/compare/v9.11.7...v9.11.8) (2024-10-15)


Expand Down Expand Up @@ -26,6 +169,102 @@

* update default props to JS default params ([#1598](https://github.com/dhis2/ui/issues/1598)) ([20e343f](https://github.com/dhis2/ui/commit/20e343fc9e34570dcd8678ddb449d48c5b62a140))

# [10.0.0-alpha.6](https://github.com/dhis2/ui/compare/v10.0.0-alpha.5...v10.0.0-alpha.6) (2024-10-29)


### Bug Fixes

* **calendar:** stop extra call to validation when choosing from picker ([#1623](https://github.com/dhis2/ui/issues/1623)) ([a1786d5](https://github.com/dhis2/ui/commit/a1786d593f9c3f2cac79dc6f657fa65c71d57690))

# [10.0.0-alpha.5](https://github.com/dhis2/ui/compare/v10.0.0-alpha.4...v10.0.0-alpha.5) (2024-10-21)


### Bug Fixes

* **calendar-input:** trigger onFocus if passed ([#1622](https://github.com/dhis2/ui/issues/1622)) ([293505d](https://github.com/dhis2/ui/commit/293505d6376c57a4cef453096b791137c619ca7e))

# [10.0.0-alpha.4](https://github.com/dhis2/ui/compare/v10.0.0-alpha.3...v10.0.0-alpha.4) (2024-10-11)


### Bug Fixes

* bump multi-calendar library ([#1618](https://github.com/dhis2/ui/issues/1618)) ([769c7ae](https://github.com/dhis2/ui/commit/769c7aee5fee159d9eb8eb67cb869ee87367f7fd))

# [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)


### Bug Fixes

* stories for calendar validation ([#1616](https://github.com/dhis2/ui/issues/1616)) ([c00a2d6](https://github.com/dhis2/ui/commit/c00a2d62b85c686acb4fc0ad6aea39d839940ee9))

# [10.0.0-alpha.1](https://github.com/dhis2/ui/compare/v9.12.0-alpha.4...v10.0.0-alpha.1) (2024-10-04)


### Bug Fixes

* bump multi-calendar library ([#1615](https://github.com/dhis2/ui/issues/1615)) ([238de1f](https://github.com/dhis2/ui/commit/238de1f30e4b7bbfe40127ed35e9661ff1543a26))


### BREAKING CHANGES

* multi-calendar hook no longer returns Temporal date

* fix: failing test

# [9.12.0-alpha.4](https://github.com/dhis2/ui/compare/v9.12.0-alpha.3...v9.12.0-alpha.4) (2024-09-27)


### Bug Fixes

* clear button and arrow alignment issues ([#1609](https://github.com/dhis2/ui/issues/1609)) ([ba0b657](https://github.com/dhis2/ui/commit/ba0b657a798c8f538ee025144d579d862bbd583a))

# [9.12.0-alpha.3](https://github.com/dhis2/ui/compare/v9.12.0-alpha.2...v9.12.0-alpha.3) (2024-09-26)


### Features

* calendar input to work with react final form ([827c3f8](https://github.com/dhis2/ui/commit/827c3f853d24d08b9d1952c72149fc3359ffc34a))

# [9.12.0-alpha.2](https://github.com/dhis2/ui/compare/v9.12.0-alpha.1...v9.12.0-alpha.2) (2024-09-24)


### Bug Fixes

* update multi-calendar library ([6aa01cc](https://github.com/dhis2/ui/commit/6aa01cc9fd0cde91fd8d20716b132fe6518476e9))

# [9.12.0-alpha.1](https://github.com/dhis2/ui/compare/v9.11.4...v9.12.0-alpha.1) (2024-09-23)


### 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))
* bump multi calendar library version in calendar component ([#1576](https://github.com/dhis2/ui/issues/1576)) ([5f2b13d](https://github.com/dhis2/ui/commit/5f2b13dc3abfd2396c83c39fb399d3c7e0d1dffe))
* update yarn.lock after deduping ([5c24b02](https://github.com/dhis2/ui/commit/5c24b02782c2e9c530ec857669ba51ff3e5f3768))


### Features

* add aria attributes to loaders ([#1449](https://github.com/dhis2/ui/issues/1449)) ([2832584](https://github.com/dhis2/ui/commit/28325848aac6e1c5244b7a48ed5d8951a0cfa1d3))
* memorize calendar container component to improve perfromance ([#1575](https://github.com/dhis2/ui/issues/1575)) ([0d00a19](https://github.com/dhis2/ui/commit/0d00a19663147b24acc0513aa8958d630ffed94c))
* merge master into alpha ([7afecf9](https://github.com/dhis2/ui/commit/7afecf9121d573bc96f58f8bb89215440036c970))
* splitButton accessibility improvements ([#1458](https://github.com/dhis2/ui/issues/1458)) ([51a1b14](https://github.com/dhis2/ui/commit/51a1b149ae720703339dc36edc88de70c6798bf8))
* 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))
* use alpha of multi calendar library ([0c6b966](https://github.com/dhis2/ui/commit/0c6b966fca18912e88a13c6822ec68b46208e99a))
* verify date input only on blur on calendar input, close calendar popup on blur as well ([d8b0d1c](https://github.com/dhis2/ui/commit/d8b0d1cd2fd93a88413f0f73ad216783e6dd3ff7))
* **tooltip:** accessibility improvements for tooltip ([#1463](https://github.com/dhis2/ui/issues/1463)) ([f11eabb](https://github.com/dhis2/ui/commit/f11eabb87309efdb6e1d961a461002cdc76664b1))


### Reverts

* Revert "feat(selectionBar): accessibility improvements for SelectionBar (#1475)" ([54498fb](https://github.com/dhis2/ui/commit/54498fbdd8cec448c891855b72691d5613c83a47)), closes [#1475](https://github.com/dhis2/ui/issues/1475)

## [9.11.4](https://github.com/dhis2/ui/compare/v9.11.3...v9.11.4) (2024-09-10)


Expand Down
1 change: 1 addition & 0 deletions CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
# default code owner for repo
* @dhis2/team-extensibility
* @dhis2/platform-frontend
4 changes: 2 additions & 2 deletions collections/forms/i18n/en.pot
Original file line number Diff line number Diff line change
Expand Up @@ -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-09-09T12:09:30.724Z\n"
"PO-Revision-Date: 2024-09-09T12:09:30.724Z\n"
"POT-Creation-Date: 2024-09-26T14:15:11.940Z\n"
"PO-Revision-Date: 2024-09-26T14:15:11.941Z\n"

msgid "Upload file"
msgstr "Upload file"
Expand Down
28 changes: 14 additions & 14 deletions collections/forms/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@dhis2/ui-forms",
"version": "9.11.8",
"version": "10.1.3",
"main": "./build/cjs/index.js",
"module": "./build/es/index.js",
"sideEffects": [
Expand Down Expand Up @@ -30,20 +30,20 @@
"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",
"@dhis2-ui/button": "9.11.8",
"@dhis2-ui/checkbox": "9.11.8",
"@dhis2-ui/field": "9.11.8",
"@dhis2-ui/file-input": "9.11.8",
"@dhis2-ui/input": "9.11.8",
"@dhis2-ui/radio": "9.11.8",
"@dhis2-ui/select": "9.11.8",
"@dhis2-ui/switch": "9.11.8",
"@dhis2-ui/text-area": "9.11.8",
"@dhis2-ui/button": "10.1.3",
"@dhis2-ui/checkbox": "10.1.3",
"@dhis2-ui/field": "10.1.3",
"@dhis2-ui/file-input": "10.1.3",
"@dhis2-ui/input": "10.1.3",
"@dhis2-ui/radio": "10.1.3",
"@dhis2-ui/select": "10.1.3",
"@dhis2-ui/switch": "10.1.3",
"@dhis2-ui/text-area": "10.1.3",
"classnames": "^2.3.1",
"final-form": "^4.20.2",
"prop-types": "^15.7.2",
Expand All @@ -54,8 +54,8 @@
"types"
],
"devDependencies": {
"react": "16.13",
"react-dom": "16.13"
"react": "^18.3.1",
"react-dom": "^18.3.1"
},
"types": "types"
}
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ Press **Submit** to see the form values logged to the console.
`

export default {
title: 'Input Field (Final Form)',
title: 'Final Form - Input Field ',
component: InputFieldFF,
decorators: [formDecorator],
parameters: { docs: { description: { component: description } } },
Expand Down
Loading

0 comments on commit 22a5d3b

Please sign in to comment.