@operato/input 2.0.0-alpha.2 → 2.0.0-alpha.20

package/package.json

@@ -2,7 +2,7 @@
   "name": "@operato/input",
   "description": "Webcomponents for input following open-wc recommendations",
   "author": "heartyoh@hatiolab.com",
-  "version": "2.0.0-alpha.2",
+  "version": "2.0.0-alpha.20",
   "main": "dist/src/index.js",
   "module": "dist/src/index.js",
   "license": "MIT",
@@ -193,14 +193,14 @@
     "@material/mwc-icon": "^0.27.0",
     "@operato/color-picker": "^2.0.0-alpha.0",
     "@operato/i18n": "^2.0.0-alpha.0",
-    "@operato/popup": "^2.0.0-alpha.2",
+    "@operato/popup": "^2.0.0-alpha.9",
     "@operato/styles": "^2.0.0-alpha.0",
-    "@operato/utils": "^2.0.0-alpha.0",
+    "@operato/utils": "^2.0.0-alpha.8",
     "@polymer/paper-dropdown-menu": "^3.2.0",
     "@polymer/paper-item": "^3.0.1",
     "@thebespokepixel/es-tinycolor": "^3.1.0",
     "@types/codemirror": "^5.60.5",
-    "@zxing/library": "^0.20.0",
+    "@undecaf/zbar-wasm": "^0.10.1",
     "codemirror": "^6.0.1",
     "lit": "^2.5.0",
     "lodash-es": "^4.17.21"
@@ -239,5 +239,5 @@
       "prettier --write"
     ]
   },
-  "gitHead": "b940cc5dd44c22458ec03189e6bc8dae7f04f32e"
+  "gitHead": "942ad6bf3a182a0412bc01473691ff221f419d5d"
 }

package/src/ox-input-barcode.ts

@@ -6,14 +6,40 @@ import '@operato/popup/ox-popup.js'
 
 import { css, html } from 'lit'
 import { customElement, property, query, state } from 'lit/decorators.js'
+import { scanImageData } from '@undecaf/zbar-wasm'
 
 import { OxPopup } from '@operato/popup'
-import { BrowserMultiFormatReader } from '@zxing/library'
 
 import { OxFormField } from './ox-form-field.js'
 
 const barcodeIcon = `data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB4AAAAYBAMAAAAfR1CMAAADKGlUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENvcmUgNS42LWMxNDUgNzkuMTYzNDk5LCAyMDE4LzA4LzEzLTE2OjQwOjIyICAgICAgICAiPiA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtbG5zOnhtcE1NPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvbW0vIiB4bWxuczpzdFJlZj0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL3NUeXBlL1Jlc291cmNlUmVmIyIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ0MgMjAxOSAoTWFjaW50b3NoKSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDpFNjM4RURDQkQ1OUExMUU5QkExMkQ4NUY3NkMxNzBFOSIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDpFNjM4RURDQ0Q1OUExMUU5QkExMkQ4NUY3NkMxNzBFOSI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOkU2MzhFREM5RDU5QTExRTlCQTEyRDg1Rjc2QzE3MEU5IiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOkU2MzhFRENBRDU5QTExRTlCQTEyRDg1Rjc2QzE3MEU5Ii8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+55pr/QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAkUExURQAAAEdwTAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEus/7UCWQwAAAALdFJOU9YAg3wKBFBDSz9PnvQNDgAAAE9JREFUGNNjEEQFDKLJSnCOklkgg9QUJFn3RgZhRyS+iCGDEIp2RSBfQICRkRGIgTSQL4jCF6ScvxsZYOFT2T50/6D7Fz080MMLPTzRwhsAHVspfelur08AAAAASUVORK5CYII=`
 
+/**
+ * Custom input component for barcode scanning.
+ *
+ * This component provides a text input field and a barcode scanning button. Users can input text
+ * manually or scan barcodes using the device camera. Supported barcode formats include:
+ *
+ * - Code-39
+ * - Code-93
+ * - Code-128
+ * - Codabar
+ * - Databar/Expanded
+ * - EAN/GTIN-5/8/13
+ * - ISBN-10/13
+ * - ISBN-13+2
+ * - ISBN-13+5
+ * - ITF (Interleaved 2 of 5)
+ * - QR Code
+ * - UPC-A/E
+ *
+ * @fires CustomEvent#change - Dispatched when the input value changes.
+ * @fires KeyboardEvent#keydown - Dispatched when the Enter key is pressed (if not withoutEnter).
+ *
+ * @cssprop {String} --barcodescan-input-button-icon - Icon for the barcode scanning button.
+ *
+ * @customElement
+ */
 @customElement('ox-input-barcode')
 export class OxInputBarcode extends OxFormField {
   static styles = [
@@ -59,46 +85,45 @@ export class OxInputBarcode extends OxFormField {
       #scan-button[hidden] {
         display: none;
       }
-
-      ox-popup {
-        position: fixed;
-
-        width: 80vw;
-        height: 80vh;
-        transform: translate(10%, 10%);
-      }
-
-      video {
-        width: 100%;
-        height: 100%;
-      }
-
-      @media screen and (max-width: 460px) {
-        ox-popup {
-          position: fixed;
-          left: 0;
-          top: 0;
-          width: 100vw;
-          height: 100vh;
-          height: 100dvh;
-          transform: translate(0%, 0%);
-        }
-      }
     `
   ]
 
+  /**
+   * Indicates whether barcode scanning is enabled.
+   * @property {Boolean} scannable
+   */
   @property({ type: Boolean }) scannable?: boolean
+
+  /**
+   * If true, the "Enter" key press event is not fired after scanning a barcode.
+   * @property {Boolean} withoutEnter
+   */
   @property({ attribute: 'without-enter', type: Boolean }) withoutEnter?: boolean
+
+  /**
+   * The value of the input field.
+   * @property {String} declare value
+   */
   @property({ type: String }) declare value?: string
+
+  /**
+   * If true, only English characters are allowed in the input field.
+   * @property {Boolean} englishOnly
+   */
   @property({ attribute: 'english-only', type: Boolean }) englishOnly?: boolean
+
+  /**
+   * If true, the input field is automatically selected after a change event.
+   * @property {Boolean} selectAfterChange
+   */
   @property({ attribute: 'select-after-change', type: Boolean }) selectAfterChange?: boolean
 
   @state() stream?: MediaStream
-  @state() reader?: BrowserMultiFormatReader
 
   @query('input') input!: HTMLInputElement
-  @query('ox-popup') popup!: OxPopup
-  @query('video') video!: HTMLVideoElement
+
+  private popup: OxPopup | null = null
+  private video: HTMLVideoElement | null = null
 
   connectedCallback() {
     super.connectedCallback()
@@ -108,7 +133,7 @@ export class OxInputBarcode extends OxFormField {
     if (navigator.mediaDevices) {
       ;(async () => {
         try {
-          var stream = await navigator.mediaDevices.getUserMedia({ video: { facingMode: 'environment' } })
+          var stream = await navigator.mediaDevices.getUserMedia({ audio: false, video: { facingMode: 'environment' } })
           if (stream) {
             stream.getTracks().forEach(track => track.stop())
             this.scannable = true
@@ -143,14 +168,6 @@ export class OxInputBarcode extends OxFormField {
         }}
         ?disabled=${this.disabled}
       ></button>
-
-      <ox-popup
-        @focusout=${() => {
-          this.stopScan()
-        }}
-      >
-        <video></video>
-      </ox-popup>
     `
   }
 
@@ -201,27 +218,74 @@ export class OxInputBarcode extends OxFormField {
 
   async scan(e: MouseEvent) {
     try {
-      this.popup.open({})
+      if (this.popup) {
+        this.stopScan()
+      }
+
+      this.popup = OxPopup.open({
+        template: html`
+          <video></video>
+          <mwc-icon
+            style="position: fixed; right: 0; top: 0; color: red; tabindex: 0"
+            @click=${() => {
+              this.stopScan()
+            }}
+            >close</mwc-icon
+          >
+        `,
+        width: '100vw',
+        height: '100dvh'
+      })
 
-      /* template.video가 생성된 후에 접근하기 위해서, 한 프레임을 강제로 건너뛴다. */
-      await this.updateComplete
+      this.video! = this.popup.querySelector('video') as HTMLVideoElement
 
-      var constraints = { video: { facingMode: 'environment' } } /* backside camera first */
+      var constraints = { audio: false, video: { facingMode: 'environment' } } /* backside camera first */
       this.stream = await navigator.mediaDevices.getUserMedia(constraints)
 
-      this.reader = new BrowserMultiFormatReader()
-      if (getComputedStyle(this.popup).display !== 'none' /* popup not hidden */ && this.stream) {
-        var result = await this.reader.decodeOnceFromStream(this.stream, this.video)
-        var input = this.input
-        input.focus()
-        this.value = input.value = String(result)
-
-        if (!this.withoutEnter) {
-          input.dispatchEvent(new KeyboardEvent('keydown', { key: 'Enter' }))
+      this.video.srcObject = this.stream
+      this.video.play()
+
+      this.video.onloadedmetadata = async e => {
+        var canvas = new OffscreenCanvas(
+          this.video!.videoWidth || this.video!.width,
+          this.video!.videoHeight || this.video!.height
+        )
+
+        var context = canvas.getContext('2d', {
+          willReadFrequently: true
+        })
+
+        const detect = async () => {
+          try {
+            if (!this.stream?.active) {
+              return
+            }
+
+            context!.drawImage(this.video!, 0, 0, canvas.width, canvas.height)
+            const imageData = context!.getImageData(0, 0, canvas.width, canvas.height)
+            const symbols = await scanImageData(imageData)
+            const result = symbols[0]?.decode()
+
+            if (result) {
+              this.stopScan()
+
+              var input = this.input
+              input.focus()
+              this.value = input.value = String(result)
+
+              if (!this.withoutEnter) {
+                input.dispatchEvent(new KeyboardEvent('keydown', { key: 'Enter' }))
+              }
+            } else {
+              requestAnimationFrame(async () => await detect())
+            }
+          } catch (e) {
+            console.warn(e)
+            this.stopScan()
+          }
         }
-      } else {
-        /* popup이 비동기 진행 중에 close된 경우라면, stopScan()을 처리하지 못하게 되므로, 다시한번 clear해준다. */
-        this.stopScan()
+
+        await detect()
       }
     } catch (err) {
       /*
@@ -229,20 +293,20 @@ export class OxInputBarcode extends OxFormField {
        * 2. 뒤로가기 등으로 popup이 종료된 경우에도 NotFoundException: Video stream has ended before any code could be detected. 이 발생한다.
        */
       console.warn(err)
-    } finally {
-      this.popup.close()
-
-      this.stopScan()
     }
   }
 
   stopScan() {
-    this.video?.pause()
+    if (this.video) {
+      this.video.pause()
+      this.video.srcObject = null
+    }
 
-    this.stream?.getTracks().forEach(track => track.stop())
-    this.reader?.reset()
+    if (this.popup) {
+      this.popup.close()
+      this.popup = null
+    }
 
-    delete this.stream
-    delete this.reader
+    this.stream?.getTracks().forEach(track => track.stop())
   }
 }

package/src/ox-input-data.ts

@@ -4,11 +4,13 @@
 
 import './ox-input-code'
 
-import { css, html, PropertyValues } from 'lit'
+import { css, html } from 'lit'
 import { customElement } from 'lit/decorators.js'
+import { live } from 'lit/directives/live.js'
 
 import { OxFormField } from './ox-form-field.js'
 import { OxInputCode } from './ox-input-code.js'
+import { isEqual } from 'lodash-es'
 
 /**
 WEB Component for code-mirror based data editor.
@@ -49,38 +51,56 @@ export class OxInputData extends OxFormField {
   ]
 
   render() {
+    const valueType = typeof this.value
+
     return html`
       <div datatype>
         <input
+          id="string"
           type="radio"
           name="data-type"
           data-value="string"
-          .checked=${typeof this.value == 'string'}
+          .checked=${live(valueType == 'string')}
           @click=${() => this._setDataType('string')}
           ?disabled=${this.disabled}
-        />string
+        />
+        <label for="string">string</label>
 
         <input
+          id="number"
           type="radio"
           name="data-type"
           data-value="number"
-          .checked=${typeof this.value == 'number'}
+          .checked=${live(valueType == 'number')}
           @click=${() => this._setDataType('number')}
           ?disabled=${this.disabled}
-        />number
+        />
+        <label for="number">number</label>
 
         <input
+          id="object"
           type="radio"
           name="data-type"
           data-value="object"
-          .checked=${typeof this.value == 'object'}
+          .checked=${live(valueType == 'object')}
           @click=${() => this._setDataType('object')}
           ?disabled=${this.disabled}
-        />object
+        />
+        <label for="object">object</label>
+
         <mwc-icon @click=${() => this._clearData()} title="delete">delete_forever</mwc-icon>
       </div>
 
-      <ox-input-code .value=${this._getData(this.value)} language="javascript" editor ?disabled=${this.disabled}>
+      <ox-input-code
+        .value=${this._getStringData(this.value)}
+        language="text"
+        editor
+        ?disabled=${this.disabled}
+        @change=${(e: CustomEvent) => {
+          e.stopPropagation()
+          this._setDataTypeAndValue(valueType, (e.target as any).value)
+        }}
+      >
       </ox-input-code>
     `
   }
@@ -88,45 +108,75 @@ export class OxInputData extends OxFormField {
   firstUpdated() {
     this.renderRoot.addEventListener('change', e => {
       e.stopPropagation()
+
       const target = e.target as OxInputCode
       if (target.hasAttribute('editor')) {
+        if (this.value === undefined && target.value == '') {
+          return
+        }
         this.value = target.value
       }
-
-      const type = this.renderRoot.querySelector('input[name=data-type]:checked')?.getAttribute('data-value')
-      this._setDataType(type)
     })
   }
 
-  udpated(changes: PropertyValues<this>) {
-    if (changes.has('value')) {
-      this.value = this._getData(this.value)
+  _setDataTypeAndValue(type: string | undefined | null, value: any) {
+    /* value must be a string */
+    try {
+      switch (type) {
+        case 'number':
+          if (!isNaN(Number(value))) {
+            value = Number(value)
+          }
+          break
+        case 'object':
+          value = eval('(' + value + ')')
+          break
+      }
+    } catch (e) {}
+
+    if (isEqual(this.value, value)) {
+      return
     }
+
+    this.value = value
+
+    this.requestUpdate()
+    this._onAfterValueChange()
   }
 
   _setDataType(type: string | undefined | null) {
-    if (typeof this.value !== type) {
-      var value = this.value
-
-      try {
-        switch (type) {
-          case 'string':
-            this.value = String(value || '')
-            break
-          case 'number':
-            if (!isNaN(value)) {
-              this.value = Number(value)
-            }
-            break
-          case 'object':
-            this.value = eval('(' + value + ')')
-            break
-        }
-      } catch (e) {
-        console.log(e)
+    if (typeof this.value == type) {
+      return
+    }
+
+    var value = this.value
+
+    try {
+      switch (type) {
+        case 'string':
+          value = this._getStringData(value)
+          break
+        case 'number':
+          if (!isNaN(value)) {
+            value = Number(value)
+          }
+          break
+        case 'object':
+          value = eval('(' + value + ')')
+          break
       }
+    } catch (e) {
+      console.log(e)
     }
 
+    if (isEqual(this.value, value)) {
+      this.requestUpdate()
+      return
+    }
+
+    this.value = value
+
+    this.requestUpdate()
     this._onAfterValueChange()
   }
 
@@ -135,11 +185,20 @@ export class OxInputData extends OxFormField {
     this._onAfterValueChange()
   }
 
-  _getData(data: any) {
-    return typeof data !== 'object' ? data || '' : JSON.stringify(data, null, 1)
+  _getStringData(data: any) {
+    const type = typeof data
+
+    switch (type) {
+      case 'object':
+        return JSON.stringify(data, null, 1)
+      case 'undefined':
+        return ''
+      default:
+        return String(data) || ''
+    }
   }
 
-  _onAfterValueChange() {
+  async _onAfterValueChange() {
     this.dispatchEvent(
       new CustomEvent('change', {
         bubbles: true,

package/src/ox-input-mass-fraction.ts

@@ -131,11 +131,16 @@ export class OxInputMassFraction extends OxFormField {
         display: block;
         text-align: center;
       }
+
+      [right-end] {
+        margin-left: auto;
+      }
     `
   ]
 
   @property({ type: Object }) defaultValue: MassFraction = {}
   @property({ type: Object }) value: MassFraction = {}
+  @property({ type: Boolean, attribute: true }) composable: boolean = false
 
   @queryAll('[data-record]') records!: NodeListOf<HTMLElement>
 
@@ -168,14 +173,18 @@ export class OxInputMassFraction extends OxFormField {
                     list="value-template"
                     ?disabled=${this.disabled}
                   />
-                  <button
-                    class="record-action"
-                    @click=${(e: MouseEvent) => this._delete(e)}
-                    tabindex="-1"
-                    ?disabled=${this.disabled}
-                  >
-                    <mwc-icon>remove</mwc-icon>
-                  </button>
+                  ${this.composable
+                    ? html`
+                        <button
+                          class="record-action"
+                          @click=${(e: MouseEvent) => this._delete(e)}
+                          tabindex="-1"
+                          ?disabled=${this.disabled}
+                        >
+                          <mwc-icon>remove</mwc-icon>
+                        </button>
+                      `
+                    : nothing}
                   <button
                     class="record-action"
                     @click=${(e: MouseEvent) => this._up(e)}
@@ -202,36 +211,41 @@ export class OxInputMassFraction extends OxFormField {
         ? nothing
         : html`
             <div data-record-new>
-              <ox-select
-                data-key
-                placeholder="Fluid"
-                .value=${live('')}
-                @change=${(e: Event) => {
-                  e.stopPropagation()
-                }}
-              >
-                <ox-popup-list with-search> ${this.options} </ox-popup-list>
-              </ox-select>
-
-              <input
-                type="number"
-                data-value
-                placeholder="proportion"
-                min="0"
-                max="1"
-                step="0.01"
-                value=""
-                list="value-template"
-              />
-              <button class="record-action" @click=${(e: MouseEvent) => this._add()} tabindex="-1">
-                <mwc-icon>add</mwc-icon>
-              </button>
+              ${this.composable
+                ? html`
+                    <ox-select
+                      data-key
+                      placeholder="Fluid"
+                      .value=${live('')}
+                      @change=${(e: Event) => {
+                        e.stopPropagation()
+                      }}
+                    >
+                      <ox-popup-list with-search> ${this.options} </ox-popup-list>
+                    </ox-select>
+
+                    <input
+                      type="number"
+                      data-value
+                      placeholder="proportion"
+                      min="0"
+                      max="1"
+                      step="0.01"
+                      value=""
+                      list="value-template"
+                    />
+                    <button class="record-action" @click=${(e: MouseEvent) => this._add()} tabindex="-1">
+                      <mwc-icon>add</mwc-icon>
+                    </button>
+                  `
+                : nothing}
               <button
                 title="fill with the values suggested"
                 @click=${() => {
                   this.value = { ...this.defaultValue }
                   this.dispatchChangeEvent()
                 }}
+                right-end
               >
                 <mwc-icon>settings_suggest</mwc-icon>
               </button>

package/src/ox-input-unit-number.ts

@@ -2,6 +2,8 @@
  * @license Copyright © HatioLab Inc. All rights reserved.
  */
 
+import '@material/mwc-icon'
+
 import { css, html, PropertyValues } from 'lit'
 import { customElement, property, query } from 'lit/decorators.js'
 import { ifDefined } from 'lit/directives/if-defined.js'
@@ -169,7 +171,7 @@ const UNIT_SYSTEMS: { [unit: string]: { [unit: string]: number | ((v: number) =>
 }
 
 @customElement('ox-input-unit-number')
-export class OxInputUnit extends OxFormField {
+export class OxInputUnitNumber extends OxFormField {
   static styles = [
     css`
       :host {
@@ -205,13 +207,25 @@ export class OxInputUnit extends OxFormField {
       }
 
       #unit {
-        display: inline;
+        flex: 1;
+        display: flex;
+        align-items: center;
         position: relative;
         margin-left: var(--margin-narrow);
         font: var(--label-font);
         color: var(--label-color);
         min-width: 24px;
       }
+
+      mwc-icon {
+        font-size: 18px;
+        color: var(--primary-color, #3c3938);
+        margin-left: auto;
+      }
+
+      ox-popup-list {
+        right: 0;
+      }
     `
   ]
 
@@ -258,6 +272,7 @@ export class OxInputUnit extends OxFormField {
           <div option value=${this.stdUnit}>${this.stdUnit}</div>
           ${units.map(unit => html`<div option value=${unit}>${unit}</div>`)}
         </ox-popup-list>
+        <mwc-icon>expand_more</mwc-icon>
       </div>
     `
   }

package/stories/ox-input-barcode.stories.ts

@@ -43,6 +43,10 @@ const Template: Story<ArgTypes> = ({
   <link href="/themes/app-theme.css" rel="stylesheet" />
   <link href="https://fonts.googleapis.com/css?family=Material+Icons&display=block" rel="stylesheet" />
   <style>
+    #root {
+      height: 500px;
+    }
+
     ox-input-barcode {
       font-size: 80px;
       --input-font: initial;