@orbcharts/core 3.0.0-alpha.52 → 3.0.0-alpha.54

package/dist/vite.config.d.ts

@@ -1,2 +1,2 @@
-declare const _default: import('vite').UserConfig & Promise<import('vite').UserConfig> & (import('vite').UserConfigFnObject & import('vite').UserConfigExport);
+declare const _default: import('vite').UserConfigFnObject;
 export default _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orbcharts/core",
-  "version": "3.0.0-alpha.52",
+  "version": "3.0.0-alpha.54",
   "description": "OrbCharts is an open source chart library based on d3.js and rx.js",
   "author": "Blue Planet Inc.",
   "license": "Apache-2.0",
@@ -25,7 +25,7 @@
   "types": "./dist/src/index.d.ts",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "build": "vite build --mode release"
+    "build": "vite build --mode production"
   },
   "devDependencies": {
     "@types/d3": "^7.4.0",

package/src/multiGrid/createMultiGridContextObserver.ts

@@ -1,7 +1,8 @@
 import {
+  map,
   shareReplay } from 'rxjs'
 import type { ContextObserverFn } from '../types'
-import { multiGridEachDetailObservable } from './multiGridObservables'
+import { multiGridEachDetailObservable, multiGridContainerObservable } from './multiGridObservables'
 import { textSizePxObservable } from '../utils/observables'
 
 export const createMultiGridContextObserver: ContextObserverFn<'multiGrid'> = ({ subject, observer }) => {
@@ -20,12 +21,11 @@ export const createMultiGridContextObserver: ContextObserverFn<'multiGrid'> = ({
     shareReplay(1)
   )
 
-  // const multiGridContainer$ = multiGridContainerObservable({
-  //   computedData$: observer.computedData$,
-  //   fullDataFormatter$: observer.fullDataFormatter$,
-  //   fullChartParams$: observer.fullChartParams$,
-  //   layout$: observer.layout$,
-  // })
+  const multiGridContainerPosition$ = multiGridContainerObservable({
+    computedData$: observer.computedData$,
+    fullDataFormatter$: observer.fullDataFormatter$,
+    layout$: observer.layout$,
+  })
 
   return {
     fullParams$: observer.fullParams$,
@@ -34,6 +34,7 @@ export const createMultiGridContextObserver: ContextObserverFn<'multiGrid'> = ({
     computedData$: observer.computedData$,
     layout$: observer.layout$,
     textSizePx$,
+    multiGridContainerPosition$,
     multiGridEachDetail$,
     // multiGridContainer$
   }

package/src/multiGrid/multiGridObservables.ts

@@ -315,6 +315,7 @@ export const multiGridContainerObservable = ({ computedData$, fullDataFormatter$
         }
         return seriesContainerArr
       })
+      console.log('gridContainerPositionArr', gridContainerPositionArr)
 
       // let accGridSlotIndex = 0
 

package/src/types/ContextObserverMultiGrid.ts

@@ -2,10 +2,11 @@ import { Observable } from 'rxjs'
 import type { ContextObserverBase } from './ContextObserver'
 import type { ComputedDataGrid, ComputedDatumGrid } from './ComputedDataGrid'
 import type { DataFormatterGrid } from './DataFormatterGrid'
-import type { ContextObserverGridDetail } from './ContextObserverGrid'
+import type { GridContainerPosition, ContextObserverGridDetail } from './ContextObserverGrid'
 
 export interface ContextObserverMultiGrid<PluginParams> extends ContextObserverBase<'multiGrid', PluginParams> {
   textSizePx$: Observable<number>
+  multiGridContainerPosition$: Observable<GridContainerPosition[][]>
   multiGridEachDetail$: Observable<ContextObserverMultiGridDetail[]>
 }
 

package/src/utils/d3Utils.ts

@@ -65,13 +65,12 @@ export const createAxisPointScale = ({ axisLabels, axisWidth, padding = 0.5 }: {
 }
 
 // scaleQuantize - 比例尺座標對應非連續資料索引
-export const createAxisQuantizeScale = ({ axisLabels, axisWidth, padding = 0.5, reverse = false }:{
+export const createAxisQuantizeScale = ({ axisLabels, axisWidth, padding = 0, reverse = false }:{
   axisLabels: string[] | Date[],
   axisWidth: number
   padding?: number
   reverse?: boolean
 }) => {
-  const rangePadding = 0
 
   let range: number[] = axisLabels.map((d: string | Date, i: number) => i)
   if (reverse) {
@@ -82,8 +81,12 @@ export const createAxisQuantizeScale = ({ axisLabels, axisWidth, padding = 0.5,
   // } else {
   //   range = axisLabels.map((d: string | Date, i: number) => i)
   // }
+  const step = range.length - 1 + (padding * 2) // 圖軸刻度分段數量
+  const stepWidth = axisWidth / step
+  const rangePadding = stepWidth * padding - (stepWidth * 0.5) // 實際要計算的範圍是圖軸左右那邊增加0.5
 
+  // console.log('rangePadding', rangePadding)
   return d3.scaleQuantize<number>()
-    .domain([- rangePadding, axisWidth + rangePadding])
+    .domain([rangePadding, axisWidth - rangePadding])
     .range(range)
 }

package/vite.config.js

@@ -1,45 +1,23 @@
-// import { fileURLToPath, URL } from 'node:url'
-
-// import { resolve } from 'path'
 import { defineConfig } from 'vite'
 import dts from 'vite-plugin-dts'
 
-const releaseConfig = {
-  plugins: [
-    dts({
-      insertTypesEntry: true
-    })
-  ],
-  compilerOptions: {
-    composite: true
-  },
-  build: {
-    lib: {
-      entry: "src/index.ts",
-      name: 'orbcharts-core',
-      formats: ["es", "umd"],
-      fileName: format => `orbcharts-core.${format}.js`
-    },
-    // rollupOptions: {
-    //   input: {
-    //     main: resolve(__dirname, "src/index.ts")
-    //   },
-    //   external: ['vue'],
-    //   output: {
-    //     assetFileNames: 'my-library.css',
-    //     exports: "named",
-    //     globals: {
-    //       vue: 'Vue',
-    //     },
-    //   },
-    // },
-  }
-}
-
 export default defineConfig(({ command, mode }) => {
-  if (mode === 'release') {
-    return releaseConfig
-  } else {
-    return releaseConfig
+  return {
+    plugins: [
+      dts({
+        insertTypesEntry: true
+      })
+    ],
+    compilerOptions: {
+      composite: true
+    },
+    build: {
+      lib: {
+        entry: "src/index.ts",
+        name: 'orbcharts-core',
+        formats: ["es", "umd"],
+        fileName: format => `orbcharts-core.${format}.js`
+      },
+    }
   }
 })