From 9ca9aa55eabcbd91a3ef0ca5b7b2d20721b97474 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=87=E5=A4=A9?= <yutent.io@gmail.com>
Date: Tue, 6 Apr 2021 19:06:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8D=95=E9=80=89/=E5=A4=8D?=
 =?UTF-8?q?=E9=80=89=E6=A1=86=E7=9A=84=E6=A0=B7=E5=BC=8F=E5=8F=8A=E4=BA=A4?=
 =?UTF-8?q?=E4=BA=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/form/checkbox-item.wc | 162 +++++++++++++++++++++++++++++---------
 src/form/checkbox.wc      |  19 ++++-
 src/form/radio-item.wc    |  32 ++++++--
 src/form/radio.wc         |  17 +++-
 src/meditor/index.wc      |   2 +-
 5 files changed, 183 insertions(+), 49 deletions(-)

diff --git a/src/form/checkbox-item.wc b/src/form/checkbox-item.wc
index d732b3d..b3182ed 100644
--- a/src/form/checkbox-item.wc
+++ b/src/form/checkbox-item.wc
@@ -1,6 +1,6 @@
 <template>
   <label tabindex="0">
-    <wc-icon class="dot" is="checkbox-off"></wc-icon>
+    <span class="dot"><wc-icon is="get"></wc-icon></span>
     <slot />
   </label>
 </template>
@@ -24,16 +24,113 @@
     user-select: none;
     white-space: nowrap;
     cursor: inherit;
+    outline: none;
     color: var(--color-dark-1);
+
+    &.checked .dot {
+      background: var(--color-dark-1);
+
+      wc-icon {
+        --size: 14px;
+      }
+    }
   }
 
   .dot {
-    --size: 20px;
-    padding: 2px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    width: 16px;
+    height: 16px;
     margin-right: 4px;
+    border: 1px solid var(--color-dark-1);
+    border-radius: 4px;
+    background: #fff;
+    color: #fff;
+    transition: box-shadow 0.15s linear, background 0.15s linear;
+
+    wc-icon {
+      --size: 0px;
+      transition: width 0.15s linear;
+    }
   }
 }
 
+:host(:focus-within) .dot {
+  box-shadow: 0 0 0 2px var(--color-plain-a);
+}
+
+:host([type='danger']) label {
+  color: var(--color-red-1);
+  .dot {
+    border-color: var(--color-red-1);
+  }
+
+  &.checked .dot {
+    background: var(--color-red-1);
+  }
+}
+:host([type='danger']:focus-within) .dot {
+  box-shadow: 0 0 0 2px var(--color-red-a);
+}
+
+:host([type='info']) label {
+  color: var(--color-blue-1);
+  .dot {
+    border-color: var(--color-bule-1);
+  }
+
+  &.checked .dot {
+    background: var(--color-bule-1);
+  }
+}
+:host([type='info']:focus-within) .dot {
+  box-shadow: 0 0 0 2px var(--color-blue-a);
+}
+
+:host([type='success']) label {
+  color: var(--color-green-1);
+  .dot {
+    border-color: var(--color-green-1);
+  }
+
+  &.checked .dot {
+    background: var(--color-green-1);
+  }
+}
+:host([type='success']:focus-within) .dot {
+  box-shadow: 0 0 0 2px var(--color-green-a);
+}
+
+:host([type='primary']) label {
+  color: var(--color-teal-1);
+
+  .dot {
+    border-color: var(--color-teal-1);
+  }
+
+  &.checked .dot {
+    background: var(--color-teal-1);
+  }
+}
+:host([type='primary']:focus-within) .dot {
+  box-shadow: 0 0 0 2px var(--color-teal-a);
+}
+
+:host([type='warning']) label {
+  color: var(--color-orange-1);
+  .dot {
+    border-color: var(--color-orange-1);
+  }
+
+  &.checked .dot {
+    background: var(--color-orange-1);
+  }
+}
+:host([type='warning']:focus-within) .dot {
+  box-shadow: 0 0 0 2px var(--color-orange-a);
+}
+
 :host([readonly]) {
   cursor: default;
   opacity: 0.8;
@@ -47,26 +144,6 @@
     color: var(--color-grey-2);
   }
 }
-
-:host([type='danger']) label {
-  color: var(--color-red-1);
-}
-
-:host([type='info']) label {
-  color: var(--color-blue-1);
-}
-
-:host([type='success']) label {
-  color: var(--color-green-1);
-}
-
-:host([type='primary']) label {
-  color: var(--color-teal-1);
-}
-
-:host([type='warning']) label {
-  color: var(--color-orange-1);
-}
 </style>
 
 <script>
@@ -163,32 +240,43 @@ export default class Checkbox {
     }
   }
 
+  _toggleCheck() {
+    if (this.disabled || this.readOnly) {
+      return
+    }
+
+    this.checked = !this.checked
+
+    if (this._isInGroup) {
+      this.parentNode.dispatchEvent(
+        new CustomEvent('child-picked', {
+          detail: { value: this.value, checked: this.checked }
+        })
+      )
+    } else {
+      this.dispatchEvent(new CustomEvent('input'))
+    }
+  }
+
   mounted() {
     this._checkGroup()
 
     this._handlClick = $.bind(this, 'click', ev => {
       ev.preventDefault()
+      this._toggleCheck()
+    })
 
-      if (this.disabled || this.readOnly) {
-        return
-      }
-
-      this.checked = !this.checked
-
-      if (this._isInGroup) {
-        this.parentNode.dispatchEvent(
-          new CustomEvent('child-picked', {
-            detail: { value: this.value, checked: this.checked }
-          })
-        )
-      } else {
-        this.dispatchEvent(new CustomEvent('input'))
+    this._handlKeydown = $.bind(this, 'keydown', ev => {
+      // 空格交互
+      if (ev.keyCode === 32) {
+        this._toggleCheck()
       }
     })
   }
 
   unmount() {
     $.unbind(this, 'click', this._handlClick)
+    $.unbind(this, 'keydown', this._handlKeydown)
   }
 
   watch() {
diff --git a/src/form/checkbox.wc b/src/form/checkbox.wc
index bb54888..42b9e70 100644
--- a/src/form/checkbox.wc
+++ b/src/form/checkbox.wc
@@ -14,7 +14,9 @@ import './checkbox-item'
 
 export default class CheckboxGroup {
   props = {
-    value: []
+    value: '',
+    disabled: false,
+    readonly: false
   }
 
   __init__() {
@@ -71,9 +73,22 @@ export default class CheckboxGroup {
     switch (name) {
       case 'value':
         if (val) {
-          this.value = val.split(/,\s*?/)
+          this.value = val.split(',').map(it => it.trim())
         }
         break
+
+      case 'readonly':
+      case 'disabled':
+        Array.from(this.children).forEach(it => {
+          if (it.tagName === 'WC-CHECKBOX' && it.root) {
+            if (val === null) {
+              it.removeAttribute(name)
+            } else {
+              it.setAttribute(name, '')
+            }
+          }
+        })
+        break
     }
   }
 }
diff --git a/src/form/radio-item.wc b/src/form/radio-item.wc
index 4319549..21b53c4 100644
--- a/src/form/radio-item.wc
+++ b/src/form/radio-item.wc
@@ -28,6 +28,7 @@
 
     &.checked .dot::after {
       visibility: visible;
+      transform: scale(1);
     }
   }
 
@@ -51,6 +52,8 @@
       border-radius: 50%;
       background: var(--color-dark-1);
       content: '';
+      transform: scale(0);
+      transition: transform 0.15s linear;
     }
   }
 }
@@ -218,26 +221,39 @@ export default class Radio {
     }
   }
 
+  _toggleCheck() {
+    if (this.disabled || this.readOnly || this.checked) {
+      return
+    }
+
+    this.checked = true
+
+    this.parentNode.dispatchEvent(
+      new CustomEvent('child-picked', { detail: this.value })
+    )
+  }
+
   mounted() {
     if (this.value === this.parentNode.value) {
       this.checked = true
     }
 
     this._handleClick = $.catch(this, 'click', ev => {
-      if (this.disabled || this.readOnly || this.checked) {
-        return
+      ev.preventDefault()
+      this._toggleCheck()
+    })
+
+    this._handlKeydown = $.bind(this, 'keydown', ev => {
+      // 空格交互
+      if (ev.keyCode === 32) {
+        this._toggleCheck()
       }
-
-      this.checked = true
-
-      this.parentNode.dispatchEvent(
-        new CustomEvent('child-picked', { detail: this.value })
-      )
     })
   }
 
   unmount() {
     $.unbind(this, 'click', this._handleClick)
+    $.unbind(this, 'keydown', this._handlKeydown)
   }
 
   watch() {
diff --git a/src/form/radio.wc b/src/form/radio.wc
index 0e96954..d96f82a 100644
--- a/src/form/radio.wc
+++ b/src/form/radio.wc
@@ -14,7 +14,9 @@ import './radio-item'
 
 export default class RadioGroup {
   props = {
-    value: null
+    value: null,
+    disabled: false,
+    readonly: false
   }
 
   __init__() {
@@ -61,6 +63,19 @@ export default class RadioGroup {
       case 'value':
         this.value = val
         break
+
+      case 'readonly':
+      case 'disabled':
+        Array.from(this.children).forEach(it => {
+          if (it.tagName === 'WC-RADIO' && it.root) {
+            if (val === null) {
+              it.removeAttribute(name)
+            } else {
+              it.setAttribute(name, '')
+            }
+          }
+        })
+        break
     }
   }
 }
diff --git a/src/meditor/index.wc b/src/meditor/index.wc
index 9be7a41..7ff3e8e 100644
--- a/src/meditor/index.wc
+++ b/src/meditor/index.wc
@@ -345,7 +345,7 @@
 }
 
 :host([readonly]) {
-  opacity: 0.6;
+  opacity: 0.8;
 
   .toolbar {
     span:hover {