@operato/input 1.0.0-beta.10 → 1.0.0-beta.13

package/src/ox-input-3dish.ts

@@ -16,21 +16,37 @@ export class OxInput3Dish extends OxFormField {
     css`
       :host {
         display: grid;
-        grid-template-columns: repeat(4, minmax(50px, 1fr));
-        grid-gap: 5px;
-        grid-auto-rows: minmax(24px, auto);
-      }
-
-      :host > * {
-        grid-column: span 1;
+        grid-template-columns: repeat(7, minmax(50px, 1fr));
+        grid-gap: var(--margin-default);
       }
 
       label {
         text-align: right;
+        align-self: center;
+        font: var(--label-font);
+        color: var(--label-color);
+        text-transform: var(--label-text-transform);
+        grid-column: span 1;
       }
 
       span {
+        grid-column: span 2;
         text-align: center;
+        font: var(--label-font);
+        color: var(--legend-color);
+      }
+
+      input {
+        grid-column: span 2;
+        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);
       }
     `
   ]
@@ -154,7 +170,7 @@ export class OxInput3Dish extends OxFormField {
 
   render() {
     return html`
-      <span></span> <span>${msg('x-axes')}</span>
+      <label></label> <span>${msg('x-axes')}</span>
       <span>${msg('y-axes')}</span>
       <span>${msg('z-axes')}</span>
 

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-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-search.ts

@@ -26,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 {

package/src/ox-input-unit.ts

@@ -0,0 +1,112 @@
+/**
+ * @license Copyright © HatioLab Inc. All rights reserved.
+ */
+
+import { css, html } from 'lit'
+import { customElement, property, query } from 'lit/decorators.js'
+
+import { OxFormField } from './ox-form-field'
+import { OxPopupList } from '@operato/popup'
+
+const UNIT_SYSTEMS: { [unit: string]: { [unit: string]: number } } = {
+  kg: {
+    mg: 1000000,
+    g: 1000,
+    ton: 0.001
+  },
+  rad: {
+    degree: 180 / Math.PI
+  }
+}
+
+@customElement('ox-input-unit')
+export class OxInputUnit extends OxFormField {
+  static styles = [
+    css`
+      input {
+        box-sizing: border-box;
+        border: 1px solid rgba(0, 0, 0, 0.2);
+        text-align: end;
+      }
+
+      input::-webkit-outer-spin-button,
+      input::-webkit-inner-spin-button {
+        -webkit-appearance: none;
+        margin: 0;
+      }
+
+      input[type='number'] {
+        -moz-appearance: textfield;
+      }
+
+      div {
+        display: inline;
+        position: relative;
+      }
+    `
+  ]
+
+  @property({ type: String }) placeholder?: string
+  @property({ type: String, attribute: 'std-unit' }) stdUnit!: string
+  @property({ type: String, attribute: 'user-unit' }) userUnit?: string
+
+  @query('input') input!: HTMLInputElement
+  @query('ox-popup-list') popup!: OxPopupList
+
+  render() {
+    const userUnit = this.userUnit || this.stdUnit
+    const units = Object.keys(UNIT_SYSTEMS[this.stdUnit])
+    const rate = !this.userUnit || this.userUnit === this.stdUnit ? 1 : UNIT_SYSTEMS[this.stdUnit][this.userUnit] || 1
+
+    return html`
+      <input
+        type="number"
+        .value=${this._toUserUnit(this.value)}
+        placeholder=${this.placeholder}
+        @change=${(e: Event) => this._onChangeValue(e)}
+      />
+      <div
+        @click=${(e: Event) => {
+          const target = e.currentTarget as HTMLElement
+          this.popup.open({
+            right: 0,
+            top: target.offsetTop + target.offsetHeight
+          })
+        }}
+      >
+        ${userUnit}
+        <ox-popup-list
+          .value=${userUnit}
+          @select=${(e: CustomEvent) => {
+            this.userUnit = e.detail
+          }}
+        >
+          <div option value=${this.stdUnit}>${this.stdUnit}</div>
+          ${units.map(unit => html`<div option value=${unit}>${unit}</div>`)}
+        </ox-popup-list>
+      </div>
+    `
+  }
+
+  _onChangeValue(e: Event) {
+    this.value = this._toStdUnit(this.input.value)
+
+    this.dispatchEvent(
+      new CustomEvent('change', {
+        bubbles: true,
+        composed: true,
+        detail: this.value
+      })
+    )
+  }
+
+  _toUserUnit(stdValue: string | number | undefined) {
+    const rate = !this.userUnit || this.userUnit === this.stdUnit ? 1 : UNIT_SYSTEMS[this.stdUnit][this.userUnit] || 1
+    return Number(stdValue) * rate
+  }
+
+  _toStdUnit(userValue: string | number | undefined) {
+    const rate = !this.userUnit || this.userUnit === this.stdUnit ? 1 : UNIT_SYSTEMS[this.stdUnit][this.userUnit] || 1
+    return isNaN(Number(userValue)) ? undefined : Number(userValue) / rate
+  }
+}

package/src/ox-input-work-shift.ts

@@ -7,6 +7,8 @@ import './ox-input-color'
 import { css, html } from 'lit'
 import { customElement, property } from 'lit/decorators.js'
 
+import { localized, msg } from '@lit/localize'
+
 import { OxFormField } from './ox-form-field.js'
 
 type WorkShift = { name: string; fromDate: number; fromTime: string; toDate: number; toTime: string }
@@ -21,6 +23,7 @@ Example:
   </ox-input-work-shift>
 */
 
+@localized()
 @customElement('ox-input-work-shift')
 export class OxInputWorkShift extends OxFormField {
   static styles = css`
@@ -92,11 +95,11 @@ export class OxInputWorkShift extends OxFormField {
   render() {
     return html`
       <div data-header>
-        <span>name</span>
-        <span>from date</span>
-        <span>from time</span>
-        <span>to date</span>
-        <span>to time</span>
+        <span>${msg('name')}</span>
+        <span>${msg('from date')}</span>
+        <span>${msg('from time')}</span>
+        <span>${msg('to date')}</span>
+        <span>${msg('to time')}</span>
         <empty-element></empty-element>
       </div>
 
@@ -106,16 +109,16 @@ export class OxInputWorkShift extends OxFormField {
             <input type="text" data-name .value=${item.name} required />
 
             <select data-from-date .value=${item.fromDate || 0}>
-              <option value="-1">The day before</option>
-              <option value="0">The day</option>
-              <option value="1">The day after</option>
+              <option value="-1">${msg('The day before')}</option>
+              <option value="0">${msg('The day')}</option>
+              <option value="1">${msg('The day after')}</option>
             </select>
             <input type="time" data-from-time .value=${item.fromTime} step="1800" required />
 
             <select data-to-date .value=${item.toDate || 0}>
-              <option value="-1">The day before</option>
-              <option value="0">The day</option>
-              <option value="1">The day after</option>
+              <option value="-1">${msg('The day before')}</option>
+              <option value="0">${msg('The day')}</option>
+              <option value="1">${msg('The day after')}</option>
             </select>
             <input type="time" data-to-time .value=${item.toTime} step="1800" required />
 
@@ -128,16 +131,16 @@ export class OxInputWorkShift extends OxFormField {
         <input type="text" data-name />
 
         <select data-from-date>
-          <option value="-1">The day before</option>
-          <option value="0" selected>The day</option>
-          <option value="+1">The day after</option>
+          <option value="-1">${msg('The day before')}</option>
+          <option value="0" selected>${msg('The day')}</option>
+          <option value="+1">${msg('The day after')}</option>
         </select>
         <input type="time" data-from-time step="1800" />
 
         <select data-to-date>
-          <option value="-1">The day before</option>
-          <option value="0" selected>The day</option>
-          <option value="+1">The day after</option>
+          <option value="-1">${msg('The day before')}</option>
+          <option value="0" selected>${msg('The day')}</option>
+          <option value="+1">${msg('The day after')}</option>
         </select>
         <input type="time" data-to-time step="1800" />