diff --git a/govuk_frontend_django/components/header.py b/govuk_frontend_django/components/header.py index f75d38c..a512d8f 100644 --- a/govuk_frontend_django/components/header.py +++ b/govuk_frontend_django/components/header.py @@ -28,7 +28,6 @@ class GovUKHeader(govuk_frontend_base.GovUKComponent): """ homepageUrl: Optional[str] = None - assetsPath: Optional[str] = None productName: Optional[str] = None serviceName: Optional[str] = None serviceUrl: Optional[str] = None @@ -38,6 +37,7 @@ class GovUKHeader(govuk_frontend_base.GovUKComponent): menuButtonLabel: Optional[str] = None menuButtonText: Optional[str] = None containerClasses: Optional[str] = None + useTudorCrown: Optional[bool] = None _jinja2_template = "govuk_frontend_jinja/components/header/macro.html" _macro_name = "govukHeader" diff --git a/govuk_frontend_django/components/input.py b/govuk_frontend_django/components/input.py index 64e10b4..239e025 100644 --- a/govuk_frontend_django/components/input.py +++ b/govuk_frontend_django/components/input.py @@ -11,6 +11,12 @@ from govuk_frontend_django.components import tag as govuk_frontend_tag +@dataclass(kw_only=True) +class InputInputwrapper: + classes: Optional[str] = None + attributes: Optional[govuk_frontend_base.Attributes] = None + + @dataclass(kw_only=True) class InputSuffix: text: Optional[str] = None @@ -50,6 +56,8 @@ class GovUKInput(govuk_frontend_base.GovUKComponent): autocomplete: Optional[str] = None pattern: Optional[str] = None spellcheck: Optional[bool] = None + autocapitalize: Optional[str] = None + inputWrapper: Optional[InputInputwrapper] = None _jinja2_template = "govuk_frontend_jinja/components/input/macro.html" _macro_name = "govukInput" diff --git a/govuk_frontend_django/components/pagination.py b/govuk_frontend_django/components/pagination.py index 329f4fc..4c4ba54 100644 --- a/govuk_frontend_django/components/pagination.py +++ b/govuk_frontend_django/components/pagination.py @@ -14,6 +14,7 @@ @dataclass(kw_only=True) class PaginationNext: text: Optional[str] = None + html: Optional[str] = None labelText: Optional[str] = None href: str attributes: Optional[govuk_frontend_base.Attributes] = None @@ -22,6 +23,7 @@ class PaginationNext: @dataclass(kw_only=True) class PaginationPrevious: text: Optional[str] = None + html: Optional[str] = None labelText: Optional[str] = None href: str attributes: Optional[govuk_frontend_base.Attributes] = None diff --git a/govuk_frontend_django/components/radios.py b/govuk_frontend_django/components/radios.py index e8544c3..717192e 100644 --- a/govuk_frontend_django/components/radios.py +++ b/govuk_frontend_django/components/radios.py @@ -13,7 +13,7 @@ @dataclass(kw_only=True) class RadiosItemsConditional: - html: Optional[str] = None + html: str @dataclass(kw_only=True) diff --git a/govuk_frontend_django/components/select.py b/govuk_frontend_django/components/select.py index b136c51..54c46f9 100644 --- a/govuk_frontend_django/components/select.py +++ b/govuk_frontend_django/components/select.py @@ -33,7 +33,7 @@ class GovUKSelect(govuk_frontend_base.GovUKComponent): value: Optional[str] = None disabled: Optional[bool] = None describedBy: Optional[str] = None - label: Optional[govuk_frontend_label.GovUKLabel] = None + label: govuk_frontend_label.GovUKLabel hint: Optional[govuk_frontend_hint.GovUKHint] = None errorMessage: Optional[govuk_frontend_error_message.GovUKErrorMessage] = None formGroup: Optional[govuk_frontend_base.FormGroup] = None diff --git a/govuk_frontend_django/components/task_list.py b/govuk_frontend_django/components/task_list.py new file mode 100644 index 0000000..3cc6f4b --- /dev/null +++ b/govuk_frontend_django/components/task_list.py @@ -0,0 +1,52 @@ +from dataclasses import dataclass +from typing import Any, List, Optional + +from govuk_frontend_django.components import base as govuk_frontend_base +from govuk_frontend_django.components import ( + error_message as govuk_frontend_error_message, +) +from govuk_frontend_django.components import fieldset as govuk_frontend_fieldset +from govuk_frontend_django.components import hint as govuk_frontend_hint +from govuk_frontend_django.components import label as govuk_frontend_label +from govuk_frontend_django.components import tag as govuk_frontend_tag + + +@dataclass(kw_only=True) +class TaskListItemsStatus: + tag: Optional[Any] = None + text: Optional[str] = None + html: Optional[str] = None + classes: Optional[str] = None + + +@dataclass(kw_only=True) +class TaskListItemsTitle: + text: Optional[str] = None + html: Optional[str] = None + classes: Optional[str] = None + + +@dataclass(kw_only=True) +class TaskListItems: + title: TaskListItemsTitle + hint: Optional[govuk_frontend_hint.GovUKHint] = None + status: TaskListItemsStatus + href: Optional[str] = None + classes: Optional[str] = None + + +@dataclass(kw_only=True) +class GovUKTaskList(govuk_frontend_base.GovUKComponent): + """GOV.UK Task List + + See: https://design-system.service.gov.uk/components/task-list/ + """ + + items: List[TaskListItems] + idPrefix: Optional[str] = None + + _jinja2_template = "govuk_frontend_jinja/components/task-list/macro.html" + _macro_name = "govukTaskList" + + +COMPONENT = GovUKTaskList diff --git a/poetry.lock b/poetry.lock index 1af4f81..3729a76 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,4 +1,4 @@ -# This file is automatically @generated by Poetry 1.7.1 and should not be changed by hand. +# This file is automatically @generated by Poetry 1.8.2 and should not be changed by hand. [[package]] name = "asgiref" @@ -585,13 +585,13 @@ dev = ["flake8", "markdown", "twine", "wheel"] [[package]] name = "govuk-frontend-jinja" -version = "2.7.0" +version = "3.0.0" description = "GOV.UK Frontend Jinja Macros" optional = false python-versions = ">=3.8" files = [ - {file = "govuk-frontend-jinja-2.7.0.tar.gz", hash = "sha256:de797f6a1247da50c70677a9b50197e3198e0001dbabe9e17703f33e72818646"}, - {file = "govuk_frontend_jinja-2.7.0-py3-none-any.whl", hash = "sha256:94ee83e6c766922204c2b26005779cd4a44c2e9d6f1c7d9a0c2868a41785be39"}, + {file = "govuk-frontend-jinja-3.0.0.tar.gz", hash = "sha256:0675860c60158f57f24406a22fbea43ddcfce7b93346af098868b4999f8918ed"}, + {file = "govuk_frontend_jinja-3.0.0-py3-none-any.whl", hash = "sha256:fd8cb0b08be013b1bef893da46a364367b6bacc1c1e535083f5693c7bf6f698f"}, ] [package.dependencies] @@ -801,6 +801,16 @@ files = [ {file = "MarkupSafe-2.1.3-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:5bbe06f8eeafd38e5d0a4894ffec89378b6c6a625ff57e3028921f8ff59318ac"}, {file = "MarkupSafe-2.1.3-cp311-cp311-win32.whl", hash = "sha256:dd15ff04ffd7e05ffcb7fe79f1b98041b8ea30ae9234aed2a9168b5797c3effb"}, {file = "MarkupSafe-2.1.3-cp311-cp311-win_amd64.whl", hash = "sha256:134da1eca9ec0ae528110ccc9e48041e0828d79f24121a1a146161103c76e686"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:f698de3fd0c4e6972b92290a45bd9b1536bffe8c6759c62471efaa8acb4c37bc"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:aa57bd9cf8ae831a362185ee444e15a93ecb2e344c8e52e4d721ea3ab6ef1823"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ffcc3f7c66b5f5b7931a5aa68fc9cecc51e685ef90282f4a82f0f5e9b704ad11"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:47d4f1c5f80fc62fdd7777d0d40a2e9dda0a05883ab11374334f6c4de38adffd"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1f67c7038d560d92149c060157d623c542173016c4babc0c1913cca0564b9939"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:9aad3c1755095ce347e26488214ef77e0485a3c34a50c5a5e2471dff60b9dd9c"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:14ff806850827afd6b07a5f32bd917fb7f45b046ba40c57abdb636674a8b559c"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:8f9293864fe09b8149f0cc42ce56e3f0e54de883a9de90cd427f191c346eb2e1"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-win32.whl", hash = "sha256:715d3562f79d540f251b99ebd6d8baa547118974341db04f5ad06d5ea3eb8007"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-win_amd64.whl", hash = "sha256:1b8dd8c3fd14349433c79fa8abeb573a55fc0fdd769133baac1f5e07abf54aeb"}, {file = "MarkupSafe-2.1.3-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:8e254ae696c88d98da6555f5ace2279cf7cd5b3f52be2b5cf97feafe883b58d2"}, {file = "MarkupSafe-2.1.3-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cb0932dc158471523c9637e807d9bfb93e06a95cbf010f1a38b98623b929ef2b"}, {file = "MarkupSafe-2.1.3-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9402b03f1a1b4dc4c19845e5c749e3ab82d5078d16a2a4c2cd2df62d57bb0707"}, @@ -1366,6 +1376,7 @@ files = [ {file = "PyYAML-6.0.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:69b023b2b4daa7548bcfbd4aa3da05b3a74b772db9e23b982788168117739938"}, {file = "PyYAML-6.0.1-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:81e0b275a9ecc9c0c0c07b4b90ba548307583c125f54d5b6946cfee6360c733d"}, {file = "PyYAML-6.0.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ba336e390cd8e4d1739f42dfe9bb83a3cc2e80f567d8805e11b46f4a943f5515"}, + {file = "PyYAML-6.0.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:326c013efe8048858a6d312ddd31d56e468118ad4cdeda36c719bf5bb6192290"}, {file = "PyYAML-6.0.1-cp310-cp310-win32.whl", hash = "sha256:bd4af7373a854424dabd882decdc5579653d7868b8fb26dc7d0e99f823aa5924"}, {file = "PyYAML-6.0.1-cp310-cp310-win_amd64.whl", hash = "sha256:fd1592b3fdf65fff2ad0004b5e363300ef59ced41c2e6b3a99d4089fa8c5435d"}, {file = "PyYAML-6.0.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:6965a7bc3cf88e5a1c3bd2e0b5c22f8d677dc88a455344035f03399034eb3007"}, @@ -1373,8 +1384,16 @@ files = [ {file = "PyYAML-6.0.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:42f8152b8dbc4fe7d96729ec2b99c7097d656dc1213a3229ca5383f973a5ed6d"}, {file = "PyYAML-6.0.1-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:062582fca9fabdd2c8b54a3ef1c978d786e0f6b3a1510e0ac93ef59e0ddae2bc"}, {file = "PyYAML-6.0.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d2b04aac4d386b172d5b9692e2d2da8de7bfb6c387fa4f801fbf6fb2e6ba4673"}, + {file = "PyYAML-6.0.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:e7d73685e87afe9f3b36c799222440d6cf362062f78be1013661b00c5c6f678b"}, {file = "PyYAML-6.0.1-cp311-cp311-win32.whl", hash = "sha256:1635fd110e8d85d55237ab316b5b011de701ea0f29d07611174a1b42f1444741"}, {file = "PyYAML-6.0.1-cp311-cp311-win_amd64.whl", hash = "sha256:bf07ee2fef7014951eeb99f56f39c9bb4af143d8aa3c21b1677805985307da34"}, + {file = "PyYAML-6.0.1-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:855fb52b0dc35af121542a76b9a84f8d1cd886ea97c84703eaa6d88e37a2ad28"}, + {file = "PyYAML-6.0.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:40df9b996c2b73138957fe23a16a4f0ba614f4c0efce1e9406a184b6d07fa3a9"}, + {file = "PyYAML-6.0.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a08c6f0fe150303c1c6b71ebcd7213c2858041a7e01975da3a99aed1e7a378ef"}, + {file = "PyYAML-6.0.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6c22bec3fbe2524cde73d7ada88f6566758a8f7227bfbf93a408a9d86bcc12a0"}, + {file = "PyYAML-6.0.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:8d4e9c88387b0f5c7d5f281e55304de64cf7f9c0021a3525bd3b1c542da3b0e4"}, + {file = "PyYAML-6.0.1-cp312-cp312-win32.whl", hash = "sha256:d483d2cdf104e7c9fa60c544d92981f12ad66a457afae824d146093b8c294c54"}, + {file = "PyYAML-6.0.1-cp312-cp312-win_amd64.whl", hash = "sha256:0d3304d8c0adc42be59c5f8a4d9e3d7379e6955ad754aa9d6ab7a398b59dd1df"}, {file = "PyYAML-6.0.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:50550eb667afee136e9a77d6dc71ae76a44df8b3e51e41b77f6de2932bfe0f47"}, {file = "PyYAML-6.0.1-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1fe35611261b29bd1de0070f0b2f47cb6ff71fa6595c077e42bd0c419fa27b98"}, {file = "PyYAML-6.0.1-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:704219a11b772aea0d8ecd7058d0082713c3562b4e271b849ad7dc4a5c90c13c"}, @@ -1391,6 +1410,7 @@ files = [ {file = "PyYAML-6.0.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a0cd17c15d3bb3fa06978b4e8958dcdc6e0174ccea823003a106c7d4d7899ac5"}, {file = "PyYAML-6.0.1-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:28c119d996beec18c05208a8bd78cbe4007878c6dd15091efb73a30e90539696"}, {file = "PyYAML-6.0.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7e07cbde391ba96ab58e532ff4803f79c4129397514e1413a7dc761ccd755735"}, + {file = "PyYAML-6.0.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:49a183be227561de579b4a36efbb21b3eab9651dd81b1858589f796549873dd6"}, {file = "PyYAML-6.0.1-cp38-cp38-win32.whl", hash = "sha256:184c5108a2aca3c5b3d3bf9395d50893a7ab82a38004c8f61c258d4428e80206"}, {file = "PyYAML-6.0.1-cp38-cp38-win_amd64.whl", hash = "sha256:1e2722cc9fbb45d9b87631ac70924c11d3a401b2d7f410cc0e3bbf249f2dca62"}, {file = "PyYAML-6.0.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:9eb6caa9a297fc2c2fb8862bc5370d0303ddba53ba97e71f08023b6cd73d16a8"}, @@ -1398,6 +1418,7 @@ files = [ {file = "PyYAML-6.0.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5773183b6446b2c99bb77e77595dd486303b4faab2b086e7b17bc6bef28865f6"}, {file = "PyYAML-6.0.1-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b786eecbdf8499b9ca1d697215862083bd6d2a99965554781d0d8d1ad31e13a0"}, {file = "PyYAML-6.0.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bc1bf2925a1ecd43da378f4db9e4f799775d6367bdb94671027b73b393a7c42c"}, + {file = "PyYAML-6.0.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:04ac92ad1925b2cff1db0cfebffb6ffc43457495c9b3c39d3fcae417d7125dc5"}, {file = "PyYAML-6.0.1-cp39-cp39-win32.whl", hash = "sha256:faca3bdcf85b2fc05d06ff3fbc1f83e1391b3e724afa3feba7d13eeab355484c"}, {file = "PyYAML-6.0.1-cp39-cp39-win_amd64.whl", hash = "sha256:510c9deebc5c0225e8c96813043e62b680ba2f9c50a08d3724c7f28a747d1486"}, {file = "PyYAML-6.0.1.tar.gz", hash = "sha256:bfdf460b1736c775f2ba9f6a92bca30bc2095067b8a9d77876d1fad6cc3b4a43"}, @@ -1800,4 +1821,4 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "p [metadata] lock-version = "2.0" python-versions = "^3.8" -content-hash = "c5e71a8503abb07b0258d2013734fd4e1855d4a1a157413ebfbf2d0a965532d8" +content-hash = "8ad71da4bf5b203a878c6ab54b5a4dfc822eaee0a133d93fbf211534fa92975c" diff --git a/pyproject.toml b/pyproject.toml index 3de9fd6..c600cdd 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -25,7 +25,7 @@ packages = [ python = "^3.8" Django = "^4.1.9" jinja2 = "^3.1.2" -govuk-frontend-jinja = "2.7.0" +govuk-frontend-jinja = "3.0.0" [tool.poetry.group.testing] optional = true