nhsuk-decorated-components 0.0.8 → 0.2.0

package/README.md

@@ -36,7 +36,7 @@ To add them to the NHS.UK Prototype Kit, follow these steps:
      var nunjucksAppEnv = nunjucks.configure(appViews, nunjucksConfig)
 
      // Add Nunjucks Globals
-   + const { decorate } = require('nhsuk-decorated-components')
+   + import { decorate } from 'nhsuk-decorated-components'
    + nunjucksAppEnv.addGlobal('decorate', decorate)
 
      // Add Nunjucks filters

package/lib/decorate.js

@@ -1,4 +1,4 @@
-const _ = require('lodash')
+import _ from 'lodash'
 
 /**
  * Add `name`, `value`, `id`, `idPrefix` and `checked`/`selected` attributes
@@ -10,7 +10,7 @@ const _ = require('lodash')
  * @param {string} [componentName] - Name of component calling decorate
  * @returns {Object} Updated component parameters
  */
-exports.decorate = function (params, keyPath, componentName) {
+export function decorate(params, keyPath, componentName) {
   if (typeof keyPath === 'undefined') {
     return params
   }
@@ -107,7 +107,11 @@ exports.decorate = function (params, keyPath, componentName) {
         let checkedValue = ''
         let selectedValue = ''
 
-        if (Array.isArray(storedValue)) {
+        if (storedValue === undefined) {
+          // Stored value undefined, defer to `checked` or `selected` params
+          checkedValue = item.checked
+          selectedValue = item.selected
+        } else if (Array.isArray(storedValue)) {
           // Stored value is an array, check it exists in the array
           if (storedValue.indexOf(item.value) !== -1) {
             checkedValue = 'checked'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nhsuk-decorated-components",
-  "version": "0.0.8",
+  "version": "0.2.0",
   "description": "Form components for the NHS.UK Design System that require less parameters to collect data",
   "keywords": [
     "nhsuk",
@@ -40,19 +40,14 @@
     "lodash": "^4.17.21"
   },
   "devDependencies": {
-    "eslint": "^8.56.0",
-    "eslint-config-prettier": "^9.1.0",
-    "eslint-config-standard": "^17.1.0",
-    "eslint-plugin-import": "^2.29.1",
-    "eslint-plugin-jsdoc": "^48.0.6",
-    "eslint-plugin-n": "^16.6.2",
-    "eslint-plugin-prettier": "^5.1.3",
-    "eslint-plugin-promise": "^6.1.1",
-    "nhsuk-frontend": "^8.0.0",
+    "@x-govuk/eslint-config": "^0.0.1",
+    "prettier": "^3.1.0",
+    "nhsuk-frontend": "^9.0.0",
     "np": "^10.0.0",
     "nunjucks": "^3.2.3"
   },
   "engines": {
     "node": ">=20"
-  }
+  },
+  "type": "module"
 }

package/x-nhsuk/decorated/button/macro.njk

@@ -1,4 +1,4 @@
-{% from "button/macro.njk" import button as source -%}
+{% from "components/button/macro.njk" import button as source -%}
 {%- macro button(params) -%}
   {{- source(params) if params.href else source(decorate(params, params.decorate)) -}}
 {%- endmacro %}

package/x-nhsuk/decorated/checkboxes/macro.njk

@@ -1,4 +1,4 @@
-{% from "checkboxes/macro.njk" import checkboxes as source -%}
+{% from "components/checkboxes/macro.njk" import checkboxes as source -%}
 {%- macro checkboxes(params) -%}
   {{- source(decorate(params, params.decorate)) -}}
 {%- endmacro %}

package/x-nhsuk/decorated/date-input/macro.njk

@@ -1,4 +1,4 @@
-{% from "date-input/macro.njk" import dateInput as source -%}
+{% from "components/date-input/macro.njk" import dateInput as source -%}
 {%- macro dateInput(params) -%}
   {{- source(decorate(params, params.decorate, "dateInput")) -}}
 {%- endmacro %}

package/x-nhsuk/decorated/input/macro.njk

@@ -1,4 +1,4 @@
-{% from "input/macro.njk" import input as source %}
+{% from "components/input/macro.njk" import input as source %}
 {%- macro input(params) -%}
   {{- source(decorate(params, params.decorate)) -}}
 {%- endmacro %}

package/x-nhsuk/decorated/radios/macro.njk

@@ -1,4 +1,4 @@
-{% from "radios/macro.njk" import radios as source -%}
+{% from "components/radios/macro.njk" import radios as source -%}
 {%- macro radios(params) -%}
   {{- source(decorate(params, params.decorate)) -}}
 {%- endmacro %}

package/x-nhsuk/decorated/select/macro.njk

@@ -1,4 +1,4 @@
-{% from "select/macro.njk" import select as source -%}
+{% from "components/select/macro.njk" import select as source -%}
 {%- macro select(params) -%}
   {{- source(decorate(params, params.decorate)) -}}
 {%- endmacro %}

package/x-nhsuk/decorated/textarea/macro.njk

@@ -1,4 +1,4 @@
-{% from "textarea/macro.njk" import textarea as source -%}
+{% from "components/textarea/macro.njk" import textarea as source -%}
 {%- macro textarea(params) -%}
   {{- source(decorate(params, params.decorate)) -}}
 {%- endmacro %}