@usereactify/search 3.0.0-beta.1 → 3.2.0

package/dist/provider.d.ts

@@ -19,8 +19,6 @@ declare type Context = {
     curation?: ConfigCuration;
     /** Array of additional component IDs managed outside of Reactify Search */
     additionalComponentIds?: string[];
-    /** Enable the new callouts feature */
-    enableCallouts?: boolean;
 };
 declare const Context: React.Context<Context | undefined>;
 declare type Props = {
@@ -34,8 +32,6 @@ declare type Props = {
     theme?: Theme;
     /** Array of additional component IDs managed outside of Reactify Search */
     additionalComponentIds?: string[];
-    /** Enable the new callouts feature */
-    enableCallouts?: boolean;
 };
 export declare const Provider: React.FC<Props>;
 export declare const useContext: () => Context;

package/dist/provider.js

@@ -15,7 +15,7 @@ const defaultCredentials = {
 };
 const Provider = (props) => {
     var _a, _b;
-    const { index, config, children, collection, instantSearch, filterStackId, noReactiveBase, enableCallouts, additionalComponentIds, } = props;
+    const { index, config, children, collection, instantSearch, filterStackId, noReactiveBase, additionalComponentIds, } = props;
     const credentials = (_a = props.credentials) !== null && _a !== void 0 ? _a : defaultCredentials;
     const theme = (_b = props.theme) !== null && _b !== void 0 ? _b : {
         typography: {
@@ -76,7 +76,6 @@ const Provider = (props) => {
         setShowInstantSearchResults,
         theme,
         curation,
-        enableCallouts,
         additionalComponentIds,
         instantSearch: !!instantSearch,
         showInstantSearchResults: !!showInstantSearchResults && !!searchQuery,
@@ -92,7 +91,6 @@ const Provider = (props) => {
         sortOptions,
         submitSearch,
         instantSearch,
-        enableCallouts,
         additionalComponentIds,
         showInstantSearchResults,
         theme,

package/dist/result/ResultList.d.ts

@@ -5,6 +5,11 @@ import { ResultCardCallout } from "./ResultCardCallout";
 import { ResultLoadMoreButton } from "./ResultLoadMoreButton";
 import { ResultPaginationNextPrev } from "./ResultPaginationNextPrev";
 import { ReactivesearchError, ReactivesearchResultProps } from "../types/reactivesearch";
+import { ElasticCallout, ElasticProduct } from "../types/elastic";
+declare type ResultProps = ReactivesearchResultProps & {
+    callouts: ElasticCallout[];
+    products: ElasticProduct[];
+};
 declare type Props = {
     pageSize?: number;
     gridColumns?: number;
@@ -14,9 +19,9 @@ declare type Props = {
     renderResultCard?: Parameters<typeof ResultCard>[0]["render"];
     renderPagination?: Parameters<typeof ResultPagination>[0]["render"];
     renderResultCardCallout?: Parameters<typeof ResultCardCallout>[0]["render"];
-    renderAfter?: (props: ReactivesearchResultProps) => JSX.Element | null;
-    renderBefore?: (props: ReactivesearchResultProps) => JSX.Element | null;
-    renderResults?: (props: ReactivesearchResultProps) => JSX.Element | null;
+    renderAfter?: (props: ResultProps) => JSX.Element | null;
+    renderBefore?: (props: ResultProps) => JSX.Element | null;
+    renderResults?: (props: ResultProps) => JSX.Element | null;
     renderError?: (props: {
         error: ReactivesearchError;
     }) => JSX.Element | null;

package/dist/result/ResultList.js

@@ -11,7 +11,6 @@ const ResultPagination_1 = require("./ResultPagination");
 const ResultCardCallout_1 = require("./ResultCardCallout");
 const ResultLoadMoreButton_1 = require("./ResultLoadMoreButton");
 const ResultPaginationNextPrev_1 = require("./ResultPaginationNextPrev");
-const provider_1 = require("../provider");
 const hooks_1 = require("../hooks");
 const elastic_1 = require("../types/elastic");
 const ResultList = (props) => {
@@ -24,18 +23,15 @@ const ResultList = (props) => {
 exports.ResultList = ResultList;
 const ResultListInner = (props) => {
     const { gridColumns, renderError, renderAfter, renderBefore, renderLoading, listClassName, renderResults, renderNoResults, renderResultCard, renderLoadMoreButton, renderResultCardCallout, reactivesearchResultProps, } = props;
-    const curation = (0, hooks_1.useCuration)();
     const filterStack = (0, hooks_1.useFilterStack)();
     const { instantSearch } = (0, hooks_1.useSearch)();
-    const { enableCallouts } = (0, provider_1.useContext)();
     const initialSearchHasRun = react_1.default.useMemo(() => "undefined" !==
         typeof reactivesearchResultProps.resultStats.numberOfResults, [reactivesearchResultProps]);
-    const styleProp = react_1.default.useMemo(() => !!enableCallouts
-        ? {
-            display: "grid",
-            gridTemplateColumns: `repeat(${gridColumns !== null && gridColumns !== void 0 ? gridColumns : 4}, minmax(0, 1fr))`,
-        }
-        : {}, [curation]);
+    const styleProp = react_1.default.useMemo(() => ({
+        display: "grid",
+        gridTemplateColumns: `repeat(${gridColumns !== null && gridColumns !== void 0 ? gridColumns : 4}, minmax(0, 1fr))`,
+    }), [gridColumns]);
+    const resultProps = react_1.default.useMemo(() => (Object.assign(Object.assign({}, reactivesearchResultProps), { products: reactivesearchResultProps.data.filter((document) => elastic_1.ElasticDocumentType.Product === document.type || !document.type), callouts: reactivesearchResultProps.data.filter((document) => elastic_1.ElasticDocumentType.Callout === document.type) })), [reactivesearchResultProps]);
     if (reactivesearchResultProps.error) {
         if (renderError)
             return renderError({ error: reactivesearchResultProps.error });
@@ -54,21 +50,22 @@ const ResultListInner = (props) => {
         return react_1.default.createElement("div", null, "No results");
     }
     if (renderResults) {
-        return renderResults(reactivesearchResultProps);
+        return renderResults(resultProps);
     }
     return (react_1.default.createElement(react_1.default.Fragment, null,
-        renderBefore && renderBefore(reactivesearchResultProps),
-        react_1.default.createElement("section", { className: listClassName, style: styleProp }, reactivesearchResultProps.data.map((result, key) => {
-            if (elastic_1.ElasticDocumentType.Product === result.type) {
-                return (react_1.default.createElement(ResultCard_1.ResultCard, { key: result._id, product: result, document: result, pagePosition: key + 1, render: renderResultCard }));
+        renderBefore && renderBefore(resultProps),
+        react_1.default.createElement("section", { className: listClassName, style: styleProp }, reactivesearchResultProps.data.map((document, key) => {
+            // @todo result.type is missing in v1 indexes, this check ensures that they are assumed to be products
+            if (elastic_1.ElasticDocumentType.Product === document.type || !document.type) {
+                return (react_1.default.createElement(ResultCard_1.ResultCard, { key: document._id, product: document, document: document, pagePosition: key + 1, render: renderResultCard }));
             }
-            if (!!enableCallouts && elastic_1.ElasticDocumentType.Callout === result.type) {
-                return (react_1.default.createElement(ResultCardCallout_1.ResultCardCallout, { key: result._id, document: result, pagePosition: key + 1, callout: result.callout, render: renderResultCardCallout }));
+            if (elastic_1.ElasticDocumentType.Callout === document.type) {
+                return (react_1.default.createElement(ResultCardCallout_1.ResultCardCallout, { key: document._id, document: document, pagePosition: key + 1, callout: document.callout, render: renderResultCardCallout }));
             }
             return null;
         })),
         !instantSearch && "load_more" === (filterStack === null || filterStack === void 0 ? void 0 : filterStack.paginationType) && (react_1.default.createElement(ResultLoadMoreButton_1.ResultLoadMoreButton, Object.assign({}, reactivesearchResultProps, { render: renderLoadMoreButton }))),
-        renderAfter && renderAfter(reactivesearchResultProps)));
+        renderAfter && renderAfter(resultProps)));
 };
 const ResultPaginationInner = (props) => {
     const { renderPagination, renderPaginationNextPrev } = props;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@usereactify/search",
   "description": "React UI library for Reactify Search",
-  "version": "3.0.0-beta.1",
+  "version": "3.2.0",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",