From 11b08c8047953a149a9acdb6582f5ea864a5f6e4 Mon Sep 17 00:00:00 2001
From: Ned Zimmerman <ned@bight.dev>
Date: Mon, 13 Jan 2020 20:16:34 -0700
Subject: [PATCH] feat: move search component into molecules

---
 .../12-search-inputs/search-inputs.njk             |  4 ----
 .../{13-selects => 12-selects}/selects.config.js   |  0
 .../{13-selects => 12-selects}/selects.njk         |  0
 .../checkboxes.config.js                           |  0
 .../checkboxes.njk                                 |  0
 .../radio-buttons.config.js                        |  0
 .../radio-buttons.njk                              |  0
 .../{16-submit => 15-submit}/submit.config.js      |  0
 .../{16-submit => 15-submit}/submit.njk            |  0
 .../_search-input/_search-input.config.js          | 10 ----------
 .../_search-input/_search-input.njk                |  3 ---
 .../07-search/search.config.js}                    | 14 ++++----------
 src/components/02-molecules/07-search/search.njk   |  6 ++++++
 13 files changed, 10 insertions(+), 27 deletions(-)
 delete mode 100644 src/components/01-atoms/12-form-elements/12-search-inputs/search-inputs.njk
 rename src/components/01-atoms/12-form-elements/{13-selects => 12-selects}/selects.config.js (100%)
 rename src/components/01-atoms/12-form-elements/{13-selects => 12-selects}/selects.njk (100%)
 rename src/components/01-atoms/12-form-elements/{14-checkboxes => 13-checkboxes}/checkboxes.config.js (100%)
 rename src/components/01-atoms/12-form-elements/{14-checkboxes => 13-checkboxes}/checkboxes.njk (100%)
 rename src/components/01-atoms/12-form-elements/{15-radio-buttons => 14-radio-buttons}/radio-buttons.config.js (100%)
 rename src/components/01-atoms/12-form-elements/{15-radio-buttons => 14-radio-buttons}/radio-buttons.njk (100%)
 rename src/components/01-atoms/12-form-elements/{16-submit => 15-submit}/submit.config.js (100%)
 rename src/components/01-atoms/12-form-elements/{16-submit => 15-submit}/submit.njk (100%)
 delete mode 100644 src/components/01-atoms/12-form-elements/_search-input/_search-input.config.js
 delete mode 100644 src/components/01-atoms/12-form-elements/_search-input/_search-input.njk
 rename src/components/{01-atoms/12-form-elements/12-search-inputs/search-inputs.config.js => 02-molecules/07-search/search.config.js} (66%)
 create mode 100644 src/components/02-molecules/07-search/search.njk

diff --git a/src/components/01-atoms/12-form-elements/12-search-inputs/search-inputs.njk b/src/components/01-atoms/12-form-elements/12-search-inputs/search-inputs.njk
deleted file mode 100644
index 8c87f948..00000000
--- a/src/components/01-atoms/12-form-elements/12-search-inputs/search-inputs.njk
+++ /dev/null
@@ -1,4 +0,0 @@
-{% if not standAlone %}<div class="spacer"></div>{% endif %}
-{% for searchInput in searchInputs %}
-{% render '@search-input', searchInput, true %}
-{% endfor %}
diff --git a/src/components/01-atoms/12-form-elements/13-selects/selects.config.js b/src/components/01-atoms/12-form-elements/12-selects/selects.config.js
similarity index 100%
rename from src/components/01-atoms/12-form-elements/13-selects/selects.config.js
rename to src/components/01-atoms/12-form-elements/12-selects/selects.config.js
diff --git a/src/components/01-atoms/12-form-elements/13-selects/selects.njk b/src/components/01-atoms/12-form-elements/12-selects/selects.njk
similarity index 100%
rename from src/components/01-atoms/12-form-elements/13-selects/selects.njk
rename to src/components/01-atoms/12-form-elements/12-selects/selects.njk
diff --git a/src/components/01-atoms/12-form-elements/14-checkboxes/checkboxes.config.js b/src/components/01-atoms/12-form-elements/13-checkboxes/checkboxes.config.js
similarity index 100%
rename from src/components/01-atoms/12-form-elements/14-checkboxes/checkboxes.config.js
rename to src/components/01-atoms/12-form-elements/13-checkboxes/checkboxes.config.js
diff --git a/src/components/01-atoms/12-form-elements/14-checkboxes/checkboxes.njk b/src/components/01-atoms/12-form-elements/13-checkboxes/checkboxes.njk
similarity index 100%
rename from src/components/01-atoms/12-form-elements/14-checkboxes/checkboxes.njk
rename to src/components/01-atoms/12-form-elements/13-checkboxes/checkboxes.njk
diff --git a/src/components/01-atoms/12-form-elements/15-radio-buttons/radio-buttons.config.js b/src/components/01-atoms/12-form-elements/14-radio-buttons/radio-buttons.config.js
similarity index 100%
rename from src/components/01-atoms/12-form-elements/15-radio-buttons/radio-buttons.config.js
rename to src/components/01-atoms/12-form-elements/14-radio-buttons/radio-buttons.config.js
diff --git a/src/components/01-atoms/12-form-elements/15-radio-buttons/radio-buttons.njk b/src/components/01-atoms/12-form-elements/14-radio-buttons/radio-buttons.njk
similarity index 100%
rename from src/components/01-atoms/12-form-elements/15-radio-buttons/radio-buttons.njk
rename to src/components/01-atoms/12-form-elements/14-radio-buttons/radio-buttons.njk
diff --git a/src/components/01-atoms/12-form-elements/16-submit/submit.config.js b/src/components/01-atoms/12-form-elements/15-submit/submit.config.js
similarity index 100%
rename from src/components/01-atoms/12-form-elements/16-submit/submit.config.js
rename to src/components/01-atoms/12-form-elements/15-submit/submit.config.js
diff --git a/src/components/01-atoms/12-form-elements/16-submit/submit.njk b/src/components/01-atoms/12-form-elements/15-submit/submit.njk
similarity index 100%
rename from src/components/01-atoms/12-form-elements/16-submit/submit.njk
rename to src/components/01-atoms/12-form-elements/15-submit/submit.njk
diff --git a/src/components/01-atoms/12-form-elements/_search-input/_search-input.config.js b/src/components/01-atoms/12-form-elements/_search-input/_search-input.config.js
deleted file mode 100644
index 2d52f43b..00000000
--- a/src/components/01-atoms/12-form-elements/_search-input/_search-input.config.js
+++ /dev/null
@@ -1,10 +0,0 @@
-module.exports = {
-	title: 'Search Input',
-	status: 'wip',
-	context: {
-		label: 'Search',
-		name: 's',
-		placeholder: 'Example search',
-		disabled: false,
-	}
-};
diff --git a/src/components/01-atoms/12-form-elements/_search-input/_search-input.njk b/src/components/01-atoms/12-form-elements/_search-input/_search-input.njk
deleted file mode 100644
index 0ebf2c3f..00000000
--- a/src/components/01-atoms/12-form-elements/_search-input/_search-input.njk
+++ /dev/null
@@ -1,3 +0,0 @@
-<div class="input-group">
-	<input id="{{ name }}" name="{{ name }}" placeholder="{{ placeholder }}" aria-label="{{ label }}" type="search"{% if disabled %} disabled{% endif %} />
-</div>
diff --git a/src/components/01-atoms/12-form-elements/12-search-inputs/search-inputs.config.js b/src/components/02-molecules/07-search/search.config.js
similarity index 66%
rename from src/components/01-atoms/12-form-elements/12-search-inputs/search-inputs.config.js
rename to src/components/02-molecules/07-search/search.config.js
index edeb9cbc..fb5cc192 100644
--- a/src/components/01-atoms/12-form-elements/12-search-inputs/search-inputs.config.js
+++ b/src/components/02-molecules/07-search/search.config.js
@@ -1,17 +1,11 @@
 module.exports = {
-	title: 'Search Input',
+	title: 'Search',
 	status: 'wip',
 	context: {
 		standAlone: false,
-		searchInputs: [
-			{
-				name: 's',
-			},
-			{
-				name: 'disabled',
-				disabled: true
-			}
-		]
+		name: 's',
+		placeholder: 'Search…',
+		label: 'Search'
 	},
 	variants: [
 		{
diff --git a/src/components/02-molecules/07-search/search.njk b/src/components/02-molecules/07-search/search.njk
new file mode 100644
index 00000000..b77a9fc8
--- /dev/null
+++ b/src/components/02-molecules/07-search/search.njk
@@ -0,0 +1,6 @@
+{% if not standAlone %}<div class="spacer"></div>{% endif %}
+<form class="search-input">
+	<label for="{{ name }}" class="screen-reader-text">{{ label }}</label>
+	<input id="{{ name }}" name="{{ name }}" placeholder="{{ placeholder }}" type="search"{% if disabled %} disabled{% endif %} />
+	<button type="submit"{% if disabled %} disabled{% endif %}><span class="screen-reader-text">{{ submitLabel }}</span>{% render '@svg', {svg: 'search'}, true %}</button>
+</form>