ar-design 0.1.81 → 0.1.83

package/dist/components/data-display/table/index.js

@@ -19,7 +19,7 @@ const Table = function ({ children, title, description, data, columns, actions,
     // states
     const [selectAll, setSelectAll] = useState(false);
     const [selectionItems, setSelectionItems] = useState([]);
-    const [searchedTexts, setSearchedTexts] = useState([]);
+    const [searchedText, setSearchedText] = useState(undefined);
     const [_searchedParams, setSearchedParams] = useState(undefined);
     const [currentPage, setCurrentPage] = useState(1);
     if (config && Object.keys(config.scroll || {}).length > 0) {
@@ -94,23 +94,21 @@ const Table = function ({ children, title, description, data, columns, actions,
         });
     };
     // Derinlemesine arama yapmak için özyinelemeli bir fonksiyon tanımlayalım.
-    const deepSearch = (key, value, searchedTexts) => {
-        if (value === null || value === undefined)
+    const deepSearch = (item, searchedText) => {
+        if (!searchedText)
             return false;
-        if (searchedTexts.length === 0)
-            return true;
         // Eğer değer bir sayı veya string ise, aranan metinle eşleşip eşleşmediğini kontrol ediyoruz.
-        if (typeof value === "number" || typeof value === "string") {
-            return searchedTexts.some((searchedText) => searchedText.key === key &&
-                searchedText.value.length > 0 &&
-                value.toString().toLowerCase().includes(searchedText.value.toLowerCase()));
-        }
-        // Eğer değer bir nesne veya dizi ise, içindeki her bir değeri yine deepSearch fonksiyonuyla kontrol ediyoruz.
-        if (typeof value === "object") {
-            return Object.values(value).some((innerValue) => deepSearch(key, innerValue, searchedTexts));
-        }
-        // Diğer türlerdeki değerleri atla.
-        return false;
+        return Object.entries(searchedText).every(([key, value]) => {
+            const _itemValue = item[key];
+            if (typeof _itemValue === "number" || typeof _itemValue === "string") {
+                return _itemValue.toString().toLowerCase().includes(value.toLowerCase());
+            }
+            if (typeof _itemValue === "object") {
+                deepSearch(_itemValue, searchedText);
+            }
+            // Diğer türlerdeki değerleri atla.
+            return false;
+        });
     };
     const getData = useCallback(() => {
         let _data = [...data];
@@ -120,13 +118,10 @@ const Table = function ({ children, title, description, data, columns, actions,
             const indexOfFirstRow = indexOfLastRow - pagination.perPage;
             _data = data.slice(indexOfFirstRow, indexOfLastRow);
         }
-        return Object.keys(searchedTexts).length > 0
-            ? _data.filter((item) => {
-                // `some` kullanarak herhangi bir girişin arama koşulunu karşılayıp karşılamadığını kontrol ediyoruz.
-                return Object.entries(item).some(([_key, _value]) => deepSearch(_key, _value, searchedTexts));
-            })
-            : _data;
-    }, [data, searchedTexts, currentPage]);
+        if (searchedText)
+            _data = _data.filter((item) => deepSearch(item, searchedText));
+        return _data;
+    }, [data, searchedText, currentPage]);
     // useEffects
     useEffect(() => {
         handleOnScroll();
@@ -157,7 +152,7 @@ const Table = function ({ children, title, description, data, columns, actions,
         setSelectAll(allChecked);
     }, [currentPage]);
     return (React.createElement("div", { ref: _tableWrapper, className: _tableClassName.map((c) => c).join(" ") },
-        (title || description || actions) && (React.createElement("div", { className: "header" },
+        (title || description || actions || React.Children.count(children) > 0) && (React.createElement("div", { className: "header" },
             React.createElement("div", { className: "title" },
                 React.createElement("h3", null, title),
                 React.createElement("h5", null, description)),
@@ -215,7 +210,7 @@ const Table = function ({ children, title, description, data, columns, actions,
                                 }), ...(c.config?.sticky && {
                                     "data-sticky-position": c.config.sticky,
                                 }) },
-                                React.createElement("input", { name: String(c.key), className: "search-input", onChange: (event) => {
+                                React.createElement("input", { name: typeof c.key !== "object" ? String(c.key) : String(c.key.field), className: "search-input", onChange: (event) => {
                                         if (config.isServerSide) {
                                             if (_searchTimeOut.current)
                                                 clearTimeout(_searchTimeOut.current);
@@ -225,19 +220,7 @@ const Table = function ({ children, title, description, data, columns, actions,
                                             }, 750);
                                         }
                                         else {
-                                            // Bileşen bazlı arama işlemi.
-                                            setSearchedTexts((prev) => {
-                                                const updated = prev.some((item) => item.key === c.key);
-                                                if (updated) {
-                                                    if (event.target.value.toLowerCase() === "") {
-                                                        return prev.filter((item) => item.key !== c.key);
-                                                    }
-                                                    return prev.map((item) => item.key === c.key ? { ...item, value: event.target.value.toLowerCase() } : item);
-                                                }
-                                                else {
-                                                    return [...prev, { key: c.key, value: event.target.value.toLowerCase() }];
-                                                }
-                                            });
+                                            setSearchedText((prev) => ({ ...prev, [event.target.name]: event.target.value }));
                                         }
                                     } })));
                         })))),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ar-design",
-  "version": "0.1.81",
+  "version": "0.1.83",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
   "types": "./dist/index.d.ts",