From fccdf4de8df31b9e8469d3142e24a330de975b31 Mon Sep 17 00:00:00 2001
From: Igor Vidic <ividic@gmail.com>
Date: Mon, 21 Jan 2019 21:28:29 +1100
Subject: [PATCH 1/2] feat: add control option to Checkbox

---
 docs/components/Checkbox.mdx     | 39 ++++++++++++++++++++++++++
 packages/shared/core/Checkbox.js | 48 +++++++++++++++++++++++++++++++-
 2 files changed, 86 insertions(+), 1 deletion(-)

diff --git a/docs/components/Checkbox.mdx b/docs/components/Checkbox.mdx
index 52f544eba..f87c409c9 100644
--- a/docs/components/Checkbox.mdx
+++ b/docs/components/Checkbox.mdx
@@ -54,6 +54,43 @@ Disable using `disabled` prop.
   </FormCheck>
 </Playground>
 
+## Control & Validation
+
+* Set `display` to "block" and `width` to "100%" using `control` prop.
+* Set validation using `valid` or `valid={false}`
+
+<Playground>
+  <FormCheck>
+    <Checkbox
+      id="sizeCheckbox1"
+      name="sizeCheckboxs"
+      value="option1"
+      control
+    />
+    <FormCheckLabel htmlFor="sizeCheckbox1">Control</FormCheckLabel>
+  </FormCheck>
+  <FormCheck>
+    <Checkbox
+      id="sizeCheckbox2"
+      name="sizeCheckboxs"
+      value="option2"
+      control
+      valid
+    />
+    <FormCheckLabel htmlFor="sizeCheckbox2">Valid Control</FormCheckLabel>
+  </FormCheck>
+  <FormCheck>
+    <Checkbox
+      id="sizeCheckbox3"
+      name="sizeCheckboxs"
+      value="option3"
+      control
+      valid={false}
+    />
+    <FormCheckLabel htmlFor="sizeCheckbox3">Invalid Control</FormCheckLabel>
+  </FormCheck>
+</Playground>
+
 ## API
 
 ### Checkbox
@@ -61,9 +98,11 @@ Disable using `disabled` prop.
 <PropsTable
   of={PropDesc({
     checked: PropDesc.bool,
+    control: PropDesc.bool,
     disabled: PropDesc.bool,
     onChange: PropDesc.func,
     size: PropDesc.oneOf(['sm', 'lg']),
+    valid: PropDesc.bool,
     value: PropDesc.string,
     ...getSystemPropDesc(Checkbox),
   })}
diff --git a/packages/shared/core/Checkbox.js b/packages/shared/core/Checkbox.js
index e5b4add65..9a4cce96d 100644
--- a/packages/shared/core/Checkbox.js
+++ b/packages/shared/core/Checkbox.js
@@ -54,6 +54,48 @@ const sizeStyle = {
   `,
 }
 
+const validStyle = css`
+  input + .sui-checkbox-content,
+  input:checked + .sui-checkbox-content {
+    border-color: ${th('success')};
+  }
+
+  input:focus + .sui-checkbox-content {
+    border-color: ${th('success')};
+    box-shadow: ${mixin('controlFocusBoxShadow', 'success')};
+  }
+`
+
+const invalidStyle = css`
+  input + .sui-checkbox-content,
+  input:checked + .sui-checkbox-content {
+    border-color: ${th('danger')};
+  }
+
+  input:focus + .sui-checkbox-content {
+    border-color: ${th('danger')};
+    box-shadow: ${mixin('controlFocusBoxShadow', 'danger')};
+  }
+`
+
+const controlStyle = css`
+  input:focus + .sui-checkbox-content {
+    border-color: ${th('controlFocusBorderColor')};
+    box-shadow: ${mixin('controlFocusBoxShadow', 'primary')};
+  }
+
+  ${p => {
+    switch (p.valid) {
+      case true:
+        return validStyle
+      case false:
+        return invalidStyle
+      default:
+        return null
+    }
+  }};
+`
+
 const containerSystem = compose(
   basics,
   dimensions,
@@ -75,6 +117,7 @@ const system = compose(
 
 const Checkbox = createComponent(() => ({
   name: 'checkbox',
+  omitProps: ['control', 'valid'],
   system,
   applySystem: null,
   render: ({ Component, ref, className, size, ...props }) => (
@@ -134,7 +177,7 @@ const Checkbox = createComponent(() => ({
       }
     }
 
-    input:focused + .sui-checkbox-content {
+    input:focus + .sui-checkbox-content {
       ${mixin('controlFocus')};
     }
 
@@ -143,6 +186,7 @@ const Checkbox = createComponent(() => ({
     }
 
     ${p => sizeStyle[p.size]};
+    ${p => p.control && controlStyle};
 
     ${containerSystem.props};
 
@@ -152,9 +196,11 @@ const Checkbox = createComponent(() => ({
   `,
   propTypes: {
     checked: PropTypes.bool,
+    control: PropTypes.bool,
     disabled: PropTypes.bool,
     onChange: PropTypes.func,
     size: PropTypes.oneOf(['sm', 'md', 'lg']),
+    valid: PropTypes.bool,
     value: PropTypes.string,
   },
   defaultProps: {

From cbfa206386a980db7c263245be992e0d05abd700 Mon Sep 17 00:00:00 2001
From: Igor Vidic <ividic@gmail.com>
Date: Tue, 22 Jan 2019 06:27:21 +1100
Subject: [PATCH 2/2] fix: Checkbox docs names and ids

---
 docs/components/Checkbox.mdx | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/docs/components/Checkbox.mdx b/docs/components/Checkbox.mdx
index f87c409c9..a6ff0afb3 100644
--- a/docs/components/Checkbox.mdx
+++ b/docs/components/Checkbox.mdx
@@ -18,20 +18,20 @@ Set sizes using `size` prop like `"sm"`, `"md"` or `"lg"`.
     <Checkbox
       size="sm"
       id="sizeCheckbox1"
-      name="sizeCheckboxs"
+      name="sizeCheckboxes"
       value="option1"
     />
     <FormCheckLabel htmlFor="sizeCheckbox1">Small</FormCheckLabel>
   </FormCheck>
   <FormCheck>
-    <Checkbox id="sizeCheckbox2" name="sizeCheckboxs" value="option2" />
+    <Checkbox id="sizeCheckbox2" name="sizeCheckboxes" value="option2" />
     <FormCheckLabel htmlFor="sizeCheckbox2">Medium</FormCheckLabel>
   </FormCheck>
   <FormCheck>
     <Checkbox
       size="lg"
       id="sizeCheckbox3"
-      name="sizeCheckboxs"
+      name="sizeCheckboxes"
       value="option3"
     />
     <FormCheckLabel htmlFor="sizeCheckbox3">Large</FormCheckLabel>
@@ -62,32 +62,32 @@ Disable using `disabled` prop.
 <Playground>
   <FormCheck>
     <Checkbox
-      id="sizeCheckbox1"
-      name="sizeCheckboxs"
+      id="controlCheckbox1"
+      name="controlCheckboxes"
       value="option1"
       control
     />
-    <FormCheckLabel htmlFor="sizeCheckbox1">Control</FormCheckLabel>
+    <FormCheckLabel htmlFor="controlCheckbox1">Control</FormCheckLabel>
   </FormCheck>
   <FormCheck>
     <Checkbox
-      id="sizeCheckbox2"
-      name="sizeCheckboxs"
+      id="controlCheckbox2"
+      name="controlCheckboxes"
       value="option2"
       control
       valid
     />
-    <FormCheckLabel htmlFor="sizeCheckbox2">Valid Control</FormCheckLabel>
+    <FormCheckLabel htmlFor="controlCheckbox2">Valid Control</FormCheckLabel>
   </FormCheck>
   <FormCheck>
     <Checkbox
-      id="sizeCheckbox3"
-      name="sizeCheckboxs"
+      id="controlCheckbox3"
+      name="controlCheckboxes"
       value="option3"
       control
       valid={false}
     />
-    <FormCheckLabel htmlFor="sizeCheckbox3">Invalid Control</FormCheckLabel>
+    <FormCheckLabel htmlFor="controlCheckbox3">Invalid Control</FormCheckLabel>
   </FormCheck>
 </Playground>