pixel-react-excel-sheet 1.0.2 → 1.0.3

package/lib/index.js

@@ -47734,6 +47734,19 @@ function applyUnderlineToCells(currentData, selectedRange) {
   }
   return updatedData;
 }
+function isValidHexColor(color) {
+  if (color.length !== 6) {
+    return false;
+  }
+  const hexChars = '0123456789ABCDEFabcdef';
+  for (let i = 1; i < color.length; i++) {
+    console.log(typeof color[i]);
+    if (!hexChars.includes(color[i])) {
+      return false;
+    }
+  }
+  return true;
+}
 function applyColorToCells(currentData, selectedRange, color) {
   if (!selectedRange) {
     return currentData;
@@ -47743,8 +47756,8 @@ function applyColorToCells(currentData, selectedRange, color) {
     end
   } = selectedRange;
   let updatedData = currentData;
-  const isHexColor = color => /^#[0-9A-Fa-f]{6}$/i.test(color);
-  const applyColor = isHexColor(color) ? `#${color}` : color;
+  const isHex = isValidHexColor(color);
+  const applyColor = isHex ? `#${color}` : color;
   for (let row = start.row; row <= end.row; row++) {
     for (let col = start.column; col <= end.column; col++) {
       const currentCell = get({
@@ -47776,6 +47789,8 @@ function applyBackgroundColorToCells(currentData, selectedRange, backgroundColor
       end
     } = selectedRange;
     let updatedData = currentData;
+    const isHex = isValidHexColor(backgroundColor);
+    const applyColor = isHex ? `#${backgroundColor}` : backgroundColor;
     for (let row = start.row; row <= end.row; row++) {
       for (let col = start.column; col <= end.column; col++) {
         const currentCell = get({
@@ -47785,12 +47800,11 @@ function applyBackgroundColorToCells(currentData, selectedRange, backgroundColor
         if (!currentCell) {
           continue;
         }
-        let HexCode = backgroundColor.length === 6;
         const updatedCell = {
           ...currentCell,
           style: {
             ...currentCell.style,
-            backgroundColor: HexCode ? `#${backgroundColor}` : backgroundColor
+            backgroundColor: applyColor
           }
         };
         updatedData = set({
@@ -49663,7 +49677,7 @@ const ExcelToolBar = ({
   const getTextColor = color => {
     setColorPicker(prev => ({
       ...prev,
-      color
+      color: color
     }));
   };
   const getBackgroundColor = color => {
@@ -49674,6 +49688,7 @@ const ExcelToolBar = ({
   };
   React.useEffect(() => {
     let timeGap = setTimeout(() => {
+      console.log(colorContainer.color);
       setColor(data, colorContainer.color);
     }, 0);
     return () => {