@pro6pp/infer-react 0.0.2-beta.15 → 0.0.2-beta.17

package/README.md

@@ -45,7 +45,7 @@ You can customize the appearance of the component via the following props:
 | `debounceMs`           | Delay in ms before API search. Defaults to `150` (min `50`).                              |
 | `maxRetries`           | Maximum retry attempts for transient network errors. Valid range: `0` to `10`.            |
 | `showClearButton`      | If `true`, displays a button to empty the input field. Defaults to `true`.                |
-| `loadMoreText`         | The text to display on the pagination button.                                             |
+| `loadingText`          | The text displayed at the bottom of the list when fetching more results.                  |
 
 ---
 

package/dist/index.cjs

@@ -38,6 +38,100 @@ __export(index_exports, {
 module.exports = __toCommonJS(index_exports);
 var import_react = __toESM(require("react"), 1);
 
+// ../core/src/label-formatter.ts
+function normalize(str) {
+  return str.toLowerCase().trim();
+}
+function escapeRegex(str) {
+  return str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+function findWordPosition(query, value) {
+  const normalizedQuery = normalize(query);
+  const normalizedValue = normalize(value);
+  if (normalizedValue.includes(" ")) {
+    return normalizedQuery.indexOf(normalizedValue);
+  }
+  const pattern = new RegExp(`(?:^|[,\\s])${escapeRegex(normalizedValue)}(?:$|[,\\s])`, "g");
+  const match = pattern.exec(normalizedQuery);
+  if (match) {
+    const matchStart = match.index;
+    const firstChar = normalizedQuery[matchStart];
+    if (firstChar === "," || firstChar === " ") {
+      return matchStart + 1;
+    }
+    return matchStart;
+  }
+  return -1;
+}
+function detectComponentOrder(query, value) {
+  const detected = [];
+  const componentMap = [];
+  if (value.street) {
+    componentMap.push({ value: value.street, type: "street" });
+  }
+  if (value.city) {
+    componentMap.push({ value: value.city, type: "city" });
+  }
+  if (value.postcode) {
+    componentMap.push({ value: value.postcode, type: "postcode" });
+  }
+  if (value.street_number !== void 0 && value.street_number !== null) {
+    componentMap.push({ value: String(value.street_number), type: "street_number" });
+  }
+  if (value.addition) {
+    componentMap.push({ value: value.addition, type: "addition" });
+  }
+  for (const comp of componentMap) {
+    const position = findWordPosition(query, comp.value);
+    if (position !== -1) {
+      detected.push({
+        type: comp.type,
+        value: comp.value,
+        position
+      });
+    }
+  }
+  detected.sort((a, b) => a.position - b.position);
+  return detected;
+}
+function formatLabelByInputOrder(query, value) {
+  if (!value || !query) {
+    return "";
+  }
+  const detectedOrder = detectComponentOrder(query, value);
+  const detectedTypes = new Set(detectedOrder.map((d) => d.type));
+  const parts = [];
+  for (const detected of detectedOrder) {
+    parts.push(detected.value);
+  }
+  const defaultOrder = ["street", "street_number", "addition", "postcode", "city"];
+  for (const type of defaultOrder) {
+    if (detectedTypes.has(type)) continue;
+    let val;
+    switch (type) {
+      case "street":
+        val = value.street;
+        break;
+      case "city":
+        val = value.city;
+        break;
+      case "street_number":
+        val = value.street_number !== void 0 ? String(value.street_number) : void 0;
+        break;
+      case "postcode":
+        val = value.postcode;
+        break;
+      case "addition":
+        val = value.addition;
+        break;
+    }
+    if (val) {
+      parts.push(val);
+    }
+  }
+  return parts.join(", ");
+}
+
 // ../core/src/core.ts
 var DEFAULTS = {
   API_URL: "https://api.pro6pp.nl/v2",
@@ -203,10 +297,11 @@ var InferCore = class {
     if (this.state.stage === "final" || isFullResult) {
       let finalQuery = label;
       if (valueObj && Object.keys(valueObj).length > 0) {
-        const { street, street_number, city, addition } = valueObj;
+        const { street, street_number, postcode, city, addition } = valueObj;
         if (street && street_number && city) {
           const suffix = addition ? ` ${addition}` : "";
-          finalQuery = `${street} ${street_number}${suffix}, ${city}`;
+          const postcodeStr = postcode ? `${postcode}, ` : "";
+          finalQuery = `${street} ${street_number}${suffix}, ${postcodeStr}${city}`;
         }
       }
       this.finishSelection(finalQuery, valueObj);
@@ -348,7 +443,8 @@ var InferCore = class {
       const key = `${item.label}|${item.subtitle || ""}|${JSON.stringify(item.value || {})}`;
       if (!seen.has(key)) {
         seen.add(key);
-        uniqueSuggestions.push(item);
+        const reformattedItem = this.reformatSuggestionLabel(item);
+        uniqueSuggestions.push(reformattedItem);
       }
     }
     const totalCount = uniqueSuggestions.length + (data.cities?.length || 0) + (data.streets?.length || 0);
@@ -372,6 +468,25 @@ var InferCore = class {
       this.selectItem(uniqueSuggestions[0]);
     }
   }
+  /**
+   * Reformats a suggestion's label based on the user's input order.
+   * If the suggestion has a structured value object, we reorder the label
+   * to match how the user typed the components.
+   */
+  reformatSuggestionLabel(item) {
+    if (!item.value || typeof item.value === "string") {
+      return item;
+    }
+    const addressValue = item.value;
+    if (!addressValue.street || !addressValue.city) {
+      return item;
+    }
+    const reformattedLabel = formatLabelByInputOrder(this.state.query, addressValue);
+    if (reformattedLabel) {
+      return { ...item, label: reformattedLabel };
+    }
+    return item;
+  }
   updateQueryAndFetch(nextQuery) {
     this.updateState({
       query: nextQuery,
@@ -421,6 +536,19 @@ var InferCore = class {
 };
 
 // ../core/src/highlight.ts
+function mergeSegments(segments) {
+  if (segments.length === 0) return segments;
+  const merged = [];
+  for (const seg of segments) {
+    const last = merged[merged.length - 1];
+    if (last && last.match === seg.match) {
+      last.text += seg.text;
+    } else {
+      merged.push({ text: seg.text, match: seg.match });
+    }
+  }
+  return merged;
+}
 function getHighlightSegments(text, query) {
   if (!query || !text) return [{ text, match: false }];
   const segments = [];
@@ -447,7 +575,7 @@ function getHighlightSegments(text, query) {
   if (!isFullMatch) {
     return [{ text, match: false }];
   }
-  return segments;
+  return mergeSegments(segments);
 }
 
 // ../core/src/default-styles.ts
@@ -524,17 +652,6 @@ var DEFAULT_STYLES = `
     background-color: #f3f4f6;
   }
 
-  .pro6pp-loader {
-    width: 20px;
-    height: 20px;
-    margin: 0 8px;
-    border: 2px solid #e0e0e0;
-    border-top-color: #6b7280;
-    border-radius: 50%;
-    animation: pro6pp-spin 0.6s linear infinite;
-    flex-shrink: 0;
-  }
-
   .pro6pp-dropdown {
     position: absolute;
     top: 100%;
@@ -594,15 +711,23 @@ var DEFAULT_STYLES = `
   }
 
   .pro6pp-item__label {
-    font-weight: 500;
+    font-weight: 400;
     flex-shrink: 1;
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
   }
 
+  .pro6pp-item__label--match {
+    font-weight: 520;
+  }
+
+  .pro6pp-item__label--unmatched {
+    font-weight: 400;
+    color: #4b5563;
+  }
+
   .pro6pp-item__subtitle {
-    font-size: 13px;
     color: #6b7280;
     flex-shrink: 0;
   }
@@ -622,18 +747,25 @@ var DEFAULT_STYLES = `
     text-align: center;
   }
 
-  .pro6pp-load-more {
-    width: 100%;
-    padding: 14px;
-    background: #f9fafb;
-    border: none;
-    border-top: 1px solid #e0e0e0;
-    color: #3b82f6;
-    font-size: 14px;
-    font-weight: 600;
-    cursor: pointer;
-    flex-shrink: 0;
-    touch-action: manipulation;
+  .pro6pp-loader-item {
+    padding: 10px 12px;
+    color: #6b7280;
+    font-size: 0.875rem;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    gap: 8px;
+    background-color: #f9fafb;
+    border-top: 1px solid #f3f4f6;
+  }
+
+  .pro6pp-mini-spinner {
+    width: 14px;
+    height: 14px;
+    border: 2px solid #e5e7eb;
+    border-top-color: #6b7280;
+    border-radius: 50%;
+    animation: pro6pp-spin 0.6s linear infinite;
   }
 
   @media (max-width: 640px) {
@@ -645,17 +777,6 @@ var DEFAULT_STYLES = `
       padding: 10px 12px;
       font-size: 14px;
     }
-    .pro6pp-item__subtitle {
-      font-size: 12px;
-    }
-    .pro6pp-load-more {
-      padding: 12px;
-      font-size: 13px;
-    }
-  }
-
-  .pro6pp-load-more:active {
-    background-color: #f3f4f6;
   }
 
   @keyframes pro6pp-spin {
@@ -667,16 +788,17 @@ var DEFAULT_STYLES = `
 var HighlightedText = ({ text, query }) => {
   const segments = (0, import_react.useMemo)(() => getHighlightSegments(text, query), [text, query]);
   return /* @__PURE__ */ import_react.default.createElement("span", { className: "pro6pp-item__label" }, segments.map(
-    (seg, i) => seg.match ? /* @__PURE__ */ import_react.default.createElement("strong", { key: i, className: "pro6pp-item__label--match" }, seg.text) : seg.text
+    (seg, i) => seg.match ? /* @__PURE__ */ import_react.default.createElement("span", { key: i, className: "pro6pp-item__label--match" }, seg.text) : /* @__PURE__ */ import_react.default.createElement("span", { key: i, className: "pro6pp-item__label--unmatched" }, seg.text)
   ));
 };
 function useInfer(config) {
   const [state, setState] = (0, import_react.useState)(() => {
     if (config.initialValue) {
+      const postcodeStr = config.initialValue.postcode ? `${config.initialValue.postcode}, ` : "";
       return {
         ...INITIAL_STATE,
         value: config.initialValue,
-        query: `${config.initialValue.street} ${config.initialValue.street_number}, ${config.initialValue.city}`,
+        query: `${config.initialValue.street} ${config.initialValue.street_number}, ${postcodeStr}${config.initialValue.city}`,
         isValid: true,
         stage: "final"
       };
@@ -706,7 +828,8 @@ function useInfer(config) {
     });
     if (config.initialValue) {
       const address = config.initialValue;
-      const label = `${address.street} ${address.street_number}, ${address.city}`;
+      const postcodeStr = address.postcode ? `${address.postcode}, ` : "";
+      const label = `${address.street} ${address.street_number}, ${postcodeStr}${address.city}`;
       instance.selectItem({ label, value: address });
     }
     return instance;
@@ -722,7 +845,8 @@ function useInfer(config) {
   ]);
   const setValue = (address) => {
     if (!address) return;
-    const label = `${address.street} ${address.street_number}, ${address.city}`;
+    const postcodeStr = address.postcode ? `${address.postcode}, ` : "";
+    const label = `${address.street} ${address.street_number}, ${postcodeStr}${address.city}`;
     core.selectItem({ label, value: address });
   };
   return {
@@ -753,7 +877,7 @@ var Pro6PPInfer = (0, import_react.forwardRef)(
     renderItem,
     disableDefaultStyles = false,
     noResultsText = "No results found",
-    loadMoreText = "Show more results...",
+    loadingText = "Loading more...",
     renderNoResults,
     showClearButton = true,
     ...config
@@ -762,6 +886,7 @@ var Pro6PPInfer = (0, import_react.forwardRef)(
     const [isOpen, setIsOpen] = (0, import_react.useState)(false);
     const internalInputRef = (0, import_react.useRef)(null);
     const wrapperRef = (0, import_react.useRef)(null);
+    const observerTarget = (0, import_react.useRef)(null);
     (0, import_react.useImperativeHandle)(ref, () => internalInputRef.current);
     (0, import_react.useEffect)(() => {
       if (disableDefaultStyles) return;
@@ -782,6 +907,22 @@ var Pro6PPInfer = (0, import_react.forwardRef)(
       document.addEventListener("mousedown", handleClickOutside);
       return () => document.removeEventListener("mousedown", handleClickOutside);
     }, []);
+    (0, import_react.useEffect)(() => {
+      const currentTarget = observerTarget.current;
+      if (!currentTarget) return;
+      const observer = new IntersectionObserver(
+        (entries) => {
+          if (entries[0].isIntersecting && state.hasMore && !state.isLoading) {
+            loadMore();
+          }
+        },
+        { threshold: 0.1 }
+      );
+      observer.observe(currentTarget);
+      return () => {
+        if (currentTarget) observer.unobserve(currentTarget);
+      };
+    }, [state.hasMore, state.isLoading, loadMore, isOpen]);
     const items = (0, import_react.useMemo)(() => {
       return [
         ...state.cities.map((c) => ({ ...c, type: "city" })),
@@ -804,6 +945,7 @@ var Pro6PPInfer = (0, import_react.forwardRef)(
     const hasResults = items.length > 0;
     const showNoResults = !state.isLoading && !state.isError && state.query.length > 0 && !hasResults && !state.isValid;
     const showDropdown = isOpen && (hasResults || state.isLoading || showNoResults);
+    const isInfiniteLoading = state.isLoading && items.length > 0;
     return /* @__PURE__ */ import_react.default.createElement("div", { ref: wrapperRef, className: `pro6pp-wrapper ${className || ""}`, style }, /* @__PURE__ */ import_react.default.createElement("div", { style: { position: "relative" } }, /* @__PURE__ */ import_react.default.createElement(
       "input",
       {
@@ -824,7 +966,7 @@ var Pro6PPInfer = (0, import_react.forwardRef)(
           inputProps?.onFocus?.(e);
         }
       }
-    ), /* @__PURE__ */ import_react.default.createElement("div", { className: "pro6pp-input-addons" }, state.isLoading && /* @__PURE__ */ import_react.default.createElement("div", { className: "pro6pp-loader" }), showClearButton && state.query.length > 0 && /* @__PURE__ */ import_react.default.createElement(
+    ), /* @__PURE__ */ import_react.default.createElement("div", { className: "pro6pp-input-addons" }, showClearButton && state.query.length > 0 && /* @__PURE__ */ import_react.default.createElement(
       "button",
       {
         type: "button",
@@ -854,7 +996,7 @@ var Pro6PPInfer = (0, import_react.forwardRef)(
         onWheel: (e) => e.stopPropagation(),
         onMouseDown: (e) => e.stopPropagation()
       },
-      /* @__PURE__ */ import_react.default.createElement("ul", { className: "pro6pp-list", role: "listbox" }, hasResults ? items.map((item, index) => {
+      /* @__PURE__ */ import_react.default.createElement("ul", { className: "pro6pp-list", role: "listbox" }, hasResults ? /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, items.map((item, index) => {
         const isActive = index === state.selectedSuggestionIndex;
         const secondaryText = item.subtitle || (item.count !== void 0 ? item.count : "");
         const showChevron = item.value === void 0 || item.value === null;
@@ -883,19 +1025,7 @@ var Pro6PPInfer = (0, import_react.forwardRef)(
             /* @__PURE__ */ import_react.default.createElement("polyline", { points: "9 18 15 12 9 6" })
           )))
         );
-      }) : state.isLoading ? /* @__PURE__ */ import_react.default.createElement("li", { className: "pro6pp-no-results" }, "Loading suggestions...") : /* @__PURE__ */ import_react.default.createElement("li", { className: "pro6pp-no-results" }, renderNoResults ? renderNoResults(state) : noResultsText)),
-      state.hasMore && /* @__PURE__ */ import_react.default.createElement(
-        "button",
-        {
-          type: "button",
-          className: "pro6pp-load-more",
-          onClick: (e) => {
-            e.preventDefault();
-            loadMore();
-          }
-        },
-        loadMoreText
-      )
+      }), state.hasMore && !state.isLoading && /* @__PURE__ */ import_react.default.createElement("li", { key: "sentinel", ref: observerTarget, style: { height: "1px", opacity: 0 } }), isInfiniteLoading && /* @__PURE__ */ import_react.default.createElement("li", { key: "loader", className: "pro6pp-loader-item" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pro6pp-mini-spinner" }), /* @__PURE__ */ import_react.default.createElement("span", null, loadingText))) : state.isLoading ? /* @__PURE__ */ import_react.default.createElement("li", { className: "pro6pp-no-results" }, "Searching...") : /* @__PURE__ */ import_react.default.createElement("li", { className: "pro6pp-no-results" }, renderNoResults ? renderNoResults(state) : noResultsText))
     ));
   }
 );

package/dist/index.d.cts

@@ -58,10 +58,10 @@ interface Pro6PPInferProps extends UseInferConfig {
      * @default 'No results found'
      */
     noResultsText?: string;
-    /** * The text to show on the load more button.
-     * @default 'Show more results...'
+    /** * The text to show on the bottom loading indicator.
+     * @default 'Loading more...'
      */
-    loadMoreText?: string;
+    loadingText?: string;
     /** A custom render function for the "no results" state. */
     renderNoResults?: (state: InferState) => React.ReactNode;
     /**

package/dist/index.d.ts

@@ -58,10 +58,10 @@ interface Pro6PPInferProps extends UseInferConfig {
      * @default 'No results found'
      */
     noResultsText?: string;
-    /** * The text to show on the load more button.
-     * @default 'Show more results...'
+    /** * The text to show on the bottom loading indicator.
+     * @default 'Loading more...'
      */
-    loadMoreText?: string;
+    loadingText?: string;
     /** A custom render function for the "no results" state. */
     renderNoResults?: (state: InferState) => React.ReactNode;
     /**

package/dist/index.js

@@ -12,6 +12,100 @@ import React, {
   useImperativeHandle
 } from "react";
 
+// ../core/src/label-formatter.ts
+function normalize(str) {
+  return str.toLowerCase().trim();
+}
+function escapeRegex(str) {
+  return str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+function findWordPosition(query, value) {
+  const normalizedQuery = normalize(query);
+  const normalizedValue = normalize(value);
+  if (normalizedValue.includes(" ")) {
+    return normalizedQuery.indexOf(normalizedValue);
+  }
+  const pattern = new RegExp(`(?:^|[,\\s])${escapeRegex(normalizedValue)}(?:$|[,\\s])`, "g");
+  const match = pattern.exec(normalizedQuery);
+  if (match) {
+    const matchStart = match.index;
+    const firstChar = normalizedQuery[matchStart];
+    if (firstChar === "," || firstChar === " ") {
+      return matchStart + 1;
+    }
+    return matchStart;
+  }
+  return -1;
+}
+function detectComponentOrder(query, value) {
+  const detected = [];
+  const componentMap = [];
+  if (value.street) {
+    componentMap.push({ value: value.street, type: "street" });
+  }
+  if (value.city) {
+    componentMap.push({ value: value.city, type: "city" });
+  }
+  if (value.postcode) {
+    componentMap.push({ value: value.postcode, type: "postcode" });
+  }
+  if (value.street_number !== void 0 && value.street_number !== null) {
+    componentMap.push({ value: String(value.street_number), type: "street_number" });
+  }
+  if (value.addition) {
+    componentMap.push({ value: value.addition, type: "addition" });
+  }
+  for (const comp of componentMap) {
+    const position = findWordPosition(query, comp.value);
+    if (position !== -1) {
+      detected.push({
+        type: comp.type,
+        value: comp.value,
+        position
+      });
+    }
+  }
+  detected.sort((a, b) => a.position - b.position);
+  return detected;
+}
+function formatLabelByInputOrder(query, value) {
+  if (!value || !query) {
+    return "";
+  }
+  const detectedOrder = detectComponentOrder(query, value);
+  const detectedTypes = new Set(detectedOrder.map((d) => d.type));
+  const parts = [];
+  for (const detected of detectedOrder) {
+    parts.push(detected.value);
+  }
+  const defaultOrder = ["street", "street_number", "addition", "postcode", "city"];
+  for (const type of defaultOrder) {
+    if (detectedTypes.has(type)) continue;
+    let val;
+    switch (type) {
+      case "street":
+        val = value.street;
+        break;
+      case "city":
+        val = value.city;
+        break;
+      case "street_number":
+        val = value.street_number !== void 0 ? String(value.street_number) : void 0;
+        break;
+      case "postcode":
+        val = value.postcode;
+        break;
+      case "addition":
+        val = value.addition;
+        break;
+    }
+    if (val) {
+      parts.push(val);
+    }
+  }
+  return parts.join(", ");
+}
+
 // ../core/src/core.ts
 var DEFAULTS = {
   API_URL: "https://api.pro6pp.nl/v2",
@@ -177,10 +271,11 @@ var InferCore = class {
     if (this.state.stage === "final" || isFullResult) {
       let finalQuery = label;
       if (valueObj && Object.keys(valueObj).length > 0) {
-        const { street, street_number, city, addition } = valueObj;
+        const { street, street_number, postcode, city, addition } = valueObj;
         if (street && street_number && city) {
           const suffix = addition ? ` ${addition}` : "";
-          finalQuery = `${street} ${street_number}${suffix}, ${city}`;
+          const postcodeStr = postcode ? `${postcode}, ` : "";
+          finalQuery = `${street} ${street_number}${suffix}, ${postcodeStr}${city}`;
         }
       }
       this.finishSelection(finalQuery, valueObj);
@@ -322,7 +417,8 @@ var InferCore = class {
       const key = `${item.label}|${item.subtitle || ""}|${JSON.stringify(item.value || {})}`;
       if (!seen.has(key)) {
         seen.add(key);
-        uniqueSuggestions.push(item);
+        const reformattedItem = this.reformatSuggestionLabel(item);
+        uniqueSuggestions.push(reformattedItem);
       }
     }
     const totalCount = uniqueSuggestions.length + (data.cities?.length || 0) + (data.streets?.length || 0);
@@ -346,6 +442,25 @@ var InferCore = class {
       this.selectItem(uniqueSuggestions[0]);
     }
   }
+  /**
+   * Reformats a suggestion's label based on the user's input order.
+   * If the suggestion has a structured value object, we reorder the label
+   * to match how the user typed the components.
+   */
+  reformatSuggestionLabel(item) {
+    if (!item.value || typeof item.value === "string") {
+      return item;
+    }
+    const addressValue = item.value;
+    if (!addressValue.street || !addressValue.city) {
+      return item;
+    }
+    const reformattedLabel = formatLabelByInputOrder(this.state.query, addressValue);
+    if (reformattedLabel) {
+      return { ...item, label: reformattedLabel };
+    }
+    return item;
+  }
   updateQueryAndFetch(nextQuery) {
     this.updateState({
       query: nextQuery,
@@ -395,6 +510,19 @@ var InferCore = class {
 };
 
 // ../core/src/highlight.ts
+function mergeSegments(segments) {
+  if (segments.length === 0) return segments;
+  const merged = [];
+  for (const seg of segments) {
+    const last = merged[merged.length - 1];
+    if (last && last.match === seg.match) {
+      last.text += seg.text;
+    } else {
+      merged.push({ text: seg.text, match: seg.match });
+    }
+  }
+  return merged;
+}
 function getHighlightSegments(text, query) {
   if (!query || !text) return [{ text, match: false }];
   const segments = [];
@@ -421,7 +549,7 @@ function getHighlightSegments(text, query) {
   if (!isFullMatch) {
     return [{ text, match: false }];
   }
-  return segments;
+  return mergeSegments(segments);
 }
 
 // ../core/src/default-styles.ts
@@ -498,17 +626,6 @@ var DEFAULT_STYLES = `
     background-color: #f3f4f6;
   }
 
-  .pro6pp-loader {
-    width: 20px;
-    height: 20px;
-    margin: 0 8px;
-    border: 2px solid #e0e0e0;
-    border-top-color: #6b7280;
-    border-radius: 50%;
-    animation: pro6pp-spin 0.6s linear infinite;
-    flex-shrink: 0;
-  }
-
   .pro6pp-dropdown {
     position: absolute;
     top: 100%;
@@ -568,15 +685,23 @@ var DEFAULT_STYLES = `
   }
 
   .pro6pp-item__label {
-    font-weight: 500;
+    font-weight: 400;
     flex-shrink: 1;
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
   }
 
+  .pro6pp-item__label--match {
+    font-weight: 520;
+  }
+
+  .pro6pp-item__label--unmatched {
+    font-weight: 400;
+    color: #4b5563;
+  }
+
   .pro6pp-item__subtitle {
-    font-size: 13px;
     color: #6b7280;
     flex-shrink: 0;
   }
@@ -596,18 +721,25 @@ var DEFAULT_STYLES = `
     text-align: center;
   }
 
-  .pro6pp-load-more {
-    width: 100%;
-    padding: 14px;
-    background: #f9fafb;
-    border: none;
-    border-top: 1px solid #e0e0e0;
-    color: #3b82f6;
-    font-size: 14px;
-    font-weight: 600;
-    cursor: pointer;
-    flex-shrink: 0;
-    touch-action: manipulation;
+  .pro6pp-loader-item {
+    padding: 10px 12px;
+    color: #6b7280;
+    font-size: 0.875rem;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    gap: 8px;
+    background-color: #f9fafb;
+    border-top: 1px solid #f3f4f6;
+  }
+
+  .pro6pp-mini-spinner {
+    width: 14px;
+    height: 14px;
+    border: 2px solid #e5e7eb;
+    border-top-color: #6b7280;
+    border-radius: 50%;
+    animation: pro6pp-spin 0.6s linear infinite;
   }
 
   @media (max-width: 640px) {
@@ -619,17 +751,6 @@ var DEFAULT_STYLES = `
       padding: 10px 12px;
       font-size: 14px;
     }
-    .pro6pp-item__subtitle {
-      font-size: 12px;
-    }
-    .pro6pp-load-more {
-      padding: 12px;
-      font-size: 13px;
-    }
-  }
-
-  .pro6pp-load-more:active {
-    background-color: #f3f4f6;
   }
 
   @keyframes pro6pp-spin {
@@ -641,16 +762,17 @@ var DEFAULT_STYLES = `
 var HighlightedText = ({ text, query }) => {
   const segments = useMemo(() => getHighlightSegments(text, query), [text, query]);
   return /* @__PURE__ */ React.createElement("span", { className: "pro6pp-item__label" }, segments.map(
-    (seg, i) => seg.match ? /* @__PURE__ */ React.createElement("strong", { key: i, className: "pro6pp-item__label--match" }, seg.text) : seg.text
+    (seg, i) => seg.match ? /* @__PURE__ */ React.createElement("span", { key: i, className: "pro6pp-item__label--match" }, seg.text) : /* @__PURE__ */ React.createElement("span", { key: i, className: "pro6pp-item__label--unmatched" }, seg.text)
   ));
 };
 function useInfer(config) {
   const [state, setState] = useState(() => {
     if (config.initialValue) {
+      const postcodeStr = config.initialValue.postcode ? `${config.initialValue.postcode}, ` : "";
       return {
         ...INITIAL_STATE,
         value: config.initialValue,
-        query: `${config.initialValue.street} ${config.initialValue.street_number}, ${config.initialValue.city}`,
+        query: `${config.initialValue.street} ${config.initialValue.street_number}, ${postcodeStr}${config.initialValue.city}`,
         isValid: true,
         stage: "final"
       };
@@ -680,7 +802,8 @@ function useInfer(config) {
     });
     if (config.initialValue) {
       const address = config.initialValue;
-      const label = `${address.street} ${address.street_number}, ${address.city}`;
+      const postcodeStr = address.postcode ? `${address.postcode}, ` : "";
+      const label = `${address.street} ${address.street_number}, ${postcodeStr}${address.city}`;
       instance.selectItem({ label, value: address });
     }
     return instance;
@@ -696,7 +819,8 @@ function useInfer(config) {
   ]);
   const setValue = (address) => {
     if (!address) return;
-    const label = `${address.street} ${address.street_number}, ${address.city}`;
+    const postcodeStr = address.postcode ? `${address.postcode}, ` : "";
+    const label = `${address.street} ${address.street_number}, ${postcodeStr}${address.city}`;
     core.selectItem({ label, value: address });
   };
   return {
@@ -727,7 +851,7 @@ var Pro6PPInfer = forwardRef(
     renderItem,
     disableDefaultStyles = false,
     noResultsText = "No results found",
-    loadMoreText = "Show more results...",
+    loadingText = "Loading more...",
     renderNoResults,
     showClearButton = true,
     ...config
@@ -736,6 +860,7 @@ var Pro6PPInfer = forwardRef(
     const [isOpen, setIsOpen] = useState(false);
     const internalInputRef = useRef(null);
     const wrapperRef = useRef(null);
+    const observerTarget = useRef(null);
     useImperativeHandle(ref, () => internalInputRef.current);
     useEffect(() => {
       if (disableDefaultStyles) return;
@@ -756,6 +881,22 @@ var Pro6PPInfer = forwardRef(
       document.addEventListener("mousedown", handleClickOutside);
       return () => document.removeEventListener("mousedown", handleClickOutside);
     }, []);
+    useEffect(() => {
+      const currentTarget = observerTarget.current;
+      if (!currentTarget) return;
+      const observer = new IntersectionObserver(
+        (entries) => {
+          if (entries[0].isIntersecting && state.hasMore && !state.isLoading) {
+            loadMore();
+          }
+        },
+        { threshold: 0.1 }
+      );
+      observer.observe(currentTarget);
+      return () => {
+        if (currentTarget) observer.unobserve(currentTarget);
+      };
+    }, [state.hasMore, state.isLoading, loadMore, isOpen]);
     const items = useMemo(() => {
       return [
         ...state.cities.map((c) => ({ ...c, type: "city" })),
@@ -778,6 +919,7 @@ var Pro6PPInfer = forwardRef(
     const hasResults = items.length > 0;
     const showNoResults = !state.isLoading && !state.isError && state.query.length > 0 && !hasResults && !state.isValid;
     const showDropdown = isOpen && (hasResults || state.isLoading || showNoResults);
+    const isInfiniteLoading = state.isLoading && items.length > 0;
     return /* @__PURE__ */ React.createElement("div", { ref: wrapperRef, className: `pro6pp-wrapper ${className || ""}`, style }, /* @__PURE__ */ React.createElement("div", { style: { position: "relative" } }, /* @__PURE__ */ React.createElement(
       "input",
       {
@@ -798,7 +940,7 @@ var Pro6PPInfer = forwardRef(
           inputProps?.onFocus?.(e);
         }
       }
-    ), /* @__PURE__ */ React.createElement("div", { className: "pro6pp-input-addons" }, state.isLoading && /* @__PURE__ */ React.createElement("div", { className: "pro6pp-loader" }), showClearButton && state.query.length > 0 && /* @__PURE__ */ React.createElement(
+    ), /* @__PURE__ */ React.createElement("div", { className: "pro6pp-input-addons" }, showClearButton && state.query.length > 0 && /* @__PURE__ */ React.createElement(
       "button",
       {
         type: "button",
@@ -828,7 +970,7 @@ var Pro6PPInfer = forwardRef(
         onWheel: (e) => e.stopPropagation(),
         onMouseDown: (e) => e.stopPropagation()
       },
-      /* @__PURE__ */ React.createElement("ul", { className: "pro6pp-list", role: "listbox" }, hasResults ? items.map((item, index) => {
+      /* @__PURE__ */ React.createElement("ul", { className: "pro6pp-list", role: "listbox" }, hasResults ? /* @__PURE__ */ React.createElement(React.Fragment, null, items.map((item, index) => {
         const isActive = index === state.selectedSuggestionIndex;
         const secondaryText = item.subtitle || (item.count !== void 0 ? item.count : "");
         const showChevron = item.value === void 0 || item.value === null;
@@ -857,19 +999,7 @@ var Pro6PPInfer = forwardRef(
             /* @__PURE__ */ React.createElement("polyline", { points: "9 18 15 12 9 6" })
           )))
         );
-      }) : state.isLoading ? /* @__PURE__ */ React.createElement("li", { className: "pro6pp-no-results" }, "Loading suggestions...") : /* @__PURE__ */ React.createElement("li", { className: "pro6pp-no-results" }, renderNoResults ? renderNoResults(state) : noResultsText)),
-      state.hasMore && /* @__PURE__ */ React.createElement(
-        "button",
-        {
-          type: "button",
-          className: "pro6pp-load-more",
-          onClick: (e) => {
-            e.preventDefault();
-            loadMore();
-          }
-        },
-        loadMoreText
-      )
+      }), state.hasMore && !state.isLoading && /* @__PURE__ */ React.createElement("li", { key: "sentinel", ref: observerTarget, style: { height: "1px", opacity: 0 } }), isInfiniteLoading && /* @__PURE__ */ React.createElement("li", { key: "loader", className: "pro6pp-loader-item" }, /* @__PURE__ */ React.createElement("div", { className: "pro6pp-mini-spinner" }), /* @__PURE__ */ React.createElement("span", null, loadingText))) : state.isLoading ? /* @__PURE__ */ React.createElement("li", { className: "pro6pp-no-results" }, "Searching...") : /* @__PURE__ */ React.createElement("li", { className: "pro6pp-no-results" }, renderNoResults ? renderNoResults(state) : noResultsText))
     ));
   }
 );

package/package.json

@@ -20,7 +20,7 @@
     "url": "https://github.com/pro6pp/infer-sdk/issues"
   },
   "sideEffects": false,
-  "version": "0.0.2-beta.15",
+  "version": "0.0.2-beta.17",
   "main": "./dist/index.cjs",
   "module": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -46,7 +46,7 @@
     "react": ">=16"
   },
   "dependencies": {
-    "@pro6pp/infer-core": "0.0.2-beta.13"
+    "@pro6pp/infer-core": "0.0.2-beta.15"
   },
   "devDependencies": {
     "@testing-library/dom": "^10.4.1",