@bashem/rn-charts 0.0.4 → 0.0.5

package/lib/module/skia/HeatMap/HeatMap.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","View","Canvas","Group","Rect","useHeatMap","Popup","jsx","_jsx","jsxs","_jsxs","HeatMap","props","daysInRange","totalWidth","totalHeight","popupData","popupRef","popupDimension","touchHandler","getColor","cellSize","onTouchOutside","viewOffset","setViewOffset","useState","x","y","style","backgroundColor","ref","view","measureInWindow","fx","fy","prev","children","width","height","onTouchStart","event","nativeEvent","locationX","locationY","map","day","color","value","date","popupStyle","data"],"sourceRoot":"../../../../src","sources":["skia/HeatMap/HeatMap.tsx"],"mappings":";;AAAA,OAAOA,KAAK,MAAoB,OAAO;AACvC,SAASC,IAAI,QAAe,cAAc;AAC1C,SAASC,MAAM,EAAEC,KAAK,EAAEC,IAAI,QAAQ,4BAA4B;AAChE,OAAOC,UAAU,MAAM,iBAAc;AAErC,OAAOC,KAAK,MAA2B,aAAU;AAAC,SAAAC,GAAA,IAAAC,IAAA,EAAAC,IAAA,IAAAC,KAAA;AAiClD,SAASC,OAAOA,CAACC,KAAmB,EAAE;EACpC,MAAM;IACJC,WAAW;IACXC,UAAU;IACVC,WAAW;IACXC,SAAS;IACTC,QAAQ;IACRC,cAAc;IACdC,YAAY;IACZC,QAAQ;IACRC,QAAQ;IACRC;EACF,CAAC,GAAGjB,UAAU,CAACO,KAAK,CAAC;EAErB,MAAM,CAACW,UAAU,EAAEC,aAAa,CAAC,GAAGxB,KAAK,CAACyB,QAAQ,CAAC;IAAEC,CAAC,EAAE,CAAC;IAAEC,CAAC,EAAE;EAAE,CAAC,CAAC;EAElE,oBACEjB,KAAA,CAACT,IAAI;IACH2B,KAAK,EAAE;MAAEC,eAAe,EAAEjB,KAAK,CAACgB,KAAK,EAAEC;IAAgB,CAAE;IACzDC,GAAG,EAAGC,IAAI,IAAK;MACbA,IAAI,EAAEC,eAAe,CAAC,CAACC,EAAE,EAAEC,EAAE,KAAK;QAChCV,aAAa,CAAEW,IAAI,IAAK;UACtB,IAAIA,IAAI,CAACT,CAAC,KAAKO,EAAE,IAAIE,IAAI,CAACR,CAAC,KAAKO,EAAE,EAAE;YAClC,OAAOC,IAAI;UACb;UACA,OAAO;YAAET,CAAC,EAAEO,EAAE;YAAEN,CAAC,EAAEO;UAAG,CAAC;QACzB,CAAC,CAAC;MACJ,CAAC,CAAC;IACJ,CAAE;IAAAE,QAAA,gBAEF5B,IAAA,CAACN,MAAM;MACL0B,KAAK,EAAE;QAAES,KAAK,EAAEvB,UAAU;QAAEwB,MAAM,EAAEvB;MAAY,CAAE;MAClDwB,YAAY,EAAGC,KAAK,IAClBrB,YAAY,CAACqB,KAAK,CAACC,WAAW,CAACC,SAAS,EAAEF,KAAK,CAACC,WAAW,CAACE,SAAS,CACtE;MAAAP,QAAA,eAED5B,IAAA,CAACL,KAAK;QAAAiC,QAAA,EACHvB,WAAW,CAAC+B,GAAG,CAAEC,GAAG,IAAK;UACxB,oBACErC,IAAA,CAACJ,IAAI;YAEHsB,CAAC,EAAEmB,GAAG,CAACnB,CAAE;YACTC,CAAC,EAAEkB,GAAG,CAAClB,CAAE;YACTU,KAAK,EAAEhB,QAAS;YAChBiB,MAAM,EAAEjB,QAAS;YACjByB,KAAK,EAAE1B,QAAQ,CAACyB,GAAG,CAACE,KAAK;UAAE,GALtBF,GAAG,CAACG,IAMV,CAAC;QAEN,CAAC;MAAC,CACG;IAAC,CACF,CAAC,EAERhC,SAAS,IAAIJ,KAAK,CAACqC,UAAU,iBAC5BzC,IAAA,CAACF,KAAK;MACJU,SAAS,EAAE;QAAEU,CAAC,EAAEV,SAAS,CAACU,CAAC;QAAEC,CAAC,EAAEX,SAAS,CAACW,CAAC;QAAEuB,IAAI,EAAElC,SAAS,CAAC6B;MAAI,CAAE;MACnE/B,UAAU,EAAEA,UAAW;MACvBC,WAAW,EAAEA,WAAY;MACzBI,YAAY,EAAEA,YAAa;MAC3BG,cAAc,EAAEA,cAAe;MAC/B2B,UAAU,EAAErC,KAAK,CAACqC,UAAW;MAC7B1B,UAAU,EAAEA;IAAW,CACxB,CACF;EAAA,CACG,CAAC;AAEX;AAEA,eAAeZ,OAAO","ignoreList":[]}
+{"version":3,"names":["React","View","Canvas","Group","Rect","rect","useHeatMap","Popup","VerticalLabelView","HorizontalLabelView","jsx","_jsx","jsxs","_jsxs","Fragment","_Fragment","HeatMap","yLabelView","yLabelSkiaView","xLabelView","xLabelSkiaView","cellSkiaView","onSelectView","onSelectSkiaView","props","cellData","totalWidth","totalHeight","popupData","popupRef","popupDimension","touchHandler","getColor","cellSize","onTouchOutside","horizontalLabelHeight","verticalLabelWidth","setHorizontalLabelHeight","setVerticalLabelWidth","numberOfRows","paddingTop","paddingBottom","paddingLeft","paddingRight","xLabelsRect","viewOffset","setViewOffset","useState","x","y","onSelectSkiaViewMemo","useMemo","undefined","data","onSelectViewMemo","style","backgroundColor","ref","view","measureInWindow","fx","fy","prev","children","flexDirection","onLayout","event","nativeEvent","layout","width","labelPercentages","Array","from","length","_","i","styles","height","top","verticalLabelStyle","labelSkiaView","_percentage","yPosition","index","labels","map","positions","horizontalLabelStyle","yPostion","onTouchStart","locationX","locationY","datum","skiaView","color","value","position","viewPosition","left","console","log","popupStyle"],"sourceRoot":"../../../../src","sources":["skia/HeatMap/HeatMap.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/skia/HeatMap/useHeatMap.js

@@ -1,13 +1,15 @@
 "use strict";
 
 import { useImperativeHandle, useLayoutEffect, useMemo, useRef, useState } from "react";
+import { getPaddings } from "../common.js";
+import { rect } from "@shopify/react-native-skia";
 function useHeatMap({
-  startDate,
-  endDate,
+  rows,
   data,
   style,
   minValue,
   maxValue,
+  coalesceGroups,
   ref,
   popupStyle
 }) {
@@ -15,49 +17,95 @@ function useHeatMap({
   const cellGap = style?.cellGap ?? 4;
   const cellMaxColor = style?.cellMaxColor ?? '#50f555ff';
   const cellMinColor = style?.cellMinColor ?? '#ffffffff';
-  const numberOfDaysInWeek = 7;
-  const numberOfMsInDay = 1000 * 60 * 60 * 24;
+  const [verticalLabelWidth, setVerticalLabelWidth] = useState(0);
+  const [horizontalLabelHeight, setHorizontalLabelHeight] = useState(0);
+  const {
+    paddingLeft,
+    paddingRight,
+    paddingTop,
+    paddingBottom
+  } = getPaddings(style);
+  const numberOfRows = rows;
   const [popupData, setPopupData] = useState(undefined);
   const [popupDimension, setPopupDimension] = useState({
     width: 0,
     height: 0
   });
   const popupRef = useRef(null);
-  const formatDate = date => `${date.getFullYear()}-${String(date.getMonth() + 1).padStart(2, '0')}-${String(date.getDate()).padStart(2, '0')}`;
   const {
-    daysInRange,
+    cellData,
     computedMin,
-    computedMax
+    computedMax,
+    numberOfCols,
+    totalInterGroupSpacing,
+    xLabelsRect,
+    groupInfos
   } = useMemo(() => {
-    const start = new Date(startDate);
-    const end = new Date(endDate);
-    const output = [];
     let computedMax = Number.MIN_VALUE;
     let computedMin = Number.MAX_VALUE;
-    const startDayOfWeek = start.getDay();
-    for (let d = new Date(start); d <= end; d.setDate(d.getDate() + 1)) {
-      const dateStr = formatDate(d);
-      const value = data?.[dateStr] ?? 0;
-      const dayOfWeek = d.getDay();
-      const daysFromStart = Math.floor((d.getTime() - start.getTime()) / numberOfMsInDay);
-      const week = Math.floor((startDayOfWeek + daysFromStart) / numberOfDaysInWeek);
-      computedMax = Math.max(computedMax, value);
-      computedMin = Math.min(computedMin, value);
-      output.push({
-        date: dateStr,
-        value,
-        dayOfWeek,
-        week,
-        x: week * (cellSize + cellGap),
-        y: dayOfWeek * (cellSize + cellGap)
+    let nextRow = 0;
+    let nextCol = 0;
+    let xLabelsRect = [];
+    let cellsInRange = [];
+    let totalInterGroupSpacing = 0;
+    let groupInfos = [];
+    data.forEach((datum, index) => {
+      let startingRow = datum.startingRow;
+      let currentCol = nextCol;
+      if (index !== 0 && (coalesceGroups === false || datum.startingRow < nextRow)) {
+        currentCol++;
+        let additionalGroupSpacing = coalesceGroups ? 0 : style?.interGroupSpacing ?? 0;
+        totalInterGroupSpacing += additionalGroupSpacing;
+      }
+      let minX = Number.MAX_VALUE;
+      let maxX = Number.MIN_VALUE;
+      let firstIndexInGroup = cellsInRange.length;
+      let lastIndexInGroup = firstIndexInGroup;
+      for (let i = 0; i < datum.cols; i++) {
+        for (let j = startingRow; j < (i === datum.cols - 1 ? datum.endingRow + 1 : rows); j++) {
+          const value = datum.data?.[j]?.[i] ?? 0;
+          computedMax = Math.max(computedMax, value);
+          computedMin = Math.min(computedMin, value);
+          let x = currentCol * (cellSize + cellGap) + totalInterGroupSpacing;
+          let y = j * (cellSize + cellGap);
+          minX = Math.min(minX, x);
+          maxX = Math.max(maxX, x);
+          cellsInRange.push({
+            rowIndex: j,
+            colIndex: currentCol,
+            groupIndex: data.indexOf(datum),
+            value,
+            x: x,
+            y: y
+          });
+          lastIndexInGroup = cellsInRange.length - 1;
+          nextRow = j + 1;
+        }
+        startingRow = 0;
+        if (nextRow == rows) {
+          currentCol++;
+          nextRow = 0;
+        }
+      }
+      nextCol = Math.max(nextCol, currentCol);
+      xLabelsRect.push(rect(minX, 0, maxX - minX + cellSize + 1, style?.horizontalLabelStyle?.height ?? -1));
+      groupInfos.push({
+        startingX: minX,
+        endingX: maxX + cellSize,
+        startingCellIndex: firstIndexInGroup,
+        lastCellIndex: lastIndexInGroup
       });
-    }
+    });
     return {
-      daysInRange: output,
+      cellData: cellsInRange,
+      numberOfCols: nextCol + (nextRow > 0 ? 1 : 0),
+      totalInterGroupSpacing,
+      xLabelsRect,
+      groupInfos,
       computedMin: minValue !== undefined ? minValue : computedMin,
       computedMax: maxValue !== undefined ? maxValue : computedMax
     };
-  }, [startDate, endDate, data, minValue, maxValue, cellSize, cellGap]);
+  }, [rows, data, minValue, maxValue, cellSize, cellGap]);
 
   // --- COLOR LOGIC ---
   const getColor = value => {
@@ -72,9 +120,8 @@ function useHeatMap({
   };
 
   // Heatmap size
-  const numWeeks = Math.ceil(daysInRange.length / 7 + 1);
-  const totalWidth = numWeeks * (cellSize + cellGap);
-  const totalHeight = 7 * (cellSize + cellGap);
+  const totalWidth = numberOfCols * (cellSize + cellGap) + totalInterGroupSpacing + verticalLabelWidth;
+  const totalHeight = rows * (cellSize + cellGap) + horizontalLabelHeight;
 
   // --- POPUP MEASUREMENT ---
   useLayoutEffect(() => {
@@ -94,21 +141,48 @@ function useHeatMap({
       setPopupData(undefined);
       return;
     }
-    const col = Math.floor(x / (cellSize + cellGap));
-    const row = Math.floor(y / (cellSize + cellGap));
-    const start = new Date(startDate);
-    const startDayOfWeek = start.getDay();
-    const index = col * numberOfDaysInWeek + row;
-    if (index >= startDayOfWeek && index - startDayOfWeek < daysInRange.length) {
-      const day = daysInRange[index - startDayOfWeek];
-      if (day) {
-        setPopupData({
-          x: col * (cellSize + cellGap),
-          y: row * (cellSize + cellGap),
-          day
-        });
-        return;
+    let cellIndex = undefined;
+    for (const [index, group] of groupInfos.entries()) {
+      if (x > group.endingX) continue;
+      if (x < group.startingX) continue;
+      let groupData = data[index];
+      if (!groupData) break;
+      let colIndex = Math.floor((x - group.startingX) / (cellSize + cellGap));
+      let rowIndex = Math.floor(y / (cellSize + cellGap));
+      let firstRowCells = rows - groupData.startingRow;
+      if (colIndex < 0 || colIndex >= groupData.cols || rowIndex < 0 || rowIndex >= rows) {
+        break;
+      }
+      let cellColStartingCellIndex = group.startingCellIndex + Math.max(0, colIndex - 1) * rows;
+      if (colIndex !== 0) {
+        cellColStartingCellIndex += firstRowCells;
+        cellIndex = cellColStartingCellIndex + rowIndex;
+      } else {
+        cellIndex = cellColStartingCellIndex + rowIndex - groupData.startingRow;
+      }
+      if (cellIndex < 0 || cellIndex >= cellData.length) {
+        console.error("Calculated cell index is out of bounds:", cellIndex);
+        cellIndex = undefined;
+        break;
       }
+      let cell = cellData[cellIndex];
+      if (!cell || x < cell.x || x > cell.x + cellSize || y < cell.y || y > cell.y + cellSize) {
+        cellIndex = undefined;
+      }
+      break;
+    }
+    if (cellIndex === undefined) {
+      setPopupData(undefined);
+      return;
+    }
+    const cellDatum = cellData[cellIndex];
+    if (cellDatum) {
+      setPopupData({
+        x: cellDatum.x,
+        y: cellDatum.y,
+        data: cellDatum
+      });
+      return;
     }
     setPopupData(undefined);
   };
@@ -121,7 +195,7 @@ function useHeatMap({
     }
   }), [ref]);
   return {
-    daysInRange,
+    cellData,
     computedMin,
     computedMax,
     totalWidth,
@@ -132,7 +206,17 @@ function useHeatMap({
     touchHandler,
     getColor,
     cellSize,
-    onTouchOutside
+    onTouchOutside,
+    verticalLabelWidth,
+    setVerticalLabelWidth,
+    horizontalLabelHeight,
+    setHorizontalLabelHeight,
+    numberOfRows,
+    paddingLeft,
+    paddingRight,
+    paddingTop,
+    paddingBottom,
+    xLabelsRect
   };
 }
 export default useHeatMap;

package/lib/module/skia/HeatMap/useHeatMap.js.map

@@ -1 +1 @@
-{"version":3,"names":["useImperativeHandle","useLayoutEffect","useMemo","useRef","useState","useHeatMap","startDate","endDate","data","style","minValue","maxValue","ref","popupStyle","cellSize","cellGap","cellMaxColor","cellMinColor","numberOfDaysInWeek","numberOfMsInDay","popupData","setPopupData","undefined","popupDimension","setPopupDimension","width","height","popupRef","formatDate","date","getFullYear","String","getMonth","padStart","getDate","daysInRange","computedMin","computedMax","start","Date","end","output","Number","MIN_VALUE","MAX_VALUE","startDayOfWeek","getDay","d","setDate","dateStr","value","dayOfWeek","daysFromStart","Math","floor","getTime","week","max","min","push","x","y","getColor","intensity","bigint","parseInt","replace","r","g","b","mix","base","round","numWeeks","ceil","length","totalWidth","totalHeight","current","measure","touchHandler","renderPopup","col","row","index","day","onTouchOutside","touchedOutside"],"sourceRoot":"../../../../src","sources":["skia/HeatMap/useHeatMap.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["useImperativeHandle","useLayoutEffect","useMemo","useRef","useState","getPaddings","rect","useHeatMap","rows","data","style","minValue","maxValue","coalesceGroups","ref","popupStyle","cellSize","cellGap","cellMaxColor","cellMinColor","verticalLabelWidth","setVerticalLabelWidth","horizontalLabelHeight","setHorizontalLabelHeight","paddingLeft","paddingRight","paddingTop","paddingBottom","numberOfRows","popupData","setPopupData","undefined","popupDimension","setPopupDimension","width","height","popupRef","cellData","computedMin","computedMax","numberOfCols","totalInterGroupSpacing","xLabelsRect","groupInfos","Number","MIN_VALUE","MAX_VALUE","nextRow","nextCol","cellsInRange","forEach","datum","index","startingRow","currentCol","additionalGroupSpacing","interGroupSpacing","minX","maxX","firstIndexInGroup","length","lastIndexInGroup","i","cols","j","endingRow","value","Math","max","min","x","y","push","rowIndex","colIndex","groupIndex","indexOf","horizontalLabelStyle","startingX","endingX","startingCellIndex","lastCellIndex","getColor","intensity","bigint","parseInt","replace","r","g","b","mix","base","round","totalWidth","totalHeight","current","measure","touchHandler","renderPopup","cellIndex","group","entries","groupData","floor","firstRowCells","cellColStartingCellIndex","console","error","cell","cellDatum","onTouchOutside","touchedOutside"],"sourceRoot":"../../../../src","sources":["skia/HeatMap/useHeatMap.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/skia/PieChart/PieChart.js

@@ -6,18 +6,25 @@ import { usePieChart } from "./usePieChart.js";
 import Popup from "../Popup.js";
 import { useState } from 'react';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-function PieChart(props) {
+function PieChart({
+  popupStyle,
+  centerSkiaView,
+  centerView,
+  ...props
+}) {
   const {
     radius,
+    width,
+    height,
+    cx,
+    cy,
     innerRadius,
     paths,
     popupData,
     touchHandler
   } = usePieChart(props);
   const {
-    style,
-    centerView,
-    popupStyle
+    style
   } = props;
   const paddingTop = style.paddingTop ?? style.padding ?? 0;
   const paddingBottom = style.paddingBottom ?? style.padding ?? 0;
@@ -51,8 +58,8 @@ function PieChart(props) {
     children: [centerView && /*#__PURE__*/_jsx(View, {
       style: {
         position: 'absolute',
-        top: paddingTop + radius - innerRadius,
-        left: paddingLeft + radius - innerRadius,
+        top: paddingTop + cx - innerRadius,
+        left: paddingLeft + cy - innerRadius,
         width: innerRadius * 2,
         height: innerRadius * 2,
         borderRadius: innerRadius,
@@ -61,31 +68,28 @@ function PieChart(props) {
         backgroundColor: style.innerColor ?? 'black'
       },
       children: centerView
-    }), /*#__PURE__*/_jsx(Canvas, {
+    }), /*#__PURE__*/_jsxs(Canvas, {
       style: {
-        width: radius * 2,
-        height: radius * 2,
+        width,
+        height,
         backgroundColor: style.backgroundColor ?? 'transparent'
       },
       onTouchStart: event => touchHandler(event.nativeEvent.locationX, event.nativeEvent.locationY),
-      children: paths.map(({
+      children: [paths.map(({
         path,
         color
       }, index) => /*#__PURE__*/_jsx(Path, {
         path: path,
-        color: color,
-        stroke: {
-          width: 5
-        }
-      }, index))
+        color: color
+      }, index)), centerSkiaView && centerSkiaView(cx, cy, innerRadius)]
     }), popupData && /*#__PURE__*/_jsx(Popup, {
       popupData: {
         x: popupData.centerX,
         y: popupData.centerY,
         data: popupData.data
       },
-      totalWidth: radius * 2,
-      totalHeight: radius * 2,
+      totalWidth: width,
+      totalHeight: height,
       touchHandler: (x, y) => touchHandler(x - paddingLeft, y - paddingTop),
       viewOffset: viewOffset,
       popupStyle: popupStyle

package/lib/module/skia/PieChart/PieChart.js.map

@@ -1 +1 @@
-{"version":3,"names":["Canvas","Path","View","usePieChart","Popup","useState","jsx","_jsx","jsxs","_jsxs","PieChart","props","radius","innerRadius","paths","popupData","touchHandler","style","centerView","popupStyle","paddingTop","padding","paddingBottom","paddingLeft","paddingRight","viewOffset","setViewOffset","x","y","backgroundColor","ref","view","measureInWindow","fx","fy","prev","children","position","top","left","width","height","borderRadius","justifyContent","alignItems","innerColor","onTouchStart","event","nativeEvent","locationX","locationY","map","path","color","index","stroke","centerX","centerY","data","totalWidth","totalHeight"],"sourceRoot":"../../../../src","sources":["skia/PieChart/PieChart.tsx"],"mappings":";;AAAA,SAASA,MAAM,EAAEC,IAAI,QAAQ,4BAA4B;AAEzD,SAAeC,IAAI,QAAQ,cAAc;AACzC,SAASC,WAAW,QAAQ,kBAAe;AAC3C,OAAOC,KAAK,MAA2B,aAAU;AACjD,SAASC,QAAQ,QAAQ,OAAO;AAAC,SAAAC,GAAA,IAAAC,IAAA,EAAAC,IAAA,IAAAC,KAAA;AA4BjC,SAASC,QAAQA,CAACC,KAAoB,EAAE;EACtC,MAAM;IAAEC,MAAM;IAAEC,WAAW;IAAEC,KAAK;IAAEC,SAAS;IAAEC;EAAa,CAAC,GAC3Db,WAAW,CAACQ,KAAK,CAAC;EACpB,MAAM;IAAEM,KAAK;IAAEC,UAAU;IAAEC;EAAW,CAAC,GAAGR,KAAK;EAE/C,MAAMS,UAAU,GAAGH,KAAK,CAACG,UAAU,IAAIH,KAAK,CAACI,OAAO,IAAI,CAAC;EACzD,MAAMC,aAAa,GAAGL,KAAK,CAACK,aAAa,IAAIL,KAAK,CAACI,OAAO,IAAI,CAAC;EAC/D,MAAME,WAAW,GAAGN,KAAK,CAACM,WAAW,IAAIN,KAAK,CAACI,OAAO,IAAI,CAAC;EAC3D,MAAMG,YAAY,GAAGP,KAAK,CAACO,YAAY,IAAIP,KAAK,CAACI,OAAO,IAAI,CAAC;EAC7D,MAAM,CAACI,UAAU,EAAEC,aAAa,CAAC,GAAGrB,QAAQ,CAAC;IAAEsB,CAAC,EAAE,CAAC;IAAEC,CAAC,EAAE;EAAE,CAAC,CAAC;EAE5D,oBACEnB,KAAA,CAACP,IAAI;IACHe,KAAK,EAAE;MACLG,UAAU,EAAEA,UAAU;MACtBE,aAAa,EAAEA,aAAa;MAC5BE,YAAY,EAAEA,YAAY;MAC1BD,WAAW,EAAEA,WAAW;MACxBM,eAAe,EAAEZ,KAAK,CAACY,eAAe,IAAI;IAC5C,CAAE;IACFC,GAAG,EAAGC,IAAI,IAAK;MACbA,IAAI,EAAEC,eAAe,CAAC,CAACC,EAAE,EAAEC,EAAE,KAAK;QAChCR,aAAa,CAAES,IAAI,IAAK;UACtB,IAAIA,IAAI,CAACR,CAAC,KAAKM,EAAE,IAAIE,IAAI,CAACP,CAAC,KAAKM,EAAE,EAAE;YAClC,OAAOC,IAAI;UACb;UACA,OAAO;YAAER,CAAC,EAAEM,EAAE;YAAEL,CAAC,EAAEM;UAAG,CAAC;QACzB,CAAC,CAAC;MACJ,CAAC,CAAC;IACJ,CAAE;IAAAE,QAAA,GAEDlB,UAAU,iBACTX,IAAA,CAACL,IAAI;MACHe,KAAK,EAAE;QACLoB,QAAQ,EAAE,UAAU;QACpBC,GAAG,EAAElB,UAAU,GAAGR,MAAM,GAAGC,WAAW;QACtC0B,IAAI,EAAEhB,WAAW,GAAGX,MAAM,GAAGC,WAAW;QACxC2B,KAAK,EAAE3B,WAAW,GAAG,CAAC;QACtB4B,MAAM,EAAE5B,WAAW,GAAG,CAAC;QACvB6B,YAAY,EAAE7B,WAAW;QACzB8B,cAAc,EAAE,QAAQ;QACxBC,UAAU,EAAE,QAAQ;QACpBf,eAAe,EAAEZ,KAAK,CAAC4B,UAAU,IAAI;MACvC,CAAE;MAAAT,QAAA,EAEDlB;IAAU,CACP,CACP,eACDX,IAAA,CAACP,MAAM;MACLiB,KAAK,EAAE;QACLuB,KAAK,EAAE5B,MAAM,GAAG,CAAC;QACjB6B,MAAM,EAAE7B,MAAM,GAAG,CAAC;QAClBiB,eAAe,EAAEZ,KAAK,CAACY,eAAe,IAAI;MAC5C,CAAE;MACFiB,YAAY,EAAGC,KAAK,IAClB/B,YAAY,CAAC+B,KAAK,CAACC,WAAW,CAACC,SAAS,EAAEF,KAAK,CAACC,WAAW,CAACE,SAAS,CACtE;MAAAd,QAAA,EAEAtB,KAAK,CAACqC,GAAG,CAAC,CAAC;QAAEC,IAAI;QAAEC;MAAM,CAAC,EAAEC,KAAK,kBAChC/C,IAAA,CAACN,IAAI;QAAamD,IAAI,EAAEA,IAAK;QAACC,KAAK,EAAEA,KAAM;QAACE,MAAM,EAAE;UAAEf,KAAK,EAAE;QAAE;MAAE,GAAtDc,KAAwD,CACpE;IAAC,CACI,CAAC,EACRvC,SAAS,iBACRR,IAAA,CAACH,KAAK;MACJW,SAAS,EAAE;QACTY,CAAC,EAAEZ,SAAS,CAACyC,OAAO;QACpB5B,CAAC,EAAEb,SAAS,CAAC0C,OAAO;QACpBC,IAAI,EAAE3C,SAAS,CAAC2C;MAClB,CAAE;MACFC,UAAU,EAAE/C,MAAM,GAAG,CAAE;MACvBgD,WAAW,EAAEhD,MAAM,GAAG,CAAE;MACxBI,YAAY,EAAEA,CAACW,CAAC,EAAEC,CAAC,KAAKZ,YAAY,CAACW,CAAC,GAAGJ,WAAW,EAAEK,CAAC,GAAGR,UAAU,CAAE;MACtEK,UAAU,EAAEA,UAAW;MACvBN,UAAU,EAAEA;IAAW,CACxB,CACF;EAAA,CACG,CAAC;AAEX;AAEA,eAAeT,QAAQ","ignoreList":[]}
+{"version":3,"names":["Canvas","Path","View","usePieChart","Popup","useState","jsx","_jsx","jsxs","_jsxs","PieChart","popupStyle","centerSkiaView","centerView","props","radius","width","height","cx","cy","innerRadius","paths","popupData","touchHandler","style","paddingTop","padding","paddingBottom","paddingLeft","paddingRight","viewOffset","setViewOffset","x","y","backgroundColor","ref","view","measureInWindow","fx","fy","prev","children","position","top","left","borderRadius","justifyContent","alignItems","innerColor","onTouchStart","event","nativeEvent","locationX","locationY","map","path","color","index","centerX","centerY","data","totalWidth","totalHeight"],"sourceRoot":"../../../../src","sources":["skia/PieChart/PieChart.tsx"],"mappings":";;AAAA,SAASA,MAAM,EAAEC,IAAI,QAAQ,4BAA4B;AAEzD,SAASC,IAAI,QAAQ,cAAc;AACnC,SAASC,WAAW,QAAQ,kBAAe;AAC3C,OAAOC,KAAK,MAA2B,aAAU;AACjD,SAASC,QAAQ,QAAQ,OAAO;AAAC,SAAAC,GAAA,IAAAC,IAAA,EAAAC,IAAA,IAAAC,KAAA;AAgCjC,SAASC,QAAQA,CAAC;EAAEC,UAAU;EAAEC,cAAc;EAAEC,UAAU;EAAE,GAAGC;AAAqB,CAAC,EAAE;EACrF,MAAM;IAAEC,MAAM;IAAEC,KAAK;IAAEC,MAAM;IAAEC,EAAE;IAAEC,EAAE;IAAEC,WAAW;IAAEC,KAAK;IAAEC,SAAS;IAAEC;EAAa,CAAC,GAClFpB,WAAW,CAACW,KAAK,CAAC;EAEpB,MAAM;IAAEU;EAAM,CAAC,GAAGV,KAAK;EACvB,MAAMW,UAAU,GAAGD,KAAK,CAACC,UAAU,IAAID,KAAK,CAACE,OAAO,IAAI,CAAC;EACzD,MAAMC,aAAa,GAAGH,KAAK,CAACG,aAAa,IAAIH,KAAK,CAACE,OAAO,IAAI,CAAC;EAC/D,MAAME,WAAW,GAAGJ,KAAK,CAACI,WAAW,IAAIJ,KAAK,CAACE,OAAO,IAAI,CAAC;EAC3D,MAAMG,YAAY,GAAGL,KAAK,CAACK,YAAY,IAAIL,KAAK,CAACE,OAAO,IAAI,CAAC;EAC7D,MAAM,CAACI,UAAU,EAAEC,aAAa,CAAC,GAAG1B,QAAQ,CAAC;IAAE2B,CAAC,EAAE,CAAC;IAAEC,CAAC,EAAE;EAAE,CAAC,CAAC;EAE5D,oBACExB,KAAA,CAACP,IAAI;IACHsB,KAAK,EAAE;MACLC,UAAU,EAAEA,UAAU;MACtBE,aAAa,EAAEA,aAAa;MAC5BE,YAAY,EAAEA,YAAY;MAC1BD,WAAW,EAAEA,WAAW;MACxBM,eAAe,EAAEV,KAAK,CAACU,eAAe,IAAI;IAC5C,CAAE;IACFC,GAAG,EAAGC,IAAI,IAAK;MACbA,IAAI,EAAEC,eAAe,CAAC,CAACC,EAAE,EAAEC,EAAE,KAAK;QAChCR,aAAa,CAAES,IAAI,IAAK;UACtB,IAAIA,IAAI,CAACR,CAAC,KAAKM,EAAE,IAAIE,IAAI,CAACP,CAAC,KAAKM,EAAE,EAAE;YAClC,OAAOC,IAAI;UACb;UACA,OAAO;YAAER,CAAC,EAAEM,EAAE;YAAEL,CAAC,EAAEM;UAAG,CAAC;QACzB,CAAC,CAAC;MACJ,CAAC,CAAC;IACJ,CAAE;IAAAE,QAAA,GAED5B,UAAU,iBACTN,IAAA,CAACL,IAAI;MACHsB,KAAK,EAAE;QACLkB,QAAQ,EAAE,UAAU;QACpBC,GAAG,EAAElB,UAAU,GAAGP,EAAE,GAAGE,WAAW;QAClCwB,IAAI,EAAEhB,WAAW,GAAGT,EAAE,GAAGC,WAAW;QACpCJ,KAAK,EAAEI,WAAW,GAAG,CAAC;QACtBH,MAAM,EAAEG,WAAW,GAAG,CAAC;QACvByB,YAAY,EAAEzB,WAAW;QACzB0B,cAAc,EAAE,QAAQ;QACxBC,UAAU,EAAE,QAAQ;QACpBb,eAAe,EAAEV,KAAK,CAACwB,UAAU,IAAI;MACvC,CAAE;MAAAP,QAAA,EAED5B;IAAU,CACP,CACP,eACDJ,KAAA,CAACT,MAAM;MACLwB,KAAK,EAAE;QACLR,KAAK;QACLC,MAAM;QACNiB,eAAe,EAAEV,KAAK,CAACU,eAAe,IAAI;MAC5C,CAAE;MACFe,YAAY,EAAGC,KAAK,IAClB3B,YAAY,CAAC2B,KAAK,CAACC,WAAW,CAACC,SAAS,EAAEF,KAAK,CAACC,WAAW,CAACE,SAAS,CACtE;MAAAZ,QAAA,GAEApB,KAAK,CAACiC,GAAG,CAAC,CAAC;QAAEC,IAAI;QAAEC;MAAM,CAAC,EAAEC,KAAK,kBAChClD,IAAA,CAACN,IAAI;QAAasD,IAAI,EAAEA,IAAK;QAACC,KAAK,EAAEA;MAAM,GAAhCC,KAAkC,CAC9C,CAAC,EACD7C,cAAc,IAAIA,cAAc,CAACM,EAAE,EAAEC,EAAE,EAAEC,WAAW,CAAC;IAAA,CAChD,CAAC,EACRE,SAAS,iBACRf,IAAA,CAACH,KAAK;MACJkB,SAAS,EAAE;QACTU,CAAC,EAAEV,SAAS,CAACoC,OAAO;QACpBzB,CAAC,EAAEX,SAAS,CAACqC,OAAO;QACpBC,IAAI,EAAEtC,SAAS,CAACsC;MAClB,CAAE;MACFC,UAAU,EAAE7C,KAAM;MAClB8C,WAAW,EAAE7C,MAAO;MACpBM,YAAY,EAAEA,CAACS,CAAC,EAAEC,CAAC,KAAKV,YAAY,CAACS,CAAC,GAAGJ,WAAW,EAAEK,CAAC,GAAGR,UAAU,CAAE;MACtEK,UAAU,EAAEA,UAAW;MACvBnB,UAAU,EAAEA;IAAW,CACxB,CACF;EAAA,CACG,CAAC;AAEX;AAEA,eAAeD,QAAQ","ignoreList":[]}