Merge branch 'add-date-picker' of https://github.com/ministryofjustic…

…e/moj-frontend into add-date-picker
ministryofjustice · Jul 31, 2024 · 3bdbfb0 · 3bdbfb0
2 parents 9003aa3 + c886536
commit 3bdbfb0
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 5 deletions.
diff --git a/docs/examples/date-picker-error/index.njk b/docs/examples/date-picker-error/index.njk
@@ -2,6 +2,7 @@
 layout: layouts/example.njk
 title: Date Picker (example)
 arguments: date-picker
+figma_link: https://www.figma.com/design/N2xqOFkyehXwcD9DxU1gEq/MoJ-Figma-Kit?node-id=792-861&t=6DfPOX7RAnjrVE0j-0
 ---
 
 {%- from "moj/components/date-picker/macro.njk" import mojDatePicker -%}

diff --git a/docs/examples/date-picker-excluded-dates/index.njk b/docs/examples/date-picker-excluded-dates/index.njk
@@ -1,6 +1,7 @@
 ---
 layout: layouts/example.njk
 title: Date Picker Excluded Dates (example)
+figma_link: https://www.figma.com/design/N2xqOFkyehXwcD9DxU1gEq/MoJ-Figma-Kit?node-id=792-861&t=6DfPOX7RAnjrVE0j-0
 ---
 
 {%- from "moj/components/date-picker/macro.njk" import mojDatePicker -%}

diff --git a/docs/examples/date-picker-excluded-days/index.njk b/docs/examples/date-picker-excluded-days/index.njk
@@ -1,6 +1,7 @@
 ---
 layout: layouts/example.njk
 title: Date Picker Excluded Days (example)
+figma_link: https://www.figma.com/design/N2xqOFkyehXwcD9DxU1gEq/MoJ-Figma-Kit?node-id=792-861&t=6DfPOX7RAnjrVE0j-0
 ---
 
 {%- from "moj/components/date-picker/macro.njk" import mojDatePicker -%}

diff --git a/docs/examples/date-picker-min-max/index.njk b/docs/examples/date-picker-min-max/index.njk
@@ -1,6 +1,7 @@
 ---
 layout: layouts/example.njk
 title: Date Picker Min and Max Date (example)
+figma_link: https://www.figma.com/design/N2xqOFkyehXwcD9DxU1gEq/MoJ-Figma-Kit?node-id=792-861&t=6DfPOX7RAnjrVE0j-0
 ---
 
 {%- from "moj/components/date-picker/macro.njk" import mojDatePicker -%}

diff --git a/src/moj/components/date-picker/README.md b/src/moj/components/date-picker/README.md
@@ -1,7 +1,6 @@
 # Date picker
 
-- [Guidance](https://design-patterns.service.justice.gov.uk/components/date-picker
-picker)
+- [Guidance](https://design-patterns.service.justice.gov.uk/components/date-picker)
 
 ## Example
 

diff --git a/src/moj/components/date-picker/date-picker.js b/src/moj/components/date-picker/date-picker.js
@@ -194,7 +194,7 @@ Datepicker.prototype.createDialog = function () {
   const $dialog = document.createElement("div");
 
   $dialog.id = this.id;
-  $dialog.setAttribute("class", "moj-datepicker__dialog  datepickerDialog");
+  $dialog.setAttribute("class", "moj-datepicker__dialog");
   $dialog.setAttribute("role", "dialog");
   $dialog.setAttribute("aria-modal", "true");
   $dialog.setAttribute("aria-labelledby", titleId);
@@ -337,7 +337,7 @@ Datepicker.prototype.setOptions = function () {
 Datepicker.prototype.setMinAndMaxDatesOnCalendar = function () {
   if (this.config.minDate) {
     this.minDate = this.formattedDateFromString(
-      this.$module.dataset.mindate,
+      this.config.minDate,
       null,
     );
     if (this.minDate && this.currentDate < this.minDate) {
@@ -347,7 +347,7 @@ Datepicker.prototype.setMinAndMaxDatesOnCalendar = function () {
 
   if (this.config.maxDate) {
     this.maxDate = this.formattedDateFromString(
-      this.$module.dataset.maxdate,
+      this.config.maxDate,
       null,
     );
     if (this.maxDate && this.currentDate > this.maxDate) {