@operato/input 1.0.0-beta.2 → 1.0.0-beta.20

package/src/ox-input-color.ts

@@ -7,9 +7,10 @@ import '@operato/color-picker/paper-color-picker.js'
 import { css, html } from 'lit'
 import { customElement, property } from 'lit/decorators.js'
 
-import { OxFormField } from './ox-form-field'
 import { tinycolor } from '@thebespokepixel/es-tinycolor'
 
+import { OxFormField } from './ox-form-field'
+
 /**
 색상을 입력하는데 사용되는 입력 컴포넌트이다.
 화면상에는 두개의 입력 필드가 보이며, 하나는 색상값을 키보드로 직접 입력하는 입력 픽드이며,
@@ -180,18 +181,24 @@ export class OxInputColor extends OxFormField {
     }
 
     input[type='text'] {
-      padding-right: 24px;
       width: 100%;
-      height: 100%;
-      box-sizing: border-box;
-      border: 1px solid rgba(0, 0, 0, 0.2);
+      border: 0;
+      border-bottom: var(--border-dark-color);
+      padding: var(--input-padding);
+      font: var(--input-font);
+      color: var(--primary-text-color);
+      padding-right: 35px;
+    }
+    input:focus {
+      outline: none;
+      border-bottom: 1px solid var(--primary-color);
     }
 
     a {
       -webkit-appearance: none;
       display: flex;
       position: absolute;
-      width: 24px;
+      width: 35px;
       height: 100%;
       box-sizing: border-box;
       align-items: center;
@@ -199,11 +206,10 @@ export class OxInputColor extends OxFormField {
     }
 
     span {
-      width: 18px;
-      height: 100%;
-      max-height: 18px;
-      border-radius: 10%;
-      border: 1px solid #eee;
+      width: 80%;
+      height: 60%;
+      border: var(--border-dark-color);
+      border-radius: var(--border-radius);
     }
 
     span.transparent {

package/src/ox-input-crontab.ts

@@ -84,7 +84,6 @@ export class OxInputCrontab extends OxFormField {
       width: 100%;
       height: 100%;
       border: 0;
-      background-color: var(--main-section-background-color);
     }
 
     :host * {
@@ -118,32 +117,36 @@ export class OxInputCrontab extends OxFormField {
       grid-column: 4 / span 3;
       width: 100%;
       height: 100%;
-      font: normal 0.9em var(--theme-font);
+      padding: var(--input-padding);
+      border: 0;
+      border-bottom: var(--border-dark-color);
       text-transform: capitalize;
-      border-radius: var(--border-radius);
-      border: var(--border-dark-color);
+      font: var(--label-font);
+      color: var(--label-color);
     }
 
     input {
       width: 100%;
       margin-top: var(--margin-default);
       padding: 5px;
-      border-radius: var(--border-radius);
-      border: var(--border-dark-color);
-      font: normal 1em var(--theme-font);
+      border: 0;
+      border-bottom: var(--border-dark-color);
+      padding: var(--input-padding);
+      font: var(--input-font);
+      color: var(--primary-text-color);
     }
     input:focus {
-      border: 1px solid var(--primary-color);
+      outline: none;
+      border-bottom: 1px solid var(--primary-color);
     }
 
     input:invalid {
-      border: 1px solid var(--status-danger-color);
+      border-bottom: 1px solid var(--status-danger-color);
       color: var(--status-danger-color);
     }
 
     label {
       width: 100%;
-      height: 100%;
       font: normal 0.8em var(--theme-font);
       color: var(--primary-color);
     }

package/src/ox-input-file.ts

@@ -1,11 +1,12 @@
 import '@material/mwc-icon'
 
-import { PropertyValues, css, html } from 'lit'
+import { css, html, PropertyValues } from 'lit'
 import { customElement, property, query } from 'lit/decorators.js'
 
+import { ScrollbarStyles } from '@operato/styles'
 import { FileDropHelper } from '@operato/utils'
+
 import { OxFormField } from './ox-form-field.js'
-import { ScrollbarStyles } from '@operato/styles'
 
 @customElement('ox-input-file')
 export class OxInputFile extends OxFormField {
@@ -85,9 +86,9 @@ export class OxInputFile extends OxFormField {
 
   @property({ type: Boolean }) multiple?: boolean
   @property({ type: String }) accept?: string
-  @property({ type: String }) icon?: string
+  @property({ type: String }) icon?: string = 'upload'
   @property({ type: String }) label?: string
-  @property({ type: String }) description?: string
+  @property({ type: String }) description?: string = 'drop files here!'
   @property({ type: Boolean, reflect: true, attribute: 'hide-filelist' })
   hideFileList: boolean = false
   @property({ type: Boolean, reflect: true, attribute: 'attach-filelist' })
@@ -99,9 +100,9 @@ export class OxInputFile extends OxFormField {
     var files: File[] = this.value || []
 
     return html`
-      <mwc-icon>upload</mwc-icon>
+      <mwc-icon>${this.icon || 'upload'}</mwc-icon>
 
-      <span>drop files here!</span>
+      <span>${this.description || 'drop files here!'}</span>
 
       <input
         id="input-file"

package/src/ox-input-multiple-colors.ts

@@ -3,6 +3,7 @@
  */
 
 import './ox-input-color.js'
+import '@material/mwc-icon'
 
 import { css, html } from 'lit'
 import { customElement, property, query, queryAll } from 'lit/decorators.js'
@@ -28,29 +29,38 @@ export class OxInputMultipleColors extends OxFormField {
     :host {
       display: inline-block;
     }
-
     #colors-container > div {
       display: grid;
-      grid-template-columns: 22px 1fr 22px;
-      grid-gap: 5px;
+      grid-template-columns: 34px 1fr 34px;
+      grid-gap: var(--margin-default);
       align-items: center;
       justify-content: left;
+      margin-bottom: var(--margin-narrow);
     }
 
     ox-input-color {
-      height: 25px;
       width: 100%;
     }
 
-    input[type='button'] {
-      width: 22px;
-      height: 25px;
-      border: 1px solid rgba(0, 0, 0, 0.15);
-      padding-top: 0px;
-      padding-bottom: 2px;
-      background-color: #f1f2f4;
-      color: #8f9192;
-      font-size: 16px;
+    button {
+      height: 100%;
+      border: var(--button-border);
+      border-radius: var(--border-radius);
+      background-color: var(--button-background-color);
+      padding: var(--padding-narrow) var(--padding-default);
+      line-height: 0.8;
+      color: var(--button-color);
+      cursor: pointer;
+    }
+    button mwc-icon {
+      font-size: var(--fontsize-default);
+    }
+    button:focus,
+    button:hover,
+    button:active {
+      border: var(--button-activ-border);
+      background-color: var(--button-background-focus-color);
+      color: var(--theme-white-color);
     }
   `
 
@@ -69,18 +79,16 @@ export class OxInputMultipleColors extends OxFormField {
         ${(this.value || []).map(
           (item, index) => html`
             <div>
-              <input type="button" value="+" @click=${() => this._appendEditorColor()} data-index=${index} />
-
+              <button @click=${() => this._appendEditorColor()} data-index=${index}>
+                <mwc-icon>add</mwc-icon>
+              </button>
               <ox-input-color .value=${item}> </ox-input-color>
 
               ${(this.value || []).length > 1
                 ? html`
-                    <input
-                      type="button"
-                      value="-"
-                      @click=${(e: Event) => this._removeEditorColor(e)}
-                      data-index=${index}
-                    />
+                    <button @click=${(e: Event) => this._removeEditorColor(e)} data-index=${index}>
+                      <mwc-icon>remove</mwc-icon>
+                    </button>
                   `
                 : html``}
             </div>

package/src/ox-input-options.ts

@@ -1,6 +1,7 @@
 /**
  * @license Copyright © HatioLab Inc. All rights reserved.
  */
+import '@material/mwc-icon'
 
 import { css, html } from 'lit'
 import { customElement, property } from 'lit/decorators.js'
@@ -12,23 +13,58 @@ type Option = { text: string; value: string }
 @customElement('ox-input-options')
 export class OxInputOptions extends OxFormField {
   static styles = css`
-    div {
-      display: grid;
-      grid-template-columns: repeat(10, 1fr);
-      grid-gap: 5px;
-      grid-auto-rows: minmax(24px, auto);
+    :host {
+      display: flex;
+      flex-direction: column;
+      overflow: hidden;
+      margin-bottom: var(--margin-wide);
     }
 
-    input[data-text] {
-      grid-column: span 5;
+    div {
+      display: flex;
+      flex-flow: row nowrap;
+      gap: var(--margin-default);
+      margin-bottom: var(--margin-narrow);
     }
 
-    input[data-value] {
-      grid-column: span 4;
+    button {
+      border: var(--button-border);
+      border-radius: var(--border-radius);
+      background-color: var(--button-background-color);
+      padding: var(--padding-narrow) var(--padding-default);
+      line-height: 0.8;
+      color: var(--button-color);
+      cursor: pointer;
+    }
+    button + button {
+      margin-left: -5px;
+    }
+    button mwc-icon {
+      font-size: var(--fontsize-default);
+    }
+    button:focus,
+    button:hover,
+    button:active {
+      border: var(--button-activ-border);
+      background-color: var(--button-background-focus-color);
+      color: var(--theme-white-color);
     }
 
-    button {
-      grid-column: span 1;
+    input {
+      flex: 1;
+      border: 0;
+      border-bottom: var(--border-dark-color);
+      padding: var(--input-padding);
+      font: var(--input-font);
+      color: var(--primary-text-color);
+    }
+    input:focus {
+      outline: none;
+      border-bottom: 1px solid var(--primary-color);
+    }
+    button.hidden {
+      opacity: 0;
+      cursor: default;
     }
   `
 
@@ -47,7 +83,9 @@ export class OxInputOptions extends OxFormField {
           <div data-record="">
             <input type="text" data-text="" placeholder="text" .value=${item.text} />
             <input type="text" data-value="" placeholder="value" .value=${item.value} />
-            <button class="record-action" @click=${(e: MouseEvent) => this._delete(e)} tabindex="-1">-</button>
+            <button class="record-action" @click=${(e: MouseEvent) => this._delete(e)} tabindex="-1">
+              <mwc-icon>remove</mwc-icon>
+            </button>
           </div>
         `
       )}
@@ -55,7 +93,9 @@ export class OxInputOptions extends OxFormField {
       <div data-record-new="">
         <input type="text" data-text="" placeholder="text" value="" />
         <input type="text" data-value="" placeholder="value" value="" @change=${(e: Event) => this._add()} />
-        <button class="record-action" @click=${(e: MouseEvent) => this._add()} tabindex="-1">+</button>
+        <button class="record-action" @click=${(e: MouseEvent) => this._add()} tabindex="-1">
+          <mwc-icon>add</mwc-icon>
+        </button>
       </div>
     `
   }

package/src/ox-input-partition-keys.ts

@@ -2,6 +2,8 @@
  * @license Copyright © HatioLab Inc. All rights reserved.
  */
 
+import '@material/mwc-icon'
+
 import { css, html } from 'lit'
 import { customElement, property, queryAll } from 'lit/decorators.js'
 
@@ -25,38 +27,55 @@ export class OxInputPartitionKeys extends OxFormField {
     :host {
       display: flex;
       flex-direction: column;
-      align-content: center;
-
-      width: 100%;
       overflow: hidden;
-      border: 1px solid #ccc;
+      margin-bottom: var(--margin-wide);
     }
 
     div {
       display: flex;
       flex-flow: row nowrap;
-      align-items: center;
-
-      border-bottom: 1px solid #c0c0c0;
+      gap: var(--margin-default);
+      margin-bottom: var(--margin-narrow);
     }
 
-    div:last-child {
-      border-bottom: none;
+    button {
+      border: var(--button-border);
+      border-radius: var(--border-radius);
+      background-color: var(--button-background-color);
+      padding: var(--padding-narrow) var(--padding-default);
+      line-height: 0.8;
+      color: var(--button-color);
+      cursor: pointer;
     }
-
-    div > * {
-      min-width: 0px;
-      margin: 2px;
-      padding: 0;
+    button + button {
+      margin-left: -5px;
     }
-
-    button {
-      width: 20px;
-      text-align: center;
+    button mwc-icon {
+      font-size: var(--fontsize-default);
+    }
+    button:focus,
+    button:hover,
+    button:active {
+      border: var(--button-activ-border);
+      background-color: var(--button-background-focus-color);
+      color: var(--theme-white-color);
     }
 
     input {
       flex: 1;
+      border: 0;
+      border-bottom: var(--border-dark-color);
+      padding: var(--input-padding);
+      font: var(--input-font);
+      color: var(--primary-text-color);
+    }
+    input:focus {
+      outline: none;
+      border-bottom: 1px solid var(--primary-color);
+    }
+    button.hidden {
+      opacity: 0;
+      cursor: default;
     }
   `
 
@@ -77,9 +96,15 @@ export class OxInputPartitionKeys extends OxFormField {
           <div data-record>
             <input type="text" data-key placeholder="key" .value=${item.key} />
             <input type="text" data-value placeholder="value" .value=${item.value} list="value-template" />
-            <button class="record-action" @click=${(e: MouseEvent) => this._delete(e)} tabindex="-1">-</button>
-            <button class="record-action" @click=${(e: MouseEvent) => this._up(e)} tabindex="-1">↑</button>
-            <button class="record-action" @click=${(e: MouseEvent) => this._down(e)} tabindex="-1">↓</button>
+            <button class="record-action" @click=${(e: MouseEvent) => this._delete(e)} tabindex="-1">
+              <mwc-icon>remove</mwc-icon>
+            </button>
+            <button class="record-action" @click=${(e: MouseEvent) => this._up(e)} tabindex="-1">
+              <mwc-icon>arrow_upward</mwc-icon>
+            </button>
+            <button class="record-action" @click=${(e: MouseEvent) => this._down(e)} tabindex="-1">
+              <mwc-icon>arrow_downward</mwc-icon>
+            </button>
           </div>
         `
       )}
@@ -87,7 +112,11 @@ export class OxInputPartitionKeys extends OxFormField {
       <div data-record-new>
         <input type="text" data-key placeholder="key" value="" />
         <input type="text" data-value placeholder="value" value="" list="value-template" />
-        <button class="record-action" @click=${(e: MouseEvent) => this._add()} tabindex="-1">+</button>
+        <button class="record-action" @click=${(e: MouseEvent) => this._add()} tabindex="-1">
+          <mwc-icon>add</mwc-icon>
+        </button>
+        <button class="hidden"><mwc-icon>add</mwc-icon></button>
+        <button class="hidden"><mwc-icon>add</mwc-icon></button>
       </div>
 
       <datalist id="value-template">

package/src/ox-input-range.ts

@@ -11,10 +11,9 @@ import { OxFormField } from './ox-form-field.js'
 class OxInputRange extends OxFormField {
   static styles = css`
     :host {
-      font-size: 16px;
       display: flex;
+      gap: var(--margin-default);
       align-items: center;
-      padding: 1px 0;
 
       width: 100%;
       user-select: text;
@@ -22,15 +21,15 @@ class OxInputRange extends OxFormField {
 
     input[type='number'] {
       width: 48px;
-      overflow: hidden;
+      border: 0;
+      border-bottom: var(--border-dark-color);
+      padding: var(--input-padding);
+      font: var(--input-font);
+      color: var(--primary-text-color);
     }
-
-    input[type='number'] {
-      color: black;
-      border: none;
-      font-weight: 300;
-      background: white;
-      padding: 1px 2px;
+    input[type='number']:focus {
+      outline: none;
+      border-bottom: 1px solid var(--primary-color);
     }
 
     input[type='range'] {
@@ -44,40 +43,40 @@ class OxInputRange extends OxFormField {
     }
     input[type='range']::-webkit-slider-runnable-track {
       width: 100%;
-      height: 1px;
-      background: black;
-      border: none;
+      height: 7px;
+      background-color: rgba(0, 0, 0, 0.02);
+      border: 1px solid rgba(0, 0, 0, 0.05);
       border-radius: 5px;
     }
     input[type='range']::-webkit-slider-thumb {
       -webkit-appearance: none;
       border: none;
-      height: 10px;
-      width: 10px;
+      height: 16px;
+      width: 16px;
       border-radius: 50%;
-      background: black;
-      margin-top: -5px;
+      background: var(--primary-color);
+      margin-top: -6px;
+      box-shadow: 0px 0px 2px 1px rgba(0, 0, 0, 0.15);
     }
     input[type='range']:focus {
       outline: none;
     }
-    input[type='range']:focus::-webkit-slider-runnable-track {
-      background: black;
-    }
 
     input[type='range']::-moz-range-track {
       width: 100%;
-      height: 1px;
-      background: black;
-      border: none;
+      height: 7px;
+      background-color: rgba(0, 0, 0, 0.02);
+      border: 1px solid rgba(0, 0, 0, 0.05);
       border-radius: 5px;
     }
     input[type='range']::-moz-range-thumb {
       border: none;
-      height: 10px;
-      width: 10px;
+      height: 16px;
+      width: 16px;
       border-radius: 50%;
-      background: black;
+      background: var(--primary-color);
+      margin-top: -6px;
+      box-shadow: 0px 0px 2px 1px rgba(0, 0, 0, 0.15);
     }
 
     input[type='range']:-moz-focusring {
@@ -87,21 +86,19 @@ class OxInputRange extends OxFormField {
 
     input[type='range']::-ms-track {
       width: 100%;
-      height: 1px;
-      background: black;
-      border-radius: 10px;
-      color: transparent;
-      border: none;
-      outline: none;
+      height: 7px;
+      background-color: rgba(0, 0, 0, 0.02);
+      border: 1px solid rgba(0, 0, 0, 0.05);
+      border-radius: 5px;
     }
     input[type='range']::-ms-thumb {
-      height: 10px;
-      width: 10px;
-      border-radius: 50%;
-      background: black;
       border: none;
-      outline: none;
-      margin-top: 2px;
+      height: 16px;
+      width: 16px;
+      border-radius: 50%;
+      background: var(--primary-color);
+      margin-top: -6px;
+      box-shadow: 0px 0px 2px 1px rgba(0, 0, 0, 0.15);
     }
 
     input:focus {

package/src/ox-input-search.ts

@@ -14,8 +14,6 @@ export class OxInputSearch extends OxFormField {
   static styles = [
     css`
       :host {
-        flex: 1;
-
         display: flex;
         position: relative;
         align-items: center;
@@ -28,9 +26,14 @@ export class OxInputSearch extends OxFormField {
         background-color: transparent;
         border: 0;
         border-bottom: var(--border-dark-color);
-        padding: var(--padding-narrow) var(--padding-narrow) 7px 25px;
-        font-size: var(--fontsize-large);
+        padding: var(--input-padding);
+        padding-left: 25px;
+        font: var(--input-font);
+        color: var(--primary-text-color);
+      }
+      [type='text']:focus {
         outline: none;
+        border-bottom: 1px solid var(--primary-color);
       }
 
       mwc-icon {
@@ -52,14 +55,17 @@ export class OxInputSearch extends OxFormField {
         .value=${this.value || ''}
         .placeholder=${this.placeholder || ''}
         @change=${(e: Event) => this._onChangeValue(e)}
+        @keydown=${(e: KeyboardEvent) => {
+          if (e.key === 'Enter') {
+            /* Even if the value has not changed, the enter key triggers a change event. */
+            e.preventDefault() /* Prevent change event from occurring twice. */
+            this._onChangeValue(e)
+          }
+        }}
       />
     `
   }
 
-  firstUpdated() {
-    this.renderRoot.addEventListener('change', this._onChangeValue.bind(this))
-  }
-
   _onChangeValue(e: Event) {
     e.stopPropagation()
     this.value = this.input.value