From ef1a764b1efca373fb62e14f1388c6dc0fbd631f Mon Sep 17 00:00:00 2001 From: ache Date: Thu, 3 Jan 2019 09:15:14 +0100 Subject: Update id property priority --- src/index.js | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/index.js b/src/index.js index fc7a02a..3983260 100644 --- a/src/index.js +++ b/src/index.js @@ -150,10 +150,16 @@ function parse(value, indexNext, userConfig) { } }; + let idSetByKey = false; const addAttribute = () => { switch (type) { case 'id': // ID - prop.id = prop.id || labelFirst; + if (idSetByKey) { + prop.id = labelFirst; + idSetByKey = false; + } else { + prop.id = prop.id || labelFirst; + } break; case 'class': if (!prop.class) { @@ -176,6 +182,11 @@ function parse(value, indexNext, userConfig) { } else { prop[labelFirst] = labelFirst === 'class' ? [labelSecond] : labelSecond; } + if (labelFirst === 'id') { + idSetByKey = true; + } + } else if (labelFirst === 'class' && Boolean(labelSecond)) { + prop.class.push(labelSecond); } break; default: -- cgit v1.2.3