@oliasoft-open-source/charts-library 3.7.4 → 3.7.6

package/dist/index.js

@@ -22743,8 +22743,7 @@ const LineOptions = ({
   onToggleLine,
   onTogglePoints,
   pointsEnabled,
-  translations,
-  hasCustomOpt
+  translations
 }) => {
   const options = [
     {
@@ -22774,26 +22773,17 @@ const LineOptions = ({
     }
   ];
   const selectedOption = options.find((option) => option.selected);
-  return /* @__PURE__ */ jsx(
-    Tooltip$2,
+  return /* @__PURE__ */ jsx(Tooltip$2, { text: selectedOption == null ? void 0 : selectedOption.label, placement: "bottom", children: /* @__PURE__ */ jsx(
+    Button,
     {
-      text: selectedOption == null ? void 0 : selectedOption.label,
-      placement: "bottom",
-      enabled: !hasCustomOpt,
-      children: /* @__PURE__ */ jsx(
-        Button,
-        {
-          small: true,
-          basic: true,
-          colored: "muted",
-          round: true,
-          icon: selectedOption == null ? void 0 : selectedOption.icon,
-          onClick: selectedOption == null ? void 0 : selectedOption.onClick,
-          disabled: hasCustomOpt
-        }
-      )
+      small: true,
+      basic: true,
+      colored: "muted",
+      round: true,
+      icon: selectedOption == null ? void 0 : selectedOption.icon,
+      onClick: selectedOption == null ? void 0 : selectedOption.onClick
     }
-  );
+  ) });
 };
 function TbHandStop(props) {
   return GenIcon({ "tag": "svg", "attr": { "viewBox": "0 0 24 24", "strokeWidth": "2", "stroke": "currentColor", "fill": "none", "strokeLinecap": "round", "strokeLinejoin": "round" }, "child": [{ "tag": "path", "attr": { "stroke": "none", "d": "M0 0h24v24H0z", "fill": "none" } }, { "tag": "path", "attr": { "d": "M8 13v-7.5a1.5 1.5 0 0 1 3 0v6.5" } }, { "tag": "path", "attr": { "d": "M11 5.5v-2a1.5 1.5 0 1 1 3 0v8.5" } }, { "tag": "path", "attr": { "d": "M14 5.5a1.5 1.5 0 0 1 3 0v6.5" } }, { "tag": "path", "attr": { "d": "M17 7.5a1.5 1.5 0 0 1 3 0v8.5a6 6 0 0 1 -6 6h-2h.208a6 6 0 0 1 -5.012 -2.7a69.74 69.74 0 0 1 -.196 -.3c-.312 -.479 -1.407 -2.388 -3.286 -5.728a1.5 1.5 0 0 1 .536 -2.022a1.867 1.867 0 0 1 2.28 .28l1.47 1.47" } }] })(props);
@@ -24311,27 +24301,6 @@ const ControlsPortal = ({
   }
   return children;
 };
-const checkCustomOption = (data, customOptions) => {
-  if (isEmpty(data) || isEmpty(customOptions))
-    return false;
-  const checkOption = (dataset) => {
-    if (typeof customOptions === "string") {
-      return has(dataset, customOptions);
-    } else if (isArray$2(customOptions)) {
-      return some(customOptions, (option) => has(dataset, option));
-    } else {
-      return some(
-        Object.values(customOptions),
-        (option) => has(dataset, option)
-      );
-    }
-  };
-  if (isArray$2(data)) {
-    return some(data, (dataset) => checkOption(dataset));
-  } else {
-    return checkOption(data);
-  }
-};
 const Controls = ({
   headerComponent,
   subheaderComponent,
@@ -24370,7 +24339,6 @@ const Controls = ({
     dispatch,
     generatedDatasets
   });
-  const hasCustomOpt = checkCustomOption(generatedDatasets, "hasCustomOpt");
   return /* @__PURE__ */ jsxs(Fragment, { children: [
     /* @__PURE__ */ jsxs("div", { className: styles$3.controls, children: [
       !!options.title && /* @__PURE__ */ jsx(Text, { bold: true, children: options.title }),
@@ -24396,8 +24364,7 @@ const Controls = ({
               pointsEnabled,
               onToggleLine,
               onTogglePoints,
-              translations,
-              hasCustomOpt
+              translations
             }
           ),
           /* @__PURE__ */ jsx(
@@ -25098,6 +25065,27 @@ const INIT_KEYS = {
 };
 const LOWER_BOUND = 1e-4;
 const UPPER_BOUND = 1e7;
+const checkCustomOption = (data, customOptions) => {
+  if (isEmpty(data) || isEmpty(customOptions))
+    return false;
+  const checkOption = (dataset) => {
+    if (typeof customOptions === "string") {
+      return has(dataset, customOptions);
+    } else if (isArray$2(customOptions)) {
+      return some(customOptions, (option) => has(dataset, option));
+    } else {
+      return some(
+        Object.values(customOptions),
+        (option) => has(dataset, option)
+      );
+    }
+  };
+  if (isArray$2(data)) {
+    return some(data, (dataset) => checkOption(dataset));
+  } else {
+    return checkOption(data);
+  }
+};
 var CUSTOM_OPTION = /* @__PURE__ */ ((CUSTOM_OPTION2) => {
   CUSTOM_OPTION2["showLine"] = "showLine";
   CUSTOM_OPTION2["showPoints"] = "showPoints";
@@ -25145,8 +25133,8 @@ const generateLineChartDatasets = (datasets, state, options, { label }) => {
       backgroundColor,
       pointBackgroundColor,
       borderDash,
-      showPoints = true,
-      showLine
+      showPoints: customShowPoints,
+      showLine: customShowLine
     } = line ?? {};
     const { lineEnabled, pointsEnabled, axes = [] } = state ?? {};
     const { lineTension, spanGaps } = graph ?? {};
@@ -25161,18 +25149,25 @@ const generateLineChartDatasets = (datasets, state, options, { label }) => {
         data[2].x = Math.min(axesMax, endPoint.x);
       }
     }
+    const hasCustomOpt = checkCustomOption(line, CUSTOM_OPTION);
     const filteredData = data.filter(Boolean) || [];
     const isSinglePoint = (filteredData == null ? void 0 : filteredData.length) === 1;
+    let pointState, lineState;
+    if (hasCustomOpt) {
+      pointState = customShowPoints !== void 0 ? customShowPoints : !customShowLine;
+      lineState = customShowLine !== void 0 ? customShowLine : !customShowPoints;
+    } else {
+      pointState = pointsEnabled || isSinglePoint;
+      lineState = lineEnabled;
+    }
     const linePointRadius = parseFloat(pointRadiusProp) || DEFAULT_POINT_RADIUS;
-    const pointRadius = (pointsEnabled || isSinglePoint) && showPoints ? linePointRadius : 0;
     const hoverRadius = parseFloat(pointHoverRadius) || DEFAULT_HOVER_RADIUS;
     const indexedColor = COLORS[i2];
-    const hasCustomOpt = checkCustomOption(line, CUSTOM_OPTION);
     return {
       ...line,
       label: line.label || `${label} ${i2 + 1}`,
       data: filteredData,
-      showLine: showLine ?? lineEnabled,
+      showLine: lineState,
       lineTension,
       spanGaps,
       borderWidth: parseFloat(borderWidth) || DEFAULT_BORDER_WIDTH,
@@ -25181,7 +25176,7 @@ const generateLineChartDatasets = (datasets, state, options, { label }) => {
       borderColor: borderColor ?? indexedColor ?? generateRandomColor(COLORS),
       backgroundColor: backgroundColor ?? DEFAULT_BACKGROUND_COLOR,
       pointBackgroundColor: pointBackgroundColor ?? indexedColor ?? generateRandomColor(COLORS),
-      pointRadius,
+      pointRadius: pointState ? linePointRadius : 0,
       pointHoverRadius: hoverRadius,
       pointHitRadius: line.pointHitRadius ?? hoverRadius,
       ...hasCustomOpt ? { hasCustomOpt } : {}