@dnax/ui 0.0.67 → 0.0.70

package/components/QSpreadsheet.vue

@@ -198,6 +198,7 @@ import { checkValidation, type ArkCheck } from "../lib/spreadsheetValidation"
 import { normalizeCellOptions } from "../lib/spreadsheetOptions"
 import { inLockRect, lockRects, prefillForRow } from "../lib/spreadsheetZones"
 import { canAddRows, canRemoveRows, clampRows } from "../lib/spreadsheetRows"
+import { createHistory } from "../lib/history"
 import {
   DEFAULT_ROW_KEY,
   diffDocuments,
@@ -1148,12 +1149,14 @@ const clearCell = (row: number, column: string) => {
   if (isCellLocked(row, column)) return
   const old = state.value[row]?.[column]
   if (isBlankValue(old) || (Array.isArray(old) && old.length === 0)) return
+  pushHistory()
   setCellValue(row, column, old, null)
 }
 
 const toggleBoolean = (row: number, column: string) => {
   if (isCellLocked(row, column)) return
   const old = !!state.value[row]?.[column]
+  pushHistory()
   setCellValue(row, column, old, !old)
 }
 
@@ -1258,9 +1261,7 @@ interface Snapshot {
   merges: MergeRange[]
   rules: CondRule[]
 }
-const undoStack: Snapshot[] = []
-const redoStack: Snapshot[] = []
-
+const history = createHistory<Snapshot>(100)
 const takeSnapshot = (): Snapshot => ({
   rows: state.value.map((r) => ({ ...r })),
   cols: cols.value.map((c) => ({ ...c })),
@@ -1273,13 +1274,9 @@ const takeSnapshot = (): Snapshot => ({
   merges: merges.value.map((m) => ({ ...m })),
   rules: condRules.value.map((r) => ({ ...r })),
 })
-const pushHistory = () => {
-  undoStack.push(takeSnapshot())
-  if (undoStack.length > 100) undoStack.shift()
-  redoStack.length = 0
-}
-const canUndo = computed(() => undoStack.length > 0 && !props.readonly && !props.disable)
-const canRedo = computed(() => redoStack.length > 0 && !props.readonly && !props.disable)
+const pushHistory = () => history.push(takeSnapshot())
+const canUndo = computed(() => history.canUndo.value && !props.readonly && !props.disable)
+const canRedo = computed(() => history.canRedo.value && !props.readonly && !props.disable)
 
 const restoreSnapshot = (s: Snapshot) => {
   cols.value = s.cols.map((c) => ({ ...c }))
@@ -1294,17 +1291,35 @@ const restoreSnapshot = (s: Snapshot) => {
   condRules.value = s.rules.map((r) => ({ ...r }))
   emit("update:columns", cols.value)
   pushRows(state.value)
+  // La sélection peut pointer sur une ligne/colonne qui n'existe plus (redo d'une
+  // suppression) : on la ramène sur la première cellule plutôt que de laisser un
+  // curseur fantôme hors grille.
+  const current = sel.value
+  if (current) {
+    const maxRow = state.value.length - 1
+    const bad =
+      colIndex(current.column) === -1 ||
+      (current.endColumn !== undefined && colIndex(current.endColumn) === -1) ||
+      current.row > maxRow ||
+      (current.endRow !== undefined && current.endRow > maxRow)
+    if (bad) {
+      if (state.value.length && cols.value.length) select(0, cols.value[0]!.name)
+      else setSel(null)
+    }
+  }
 }
 const undo = () => {
   if (!canUndo.value) return
-  redoStack.push(takeSnapshot())
-  restoreSnapshot(undoStack.pop()!)
+  const snapshot = history.undo(takeSnapshot())
+  if (!snapshot) return
+  restoreSnapshot(snapshot)
   emit("structure-change", { rows: state.value, columns: cols.value, reason: "undo" })
 }
 const redo = () => {
   if (!canRedo.value) return
-  undoStack.push(takeSnapshot())
-  restoreSnapshot(redoStack.pop()!)
+  const snapshot = history.redo(takeSnapshot())
+  if (!snapshot) return
+  restoreSnapshot(snapshot)
   emit("structure-change", { rows: state.value, columns: cols.value, reason: "redo" })
 }
 
@@ -3143,10 +3158,17 @@ const endResize = () => {
   window.removeEventListener("pointerup", endResize)
 }
 
-const onPointerUpGlobal = () => {
+const onPointerUpGlobal = (e: PointerEvent) => {
   isPointerDown.value = false
   endResize()
   endRowResize()
+  const target = e.target as HTMLElement | null
+  // Ne restaurer le focus de la grille que si le geste se termine **dans la grille**,
+  // et jamais depuis l'éditeur / ses listes. Sinon `td.focus()` déclenche le `blur`
+  // de l'input **avant** le `click` de l'option : `commitEdit()` ferme l'éditeur et
+  // la valeur cliquée (`select` / `multiselect`) était perdue.
+  if (!target?.closest?.(".q-spreadsheet__viewport")) return
+  if (target.closest(".q-spreadsheet__editor")) return
   const s = sel.value
   if (s) focusCell(s.row, s.column)
 }
@@ -3353,8 +3375,7 @@ const loadSheetIntoEngine = (idx: number) => {
   colWidths.value = { ...ext.widths }
   setSel(null)
   editing.value = null
-  undoStack.length = 0
-  redoStack.length = 0
+  history.clear()
   if (scrollEl.value) scrollEl.value.scrollTop = 0
 }
 /**
@@ -3766,7 +3787,10 @@ const findReplaceCurrent = () => {
   const next = findCase.value
     ? raw.split(findQuery.value).join(findReplaceText.value)
     : raw.replace(new RegExp(escapeRegExp(findQuery.value), "gi"), findReplaceText.value)
-  if (next !== raw) setCellValue(m.r, m.name, raw, next)
+  if (next !== raw) {
+    pushHistory()
+    setCellValue(m.r, m.name, raw, next)
+  }
   findScan()
   findNext(1)
 }
@@ -4306,6 +4330,7 @@ const validateAndSet = async (r: number, name: string, old: any, next: any): Pro
     return false
   }
   clearValError(r, name)
+  pushHistory()
   setCellValue(r, name, old, next)
   return true
 }

package/index.ts

@@ -203,19 +203,38 @@ export { DEFAULT_LAYOUT_VIEW, parseView, qLayoutKey } from "./lib/layout"
 export type { LayoutView, LayoutZone, LayoutZonePlacement, QLayoutContext } from "./lib/layout"
 export { vRipple } from "./lib/ripple"
 export type { RippleOptions, RippleValue } from "./lib/ripple"
-export { chartToECharts, channelValue, pickFromEvent, tableModel, textValue } from "./lib/chart"
+export { chartToECharts, channelValue, pickFromEvent, tableCsv, tableModel, textValue, tokenCss } from "./lib/chart"
 export type {
   QChartAxis,
   QChartChannel,
   QChartColumn,
   QChartConfig,
+  QChartFormat,
+  QChartFormatKind,
+  QChartFormatOptions,
+  QChartGaugeBand,
   QChartLegend,
   QChartMark,
   QChartMarkType,
   QChartOrientation,
   QChartTable,
+  QChartTableTotals,
+  QChartTableView,
+  QChartThreshold,
+  QChartTooltip,
   QChartPick,
 } from "./lib/chart"
+export { DEFAULT_CURRENCY, DEFAULT_LOCALE, formatValue } from "./lib/chartFormat"
+export { boxStats, histogram, linearFit, waterfallSteps } from "./lib/chartStats"
+export { cellBarGeometry, cellScale, cellVisualOf, sparklineGeometry } from "./lib/chartTable"
+export type {
+  QChartCellBar,
+  QChartCellKind,
+  QChartCellScale,
+  QChartCellVisual,
+  QChartSparkPoint,
+  QChartSparkline,
+} from "./lib/chartTable"
 export { vTouchPan } from "./lib/touchPan"
 export type { PanDetails, TouchPanHandler, PanDirection } from "./lib/touchPan"
 export { vTouchHold } from "./lib/touchHold"

package/lib/chart.axis.test.ts

@@ -28,7 +28,7 @@ function renderSvg(config: Record<string, any>, width: number, height: number):
     width,
     height,
   })
-  chart.setOption(chartToECharts({ theme: THEME, ...config }))
+  chart.setOption(chartToECharts({ marks: [], theme: THEME, ...config }))
   const svg = chart.renderToSVGString()
   chart.dispose()
   return svg