@etsoo/react 1.4.28 → 1.4.29

package/lib/mu/SearchBar.js

@@ -65,15 +65,13 @@ export function SearchBar(props) {
     // Drawer open / close
     const [open, updateOpen] = React.useState(false);
     // State
-    const state = React.useRef({}).current;
+    const state = React.useRef({ hasMore: true }).current;
     const lastMaxWidth = (_a = state.lastMaxWidth) !== null && _a !== void 0 ? _a : 9999;
     // Watch container
     const { dimensions } = useDimensions(1, (target, rect) => {
         // Same logic from resetButtonRef
         if (rect.width === lastMaxWidth ||
-            (index != null &&
-                index >= fields.length &&
-                rect.width > lastMaxWidth))
+            (!state.hasMore && rect.width > lastMaxWidth))
             return false;
         // Len
         const len = target.children.length;
@@ -102,7 +100,7 @@ export function SearchBar(props) {
         // Container width
         let maxWidth = containerRect.width;
         if (maxWidth === lastMaxWidth ||
-            (index != null && index >= fields.length && maxWidth > lastMaxWidth)) {
+            (!state.hasMore && maxWidth > lastMaxWidth)) {
             return;
         }
         state.lastMaxWidth = maxWidth;
@@ -164,6 +162,7 @@ export function SearchBar(props) {
             }
         }
         // Show or hide more button
+        state.hasMore = hasMore;
         setElementVisible(buttonMore, hasMore);
         setElementVisible(resetButton, true);
         // Update menu start index

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/react",
-    "version": "1.4.28",
+    "version": "1.4.29",
     "description": "TypeScript ReactJs framework",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",

package/src/mu/SearchBar.tsx

@@ -105,7 +105,8 @@ export function SearchBar(props: SearchBarProps) {
         moreForm?: HTMLFormElement;
         submitSeed?: number;
         lastMaxWidth?: number;
-    }>({}).current;
+        hasMore: boolean;
+    }>({ hasMore: true }).current;
     const lastMaxWidth = state.lastMaxWidth ?? 9999;
 
     // Watch container
@@ -113,9 +114,7 @@ export function SearchBar(props: SearchBarProps) {
         // Same logic from resetButtonRef
         if (
             rect.width === lastMaxWidth ||
-            (index != null &&
-                index >= fields.length &&
-                rect.width > lastMaxWidth)
+            (!state.hasMore && rect.width > lastMaxWidth)
         )
             return false;
 
@@ -152,7 +151,7 @@ export function SearchBar(props: SearchBarProps) {
         let maxWidth = containerRect.width;
         if (
             maxWidth === lastMaxWidth ||
-            (index != null && index >= fields.length && maxWidth > lastMaxWidth)
+            (!state.hasMore && maxWidth > lastMaxWidth)
         ) {
             return;
         }
@@ -230,6 +229,7 @@ export function SearchBar(props: SearchBarProps) {
         }
 
         // Show or hide more button
+        state.hasMore = hasMore;
         setElementVisible(buttonMore, hasMore);
         setElementVisible(resetButton, true);