@globalbrain/sefirot 4.15.0 → 4.17.0

package/lib/components/SChartBar.vue

@@ -3,6 +3,7 @@ import { useElementSize } from '@vueuse/core'
 import * as d3 from 'd3'
 import { useTemplateRef, watch } from 'vue'
 import { type ChartColor, type KV, type Margins, c, scheme } from '../support/Chart'
+import { getTextSize } from '../support/Text'
 
 const props = withDefaults(defineProps<{
   // State
@@ -19,6 +20,8 @@ const props = withDefaults(defineProps<{
   yLabel?: string
   xLabelOffset?: number
   yLabelOffset?: number
+  xLabelTickGap?: number
+  yLabelTickGap?: number
   xLabelFontSize?: string
   yLabelFontSize?: string
   ticks?: number
@@ -38,11 +41,13 @@ const props = withDefaults(defineProps<{
 
   xLabelFontSize: '14px',
   yLabelFontSize: '14px',
+  xLabelTickGap: 20,
+  yLabelTickGap: 20,
   ticks: 5,
   tickFontSize: '14px',
 
   tooltip: true,
-  tooltipFormat: (d: KV) => `${d.key} – ${d.value}`,
+  tooltipFormat: (d: KV) => `${d.key}&nbsp;&ndash; ${d.value}`,
 
   animate: true,
   debug: false
@@ -67,6 +72,7 @@ function renderChart({
 
   // Create color scale
   const color = scheme(props.data, props.colors)
+  const font = getComputedStyle(chartRef.value).fontFamily
 
   // Clear any existing SVG
   d3
@@ -77,25 +83,37 @@ function renderChart({
   // Set dimensions and margins
   const vertical = props.type === 'vertical'
 
+  const maxKeyLength = props.data.reduce((a, b) => Math.max(a, b.key.length), Number.NEGATIVE_INFINITY)
+  const maxValueLength = props.data.reduce((a, b) => Math.max(a, b.value.toLocaleString().length), Number.NEGATIVE_INFINITY)
+
+  const maxVerticalTickWidthInCh = vertical ? maxValueLength : maxKeyLength
+  const maxVerticalTickWidthInPx = getTextSize('0'.repeat(maxVerticalTickWidthInCh), `400 ${props.tickFontSize} ${font}`).width
+  const verticalLabelWidthInPx = props.yLabel ? getTextSize(props.yLabel, `400 ${props.yLabelFontSize} ${font}`).height : 0
+  const gapBetweenVerticalLabelAndTicks = props.yLabel ? props.yLabelTickGap : 0
+
+  const maxHorizontalTickHeightInPx = getTextSize('0', `400 ${props.tickFontSize} ${font}`).height // wrapping isn't supported
+  const horizontalLabelHeightInPx = props.xLabel ? getTextSize(props.xLabel, `400 ${props.xLabelFontSize} ${font}`).height : 0
+  const gapBetweenHorizontalLabelAndTicks = props.xLabel ? props.xLabelTickGap : 0
+
+  const xLabelOffset = props.xLabelOffset ?? horizontalLabelHeightInPx + 9 + maxHorizontalTickHeightInPx + gapBetweenHorizontalLabelAndTicks
+  const yLabelOffset = props.yLabelOffset ?? 9 + maxVerticalTickWidthInPx + gapBetweenVerticalLabelAndTicks
+
   const margin = {
     top: props.margins?.top ?? 30,
-    right: props.margins?.right ?? 40,
-    bottom: props.margins?.bottom ?? (props.xLabel ? 80 : 60),
-    left: props.margins?.left ?? (props.yLabel ? (vertical ? 80 : 100) : (vertical ? 60 : 80))
+    right: props.margins?.right ?? 30,
+    bottom: (props.margins?.bottom ?? 30) + horizontalLabelHeightInPx + xLabelOffset - (props.xLabel ? 9 : 0),
+    left: (props.margins?.left ?? 30) + verticalLabelWidthInPx + yLabelOffset
   }
 
   const width = clientWidth - margin.left - margin.right
   const height = clientHeight - margin.top - margin.bottom
 
-  const xLabelOffset = props.xLabelOffset ?? 46
-  const yLabelOffset = props.yLabelOffset ?? (vertical ? 40 : 56)
-
   // Create SVG
   const svg = d3
     .select(chartRef.value)
     .append('svg')
     .attr('width', '100%')
-    .attr('height', height + margin.top + margin.bottom)
+    .attr('height', clientHeight)
     .append('g')
     .attr('transform', `translate(${margin.left},${margin.top})`)
 

package/lib/components/SChartPie.vue

@@ -50,7 +50,7 @@ const props = withDefaults(defineProps<{
   legendFontSize: '14px',
 
   tooltip: true,
-  tooltipFormat: (d: KV) => `${d.key} – ${d.value}`,
+  tooltipFormat: (d: KV) => `${d.key}&nbsp;&ndash; ${d.value}`,
 
   animate: true,
   debug: false

package/lib/components/STable.vue

@@ -5,7 +5,7 @@ import xor from 'lodash-es/xor'
 import { computed, nextTick, reactive, ref, shallowRef, toValue, unref, watch } from 'vue'
 import { type Table } from '../composables/Table'
 import { smartComputed } from '../support/Reactivity'
-import { getTextWidth } from '../support/Text'
+import { getTextSize } from '../support/Text'
 import SInputCheckbox from './SInputCheckbox.vue'
 import SInputRadio from './SInputRadio.vue'
 import SSpinner from './SSpinner.vue'
@@ -231,12 +231,12 @@ const actionsColumnWidth = computed(() => {
 
     // has only label
     if (label && !icon) {
-      return 1 /* border */ + 12 /* padding */ + getTextWidth(label, font) + 12 /* padding */ + 1 /* border */
+      return 1 /* border */ + 12 /* padding */ + getTextSize(label, font).width + 12 /* padding */ + 1 /* border */
     }
 
     // has both icon and label
     if (icon && label) {
-      return 1 /* border */ + 8 /* padding */ + 16 /* icon */ + 4 /* padding */ + getTextWidth(label, font) + 10 /* padding */ + 1 /* border */
+      return 1 /* border */ + 8 /* padding */ + 16 /* icon */ + 4 /* padding */ + getTextSize(label, font).width + 10 /* padding */ + 1 /* border */
     }
 
     return 0

package/lib/support/Text.ts

@@ -2,16 +2,16 @@
 
 let _canvas: HTMLCanvasElement
 
-export function getTextWidth(text: string, font: string): number
-export function getTextWidth(text: string, el: HTMLElement): number
-
-export function getTextWidth(text: string, fontOrEl: string | HTMLElement): number {
+export function getTextSize(text: string, fontOrEl: string | HTMLElement) {
   const canvas = _canvas || (_canvas = document.createElement('canvas'))
   const context = canvas.getContext('2d')!
   context.font = typeof fontOrEl === 'string' ? fontOrEl : getCanvasFont(fontOrEl)
   const metrics = context.measureText(text)
 
-  return metrics.width
+  return {
+    width: metrics.width,
+    height: metrics.actualBoundingBoxAscent + metrics.actualBoundingBoxDescent
+  }
 }
 
 function getCanvasFont(el: HTMLElement) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@globalbrain/sefirot",
   "type": "module",
-  "version": "4.15.0",
+  "version": "4.17.0",
   "packageManager": "pnpm@9.15.4",
   "description": "Vue Components for Global Brain Design System.",
   "author": "Kia Ishii <ka.ishii@globalbrains.com>",