@operato/data-grist 8.0.0-alpha.5 → 8.0.0-alpha.50

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@operato/data-grist",
-  "version": "8.0.0-alpha.5",
+  "version": "8.0.0-alpha.50",
   "description": "User interface for grid (desktop) and list (mobile)",
   "author": "heartyoh",
   "main": "dist/index.js",
@@ -62,32 +62,32 @@
   },
   "dependencies": {
     "@material/web": "^2.0.0",
-    "@operato/headroom": "^8.0.0-alpha.0",
-    "@operato/input": "^8.0.0-alpha.4",
-    "@operato/p13n": "^8.0.0-alpha.4",
-    "@operato/popup": "^8.0.0-alpha.4",
-    "@operato/pull-to-refresh": "^8.0.0-alpha.0",
-    "@operato/styles": "^8.0.0-alpha.4",
-    "@operato/time-calculator": "^8.0.0-alpha.0",
-    "@operato/utils": "^8.0.0-alpha.0",
+    "@operato/headroom": "^8.0.0-alpha.37",
+    "@operato/input": "^8.0.0-alpha.50",
+    "@operato/p13n": "^8.0.0-alpha.50",
+    "@operato/popup": "^8.0.0-alpha.50",
+    "@operato/pull-to-refresh": "^8.0.0-alpha.37",
+    "@operato/styles": "^8.0.0-alpha.50",
+    "@operato/time-calculator": "^8.0.0-alpha.37",
+    "@operato/utils": "^8.0.0-alpha.37",
     "i18next": "^23.11.5",
     "json5": "^2.2.0",
     "lit": "^3.1.2",
     "lodash-es": "^4.17.21"
   },
   "devDependencies": {
-    "@custom-elements-manifest/analyzer": "^0.9.2",
+    "@custom-elements-manifest/analyzer": "^0.10.0",
     "@hatiolab/prettier-config": "^1.0.0",
     "@open-wc/eslint-config": "^12.0.3",
-    "@open-wc/testing": "^3.1.6",
+    "@open-wc/testing": "^4.0.0",
     "@types/lodash-es": "^4.17.5",
-    "@typescript-eslint/eslint-plugin": "^7.0.1",
-    "@typescript-eslint/parser": "^7.0.1",
-    "@web/dev-server": "^0.3.0",
+    "@typescript-eslint/eslint-plugin": "^8.0.0",
+    "@typescript-eslint/parser": "^8.0.0",
+    "@web/dev-server": "^0.4.0",
     "@web/dev-server-storybook": "^2.0.1",
-    "@web/test-runner": "^0.18.0",
-    "concurrently": "^8.0.1",
-    "eslint": "^8.39.0",
+    "@web/test-runner": "^0.19.0",
+    "concurrently": "^9.0.0",
+    "eslint": "^9.0.0",
     "eslint-config-prettier": "^9.1.0",
     "husky": "^9.0.11",
     "lint-staged": "^15.2.2",
@@ -108,5 +108,5 @@
       "prettier --write"
     ]
   },
-  "gitHead": "3c792906872d3f5d7740b045c06115423595accf"
+  "gitHead": "4a218d16762f21bec5de8d2551cf18073e6703ff"
 }

package/src/data-card/record-card.ts

@@ -25,7 +25,16 @@ const OPTIONS: Intl.DateTimeFormatOptions = {
   // timeZone: 'America/Los_Angeles'
 }
 
-const formatter = new Intl.DateTimeFormat(navigator.language, OPTIONS)
+function getSafeFormatter(locale: string, options: Intl.DateTimeFormatOptions) {
+  try {
+    const safeLocale = locale || 'en-US'
+    return new Intl.DateTimeFormat(safeLocale, options)
+  } catch (e) {
+    return new Intl.DateTimeFormat('en-US', options)
+  }
+}
+
+const formatter = getSafeFormatter(navigator.language, OPTIONS)
 
 @customElement('ox-record-card')
 export class RecordCard extends LitElement {

package/src/data-grid/data-grid-body.ts

@@ -61,6 +61,9 @@ export class DataGridBody extends LitElement {
     css`
       :host {
         font-variation-settings: 'FILL' 1;
+
+        overscroll-behavior: none;
+        user-select: none;
       }
 
       [select-block] {
@@ -72,6 +75,7 @@ export class DataGridBody extends LitElement {
         border: var(--grid-record-focused-cell-border);
         background-image: var(--focused-background-image);
         pointer-events: none;
+
         z-index: 5;
       }
 
@@ -289,14 +293,16 @@ export class DataGridBody extends LitElement {
       )
     })
 
-    this.renderRoot.addEventListener('mousedown', (event: Event) => {
-      const e = event as MouseEvent
+    this.renderRoot.addEventListener('pointerdown', (e: Event) => {
       this.setSelectBlock()
 
-      if (e.buttons !== 1) {
+      if ('buttons' in e && e.buttons !== 1) {
         return
       }
 
+      e.preventDefault()
+      e.stopPropagation()
+
       this._draggable = true
 
       var target = (e.target as Element).closest('ox-grid-field') as DataGridField
@@ -318,12 +324,15 @@ export class DataGridBody extends LitElement {
       }
     })
 
-    this.renderRoot.addEventListener('mousemove', (event: Event) => {
+    this.renderRoot.addEventListener('pointermove', (event: Event) => {
       const e = event as MouseEvent
-      if (e.buttons !== 1 || !this._draggable) {
+      if (('buttons' in e && e.buttons !== 1) || !this._draggable) {
         return
       }
 
+      e.preventDefault()
+      e.stopPropagation()
+
       const field = e.target as DataGridField
       if (!this._selectBlock) {
         this.setSelectBlock(this.focusedField || field, this.focusedField || field)
@@ -340,7 +349,10 @@ export class DataGridBody extends LitElement {
       }
     })
 
-    this.renderRoot.addEventListener('mouseup', (event: Event) => {
+    this.renderRoot.addEventListener('pointerup', (event: Event) => {
+      event.preventDefault()
+      event.stopPropagation()
+
       this._draggable = false
     })
 
@@ -650,7 +662,11 @@ export class DataGridBody extends LitElement {
                 value = parseToNumberOrNull(value)
                 break
               default:
-                value = value
+                try {
+                  value = JSON.parse(value)
+                } catch (err) {
+                  value = value
+                }
             }
 
             if (targetColumn && !targetColumn.gutterName && editable) {

package/src/data-grid/data-grid-footer.ts

@@ -21,6 +21,8 @@ export class DataGridFooter extends LitElement {
         background-color: var(--grid-footer-background-color);
         font-size: var(--grid-footer-font-size);
         align-items: center;
+
+        user-select: none;
       }
 
       :host * {

package/src/data-grid/data-grid-header.ts

@@ -28,6 +28,8 @@ export class DataGridHeader extends LitElement {
         overflow: hidden;
 
         font-variation-settings: 'FILL' 1;
+
+        user-select: none;
       }
 
       :host([raised]) [fixed] {
@@ -266,7 +268,9 @@ export class DataGridHeader extends LitElement {
           : nothing}
         ${column.resizable !== false
           ? html`
-              <span splitter draggable="false" @mousedown=${(e: MouseEvent) => this._mousedown(e, index)}>&nbsp;</span>
+              <span splitter draggable="false" @pointerdown=${(e: PointerEvent) => this._pointerdown(e, index)}
+                >&nbsp;</span
+              >
             `
           : nothing}
       </div>
@@ -543,11 +547,11 @@ export class DataGridHeader extends LitElement {
     this._throttledNotifier(idx, width)
   }
 
-  _mousedown(e: MouseEvent, idx: number) {
+  _pointerdown(e: MouseEvent, idx: number) {
     e.stopPropagation()
     e.preventDefault()
 
-    var mousemoveHandler = ((e: MouseEvent) => {
+    var pointermoveHandler = ((e: MouseEvent) => {
       e.stopPropagation()
       e.preventDefault()
       let column = this.columns[idx]
@@ -561,14 +565,14 @@ export class DataGridHeader extends LitElement {
       this._notifyWidthChange(idx, width)
     }).bind(this)
 
-    var mouseupHandler = ((e: MouseEvent) => {
-      document.removeEventListener('mousemove', mousemoveHandler)
-      document.removeEventListener('mouseup', mouseupHandler)
+    var pointerupHandler = ((e: MouseEvent) => {
+      document.removeEventListener('pointermove', pointermoveHandler)
+      document.removeEventListener('pointerup', pointerupHandler)
 
-      mousemoveHandler(e)
+      pointermoveHandler(e)
     }).bind(this)
 
-    document.addEventListener('mousemove', mousemoveHandler)
-    document.addEventListener('mouseup', mouseupHandler)
+    document.addEventListener('pointermove', pointermoveHandler)
+    document.addEventListener('pointerup', pointerupHandler)
   }
 }

package/src/data-list/record-partial.ts

@@ -26,7 +26,16 @@ const OPTIONS: Intl.DateTimeFormatOptions = {
   // timeZone: 'America/Los_Angeles'
 }
 
-const formatter = new Intl.DateTimeFormat(navigator.language, OPTIONS)
+function getSafeFormatter(locale: string, options: Intl.DateTimeFormatOptions) {
+  try {
+    const safeLocale = locale || 'en-US'
+    return new Intl.DateTimeFormat(safeLocale, options)
+  } catch (e) {
+    return new Intl.DateTimeFormat('en-US', options)
+  }
+}
+
+const formatter = getSafeFormatter(navigator.language, OPTIONS)
 
 @customElement('ox-record-partial')
 export class RecordPartial extends LitElement {

package/src/editors/ox-grist-editor-varname.ts

@@ -0,0 +1,36 @@
+import { OxGristEditor } from './ox-grist-editor.js'
+import { customElement } from 'lit/decorators.js'
+import { html } from 'lit'
+
+@customElement('ox-grist-editor-varname')
+export class OxGristEditorVarname extends OxGristEditor {
+  get inlineEditable() {
+    return true
+  }
+
+  get editorTemplate() {
+    return html`
+      <input
+        type="text"
+        .value=${this.value}
+        @input=${this.handleInput}
+        pattern="^[A-Za-z_][A-Za-z0-9_]*$"
+        title="Variable names must start with a letter or underscore and contain only letters, numbers, or underscores."
+      />
+    `
+  }
+
+  handleInput(event: KeyboardEvent) {
+    const input = event.target as HTMLInputElement
+    const regex = /^[A-Za-z_][A-Za-z0-9_]*$/
+
+    // Only allow valid characters as the user types
+    if (!regex.test(input.value)) {
+      // Keep only valid characters and start with a letter or underscore
+      input.value = input.value.replace(/[^A-Za-z0-9_]/g, '').replace(/^[^A-Za-z_]+/, '')
+    }
+
+    // Update the component's internal value state
+    this.value = input.value
+  }
+}

package/src/editors/ox-grist-editor.ts

@@ -107,9 +107,9 @@ export class OxGristEditor extends LitElement {
     this.addEventListener('keydown', this._onkeydown.bind(this))
 
     /* editor mode 인 경우의 마우스 움직임이, grist-body의 이벤트 처리에 의해서 에디터를 리셋시킬 수 있으므로, 이벤트 전파를 막는다. */
-    this.addEventListener('mousedown', (e: Event) => e.stopPropagation())
-    this.addEventListener('mousemove', (e: Event) => e.stopPropagation())
-    this.addEventListener('mouseup', (e: Event) => e.stopPropagation())
+    this.addEventListener('pointerdown', (e: Event) => e.stopPropagation())
+    this.addEventListener('pointermove', (e: Event) => e.stopPropagation())
+    this.addEventListener('pointerup', (e: Event) => e.stopPropagation())
 
     const { name = '' } = this.column
     const { align, defaultValue } = this.column.record

package/src/editors/registry.ts

@@ -19,6 +19,7 @@ import { OxGristEditorTextarea } from './ox-grist-editor-textarea'
 import { OxGristEditorTime } from './ox-grist-editor-time'
 import { OxGristEditorTree } from './ox-grist-editor-tree'
 import { OxGristEditorWeek } from './ox-grist-editor-week'
+import { OxGristEditorVarname } from './ox-grist-editor-varname'
 
 var EDITORS: { [name: string]: { new (): OxGristEditor } } = {
   string: OxGristEditorText,
@@ -44,7 +45,8 @@ var EDITORS: { [name: string]: { new (): OxGristEditor } } = {
   image: OxGristEditorImage,
   file: OxGristEditorFile,
   'string[]': OxGristEditorMultipleSelect,
-  tree: OxGristEditorTree
+  tree: OxGristEditorTree,
+  varname: OxGristEditorVarname
 }
 
 export function registerEditor(type: string, editor: { new (): OxGristEditor }) {

package/src/record-view/record-view-body.ts

@@ -24,7 +24,7 @@ export class RecordViewBody extends LitElement {
       }
 
       div[content] {
-        align-self: auto;
+        align-self: center;
 
         display: grid;
         grid-template-columns: 2fr 3fr 2fr 3fr;
@@ -70,7 +70,6 @@ export class RecordViewBody extends LitElement {
       }
 
       ox-grid-field {
-        justify-content: var();
         background-color: var(--record-view-grid-field-background-color, var(--md-sys-color-surface-container-lowest));
         border: var(--record-view-grid-field-border);
         border-radius: var(--md-sys-shape-corner-small);
@@ -96,12 +95,12 @@ export class RecordViewBody extends LitElement {
         color: var(--record-view-focus-color);
         font-weight: bold;
       }
-      
+
       .highlight-invalid {
         position: relative;
         padding: var(--spacing-tiny) var(--spacing-small);
       }
-      
+
       .highlight-invalid::after {
         content: attr(data-reason); /* 콘텐츠를 동적으로 변경하기 위해 data-reason 속성을 사용 */
         color: red;
@@ -110,7 +109,7 @@ export class RecordViewBody extends LitElement {
         left: 0;
         bottom: -8px; /* 라벨 아래쪽에 메시지를 표시 */
       }
-      
+
       @media only screen and (max-width: 1000px) {
         div[content] {
           grid-template-columns: 2fr 3fr;
@@ -166,7 +165,7 @@ export class RecordViewBody extends LitElement {
     super.disconnectedCallback()
     this.removeEventListener('keydown', this._onKeyDown)
   }
-  
+
   setFocus(fieldElement: HTMLElement) {
     fieldElement?.dispatchEvent(new CustomEvent('click', { bubbles: true, composed: true }))
   }
@@ -176,26 +175,25 @@ export class RecordViewBody extends LitElement {
     allLabels.forEach((label: HTMLLabelElement) => {
       label.classList.remove('highlight-invalid')
       label.removeAttribute('data-reason')
-    });
-  
+    })
+
     // 유효성 검사를 통과하지 못한 필드에 대해 처리
     invalidFields.forEach(({ field, reason }, index) => {
       const labelElement = this.renderRoot.querySelector(`[data-name="${field}"]`) as HTMLLabelElement
       const fieldElement = this.renderRoot.querySelector(`[data-name="${field}"] + ox-grid-field`) as HTMLInputElement
-      
+
       // 동적으로 data-reason 속성을 설정하여 메시지를 변경
       if (labelElement) {
-        labelElement.classList.add('highlight-invalid');
+        labelElement.classList.add('highlight-invalid')
         labelElement.setAttribute('data-reason', '(' + i18next.t(`text.validation-reason.${reason}`) + ')')
       }
-  
+
       // 첫 번째 필드에 포커스 설정
       if (index === 0 && fieldElement) {
         this.setFocus(fieldElement)
       }
-    });
+    })
   }
-  
 
   _onKeyDown(event: KeyboardEvent) {
     if (event.key === 'Tab') {

package/src/renderers/ox-grist-renderer-boolean.ts

@@ -12,7 +12,7 @@ export const OxGristRendererBoolean: FieldRenderer = (value, column, record, row
       type="checkbox"
       .checked=${!!value && !!String(value).match(/true/i)}
       ?disabled=${!editable}
-      @mousedown=${(e: Event) => {
+      @pointerdown=${(e: Event) => {
         /* edit mode로 전환되지 않도록 차단함. 체크박스인풋은 렌더러 모드에서도 처리가능하므로. */
         e.stopPropagation()
       }}

package/themes/calendar-theme.css

@@ -9,7 +9,8 @@ body {
   /* monthly layout */
   --calendar-monthly-ol-margin: var(--margin-default) 0;
   --calendar-monthly-ol-top-border: 2px solid var(--md-sys-color-secondary);
-  --calendar-current-monty-background-color: var(--md-sys-color-surface-variant);
+  --calendar-current-month-background-color: var(--md-sys-color-surface-variant);
+  --calendar-current-month-color: var(--md-sys-color-on-surface);
   --calendar-monthly-label-align: left;
   --calendar-monthly-label-padding: var(--padding-narrow) 0;
   --calendar-monthly-label-color: var(--md-sys-color-secondary);
@@ -35,6 +36,7 @@ body {
   --calendar-weekly-ol-margin: var(--margin-default) 0;
   --calendar-weekly-ol-top-border: 2px solid var(--md-sys-color-secondary);
   --calendar-current-week-background-color: var(--md-sys-color-surface-variant);
+  --calendar-current-week-color: var(--md-sys-color-on-surface);
   --calendar-weekly-label-align: center;
   --calendar-weekly-label-padding: var(--padding-narrow) 0;
   --calendar-weekly-label-color: var(--md-sys-color-secondary);